client: 1383 Support device identifier - DOT and DOH

2020-12-11 17:49:50 +03:00
460 changed files with 5417 additions and 33917 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,40 @@
-# Ignore everything except for explicitly allowed stuff.
-*
-!dist/docker
+.DS_Store
+/.git
+/.github
+/.vscode
+.idea
+/AdGuardHome
+/AdGuardHome.exe
+/AdGuardHome.yaml
+/AdGuardHome.log
+/data
+/build
+/dist
+/client/node_modules
+/.gitattributes
+/.gitignore
+/.goreleaser.yml
+/changelog.config.js
+/coverage.txt
+/Dockerfile
+/LICENSE.txt
+/Makefile
+/querylog.json
+/querylog.json.1
+/*.md
+
+# Test output
+dnsfilter/tests/top-1m.csv
+dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
+
+# Snapcraft build temporary files
+*.snap
+launchpad_credentials
+snapcraft_login
+snapcraft.yaml.bak
+
+# IntelliJ IDEA project files
+*.iml
+
+# Packr
+*-packr.go
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1 @@
-client/*                      linguist-vendored
-client/src/__locales/*.json   binary
-# Make an exception for the english locale, as it is the base one.
-client/src/__locales/en.json -binary
+client/* linguist-vendored
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e;
+
+found=0
+git diff --cached --name-only | grep -q '.js$' && found=1
+if [ $found == 1 ]; then
+    npm --prefix client run lint || exit 1
+    npm run test --prefix client || exit 1
+fi
+
+found=0
+git diff --cached --name-only | grep -q '.go$' && found=1
+if [ $found == 1 ]; then
+	make go-lint || exit 1
+	go test ./... || exit 1
+fi
+
+exit 0;
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -21,8 +21,6 @@ Please answer the following questions for yourself before submitting an issue. *

 * **Version of AdGuard Home server:**
  * <!-- (e.g. v1.0) -->
-* **How did you install AdGuard Home:**
-  * <!-- (e.g. Snapcraft, Docker, Github releases) -->
 * **How did you setup DNS configuration:**
  * <!-- (System/Router/IoT) -->
 * **If it's a router or IoT, please write device model:**
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -8,7 +8,6 @@
 - 'enhancement'
 - 'feature request'
 - 'localization'
- 'recurrent'
 # Label to use when marking an issue as stale.
 'staleLabel': 'wontfix'
 # Comment to post when marking an issue as stale. Set to `false` to disable.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@

 'env':
  'GO_VERSION': '1.14'
-  'NODE_VERSION': '14'
+  'NODE_VERSION': '13'

 'on':
  'push':
@@ -39,9 +39,7 @@
      'with':
        'node-version': '${{ env.NODE_VERSION }}'
    - 'name': 'Set up Go modules cache'
-      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
-      # most probably https://github.com/actions/cache/issues/527.
-      'uses': 'actions/cache@v2.1.3'
+      'uses': 'actions/cache@v2'
      'with':
        'path': '~/go/pkg/mod'
        'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -50,23 +48,21 @@
      'id': 'npm-cache'
      'run': 'echo "::set-output name=dir::$(npm config get cache)"'
    - 'name': 'Set up npm cache'
-      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
-      # most probably https://github.com/actions/cache/issues/527.
-      'uses': 'actions/cache@v2.1.3'
+      'uses': 'actions/cache@v2'
      'with':
        'path': '${{ steps.npm-cache.outputs.dir }}'
        'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
        'restore-keys': '${{ runner.os }}-node-'
    - 'name': 'Run make ci'
      'shell': 'bash'
-      'run': 'make VERBOSE=1 ci'
+      'run': 'make ci'
    - 'name': 'Upload coverage'
      'uses': 'codecov/codecov-action@v1'
      'if': "success() && matrix.os == 'ubuntu-latest'"
      'with':
        'token': '${{ secrets.CODECOV_TOKEN }}'
        'file': './coverage.txt'
-  'build-release':
+  'app':
    'runs-on': 'ubuntu-latest'
    'needs': 'test'
    'steps':
@@ -83,9 +79,7 @@
      'with':
        'node-version': '${{ env.NODE_VERSION }}'
    - 'name': 'Set up Go modules cache'
-      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
-      # most probably https://github.com/actions/cache/issues/527.
-      'uses': 'actions/cache@v2.1.3'
+      'uses': 'actions/cache@v2'
      'with':
        'path': '~/go/pkg/mod'
        'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -93,26 +87,38 @@
    - 'name': 'Get npm cache directory'
      'id': 'npm-cache'
      'run': 'echo "::set-output name=dir::$(npm config get cache)"'
-    - 'name': 'Set up npm cache'
-      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
-      # most probably https://github.com/actions/cache/issues/527.
-      'uses': 'actions/cache@v2.1.3'
+    - 'name': 'Set up node_modules cache'
+      'uses': 'actions/cache@v2'
      'with':
        'path': '${{ steps.npm-cache.outputs.dir }}'
        'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
        'restore-keys': '${{ runner.os }}-node-'
    - 'name': 'Set up Snapcraft'
      'run': 'sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft'
+    - 'name': 'Set up GoReleaser'
+      'run': 'curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | BINDIR="$(go env GOPATH)/bin" sh'
+    - 'name': 'Run snapshot build'
+      'run': 'make release'
+
+  'docker':
+    'runs-on': 'ubuntu-latest'
+    'needs': 'test'
+    'steps':
+    - 'name': 'Checkout'
+      'uses': 'actions/checkout@v2'
+      'with':
+        'fetch-depth': 0
    - 'name': 'Set up QEMU'
      'uses': 'docker/setup-qemu-action@v1'
    - 'name': 'Set up Docker Buildx'
      'uses': 'docker/setup-buildx-action@v1'
-    - 'name': 'Run snapshot build'
-      'run': 'make SIGN=0 VERBOSE=1 build-release build-docker'
+    - 'name': 'Docker Buildx (build)'
+      'run': 'make docker-multi-arch'

  'notify':
    'needs':
-    - 'build-release'
+    - 'app'
+    - 'docker'
    # Secrets are not passed to workflows that are triggered by a pull request
    # from a fork.
    #
@@ -133,7 +139,7 @@
      'uses': '8398a7/action-slack@v3'
      'with':
        'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author, workflow'
+        'fields': 'repo, message, commit, author, job'
      'env':
        'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
        'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,15 +13,15 @@
    - 'uses': 'actions/checkout@v2'
    - 'name': 'run-lint'
      'run': >
-        make go-deps go-tools go-lint
+        make go-install-tools go-lint
  'eslint':
    'runs-on': 'ubuntu-latest'
    'steps':
    - 'uses': 'actions/checkout@v2'
    - 'name': 'Install modules'
-      'run': 'npm --prefix="./client" ci'
+      'run': 'npm --prefix client ci'
    - 'name': 'Run ESLint'
-      'run': 'npm --prefix="./client" run lint'
+      'run': 'npm --prefix client run lint'
  'notify':
    'needs':
    - 'go-lint'
@@ -46,7 +46,7 @@
      'uses': '8398a7/action-slack@v3'
      'with':
        'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author, workflow'
+        'fields': 'repo, message, commit, author, job'
      'env':
        'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
        'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
--- a/.gitignore
+++ b/.gitignore
@@ -7,11 +7,9 @@
 # Only build, run, and test outputs here.  Sorted.
 *-packr.go
 *.db
-*.log
 *.snap
 /bin/
 /build/
-/build2/
 /data/
 /dist/
 /dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
@@ -21,5 +19,4 @@
 /snapcraft_login
 AdGuardHome*
 coverage.txt
-leases.db
 node_modules/
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -0,0 +1,115 @@
+'project_name': 'AdGuardHome'
+
+'env':
+- 'GO111MODULE=on'
+- 'GOPROXY=https://goproxy.io'
+
+'before':
+  'hooks':
+  - 'go mod download'
+  - 'go generate ./...'
+
+'builds':
+- 'main': './main.go'
+  'ldflags':
+  - '-s -w -X main.version={{.Version}} -X main.channel={{.Env.CHANNEL}} -X main.goarm={{.Env.GOARM}}'
+  'env':
+  - 'CGO_ENABLED=0'
+  'goos':
+  - 'darwin'
+  - 'linux'
+  - 'freebsd'
+  - 'windows'
+  'goarch':
+  - '386'
+  - 'amd64'
+  - 'arm'
+  - 'arm64'
+  - 'mips'
+  - 'mipsle'
+  - 'mips64'
+  - 'mips64le'
+  'goarm':
+  - '5'
+  - '6'
+  - '7'
+  'gomips':
+  - 'softfloat'
+  'ignore':
+  - 'goos': 'freebsd'
+    'goarch': 'mips'
+  - 'goos': 'freebsd'
+    'goarch': 'mipsle'
+
+'archives':
+- # Archive name template.
+  # Defaults:
+  # - if format is `tar.gz`, `tar.xz`, `gz` or `zip`:
+  #   - `{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}`
+  # - if format is `binary`:
+  #   - `{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}`
+  'name_template': '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
+  'wrap_in_directory': 'AdGuardHome'
+  'format_overrides':
+  - 'goos': 'windows'
+    'format': 'zip'
+  - 'goos': 'darwin'
+    'format': 'zip'
+  'files':
+  - 'LICENSE.txt'
+  - 'README.md'
+
+'snapcrafts':
+- 'name': 'adguard-home'
+  'base': 'core20'
+  'name_template': '{{ .ProjectName }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+  'summary': 'Network-wide ads & trackers blocking DNS server'
+  'description': |
+    AdGuard Home is a network-wide software for blocking ads & tracking. After
+    you set it up, it'll cover ALL your home devices, and you don't need any
+    client-side software for that.
+
+    It operates as a DNS server that re-routes tracking domains to a "black hole,"
+    thus preventing your devices from connecting to those servers. It's based
+    on software we use for our public AdGuard DNS servers -- both share a lot
+    of common code.
+  'grade': 'stable'
+  'confinement': 'strict'
+  'publish': false
+  'license': 'GPL-3.0'
+  'extra_files':
+  - 'source': 'scripts/snap/local/adguard-home-web.sh'
+    'destination': 'adguard-home-web.sh'
+    'mode': 0755
+  - 'source': 'scripts/snap/gui/adguard-home-web.desktop'
+    'destination': 'meta/gui/adguard-home-web.desktop'
+    'mode': 0644
+  - 'source': 'scripts/snap/gui/adguard-home-web.png'
+    'destination': 'meta/gui/adguard-home-web.png'
+    'mode': 0644
+  'apps':
+    'adguard-home':
+      'command': 'AdGuardHome -w $SNAP_DATA --no-check-update'
+      'plugs':
+      # Add the "netrwork-bind" plug to bind to interfaces.
+      - 'network-bind'
+      # Add the "netrwork-observe" plug to be able to bind to ports below 1024
+      # (cap_net_bind_service) and also to bind to a particular interface using
+      # SO_BINDTODEVICE (cap_net_raw).
+      - 'network-observe'
+      'daemon': 'simple'
+    'adguard-home-web':
+      'command': 'adguard-home-web.sh'
+      'plugs':
+      - 'desktop'
+
+'checksum':
+  'name_template': 'checksums.txt'
+
+'snapshot':
+  # TODO(a.garipov): A temporary solution to trim the prerelease versions.
+  # A real solution would consist of making a better versioning scheme that also
+  # doesn't break SemVer or Snapcraft.
+  #
+  # See https://github.com/AdguardTeam/AdGuardHome/issues/2412.
+  'name_template': '{{ slice .Tag 0 8 }}-SNAPSHOT-{{ .ShortCommit }}'
--- a/AGHTechDoc.md
+++ b/AGHTechDoc.md
@@ -1833,22 +1833,16 @@ Response:
 	200 OK

 	{
-		"reason":"FilteredBlackList",
-		"rules":{
-			"filter_list_id":42,
-			"text":"||doubleclick.net^",
-		},
-		// If we have "reason":"FilteredBlockedService".
-		"service_name": "...",
-		// If we have "reason":"Rewrite".
-		"cname": "...",
-		"ip_addrs": ["1.2.3.4", ...]
+	"reason":"FilteredBlackList",
+	"filter_id":1,
+	"rule":"||doubleclick.net^",
+	"service_name": "...", // set if reason=FilteredBlockedService
+
+	// if reason=ReasonRewrite:
+	"cname": "...",
+	"ip_addrs": ["1.2.3.4", ...],
 	}

-There are also deprecated properties `filter_id` and `rule` on the top level of
-the response object.  Their usage should be replaced with
-`rules[*].filter_list_id` and `rules[*].text` correspondingly.  See the
-_OpenAPI_ documentation and the `./openapi/CHANGELOG.md` file.

 ## Log-in page

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,103 +10,57 @@ and this project adheres to
 ## [Unreleased]

 <!--
-## [v0.105.0] - 2021-02-08
+## [v0.105.0] - 2020-12-28
 -->

 ### Added

- Added more services to the "Blocked services" list ([#2224], [#2401]).
- `ipset` subdomain matching, just like `dnsmasq` does ([#2179]).
- Client ID support for DNS-over-HTTPS, DNS-over-QUIC, and DNS-over-TLS
-  ([#1383]).
- `$dnsrewrite` modifier for filters ([#2102]).
- The host checking API and the query logs API can now return multiple matched
-  rules ([#2102]).
- Detecting of network interface configured to have static IP address via
+- Detecting of network interface configurated to have static IP address via
  `/etc/network/interfaces` ([#2302]).
- DNSCrypt protocol support ([#1361]).
+- DNSCrypt protocol support [#1361].
 - A 5 second wait period until a DHCP server's network interface gets an IP
  address ([#2304]).
 - `$dnstype` modifier for filters ([#2337]).
 - HTTP API request body size limit ([#2305]).

+[#1361]: https://github.com/AdguardTeam/AdGuardHome/issues/1361
+[#2302]: https://github.com/AdguardTeam/AdGuardHome/issues/2302
+[#2304]: https://github.com/AdguardTeam/AdGuardHome/issues/2304
+[#2305]: https://github.com/AdguardTeam/AdGuardHome/issues/2305
+[#2337]: https://github.com/AdguardTeam/AdGuardHome/issues/2337
+
 ### Changed

- `Access-Control-Allow-Origin` is now only set to the same origin as the
-  domain, but with an HTTP scheme as opposed to `*` ([#2484]).
- `workDir` now supports symlinks.
- Stopped mounting together the directories `/opt/adguardhome/conf` and
-  `/opt/adguardhome/work` in our Docker images ([#2589]).
- When `dns.bogus_nxdomain` option is used, the server will now transform
-  responses if there is at least one bogus address instead of all of them
-  ([#2394]).  The new behavior is the same as in `dnsmasq`.
 - Post-updating relaunch possibility is now determined OS-dependently ([#2231],
  [#2391]).
 - Made the mobileconfig HTTP API more robust and predictable, add parameters and
  improve error response ([#2358]).
 - Improved HTTP requests handling and timeouts ([#2343]).
 - Our snap package now uses the `core20` image as its base ([#2306]).
- New build system and various internal improvements ([#2271], [#2276], [#2297],
-  [#2509], [#2552]).
+- Various internal improvements ([#2267], [#2271], [#2297]).

-### Deprecated
-
- 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"` fields in `GET /filtering/check_host` and
-  `GET /querylog` responses.  They will be removed in v0.106.0 ([#2102]).
+[#2231]: https://github.com/AdguardTeam/AdGuardHome/issues/2231
+[#2267]: https://github.com/AdguardTeam/AdGuardHome/issues/2267
+[#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271
+[#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297
+[#2306]: https://github.com/AdguardTeam/AdGuardHome/issues/2306
+[#2343]: https://github.com/AdguardTeam/AdGuardHome/issues/2343
+[#2358]: https://github.com/AdguardTeam/AdGuardHome/issues/2358
+[#2391]: https://github.com/AdguardTeam/AdGuardHome/issues/2391

 ### Fixed

- Autoupdate bug in the Darwin (macOS) version ([#2630]).
- Unnecessary conversions from `string` to `net.IP`, and vice versa ([#2508]).
- Inability to set DNS cache TTL limits ([#2459]).
- Possible freezes on slower machines ([#2225]).
 - A mitigation against records being shown in the wrong order on the query log
  page ([#2293]).
 - A JSON parsing error in query log ([#2345]).
 - Incorrect detection of the IPv6 address of an interface as well as another
  infinite loop in the `/dhcp/find_active_dhcp` HTTP API ([#2355]).

-### Removed
-
- The undocumented ability to use hostnames as any of `bind_host` values in
-  configuration.  Documentation requires them to be valid IP addresses, and now
-  the implementation makes sure that that is the case ([#2508]).
- `Dockerfile` ([#2276]).  Replaced with the script
-  `scripts/make/build-docker.sh` which uses `scripts/make/Dockerfile`.
- Support for pre-v0.99.3 format of query logs ([#2102]).
-
-[#1361]: https://github.com/AdguardTeam/AdGuardHome/issues/1361
-[#1383]: https://github.com/AdguardTeam/AdGuardHome/issues/1383
-[#2102]: https://github.com/AdguardTeam/AdGuardHome/issues/2102
-[#2179]: https://github.com/AdguardTeam/AdGuardHome/issues/2179
-[#2224]: https://github.com/AdguardTeam/AdGuardHome/issues/2224
-[#2225]: https://github.com/AdguardTeam/AdGuardHome/issues/2225
-[#2231]: https://github.com/AdguardTeam/AdGuardHome/issues/2231
-[#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271
-[#2276]: https://github.com/AdguardTeam/AdGuardHome/issues/2276
 [#2293]: https://github.com/AdguardTeam/AdGuardHome/issues/2293
-[#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297
-[#2302]: https://github.com/AdguardTeam/AdGuardHome/issues/2302
-[#2304]: https://github.com/AdguardTeam/AdGuardHome/issues/2304
-[#2305]: https://github.com/AdguardTeam/AdGuardHome/issues/2305
-[#2306]: https://github.com/AdguardTeam/AdGuardHome/issues/2306
-[#2337]: https://github.com/AdguardTeam/AdGuardHome/issues/2337
-[#2343]: https://github.com/AdguardTeam/AdGuardHome/issues/2343
 [#2345]: https://github.com/AdguardTeam/AdGuardHome/issues/2345
 [#2355]: https://github.com/AdguardTeam/AdGuardHome/issues/2355
-[#2358]: https://github.com/AdguardTeam/AdGuardHome/issues/2358
-[#2391]: https://github.com/AdguardTeam/AdGuardHome/issues/2391
-[#2394]: https://github.com/AdguardTeam/AdGuardHome/issues/2394
-[#2401]: https://github.com/AdguardTeam/AdGuardHome/issues/2401
-[#2459]: https://github.com/AdguardTeam/AdGuardHome/issues/2459
-[#2484]: https://github.com/AdguardTeam/AdGuardHome/issues/2484
-[#2508]: https://github.com/AdguardTeam/AdGuardHome/issues/2508
-[#2509]: https://github.com/AdguardTeam/AdGuardHome/issues/2509
-[#2552]: https://github.com/AdguardTeam/AdGuardHome/issues/2552
-[#2589]: https://github.com/AdguardTeam/AdGuardHome/issues/2589
-[#2630]: https://github.com/AdguardTeam/AdGuardHome/issues/2630
+
+

 ## [v0.104.3] - 2020-11-19

@@ -133,7 +87,7 @@ and this project adheres to

 - Query logs from file not loading after the ones buffered in memory ([#2325]).
 - Unnecessary errors in query logs when switching between log files ([#2324]).
- `404 Not Found` errors on the DHCP settings page on Windows.  The page now
+- `404 Not Found` errors on the DHCP settings page on *Windows*.  The page now
  correctly shows that DHCP is not currently available on that OS ([#2295]).
 - Infinite loop in `/dhcp/find_active_dhcp` ([#2301]).

--- a/77
+++ b/77
@@ -0,0 +1,77 @@
+FROM --platform=${BUILDPLATFORM:-linux/amd64} tonistiigi/xx:golang AS xgo
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-alpine as builder
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION=dev
+ARG CHANNEL=release
+
+ENV CGO_ENABLED 0
+ENV GO111MODULE on
+ENV GOPROXY https://goproxy.io
+
+COPY --from=xgo / /
+RUN go env
+
+RUN apk --update --no-cache add \
+    build-base \
+    gcc \
+    git \
+    npm \
+  && rm -rf /tmp/* /var/cache/apk/*
+
+WORKDIR /app
+
+COPY . ./
+
+# Prepare the client code
+RUN npm --prefix client ci && npm --prefix client run build-prod
+
+# Download go dependencies
+RUN go mod download
+RUN go generate ./...
+
+# It's important to place TARGET* arguments here to avoid running npm and go mod download for every platform
+ARG TARGETPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
+RUN go build -ldflags="-s -w -X main.version=${VERSION} -X main.channel=${CHANNEL} -X main.goarm=${GOARM}"
+
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:latest
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+ARG CHANNEL
+
+LABEL maintainer="AdGuard Team <devteam@adguard.com>" \
+  org.opencontainers.image.created=$BUILD_DATE \
+  org.opencontainers.image.url="https://adguard.com/adguard-home.html" \
+  org.opencontainers.image.source="https://github.com/AdguardTeam/AdGuardHome" \
+  org.opencontainers.image.version=$VERSION \
+  org.opencontainers.image.revision=$VCS_REF \
+  org.opencontainers.image.vendor="AdGuard" \
+  org.opencontainers.image.title="AdGuard Home" \
+  org.opencontainers.image.description="Network-wide ads & trackers blocking DNS server" \
+  org.opencontainers.image.licenses="GPL-3.0"
+
+RUN apk --update --no-cache add \
+    ca-certificates \
+    libcap \
+    libressl \
+  && rm -rf /tmp/* /var/cache/apk/*
+
+COPY --from=builder --chown=nobody:nogroup /app/AdGuardHome /opt/adguardhome/AdGuardHome
+COPY --from=builder --chown=nobody:nogroup /usr/local/go/lib/time/zoneinfo.zip /usr/local/go/lib/time/zoneinfo.zip
+
+RUN /opt/adguardhome/AdGuardHome --version \
+  && mkdir -p /opt/adguardhome/conf /opt/adguardhome/work \
+  && chown -R nobody: /opt/adguardhome \
+  && setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
+
+EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 853/tcp 3000/tcp
+WORKDIR /opt/adguardhome/work
+VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"]
+
+ENTRYPOINT ["/opt/adguardhome/AdGuardHome"]
+CMD ["-h", "0.0.0.0", "-c", "/opt/adguardhome/conf/AdGuardHome.yaml", "-w", "/opt/adguardhome/work", "--no-check-update"]
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,33 +1,17 @@
- #  AdGuard Home Developer Guidelines
+ #  *AdGuardHome* Developer Guidelines

-As of **February 2021**, this document is partially a work-in-progress, but
+As of **December 2020**, this document is partially a work-in-progress, but
 should still be followed.  Some of the rules aren't enforced as thoroughly or
 remain broken in old code, but this is still the place to find out about what we
 **want** our code to look like.

 The rules are mostly sorted in the alphabetical order.

-## Contents
-
- *  [Git](#git)
- *  [Go](#go)
-     *  [Code And Naming](#code-and-naming)
-     *  [Commenting](#commenting)
-     *  [Formatting](#formatting)
-     *  [Recommended Reading](#recommended-reading)
- *  [Markdown](#markdown)
- *  [Shell Scripting](#shell-scripting)
- *  [Text, Including Comments](#text-including-comments)
- *  [YAML](#yaml)
-
-<!-- NOTE: Use the IDs that GitHub would generate in order for this to work both
-on GitHub and most other Markdown renderers. -->
-
-##  <a id="git" href="#git">Git</a>
+##  *Git*

 *  Call your branches either `NNNN-fix-foo` (where `NNNN` is the ID of the
-    GitHub issue you worked on in this branch) or just `fix-foo` if there was no
-    GitHub issue.
+    *GitHub* issue you worked on in this branch) or just `fix-foo` if there was
+    no *GitHub* issue.

 *  Follow the commit message header format:

@@ -35,9 +19,8 @@ on GitHub and most other Markdown renderers. -->
    pkg: fix the network error logging issue
    ```

-    Where `pkg` is the directory or Go package (without the `internal/` part)
-    where most changes took place.  If there are several such packages, or the
-    change is top-level only, write `all`.
+    Where `pkg` is the package where most changes took place.  If there are
+    several such packages, or the change is top-level only, write `all`.

 *  Keep your commit messages, including headers, to eighty (**80**) columns.

@@ -47,14 +30,14 @@ on GitHub and most other Markdown renderers. -->
    The only exceptions are direct mentions of identifiers from the source code
    and filenames like `HACKING.md`.

-##  <a id="go" href="#go">Go</a>
+##  *Go*

 > Not Golang, not GO, not GOLANG, not GoLang. It is Go in natural language,
 > golang for others.

 — [@rakyll](https://twitter.com/rakyll/status/1229850223184269312)

- ###  <a id="code-and-naming" href="#code-and-naming">Code And Naming</a>
+ ###  Code And Naming

 *  Avoid `goto`.

@@ -62,14 +45,6 @@ on GitHub and most other Markdown renderers. -->

 *  Avoid `new`, especially with structs.

- *  Check against empty strings like this:
-
-    ```go
-    if s == "" {
-            // …
-    }
-    ```
-
 *  Constructors should validate their arguments and return meaningful errors.
    As a corollary, avoid lazy initialization.

@@ -78,12 +53,9 @@ on GitHub and most other Markdown renderers. -->
 *  Don't use underscores in file and package names, unless they're build tags
    or for tests.  This is to prevent accidental build errors with weird tags.

- *  Don't write non-test code with more than four (**4**) levels of indentation.
-    Just like [Linus said], plus an additional level for an occasional error
-    check or struct initialization.
-
-    The exception proving the rule is the table-driven test code, where an
-    additional level of indentation is allowed.
+ *  Don't write code with more than four (**4**) levels of indentation.  Just
+    like [Linus said], plus an additional level for an occasional error check or
+    struct initialization.

 *  Eschew external dependencies, including transitive, unless
    absolutely necessary.
@@ -98,14 +70,6 @@ on GitHub and most other Markdown renderers. -->
    func TestType_Method_suffix(t *testing.T) { /* … */ }
    ```

- *  Name parameters in interface definitions:
-
-   ```go
-   type Frobulator interface {
-           Frobulate(f Foo, b Bar) (r Result, err error)
-   }
-   ```
-
 *  Name the deferred errors (e.g. when closing something) `cerr`.

 *  No shadowing, since it can often lead to subtle bugs, especially with
@@ -114,17 +78,6 @@ on GitHub and most other Markdown renderers. -->
 *  Prefer constants to variables where possible.  Reduce global variables.  Use
    [constant errors] instead of `errors.New`.

- *  Program code lines should not be longer than one hundred (**100**) columns.
-    For comments, see the text section below.
-
- *  Unused arguments in anonymous functions must be called `_`:
-
-    ```go
-    v.onSuccess = func(_ int, msg string) {
-            // …
-    }
-    ```
-
 *  Use linters.

 *  Use named returns to improve readability of function signatures.
@@ -132,9 +85,12 @@ on GitHub and most other Markdown renderers. -->
 *  Write logs and error messages in lowercase only to make it easier to `grep`
    logs and error messages without using the `-i` flag.

- ###  <a id="commenting" href="#commenting">Commenting</a>
+[constant errors]: https://dave.cheney.net/2016/04/07/constant-errors
+[Linus said]:      https://www.kernel.org/doc/html/v4.17/process/coding-style.html#indentation

- *  See also the “[Text, Including Comments]” section below.
+ ###  Commenting
+
+ *  See also the *Text, Including Comments* section below.

 *  Document everything, including unexported top-level identifiers, to build
    a habit of writing documentation.
@@ -150,20 +106,11 @@ on GitHub and most other Markdown renderers. -->
    ```go
    // Foo implements the Fooer interface for *foo.
    func (f *foo) Foo() {
-            // …
+        // …
    }
    ```

-    When the implemented interface is unexported:
-
-    ```go
-    // Unwrap implements the hidden wrapper interface for *fooError.
-    func (err *fooError) Unwrap() (unwrapped error) {
-            // …
-    }
-    ```
-
- ###  <a id="formatting" href="#formatting">Formatting</a>
+ ###  Formatting

 *  Add an empty line before `break`, `continue`, `fallthrough`, and `return`,
    unless it's the only statement in that block.
@@ -185,7 +132,7 @@ on GitHub and most other Markdown renderers. -->
    }}
    ```

- ###  <a id="recommended-reading" href="#recommended-reading">Recommended Reading</a>
+ ###  Recommended Reading

 *  <https://github.com/golang/go/wiki/CodeReviewComments>.

@@ -193,63 +140,26 @@ on GitHub and most other Markdown renderers. -->

 *  <https://go-proverbs.github.io/>

-[constant errors]:          https://dave.cheney.net/2016/04/07/constant-errors
-[Linus said]:               https://www.kernel.org/doc/html/v4.17/process/coding-style.html#indentation
-[Text, Including Comments]: #text-including-comments
+##  *Markdown*

-##  <a id="markdown" href="#markdown">Markdown</a>
+ *  **TODO(a.garipov):** Define our *Markdown* conventions.

- *  **TODO(a.garipov):** Define more Markdown conventions.
+##  Shell Scripting

- *  Prefer triple-backtick preformatted code blocks to indented code blocks.
-
- *  Use asterisks and not underscores for bold and italic.
-
- *  Use either link references or link destinations only.  Put all link
-    reference definitions at the end of the second-level block.
-
-##  <a id="shell-scripting" href="#shell-scripting">Shell Scripting</a>
-
- *  Avoid bashisms and GNUisms, prefer POSIX features only.
+ *  Avoid bashisms, prefer *POSIX* features only.

 *  Prefer `'raw strings'` to `"double quoted strings"` whenever possible.

 *  Put spaces within `$( cmd )`, `$(( expr ))`, and `{ cmd; }`.

- *  Put utility flags in the ASCII order and **don't** group them together.  For
-    example, `ls -1 -A -q`.
-
- *  `snake_case`, not `camelCase` for variables.  `kebab-case` for filenames.
-
- *  UPPERCASE names for external exported variables, lowercase for local,
-    unexported ones.
+ *  `snake_case`, not `camelCase`.

 *  Use `set -e -f -u` and also `set -x` in verbose mode.

- *  Use `readonly` liberally.
-
 *  Use the `"$var"` form instead of the `$var` form, unless word splitting is
    required.

- *  When concatenating, always use the form with curly braces to prevent
-    accidental bad variable names.  That is, `"${var}_tmp.txt"` and **not**
-    `"$var_tmp.txt"`.  The latter will try to lookup variable `var_tmp`.
-
- *  When concatenating, surround the whole string with quotes.  That is, use
-    this:
-
-    ```sh
-    dir="${TOP_DIR}/sub"
-    ```
-
-    And **not** this:
-
-    ```sh
-    # Bad!
-    dir="${TOP_DIR}"/sub
-    ```
-
-##  <a id="text-including-comments" href="#text-including-comments">Text, Including Comments</a>
+##  Text, Including Comments

 *  End sentences with appropriate punctuation.

@@ -270,7 +180,7 @@ on GitHub and most other Markdown renderers. -->

 *  Use double spacing between sentences to make sentence borders more clear.

- *  Use the serial comma (a.k.a. Oxford comma) to improve comprehension,
+ *  Use the serial comma (a.k.a. *Oxford* comma) to improve comprehension,
    decrease ambiguity, and use a common standard.

 *  Write todos like this:
@@ -285,16 +195,16 @@ on GitHub and most other Markdown renderers. -->
    // TODO(usr1, usr2): Fix the frobulation issue.
    ```

-##  <a id="yaml" href="#yaml">YAML</a>
+##  *YAML*

 *  **TODO(a.garipov):** Define naming conventions for schema names in our
-    OpenAPI YAML file.  And just generally OpenAPI conventions.
+    *OpenAPI* *YAML* file.  And just generally OpenAPI conventions.

- *  **TODO(a.garipov):** Find a YAML formatter or write our own.
+ *  **TODO(a.garipov):** Find a *YAML* formatter or write our own.

- *  All strings, including keys, must be quoted.  Reason: the “[NO-rway Law]”.
+ *  All strings, including keys, must be quoted.  Reason: the [*NO-rway Law*].

- *  Indent with two (**2**) spaces.  YAML documents can get pretty
+ *  Indent with two (**2**) spaces.  *YAML* documents can get pretty
    deeply-nested.

 *  No extra indentation in multiline arrays:
@@ -308,8 +218,8 @@ on GitHub and most other Markdown renderers. -->

 *  Prefer single quotes for strings to prevent accidental escaping, unless
    escaping is required or there are single quotes inside the string (e.g. for
-    GitHub Actions).
+    *GitHub Actions*).

 *  Use `>` for multiline strings, unless you need to keep the line breaks.

-[NO-rway Law]: https://news.ycombinator.com/item?id=17359376
+[*NO-rway Law*]: https://news.ycombinator.com/item?id=17359376
--- a/416
+++ b/416
@@ -1,103 +1,345 @@
-# Keep the Makefile POSIX-compliant.  We currently allow hyphens in
-# target names, but that may change in the future.
 #
-# See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html.
-.POSIX:
-
-CHANNEL = development
-CLIENT_BETA_DIR = client2
-CLIENT_DIR = client
-COMMIT = $$(git rev-parse --short HEAD)
-DIST_DIR = dist
-GO = go
-# TODO(a.garipov): Add more default proxies using pipes after update to
-# Go 1.15.
+# Available targets
 #
-# GOPROXY = https://goproxy.io|https://goproxy.cn|direct
-GOPROXY = https://goproxy.cn,https://goproxy.io,direct
-GPG_KEY = devteam@adguard.com
-GPG_KEY_PASSPHRASE = not-a-real-password
-NPM = npm
-NPM_FLAGS = --prefix $(CLIENT_DIR)
-SIGN = 1
-VERBOSE = 0
-VERSION = v0.0.0
-YARN = yarn
-YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
+# * build -- builds AdGuardHome for the current platform
+# * client -- builds client-side code of AdGuard Home
+# * client-watch -- builds client-side code of AdGuard Home and watches for changes there
+# * docker -- builds a docker image for the current platform
+# * clean -- clean everything created by previous builds
+# * lint -- run all linters
+# * test -- run all unit-tests
+# * dependencies -- installs dependencies (go and npm modules)
+# * ci -- installs dependencies, runs linters and tests, intended to be used by CI/CD
+#
+# Building releases:
+#
+# * release -- builds AdGuard Home distros. CHANNEL must be specified (edge, release or beta).
+# * release_and_sign -- builds AdGuard Home distros and signs the binary files.
+#   CHANNEL must be specified (edge, release or beta).
+# * sign -- Repacks all release archive files and signs the binary files inside them.
+#   For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
+#     gpg --import public.txt
+#     gpg --import private.txt
+#   GPG_KEY_PASSPHRASE must contain the GPG key passphrase
+# * docker-multi-arch -- builds a multi-arch image. If you want it to be pushed to docker hub,
+# 	you must specify:
+#     * DOCKER_IMAGE_NAME - adguard/adguard-home
+#     * DOCKER_OUTPUT - type=image,name=adguard/adguard-home,push=true

-ENV = env\
-	COMMIT='$(COMMIT)'\
-	CHANNEL='$(CHANNEL)'\
-	GPG_KEY='$(GPG_KEY)'\
-	GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
-	DIST_DIR='$(DIST_DIR)'\
-	GO='$(GO)'\
-	GOPROXY='$(GOPROXY)'\
-	PATH="$${PWD}/bin:$$($(GO) env GOPATH)/bin:$${PATH}"\
-	SIGN='$(SIGN)'\
-	VERBOSE='$(VERBOSE)'\
-	VERSION='$(VERSION)'\
+GO := go
+GOPATH := $(shell $(GO) env GOPATH)
+PWD := $(shell pwd)
+TARGET=AdGuardHome
+BASE_URL="https://static.adguard.com/adguardhome/$(CHANNEL)"
+GPG_KEY := devteam@adguard.com
+GPG_KEY_PASSPHRASE :=
+GPG_CMD := gpg --detach-sig --default-key $(GPG_KEY) --pinentry-mode loopback --passphrase $(GPG_KEY_PASSPHRASE)
+VERBOSE := -v

-# Keep the line above blank.
+# See release target
+DIST_DIR=dist

-# Keep this target first, so that a naked make invocation triggers
-# a full build.
-build: deps quick-build
+# Update channel. Can be release, beta or edge. Uses edge by default.
+CHANNEL ?= edge

-quick-build: js-build go-build
+# Validate channel
+ifneq ($(CHANNEL),release)
+ifneq ($(CHANNEL),beta)
+ifneq ($(CHANNEL),edge)
+$(error CHANNEL value is not valid. Valid values are release,beta or edge)
+endif
+endif
+endif

-ci: deps test
+# Version history URL (see
+VERSION_HISTORY_URL="https://github.com/AdguardTeam/AdGuardHome/releases"
+ifeq ($(CHANNEL),edge)
+	VERSION_HISTORY_URL="https://github.com/AdguardTeam/AdGuardHome/commits/master"
+endif
+
+# goreleaser command depends on the $CHANNEL
+GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --snapshot --parallelism 1
+ifneq ($(CHANNEL),edge)
+	# If this is not an "edge" build, use normal release command
+	GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --parallelism 1
+endif
+
+# Version properties
+COMMIT=$(shell git rev-parse --short HEAD)
+# TODO(a.garipov): The cut call is a temporary solution to trim
+# prerelease versions.  See the comment in .goreleaser.yml.
+TAG_NAME=$(shell git describe --abbrev=0 | cut -c 1-8)
+RELEASE_VERSION=$(TAG_NAME)
+SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
+
+# Set proper version
+VERSION=
+ifeq ($(TAG_NAME),$(shell git describe --abbrev=4))
+	ifeq ($(CHANNEL),edge)
+		VERSION=$(SNAPSHOT_VERSION)
+	else
+		VERSION=$(RELEASE_VERSION)
+	endif
+else
+	VERSION=$(SNAPSHOT_VERSION)
+endif
+
+# Docker target parameters
+DOCKER_IMAGE_NAME ?= adguardhome-dev
+DOCKER_IMAGE_FULL_NAME = $(DOCKER_IMAGE_NAME):$(VERSION)
+DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le
+DOCKER_OUTPUT ?= type=image,name=$(DOCKER_IMAGE_NAME),push=false
+BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+# Docker tags (can be redefined)
+DOCKER_TAGS ?=
+ifndef DOCKER_TAGS
+	ifeq ($(CHANNEL),release)
+		DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):latest
+	endif
+	ifeq ($(CHANNEL),beta)
+		DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):beta
+	endif
+	ifeq ($(CHANNEL),edge)
+		# Don't set the version tag when pushing to "edge"
+		DOCKER_IMAGE_FULL_NAME := $(DOCKER_IMAGE_NAME):edge
+		# DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge
+	endif
+endif
+
+# Validate docker build arguments
+ifndef DOCKER_IMAGE_NAME
+$(error DOCKER_IMAGE_NAME value is not set)
+endif
+
+# OS-specific flags
+TEST_FLAGS := --race $(VERBOSE)
+ifeq ($(OS),Windows_NT)
+	TEST_FLAGS :=
+endif
+
+.PHONY: all build client client-watch docker lint lint-js lint-go test dependencies clean release docker-multi-arch
+all: build
+
+init:
+	git config core.hooksPath .githooks
+
+build: client_with_deps
+	$(GO) mod download
+	PATH=$(GOPATH)/bin:$(PATH) $(GO) generate ./...
+	CGO_ENABLED=0 $(GO) build -ldflags="-s -w -X main.version=$(VERSION) -X main.channel=$(CHANNEL) -X main.goarm=$(GOARM)"
+	PATH=$(GOPATH)/bin:$(PATH) packr clean
+
+client:
+	npm --prefix client run build-prod
+
+client_with_deps:
+	npm --prefix client ci
+	npm --prefix client run build-prod
+
+client-watch:
+	npm --prefix client run watch
+
+docker:
+	DOCKER_CLI_EXPERIMENTAL=enabled \
+	docker buildx build \
+	--build-arg VERSION=$(VERSION) \
+	--build-arg CHANNEL=$(CHANNEL) \
+	--build-arg VCS_REF=$(COMMIT) \
+	--build-arg BUILD_DATE=$(BUILD_DATE) \
+	$(DOCKER_TAGS) \
+	--load \
+	-t "$(DOCKER_IMAGE_NAME)" -f ./Dockerfile .
+
+	@echo Now you can run the docker image:
+	@echo docker run --name "adguard-home" -p 53:53/tcp -p 53:53/udp -p 80:80/tcp -p 443:443/tcp -p 853:853/tcp -p 3000:3000/tcp $(DOCKER_IMAGE_NAME)

-deps: js-deps go-deps
 lint: js-lint go-lint
+
+js-lint: dependencies
+	npm --prefix client run lint
+
+go-install-tools:
+	env GO=$(GO) sh ./scripts/go-install-tools.sh
+
+go-lint:
+	env GO=$(GO) PATH="$$PWD/bin:$$PATH" sh ./scripts/go-lint.sh
+
 test: js-test go-test

-# Here and below, keep $(SHELL) in quotes, because on Windows this will
-# expand to something like "C:/Program Files/Git/usr/bin/sh.exe".
-build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
+js-test:
+	npm run test --prefix client

-build-release: deps js-build
-	$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
+go-test:
+	$(GO) test $(TEST_FLAGS) --coverprofile coverage.txt ./...

-clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
-init:  ; git config core.hooksPath ./scripts/hooks
+ci: client_with_deps
+	$(GO) mod download
+	$(MAKE) test

-js-build:
-	$(NPM) $(NPM_FLAGS) run build-prod
-	$(YARN) $(YARN_FLAGS) build
-js-deps:
-	$(NPM) $(NPM_FLAGS) ci
-	$(YARN) $(YARN_FLAGS) install
-
-# TODO(a.garipov): Remove the legacy client tasks support once the new
-# client is done and the old one is removed.
-js-lint: ; $(NPM) $(NPM_FLAGS) run lint
-js-test: ; $(NPM) $(NPM_FLAGS) run test
-js-beta-lint: ; $(YARN) $(YARN_FLAGS) lint
-js-beta-test: ; # TODO(v.abdulmyanov): Add tests for the new client.
-
-go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
-go-deps:  ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
-go-lint:  ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
-go-test:  ; $(ENV) "$(SHELL)" ./scripts/make/go-test.sh
-go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
-
-go-check: go-tools go-lint go-test
-
-openapi-lint: ; cd ./openapi/ && $(YARN) test
-openapi-show: ; cd ./openapi/ && $(YARN) start
-
-# TODO(a.garipov): Remove the legacy targets once the build
-# infrastructure stops using them.
 dependencies:
-	@ echo "use make deps instead"
-	@ $(MAKE) deps
+	npm --prefix client ci
+	$(GO) mod download
+
+clean:
+	rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt
+	rm -f -r ./build/ ./client/node_modules/ ./data/ ./$(DIST_DIR)/
+# Set the GOPATH explicitly in case make clean is called from under sudo
+# after a Docker build.
+	env PATH="$(GOPATH)/bin:$$PATH" packr clean
+	rm -f -r ./bin/
+
 docker-multi-arch:
-	@ echo "use make build-docker instead"
-	@ $(MAKE) build-docker
-go-install-tools:
-	@ echo "use make go-tools instead"
-	@ $(MAKE) go-tools
-release:
-	@ echo "use make build-release instead"
-	@ $(MAKE) build-release
+	DOCKER_CLI_EXPERIMENTAL=enabled \
+	docker buildx build \
+	--platform $(DOCKER_PLATFORMS) \
+	--build-arg VERSION=$(VERSION) \
+	--build-arg CHANNEL=$(CHANNEL) \
+	--build-arg VCS_REF=$(COMMIT) \
+	--build-arg BUILD_DATE=$(BUILD_DATE) \
+	$(DOCKER_TAGS) \
+	--output "$(DOCKER_OUTPUT)" \
+	-t "$(DOCKER_IMAGE_FULL_NAME)" -f ./Dockerfile .
+
+	@echo If the image was pushed to the registry, you can now run it:
+	@echo docker run --name "adguard-home" -p 53:53/tcp -p 53:53/udp -p 80:80/tcp -p 443:443/tcp -p 853:853/tcp -p 3000:3000/tcp $(DOCKER_IMAGE_NAME)
+
+release: client_with_deps
+	$(GO) mod download
+	@echo Starting release build: version $(VERSION), channel $(CHANNEL)
+	CHANNEL=$(CHANNEL) $(GORELEASER_COMMAND)
+	$(call write_version_file,$(VERSION))
+	PATH=$(GOPATH)/bin:$(PATH) packr clean
+
+release_and_sign: client_with_deps
+	$(MAKE) release
+	$(call repack_dist)
+
+sign:
+	$(call repack_dist)
+
+define write_version_file
+	$(eval version := $(1))
+
+	@echo Writing version file: $(version)
+
+	# Variables for CI
+	rm -f $(DIST_DIR)/version.txt
+	echo "version=$(version)" > $(DIST_DIR)/version.txt
+
+	# Prepare the version.json file
+	rm -f $(DIST_DIR)/version.json
+	echo "{" >> $(DIST_DIR)/version.json
+	echo "  \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json
+	echo "  \"announcement\": \"AdGuard Home $(version) is now available!\"," >> $(DIST_DIR)/version.json
+	echo "  \"announcement_url\": \"$(VERSION_HISTORY_URL)\"," >> $(DIST_DIR)/version.json
+	echo "  \"selfupdate_min_version\": \"0.0\"," >> $(DIST_DIR)/version.json
+
+	# Windows builds
+	echo "  \"download_windows_amd64\": \"$(BASE_URL)/AdGuardHome_windows_amd64.zip\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_windows_386\": \"$(BASE_URL)/AdGuardHome_windows_386.zip\"," >> $(DIST_DIR)/version.json
+
+	# MacOS builds
+	echo "  \"download_darwin_amd64\": \"$(BASE_URL)/AdGuardHome_darwin_amd64.zip\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_darwin_386\": \"$(BASE_URL)/AdGuardHome_darwin_386.zip\"," >> $(DIST_DIR)/version.json
+
+	# Linux
+	echo "  \"download_linux_amd64\": \"$(BASE_URL)/AdGuardHome_linux_amd64.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_386\": \"$(BASE_URL)/AdGuardHome_linux_386.tar.gz\"," >> $(DIST_DIR)/version.json
+
+	# Linux, all kinds of ARM
+	echo "  \"download_linux_arm\": \"$(BASE_URL)/AdGuardHome_linux_armv6.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_armv5\": \"$(BASE_URL)/AdGuardHome_linux_armv5.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_armv6\": \"$(BASE_URL)/AdGuardHome_linux_armv6.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_armv7\": \"$(BASE_URL)/AdGuardHome_linux_armv7.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_arm64\": \"$(BASE_URL)/AdGuardHome_linux_arm64.tar.gz\"," >> $(DIST_DIR)/version.json
+
+	# Linux, MIPS
+	echo "  \"download_linux_mips\": \"$(BASE_URL)/AdGuardHome_linux_mips_softfloat.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_mipsle\": \"$(BASE_URL)/AdGuardHome_linux_mipsle_softfloat.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_mips64\": \"$(BASE_URL)/AdGuardHome_linux_mips64_softfloat.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_linux_mips64le\": \"$(BASE_URL)/AdGuardHome_linux_mips64le_softfloat.tar.gz\"," >> $(DIST_DIR)/version.json
+
+	# FreeBSD
+	echo "  \"download_freebsd_386\": \"$(BASE_URL)/AdGuardHome_freebsd_386.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_freebsd_amd64\": \"$(BASE_URL)/AdGuardHome_freebsd_amd64.tar.gz\"," >> $(DIST_DIR)/version.json
+
+	# FreeBSD, all kinds of ARM
+	echo "  \"download_freebsd_arm\": \"$(BASE_URL)/AdGuardHome_freebsd_armv6.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_freebsd_armv5\": \"$(BASE_URL)/AdGuardHome_freebsd_armv5.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_freebsd_armv6\": \"$(BASE_URL)/AdGuardHome_freebsd_armv6.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_freebsd_armv7\": \"$(BASE_URL)/AdGuardHome_freebsd_armv7.tar.gz\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_freebsd_arm64\": \"$(BASE_URL)/AdGuardHome_freebsd_arm64.tar.gz\"" >> $(DIST_DIR)/version.json
+
+	# Finish
+	echo "}" >> $(DIST_DIR)/version.json
+endef
+
+define repack_dist
+	# Repack archive files
+	# A temporary solution for our auto-update code to be able to unpack these archive files
+	# The problem is that goreleaser doesn't add directory AdGuardHome/ to the archive file
+	#  and we can't create it
+	rm -rf $(DIST_DIR)/AdGuardHome
+
+	# Windows builds
+	$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
+	$(call zip_repack_windows,AdGuardHome_windows_386.zip)
+
+	# MacOS builds
+	$(call zip_repack,AdGuardHome_darwin_amd64.zip)
+	$(call zip_repack,AdGuardHome_darwin_386.zip)
+
+	# Linux
+	$(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_386.tar.gz)
+
+	# Linux, all kinds of ARM
+	$(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_arm64.tar.gz)
+
+	# Linux, MIPS
+	$(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
+	$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz)
+
+	# FreeBSD
+	$(call tar_repack,AdGuardHome_freebsd_386.tar.gz)
+	$(call tar_repack,AdGuardHome_freebsd_amd64.tar.gz)
+
+	# FreeBSD, all kinds of ARM
+	$(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
+	$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
+	$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
+	$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
+endef
+
+define zip_repack_windows
+	$(eval ARC := $(1))
+	cd $(DIST_DIR) && \
+		unzip $(ARC) && \
+		$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
+		zip -r $(ARC) AdGuardHome/ && \
+		rm -rf AdGuardHome
+endef
+
+define zip_repack
+	$(eval ARC := $(1))
+	cd $(DIST_DIR) && \
+		unzip $(ARC) && \
+		$(GPG_CMD) AdGuardHome/AdGuardHome && \
+		zip -r $(ARC) AdGuardHome/ && \
+		rm -rf AdGuardHome
+endef
+
+define tar_repack
+	$(eval ARC := $(1))
+	cd $(DIST_DIR) && \
+		tar xzf $(ARC) && \
+		$(GPG_CMD) AdGuardHome/AdGuardHome && \
+		tar czf $(ARC) AdGuardHome/ && \
+		rm -rf AdGuardHome
+endef
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@

 AdGuard Home is a network-wide software for blocking ads & tracking. After you set it up, it'll cover ALL your home devices, and you don't need any client-side software for that.

-It operates as a DNS server that re-routes tracking domains to a "black hole", thus preventing your devices from connecting to those servers. It's based on software we use for our public [AdGuard DNS](https://adguard.com/en/adguard-dns/overview.html) servers -- both share a lot of common code.
+It operates as a DNS server that re-routes tracking domains to a "black hole," thus preventing your devices from connecting to those servers. It's based on software we use for our public [AdGuard DNS](https://adguard.com/en/adguard-dns/overview.html) servers -- both share a lot of common code.

 * [Getting Started](#getting-started)
 * [Comparing AdGuard Home to other solutions](#comparison)
@@ -58,7 +58,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
    * [Reporting issues](#reporting-issues)
    * [Help with translations](#translate)
    * [Other](#help-other)
-* [Projects that use AdGuard Home](#uses)
+* [Projects that use AdGuardHome](#uses)
 * [Acknowledgments](#acknowledgments)
 * [Privacy](#privacy)

@@ -87,21 +87,12 @@ If you're running **Linux**, there's a secure and easy way to install AdGuard Ho

 ### Guides

-* [Getting Started](https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started)
-    * [FAQ](https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ)
-    * [How to Write Hosts Blocklists](https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists)
-    * [Comparing AdGuard Home to Other Solutions](https://github.com/AdguardTeam/AdGuardHome/wiki/Comparison)
-* Configuring AdGuard
-    * [Configuration](https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration)
-    * [Configuring AdGuard Home Clients](https://github.com/AdguardTeam/AdGuardHome/wiki/Clients)
-    * [AdGuard Home as a DoH, DoT, or DoQ Server](https://github.com/AdguardTeam/AdGuardHome/wiki/Encryption)
-    * [AdGuard Home as a DNSCrypt Server](https://github.com/AdguardTeam/AdGuardHome/wiki/DNSCrypt)
-    * [AdGuard Home as a DHCP Server](https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP)
-* Installing AdGuard Home
-    * [Docker](https://github.com/AdguardTeam/AdGuardHome/wiki/Docker)
-    * [How to Install and Run AdGuard Home on a Raspberry Pi](https://github.com/AdguardTeam/AdGuardHome/wiki/Raspberry-Pi)
-    * [How to Install and Run AdGuard Home on a Virtual Private Server](https://github.com/AdguardTeam/AdGuardHome/wiki/VPS)
-* [Verifying Releases](https://github.com/AdguardTeam/AdGuardHome/wiki/Verify-Releases)
+* [FAQ](https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ)
+* [Configuration](https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration)
+* [AdGuard Home as a DNS-over-HTTPS or DNS-over-TLS server](https://github.com/AdguardTeam/AdGuardHome/wiki/Encryption)
+* [How to install and run AdGuard Home on Raspberry Pi](https://github.com/AdguardTeam/AdGuardHome/wiki/Raspberry-Pi)
+* [How to install and run AdGuard Home on a Virtual Private Server](https://github.com/AdguardTeam/AdGuardHome/wiki/VPS)
+* [How to write your own hosts blocklists properly](https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists)

 ### API

@@ -132,21 +123,20 @@ AdGuard Home provides a lot of features out-of-the-box with no need to install a

 > Disclaimer: some of the listed features can be added to Pi-Hole by installing additional software or by manually using SSH terminal and reconfiguring one of the utilities Pi-Hole consists of. However, in our opinion, this cannot be legitimately counted as a Pi-Hole's feature.

-| Feature                                                                 | AdGuard&nbsp;Home | Pi-Hole                                                   |
-|-------------------------------------------------------------------------|-------------------|-----------------------------------------------------------|
-| Blocking ads and trackers                                               | ✅                | ✅                                                        |
-| Customizing blocklists                                                  | ✅                | ✅                                                        |
-| Built-in DHCP server                                                    | ✅                | ✅                                                        |
-| HTTPS for the Admin interface                                           | ✅                | Kind of, but you'll need to manually configure lighthttpd |
-| Encrypted DNS upstream servers (DNS-over-HTTPS, DNS-over-TLS, DNSCrypt) | ✅                | ❌ (requires additional software)                         |
-| Cross-platform                                                          | ✅                | ❌ (not natively, only via Docker)                        |
-| Running as a DNS-over-HTTPS or DNS-over-TLS server                      | ✅                | ❌ (requires additional software)                         |
-| Blocking phishing and malware domains                                   | ✅                | ❌ (requires non-default blocklists)                      |
-| Parental control (blocking adult domains)                               | ✅                | ❌                                                        |
-| Force Safe search on search engines                                     | ✅                | ❌                                                        |
-| Per-client (device) configuration                                       | ✅                | ✅                                                        |
-| Access settings (choose who can use AGH DNS)                            | ✅                | ❌                                                        |
-| Running [without root privileges](https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser)                                         | ✅                | ❌                                                        |
+| Feature                                                                 | AdGuard&nbsp;Home | Pi-Hole                                                |
+|-------------------------------------------------------------------------|--------------|--------------------------------------------------------|
+| Blocking ads and trackers                                               | ✅            | ✅                                                      |
+| Customizing blocklists                                                  | ✅            | ✅                                                      |
+| Built-in DHCP server                                                    | ✅            | ✅                                                      |
+| HTTPS for the Admin interface                                           | ✅            | Kind of, but you'll need to manually configure lighthttpd |
+| Encrypted DNS upstream servers (DNS-over-HTTPS, DNS-over-TLS, DNSCrypt) | ✅            | ❌ (requires additional software)                       |
+| Cross-platform                                                          | ✅            | ❌ (not natively, only via Docker)                      |
+| Running as a DNS-over-HTTPS or DNS-over-TLS server                      | ✅            | ❌ (requires additional software)                       |
+| Blocking phishing and malware domains                                   | ✅            | ❌ (requires non-default blocklists)                    |
+| Parental control (blocking adult domains)                               | ✅            | ❌                                                      |
+| Force Safe search on search engines                                     | ✅            | ❌                                                      |
+| Per-client (device) configuration                                       | ✅            | ✅                                                      |
+| Access settings (choose who can use AGH DNS)                            | ✅            | ❌                                                      |

 <a id="comparison-adblock"></a>
 ### How does AdGuard Home compare to traditional ad blockers
@@ -179,8 +169,7 @@ You will need this to build AdGuard Home:

 * [go](https://golang.org/dl/) v1.14 or later.
 * [node.js](https://nodejs.org/en/download/) v10.16.2 or later.
- * [npm](https://www.npmjs.com/) v6.14 or later (temporary requirement, TODO: remove when redesign is finished).
- * [yarn](https://yarnpkg.com/) v1.22.5 or later.
+ * [npm](https://www.npmjs.com/) v6.14 or later.

 ### Building

@@ -199,28 +188,26 @@ In order to do this, specify `GOOS` and `GOARCH` env variables before running ma

 For example:
 ```
-env GOOS='linux' GOARCH='arm64' make
-```
-Or:
-```
-make GOOS='linux' GOARCH='arm64'
+GOOS=linux GOARCH=arm64 make
 ```

 #### Preparing release

 You'll need this to prepare a release build:

+* [goreleaser](https://goreleaser.com/)
 * [snapcraft](https://snapcraft.io/)

 Commands:

-```
-make build-release CHANNEL='...' VERSION='...'
-```
+* `make release` - builds a snapshot build (CHANNEL=edge)
+* `CHANNEL=beta make release` - builds beta version, tag is mandatory.
+* `CHANNEL=release make release` - builds release version, tag is mandatory.

 #### Docker image

-* Run `make build-docker` to build the Docker image locally (the one that we publish to DockerHub).
+* Run `make docker` to build the Docker image locally.
+* Run `make docker-multi-arch` to build the multi-arch Docker image (the one that we publish to Docker Hub).

 Please note, that we're using [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) to build our official image.

@@ -268,7 +255,7 @@ curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scrip

 * Beta channel builds
    * Linux: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_386.tar.gz)
-    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi), [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz)
+    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz) (recommended for Rapsberry Pi), [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz)
    * Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64le_softfloat.tar.gz)
    * Windows: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_386.zip)
    * MacOS: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_386.zip)
@@ -277,7 +264,7 @@ curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scrip

 * Edge channel builds
    * Linux: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_386.tar.gz)
-    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi), [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv7.tar.gz)
+    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv6.tar.gz) (recommended for Rapsberry Pi), [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv7.tar.gz)
    * Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64le_softfloat.tar.gz)
    * Windows: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_386.zip)
    * MacOS: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_386.zip)
@@ -303,20 +290,17 @@ Here is a link to AdGuard Home project: https://crowdin.com/project/adguard-appl
 Here's what you can also do to contribute:

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

 <a id="uses"></a>
-## Projects that use AdGuard Home
+## Projects that use AdGuardHome
+
+* Python library (https://github.com/frenck/python-adguardhome)
+* Hass.io add-on (https://github.com/hassio-addons/addon-adguard-home)
+* OpenWrt LUCI app (https://github.com/rufengsuixing/luci-app-adguardhome)

-* [AdGuard Home Remote](https://apps.apple.com/app/apple-store/id1543143740) - iOS app by [Joost](https://rocketscience-it.nl/)
-* [Python library](https://github.com/frenck/python-adguardhome) by [@frenck](https://github.com/frenck)
-* [Home Assistant add-on](https://github.com/hassio-addons/addon-adguard-home) by [@frenck](https://github.com/frenck)
-* [OpenWrt LUCI app](https://github.com/kongfl888/luci-app-adguardhome) by [@kongfl888](https://github.com/kongfl888) (originally by [@rufengsuixing](https://github.com/rufengsuixing))
-* [Prometheus exporter for AdGuard Home](https://github.com/ebrianne/adguard-exporter) by [@ebrianne](https://github.com/ebrianne)
-* [AdGuard Home on GLInet routers](https://forum.gl-inet.com/t/adguardhome-on-gl-routers/10664) by [Gl-Inet](https://gl-inet.com/)
-* [Cloudron app](https://git.cloudron.io/cloudron/adguard-home-app) by [@gramakri](https://github.com/gramakri)

 <a id="acknowledgments"></a>
 ## Acknowledgments
@@ -337,7 +321,7 @@ This software wouldn't have been possible without:
   * And many more node.js packages.
 * [whotracks.me data](https://github.com/cliqz-oss/whotracks.me)

-You might have seen that [CoreDNS](https://coredns.io) was mentioned here before — we've stopped using it in AdGuard Home. While we still use it on our servers for [AdGuard DNS](https://adguard.com/adguard-dns/overview.html) service, it seemed like an overkill for Home as it impeded with Home features that we plan to implement.
+You might have seen that [CoreDNS](https://coredns.io) was mentioned here before — we've stopped using it in AdGuardHome. While we still use it on our servers for [AdGuard DNS](https://adguard.com/adguard-dns/overview.html) service, it seemed like an overkill for Home as it impeded with Home features that we plan to implement.

 For a full list of all node.js packages in use, please take a look at [client/package.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/package.json) file.

--- a/client/public/index.html
+++ b/client/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
    <head>
        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
        <meta name="theme-color" content="#000000">
        <meta name="google" content="notranslate">
        <meta http-equiv="x-dns-prefetch-control" content="off">
--- a/client/public/install.html
+++ b/client/public/install.html
@@ -2,7 +2,7 @@
 <html lang="en">
    <head>
        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
        <meta name="theme-color" content="#000000">
        <meta name="google" content="notranslate">
        <meta name="mobile-web-app-capable" content="yes" />
--- a/client/public/login.html
+++ b/client/public/login.html
@@ -2,7 +2,7 @@
 <html lang="en">
    <head>
        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
        <meta name="theme-color" content="#000000">
        <meta name="google" content="notranslate">
        <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -249,8 +249,6 @@
    "blocking_ipv6": "Блакаванне IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": "Спампаваць .mobileconfig для DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Спампаваць .mobileconfig для DNS-over-TLS",
    "plain_dns": "Нешыфраваны DNS",
    "form_enter_rate_limit": "Увядзіце rate limit",
    "rate_limit": "Ограничение скорости",
@@ -418,7 +416,6 @@
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Ужывайце радок <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Ужывайце радок <1>{{address}}</1>.",
    "setup_dns_privacy_3": "<0>Вось спіс ПА, якое вы можаце выкарыстоўваць.</0>",
-    "setup_dns_privacy_4": "На прыладах з iOS 14 і macOS Big Sur вы можаце спампаваць адмысловы файл '.mobileconfig', які дадае <highlight>DNS-over-HTTPS</highlight> ці <highlight>DNS-over-TLS</highlight> серверы ў налады DNS.",
    "setup_dns_privacy_android_1": "Android 9 натыўна падтрымвае DNS-over-TLS. Для налады, перайдзіце ў Налады → Сеціва і Інтэрнэт → Дадаткова → Персанальны DNS сервер, і ўвядзіце туды ваша даменавае імя.",
    "setup_dns_privacy_android_2": "<0>AdGuard для Android</0> падтрымвае <1>DNS-over-HTTPS</1> і <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> дадае падтрымка <1>DNS-over-HTTPS</1> на Android.",
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -91,16 +91,16 @@
    "disabled_protection": "Schutz deaktiviert",
    "refresh_statics": "Statistiken aktualisieren",
    "dns_query": "DNS-Anfragen",
-    "blocked_by": "<0>Durch Filter gesperrt</0>",
-    "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Webseiten",
-    "stats_adult": "Gesperrte jugendgefährdende Webseiten",
+    "blocked_by": "<0>Blockiert durch die Filter</0>",
+    "stats_malware_phishing": "Blockierte Malware/Phishing",
+    "stats_adult": "Blockierte Webseiten für Erwachsene",
    "stats_query_domain": "Am häufigsten angefragte Domains",
    "for_last_24_hours": "für die letzten 24 Stunden",
    "for_last_days": "am letzten {{count}} Tag",
    "for_last_days_plural": "in den letzten {{count}} Tage",
    "no_domains_found": "Keine Domains gefunden",
    "requests_count": "Anzahl der Anfragen",
-    "top_blocked_domains": "Am häufigsten gesperrte Domains",
+    "top_blocked_domains": "Am häufigsten blockierte Domains",
    "top_clients": "Top Clients",
    "no_clients_found": "Keine Clients gefunden",
    "general_statistics": "Allgemeine Statistiken",
@@ -109,7 +109,7 @@
    "number_of_dns_query_24_hours": "Anzahl der in den letzten 24 Stunden durchgeführten DNS-Anfragen",
    "number_of_dns_query_blocked_24_hours": "Anzahl der durch Werbefilter und Host-Blocklisten geblockten DNS-Anfragen",
    "number_of_dns_query_blocked_24_hours_by_sec": "Anzahl der durch das AdGuard-Modul „Internetsicherheit” gesperrten DNS-Anfragen",
-    "number_of_dns_query_blocked_24_hours_adult": "Anzahl der gesperrten Webseiten mit jugendgefährdenden Inhalten",
+    "number_of_dns_query_blocked_24_hours_adult": "Anzahl der blockierten Webseiten für Erwachsene",
    "enforced_save_search": "SafeSearch erzwungen",
    "number_of_dns_query_to_safe_search": "Anzahl der DNS-Anfragen bei denen SafeSearch für Suchanfragen erzwungen wurde",
    "average_processing_time": "Durchschnittliche Bearbeitungsdauer",
@@ -498,7 +498,7 @@
    "descr": "Beschreibung",
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Erfahren Sie mehr</0> über die Erstellung eigener Hosts-Listen.",
-    "blocked_by_response": "Gesperrt nach Antwort von CNAME oder IP",
+    "blocked_by_response": "Nach CNAME oder IP-Antwort blockiert",
    "blocked_by_cname_or_ip": "Gesperrt durch CNAME oder IP",
    "try_again": "Erneut versuchen",
    "domain_desc": "Geben Sie den Domain-Namen oder den Platzhalter ein, der umgeschrieben werden soll.",
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -32,6 +32,7 @@
    "form_error_ip_format": "Invalid IP format",
    "form_error_mac_format": "Invalid MAC format",
    "form_error_client_id_format": "Invalid client ID format",
+    "form_error_server_name": "Invalid server name or wildcard certificate",
    "form_error_positive": "Must be greater than 0",
    "form_error_negative": "Must be equal to 0 or greater",
    "range_end_error": "Must be greater than range start",
@@ -249,6 +250,7 @@
    "blocking_ipv6": "Blocking IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
    "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
    "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
    "plain_dns": "Plain DNS",
@@ -330,7 +332,7 @@
    "encryption_config_saved": "Encryption config saved",
    "encryption_server": "Server name",
    "encryption_server_enter": "Enter your domain name",
-    "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
+    "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
    "encryption_redirect": "Redirect to HTTPS automatically",
    "encryption_redirect_desc": "If checked, AdGuard Home will automatically redirect you from HTTP to HTTPS addresses.",
    "encryption_https": "HTTPS port",
@@ -386,7 +388,7 @@
    "client_edit": "Edit Client",
    "client_identifier": "Identifier",
    "ip_address": "IP address",
-    "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
+    "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or domain. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
    "form_enter_ip": "Enter IP",
    "form_enter_mac": "Enter MAC",
    "form_enter_id": "Enter identifier",
@@ -587,4 +589,4 @@
    "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.",
    "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
    "experimental": "Experimental"
-}
+}
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -50,7 +50,7 @@
    "dhcp_table_expires": "Expira",
    "dhcp_warning": "Si de todos modos deseas habilitar el servidor DHCP, asegúrate de que no hay otro servidor DHCP activo en tu red. ¡De lo contrario, puedes dejar sin Internet a los dispositivos conectados!",
    "dhcp_error": "No pudimos determinar si hay otro servidor DHCP en la red.",
-    "dhcp_static_ip_error": "Para poder utilizar el servidor DHCP se debe establecer una dirección IP estática. No hemos podido determinar si esta interfaz de red está configurada utilizando una dirección IP estática. Por favor establece una dirección IP estática manualmente.",
+    "dhcp_static_ip_error": "Para poder utilizar el servidor DHCP se debe establecer una dirección IP estática. No hemos podido determinar si esta interfaz de red está configurada utilizando una dirección IP estática. Por favor establezca una dirección IP estática manualmente.",
    "dhcp_dynamic_ip_found": "Tu sistema utiliza la configuración de dirección IP dinámica para la interfaz <0>{{interfaceName}}</0>. Para poder utilizar el servidor DHCP se debe establecer una dirección IP estática. Tu dirección IP actual es <0>{{ipAddress}}</0>. Si presionas el botón Habilitar servidor DHCP, estableceremos automáticamente esta dirección IP como estática.",
    "dhcp_lease_added": "Asignación estática \"{{key}}\" añadido correctamente",
    "dhcp_lease_deleted": "Asignación estática \"{{key}}\" eliminado correctamente",
@@ -294,7 +294,7 @@
    "install_devices_title": "Configura tus dispositivos",
    "install_devices_desc": "Para comenzar a utilizar AdGuard Home, debes configurar tus dispositivos para usarlo.",
    "install_submit_title": "¡Felicitaciones!",
-    "install_submit_desc": "El proceso de configuración ha finalizado y estás listo para comenzar a usar AdGuard Home.",
+    "install_submit_desc": "El proceso de configuración ha finalizado y está listo para comenzar a usar AdGuard Home.",
    "install_devices_router": "Router",
    "install_devices_router_desc": "Esta configuración cubrirá automáticamente todos los dispositivos conectados a tu router doméstico y no necesitarás configurar cada uno de ellos manualmente.",
    "install_devices_address": "El servidor DNS de AdGuard Home está escuchando en las siguientes direcciones",
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -22,7 +22,7 @@
    "dhcp_found": "Il y a plusieurs serveurs DHCP actifs sur le réseau. Ce n'est pas prudent d'activer le serveur DHCP intégré en ce moment.",
    "dhcp_leases": "Locations des serveurs DHCP",
    "dhcp_static_leases": "Baux statiques DHCP",
-    "dhcp_leases_not_found": "Aucun bail DHCP trouvé",
+    "dhcp_leases_not_found": "Aucune location des serveurs DHCP trouvée",
    "dhcp_config_saved": "La configuration du serveur DHCP est sauvegardée",
    "dhcp_ipv4_settings": "Paramètres IPv4 du DHCP",
    "dhcp_ipv6_settings": "Paramètres IPv6 du DHCP",
@@ -92,7 +92,7 @@
    "refresh_statics": "Renouveler les statistiques",
    "dns_query": "Requêtes DNS",
    "blocked_by": "<0>Bloqué par Filtres</0>",
-    "stats_malware_phishing": "Tentative de malware/hameçonnage bloquée",
+    "stats_malware_phishing": "Tentative de malware/hammeçonnage bloquée",
    "stats_adult": "Sites à contenu adulte bloqués",
    "stats_query_domain": "Domaines les plus recherchés",
    "for_last_24_hours": "pendant les dernières 24 heures",
@@ -178,13 +178,13 @@
    "custom_filter_rules": "Règles de filtrage d'utilisateur",
    "custom_filter_rules_hint": "Saisissez la règle en une ligne. C'est possible d'utiliser les règles de blocage ou la syntaxe des fichiers hosts.",
    "examples_title": "Exemples",
-    "example_meaning_filter_block": "bloque l’accès au domaine example.org et à tous ses sous-domaines",
-    "example_meaning_filter_whitelist": "débloque l’accès au domaine example.org et à tous ses sous-domaines",
+    "example_meaning_filter_block": "bloquer l'accés au domaine exemple.org et à tous ses sous-domaines",
+    "example_meaning_filter_whitelist": "débloquer l'accés au domaine exemple.org et à tous ses sous-domaines",
    "example_meaning_host_block": "AdGuard Home va retourner l'adresse 127.0.0.1 au domaine example.org (mais pas aux sous-domaines).",
    "example_comment": "! Voici comment ajouter une déscription",
    "example_comment_meaning": "commentaire",
    "example_comment_hash": "# Et comme ça aussi on peut laisser des commentaires",
-    "example_regex_meaning": "bloque l’accès aux domaines correspondants à l'expression régulière spécifiée",
+    "example_regex_meaning": "bloquer l'accés aux domaines correspondants à l'expression régulière spécifiée",
    "example_upstream_regular": "DNS classique (au-dessus de UDP)",
    "example_upstream_dot": "<0>DNS-over-TLS</0> chiffré",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0> chiffré",
@@ -430,7 +430,7 @@
    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> supporte le <1>DNS-over-HTTPS</1>.",
    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supporte le <1>DNS-over-HTTPS</1>.",
    "setup_dns_privacy_other_5": "Vous trouverez plus d'implémentations <0>ici</0> et <1>ici</1>.",
-    "setup_dns_notice": "Pour utiliser le <1>DNS-over-HTTPS</1> ou le <1>DNS-over-TLS</1>, vous devez <0>configurer le Chiffrement</0> dans les paramètres de AdGuard Home.",
+    "setup_dns_notice": "Pour utiliser le <1>DNS-over-HTTPS</1> ou le <1>DNS-over-TLS</1>, vous devez <0>configurer le Cryptage</0> dans les paramètres de AdGuard Home.",
    "rewrite_added": "Réécriture DNS pour \"{{key}}\" ajoutée",
    "rewrite_deleted": "Réécriture DNS pour \"{{key}}\" supprimée",
    "rewrite_add": "Ajouter une réécriture DNS",
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -88,7 +88,7 @@
    "enable_protection": "Védelem engedélyezése",
    "enabled_protection": "Védelem engedélyezve",
    "disable_protection": "Védelem letiltása",
-    "disabled_protection": "Védelem letiltva",
+    "disabled_protection": "Letiltott védelem",
    "refresh_statics": "Statisztikák frissítése",
    "dns_query": "DNS lekérdezés",
    "blocked_by": "<0>Szűrők által blokkolt</0>",
@@ -409,7 +409,7 @@
    "access_disallowed_title": "Nem engedélyezett kliensek",
    "access_disallowed_desc": "A CIDR vagy IP címek listája. Ha konfigurálva van, az AdGuard Home eldobja a lekérdezéseket ezekről az IP-címekről.",
    "access_blocked_title": "Nem engedélyezett domainek",
-    "access_blocked_desc": "Ne keverje össze ezt a szűrőkkel. Az AdGuard Home az összes DNS kérést el fogja dobni, ami ezekkel a domainekkel kapcsolatos. Itt megadhatja a pontos domainneveket, a helyettesítő karaktereket és az urlfilter-szabályokat, pl. 'example.org', '*.example.org' vagy '||example.org^'.",
+    "access_blocked_desc": "Ne keverje össze ezt a szűrőkkel. Az AdGuard Home az összes DNS kérést el fogja dobni, ami ezekkel a domainekkel kapcsolatos. Itt megadhatja a pontos domainneveket, a helyettesítő karaktereket és az urlfilter-szabályokat, pl. 'example.org', '*.example.org' or '||example.org^'.",
    "access_settings_saved": "A hozzáférési beállítások sikeresen mentésre kerültek",
    "updates_checked": "A frissítések sikeresen ellenőrizve lettek",
    "updates_version_equal": "Az AdGuard Home naprakész",
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -186,10 +186,10 @@
    "example_comment_hash": "# Un altro commento",
    "example_regex_meaning": "blocca l'accesso ai domini che corrispondono alla specifica espressione regolare",
    "example_upstream_regular": "DNS regolari (via UDP)",
-    "example_upstream_dot": "<0>DNS su TLS</0> crittografato",
-    "example_upstream_doh": "<0>DNS su HTTPS</0> crittografato",
-    "example_upstream_doq": "<0>DNS su QUIC</0> crittografato",
-    "example_upstream_sdns": "puoi utilizzare <0>DNS Stamps</0> per <1>DNSCrypt</1> oppure dei resolver con <2>DNS su HTTPS</2>",
+    "example_upstream_dot": "<0>DNS_over_TLS</0> crittografato",
+    "example_upstream_doh": "<0>DNS-over-HTTPS</0> crittografato",
+    "example_upstream_doq": "<0>DNS_over_QUIC</0> crittografato",
+    "example_upstream_sdns": "puoi utilizzare <0>DNS Stamps</0> per <1>DNSCrypt</1> oppure dei resolver con <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "DNS regolari (via TCP)",
    "all_lists_up_to_date_toast": "Tutte le liste sono aggiornate",
    "updated_upstream_dns_toast": "Server DNS upstream aggiornati",
@@ -247,10 +247,10 @@
    "custom_ip": "IP personalizzato",
    "blocking_ipv4": "Blocca IPv4",
    "blocking_ipv6": "Blocca IPv6",
-    "dns_over_https": "DNS su HTTPS",
-    "dns_over_tls": "DNS su TLS",
-    "download_mobileconfig_doh": "Scarica .mobileconfig per DNS su HTTPS",
-    "download_mobileconfig_dot": "Scarica .mobileconfig per DNS su TLS",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Scarica .mobileconfig per DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Scarica .mobileconfig per DNS-over-TLS",
    "plain_dns": "DNS semplice",
    "form_enter_rate_limit": "Imposta limite delle richieste",
    "rate_limit": "Limite delle richieste",
@@ -334,10 +334,10 @@
    "encryption_redirect": "Reindirizza automaticamente a HTTPS",
    "encryption_redirect_desc": "Se selezionato, AdGuard Home ti reindirizzerà automaticamente da indirizzi HTTP a HTTPS.",
    "encryption_https": "Porta HTTPS",
-    "encryption_https_desc": "Se la porta HTTPS è configurata, l'interfaccia di amministrazione di AdGuard Home sarà accessibile tramite HTTPS e fornirà anche DNS su HTTPS nella posizione \"/ dns-query\".",
-    "encryption_dot": "DNS su porta TLS",
-    "encryption_dot_desc": "Se questa porta è configurata, AdGuard Home eseguirà un server DNS su TLS su questa porta.",
-    "encryption_doq": "DNS su porta QUIC",
+    "encryption_https_desc": "Se la porta HTTPS è configurata, l'interfaccia di amministrazione di AdGuard Home sarà accessibile tramite HTTPS e fornirà anche DNS-over-HTTPS nella posizione \"/ dns-query\".",
+    "encryption_dot": "DNS-su porta-TLS",
+    "encryption_dot_desc": "Se questa porta è configurata, AdGuard Home eseguirà un server DNS-over-TLS su questa porta.",
+    "encryption_doq": "DNS-su porta-QUIC",
    "encryption_doq_desc": "Se questa porta è configurata, AdGuard Home eseguirà un server DNS su porta QUIC. Questa opzione è sperimentale e potrebbe non risultare affidabile. Inoltre, al momento non sono molti i client a supportarla.",
    "encryption_certificates": "Certificati",
    "encryption_certificates_desc": "Per utilizzare la crittografia, è necessario fornire una catena di certificati SSL valida per il proprio dominio. Puoi ottenere un certificato gratuito su <0> {{link}} </ 0> o puoi acquistarlo da una delle Autorità di certificazione attendibili.",
@@ -346,8 +346,8 @@
    "encryption_expire": "Scaduto",
    "encryption_key": "Chiave privata",
    "encryption_key_input": "Copia/Incolla qui la tua chiave privata codificata PEM per il tuo certificato.",
-    "encryption_enable": "Attiva crittografia (HTTPS, DNS su HTTPS e DNS su TLS)",
-    "encryption_enable_desc": "Se la crittografia è attiva, l'interfaccia di amministrazione di AdGuard Home funzionerà su HTTPS e il server DNS ascolterà le richieste su DNS su HTTPS e DNS su TLS.",
+    "encryption_enable": "Attiva crittografia (HTTPS, DNS-su-HTTPS e DNS-su-TLS)",
+    "encryption_enable_desc": "Se la crittografia è attiva, l'interfaccia di amministrazione di AdGuard Home funzionerà su HTTPS e il server DNS ascolterà le richieste su DNS-over-HTTPS e DNS-over-TLS.",
    "encryption_chain_valid": "La catena di certificati è valida",
    "encryption_chain_invalid": "La catena di certificati non è valida",
    "encryption_key_valid": "Questa è una chiave privata {{type}} valida",
@@ -415,22 +415,22 @@
    "updates_version_equal": "AdGuard Home è aggiornato",
    "check_updates_now": "Controlla aggiornamenti adesso",
    "dns_privacy": "Privacy DNS",
-    "setup_dns_privacy_1": "<0>DNS su TLS:</0> Utilizza la stringa <1>{{address}}</1>.",
-    "setup_dns_privacy_2": "<0>DNS su HTTPS:</0> Utilizza la stringa <1>{{address}}</1>.",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Utilizza la stringa <1>{{address}}</1>.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Utilizza la stringa <1>{{address}}</1>.",
    "setup_dns_privacy_3": "<0>Ecco un elenco di software che è possibile utilizzare.</0>",
-    "setup_dns_privacy_4": "Si usa un dispositivo iOS 14 o macOS Big Sur puoi scaricare uno file speciale.mobileconfig' che aggiunge i server <highlight>DNS su HTTPS</highlight> or <highlight>DNS su TLS</highlight> alle configurazioni DNS.",
-    "setup_dns_privacy_android_1": "Android 9 supporta DNS su TLS in modo nativo. Per configurarlo, vai su Impostazioni → Rete e Internet → Avanzate → DNS privato e inserisci qui il tuo nome di dominio.",
-    "setup_dns_privacy_android_2": "<0>AdGuard per Android</0> supporta <1>DNS su HTTPS</1> e <1>DNS su TLS</1>.",
-    "setup_dns_privacy_android_3": "<0>Intra</0> aggiunge <1>DNS su HTTPS</1> il supporto ad Android.",
-    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> supporta <1>DNS su HTTPS</1>, ma per configurarlo per l'utilizzo del proprio server, è necessario generare un <2> DNS Stamp</2> apposito.",
-    "setup_dns_privacy_ios_2": "<0>AdGuard per iOS</0>supporta l'impostazione <1>DNS su HTTPS</1> e <1>DNS su TLS</1>.",
+    "setup_dns_privacy_4": "Si usa un dispositivo iOS 14 o macOS Big Sur puoi scaricare uno file speciale.mobileconfig' che aggiunge i server <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> alle configurazioni DNS.",
+    "setup_dns_privacy_android_1": "Android 9 supporta DNS-over-TLS in modo nativo. Per configurarlo, vai su Impostazioni → Rete e Internet → Avanzate → DNS privato e inserisci qui il tuo nome di dominio.",
+    "setup_dns_privacy_android_2": "<0>AdGuard per Android</0> supporta <1>DNS-over-HTTPS</1> e <1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_android_3": "<0>Intra</0> aggiunge <1>DNS-over-HTTPS</1> il supporto ad Android.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> supporta <1>DNS-over-HTTPS</1>, ma per configurarlo per l'utilizzo del proprio server, è necessario generare un <2> DNS Stamp</2> apposito.",
+    "setup_dns_privacy_ios_2": "<0>AdGuard per iOS</0>supporta l'impostazione <1>DNS-over-HTTPS</1> e <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_other_title": "Altre implementazion",
    "setup_dns_privacy_other_1": "AdGuard Home può essere un client DNS sicuro su qualsiasi piattaforma.",
    "setup_dns_privacy_other_2": "<0>dnsproxy</0> supporta tutti i protocolli DNS sicuri noti.",
-    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> supporta <1>DNS su HTTPS</1>.",
-    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supporta <1>DNS su HTTPS</1>.",
+    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> supporta <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supporta <1>DNS-over-HTTPS</1>.",
    "setup_dns_privacy_other_5": "Troverai più implementazioni <0>qui</0> e <1>qui</1>.",
-    "setup_dns_notice": "Per utilizzare <1>DNS su HTTPS</1> o <1>DNS su TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
+    "setup_dns_notice": "Per utilizzare <1>DNS-over-HTTPS</1> o <1>DNS-over-TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
    "rewrite_added": "Riscrittura DNS per \"{{key}}\" aggiunta correttamente",
    "rewrite_deleted": "La riscrittura DNS per \"{{key}}\" è stata eliminata correttamente",
    "rewrite_add": "Aggiungi la riscrittura DNS",
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -1,7 +1,6 @@
 {
    "client_settings": "クライアント設定",
    "example_upstream_reserved": "<0>特定のドメイン</0>に対してDNSアップストリームを指定できます",
-    "example_upstream_comment": "コメントを指定できます",
    "upstream_parallel": "並列リクエストを使用する（すべてのアップストリームサーバーを同時に照会することで解決スピードが向上します）",
    "parallel_requests": "並列リクエスト",
    "load_balancing": "ロードバランシング",
@@ -249,8 +248,6 @@
    "blocking_ipv6": "ブロック中のIPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": "DNS-over-HTTPS用の .mobileconfig をダウンロード",
-    "download_mobileconfig_dot": "DNS-over-TLS用の .mobileconfig をダウンロード",
    "plain_dns": "通常のDNS",
    "form_enter_rate_limit": "頻度制限を入力してください",
    "rate_limit": "頻度制限",
@@ -417,7 +414,6 @@
    "dns_privacy": "DNSプライバシー",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1>という文字列を使用してください。",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1>という文字列を使用してください。",
-    "setup_dns_privacy_3": "<0>使用できるソフトウェアのリストは次の通りです。</0>",
    "setup_dns_privacy_4": "iOS 14 または macOS Big Sur デバイスにて、<highlight>DNS-over-HTTPS</highlight>または<highlight>DNS-over-TLS</highlight>サーバをDNS設定へ追加する特別な「.mobileconfig」ファイルをダウンロードできます。",
    "setup_dns_privacy_android_1": "Android 9はDNS-over-TLSをネイティブにサポートします。設定するには、設定 → ネットワークとインターネット → 詳細設定 → プライベートDNS へ遷移し、そこにドメイン名を入力してください。",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0>は、<1>DNS-over-HTTPS</1>と<1>DNS-over-TLS</1>をサポートしています。",
@@ -531,7 +527,6 @@
    "check_reason": "理由: {{reason}}",
    "check_rule": "ルール: {{rule}}",
    "check_service": "サービス名: {{service}}",
-    "service_name": "サービス名",
    "check_not_found": "フィルタ一覧には見つかりません",
    "client_confirm_block": "クライアント\"{{ip}}\"をブロックしてもよろしいですか？",
    "client_confirm_unblock": "クライアント\"{{ip}}\"のブロックを解除してもよろしいですか？",
@@ -566,11 +561,6 @@
    "cache_size_desc": "DNSキャッシュサイズ（バイト単位）",
    "cache_ttl_min_override": "最小TTLの上書き（秒単位）",
    "cache_ttl_max_override": "最大TTLの上書き（秒単位）",
-    "enter_cache_size": "キャッシュサイズ（バイト単位）を入力してください",
-    "enter_cache_ttl_min_override": "最小TTL（秒単位）を入力してください",
-    "enter_cache_ttl_max_override": "最大TTL（秒単位）を入力してください",
-    "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、上流サーバから受信した短いTTL（秒単位）を延長します",
-    "cache_ttl_max_override_desc": "DNSキャッシュ内のエントリの最大TTL（秒単位）を設定します",
    "ttl_cache_validation": "最小キャッシュTTL値は最大値以下にする必要があります",
    "filter_category_general": "一般",
    "filter_category_security": "セキュリティ",
@@ -580,11 +570,9 @@
    "filter_category_security_desc": "マルウェア、フィッシング、詐欺ドメインのブロック専用リストです。",
    "filter_category_regional_desc": "それぞれの地域の広告と追跡サーバをターゲットするリストです。",
    "filter_category_other_desc": "その他のブロックリストです。",
-    "setup_config_to_enable_dhcp_server": "DHCPサーバを有効にするには構成を設定してください",
    "original_response": "当初の応答",
    "click_to_view_queries": "クエリを表示するにはクリックしてください",
    "port_53_faq_link": "多くの場合、ポート53は \"DNSStubListener\" または \"systemd-resolved\" サービスによって利用されています。これを解決する方法については、<0>この手順</0>をお読みください。",
    "adg_will_drop_dns_queries": "AdGuard Homeは、このクライアントからすべてのDNSクエリを落とします。",
-    "client_not_in_allowed_clients": "「許可されたクライアント」リストにないため、このクライアントは許可されていません。",
    "experimental": "実験用"
 }
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -301,7 +301,7 @@
    "install_devices_router_list_1": "라우터의 환경 설정을 여세요. 환경 설정은 다음의 주소(http://192.168.0.1/ 혹은 http://192.168.1.1/)를 통해 브라우저로 접근 가능합니다. 비밀번호를 입력해야할 수 있습니다. 비밀번호를 잊었다면 대개 라우터 기기에 있는 버튼을 눌러 비밀번호를 초기화할 수 있습니다. 어떤 라우터들은 당신의 컴퓨터/핸드폰에 설치할 수 있는 특정 어플리케이션을 필요로합니다.",
    "install_devices_router_list_2": "각각 1~3자리 숫자의 네 그룹으로 분할된 두 세트의 숫자를 허용하는 필드 옆에 있는 DNS 문자를 찾으세요.",
    "install_devices_router_list_3": "AdGuard Home 서버 주소를 입력하세요",
-    "install_devices_router_list_4": "일부 라우터 유형에서는 사용자 정의 DNS 서버를 설정할 수 없습니다. 이 경우에는 AdGuard Home을 <0>DHCP 서버</0>로 설정할 수 있습니다. 그렇지 않으면 특정 라우터 모델에 맞게 DNS 서버를 설정하는 방법을 찾아야 합니다.",
+    "install_devices_router_list_4": "일부 라우터는 DNS서버의 커스텀 설정이 불가합니다. 간혹 AdGuard Home을 DHCP서버로 이용하여 문제를 해결하는 경우가 있지만 문제가 지속될 경우 사용하시는 라우터 모델의 매뉴얼을 참고하시어 <0>DNS</0>서버 커스텀 설정 방법을 직접 살펴보셔야 합니다.",
    "install_devices_windows_list_1": "시작 메뉴 또는 윈도우 검색을 통해 제어판을 여세요",
    "install_devices_windows_list_2": "네트워크 및 인터넷 카테고리로 이동한 다음 네트워크 및 공유 센터로 이동하세요.",
    "install_devices_windows_list_3": "화면 왼쪽에서 어댑터 설정 변경을 찾아 클릭하세요.",
@@ -370,7 +370,7 @@
    "dns_status_error": "DNS 서버 상태를 가져오는 도중 오류가 발생했습니다",
    "down": "다운로드",
    "fix": "수정",
-    "dns_providers": "다음은 선택할 수 있는 <0>알려진 DNS 공급자 목록</0>입니다.",
+    "dns_providers": "여기에 선택가능한 DNS 목록 </0>이 있습니다.",
    "update_now": "지금 업데이트",
    "update_failed": "자동 업데이트 실패 되었습니다. <a> 단계를 따라 수동으로 업데이트하세요</a>",
    "processing_update": "잠시만 기다려주세요, AdGuard Home가 업데이트 중입니다.",
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -6,7 +6,7 @@
    "parallel_requests": "Parallelle verzoeken",
    "load_balancing": "Volume balanceren",
    "load_balancing_desc": "Eén server per keer bevragen. AdGuard Home gebruikt hiervoor een gewogen willekeurig algoritme om de server te kiezen zodat de snelste server meer zal gebruikt worden.",
-    "bootstrap_dns": "Bootstrap DNS-servers",
+    "bootstrap_dns": "Bootstrap DNS servers",
    "bootstrap_dns_desc": "Bootstrap DNS-servers worden gebruikt om IP-adressen op te lossen van de DoH / DoT-resolvers die u opgeeft als upstreams.",
    "check_dhcp_servers": "Zoek achter DHCP servers",
    "save_config": "Configuratie opslaan",
@@ -23,7 +23,7 @@
    "dhcp_leases": "DHCP lease overzicht",
    "dhcp_static_leases": "DHCP statische lease",
    "dhcp_leases_not_found": "Geen DHCP lease gevonden",
-    "dhcp_config_saved": "DHCP configuratie succesvol opgeslagen",
+    "dhcp_config_saved": "DHCP server configuratie opgeslagen",
    "dhcp_ipv4_settings": "DHCP IPv4 instellingen",
    "dhcp_ipv6_settings": "DHCP IPv6 instellingen",
    "form_error_required": "Vereist veld",
@@ -132,8 +132,8 @@
    "custom_filtering_rules": "Aangepaste filter regels",
    "encryption_settings": "Encryptie Instellingen",
    "dhcp_settings": "DHCP Instellingen",
-    "upstream_dns": "Upstream DNS-servers",
-    "upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS-servers.",
+    "upstream_dns": "Upstream DNS servers",
+    "upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
    "upstream_dns_configured_in_file": "Geconfigureerd in {{path}}",
    "test_upstream_btn": "Test upstream",
    "upstreams": "Upstreams",
@@ -186,15 +186,15 @@
    "example_comment_hash": "# Nog een opmerking",
    "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
    "example_upstream_regular": "standaard DNS (over UDP)",
-    "example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>",
-    "example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>",
+    "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
+    "example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
    "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>",
-    "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen gebruiken",
+    "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
    "example_upstream_tcp": "standaard DNS (over TCP)",
    "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
    "updated_upstream_dns_toast": "De upstream DNS-servers zijn bijgewerkt",
    "dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
-    "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven",
+    "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
    "unblock": "Deblokkeren",
    "block": "Blokkeren",
    "disallow_this_client": "Toepassing/systeem niet toelaten",
@@ -212,7 +212,7 @@
    "empty_response_status": "Leeg",
    "show_all_filter_type": "Toon alles",
    "show_filtered_type": "Toon gefilterde",
-    "no_logs_found": "Geen logboeken gevonden",
+    "no_logs_found": "Geen log bestanden gevonden",
    "refresh_btn": "Verversen",
    "previous_btn": "Vorige",
    "next_btn": "Volgende",
@@ -235,8 +235,8 @@
    "query_log_strict_search": "Gebruik dubbele aanhalingstekens voor strikt zoeken",
    "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
    "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",
+    "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in log- en statistiekbestanden",
+    "dns_config": "DNS server configuratie",
    "dns_cache_config": "DNS cache configuratie",
    "dns_cache_config_desc": "Hier kan de DNS cache geconfigureerd worden",
    "blocking_mode": "Blocking modus",
@@ -274,14 +274,14 @@
    "unknown_filter": "Onbekend filter {{filterId}}",
    "known_tracker": "Bekende volger",
    "install_welcome_title": "Welkom bij AdGuard Home!",
-    "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
+    "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
    "install_settings_title": "Admin webinterface",
    "install_settings_listen": "Luister interface",
    "install_settings_port": "Poort",
    "install_settings_interface_link": "De webinterface van AdGuard Home admin is beschikbaar op de volgende adressen:",
    "form_error_port": "Voer geldige poortwaarde in",
-    "install_settings_dns": "DNS-server",
-    "install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
+    "install_settings_dns": "DNS server",
+    "install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
    "install_settings_all_interfaces": "Alle interfaces",
    "install_auth_title": "Authenticatie",
    "install_auth_desc": "Het wordt ten zeerste aanbevolen om wachtwoordverificatie te configureren voor de AdGuard Home admin webinterface. Zelfs als het alleen toegankelijk is in uw lokale netwerk, is het nog steeds belangrijk om het te beschermen tegen onbeperkte toegang.",
@@ -301,26 +301,26 @@
    "install_devices_router_list_1": "Open de instellingen pagina voor uw router. Meestal kunt u deze vanuit uw browser openen via een URL (zoals http://192.168.0.1/ of http://192.168.1.1/). Mogelijk wordt u gevraagd om het wachtwoord in te voeren. Als u het niet meer weet, kunt u het wachtwoord vaak opnieuw instellen door op een knop op de router zelf te drukken. Voor sommige routers is een specifieke toepassing vereist, die in dat geval al op uw computer / telefoon moet zijn geïnstalleerd.",
    "install_devices_router_list_2": "Zoek de DHCP/DNS-instellingen. Zoek naar de DNS-letters naast een veld dat twee of drie reeksen nummers toestaat, elk verdeeld in vier groepen van één tot drie cijfers.",
    "install_devices_router_list_3": "Voer je AdGuard Home server adressen daar in.",
-    "install_devices_router_list_4": "Je kan de DNS-server niet aanpassen op sommige routers. In dat geval kan het een oplossing zijn om AdGuard Home te definiëren als een <0>DHCP-server</0>. Je kan ook in de handleiding van je router kijken hoe je een DNS-server aanpast.",
+    "install_devices_router_list_4": "Je kan de DNS server niet aanpassen op sommige routers. In dat geval kan het een oplossing zijn om AdGuard Home te definiëren als een <0>DHCP server</0>. Je kan ook in de handleiding van je router kijken hoe je een DNS server aanpast.",
    "install_devices_windows_list_1": "Open het Configuratiescherm via het menu Start of Windows zoeken.",
    "install_devices_windows_list_2": "Ga naar de categorie Netwerk en Internet en vervolgens naar Netwerkcentrum.",
    "install_devices_windows_list_3": "Zoek aan de linkerkant van het scherm Adapter-instellingen wijzigen en klik erop.",
    "install_devices_windows_list_4": "Selecteer jouw actieve verbinding, klik er met de rechtermuisknop op en kies Eigenschappen.",
    "install_devices_windows_list_5": "Zoek Internet Protocol versie 4 (TCP / IP) in de lijst, selecteer het en klik vervolgens opnieuw op Eigenschappen.",
-    "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-server adressen en voer jouw AdGuard Home server adressen in.",
+    "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
    "install_devices_macos_list_1": "Klik op het Apple-pictogram en ga naar Systeemvoorkeuren.",
    "install_devices_macos_list_2": "Klik op Netwerk.",
    "install_devices_macos_list_3": "Selecteer de eerste verbinding in jouw lijst en klik op Geavanceerd.",
-    "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.",
+    "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
    "install_devices_android_list_1": "Tik op het startscherm van het Android-menu op Instellingen.",
    "install_devices_android_list_2": "Tik op wifi in het menu. Het scherm met alle beschikbare netwerken wordt getoond (het is niet mogelijk om een aangepaste DNS in te stellen voor een mobiele verbinding).",
    "install_devices_android_list_3": "Druk lang op het netwerk waarmee je bent verbonden en tik op Netwerk instellingen aanpassen.",
    "install_devices_android_list_4": "Op sommige apparaten moet u het vakje aanvinken voor Geavanceerd om verdere instellingen te bekijken. Om uw Android DNS-instellingen aan te passen, moet u de IP-instellingen wijzigen van DHCP in Statisch.",
-    "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.",
+    "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
    "install_devices_ios_list_1": "Tik op het startscherm op Instellingen.",
    "install_devices_ios_list_2": "Kies Wi-Fi in het linkermenu (DNS kan niet worden geconfigureerd voor mobiele netwerken).",
    "install_devices_ios_list_3": "Tik op de naam van het momenteel actieve netwerk.",
-    "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.",
+    "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
    "get_started": "Beginnen",
    "next": "Volgende",
    "open_dashboard": "Open Dashboard",
@@ -334,9 +334,9 @@
    "encryption_redirect": "Herleid automatisch naar HTTPS",
    "encryption_redirect_desc": "Indien ingeschakeld, zal AdGuard Home je automatisch herleiden van HTTP naar HTTPS.",
    "encryption_https": "HTTPS poort",
-    "encryption_https_desc": "Als de HTTPS-poort is geconfigureerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en biedt deze ook DNS-via-HTTPS op de locatie '/ dns-query'.",
-    "encryption_dot": "DNS-via-TLS poort",
-    "encryption_dot_desc": "Indien deze poort is geconfigureerd, zal AdGuard Home gebruik maken van een DNS-via-TLS server via deze poort.",
+    "encryption_https_desc": "Als de HTTPS-poort is geconfigureerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en biedt deze ook DNS-over-HTTPS op de locatie '/ dns-query'.",
+    "encryption_dot": "DNS-over-TLS poort",
+    "encryption_dot_desc": "Indien deze poort is geconfigureerd, zal AdGuard Home gebruik maken van een DNS-over-TLS server via deze poort.",
    "encryption_doq": "DNS-via-QUIC poort",
    "encryption_doq_desc": "Als deze poort is geconfigureerd, zal AdGuard Home een DNS-via-QUIC server gebruiken via deze poort. Dit is experimenteel en kan onbetrouwbaar zijn. Er zijn overigens nog niet veel systemen die dit nu al ondersteunen.",
    "encryption_certificates": "Certificaten",
@@ -346,8 +346,8 @@
    "encryption_expire": "Verloopt",
    "encryption_key": "Prive sleutel",
    "encryption_key_input": "Kopieër en plak je PEM-gecodeerde prive sleutel voor je certificaat hier.",
-    "encryption_enable": "Activeer encryptie (HTTPS, DNS-via-HTTPS, en DNS-via-TLS)",
-    "encryption_enable_desc": "Als encryptie is geactiveerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en de DNS-server zal luisteren naar aanvragen via DNS-via-HTTPS en DNS-via-TLS.",
+    "encryption_enable": "Activeer encryptie (HTTPS, DNS-over-HTTPS, en DNS-over-TLS)",
+    "encryption_enable_desc": "Als encryptie is geactiveerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en de DNS-server zal luisteren naar aanvragen via DNS-over-HTTPS en DNS-over-TLS.",
    "encryption_chain_valid": "certificaatketen is geldig",
    "encryption_chain_invalid": "certificaatketen is ongeldig",
    "encryption_key_valid": "Dit is een geldig {{type}} privé sleutel",
@@ -366,8 +366,8 @@
    "update_announcement": "AdGuard Home{{version}} is nu beschikbaar! <0>klik hier</0> voor meer info.",
    "setup_guide": "Installatie gids",
    "dns_addresses": "DNS adressen",
-    "dns_start": "DNS-server aan het opstarten",
-    "dns_status_error": "Fout bij het oproepen van de DNS-server status",
+    "dns_start": "DNS server aan het opstarten",
+    "dns_status_error": "Fout bij het oproepen van de DNS server status",
    "down": "Uitgeschakeld",
    "fix": "Los op",
    "dns_providers": "hier is een <0>lijst of gekende DNS providers</0> waarvan je kan kiezen.",
@@ -380,7 +380,7 @@
    "settings_custom": "Aangepast",
    "table_client": "Gebruiker",
    "table_name": "Naam",
-    "save_btn": "Opslaan",
+    "save_btn": "Bewaar",
    "client_add": "Voeg gebruiker toe",
    "client_new": "Nieuwe gebruiker",
    "client_edit": "Wijzig gebruiker",
@@ -403,34 +403,34 @@
    "auto_clients_title": "Gebruikers (runtime)",
    "auto_clients_desc": "Data over gebruikers die AdGuard Home gebruiken, maar niet geconfigureerd zijn",
    "access_title": "Toegangs instellingen",
-    "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen.",
+    "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS server instellen.",
    "access_allowed_title": "Toegestane gebruikers",
    "access_allowed_desc": "Een lijst van CIDR of IP adressen. Indien ingesteld, zal AdGuard Home alleen van deze IP adressen aanvragen accepteren.",
    "access_disallowed_title": "Verworpen gebruikers",
    "access_disallowed_desc": "Een lijst van CIDR of IP adressen. Indien ingesteld, zal AdGuard Home aanvragen van deze IP adressen verwerpen.",
    "access_blocked_title": "Niet toegelaten domeinen",
    "access_blocked_desc": "Verwar dit niet met filters. AdGuard Home zal deze DNS-zoekopdrachten niet uitvoeren die deze domeinen in de zoekopdracht bevatten. Hier kan je de domeinnamen, wildcards en url-filter-regels specifiëren, bijv. 'example.org', '*.example.org' or '||example.org^'.",
-    "access_settings_saved": "Toegangsinstellingen succesvol opgeslagen",
+    "access_settings_saved": "Toegangsinstellingen met succes opgeslagen",
    "updates_checked": "Met succes op updates gecontroleerd",
    "updates_version_equal": "AdGuard Home is up-to-date",
    "check_updates_now": "Controleer op updates",
    "dns_privacy": "DNS Privacy",
-    "setup_dns_privacy_1": "<0>DNS-via-TLS:</0> Gebruik <1>{{address}}</1> string.",
-    "setup_dns_privacy_2": "<0>DNS-via-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Gebruik <1>{{address}}</1> string.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
    "setup_dns_privacy_3": "<0>Hou er rekening mee dat het beveiligde DNS protocol alleen beschikbaar is voor Android 9. U moet dus extra software installeren voor andere besturingssystemen.</0><0>Hier is een lijst van te gebruiken software.</0>",
    "setup_dns_privacy_4": "Op een iOS 14 of macOS Big Sur apparaat kan je een speciaal '.mobileconfig'-bestand downloaden dat <highlight>DNS-via-HTTPS</highlight> of <highlight>DNS-via-TLS</highlight> servers aan de DNS-instellingen toevoegt.",
-    "setup_dns_privacy_android_1": "Android 9 ondersteunt native DNS-via-TLS. Om het te configureren, ga naar Instellingen → Netwerk & internet → Geavanceerd → Privé DNS en voer daar je domeinnaam in.",
-    "setup_dns_privacy_android_2": "<0>AdGuard voor Android</0>ondersteunt<1>DNS-via-HTTPS </1>en<1>DNS-via-TLS</1>.",
-    "setup_dns_privacy_android_3": "<0> Intra </0> voegt <1> DNS-via-HTTPS</1> ondersteuning toe aan Android.",
-    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> ondersteunt <1> DNS-via-HTTPS </1>, maar om het te configureren op jouw eigen server moet er een <2> DNS-stempel </2> gegenereerd worden.",
-    "setup_dns_privacy_ios_2": "<0> AdGuard voor iOS </0> ondersteunt de instellingen <1> DNS-via-HTTPS </1> en <1> DNS-via-TLS </1>.",
+    "setup_dns_privacy_android_1": "Android 9 ondersteunt native DNS-over-TLS. Om het te configureren, ga naar Instellingen → Netwerk & internet → Geavanceerd → Privé DNS en voer daar uw domeinnaam in.",
+    "setup_dns_privacy_android_2": "<0>AdGuard voor Android</0>ondersteunt<1>DNS-over-HTTPS </1>en<1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_android_3": "<0> Intra </0> voegt <1> DNS-over-HTTPS</1> ondersteuning toe aan Android.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> ondersteunt <1> DNS-over-HTTPS </1>, maar om het te configureren om op uw eigen server te gebruiken moet er een <2> DNS-stempel </2> gegenereerd worden.",
+    "setup_dns_privacy_ios_2": "<0> AdGuard voor iOS </0> ondersteunt de instellingen <1> DNS-over-HTTPS </1> en <1> DNS-over-TLS </1>.",
    "setup_dns_privacy_other_title": "Overig gebruik",
    "setup_dns_privacy_other_1": "AdGuard Home kan op elk platform een veilige DNS-client zijn.",
    "setup_dns_privacy_other_2": "<0>dnsproxy</0> ondersteunt alle bekende beveiligde DNS-protocollen.",
-    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> ondersteunt <1>DNS-via-HTTPS</1>.",
-    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> ondersteunt <1>DNS-via-HTTPS</1>.",
+    "setup_dns_privacy_other_3": "<0> dnscrypt-proxy </0> ondersteunt <1> DNS-over-HTTPS </1>.",
+    "setup_dns_privacy_other_4": "<0> Mozilla Firefox </0> ondersteunt <1> DNS-over-HTTPS </1>.",
    "setup_dns_privacy_other_5": "U vindt meer implementaties <0> hier </0> en <1> hier </1>.",
-    "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.",
+    "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
    "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
    "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
    "rewrite_add": "DNS-herschrijving toevoegen",
@@ -511,8 +511,8 @@
    "disable_ipv6": "Zet IPv6 uit",
    "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
    "fastest_addr": "Snelste IP adres",
-    "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
-    "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.",
+    "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
+    "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
    "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
    "autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.",
    "tags_title": "Labels",
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -259,7 +259,6 @@
    "rate_limit_desc": "Antallet forespørsler per sekund som én enkelt klient har lov til å be om (0: ubegrenset)",
    "blocking_ipv4_desc": "IP-adressen som det skal svares med for blokkerte A-forespørsler",
    "blocking_ipv6_desc": "IP-adressen som det skal svares med for blokkerte AAAA-forespørsler",
-    "blocking_mode_default": "Standard: Svar med null-IP-adresse (0.0.0.0 for A; :: for AAAA) når den blokkeres av adblock-aktige oppføringer; svar med IP-adressen som er spesifisert i oppføringen når den blokkeres av /etc/hosts-typeoppføringer",
    "blocking_mode_refused": "REFUSED: Svar med REFUSED-koden",
    "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-koden",
    "blocking_mode_null_ip": "Null IP: Svar med en 0-IP-adresse (0.0.0.0 for A; :: for AAAA)",
@@ -417,7 +416,6 @@
    "dns_privacy": "DNS-privatliv",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Benytt <1>{{address}}</1>-strengen.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Benytt <1>{{address}}</1>-strengen.",
-    "setup_dns_privacy_3": "<0>Her er en liste over programvarer du kan bruke.</0>",
    "setup_dns_privacy_android_1": "Android 9 har innebygd støtte for DNS-over-TLS. For å sette det opp, gå til Innstillinger → Nettverk og internett → Avansert → Privat DNS, og skriv inn domenenavnet ditt der.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> støtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> legger til <1>DNS-over-HTTPS</1>-støtte i Android.",
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -1,6 +1,6 @@
 {
    "client_settings": "Configurações do cliente",
-    "example_upstream_reserved": "Você pode especificar o DNS primário <0>para o domínio(s) especifico</0>",
+    "example_upstream_reserved": "Você pode especificar o DNS upstream <0>para o domínio(s) especifico</0>",
    "example_upstream_comment": "Você pode especificar o comentário",
    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores upstream",
    "parallel_requests": "Solicitações paralelas",
@@ -125,18 +125,18 @@
    "no_servers_specified": "Nenhum servidor especificado",
    "general_settings": "Configurações gerais",
    "dns_settings": "Configurações de DNS",
-    "dns_blocklists": "Listas de bloqueio de DNS",
-    "dns_allowlists": "Listas de permissões de DNS",
-    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas de bloqueio.",
-    "dns_allowlists_desc": "Os domínios das listas de permissões de DNS serão permitidos mesmo que estejam em qualquer uma das listas de bloqueio.",
+    "dns_blocklists": "Listas negra de DNS",
+    "dns_allowlists": "Listas branca de DNS",
+    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas negras.",
+    "dns_allowlists_desc": "Os domínios das listas branca de DNS serão permitidos mesmo que estejam em qualquer uma das listas negra.",
    "custom_filtering_rules": "Regras de filtragem personalizadas",
    "encryption_settings": "Configurações de criptografia",
    "dhcp_settings": "Configurações de DHCP",
-    "upstream_dns": "Servidores DNS primário",
+    "upstream_dns": "Servidores DNS upstream",
    "upstream_dns_help": "Insira os endereços dos servidores, um por linha. <a>Saber mais</a> sobre a configuração de servidores DNS primários.",
    "upstream_dns_configured_in_file": "Configurado em {{path}}",
-    "test_upstream_btn": "Testar DNS primário",
-    "upstreams": "DNS primário",
+    "test_upstream_btn": "Testar upstreams",
+    "upstreams": "Upstreams",
    "apply_btn": "Aplicar",
    "disabled_filtering_toast": "Filtragem desativada",
    "enabled_filtering_toast": "Filtragem ativada",
@@ -157,22 +157,22 @@
    "delete_table_action": "Excluir",
    "elapsed": "Tempo decorrido",
    "filters_and_hosts_hint": "O AdGuard Home entende regras básicas de bloqueio de anúncios e a sintaxe de arquivos de hosts.",
-    "no_blocklist_added": "Nenhuma lista de bloqueio adicionada",
-    "no_whitelist_added": "Nenhuma lista de permissões foi adicionada",
-    "add_blocklist": "Adicionar lista de bloqueio",
-    "add_allowlist": "Adicionar lista de permissões",
+    "no_blocklist_added": "Nenhuma lista negra foi adicionada",
+    "no_whitelist_added": "Nenhuma lista branca foi adicionada",
+    "add_blocklist": "Adicionar lista negra",
+    "add_allowlist": "Adicionar lista branca",
    "cancel_btn": "Cancelar",
    "enter_name_hint": "Digite o nome",
    "enter_url_or_path_hint": "Digite a URL ou o local da lista",
    "check_updates_btn": "Verificar atualizações",
-    "new_blocklist": "Nova lista de bloqueio",
-    "new_allowlist": "Nova lista de permissão",
-    "edit_blocklist": "Editar lista de bloqueio",
-    "edit_allowlist": "Editar lista de permissões",
-    "choose_blocklist": "Escolher as listasde bloqueio",
-    "choose_allowlist": "Escolher as listas de permissões",
-    "enter_valid_blocklist": "Digite um URL válido para a lista de bloqueio.",
-    "enter_valid_allowlist": "Digite uma URL válida para a lista de permissões.",
+    "new_blocklist": "Nova lista negra",
+    "new_allowlist": "Nova lista branca",
+    "edit_blocklist": "Editar lista negra",
+    "edit_allowlist": "Editar lista branca",
+    "choose_blocklist": "Escolher as listas negras",
+    "choose_allowlist": "Escolher as listas brancas",
+    "enter_valid_blocklist": "Digite uma URL válida para a lista negra.",
+    "enter_valid_allowlist": "Digite uma URL válida para a lista branca.",
    "form_error_url_format": "Formato da URL inválida",
    "form_error_url_or_path_format": "URL ou local da lista inválida",
    "custom_filter_rules": "Regras de filtragem personalizadas",
@@ -560,7 +560,7 @@
    "filtered": "Filtrado",
    "rewritten": "Reescrito",
    "safe_search": "Pesquisa segura",
-    "blocklist": "Lista de bloqueio",
+    "blocklist": "Lista negra",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Tamanho do cache",
    "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
@@ -579,7 +579,7 @@
    "filter_category_general_desc": "Listas que bloqueiam o rastreamento e a publicidade na maioria dos dispositivos",
    "filter_category_security_desc": "Listas especializadas em bloquear domínios de malware, phishing ou fraude",
    "filter_category_regional_desc": "Listas focadas em anúncios regionais e servidores de rastreamento",
-    "filter_category_other_desc": "Outras listas de bloqueio",
+    "filter_category_other_desc": "Outras listas negras",
    "setup_config_to_enable_dhcp_server": "Configure a configuração para habilitar o servidor DHCP",
    "original_response": "Resposta original",
    "click_to_view_queries": "Clique para ver as consultas",
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -1,12 +1,12 @@
 {
    "client_settings": "Definições do cliente",
-    "example_upstream_reserved": "Podes especificar um DNS primário <0>para domínio(s) especifico(s)</0>",
+    "example_upstream_reserved": "pode especificar um DNS upstream <0>para domínio(s) especifico(s)</0>",
    "example_upstream_comment": "Tu podes especificar o comentário",
    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores upstream",
    "parallel_requests": "Solicitações paralelas",
    "load_balancing": "Balanceamento de carga",
    "load_balancing_desc": "Consulta um servidor de cada vez. O AdGuard Home usará o algoritmo aleatório ponderado para escolher o servidor, para que o servidor mais rápido seja usado com mais frequência.",
-    "bootstrap_dns": "Servidores DNS de arranque",
+    "bootstrap_dns": "Servidores DNS de inicialização",
    "bootstrap_dns_desc": "Servidores DNS de inicialização são usados para resolver endereços IP dos resolvedores DoH/DoT que especifica como upstreams.",
    "check_dhcp_servers": "Verificar por servidores DHCP",
    "save_config": "Guardar definição",
@@ -23,7 +23,7 @@
    "dhcp_leases": "Concessões DHCP",
    "dhcp_static_leases": "Concessões de DHCP estático",
    "dhcp_leases_not_found": "Nenhuma concessão DHCP encontrada",
-    "dhcp_config_saved": "Definições DHCP guardadas com sucesso",
+    "dhcp_config_saved": "Configurações DHCP guardadas com sucesso",
    "dhcp_ipv4_settings": "Definições DHCP IPv4",
    "dhcp_ipv6_settings": "Definições DHCP IPv6",
    "form_error_required": "Campo obrigatório",
@@ -75,7 +75,7 @@
    "query_log": "Registo de consultas",
    "compact": "Compacto",
    "nothing_found": "Nada encontrado",
-    "faq": "FAQ",
+    "faq": "Perguntas frequentes",
    "version": "Versão",
    "address": "Endereço",
    "protocol": "Protocolo",
@@ -91,7 +91,7 @@
    "disabled_protection": "Desactivar protecção",
    "refresh_statics": "Repor estatísticas",
    "dns_query": "Consultas de DNS",
-    "blocked_by": "<0>Bloqueado por filtros</0>",
+    "blocked_by": "<0>Bloqueado por Filtros</0>",
    "stats_malware_phishing": "Malware/phishing bloqueados",
    "stats_adult": "Sites adultos bloqueados",
    "stats_query_domain": "Principais domínios consultados",
@@ -125,18 +125,18 @@
    "no_servers_specified": "Nenhum servidor especificado",
    "general_settings": "Definições gerais",
    "dns_settings": "Definições de DNS",
-    "dns_blocklists": "Lista de bloqueio de DNS",
-    "dns_allowlists": "Listas de permissões de DNS",
-    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas de bloqueio.",
-    "dns_allowlists_desc": "Os domínios das listas de permissões de DNS serão permitidos mesmo que estejam em qualquer uma das listas de bloqueio.",
+    "dns_blocklists": "Listas negra de DNS",
+    "dns_allowlists": "Listas branca de DNS",
+    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas negras.",
+    "dns_allowlists_desc": "Os domínios das listas branca de DNS serão permitidos mesmo que estejam em qualquer uma das listas negra.",
    "custom_filtering_rules": "Regras de filtragem personalizadas",
-    "encryption_settings": "Definições de criptografia",
-    "dhcp_settings": "Definições de DHCP",
-    "upstream_dns": "Servidores DNS primário",
+    "encryption_settings": "Configurações de criptografia",
+    "dhcp_settings": "Configurações de DHCP",
+    "upstream_dns": "Servidores DNS upstream",
    "upstream_dns_help": "Insira os endereços dos servidores, um por linha. <a>Saber mais</a> sobre a definição de servidores DNS primários.",
    "upstream_dns_configured_in_file": "Configurado em {{path}}",
-    "test_upstream_btn": "Testar DNS primário",
-    "upstreams": "DNS primário",
+    "test_upstream_btn": "Testar upstreams",
+    "upstreams": "Upstreams",
    "apply_btn": "Aplicar",
    "disabled_filtering_toast": "Filtragem desactivada",
    "enabled_filtering_toast": "Filtragem activada",
@@ -157,22 +157,22 @@
    "delete_table_action": "Apagar",
    "elapsed": "Tempo decorrido",
    "filters_and_hosts_hint": "O AdGuard Home entende regras básicas de bloqueio de anúncios e a sintaxe de arquivos de hosts.",
-    "no_blocklist_added": "Nenhuma lista de bloqueio foi adicionada",
-    "no_whitelist_added": "Nenhuma lista de permissões foi adicionada",
-    "add_blocklist": "Adicionar lista de bloqueio",
-    "add_allowlist": "Adicionar lista de permissões",
+    "no_blocklist_added": "Nenhuma lista negra foi adicionada",
+    "no_whitelist_added": "Nenhuma lista branca foi adicionada",
+    "add_blocklist": "Adicionar lista negra",
+    "add_allowlist": "Adicionar lista branca",
    "cancel_btn": "Cancelar",
    "enter_name_hint": "Insira o nome",
    "enter_url_or_path_hint": "Digite a URL ou o local da lista",
    "check_updates_btn": "Verificar actualizações",
-    "new_blocklist": "Nova lista de bloqueio",
-    "new_allowlist": "Nova lista de permissões",
-    "edit_blocklist": "Editar lista de bloqueio",
-    "edit_allowlist": "Editar lista de permissões",
-    "choose_blocklist": "Escolher as listas de bloqueio",
-    "choose_allowlist": "Escolher as listas de permissões",
-    "enter_valid_blocklist": "Digite uma URL válida para a lista de bloqueio.",
-    "enter_valid_allowlist": "Digite uma URL válida para a lista de permissões.",
+    "new_blocklist": "Nova lista negra",
+    "new_allowlist": "Nova lista branca",
+    "edit_blocklist": "Editar lista negra",
+    "edit_allowlist": "Editar lista branca",
+    "choose_blocklist": "Escolher as listas negras",
+    "choose_allowlist": "Escolher as listas brancas",
+    "enter_valid_blocklist": "Digite uma URL válida para a lista negra.",
+    "enter_valid_allowlist": "Digite uma URL válida para a lista branca.",
    "form_error_url_format": "Formato da URL inválida",
    "form_error_url_or_path_format": "URL ou local da lista inválida",
    "custom_filter_rules": "Regras de filtragem personalizadas",
@@ -185,7 +185,7 @@
    "example_comment_meaning": "apenas um comentário",
    "example_comment_hash": "# Também um comentário",
    "example_regex_meaning": "bloquear o acesso aos domínios que correspondam à expressão regular especificada",
-    "example_upstream_regular": "DNS regular (através do UDP)",
+    "example_upstream_regular": "dNS regular (através do UDP)",
    "example_upstream_dot": "<0>DNS-sobre-TLS</0> criptografado",
    "example_upstream_doh": "<0>DNS-sobre-HTTPS</0> criptografado",
    "example_upstream_doq": "<0>DNS-sobre-QUIC</0> criptografado",
@@ -338,7 +338,7 @@
    "encryption_dot": "Porta DNS-sobre-TLS",
    "encryption_dot_desc": "Se essa porta estiver configurada, o AdGuard Home irá executar o servidor DNS-sobre- TSL nesta porta.",
    "encryption_doq": "Porta DNS-sobre-QUIC",
-    "encryption_doq_desc": "Se esta porta estiver configurada, o AdGuard Home executará um servidor DNS-sobre-QUIC nesta porta. É experimental e pode não ser confiável. Além disso, não há demasiados clientes que ofereçam suporte no momento.",
+    "encryption_doq_desc": "Se esta porta estiver configurada, o AdGuard Home executará um servidor DNS-sobre-QUIC nesta porta. É experimental e pode não ser confiável. Além disso, não há muitos clientes que ofereçam suporte no momento.",
    "encryption_certificates": "Certificados",
    "encryption_certificates_desc": "Para usar criptografia, precisa de fornecer uma cadeia de certificados SSL válida para o seu domínio. Pode obter um certificado gratuito em <0> {{link}}</0> ou pode comprá-lo numa das autoridades de certificação confiáveis.",
    "encryption_certificates_input": "Copie/cole aqui o seu certificado codificado em PEM.",
@@ -362,7 +362,7 @@
    "form_error_port_unsafe": "Esta porta não é segura",
    "form_error_equal": "Não deve ser igual",
    "form_error_password": "As palavras-passe não coincidem",
-    "reset_settings": "Repor definições",
+    "reset_settings": "Repor configurações",
    "update_announcement": "AdGuard Home {{version}} está disponível!<0>Clique aqui</0> para mais informações.",
    "setup_guide": "Guia de instalação",
    "dns_addresses": "Endereços DNS",
@@ -393,7 +393,7 @@
    "form_add_id": "Adicionar identificador",
    "form_client_name": "Insira o nome do cliente",
    "name": "Nome",
-    "client_global_settings": "Usar definições globais",
+    "client_global_settings": "Usar configurações globais",
    "client_deleted": "Cliente \"{{key}}\" excluído com sucesso",
    "client_added": "Cliente \"{{key}}\" adicionado com sucesso",
    "client_updated": "Cliente \"{{key}}\" actualizado com sucesso",
@@ -402,7 +402,7 @@
    "list_confirm_delete": "Você tem certeza de que deseja excluir essa lista?",
    "auto_clients_title": "Clientes (tempo de execução)",
    "auto_clients_desc": "Dados dos clientes que usam o AdGuard Home, que não são armazenados na definição",
-    "access_title": "Definições de acesso",
+    "access_title": "Configurações de acesso",
    "access_desc": "Aqui pode configurar as regras de acesso para o servidores de DNS do AdGuard Home.",
    "access_allowed_title": "Clientes permitidos",
    "access_allowed_desc": "Uma lista de endereços IP ou CIDR. Ao configurar, o AdGuard Home irá permitir solicitações apenas desses endereços de IP.",
@@ -410,7 +410,7 @@
    "access_disallowed_desc": "Uma lista de endereços IP ou CIDR. Ao configurar, o AdGuard Home irá descartar as solicitações desses endereços de IP.",
    "access_blocked_title": "Domínios bloqueados",
    "access_blocked_desc": "Não confunda isso com os filtros. O AdGuard Home irá descartar as consultas DNS com esses domínios.",
-    "access_settings_saved": "Definições de acesso foram guardadas com sucesso",
+    "access_settings_saved": "Configurações de acesso foram guardadas com sucesso",
    "updates_checked": "Actualizações verificadas com sucesso",
    "updates_version_equal": "O AdGuard Home está actualizado",
    "check_updates_now": "Verificar actualizações",
@@ -487,7 +487,7 @@
    "username_placeholder": "Insira o nome de utilizador",
    "password_label": "Palavra-passe",
    "password_placeholder": "Insira palavra-passe",
-    "sign_in": "Iniciar sessão",
+    "sign_in": "Entrar",
    "sign_out": "Sair",
    "forgot_password": "Não se lembra da palavra-passe?",
    "forgot_password_desc": "Siga <0>estes passos</0> para criar uma nova palavra-passe para a sua conta de utilizador.",
@@ -551,7 +551,7 @@
    "validated_with_dnssec": "Validado com DNSSEC",
    "all_queries": "Todas as consultas",
    "show_blocked_responses": "Bloqueado",
-    "show_whitelisted_responses": "Na lista branca",
+    "show_whitelisted_responses": "Lista Branca",
    "show_processed_responses": "Processado",
    "blocked_safebrowsing": "Bloqueado pela navegação segura",
    "blocked_adult_websites": "Sítios adultos bloqueados",
@@ -560,7 +560,7 @@
    "filtered": "Filtrado",
    "rewritten": "Reescrito",
    "safe_search": "Pesquisa segura",
-    "blocklist": "Lista de bloqueio",
+    "blocklist": "Lista negra",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Tamanho do cache",
    "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
@@ -575,11 +575,11 @@
    "filter_category_general": "Geral",
    "filter_category_security": "Segurança",
    "filter_category_regional": "Regional",
-    "filter_category_other": "Noutro",
+    "filter_category_other": "Outro",
    "filter_category_general_desc": "Listas que bloqueiam o monitorização e a publicidade na maioria dos dispositivos",
    "filter_category_security_desc": "Listas especializadas em bloquear domínios de malware, phishing ou fraude",
    "filter_category_regional_desc": "Listas focadas em anúncios regionais e servidores de monitorização",
-    "filter_category_other_desc": "Outras listas de bloqueio",
+    "filter_category_other_desc": "Outras listas negras",
    "setup_config_to_enable_dhcp_server": "Defina a definição para habilitar o servidor DHCP",
    "original_response": "Resposta original",
    "click_to_view_queries": "Clique para ver as consultas",
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -1,6 +1,6 @@
 {
    "client_settings": "Setări client",
-    "example_upstream_reserved": "Puteți preciza un DNS în amonte <0>de domeniu(ii) specific(e)</0>",
+    "example_upstream_reserved": "Puteți preciza un DNS upstream <0>de domeniu(ii) specific(e)</0>",
    "example_upstream_comment": "Puteți specifica comentariul",
    "upstream_parallel": "Folosiți interogări paralele pentru rezolvări rapide interogând simultan toate serverele în amonte",
    "parallel_requests": "Solicitări paralele",
@@ -107,7 +107,7 @@
    "number_of_dns_query_days": "Un număr de interogări DNS procesate în ultima {{count}} zi",
    "number_of_dns_query_days_plural": "Un număr de interogări DNS procesate în ultimele {{count}} zile",
    "number_of_dns_query_24_hours": "Un număr de interogări DNS procesate în ultimele 24 de ore",
-    "number_of_dns_query_blocked_24_hours": "Un număr de solicitări DNS blocate de filtrele de blocare și lista de blocaje din hosts",
+    "number_of_dns_query_blocked_24_hours": "Un număr de solicitări DNS blocate de filtrele de blocare și listele de blocaj de hosts",
    "number_of_dns_query_blocked_24_hours_by_sec": "Un număr de solicitări DNS blocate de modulul de securitate de navigare AdGuard",
    "number_of_dns_query_blocked_24_hours_adult": "Un număr de site-uri web pentru adulți blocate",
    "enforced_save_search": "Căutare protejată întărită",
@@ -117,7 +117,7 @@
    "block_domain_use_filters_and_hosts": "Blocați domenii folosind filtre și fișiere hosts",
    "filters_block_toggle_hint": "Puteți configura regulile de blocare în setările <a>Filtre</a>.",
    "use_adguard_browsing_sec": "Utilizați serviciul Navigarea în Securitate AdGuard",
-    "use_adguard_browsing_sec_hint": "AdGuard Home va verifica dacă domeniul este în lista de blocări a serviciul web de securitate de navigare. Pentru acesta va utiliza un lookup API discret: un prefix scurt al numelui de domeniu SHA256 hash este trimis serverului.",
+    "use_adguard_browsing_sec_hint": "AdGuard Home va verifica dacă domeniul este în lista negră a serviciul web de securitate de navigare. Pentru acesta va utiliza un lookup API discret: un prefix scurt al numelui de domeniu SHA256 hash este trimis serverului.",
    "use_adguard_parental": "Utilizați Controlul Parental AdGuard",
    "use_adguard_parental_hint": "AdGuard Home va verifica pentru conținut adult pe domeniu. Utilizează același API discret ca cel utilizat de serviciul de securitate de navigare.",
    "enforce_safe_search": "Căutare protejată întărită",
@@ -125,14 +125,14 @@
    "no_servers_specified": "Nu sunt specificate servere",
    "general_settings": "Setări Generale",
    "dns_settings": "Setări DNS",
-    "dns_blocklists": "Liste de blocări DNS",
-    "dns_allowlists": "Listă de DNS-uri autorizate",
+    "dns_blocklists": "DNS liste blocări",
+    "dns_allowlists": "DNS liste autorizări",
    "dns_blocklists_desc": "AdGuard Home blochează domenii incluse în liste de blocări.",
    "dns_allowlists_desc": "Domeniile DNS autorizate vor fi permise, chiar dacă se află pe orice listă de blocări.",
    "custom_filtering_rules": "Reguli filtrare personale",
    "encryption_settings": "Setări de criptare",
    "dhcp_settings": "Setări DHCP",
-    "upstream_dns": "Servere DNS în amonte",
+    "upstream_dns": "Servere upstream DNS",
    "upstream_dns_help": "Introduceți adresele serverelor una pe linie. <a>Aflați mai multe</a> despre configurarea serverelor DNS în amonte.",
    "upstream_dns_configured_in_file": "Configurat în {{path}}",
    "test_upstream_btn": "Testați upstreams",
@@ -170,7 +170,7 @@
    "edit_blocklist": "Editare blocare",
    "edit_allowlist": "Editare autorizare",
    "choose_blocklist": "Alegeți liste de blocări",
-    "choose_allowlist": "Alegeți liste de autorizări",
+    "choose_allowlist": "Alegeți liste de permisiuni",
    "enter_valid_blocklist": "Introduceți un URL valid pentru blocare.",
    "enter_valid_allowlist": "Introduceți un URL valid pentru autorizare.",
    "form_error_url_format": "Format URL invalid",
@@ -192,7 +192,7 @@
    "example_upstream_sdns": "puteți utiliza <0>DNS Stamps</0> pentru rezolvere <1>DNSCrypt</1> sau <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "DNS clasic (over TCP)",
    "all_lists_up_to_date_toast": "Toate listele sunt deja la zi",
-    "updated_upstream_dns_toast": "Serverele DNS în amonte aduse la zi",
+    "updated_upstream_dns_toast": "Serverele DNS upstream aduse la zi",
    "dns_test_ok_toast": "Serverele DNS specificate funcționează corect",
    "dns_test_not_ok_toast": "Serverul \"{{key}}\": nu a putut fi utilizat, verificați dacă l-ați scris corect",
    "unblock": "Deblocați",
@@ -212,7 +212,7 @@
    "empty_response_status": "Gol",
    "show_all_filter_type": "Arată tot",
    "show_filtered_type": "Arată cele filtrate",
-    "no_logs_found": "Niciun jurnal găsit",
+    "no_logs_found": "Nici un jurnal găsit",
    "refresh_btn": "Actualizare",
    "previous_btn": "Anterior",
    "next_btn": "Următor",
@@ -560,7 +560,7 @@
    "filtered": "Filtrate",
    "rewritten": "Rescrise",
    "safe_search": "Căutare sigură",
-    "blocklist": "Lista de blocări",
+    "blocklist": "Lista neagră",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Mărime cache",
    "cache_size_desc": "Mărime cache DNS (în octeți)",
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -511,7 +511,7 @@
    "disable_ipv6": "Отключить IPv6",
    "disable_ipv6_desc": "Если эта опция включена, все DNS-запросы адресов IPv6 (тип AAAA) будут игнорироваться.",
    "fastest_addr": "Самый быстрый IP-адрес",
-    "fastest_addr_desc": "Опросить все DNS-серверы и вернуть самый быстрый IP-адрес из полученных ответов. Это замедлит DNS-запросы, так как нужно будет дождаться ответов со всех DNS-серверов, но улучшит соединение.",
+    "fastest_addr_desc": "Опросить все DNS-серверы и вернуть самый быстрый IP-адрес из полученных ответов",
    "autofix_warning_text": "При нажатии \"Исправить\" AdGuard Home настроит вашу систему на использование DNS-сервера AdGuard Home.",
    "autofix_warning_list": "Будут выполняться следующие задачи: <0>Деактивировать системный DNSStubListener</0> <0>Установить адрес сервера DNS на 127.0.0.1</0> <0>Создать символическую ссылку /etc/resolv.conf на /run/systemd/resolve/resolv.conf</0> <0>Остановить DNSStubListener (перезагрузить системную службу)</0>.",
    "autofix_warning_result": "В результате все DNS-запросы от вашей системы будут по умолчанию обрабатываться AdGuard Home.\n",
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -1,6 +1,5 @@
 {
    "client_settings": "අනුග්‍රාහක සැකසුම්",
-    "example_upstream_comment": "ඔබට අදහසක් සඳහන් කළ හැකිය",
    "parallel_requests": "සමාන්තර ඉල්ලීම්",
    "load_balancing": "ධාරිතාව තුලනය",
    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
@@ -13,13 +12,13 @@
    "dhcp_enable": "ග.ධා.වි.කෙ. සේවාදායකය සබල කරන්න",
    "dhcp_disable": "ග.ධා.වි.කෙ. සේවාදායකය අබල කරන්න",
    "dhcp_config_saved": "ග.ධා.වි.කෙ. වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. අයිපීවී 4 සැකසුම්",
-    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අයිපීවී 6 සැකසුම්",
+    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. IPv4 සැකසුම්",
+    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. IPv6 සැකසුම්",
    "form_error_required": "අවශ්‍ය ක්ෂේත්‍රයකි",
    "form_error_ip4_format": "වලංගු නොවන IPv4 ආකෘතියකි",
    "form_error_ip6_format": "වලංගු නොවන IPv6 ආකෘතියකි",
    "form_error_ip_format": "වලංගු නොවන අ.ජා. කෙ. (IP) ආකෘතියකි",
-    "form_error_mac_format": "වලංගු නොවන මා.ප්‍ර.පා. ආකෘතියකි",
+    "form_error_mac_format": "වලංගු නොවන MAC ආකෘතියකි",
    "form_error_client_id_format": "වලංගු නොවන අනුග්‍රාහක හැඳුනුම් ආකෘතියකි",
    "form_error_positive": "0 ට වඩා වැඩි විය යුතුය",
    "form_error_negative": "0 හෝ ඊට වැඩි විය යුතුය",
@@ -93,19 +92,19 @@
    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
    "use_adguard_browsing_sec": "AdGuard browsing security වෙබ් සේවාව භාවිතා කරන්න",
    "use_adguard_parental": "AdGuard parental control වෙබ් සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය බ්‍රව්සින් සෙකියුරිටි වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
+    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය browsing security වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
    "enforce_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන්න",
    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
    "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
    "general_settings": "පොදු සැකසුම්",
    "dns_settings": "DNS සැකසුම්",
-    "dns_blocklists": "ව.නා.ප. අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "dns_allowlists": "ව.නා.ප. අවසර දීමේ ලැයිස්තු",
+    "dns_blocklists": "DNS අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
+    "dns_allowlists": "DNS අවසර දීමේ ලැයිස්තු",
    "dns_blocklists_desc": "ඇඩ්ගාර්ඩ් හෝම් විසින් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු වලට ගැලපෙන වසම් අවහිර කරනු ඇත.",
    "dns_allowlists_desc": "අවසර දීමේ ව.නා.ප. ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක අඩංගු වුවද එය නොසලකා හැර අවසර දෙනු ලැබේ.",
    "custom_filtering_rules": "අභිරුචි පෙරීමේ නීති",
    "encryption_settings": "සංකේතාංකන සැකසුම්",
-    "dhcp_settings": "ග.ධා.වි.කෙ. සැකසුම්",
+    "dhcp_settings": "DHCP සැකසුම්",
    "upstream_dns": "Upstream ව.නා.ප. සේවාදායකයන්",
    "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුළත් කරන්න. upstream ව.නා.ප. (DNS) \n සේවාදායකයන් වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
    "apply_btn": "යොදන්න",
@@ -202,16 +201,14 @@
    "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා. කෙ. (IP) නිර්නාමික කරන්න",
    "anonymize_client_ip_desc": "ලොග සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ සම්පූර්ණ අ.ජා. කෙ. ලිපිනය සුරකීමෙන් වලකින්න",
    "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
-    "dns_cache_config": "ව.නා.ප. නිහිත වින්‍යාසය",
-    "dns_cache_config_desc": "මෙහිදී ඔබට ව.නා.ප. නිහිතය වින්‍යාසගත කළ හැකිය",
    "blocking_mode": "අවහිර කරන ආකාරය",
    "default": "සුපුරුදු",
    "nxdomain": "නොපවතින වසම",
    "refused": "REFUSED",
    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ.",
    "custom_ip": "අභිරුචි අ.ජා. කෙ.",
-    "blocking_ipv4": "අයි.පී.වී.4 අවහිර කිරීම\n",
-    "blocking_ipv6": "අයි.පී.වී.6 අවහිර කිරීම",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුළත් කරන්න",
    "rate_limit": "අනුපාත සීමාව",
    "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
@@ -222,7 +219,7 @@
    "blocking_mode_nxdomain": "නොපවතින වසම (NXDOMAIN): NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා. කෙ. : ශුන්‍ය අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
+    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>DNS සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
    "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
    "source_label": "මූලාශ්‍රය",
    "found_in_known_domain_db": "දැනුවත් වසම් දත්ත ගබඩාවේ හමු විය.",
@@ -236,10 +233,9 @@
    "install_settings_title": "පරිපාලක වෙබ් අතුරු මුහුණත",
    "install_settings_listen": "සවන් දෙන අතුරු මුහුණත",
    "install_settings_port": "කවුළුව",
-    "install_settings_interface_link": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වෙබ් අතුරු මුහුණත පහත ලිපිනයන්ගෙන් ප්‍රවේශ විය හැකිය:",
    "form_error_port": "වලංගු කවුළුවක අගයක් ඇතුළත් කරන්න",
    "install_settings_dns": "ව.නා.ප. සේවාදායකය",
-    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ මාර්ගකාරකය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
+    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ රවුටරය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
    "install_settings_all_interfaces": "සියලුම අතුරුමුහුණත්",
    "install_auth_title": "සත්‍යාපනය",
    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වෙබ් අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
@@ -255,11 +251,10 @@
    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ ඇඩ්ගාර්ඩ් හෝම් භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
    "install_devices_router": "මාර්ගකාරකය",
    "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධ සියලුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒවා අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවනු ඇත.",
-    "install_devices_address": "ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය පහත ලිපිනයන්ට සවන් දෙමින් පවතී",
-    "install_devices_router_list_1": "ඔබේ මාර්ගකාරකය සඳහා වූ මනාපයන් විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ අතිරික්සුවෙන් ඒ.ස.නි.(URL) ක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) පිවිසිය හැකිය. මුර පදය ඇතුළත් කිරීමට ඔබෙන් ඉල්ලා සිටිය හැකිය. ඔබට එය මතක නැතිනම්, බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසිය හැක. සමහර මාර්ගකාරක සඳහා විශේෂිත යෙදුමක් අවශ්‍ය වන අතර, එය දැනටමත් ඔබේ පරිගණකයේ/දුරකථනයේ ස්ථාපනය කර තිබිය යුතුය.",
+    "install_devices_router_list_1": "ඔබේ මාර්ගකාරකය සඳහා වූ මනාපයන් විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ බ්‍රව්සරයෙන් URL එකක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) පිවිසිය හැකිය. මුරපදය ඇතුළත් කිරීමට ඔබෙන් ඉල්ලා සිටිය හැකිය. ඔබට එය මතක නැතිනම්, බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසිය හැක. සමහර මාර්ගකාරක සඳහා විශේෂිත යෙදුමක් අවශ්‍ය වන අතර, එය දැනටමත් ඔබේ පරිගණකයේ/දුරකථනයේ ස්ථාපනය කර තිබිය යුතුය.",
    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. ඉලක්කම් කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අක්ෂර සොයන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
-    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ මාර්ගකාරකය වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
+    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ රවුටර වල අභිරුචි ව.නා.ප. (DNS) සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
    "install_devices_windows_list_1": "ආරම්භක මෙනුව හෝ වින්ඩෝස් සෙවුම හරහා පාලක පැනලය විවෘත කරන්න.",
    "install_devices_windows_list_2": "ජාල සහ අන්තර්ජාල ප්‍රවර්ගයට ගොස් පසුව ජාල සහ බෙදාගැනීමේ මධ්‍යස්ථානය වෙත යන්න.",
    "install_devices_windows_list_3": "උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම තිරයේ වම් පසින් සොයාගෙන එය මත ක්ලික් කරන්න.",
@@ -319,7 +314,7 @@
    "reset_settings": "සැකසුම් යළි පිහිටුවන්න",
    "update_announcement": "ඇඩ්ගාර්ඩ් හෝම් {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
    "setup_guide": "පිහිටුවීමේ මාර්ගෝපදේශය",
-    "dns_addresses": "ව.නා.ප. ලිපින",
+    "dns_addresses": "DNS ලිපින",
    "dns_start": "ව.නා.ප. සේවාදායකය ආරම්භ වෙමින් පවතී",
    "dns_status_error": "ව.නා.ප. සේවාදායකයේ තත්වය පරීක්ෂා කිරීමේදී දෝෂයකි",
    "down": "පහත",
@@ -342,7 +337,7 @@
    "ip_address": "අ.ජා. කෙ. (IP) ලිපිනය",
    "client_identifier_desc": "අනුග්‍රාහකයන් අ.ජා. කෙ. (IP) ලිපිනයක් හෝ මා.ප්‍ර.පා. (MAC) ලිපිනයක් මගින් හඳුනාගත හැකිය. මා.ප්‍ර.පා. හඳුන්වනයක් ලෙස  භාවිතා කළ හැක්කේ ඇඩ්ගාර්ඩ් හෝම් ද <0>DHCP සේවාදායකයක්</0> නම් පමණක් බව කරුණාවෙන් සලකන්න. ",
    "form_enter_ip": "අ.ජා. කෙ. (IP) ඇතුළත් කරන්න",
-    "form_enter_mac": "මා.ප්‍ර.පා. (MAC) ඇතුළත් කරන්න",
+    "form_enter_mac": "MAC ඇතුළත් කරන්න",
    "form_enter_id": "හඳුන්වනය ඇතුළත් කරන්න",
    "form_add_id": "හඳුන්වනයක් එක් කරන්න",
    "form_client_name": "අනුග්‍රාහකයේ නම ඇතුළත් කරන්න",
@@ -365,20 +360,22 @@
    "updates_checked": "යාවත්කාලීන කිරීම් සාර්ථකව පරික්ෂා කර ඇත",
    "updates_version_equal": "ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීනයි",
    "check_updates_now": "යාවත්කාල කිරීම සඳහා දැන් පරීක්ෂා කරන්න",
-    "dns_privacy": "ව.නා.ප. රහස්‍යතා",
-    "setup_dns_privacy_3": "<0>මෙහි ඔබට භාවිතා කළ හැකි මෘදුකාංග ලැයිස්තුවක් ඇත.</0>",
-    "setup_dns_privacy_other_2": "<0>ඩීඑන්එස්ප්‍රොක්සි</0> දන්නා සියලුම ආරක්ෂිත ව.නා.ප. කෙටුම්පත් සඳහා සහය දක්වයි.",
+    "dns_privacy": "DNS රහස්‍යතා",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> තන්තුව භාවිතා කරයි.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> තන්තුව භාවිතා කරයි.",
+    "setup_dns_privacy_android_2": "<1>DNS-over-HTTPS</1> සහ <1>DNS-over-TLS</1> සඳහා <0>AdGuard for Android</0> සහය දක්වයි.",
+    "setup_dns_privacy_ios_2": "<1>DNS-over-HTTPS</1> සහ <1>DNS-over-TLS</1> පිහිටුවීම් සඳහා <0>AdGuard for iOS</0> සහය දක්වයි.",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> දන්නා සියලුම ආරක්ෂිත DNS කෙටුම්පත් සඳහා සහය දක්වයි.",
    "setup_dns_privacy_other_3": "<1>DNS-over-HTTPS</1> සඳහා <0>dnscrypt-පෙරකලාසිය</0> සහය දක්වයි.",
    "setup_dns_privacy_other_4": "<1>DNS-over-HTTPS</1> සඳහා <0>මොසිල්ලා ෆයර්ෆොක්ස්</0> සහය දක්වයි.",
    "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතා කිරීම සඳහා ඇඩ්ගාර්ඩ් හෝම් සැකසුම් තුළ <0>සංකේතාංකනය වින්‍යාසගත</0> කිරීමට අවශ්‍ය වේ.",
-    "rewrite_added": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම සාර්ථකව එකතු කරන ලදි",
-    "rewrite_add": "ව.නා.ප. නැවත ලිවීමක් එකතු කරන්න",
-    "rewrite_not_found": "ව.නා.ප. නැවත ලිවීම් හමු නොවීය",
-    "rewrite_confirm_delete": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
+    "rewrite_add": "DNS නැවත ලිවීමක් එකතු කරන්න",
+    "rewrite_confirm_delete": "\"{{key}}\" සඳහා DNS නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "rewrite_desc": "විශේෂිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
    "rewrite_applied": "නැවත ලිවීමේ නීතිය යොදා ඇත",
    "rewrite_hosts_applied": "ධාරක ගොනු නීතිය මගින් නැවත ලියා ඇත",
-    "dns_rewrites": "ව.නා.ප. නැවත ලිවීම්",
+    "dns_rewrites": "DNS නැවත ලිවීම්",
+    "form_domain": "වසම ඇතුළත් කරන්න",
    "form_answer": "අ.ජා. කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුළත් කරන්න ",
    "form_error_domain_format": "වලංගු නොවන වසම් ආකෘතියකි",
    "form_error_answer_format": "වලංගු නොවන පිළිතුරු ආකෘතියකි",
@@ -406,7 +403,6 @@
    "domain": "වසම",
    "answer": "පිළිතුර",
    "filter_added_successfully": "පෙරහන සාර්ථකව එකතු කරන ලදි",
-    "filter_removed_successfully": "ලැයිස්තුව සාර්ථකව ඉවත් කරන ලදි",
    "filter_updated": "ලැයිස්තුව සාර්ථකව යාවත්කාලීන කර ඇත",
    "statistics_configuration": "සංඛ්‍යාලේඛන වින්‍යාසය",
    "statistics_retention": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම",
@@ -435,24 +431,20 @@
    "network": "ජාලය",
    "descr": "විස්තරය",
    "whois": "Whois",
-    "filtering_rules_learn_more": "ඔබගේ ම ධාරක ලැයිස්තු සෑදීම පිළිබඳව <0>තව දැනගන්න</0>.",
    "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
    "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
    "try_again": "නැවත උත්සහා කරන්න",
    "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
-    "rewrite_ip_address": "අ.ජා. කෙ. ලිපිනය: මෙම අ.ජා. කෙටුම්පත A හෝ AAAA ප්‍රතිචාරයකට භාවිතා කරන්න",
    "rewrite_domain_name": "වසම් නාමය: අන්. නා. (CNAME) වාර්තාවක් එක් කරන්න",
    "disable_ipv6": "IPv6 අබල කරන්න",
    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම ව.නා.ප. විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
    "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "fastest_addr_desc": "සියලුම ව.නා.ප. සේවාදායකයන් හරහා විමසා සියලු ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා. කෙ. ලිපිනය ලබා දෙයි. සියලුම ව.නා.ප. සේවාදායකයන්ගේ ප්‍රතිචාර සඳහා අප බලා සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" බොත්තම එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
    "tags_title": "හැඳුනුම් සංකේත",
    "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>වැඩිදුර ඉගෙන ගන්න</0>",
    "form_select_tags": "අනුග්‍රාහක හැඳුනුම් සංකේත",
    "check_title": "පෙරීම පරීක්ෂා කරන්න",
-    "check_desc": "ධාරක නාමය පෙරහන් කර ඇත්දැයි පරීක්ෂා කරන්න",
    "check": "පරීක්ෂා කරන්න",
    "form_enter_host": "ධාරක නාමයක් ඇතුළත් කරන්න",
    "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
@@ -464,13 +456,12 @@
    "check_reason": "හේතුව: {{reason}}",
    "check_rule": "නීතිය: {{rule}}",
    "check_service": "සේවාවෙහි නම: {{service}}",
-    "service_name": "සේවාවේ නම",
    "check_not_found": "ඔබගේ පෙරහන් ලැයිස්තු තුළ සොයා ගත නොහැක",
    "client_confirm_block": "{{ip}} අනුග්‍රාහකය අවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "client_confirm_unblock": "{{ip}} අනුග්‍රාහකය අනවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කරන ලදි",
    "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කරන ලදි",
-    "static_ip": "ස්ථිතික අ.ජා. කෙ. ලිපිනය",
+    "static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය",
    "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
    "set_static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනයක් සකසන්න",
    "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
@@ -479,6 +470,8 @@
    "confirm_static_ip": "ඇඩ්ගාර්ඩ් හෝම් ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
    "list_updated": "{{count}} ලැයිස්තුව යාවත්කාලීන කරන ලදි",
    "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාලීන කරන ලදි",
+    "dnssec_enable": "DNSSEC සබල කරන්න",
+    "validated_with_dnssec": "DNSSEC සමඟ තහවුරු කර ඇත",
    "all_queries": "සියලුම විමසුම්",
    "show_blocked_responses": "අවහිර කර ඇත",
    "show_whitelisted_responses": "සුදු ලැයිස්තුගත කර ඇත",
@@ -491,15 +484,8 @@
    "safe_search": "ආරක්ෂිත සෙවීම",
    "blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
    "milliseconds_abbreviation": "මිලි තත්.",
-    "cache_size": "නිහිතයෙහි ප්‍රමාණය",
-    "cache_size_desc": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය (බයිට වලින්)",
-    "cache_ttl_min_override": "අවම පව. කා. අභිබවන්න",
-    "cache_ttl_max_override": "උපරිම පව. කා. අභිබවන්න",
-    "enter_cache_size": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය ඇතුළත් කරන්න (බයිට)",
    "enter_cache_ttl_min_override": "අවම පව. කා. (TTL) ඇතුළත් කරන්න",
    "enter_cache_ttl_max_override": "උපරිම පව. කා. (TTL) ඇතුළත් කරන්න",
-    "cache_ttl_max_override_desc": "ව.නා.ප. නිහිතයෙහි ඇති ඇතුළත් කිරීම් සඳහා ඉතා වැඩි පවත්නා කාලයක අගයක් (තත්පර) සකසන්න",
-    "ttl_cache_validation": "නිහිතයෙහි අවම පව. කා. (TTL) අගය උපරිම අගයට වඩා අඩු හෝ සමාන විය යුතුය",
    "filter_category_general": "පොදු",
    "filter_category_security": "ආරක්ෂණ",
    "filter_category_regional": "ප්‍රාදේශ්‍රීය",
@@ -513,6 +499,5 @@
    "click_to_view_queries": "විමසුම් බැලීමට ඔබන්න",
    "port_53_faq_link": "53 කවුළුව බොහෝ විට \"DNSStubListener\" හෝ \"systemd-resolved\" සේවාවන් භාවිතයට ගනු ලැබේ. කරුණාකර මෙය විසඳන්නේ කෙසේද යන්න පිළිබඳ <0>මෙම උපදෙස්</0> කියවන්න.",
    "adg_will_drop_dns_queries": "ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම අනුග්‍රාහකයේ සියලුම ව.නා.ප. විමසුම් අතහැර දමනු ඇත.",
-    "client_not_in_allowed_clients": "\"අවසර ලත් අනුග්‍රාහකයින්\" ලැයිස්තුවේ නොමැති නිසා අනුග්‍රාහකයට අවසර නැත.",
    "experimental": "පරීක්ෂණාත්මක"
 }
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -50,7 +50,7 @@
    "dhcp_table_expires": "Vyprší",
    "dhcp_warning": "Ak chcete server DHCP napriek tomu povoliť, uistite sa, že v sieti nie je žiadny iný aktívny DHCP server. V opačnom prípade sa môže prerušiť internet pre už pripojené zariadenia!",
    "dhcp_error": "Nebolo možné určiť, či je v sieti iný DHCP server.",
-    "dhcp_static_ip_error": "Aby bolo možné používať DHCP server, musí byť nastavená statická IP adresa. Nepodarilo sa určiť, či je toto sieťové rozhranie nakonfigurované pomocou statickej adresy IP. Nastavte statickú IP adresu manuálne.",
+    "dhcp_static_ip_error": "Aby bolo možné používať DHCP server, musí byť nastavená statická IP adresa. Nepodarilo sa určiť, či je toto sieťové rozhranie nakonfigurované pomocou statickej adresy IP. Nastavte statickú adresu IP manuálne.",
    "dhcp_dynamic_ip_found": "Váš systém používa dynamickú konfiguráciu IP adresy pre rozhranie <0{{interfaceName}}</0>. Aby bolo možné používať DHCP server, musí byť nastavená statická IP adresa. Vaša aktuálna adresa IP je <0>{{ipAddress}}</0>. Automaticky nastavíme túto IP adresu ako statickú, ak stlačíte tlačidlo Povoliť DHCP.",
    "dhcp_lease_added": "Statický  \"{{key}}\" prenájmu bol úspešne pridaný",
    "dhcp_lease_deleted": "Statický \"{{key}}\" prenájmu bol úspešne vymazaný",
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -2,20 +2,18 @@
    "client_settings": "İstemci ayarları",
    "example_upstream_reserved": "<0>Belirli alan adları için</0> DNS üst sunucusu tanımlayabilirsiniz.",
    "example_upstream_comment": "Bir yorum belirtebilirsiniz",
-    "upstream_parallel": "Tüm üst sunucuları eş zamanlı sorgulayarak çözümü hızlandırmak için paralel istekleri kullan",
+    "upstream_parallel": "Tüm üst sunucuları eş zamanlı sorgulayarak çözümü hızlandırmak için paralel sorguları kullan",
    "parallel_requests": "Paralel istekler",
-    "load_balancing": "Yük dengeleme",
-    "load_balancing_desc": "Her seferinde bir sunucuyu sorgulayın. AdGuard Home, sunucuyu seçmek için ağırlıklı rastgele algoritmayı kullanacak, böylece en hızlı sunucu daha sık kullanılacak.",
    "bootstrap_dns": "DNS Önyükleme sunucuları",
    "bootstrap_dns_desc": "DNS Önyükleme sunucuları, seçtiğiniz üst sunucuların DoH/DoT çözücülerine ait ip adreslerinin çözülmesi için kullanılır.",
-    "check_dhcp_servers": "DHCP sunucularını denetle",
-    "save_config": "Yapılandırmayı kaydet",
+    "check_dhcp_servers": "DHCP sunucularını yokla",
+    "save_config": "Ayarları kaydet",
    "enabled_dhcp": "DHCP sunucusu etkinleştirildi",
    "disabled_dhcp": "DHCP sunucusu devre dışı bırakıldı",
    "unavailable_dhcp": "DHCP kullanılamıyor",
    "unavailable_dhcp_desc": "AdGuard Home, işletim sisteminizde DHCP sunucusu çalıştıramıyor",
    "dhcp_title": "DHCP sunucusu (deneysel!)",
-    "dhcp_description": "Yönlendiriciniz DHCP ayarlarını sağlamıyorsa, AdGuard'ın kendi yerleşik DHCP sunucusunu kullanabilirsiniz.",
+    "dhcp_description": "Eğer router'ınız DHCP ayarlarını sunmuyorsa AdGuard'ın dahili DHCP sunucusunu kullanabilirsiniz.",
    "dhcp_enable": "DHCP sunucusunu etkinleştir",
    "dhcp_disable": "DHCP sunucusunu devre dışı bırak",
    "dhcp_not_found": "Yerleşik DHCP sunucusunu etkinleştirmek güvenlidir - Ağ üzerinde herhangi bir aktif DHCP sunucusu bulamadık. Ancak, otomatik testimiz şu anda %100 garanti vermediği için el ile tekrar kontrol etmenizi öneririz.",
@@ -23,15 +21,15 @@
    "dhcp_leases": "DHCP kiralamaları",
    "dhcp_static_leases": "Sabit DHCP kiralamaları",
    "dhcp_leases_not_found": "DHCP kiralaması bulunamadı",
-    "dhcp_config_saved": "DHCP sunucusu yapılandırması kaydedildi",
+    "dhcp_config_saved": "DHCP sunucusu ayarı kaydedildi",
    "dhcp_ipv4_settings": "DHCP IPv4 Ayarları",
    "dhcp_ipv6_settings": "DHCP IPv6 Ayarları",
    "form_error_required": "Gerekli alan",
-    "form_error_ip4_format": "Geçersiz IPv4 biçimi",
-    "form_error_ip6_format": "Geçersiz IPv6 biçimi",
-    "form_error_ip_format": "Geçersiz IP biçimi",
+    "form_error_ip4_format": "Geçersiz IPv4 formatı",
+    "form_error_ip6_format": "Geçersiz IPv6 formatı",
+    "form_error_ip_format": "Geçersiz IPv4 formatı",
    "form_error_mac_format": "Geçersiz MAC biçimi",
-    "form_error_client_id_format": "Geçersiz istemci kimliği biçimi",
+    "form_error_client_id_format": "Geçersiz müşteri kimliği formatı",
    "form_error_positive": "0'dan büyük olmalı",
    "form_error_negative": "0 veya daha büyük olmalıdır",
    "range_end_error": "Başlangıç aralığından daha büyük olmalı",
@@ -45,10 +43,10 @@
    "dhcp_interface_select": "DHCP arayüzünü seç",
    "dhcp_hardware_address": "Donanım adresi",
    "dhcp_ip_addresses": "IP adresleri",
-    "ip": "IP",
-    "dhcp_table_hostname": "Ana bilgisayar Adı",
+    "ip": "IP Adresi",
+    "dhcp_table_hostname": "Bilgisayar Adı",
    "dhcp_table_expires": "Geçerlilik Tarihi",
-    "dhcp_warning": "DHCP sunucusunu yine de etkinleştirmek istiyorsanız, ağınızda başka bir aktif DHCP sunucusu olmadığından emin olun. Aksi takdirde, bağlı cihazlar için interneti kırabilir!",
+    "dhcp_warning": "Dahili DHCP sunucusunu etkinleştirmek istiyorsanız başka aktif DHCP sunucusu olmadığından emin olun. Aksi takdirde cihazlar internete bağlanamayabilir.",
    "dhcp_error": "Ağda başka bir DHCP sunucusu olup olmadığını belirleyemedik.",
    "dhcp_static_ip_error": "DHCP sunucusunu kullanmak için statik bir IP adresi ayarlanmalıdır. Bu ağ arayüzünün statik IP adresi kullanılarak yapılandırılıp yapılandırılmadığını belirleyemedik. Lütfen statik bir IP adresini elle ayarlayın.",
    "dhcp_dynamic_ip_found": "Sisteminiz <0>{{interfaceName}}</0> arayüzü için dinamik IP adresi yapılandırması kullanıyor. DHCP sunucusunu kullanmak için statik bir IP adresi ayarlanmalıdır. Geçerli IP adresiniz <0>{{ipAddress}}</0>. DHCP'yi etkinleştir düğmesine basarsanız bu IP adresini statik IP adresiniz olarak ayarlayacağız.",
@@ -61,10 +59,8 @@
    "country": "Ülke",
    "city": "Şehir",
    "delete_confirm": "\"{{key}}\" silmek istediğinizden emin misiniz?",
-    "form_enter_hostname": "Ana bilgisayar adı girin",
+    "form_enter_hostname": "Cihaz ismi girin",
    "error_details": "Hata detayları",
-    "response_details": "Yanıt ayrıntıları",
-    "request_details": "İstek ayrıntıları",
    "client_details": "İstemci detayları",
    "details": "Detaylar",
    "back": "Geri",
@@ -73,7 +69,6 @@
    "filters": "Filtreler",
    "filter": "Filtre",
    "query_log": "Sorgu Günlüğü",
-    "compact": "Kompakt",
    "nothing_found": "Hiçbir şey bulunamadı",
    "faq": "SSS",
    "version": "Sürüm",
@@ -81,7 +76,7 @@
    "protocol": "Protokol",
    "on": "AÇIK",
    "off": "KAPALI",
-    "copyright": "Telif hakkı",
+    "copyright": "Tüm hakları saklıdır",
    "homepage": "Anasayfa",
    "report_an_issue": "Bir sorun bildir",
    "privacy_policy": "Gizlilik politikası",
@@ -114,7 +109,7 @@
    "number_of_dns_query_to_safe_search": "Güvenli Aramanın zorunlu kıldığı arama motorlarına gönderilen DNS isteklerinin sayısı",
    "average_processing_time": "Ortalama işlem süresi",
    "average_processing_time_hint": "Bir DNS isteğinin mili saniye cinsinden ortalama işlem süresi",
-    "block_domain_use_filters_and_hosts": "Filtre ve ana bilgisayar listelerini kullanarak alan adlarını engelle",
+    "block_domain_use_filters_and_hosts": "Filtreleri ve hosts listelerini kullanarak alan adlarını engelle",
    "filters_block_toggle_hint": "<a>Filtreler</a> sayfasından engelleme kurallarını ayarlayabilirsiniz.",
    "use_adguard_browsing_sec": "AdGuard gezinti koruması web hizmetini kullan",
    "use_adguard_browsing_sec_hint": "AdGuard Home, alan adının gezinti koruması web hizmetinde kara listede olup olmadığını kontrol edecek. Kontrol işlemi gizlilik dostu API kullanılarak yapılacak: yalnızca alan adının kısa bir ön eki SHA256 ile şifrelenip sunucuya gönderilecek.",
@@ -126,9 +121,9 @@
    "general_settings": "Genel ayarlar",
    "dns_settings": "DNS ayarları",
    "dns_blocklists": "DNS engelleme listeleri",
-    "dns_allowlists": "DNS izin verilen listeleri",
+    "dns_allowlists": "DNS izin listeleri",
    "dns_blocklists_desc": "AdGuard Home, engelleme listeleriyle eşleşen alanları engeller.",
-    "dns_allowlists_desc": "DNS izin verilen listelerindeki alanlara, engelleme listelerinden birinde olsalar bile izin verilir.",
+    "dns_allowlists_desc": "DNS izin listelerindeki alanlara, engelleme listelerinden birinde olsalar bile izin verilir.",
    "custom_filtering_rules": "Özel filtreleme kuralları",
    "encryption_settings": "Şifreleme ayarları",
    "dhcp_settings": "DHCP ayarları",
@@ -136,7 +131,7 @@
    "upstream_dns_help": "Her satıra bir sunucu adresi girin. Üst DNS sunucularını yapılandırma hakkında <a>daha fazla bilgi edinin</a>.",
    "upstream_dns_configured_in_file": "{{path}} içinde yapılandırıldı",
    "test_upstream_btn": "Üst sunucuyu test et",
-    "upstreams": "Üst kaynak",
+    "upstreams": "Upstreams",
    "apply_btn": "Uygula",
    "disabled_filtering_toast": "Filtreleme devre dışı",
    "enabled_filtering_toast": "Filtreleme çalışıyor",
@@ -156,11 +151,11 @@
    "edit_table_action": "Düzenle",
    "delete_table_action": "Sil",
    "elapsed": "Geçen zaman",
-    "filters_and_hosts_hint": "AdGuard Home temel reklam engelleme kuralları ve ana bilgisayar dosyalarının sözdizim kurallarını anlamaktadır.",
-    "no_blocklist_added": "Engelleme listesi eklenmedi",
+    "filters_and_hosts_hint": "AdGuard Home temel reklam engelleme kurallarını ve hosts dosyalarının söz dizim kurallarını anlamaktadır.",
+    "no_blocklist_added": "Hiçbir engelleme listesi eklenmedi",
    "no_whitelist_added": "İzin verilen listesi eklenmedi",
    "add_blocklist": "Engelleme listesi ekle",
-    "add_allowlist": "İzin verilen listesine ekle",
+    "add_allowlist": "İzin listesi ekle",
    "cancel_btn": "İptal",
    "enter_name_hint": "İsim girin",
    "enter_url_or_path_hint": "Bir URL ya da listenin tam yolunu girin",
@@ -173,16 +168,16 @@
    "choose_allowlist": "İzin verilen listelerini seç",
    "enter_valid_blocklist": "Engelleme listesine geçerli bir URL girin.",
    "enter_valid_allowlist": "İzin verilen listesine geçerli bir URL girin.",
-    "form_error_url_format": "Geçersiz URL biçimi",
+    "form_error_url_format": "Geçersiz url biçim",
    "form_error_url_or_path_format": "Geçersiz URL ya da listenin tam yolu",
    "custom_filter_rules": "Özel filtreleme kuralları",
-    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklama engelleme kuralı veya ana bilgisayar dosyası sözdizimi kullanabilirsiniz.",
+    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklama engelleme kuralı veya hosts dosyası söz dizimi kullanabilirsiniz.",
    "examples_title": "Örnekler",
    "example_meaning_filter_block": "example.org alan adına ve tüm alt alan adlarına olan erişimi engeller",
    "example_meaning_filter_whitelist": "example.org alan adına ve tüm alt alan adlarına olan erişim engelini kaldırır",
    "example_meaning_host_block": "AdGuard Home bu example.org adresi için 127.0.0.1 adresine yönlendirme yapacaktır (alt alan adları için geçerli değildir)",
    "example_comment": "! Buraya bir yorum ekledim",
-    "example_comment_meaning": "sadece bir yorum",
+    "example_comment_meaning": "yorum eklemek",
    "example_comment_hash": "# Bir yorum daha ekledim",
    "example_regex_meaning": "belirtilen düzenli ifadelerle eşleşen alan adlarına erişimi engelle",
    "example_upstream_regular": "normal DNS (UDP üzerinden)",
@@ -207,7 +202,6 @@
    "domain_or_client": "Alan adı veya istemci",
    "type_table_header": "Tür",
    "response_table_header": "Yanıt",
-    "response_code": "Yanıt kodu",
    "client_table_header": "İstemci",
    "empty_response_status": "Boş",
    "show_all_filter_type": "Tümünü göster",
@@ -226,10 +220,9 @@
    "query_log_filtered": "{{filter}} tarafından filtrelendi",
    "query_log_confirm_clear": "Tüm sorgu günlüğünü temizlemek istediğinizden emin misiniz?",
    "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üklerinin saklanması",
-    "query_log_enable": "Günlüğü etkinleştir",
+    "query_log_clear": "Sorgu kayıtlarını temizle",
+    "query_log_retention": "Sorgu kayıtlarının saklanması",
+    "query_log_enable": "Günlük kaydını etkinleştir",
    "query_log_configuration": "Günlük yapılandırması",
    "query_log_disabled": "Sorgu günlüğü devre dışı bırakıldı ve <0>ayarlar</0>da yapılandırılabilir",
    "query_log_strict_search": "Katı arama için çift tırnak işareti kullanın",
@@ -247,16 +240,14 @@
    "custom_ip": "Özel IP",
    "blocking_ipv4": "IPv4 engelleme",
    "blocking_ipv6": "IPv6 engelleme",
-    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_https": "DNS üzerinden HTTPS",
    "dns_over_tls": "DNS-over-TLS",
    "download_mobileconfig_doh": "DNS-over-HTTPS için .mobileconfig dosyasını indir",
    "download_mobileconfig_dot": "DNS-over-TLS için .mobileconfig dosyasını indir",
-    "plain_dns": "Sade DNS",
    "form_enter_rate_limit": "Sıklık limitini girin",
    "rate_limit": "Sıklık limiti",
    "edns_enable": "EDNS İstemci Alt Ağını Etkinleştir",
    "edns_cs_desc": "Etkinleştirilirse, AdGuard Home, istemcilerin alt ağlarını DNS sunucularına gönderir.",
-    "rate_limit_desc": "Tek bir istemcinin yapmasına izin verilen saniye başına istek sayısı (0'a ayarlamak sınırsız 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",
    "blocking_mode_default": "Varsayılan: Reklam engelleme stili kuralı tarafından engellendiğinde sıfır IP adresiyle (A için 0.0.0.0; AAAA için) yanıt verin; /etc/hosts-style kuralı tarafından engellendiğinde, kuralda belirtilen IP adresiyle yanıt verin",
@@ -277,17 +268,17 @@
    "install_welcome_desc": "AdGuard Home, ağ genelinde reklam ve izleyicileri engelleyen bir DNS sunucusudur. Tüm ağınızı ve tüm cihazlarınızı kontrol etmenize yarayan bir araçtır, istemci tarafında bir program kullanmanıza gerek duymaz.",
    "install_settings_title": "Yönetici Web Arayüzü",
    "install_settings_listen": "Dinleme arayüzü",
-    "install_settings_port": "Bağlantı noktası",
+    "install_settings_port": "Port",
    "install_settings_interface_link": "AdGuard Home yönetici web arayüzü sayfanız şu adresten erişilebilir olacaktır:",
-    "form_error_port": "Geçerli bir bağlantı noktası değeri girin",
+    "form_error_port": "Geçerli bir port değeri girin",
    "install_settings_dns": "DNS sunucusu",
    "install_settings_dns_desc": "Cihazlarınızı veya yönlendiricinizi şu adresteki DNS sunucusunu kullanması için ayarlamanız gerekecek:",
    "install_settings_all_interfaces": "Tüm arayüzler",
    "install_auth_title": "Kimlik Doğrulama",
    "install_auth_desc": "AdAdGuard Home yönetici web arayüzüne erişim için kullanıcı adı ve şifresi oluşturmanız şiddetle tavsiye edilir. Sadece yerel ağınız erişilebilir olsa bile izinsiz giriş yapılmasını engellemek için şifrenizin olması önemlidir.",
    "install_auth_username": "Kullanıcı adı",
-    "install_auth_password": "Parola",
-    "install_auth_confirm": "Parolayı onayla",
+    "install_auth_password": "Şifre",
+    "install_auth_confirm": "Şifreyi onayla",
    "install_auth_username_enter": "Kullanıcı adı girin",
    "install_auth_password_enter": "Şifre girin",
    "install_step": "Adım",
@@ -298,7 +289,7 @@
    "install_devices_router": "Yönlendirici",
    "install_devices_router_desc": "Bu kurulum evdeki yönlendiricinize bağlı tüm cihazlarınızı otomatik olarak kapsar ve her birini elle ayarlamanız gerekmez.",
    "install_devices_address": "AdGuard Home DNS sunucusu şu adresi dinleyecektir",
-    "install_devices_router_list_1": "Yönlendiricinizin ayarlarına girin. Genelde internet tarayıcınızdan bir URL vasıtasıyla erişebilirsiniz (http://192.168.0.1/ veya http://192.168.1.1/ gibi). Sizden parola girmenizi isteyebilir. Hatırlamıyorsanız yönlendiricinizin arkasındaki 'reset' tuşuna basılı tutup fabrika ayarlarına sıfırlayabilirsiniz. Bazı yönlendiriciler belirli uygulamalarla çalışır, bu durumda bilgisayarınıza/telefonunuza kurulması gerekir.",
+    "install_devices_router_list_1": "Yönlendiricinizin ayarlarına girin. Genelde internet tarayıcınızdan bir URL vasıtasıyla erişebilirsiniz (http://192.168.0.1/ veya http://192.168.1.1/ gibi). Sizden şifre girmenizi isteyebilir. Hatırlamıyorsanız yönlendiricinizin arkasındaki 'reset' tuşuna basılı tutup fabrika ayarlarına sıfırlayabilirsiniz. Bazı yönlendiriciler belirli uygulamalarla çalışır, bu durumda bilgisayarınıza/telefonunuza kurulması gerekir.",
    "install_devices_router_list_2": "DHCP/DNS ayarlarını bulun. DNS satırlarını arayın, genelde iki veya üç tanedir, üç rakam girilebilen dört ayrı grup içeren satırdır.",
    "install_devices_router_list_3": "AdGuard Home sunucusunun adresini o kısma yazın.",
    "install_devices_router_list_4": "Bazı yönlendirici tiplerinde özel bir DNS sunucusu ayarlayamazsınız. Bu durumda AdGuard Home'u bir DHCP sunucu olarak ayarlamanız yardımcı olabilir. Aksi halde, yönlendirici modeliniz için <0>DNS sunucularını</0> elle nasıl özelleştirebileceğinizi aramalısınız.",
@@ -322,7 +313,7 @@
    "install_devices_ios_list_3": "Bağlı olduğunuz ağın ismine dokunun.",
    "install_devices_ios_list_4": "DNS alanına AdGuard Home sunucunuzun adreslerini girin.",
    "get_started": "Başlarken",
-    "next": "Sonraki",
+    "next": "İleri",
    "open_dashboard": "Panoyu Aç",
    "install_saved": "Başarıyla kaydedildi",
    "encryption_title": "Şifreleme",
@@ -341,11 +332,11 @@
    "encryption_doq_desc": "Bu bağlantı noktası yapılandırılırsa, AdGuard Home bu bağlantı noktasında DNS-over-QUIC sunucusu çalıştıracaktır. Deneysel ve güvenilir olmayabilir. Ayrıca, şu anda bunu destekleyen çok fazla istemci yok.",
    "encryption_certificates": "Sertifikalar",
    "encryption_certificates_desc": "Şifrelemeyi kullanmak için alan adınız için geçerli bir SSL sertifika zinciri temin etmeniz gerekir. <0>{{link}}</0> adresinden ücretsiz temin edebilirsiniz veya güvenilir Sertifika Otoritelerinden satın alabilirsiniz.",
-    "encryption_certificates_input": "PEM biçimindeki sertifikalarınızı buraya yapıştırın.",
+    "encryption_certificates_input": "PEM formatındaki sertifikalarınızı buraya yapıştırın.",
    "encryption_status": "Durum",
    "encryption_expire": "Bitiş tarihi",
    "encryption_key": "Özel anahtar",
-    "encryption_key_input": "Sertifikanızın PEM biçimi özel anahtarını buraya yapıştırın.",
+    "encryption_key_input": "Sertifikanızın PEM formatı özel anahtarını buraya yapıştırın.",
    "encryption_enable": "Şifrelemeyi etkinleştir (HTTPS, DNS-over-HTTPS ve DNS-over-TLS)",
    "encryption_enable_desc": "Şifrelemeyi etkinleştirirseniz, AdGuard Home yönetici arayüzü HTTPS üzerinden çalışır ve DNS sunucusu DNS-over-HTTPS ve DNS-over-TLS üzerinden gelen istekleri dinler.",
    "encryption_chain_valid": "Sertifika zinciri geçerli",
@@ -354,12 +345,12 @@
    "encryption_key_invalid": "Bu geçersiz bir {{type}} özel anahtar",
    "encryption_subject": "Konu",
    "encryption_issuer": "Sertifikayı veren",
-    "encryption_hostnames": "Ana bilgisayar adları",
+    "encryption_hostnames": "Ana bilgisayar isimleri",
    "encryption_reset": "Şifreleme ayarlarını sıfırlamak istediğinize emin misiniz?",
    "topline_expiring_certificate": "SSL sertifikanızın süresi dolmak üzere. <0>Şifreleme ayarlarını</0> güncelleyin.",
    "topline_expired_certificate": "SSL sertifikanızın süresi dolmuş. <0>Şifreleme ayarlarını</0> güncelleyin.",
-    "form_error_port_range": "80-65535 aralığında geçerli bir bağlantı noktası değeri girin",
-    "form_error_port_unsafe": "Bu güvenli olmayan bir bağlantı noktası",
+    "form_error_port_range": "80-65535 aralığında geçerli bir port değeri girin.",
+    "form_error_port_unsafe": "Bu güvenli olmayan bir port",
    "form_error_equal": "Aynı olmamalı",
    "form_error_password": "Şifreler uyuşmuyor",
    "reset_settings": "Ayarları sıfırla",
@@ -392,7 +383,6 @@
    "form_enter_id": "Tanımlayıcı girin",
    "form_add_id": "Tanımlayıcı ekle",
    "form_client_name": "İstemci ismi girin",
-    "name": "İsim",
    "client_global_settings": "Genel ayarları kullan",
    "client_deleted": "\"{{key}}\" istemcisi başarıyla silindi",
    "client_added": "\"{{key}}\" istemcisi başarıyla eklendi",
@@ -417,8 +407,6 @@
    "dns_privacy": "DNS Gizliliği",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> dizesini kullan.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> dizesini kullan.",
-    "setup_dns_privacy_3": "<0>İşte kullanabileceğiniz yazılımların bir listesi.</0>",
-    "setup_dns_privacy_4": "Bir iOS 14 veya macOS Big Sur cihazında, DNS ayarlarına <highlight>DNS-over-HTTPS</highlight> veya <highlight>DNS-over-TLS</highlight> sunucuları ekleyen özel '.mobileconfig' dosyasını indirebilirsiniz.",
    "setup_dns_privacy_android_1": "Android 9 aslen DNS-over-TLS desteklemektedir. Yapılandırmak için, Ayarlar → Ağ ve internet → Gelişmiş → Özel DNS seçeneğine gidin ve alan adınızı buraya girin.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0>, <1>DNS-over-HTTPS</1> ve <1>DNS-over-TLS</1> desteklemektedir.",
    "setup_dns_privacy_android_3": "<0>Intra</0> Android'e <1>DNS-over-HTTPS</1> desteğini ekler.",
@@ -438,12 +426,12 @@
    "rewrite_confirm_delete": "\"{{key}}\" için DNS yeniden yazımını silmek istediğinize emin misiniz?",
    "rewrite_desc": "Belirli bir alan adı için kolayca özel DNS yanıtı yapılandırmanıza olanak tanır.",
    "rewrite_applied": "Uygulanan Yeniden Yazım kuralı",
-    "rewrite_hosts_applied": "Ana bilgisayar dosyası kuralı tarafından yeniden yazıldı",
+    "rewrite_hosts_applied": "Host dosyası kuralı tarafından yeniden yazıldı",
    "dns_rewrites": "DNS yeniden yazımları",
    "form_domain": "Alan adı girin",
    "form_answer": "IP adresini veya alan adı girin",
-    "form_error_domain_format": "Geçersiz alan adı biçimi",
-    "form_error_answer_format": "Geçersiz cevap biçimi",
+    "form_error_domain_format": "Geçersiz alan adı formatı",
+    "form_error_answer_format": "Geçersiz cevap formatı",
    "configure": "Yapılandır",
    "main_settings": "Ana ayarlar",
    "block_services": "Belirli hizmetleri engelle",
@@ -497,35 +485,32 @@
    "network": "Ağ",
    "descr": "Açıklama",
    "whois": "Whois",
-    "filtering_rules_learn_more": "Kendi ana bilgisayar listelerinizi oluşturma hakkında <0>daha fazla bilgi edinin</0></0>.",
+    "filtering_rules_learn_more": "Ana makinelere dair kendi kara listelerinizi oluşturmakla alakalı <0>daha fazla bilgi edinin</0>.",
    "blocked_by_response": "Cevap olarak CNAME veya IP tarafından engellendi",
    "blocked_by_cname_or_ip": "CNAME veya IP tarafından engellendi",
    "try_again": "Tekrar deneyin",
    "domain_desc": "Yeniden yazılmasını istediğiniz alan adını veya joker karakteri girin.",
    "example_rewrite_domain": "cevapları yalnızca bu alan adı için yeniden yaz.",
    "example_rewrite_wildcard": "tüm <0>example.org</0> alt alanları için cevapları yeniden yaz.",
-    "rewrite_ip_address": "IP adresi: bu IP'yi A veya AAAA yanıtında kullanın",
    "rewrite_domain_name": "Alan adı: bir CNAME kaydı ekleyin",
-    "rewrite_A": "<0>A</0>: özel değer, üst sunucudan gelen <0>A</0> kayıtlarını tut",
-    "rewrite_AAAA": "<0>AAA</0>: özel değer, üst sunucudan gelen <0>AAA</0> kayıtlarını tut",
    "disable_ipv6": "IPv6'yı Devre Dışı Bırak",
    "disable_ipv6_desc": "Bu özelliği etkinleştirirseniz, IPv6 adresleri (AAAA tipi) için gönderilen tüm DNS istekleri cevapsız bırakılacaktır.",
    "fastest_addr": "En hızlı IP adresi",
    "fastest_addr_desc": "Tüm DNS sunucularını sorgulayın ve tüm yanıtlar arasından en hızlı IP adresini döndürün. Bu, tüm DNS sunucularından yanıt beklememiz gerektiğinden DNS sorgularını yavaşlatacak ancak genel bağlantıyı iyileştirecektir.",
    "autofix_warning_text": "\"Düzelt\" i tıklatırsanız, AdGuardHome sisteminizi AdGuardHome DNS sunucusunu kullanacak şekilde yapılandırır.",
-    "autofix_warning_list": "Bu görevleri gerçekleştirecek: <0>Sistem DNSStubListener'ı devre dışı bırakın</0> <0>DNS sunucusu adresini 127.0.0.1 olarak ayarlayın</0> <0>/etc/resolv.conf'un sembolik bağlantı hedefini /run/systemd/resolve/resolv.conf ile değiştirin<0> <0>DNSStubListener'ı durdurun (systemd çözümlenmiş hizmeti yeniden yükleyin)</0>",
-    "autofix_warning_result": "Sonuç olarak, sisteminizden gelen tüm DNS istekleri varsayılan olarak AdGuard Home tarafından işlenecektir.",
+    "autofix_warning_list": "Bu görevleri gerçekleştirecektir: <0> sistemi DNSStubListener'ı devre dışı bırakma </0> <0> DNS sunucu adresini 127.0.0.1 olarak ayarlayın </0> <0> /etc/resolv.conf / / run / systemd sembolik bağlantı hedefini değiştirin /resolve/resolv.conf </0> <0> durdur DNSStubListener (sistemde yeniden çözülmüş hizmeti yeniden yükle) </0>",
+    "autofix_warning_result": "Sonuç olarak, sisteminizden gelen tüm DNS istekleri varsayılan olarak AdGuardHome tarafından işlenir.",
    "tags_title": "Etiketler",
-    "tags_desc": "Müşteriye karşılık gelen etiketleri seçebilirsiniz. Etiketler filtreleme kurallarına dahil edilebilir ve bunları daha doğru uygulamanıza olanak tanır. <0>Daha fazla bilgi edinin</0>",
-    "form_select_tags": "İstemci etiketlerini seçin",
-    "check_title": "Filtrelemeyi denetleyin",
+    "tags_desc": "İstemciye karşılık gelen etiketleri seçebilirsiniz. Etiketler, filtreleme kurallarına dahil edilebilir ve bunları daha doğru bir şekilde uygulamanıza olanak tanır. <0> Daha fazla bilgi edinin </0>",
+    "form_select_tags": "Müşteri etiketlerini seçin",
+    "check_title": "Filtrelemeyi kontrol edin",
    "check_desc": "Ana bilgisayar adının filtrelenip filtrelenmediğini kontrol edin",
-    "check": "Denetle",
-    "form_enter_host": "Ana bilgisayar adı girin",
+    "check": "Kontrol",
+    "form_enter_host": "Bir ana bilgisayar adı girin",
    "filtered_custom_rules": "Özel filtreleme kurallarına göre filtrelendi",
    "choose_from_list": "Listeden seç",
    "add_custom_list": "Özel bir liste ekle",
-    "host_whitelisted": "Ana bilgisayar beyaz listeye eklendi",
+    "host_whitelisted": "Ana makine beyaz listeye alındı",
    "check_ip": "IP adresleri: {{ip}}",
    "check_cname": "CNAME: {{cname}}",
    "check_reason": "Sebep: {{reason}}",
@@ -536,7 +521,7 @@
    "client_confirm_block": "\"{{ip}}\" istemcisini engellemek istediğinizden emin misiniz?",
    "client_confirm_unblock": "\"{{ip}}\" istemcisinin engellemesini kaldırmak istediğinizden emin misiniz?",
    "client_blocked": "\"{{ip}}\" istemcisi başarıyla engellendi",
-    "client_unblocked": "\"{{ip}}\" istemcinin engellemesi başarıyla kaldırıldı",
+    "client_unblocked": "\"{{ip}}\" müşterisinin engellemesi başarıyla kaldırıldı",
    "static_ip": "Statik IP adres",
    "static_ip_desc": "AdGuard Home bir sunucudur, bu nedenle düzgün çalışması için statik bir IP adresine ihtiyaç duyar. Aksi takdirde, bir noktada yönlendiriciniz bu cihaza farklı bir IP adresi atayabilir.",
    "set_static_ip": "Statik IP adresi ayarlama",
@@ -548,7 +533,6 @@
    "list_updated_plural": "{{count}} liste güncellendi",
    "dnssec_enable": "DNSSEC'i etkinleştir",
    "dnssec_enable_desc": "DNSSEC'i giden DNS sorguları için etkinleştir ve sonucu kontrol et (DNSSEC-etkin sorgulama gerekli)",
-    "validated_with_dnssec": "DNSSEC ile doğrulandı",
    "all_queries": "Tüm sorgular",
    "show_blocked_responses": "Engellendi",
    "show_whitelisted_responses": "Beyaz listeye eklendi",
@@ -558,7 +542,6 @@
    "blocked_threats": "Engellenen Tehditler",
    "allowed": "İzin verildi",
    "filtered": "Filtrelenmiş",
-    "rewritten": "Yeniden yazılan",
    "safe_search": "Güvenli arama",
    "blocklist": "Engelleme listesi",
    "milliseconds_abbreviation": "ms",
@@ -578,13 +561,10 @@
    "filter_category_other": "Diğer",
    "filter_category_general_desc": "Çoğu cihazda izlemeyi ve reklamları engelleyen listeler",
    "filter_category_security_desc": "Kötü amaçlı yazılım, kimlik avı veya dolandırıcılık alanlarını engelleme konusunda özelleştirilmiş listeler",
-    "filter_category_regional_desc": "Bölgesel reklamlara ve izleme sunucularına odaklanan listeler",
    "filter_category_other_desc": "Diğer engelleme listeleri",
    "setup_config_to_enable_dhcp_server": "DHCP sunucusunu etkinleştirmek için kurulum yapılandırması",
-    "original_response": "Esas yanıt",
    "click_to_view_queries": "Sorguları görmek için tıklayın",
    "port_53_faq_link": "Port 53 genellikle \"DNSStubListener\" veya \"sistemd-resolved\" hizmetler tarafından kullanılır. Lütfen problemin nasıl çözüleceğine ilişkin <0>bu talimatı</0> okuyun.",
    "adg_will_drop_dns_queries": "AdGuard Home, bu istemciden gelen tüm DNS sorgularını iptal eder.",
-    "client_not_in_allowed_clients": "İstemciye \"İzin verilen istemciler\" listesinde olmadığı için izin verilmiyor.",
    "experimental": "Deneysel"
 }
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -1,7 +1,6 @@
 {
    "client_settings": "Cài đặt máy khách",
    "example_upstream_reserved": "bạn có thể chỉ định DNS ngược tuyến <0>cho một tên miền cụ thể(hoặc nhiều)</0>",
-    "example_upstream_comment": "Bạn có thể thêm chú thích cụ thể",
    "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
    "parallel_requests": "Yêu cầu song song",
    "load_balancing": "Cân bằng tải",
@@ -133,7 +132,6 @@
    "encryption_settings": "Cài đặt mã hóa",
    "dhcp_settings": "Cài đặt DHCP",
    "upstream_dns": "Máy chủ DNS tìm kiếm",
-    "upstream_dns_configured_in_file": "Cấu hình tại {{path}}",
    "test_upstream_btn": "Kiểm tra",
    "upstreams": "Nguồn",
    "apply_btn": "Áp dụng",
@@ -187,7 +185,6 @@
    "example_upstream_regular": "DNS thông thường (dùng UDP)",
    "example_upstream_dot": "được mã hoá <0>DNS-over-TLS</0>",
    "example_upstream_doh": "được mã hoá <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "được mã hoá <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "bạn có thể sử dụng <0>DNS Stamps</0> for <1>DNSCrypt</1> hoặc <2>DNS-over-HTTPS</2> ",
    "example_upstream_tcp": "DNS thông thường(dùng TCP)",
    "all_lists_up_to_date_toast": "Tất cả danh sách đã ở phiên bản mới nhất",
@@ -196,7 +193,6 @@
    "dns_test_not_ok_toast": "Máy chủ \"\"': không thể sử dụng, vui lòng kiểm tra lại",
    "unblock": "Bỏ chặn",
    "block": "Chặn",
-    "disallow_this_client": "Không cho phép client này",
    "time_table_header": "Thời gian",
    "date": "Ngày",
    "domain_name_table_header": "Tên miền",
@@ -238,7 +234,6 @@
    "blocking_mode": "Chế độ chặn",
    "default": "Mặc định",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Địa chỉ IP rỗng",
    "custom_ip": "IP tuỳ chỉnh",
    "blocking_ipv4": "Chặn IPv4",
@@ -250,10 +245,8 @@
    "rate_limit": "Giới hạn yêu cầu",
    "edns_enable": "Bật mạng con EDNS Client",
    "edns_cs_desc": "Nếu được bật, AdGuard Home sẽ gửi các mạng con của khách hàng đến các máy chủ DNS.",
-    "rate_limit_desc": "Số lượng yêu cầu mỗi giây mà một khách hàng được phép thực hiện (0: không giới hạn)",
    "blocking_ipv4_desc": "Địa chỉ IP được trả lại cho một yêu cầu A bị chặn",
    "blocking_ipv6_desc": "Địa chỉ IP được trả lại cho một yêu cầu AAA bị chặn",
-    "blocking_mode_default": "Mặc định: Trả lời với NXDOMAIN khi bị chặn bởi quy tắc kiểu Adblock; phản hồi với địa chỉ IP được chỉ định trong quy tắc khi bị chặn bởi quy tắc / etc / hosts-style",
    "blocking_mode_nxdomain": "NXDOMAIN: Phản hổi với mã NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: Trả lời bằng không địa chỉ IP (0.0.0.0 cho A; :: cho AAAA)",
    "blocking_mode_custom_ip": "IP tùy chỉnh: Phản hồi với địa chỉ IP đã được tiết lập",
@@ -408,7 +401,6 @@
    "dns_privacy": "DNS Riêng Tư",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
-    "setup_dns_privacy_4": "Trên thiết bị chạy iOS 14 hoặc macOS Big Sur bạn có thể tải tệp '.mobileconfig' đặc biệt có chứa máy chủ <highlight>DNS-over-HTTPS</highlight> hoặc <highlight>DNS-over-TLS</highlight> trong thiết lập DNS.",
    "setup_dns_privacy_android_1": "Android 9 hỗ trợ DNS trên TLS nguyên bản. Để định cấu hình, hãy đi tới Cài đặt → Mạng & internet → Nâng cao → DNS Riêng Tư và nhập tên miền của bạn vào đó.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> hỗ trợ <1>DNS-over-HTTPS</1> và <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> thêm <1>DNS-over-HTTPS</1> hỗ trợ cho Android.",
@@ -553,8 +545,6 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "Kích thước cache",
    "cache_size_desc": "Kích thước cache DNS (bytes)",
-    "cache_ttl_min_override": "Ghi đè TTL tối thiểu",
-    "cache_ttl_max_override": "Ghi đè TTL tối đa",
    "filter_category_general": "Chung",
    "filter_category_security": "Bảo mật",
    "filter_category_regional": "Khu vực",
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -1,6 +1,6 @@
 {
    "client_settings": "客户端设置",
-    "example_upstream_reserved": "您可以<0>为特定域名</0>指定上游 DNS 服务器",
+    "example_upstream_reserved": "您可以将上游DNS 服务器<0>指定为特定域名</0>",
    "example_upstream_comment": "您可以指定注解",
    "upstream_parallel": "通过同时查询所有上游服务器，使用并行请求以加速解析",
    "parallel_requests": "并行请求",
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -2,12 +2,12 @@
    "client_settings": "用戶端設定",
    "example_upstream_reserved": "您可以<0>指定網域</0>使用特定 DNS 查詢",
    "example_upstream_comment": "您可以指定註解",
-    "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來加速解析結果",
+    "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來來加速解析結果",
    "parallel_requests": "平行處理",
-    "load_balancing": "負載平衡",
+    "load_balancing": "負載平衝",
    "load_balancing_desc": "一次只查詢一個伺服器。AdGuard Home 會使用加權隨機取樣來選擇使用的查詢結果，以確保速度最快的伺服器能被充分運用。",
    "bootstrap_dns": "引導（Boostrap） DNS 伺服器",
-    "bootstrap_dns_desc": "Bootstrap DNS 伺服器用於解析您所設定的上游 DoH/DoT 解析器的 IP 地址",
+    "bootstrap_dns_desc": "引導（Bootstrap）DNS 伺服器用來解析 DoH/DoT 的域名 IP。",
    "check_dhcp_servers": "檢查 DHCP 伺服器",
    "save_config": "儲存設定",
    "enabled_dhcp": "DHCP 伺服器已啟動",
@@ -117,9 +117,9 @@
    "block_domain_use_filters_and_hosts": "使用過濾器與 hosts 檔案阻擋網域查詢",
    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設定封鎖規則。",
    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
-    "use_adguard_browsing_sec_hint": "AdGuard Home 將比對查詢網域是否在瀏覽安全服務黑名單內。AdGuard Home 選擇使用尊重個人隱私的 API 進行比對，先透過 SHA256 將網域編碼，取前置字串傳送到伺服器進行比對。",
+    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查查詢網域是否在瀏覽安全服務黑名單內。它使用尊重個人隱私的 API 來進行檢查：會先透過 SHA256 將網域編碼後取簡短前置字串傳送到伺服器核對。",
    "use_adguard_parental": "使用 AdGuard 家長監護功能",
-    "use_adguard_parental_hint": "AdGuard Home 將比對查詢網域是否含有成人內容。它使用與 AdGuard 瀏覽安全一樣的尊重個人隱私的 API 來進行檢查。",
+    "use_adguard_parental_hint": "AdGuard Home 將檢查查詢網域是否含有成人內容。它使用與 AdGuard 瀏覽安全一樣的尊重個人隱私的 API 來進行檢查。",
    "enforce_safe_search": "強制使用安全搜尋",
    "enforce_save_search_hint": "AdGuard Home 可在下列搜尋引擎使用強制安全搜尋：Google、YouTube、Bing、DuckDuckGo 和 Yandex。",
    "no_servers_specified": "沒有指定的伺服器",
@@ -133,8 +133,8 @@
    "encryption_settings": "加密設定",
    "dhcp_settings": "DHCP 設定",
    "upstream_dns": "上游 DNS 伺服器",
-    "upstream_dns_help": "每行輸入一個伺服器位址。<a>了解更多</a>有關設定上游 DNS 伺服器的內容",
-    "upstream_dns_configured_in_file": "設定在 {{path}}",
+    "upstream_dns_help": "每行輸入一個伺服器位址。<a>了解更多</a>有關配置上遊 DNS 伺服器的內容",
+    "upstream_dns_configured_in_file": "被配置在 {{path}}",
    "test_upstream_btn": "測試上游 DNS",
    "upstreams": "上游",
    "apply_btn": "套用",
@@ -188,19 +188,19 @@
    "example_upstream_regular": "一般 DNS（透過 UDP）",
    "example_upstream_dot": "<0>DNS-over-TLS</0>（流量加密）",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0>（流量加密）",
-    "example_upstream_doq": "加密 <0>DNS-over-QUIC</0>",
+    "example_upstream_doq": "加密的<0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "您可以使透過 <0>DNS Stamps</0> 來解析  <1>DNSCrypt</1> 或 <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "一般 DNS（透過 TCP）",
-    "all_lists_up_to_date_toast": "所有清單已更新至最新",
+    "all_lists_up_to_date_toast": "所有清單已經是最新的",
    "updated_upstream_dns_toast": "已更新上游 DNS 伺服器",
    "dns_test_ok_toast": "設定中的 DNS 上游運作正常",
-    "dns_test_not_ok_toast": "DNS 設定中的 \"{{key}}\" 出現錯誤，請確認是否正確輸入",
+    "dns_test_not_ok_toast": "設定中的 \"{{key}}\" DNS 出現錯誤，請檢察拼字",
    "unblock": "解除封鎖",
    "block": "封鎖",
    "disallow_this_client": "不允許此用戶端",
    "allow_this_client": "允許此用戶端",
-    "block_for_this_client_only": "僅封鎖此用戶端",
-    "unblock_for_this_client_only": "僅解除封鎖此用戶端",
+    "block_for_this_client_only": "僅為此用戶端封鎖",
+    "unblock_for_this_client_only": "僅為此用戶端解除封鎖",
    "time_table_header": "時間",
    "date": "日期",
    "domain_name_table_header": "域名",
@@ -254,7 +254,7 @@
    "plain_dns": "一般未加密 DNS",
    "form_enter_rate_limit": "輸入速率限制",
    "rate_limit": "速率限制",
-    "edns_enable": "啟用 EDNS Client Subnet",
+    "edns_enable": "編輯 EDNS 用戶端子網路",
    "edns_cs_desc": "開啟後 AdGuard Home 將會傳送用戶端的子網路給 DNS 伺服器。",
    "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
    "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
@@ -331,14 +331,14 @@
    "encryption_server": "伺服器名稱",
    "encryption_server_enter": "輸入您的網域名稱",
    "encryption_server_desc": "要使用 HTTPS，您必須輸入與您 SSL 憑證相符的伺服器名稱。",
-    "encryption_redirect": "自動重新導向到 HTTPS",
+    "encryption_redirect": "自重新導向到 HTTPS",
    "encryption_redirect_desc": "如果啟用，AdGuard Home 將會自動導向 HTTP 到 HTTPS。",
    "encryption_https": "HTTPS 連接埠",
    "encryption_https_desc": "如果已設定 HTTPS，AdGuard Home 網頁管理介面將會使用 HTTPS 來存取，且「/dns-query」也提供 DNS-over-HTTPS 查詢。",
    "encryption_dot": "DNS-over-TLS 連接埠",
    "encryption_dot_desc": "如果已設定此連接埠，AdGuard Home 將啟動 DNS-over-TLS 伺服器來監聽請求。",
-    "encryption_doq": "DNS-over-QUIC 連接埠",
-    "encryption_doq_desc": "若設定此連接埠，AdGuard Home 將在此連接埠上運行 DNS-over-QUIC 服務。此功能還是實驗性功能，可能並不可靠。此外目前還沒有太多客戶端支援。",
+    "encryption_doq": "DNS-over-QUIC端口",
+    "encryption_doq_desc": "如果此端口被配置了, AdGuard Home將會在此端口運行DNS-over-QUIC服務. 這目前還是實驗性的功能，可能不可靠. 另外,目前還沒有大量支持它的客戶端",
    "encryption_certificates": "憑證",
    "encryption_certificates_desc": "要使用加密連線，必須擁有一個有效的 SSL 憑證對應您的網域。您可以從<0>{{link}}</0>取得免費的 SSL 憑證或從受信任的 SSL 憑證簽發機構購買。",
    "encryption_certificates_input": "在這裡複製/貼上您的 PEM 憑證。",
@@ -370,7 +370,7 @@
    "dns_status_error": "檢查 DNS 伺服器狀態錯誤",
    "down": "離線",
    "fix": "修正",
-    "dns_providers": "下列為常見的<0> DNS 伺服器</0>。",
+    "dns_providers": "下列是可以使用的<0>軟體清單</0>。",
    "update_now": "立即更新",
    "update_failed": "自動更新發生錯誤。請嘗試依照<a>以下步驟</a> 來手動更新。",
    "processing_update": "請稍候，AdGuard Home 正在更新",
@@ -393,7 +393,7 @@
    "form_add_id": "新增識別碼",
    "form_client_name": "輸入用戶端名稱",
    "name": "名稱",
-    "client_global_settings": "使用全域設定",
+    "client_global_settings": "Use global settings",
    "client_deleted": "已刪除「{{key}}」",
    "client_added": "已新增「{{key}}」",
    "client_updated": "已更新「{{key}}」",
@@ -418,13 +418,13 @@
    "setup_dns_privacy_1": "<0>DNS-over-TLS：</0>使用 <1>{{address}}</1>。",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS：</0>使用 <1>{{address}}</1>。",
    "setup_dns_privacy_3": "<0>以下是您可以使用軟體的列表</0>",
-    "setup_dns_privacy_4": "在 iOS 14 或 macOS Big Sur 裝置上，您可以下載特定的 '.mobileconfig' 檔案。此檔案將<highlight>DNS-over-HTTPS</highlight> 或 <highlight>DNS-over-TLS</highlight> 伺服器新增至 DNS 設定。",
-    "setup_dns_privacy_android_1": "Android 9 原生支援 DNS-over-TLS。前往「設定」→「網路 & 網際網路」→「進階」→「私人 DNS」設定。",
+    "setup_dns_privacy_4": "在 iOS 14 或 macOS Big Sur 裝置上，您可以下載特定的 '.mobileconfig' 檔案。此檔案將<highlight>DNS-over-HTTPS</highlight> 或 <highlight>DNS-over-TLS</highlight> 伺服器添加至 DNS 設定。",
+    "setup_dns_privacy_android_1": "Android 9 原生支援 DNS-over-TLS。前網「設定」→「網路 & 網際網路」→「進階」→「私人 DNS」設定。",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> 支援  <1>DNS-over-HTTPS</1> 與 <1>DNS-over-TLS</1>。",
    "setup_dns_privacy_android_3": "<0>Intra</0> 對 Android 新增支援 <1>DNS-over-HTTPS</1>。",
    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> 支援 <1>DNS-over-HTTPS</1>，若要使用您必須先產生 <2>DNS Stamp</2>。",
    "setup_dns_privacy_ios_2": "<0>AdGuard for iOS</0> 支援 <1>DNS-over-HTTPS</1> 與 <1>DNS-over-TLS</1> 設定。",
-    "setup_dns_privacy_other_title": "其他實作方式",
+    "setup_dns_privacy_other_title": "其他實作軟體",
    "setup_dns_privacy_other_1": "AdGuard Home 本身在任何平台都是安全的 DNS 用戶端。",
    "setup_dns_privacy_other_2": "<0>dnsproxy</0> 支援所有加密 DNS 協定。",
    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> 支援 <1>DNS-over-HTTPS</1>。",
@@ -440,7 +440,7 @@
    "rewrite_applied": "已套用 DNS 覆寫規則",
    "rewrite_hosts_applied": "由「hosts 檔案」覆寫",
    "dns_rewrites": "DNS 覆寫",
-    "form_domain": "輸入網域名稱或使用 wildcard 字元。",
+    "form_domain": "輸入網域名稱或使用萬用字元。",
    "form_answer": "輸入 IP 或網域名稱",
    "form_error_domain_format": "網域格式無效",
    "form_error_answer_format": "回應格式無效",
@@ -497,11 +497,11 @@
    "network": "網路",
    "descr": "描述",
    "whois": "Whois",
-    "filtering_rules_learn_more": "<0>進一步了解</0>如何創建自己的「hosts 檔案」",
+    "filtering_rules_learn_more": "<0>進一步了解</0>關於創建自己的「hosts 檔案」",
    "blocked_by_response": "回應時被 CNAME 或 IP 封鎖",
    "blocked_by_cname_or_ip": "使用 CNAME 或 IP 封鎖",
    "try_again": "再試一次",
-    "domain_desc": "輸入您想要覆寫的網域或 wildcard 字元。",
+    "domain_desc": "輸入您想要覆寫的網域或萬用字元。",
    "example_rewrite_domain": "DNS 覆寫只套用在這個域名。",
    "example_rewrite_wildcard": "DNS 覆寫會套用在 <0>example.org</0> 及所有子域名。",
    "rewrite_ip_address": "IP 位址：使用 A 或 AAAA 紀錄回應",
@@ -509,20 +509,20 @@
    "rewrite_A": "<0>A</0>: 特殊值，將上游查詢結果覆寫 <0>A</0> 紀錄",
    "rewrite_AAAA": "<0>AAAA</0>: 特殊值，將上游查詢結果覆寫 <0>AAAA</0> 紀錄",
    "disable_ipv6": "停用 IPv6",
-    "disable_ipv6_desc": "開啟此功能後，將捨棄所有對 IPv6 位址（AAAA）的查詢。",
+    "disable_ipv6_desc": "開啟此功能後所有，所有對於 IPv6 位址（AAAA）的查詢都會被捨棄。",
    "fastest_addr": "Fastest IP 位址",
-    "fastest_addr_desc": "從所有 DNS 伺服器查詢中回應最快的 IP 位址。但這操作會等待所有 DNS 查詢結果後才能回應，導致速度有所降低，不過同時卻也改善了整體連線品質。",
+    "fastest_addr_desc": "從所有 DNS 伺服器查詢中回應最快的 IP 位址",
    "autofix_warning_text": "如果您點擊「修復」，AdGuard Home 將更改您的系統 DNS 設定更改為 AdGuard Home DNS 伺服器",
    "autofix_warning_list": "它將執行這些任務：<0>停用系統 DNSStubListener</0> <0>將 DNS 設定為 127.0.0.1</0> <0>更換軟連結將 /etc/resolv.conf 為 /run/systemd/resolve/resolv.conf</0> <0>停止 DNSStubListener（重新載入 systemd-resolved）</0>",
    "autofix_warning_result": "就結論來說 DNS 請求預設由本機的 AdGuard Home 處理。",
    "tags_title": "標籤",
-    "tags_desc": "可在此指定用戶端的標籤。標籤可包含在過濾規則內，並且在指定上更為精確。\n<0>進一步了解</0>",
+    "tags_desc": "您可以選擇與用戶端相對應的標籤。標籤可已包含在過濾規則內且使用上更精確。\n<0>進一步了解</0>",
    "form_select_tags": "選擇用戶端標籤",
    "check_title": "過濾檢查",
    "check_desc": "檢查網域是否被封鎖",
    "check": "檢查",
    "form_enter_host": "輸入網域",
-    "filtered_custom_rules": "已套用自訂規則",
+    "filtered_custom_rules": "被自訂過濾規則封鎖",
    "choose_from_list": "從清單中選取",
    "add_custom_list": "新增自訂清單",
    "host_whitelisted": "主機已列入白名單",
@@ -569,7 +569,7 @@
    "enter_cache_size": "輸入快取大小（bytes）",
    "enter_cache_ttl_min_override": "輸入最小 TTL 值（秒）",
    "enter_cache_ttl_max_override": "輸入最大 TTL 值（秒）",
-    "cache_ttl_min_override_desc": "快取 DNS 回應時，延長從上游伺服器收到的 TTL 值 (秒）",
+    "cache_ttl_min_override_desc": "快取 DNS 回應時，延長從上遊伺服器收到的 TTL 值 (秒）",
    "cache_ttl_max_override_desc": "設定 DNS 快取條目的最大 TTL 值（秒）",
    "ttl_cache_validation": "最小快取 TTL 值必須小於或等於最大值",
    "filter_category_general": "一般",
@@ -584,7 +584,7 @@
    "original_response": "原始回應",
    "click_to_view_queries": "按一下以檢視查詢結果",
    "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
-    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。",
+    "adg_will_drop_dns_queries": "AdGuard Home 將要終止所有來自此用戶端的 DNS 查詢。",
    "client_not_in_allowed_clients": "此用戶端不被允許，它不在\"允許的用戶端\"列表中。",
    "experimental": "實驗性"
 }
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -1,6 +1,6 @@
 {
    "client_settings": "用戶端設定",
-    "example_upstream_reserved": "您可以<0>為特定網域</0>指定上游 DNS",
+    "example_upstream_reserved": "您可明確指定<0>用於特定的網域</0>之 DNS 上游",
    "example_upstream_comment": "您可明確指定註解",
    "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析網域",
    "parallel_requests": "並行的請求",
@@ -74,7 +74,7 @@
    "filter": "過濾器",
    "query_log": "查詢記錄",
    "compact": "精簡的",
-    "nothing_found": "沒找到什麼",
+    "nothing_found": "無什麼被找到",
    "faq": "常見問答集",
    "version": "版本",
    "address": "位址",
@@ -259,7 +259,7 @@
    "rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（設定它為 0 表示無限制的）",
    "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
    "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
-    "blocking_mode_default": "預設：當被 AdBlock 樣式的規則封鎖時，以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
+    "blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
    "blocking_mode_refused": "已拒絕（REFUSED）：以 REFUSED 碼回覆",
    "blocking_mode_nxdomain": "不存在的網域（NXDOMAIN）：以 NXDOMAIN 碼回覆",
    "blocking_mode_null_ip": "無效的 IP：以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆",
@@ -284,7 +284,7 @@
    "install_settings_dns_desc": "您將需要配置您的裝置或路由器以使用於下列的位址上之 DNS 伺服器：",
    "install_settings_all_interfaces": "所有的介面",
    "install_auth_title": "驗證",
-    "install_auth_desc": "我們強烈建議您設定 AdGuard Home 管理員網路介面密碼。即使它僅能在您的區域網路中使用，保護它免於不受限制的存取仍然很重要。",
+    "install_auth_desc": "配置屬於您的 AdGuard Home 管理員網路介面之密碼驗證是被非常建議的。即使它僅在您的區域網路中為可存取的，保護它免於不受限制的存取為仍然重要的。",
    "install_auth_username": "使用者名稱",
    "install_auth_password": "密碼",
    "install_auth_confirm": "確認密碼",
@@ -585,6 +585,6 @@
    "click_to_view_queries": "點擊以檢視查詢",
    "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。",
    "adg_will_drop_dns_queries": "AdGuard Home 將持續排除來自此用戶端之所有的 DNS 查詢。",
-    "client_not_in_allowed_clients": "該用戶端未被允許，因為它不在\"已允許的用戶端\"清單中。",
+    "client_not_in_allowed_clients": "因為該用戶端不在\"已允許的用戶端\"清單中，它未被允許。",
    "experimental": "實驗性的"
 }
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -287,7 +287,7 @@ export const getDnsStatus = () => async (dispatch) => {
    try {
        checkStatus(handleRequestSuccess, handleRequestError);
    } catch (error) {
-        handleRequestError();
+        handleRequestError(error);
    }
 };

--- a/client/src/actions/queryLogs.js
+++ b/client/src/actions/queryLogs.js
@@ -8,11 +8,11 @@ import {
 import { addErrorToast, addSuccessToast } from './toasts';

 const enrichWithClientInfo = async (logs) => {
-    const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id');
+    const clientsParams = getParamsForClientsSearch(logs, 'client');

    if (Object.keys(clientsParams).length > 0) {
        const clients = await apiClient.findClients(clientsParams);
-        return addClientInfo(logs, clients, 'client_id', 'client');
+        return addClientInfo(logs, clients, 'client');
    }

    return logs;
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -1,9 +1,9 @@
 :root {
    --yellow-pale: rgba(247, 181, 0, 0.1);
-    --green79: #67b279;
+    --green79: #67B279;
    --gray-a5: #a5a5a5;
    --gray-d8: #d8d8d8;
-    --gray-f3: #f3f3f3;
+    --gray-f3: #F3F3F3;
    --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
 }

@@ -13,12 +13,6 @@ body {
    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
 }

-@media screen and (max-width: 767px) {
-    input, select, textarea {
-        font-size: 16px !important;
-    }
-}
-
 .status {
    margin-top: 30px;
 }
@@ -77,11 +71,3 @@ body {
 .button-action--active {
    visibility: visible;
 }
-
-.ReactModal__Body--open {
-    overflow: hidden;
-}
-
-a.btn-success.disabled {
-    color: #fff;
-}
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -9,7 +9,7 @@ import Card from '../ui/Card';
 import Cell from '../ui/Cell';

 import { getPercent, sortIp } from '../../helpers/helpers';
-import { BLOCK_ACTIONS, R_CLIENT_ID, STATUS_COLORS } from '../../helpers/constants';
+import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
 import { toggleClientBlock } from '../../actions/access';
 import { renderFormattedClientCell } from '../../helpers/renderFormattedClientCell';
 import { getStats } from '../../actions/stats';
@@ -35,10 +35,6 @@ const CountCell = (row) => {
 };

 const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
-    if (R_CLIENT_ID.test(ip)) {
-        return null;
-    }
-
    const dispatch = useDispatch();
    const { t } = useTranslation();
    const processingSet = useSelector((state) => state.access.processingSet);
@@ -63,19 +59,17 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
    const text = disallowed ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;

    const isNotInAllowedList = disallowed && disallowed_rule === '';
-    return (
-        <div className="table__action pl-4">
-            <button
+    return <div className="table__action pl-4">
+        <button
                type="button"
                className={buttonClass}
                onClick={isNotInAllowedList ? undefined : onClick}
                disabled={isNotInAllowedList || processingSet}
                title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
-            >
-                <Trans>{text}</Trans>
-            </button>
-        </div>
-    );
+        >
+            <Trans>{text}</Trans>
+        </button>
+    </div>;
 };

 const ClientCell = (row) => {
@@ -96,14 +90,13 @@ const Clients = ({
    const { t } = useTranslation();
    const topClients = useSelector((state) => state.stats.topClients, shallowEqual);

-    return (
-        <Card
+    return <Card
            title={t('top_clients')}
            subtitle={subtitle}
            bodyType="card-table"
            refresh={refreshButton}
-        >
-            <ReactTable
+    >
+        <ReactTable
                data={topClients.map(({
                    name: ip, count, info, blocked,
                }) => ({
@@ -114,7 +107,7 @@ const Clients = ({
                }))}
                columns={[
                    {
-                        Header: <Trans>client_table_header</Trans>,
+                        Header: 'IP',
                        accessor: 'ip',
                        sortMethod: sortIp,
                        Cell: ClientCell,
@@ -141,9 +134,8 @@ const Clients = ({

                    return disallowed ? { className: 'logs__row--red' } : {};
                }}
-            />
-        </Card>
-    );
+        />
+    </Card>;
 };

 Clients.propTypes = {
--- a/client/src/components/Dashboard/Dashboard.css
+++ b/client/src/components/Dashboard/Dashboard.css
@@ -34,7 +34,7 @@
    align-items: center;
 }

-.dashboard-title__button {
+.dashboard-title__button{
    margin: 0 0.5rem;
 }

@@ -44,7 +44,7 @@
        align-items: flex-start;
    }

-    .dashboard-title__button {
+    .dashboard-title__button{
        margin: 0.5rem 0;
        display: block;
    }
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -44,7 +44,6 @@ const Dashboard = ({
    const refreshButton = <button
            type="button"
            className="btn btn-icon btn-outline-primary btn-sm"
-            title={t('refresh_btn')}
            onClick={() => getAllStats()}
    >
        <svg className="icons">
--- a/client/src/components/Filters/Check/Info.js
+++ b/client/src/components/Filters/Check/Info.js
@@ -12,7 +12,7 @@ import {
    checkSafeSearch,
    checkSafeBrowsing,
    checkParental,
-    getRulesToFilterList,
+    getFilterName,
 } from '../../../helpers/helpers';
 import { BLOCK_ACTIONS, FILTERED, FILTERED_STATUS } from '../../../helpers/constants';
 import { toggleBlocking } from '../../../actions';
@@ -41,27 +41,32 @@ const renderBlockingButton = (isFiltered, domain) => {
        </button>;
 };

-const getTitle = () => {
+const getTitle = (reason) => {
    const { t } = useTranslation();

    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
-    const rules = useSelector((state) => state.filtering.check.rules, shallowEqual);
-    const reason = useSelector((state) => state.filtering.check.reason);
+    const filter_id = useSelector((state) => state.filtering.check.filter_id);
+
+    const filterName = getFilterName(
+        filters,
+        whitelistFilters,
+        filter_id,
+        'filtered_custom_rules',
+        (filter) => (filter?.name ? t('query_log_filtered', { filter: filter.name }) : ''),
+    );

    const getReasonFiltered = (reason) => {
        const filterKey = reason.replace(FILTERED, '');
        return i18next.t('query_log_filtered', { filter: filterKey });
    };

-    const ruleAndFilterNames = getRulesToFilterList(rules, filters, whitelistFilters);
-
    const REASON_TO_TITLE_MAP = {
        [FILTERED_STATUS.NOT_FILTERED_NOT_FOUND]: t('check_not_found'),
        [FILTERED_STATUS.REWRITE]: t('rewrite_applied'),
        [FILTERED_STATUS.REWRITE_HOSTS]: t('rewrite_hosts_applied'),
-        [FILTERED_STATUS.FILTERED_BLACK_LIST]: ruleAndFilterNames,
-        [FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: ruleAndFilterNames,
+        [FILTERED_STATUS.FILTERED_BLACK_LIST]: filterName,
+        [FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: filterName,
        [FILTERED_STATUS.FILTERED_SAFE_SEARCH]: getReasonFiltered(reason),
        [FILTERED_STATUS.FILTERED_SAFE_BROWSING]: getReasonFiltered(reason),
        [FILTERED_STATUS.FILTERED_PARENTAL]: getReasonFiltered(reason),
@@ -73,11 +78,7 @@ const getTitle = () => {

    return <>
        <div>{t('check_reason', { reason })}</div>
-        <div>
-            {t('rule_label')}:
-            &nbsp;
-            {ruleAndFilterNames}
-        </div>
+        <div>{filterName}</div>
    </>;
 };

@@ -85,13 +86,14 @@ const Info = () => {
    const {
        hostname,
        reason,
+        rule,
        service_name,
        cname,
        ip_addrs,
    } = useSelector((state) => state.filtering.check, shallowEqual);
    const { t } = useTranslation();

-    const title = getTitle();
+    const title = getTitle(reason);

    const className = classNames('card mb-0 p-3', {
        'logs__row--red': checkFiltered(reason),
@@ -110,6 +112,7 @@ const Info = () => {
        <div>{title}</div>
        {!onlyFiltered
        && <>
+            {rule && <div>{t('check_rule', { rule })}</div>}
            {service_name && <div>{t('check_service', { service: service_name })}</div>}
            {cname && <div>{t('check_cname', { cname })}</div>}
            {ip_addrs && <div>{t('check_ip', { ip: ip_addrs.join(', ') })}</div>}
--- a/client/src/components/Header/index.js
+++ b/client/src/components/Header/index.js
@@ -46,7 +46,7 @@ const Header = () => {
                <div className="header__column">
                    <div className="d-flex align-items-center">
                        <Link to="/" className="nav-link pl-0 pr-1">
-                            <img src={logo} alt="AdGuard Home logo" className="header-brand-img" />
+                            <img src={logo} alt="" className="header-brand-img" />
                        </Link>
                        {!processing && isCoreRunning
                        && <span className={badgeClass}
--- a/client/src/components/Logs/Cells/ClientCell.js
+++ b/client/src/components/Logs/Cells/ClientCell.js
@@ -16,7 +16,6 @@ import { updateLogs } from '../../../actions/queryLogs';

 const ClientCell = ({
    client,
-    client_id,
    domain,
    info,
    info: {
@@ -34,14 +33,12 @@ const ClientCell = ({
    const autoClient = autoClients.find((autoClient) => autoClient.name === client);
    const source = autoClient?.source;
    const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
-    const clientName = name || client_id;
-    const clientInfo = { ...info, name: clientName };

    const id = nanoid();

    const data = {
        address: client,
-        name: clientName,
+        name,
        country: whois_info?.country,
        city: whois_info?.city,
        network: whois_info?.orgname,
@@ -102,20 +99,13 @@ const ClientCell = ({
            if (options.length === 0) {
                return null;
            }
-            return (
-                <>
-                    {options.map(({ name, onClick, disabled }) => (
-                        <button
-                            key={name}
-                            className="button-action--arrow-option px-4 py-2"
-                            onClick={onClick}
-                            disabled={disabled}
-                        >
-                            {t(name)}
-                        </button>
-                    ))}
-                </>
-            );
+            return <>{options.map(({ name, onClick, disabled }) => <button
+                    key={name}
+                    className="button-action--arrow-option px-4 py-2"
+                    onClick={onClick}
+                    disabled={disabled}
+            >{t(name)}
+            </button>)}</>;
        };

        const content = getOptions(BUTTON_OPTIONS);
@@ -135,70 +125,45 @@ const ClientCell = ({
            'button-action__container--detailed': isDetailed,
        });

-        return (
-            <div className={containerClass}>
-                <button
-                    type="button"
+        return <div className={containerClass}>
+            <button type="button"
                    className={buttonClass}
                    onClick={onClick}
                    disabled={processingRules}
-                >
-                    {t(buttonType)}
-                </button>
-                {content && (
-                    <button className={buttonArrowClass} disabled={processingRules}>
-                        <IconTooltip
-                            className="h-100"
-                            tooltipClass="button-action--arrow-option-container"
-                            xlinkHref="chevron-down"
-                            triggerClass="button-action--icon"
-                            content={content}
-                            placement="bottom-end"
-                            trigger="click"
-                            onVisibilityChange={setOptionsOpened}
-                        />
-                    </button>
-                )}
-            </div>
-        );
+            >
+                {t(buttonType)}
+            </button>
+            {content && <button className={buttonArrowClass} disabled={processingRules}>
+                <IconTooltip
+                        className='h-100'
+                        tooltipClass='button-action--arrow-option-container'
+                        xlinkHref='chevron-down'
+                        triggerClass='button-action--icon'
+                        content={content} placement="bottom-end" trigger="click"
+                        onVisibilityChange={setOptionsOpened}
+                />
+            </button>}
+        </div>;
    };

-    return (
-        <div
-            className="o-hidden h-100 logs__cell logs__cell--client"
-            role="gridcell"
-        >
-            <IconTooltip
-                className={hintClass}
-                columnClass="grid grid--limited"
-                tooltipClass="px-5 pb-5 pt-4"
-                xlinkHref="question"
-                contentItemClass="text-truncate key-colon o-hidden"
-                title="client_details"
-                content={processedData}
-                placement="bottom"
-            />
-            <div className={nameClass}>
-                <div data-tip={true} data-for={id}>
-                    {renderFormattedClientCell(client, clientInfo, isDetailed, true)}
-                </div>
-                {isDetailed && clientName && !whoisAvailable && (
-                    <div
-                        className="detailed-info d-none d-sm-block logs__text"
-                        title={clientName}
-                    >
-                        {clientName}
-                    </div>
-                )}
+    return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
+        <IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
+                     xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
+                     content={processedData} placement="bottom" />
+        <div className={nameClass}>
+            <div data-tip={true} data-for={id}>
+                {renderFormattedClientCell(client, info, isDetailed, true)}
            </div>
-            {renderBlockingButton(isFiltered, domain)}
+            {isDetailed && name && !whoisAvailable
+            && <div className="detailed-info d-none d-sm-block logs__text"
+                    title={name}>{name}</div>}
        </div>
-    );
+        {renderBlockingButton(isFiltered, domain)}
+    </div>;
 };

 ClientCell.propTypes = {
    client: propTypes.string.isRequired,
-    client_id: propTypes.string,
    domain: propTypes.string.isRequired,
    info: propTypes.oneOfType([
        propTypes.string,
--- a/client/src/components/Logs/Cells/IconTooltip.css
+++ b/client/src/components/Logs/Cells/IconTooltip.css
@@ -35,7 +35,7 @@
 }

 .grid--title {
-    font-weight: 600;
+    font-weight: bold;
 }

 .grid--title:not(:first-child) {
@@ -65,12 +65,12 @@
    }

    .grid .key-colon, .grid .title--border {
-        font-weight: 600;
+        font-weight: bold;
    }
 }

 .grid .key-colon:nth-child(odd)::after {
-    content: ":";
+    content: ':';
 }

 .grid__one-row {
@@ -95,7 +95,7 @@
 }

 .title--border:before {
-    content: "";
+    content: '';
    position: absolute;
    left: 0;
    border-top: 0.5px solid var(--gray-d8) !important;
--- a/client/src/components/Logs/Cells/ResponseCell.js
+++ b/client/src/components/Logs/Cells/ResponseCell.js
@@ -4,9 +4,8 @@ import classNames from 'classnames';
 import React from 'react';
 import propTypes from 'prop-types';
 import {
-    getRulesToFilterList,
    formatElapsedMs,
-    getFilterNames,
+    getFilterName,
    getServiceName,
 } from '../../../helpers/helpers';
 import { FILTERED_STATUS, FILTERED_STATUS_TO_META_MAP } from '../../../helpers/constants';
@@ -19,7 +18,8 @@ const ResponseCell = ({
    response,
    status,
    upstream,
-    rules,
+    rule,
+    filterId,
    service_name,
 }) => {
    const { t } = useTranslation();
@@ -36,6 +36,7 @@ const ResponseCell = ({

    const statusLabel = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.LABEL || reason);
    const boldStatusLabel = <span className="font-weight-bold">{statusLabel}</span>;
+    const filter = getFilterName(filters, whitelistFilters, filterId);

    const renderResponses = (responseArr) => {
        if (!responseArr || responseArr.length === 0) {
@@ -56,17 +57,13 @@ const ResponseCell = ({
        install_settings_dns: upstream,
        elapsed: formattedElapsedMs,
        response_code: status,
-        ...(service_name
-                && { service_name: getServiceName(service_name) }
-        ),
-        ...(rules.length > 0
-                && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
-        ),
+        ...(service_name ? { service_name: getServiceName(service_name) } : { filter }),
+        rule_label: rule,
        response_table_header: renderResponses(response),
        original_response: renderResponses(originalResponse),
    };

-    const content = rules.length > 0
+    const content = rule
        ? Object.entries(COMMON_CONTENT)
        : Object.entries({
            ...COMMON_CONTENT,
@@ -81,8 +78,7 @@ const ResponseCell = ({
                }
                return getServiceName(service_name);
            case FILTERED_STATUS.FILTERED_BLACK_LIST:
-            case FILTERED_STATUS.NOT_FILTERED_WHITE_LIST:
-                return getFilterNames(rules, filters, whitelistFilters).join(', ');
+                return filter;
            default:
                return formattedElapsedMs;
        }
@@ -117,10 +113,8 @@ ResponseCell.propTypes = {
    response: propTypes.array.isRequired,
    status: propTypes.string.isRequired,
    upstream: propTypes.string.isRequired,
-    rules: propTypes.arrayOf(propTypes.shape({
-        text: propTypes.string.isRequired,
-        filter_list_id: propTypes.number.isRequired,
-    })),
+    rule: propTypes.string,
+    filterId: propTypes.number,
    service_name: propTypes.string,
 };

--- a/client/src/components/Logs/Cells/index.js
+++ b/client/src/components/Logs/Cells/index.js
@@ -6,11 +6,11 @@ import propTypes from 'prop-types';
 import {
    captitalizeWords,
    checkFiltered,
-    getRulesToFilterList,
    formatDateTime,
    formatElapsedMs,
    formatTime,
    getBlockingClientName,
+    getFilterName,
    getServiceName,
    processContent,
 } from '../../../helpers/helpers';
@@ -70,8 +70,8 @@ const Row = memo(({
            upstream,
            type,
            client_proto,
-            client_id,
-            rules,
+            filterId,
+            rule,
            originalResponse,
            status,
            service_name,
@@ -107,6 +107,8 @@ const Row = memo(({

        const sourceData = getSourceData(tracker);

+        const filter = getFilterName(filters, whitelistFilters, filterId);
+
        const {
            confirmMessage,
            buttonKey: blockingClientKey,
@@ -170,14 +172,13 @@ const Row = memo(({
            response_details: 'title',
            install_settings_dns: upstream,
            elapsed: formattedElapsedMs,
-            ...(rules.length > 0
-                    && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
-            ),
+            filter: rule ? filter : null,
+            rule_label: rule,
            response_table_header: response?.join('\n'),
            response_code: status,
            client_details: 'title',
            ip_address: client,
-            name: info?.name || client_id,
+            name: info?.name,
            country,
            city,
            network,
@@ -234,11 +235,8 @@ Row.propTypes = {
        upstream: propTypes.string.isRequired,
        type: propTypes.string.isRequired,
        client_proto: propTypes.string.isRequired,
-        client_id: propTypes.string,
-        rules: propTypes.arrayOf(propTypes.shape({
-            text: propTypes.string.isRequired,
-            filter_list_id: propTypes.number.isRequired,
-        })),
+        filterId: propTypes.number,
+        rule: propTypes.string,
        originalResponse: propTypes.array,
        status: propTypes.string.isRequired,
        service_name: propTypes.string,
--- a/client/src/components/Logs/Logs.css
+++ b/client/src/components/Logs/Logs.css
@@ -9,18 +9,21 @@
    --size-response: 150;
    --size-client: 123;
    --gray-216: rgba(216, 216, 216, 0.23);
-    --gray-4d: #4d4d4d;
-    --gray-f3: #f3f3f3;
+    --gray-4d: #4D4D4D;
+    --gray-f3: #F3F3F3;
    --gray-8: #888;
    --gray-3: #333;
-    --danger: #df3812;
+    --danger: #DF3812;
    --white80: rgba(255, 255, 255, 0.8);
-    --btn-block: #c23814;
-    --btn-block-disabled: #e3b3a6;
-    --btn-block-active: #a62200;
+
+    --btn-block: #C23814;
+    --btn-block-disabled: #E3B3A6;
+    --btn-block-active: #A62200;
+
    --btn-unblock: #888888;
-    --btn-unblock-disabled: #d8d8d8;
-    --btn-unblock-active: #4d4d4d;
+    --btn-unblock-disabled: #D8D8D8;
+    --btn-unblock-active: #4D4D4D;
+
    --option-border-radius: 4px;
 }

@@ -37,7 +40,7 @@
 }

 .logs__text--bold {
-    font-weight: 600;
+    font-weight: bold;
 }

 .logs__time {
@@ -84,7 +87,7 @@
 }

 .custom-select__arrow--left {
-    background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat;
+    background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
    background-position: 5px 9px;
    background-size: 22px;
 }
@@ -164,13 +167,12 @@
 }

 .logs__refresh {
+    --size: 2.5rem;
    position: relative;
    top: 3px;
    display: inline-flex;
    align-items: center;
    justify-content: center;
-
-    --size: 2.5rem;
    width: var(--size);
    height: var(--size);
    padding: 0;
@@ -358,7 +360,7 @@
    color: var(--gray-4d);
    background-color: var(--white80);
    pointer-events: none;
-    font-weight: 600;
+    font-weight: bold;
    text-align: center;
    padding-top: 21rem;
    display: block;
@@ -429,13 +431,3 @@
    margin-right: 1px;
    opacity: 0.5;
 }
-
-.filteringRules__rule {
-    margin-bottom: 0;
-}
-
-.filteringRules__filter {
-    font-style: italic;
-    font-weight: normal;
-    margin-bottom: 1rem;
-}
--- a/client/src/components/Settings/Clients/Form.js
+++ b/client/src/components/Settings/Clients/Form.js
@@ -282,7 +282,7 @@ let Form = (props) => {
                        <div className="form__desc mt-0">
                            <Trans
                                components={[
-                                    <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient" key="0" target="_blank" rel="noopener noreferrer">
+                                    <a href="#dhcp" key="0">
                                        link
                                    </a>,
                                ]}
--- a/client/src/components/ui/Guide/Guide.js
+++ b/client/src/components/ui/Guide/Guide.js
@@ -3,12 +3,29 @@ import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
 import i18next from 'i18next';
 import { useSelector } from 'react-redux';
+import Tabs from './Tabs';
+import Icons from './Icons';
+import { getPathWithQueryString } from '../../helpers/helpers';

-import { MOBILE_CONFIG_LINKS } from '../../../helpers/constants';
+const MOBILE_CONFIG_LINKS = {
+    DOT: '/apple/dot.mobileconfig',
+    DOH: '/apple/doh.mobileconfig',
+};

-import Tabs from '../Tabs';
-import Icons from '../Icons';
-import MobileConfigForm from './MobileConfigForm';
+/* FIXME: find out `client_id` */
+const renderMobileconfigInfo = ({ label, components, server_name }) => <li key={label}>
+    <Trans components={components}>{label}</Trans>
+    <ul>
+        <li>
+            <a href={getPathWithQueryString(MOBILE_CONFIG_LINKS.DOT, { host: server_name, client_id: 'client_id' })}
+               download>{i18next.t('download_mobileconfig_dot')}</a>
+        </li>
+        <li>
+            <a href={getPathWithQueryString(MOBILE_CONFIG_LINKS.DOH, { host: server_name, client_id: 'client_id' })}
+               download>{i18next.t('download_mobileconfig_doh')}</a>
+        </li>
+    </ul>
+</li>;

 const renderLi = ({ label, components }) => <li key={label}>
    <Trans components={components?.map((props) => {
@@ -26,8 +43,49 @@ const renderLi = ({ label, components }) => <li key={label}>
    </Trans>
 </li>;

-const getDnsPrivacyList = () => [
-    {
+const getDnsPrivacyList = (server_name) => {
+    const iosList = [
+        {
+            label: 'setup_dns_privacy_ios_2',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://adguard.com/adguard-ios/overview.html',
+                },
+                <code key="1">text</code>,
+            ],
+        },
+        {
+            label: 'setup_dns_privacy_ios_1',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://itunes.apple.com/app/id1452162351',
+                },
+                <code key="1">text</code>,
+                {
+                    key: 2,
+                    href: 'https://dnscrypt.info/stamps',
+                },
+
+            ],
+        }];
+    /* Insert second element if can generate .mobileconfig links */
+    if (server_name) {
+        iosList.splice(1, 0, {
+            label: 'setup_dns_privacy_4',
+            components: {
+                highlight: <code />,
+            },
+            renderComponent: ({ label, components }) => renderMobileconfigInfo({
+                label,
+                components,
+                server_name,
+            }),
+        });
+    }
+
+    return [{
        title: 'Android',
        list: [
            {
@@ -57,32 +115,7 @@ const getDnsPrivacyList = () => [
    },
    {
        title: 'iOS',
-        list: [
-            {
-                label: 'setup_dns_privacy_ios_2',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://adguard.com/adguard-ios/overview.html',
-                    },
-                    <code key="1">text</code>,
-                ],
-            },
-            {
-                label: 'setup_dns_privacy_ios_1',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://itunes.apple.com/app/id1452162351',
-                    },
-                    <code key="1">text</code>,
-                    {
-                        key: 2,
-                        href: 'https://dnscrypt.info/stamps',
-                    },
-                ],
-            },
-        ],
+        list: iosList,
    },
    {
        title: 'setup_dns_privacy_other_title',
@@ -135,20 +168,20 @@ const getDnsPrivacyList = () => [
            },
        ],
    },
-];
+    ];
+};

-const renderDnsPrivacyList = ({ title, list }) => (
-    <div className="tab__paragraph" key={title}>
-        <strong>
-            <Trans>{title}</Trans>
-        </strong>
-        <ul>
-            {list.map(({ label, components, renderComponent = renderLi }) => (
-                renderComponent({ label, components })
-            ))}
-        </ul>
-    </div>
-);
+const renderDnsPrivacyList = ({ title, list }) => <div className="tab__paragraph" key={title}>
+    <strong><Trans>{title}</Trans></strong>
+    <ul>{list.map(
+        ({
+            label,
+            components,
+            renderComponent = renderLi,
+        }) => renderComponent({ label, components }),
+    )}
+    </ul>
+</div>;

 const getTabs = ({
    tlsAddress,
@@ -236,8 +269,8 @@ const getTabs = ({
                        </Trans>
                    </div>
                )}
-                {showDnsPrivacyNotice ? (
-                    <div className="tab__paragraph">
+                {showDnsPrivacyNotice
+                    ? <div className="tab__paragraph">
                        <Trans
                            components={[
                                <a
@@ -254,64 +287,35 @@ const getTabs = ({
                            setup_dns_notice
                        </Trans>
                    </div>
-                ) : (
-                    <>
+                    : <>
                        <div className="tab__paragraph">
                            <Trans components={[<p key="0">text</p>]}>
                                setup_dns_privacy_3
                            </Trans>
                        </div>
-                        {getDnsPrivacyList().map(renderDnsPrivacyList)}
-                        <div>
-                            <strong>
-                                <Trans>
-                                    setup_dns_privacy_ioc_mac
-                                </Trans>
-                            </strong>
-                        </div>
-                        <div className="mb-3">
-                            <Trans components={{ highlight: <code /> }}>
-                                setup_dns_privacy_4
-                            </Trans>
-                        </div>
-                        <MobileConfigForm
-                            initialValues={{
-                                host: server_name,
-                                clientId: '',
-                                protocol: MOBILE_CONFIG_LINKS.DOH,
-                            }}
-                        />
-                    </>
-                )}
+                        {getDnsPrivacyList(server_name).map(renderDnsPrivacyList)}
+                    </>}
            </div>
        </div>;
        },
    },
 });

-const renderContent = ({ title, list, getTitle }) => (
-    <div key={title} label={i18next.t(title)}>
-        <div className="tab__title">
-            {i18next.t(title)}
-        </div>
-        <div className="tab__text">
-            {getTitle?.()}
-            {list && (
-                <ol>
-                    {list.map((item) => (
-                        <li key={item}>
-                            <Trans>{item}</Trans>
-                        </li>
-                    ))}
-                </ol>
-            )}
-        </div>
+const renderContent = ({ title, list, getTitle }) => <div key={title} label={i18next.t(title)}>
+    <div className="tab__title">{i18next.t(title)}</div>
+    <div className="tab__text">
+        {getTitle?.()}
+        {list
+        && <ol>{list.map((item) => <li key={item}>
+            <Trans>{item}</Trans>
+        </li>)}
+        </ol>}
    </div>
-);
+</div>;

 const Guide = ({ dnsAddresses }) => {
    const { t } = useTranslation();
-    const server_name = useSelector((state) => state.encryption?.server_name);
+    const server_name = useSelector((state) => state.encryption.server_name);
    const tlsAddress = dnsAddresses?.filter((item) => item.includes('tls://')) ?? '';
    const httpsAddress = dnsAddresses?.filter((item) => item.includes('https://')) ?? '';
    const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
@@ -330,14 +334,9 @@ const Guide = ({ dnsAddresses }) => {

    return (
        <div>
-            <Tabs
-                tabs={tabs}
-                activeTabLabel={activeTabLabel}
-                setActiveTabLabel={setActiveTabLabel}
-            >
-                {activeTab}
-            </Tabs>
            <Icons />
+            <Tabs tabs={tabs} activeTabLabel={activeTabLabel}
+                  setActiveTabLabel={setActiveTabLabel}>{activeTab}</Tabs>
        </div>
    );
 };
@@ -367,4 +366,6 @@ renderLi.propTypes = {
    components: PropTypes.string,
 };

+renderMobileconfigInfo.propTypes = renderLi.propTypes;
+
 export default Guide;
--- a/client/src/components/ui/Guide/MobileConfigForm.js
+++ b/client/src/components/ui/Guide/MobileConfigForm.js
@@ -1,131 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Trans } from 'react-i18next';
-import { useSelector } from 'react-redux';
-import { Field, reduxForm } from 'redux-form';
-import i18next from 'i18next';
-import cn from 'classnames';
-
-import { getPathWithQueryString } from '../../../helpers/helpers';
-import { FORM_NAME, MOBILE_CONFIG_LINKS } from '../../../helpers/constants';
-import {
-    renderInputField,
-    renderSelectField,
-} from '../../../helpers/form';
-import {
-    validateClientId,
-    validateServerName,
-} from '../../../helpers/validators';
-
-const getDownloadLink = (host, clientId, protocol, invalid) => {
-    if (!host || invalid) {
-        return (
-            <button
-                type="button"
-                className="btn btn-success btn-standard btn-large disabled"
-            >
-                <Trans>download_mobileconfig</Trans>
-            </button>
-        );
-    }
-
-    const linkParams = { host };
-
-    if (clientId) {
-        linkParams.client_id = clientId;
-    }
-
-    return (
-        <a
-            href={getPathWithQueryString(protocol, linkParams)}
-            className={cn('btn btn-success btn-standard btn-large')}
-            download
-        >
-            <Trans>download_mobileconfig</Trans>
-        </a>
-    );
-};
-
-const MobileConfigForm = ({ invalid }) => {
-    const formValues = useSelector((state) => state.form[FORM_NAME.MOBILE_CONFIG]?.values);
-
-    if (!formValues) {
-        return null;
-    }
-
-    const { host, clientId, protocol } = formValues;
-
-    const githubLink = (
-        <a
-            href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient"
-            target="_blank"
-            rel="noopener noreferrer"
-        >
-            text
-        </a>
-    );
-
-    return (
-        <form onSubmit={(e) => e.preventDefault()}>
-            <div>
-                <div className="form__group form__group--settings">
-                    <label htmlFor="host" className="form__label">
-                        {i18next.t('dhcp_table_hostname')}
-                    </label>
-                     <Field
-                        name="host"
-                        type="text"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={i18next.t('form_enter_hostname')}
-                        validate={validateServerName}
-                    />
-                </div>
-                <div className="form__group form__group--settings">
-                    <label htmlFor="clientId" className="form__label form__label--with-desc">
-                        {i18next.t('client_id')}
-                    </label>
-                    <div className="form__desc form__desc--top">
-                        <Trans components={{ a: githubLink }}>
-                            client_id_desc
-                        </Trans>
-                    </div>
-                    <Field
-                        name="clientId"
-                        type="text"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={i18next.t('client_id_placeholder')}
-                        validate={validateClientId}
-                    />
-                </div>
-                <div className="form__group form__group--settings">
-                    <label htmlFor="protocol" className="form__label">
-                        {i18next.t('protocol')}
-                    </label>
-                    <Field
-                        name="protocol"
-                        type="text"
-                        component={renderSelectField}
-                        className="form-control"
-                    >
-                        <option value={MOBILE_CONFIG_LINKS.DOT}>
-                            {i18next.t('dns_over_tls')}
-                        </option>
-                        <option value={MOBILE_CONFIG_LINKS.DOH}>
-                            {i18next.t('dns_over_https')}
-                        </option>
-                    </Field>
-                </div>
-            </div>
-
-            {getDownloadLink(host, clientId, protocol, invalid)}
-        </form>
-    );
-};
-
-MobileConfigForm.propTypes = {
-    invalid: PropTypes.bool.isRequired,
-};
-
-export default reduxForm({ form: FORM_NAME.MOBILE_CONFIG })(MobileConfigForm);
--- a/client/src/components/ui/Guide/index.js
+++ b/client/src/components/ui/Guide/index.js
@@ -1 +0,0 @@
-export { default } from './Guide';
--- a/client/src/components/ui/Icons.css
+++ b/client/src/components/ui/Icons.css
@@ -6,21 +6,18 @@

 .icon--24 {
    --size: 1.5rem;
-
    width: var(--size);
    height: var(--size);
 }

 .icon--20 {
    --size: 1.25rem;
-
    width: var(--size);
    height: var(--size);
 }

 .icon--18 {
    --size: 1.125rem;
-
    width: var(--size);
    height: var(--size);
 }
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -104,8 +104,14 @@ const Icons = () => (
                d="M16.2,4c-3.3,0-6.9,1.2-7.7,5.3C8.4,9.7,8.7,10,9,10l3.3,0.3c0.3,0,0.6-0.3,0.6-0.6c0.3-1.4,1.5-2.1,2.8-2.1c0.7,0,1.5,0.3,1.9,0.9c0.5,0.7,0.4,1.7,0.4,2.5v0.5c-2,0.2-4.6,0.4-6.5,1.2c-2.2,0.9-3.7,2.8-3.7,5.7c0,3.6,2.3,5.4,5.2,5.4c2.5,0,3.8-0.6,5.7-2.5c0.6,0.9,0.9,1.4,2,2.3c0.3,0.1,0.6,0.1,0.8-0.1v0c0.7-0.6,2-1.7,2.7-2.3c0.3-0.2,0.2-0.6,0-0.9c-0.6-0.9-1.3-1.6-1.3-3.2v-5.4c0-2.3,0.2-4.4-1.5-6C20.1,4.4,17.9,4,16.2,4z M17.1,14.3c0.3,0,0.6,0,0.9,0v0.8c0,1.3,0.1,2.5-0.6,3.7c-0.5,1-1.4,1.6-2.4,1.6c-1.3,0-2.1-1-2.1-2.5C12.9,15.2,14.9,14.5,17.1,14.3z M26.7,22.4c-0.9,0-1.9,0.2-2.7,0.8c-0.2,0.2-0.2,0.4,0.1,0.4c0.9-0.1,2.8-0.4,3.2,0.1s-0.4,2.3-0.7,3.1c-0.1,0.2,0.1,0.3,0.3,0.2c1.5-1.2,1.9-3.8,1.6-4.2C28.3,22.5,27.6,22.4,26.7,22.4z M3.7,22.8c-0.2,0-0.3,0.3-0.1,0.4c3.3,3,7.6,4.7,12.4,4.7c3.4,0,7.4-1.1,10.2-3.1c0.5-0.3,0.1-0.9-0.4-0.7c-3.1,1.3-6.4,1.9-9.5,1.9c-4.5,0-8.8-1.2-12.4-3.3C3.8,22.9,3.7,22.8,3.7,22.8z" />
        </symbol>

-        <symbol id="service_ebay" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 12.601563 13.671875 L 12.636719 24.058594 C 12.632813 22.457031 12.128906 18.101563 6.464844 18.097656 C 0.210938 18.097656 -0.03125 22.964844 0.00390625 24.230469 C 0.00390625 24.230469 -0.304688 29.917969 6.3125 29.917969 C 11.996094 29.917969 12.277344 26.347656 12.277344 26.347656 L 9.664063 26.355469 C 9.664063 26.355469 9.152344 28.320313 6.320313 28.265625 C 2.683594 28.199219 2.546875 24.675781 2.546875 24.675781 L 12.621094 24.675781 C 12.621094 24.675781 12.628906 24.566406 12.636719 24.425781 L 12.644531 26.960938 C 12.644531 26.960938 12.628906 28.507813 12.535156 29.53125 L 14.984375 29.53125 L 15.089844 28.039063 C 15.089844 28.039063 16.230469 29.917969 19.566406 29.917969 C 22.902344 29.917969 25.535156 27.863281 25.609375 24.050781 C 25.675781 20.242188 22.761719 18.117188 19.617188 18.097656 C 16.472656 18.082031 15.121094 19.960938 15.121094 19.960938 L 15.121094 13.671875 Z M 31.054688 18.046875 C 29.566406 18.097656 26.539063 18.558594 26.132813 21.460938 L 28.796875 21.460938 C 28.796875 21.460938 29 19.6875 31.703125 19.738281 C 34.257813 19.785156 34.722656 21.039063 34.707031 22.578125 C 34.707031 22.578125 32.519531 22.585938 31.785156 22.59375 C 30.46875 22.597656 25.863281 22.742188 25.433594 25.550781 C 24.917969 28.890625 27.898438 29.933594 30.230469 29.917969 C 32.5625 29.90625 33.890625 29.207031 34.878906 27.953125 L 34.984375 29.511719 L 37.300781 29.496094 C 37.300781 29.496094 37.242188 28.628906 37.25 26.90625 C 37.257813 25.1875 37.308594 23.65625 37.25 22.574219 C 37.183594 21.316406 37.304688 18.285156 31.875 18.0625 C 31.875 18.0625 31.550781 18.03125 31.054688 18.046875 Z M 35.871094 18.519531 L 41.675781 29.496094 L 39.4375 33.71875 L 42.265625 33.71875 L 50 18.519531 L 47.359375 18.519531 L 43.074219 27.046875 L 38.796875 18.519531 Z M 6.402344 19.765625 C 9.984375 19.761719 9.984375 22.949219 9.984375 22.949219 L 2.628906 22.949219 C 2.628906 22.949219 2.804688 19.765625 6.402344 19.765625 Z M 19.035156 19.800781 C 23.078125 19.699219 22.949219 24.097656 22.949219 24.097656 C 22.949219 24.097656 23.011719 28.167969 19.042969 28.21875 C 15.070313 28.269531 15.136719 24.011719 15.136719 24.011719 C 15.136719 24.011719 14.992188 19.90625 19.035156 19.800781 Z M 34.734375 24.265625 C 34.734375 24.269531 35.195313 28.371094 30.664063 28.3125 C 30.664063 28.3125 28.136719 28.3125 27.988281 26.296875 C 27.832031 24.140625 31.875 24.269531 31.875 24.269531 Z" />
+        <symbol id="service_ebay" viewBox="0 0 128 128" fill="currentColor" strokeLinecap="round"
+                strokeLinejoin="round" strokeWidth="2">
+            <path d="M95.633 48.416h31.826v55.802H95.633z" />
+            <path
+                d="M64 0C45.644 0 30.717 14.927 30.717 33.283h7.734C38.452 19.194 49.911 7.734 64 7.734s25.548 11.46 25.548 25.549h7.734C97.283 14.927 82.356 0 64 0zm63.459 33.283v15.133H.541V33.283h126.918zm0 70.935V128H.541v-23.782h126.918z" />
+            <path d="M.541 48.416h31.826v55.802H.541z" />
+            <path d="M32.367 48.416h31.194v55.802H32.367z" />
+            <path d="M63.562 48.416h32.071v55.802H63.562z" />
        </symbol>

        <symbol id="service_youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round"
@@ -356,58 +362,6 @@ const Icons = () => (
                      d="M8.036 10.93l3.93 4.07 4.068-3.93" />
            </g>
        </symbol>
-
-        <symbol id="service_vimeo" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 41 5 C 34.210938 4.992188 30.46875 8.796875 28.167969 16.210938 C 29.371094 15.765625 30.578125 15.214844 31.671875 15.214844 C 33.972656 15.214844 34.738281 16.070313 34.410156 18.726563 C 34.300781 20.386719 33.644531 23.066406 31.671875 26.164063 C 29.699219 29.152344 27.984375 30 27 30 C 25.796875 30 24.882813 28.269531 23.898438 23.621094 C 23.570313 22.292969 22.804688 19.304688 21.925781 13.664063 C 21.160156 8.464844 18.613281 5.667969 15 6 C 13.46875 6.109375 11.636719 7.535156 8.570313 10.191406 C 6.378906 12.183594 4.300781 13.621094 2 15.613281 L 4.191406 18.421875 C 6.269531 16.984375 7.476563 16.429688 7.804688 16.429688 C 9.335938 16.429688 10.757813 18.863281 12.183594 23.84375 C 13.386719 28.378906 14.699219 32.914063 15.90625 37.449219 C 17.765625 42.429688 20.066406 44.863281 22.695313 44.863281 C 27.074219 44.863281 32.328125 40.882813 38.570313 32.695313 C 44.699219 24.949219 47.78125 18.535156 48 14 C 48.21875 8.027344 45.816406 5.109375 41 5 Z" />
-        </symbol>
-
-        <symbol id="service_pinterest" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M25,2C12.318,2,2,12.317,2,25s10.318,23,23,23s23-10.317,23-23S37.682,2,25,2z M27.542,32.719 c-3.297,0-4.516-2.138-4.516-2.138s-0.588,2.309-1.021,3.95s-0.507,1.665-0.927,2.591c-0.471,1.039-1.626,2.674-1.966,3.177 c-0.271,0.401-0.607,0.735-0.804,0.696c-0.197-0.038-0.197-0.245-0.245-0.678c-0.066-0.595-0.258-2.594-0.166-3.946 c0.06-0.88,0.367-2.371,0.367-2.371l2.225-9.108c-1.368-2.807-0.246-7.192,2.871-7.192c2.211,0,2.79,2.001,2.113,4.406 c-0.301,1.073-1.246,4.082-1.275,4.224c-0.029,0.142-0.099,0.442-0.083,0.738c0,0.878,0.671,2.672,2.995,2.672 c3.744,0,5.517-5.535,5.517-9.237c0-2.977-1.892-6.573-7.416-6.573c-5.628,0-8.732,4.283-8.732,8.214 c0,2.205,0.87,3.091,1.273,3.577c0.328,0.395,0.162,0.774,0.162,0.774l-0.355,1.425c-0.131,0.471-0.552,0.713-1.143,0.368 C15.824,27.948,13,26.752,13,21.649C13,16.42,17.926,11,25.571,11C31.64,11,37,14.817,37,21.001 C37,28.635,32.232,32.719,27.542,32.719z" />
-        </symbol>
-
-        <symbol id="service_imgur" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M28,48h-7c-0.553,0-1-0.448-1-1V4c0-0.552,0.447-1,1-1h7c0.553,0,1,0.448,1,1v43C29,47.552,28.553,48,28,48z" />
-        </symbol>
-
-        <symbol id="service_dailymotion" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M22.964,3H7C6.447,3,6,3.448,6,4v42c0,0.552,0.447,1,1,1h15.964C36.333,47,44,38.912,44,24.811C44,11.153,36.136,3,22.964,3 z M22.124,40H15V10h7.124C30.222,10,35,15.446,35,24.925C35,34.614,30.336,40,22.124,40z" />
-        </symbol>
-
-        <symbol id="service_wechat" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 19 6 C 9.625 6 2 12.503906 2 20.5 C 2 24.769531 4.058594 28.609375 7.816406 31.390625 L 5.179688 39.304688 L 13.425781 34.199219 C 15.714844 34.917969 18.507813 35.171875 21.203125 34.875 C 23.390625 39.109375 28.332031 42 34 42 C 35.722656 42 37.316406 41.675781 38.796875 41.234375 L 45.644531 45.066406 L 43.734375 38.515625 C 46.3125 36.375 48 33.394531 48 30 C 48 23.789063 42.597656 18.835938 35.75 18.105469 C 34.40625 11.152344 27.367188 6 19 6 Z M 13 14 C 14.101563 14 15 14.898438 15 16 C 15 17.101563 14.101563 18 13 18 C 11.898438 18 11 17.101563 11 16 C 11 14.898438 11.898438 14 13 14 Z M 25 14 C 26.101563 14 27 14.898438 27 16 C 27 17.101563 26.101563 18 25 18 C 23.898438 18 23 17.101563 23 16 C 23 14.898438 23.898438 14 25 14 Z M 34 20 C 40.746094 20 46 24.535156 46 30 C 46 32.957031 44.492188 35.550781 42.003906 37.394531 L 41.445313 37.8125 L 42.355469 40.933594 L 39.105469 39.109375 L 38.683594 39.25 C 37.285156 39.71875 35.6875 40 34 40 C 27.253906 40 22 35.464844 22 30 C 22 24.535156 27.253906 20 34 20 Z M 29.5 26 C 28.699219 26 28 26.699219 28 27.5 C 28 28.300781 28.699219 29 29.5 29 C 30.300781 29 31 28.300781 31 27.5 C 31 26.699219 30.300781 26 29.5 26 Z M 38.5 26 C 37.699219 26 37 26.699219 37 27.5 C 37 28.300781 37.699219 29 38.5 29 C 39.300781 29 40 28.300781 40 27.5 C 40 26.699219 39.300781 26 38.5 26 Z" />
-        </symbol>
-
-        <symbol id="service_viber" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 44.78125 13.15625 C 44 10.367188 42.453125 8.164063 40.1875 6.605469 C 37.328125 4.632813 34.039063 3.9375 31.199219 3.511719 C 27.269531 2.925781 23.710938 2.84375 20.316406 3.257813 C 17.136719 3.648438 14.742188 4.269531 12.558594 5.273438 C 8.277344 7.242188 5.707031 10.425781 4.921875 14.734375 C 4.539063 16.828125 4.28125 18.71875 4.132813 20.523438 C 3.789063 24.695313 4.101563 28.386719 5.085938 31.808594 C 6.046875 35.144531 7.722656 37.527344 10.210938 39.09375 C 10.84375 39.492188 11.65625 39.78125 12.441406 40.058594 C 12.886719 40.214844 13.320313 40.367188 13.675781 40.535156 C 14.003906 40.6875 14.003906 40.714844 14 40.988281 C 13.972656 43.359375 14 48.007813 14 48.007813 L 14.007813 49 L 15.789063 49 L 16.078125 48.71875 C 16.269531 48.539063 20.683594 44.273438 22.257813 42.554688 L 22.472656 42.316406 C 22.742188 42.003906 22.742188 42.003906 23.019531 42 C 25.144531 41.957031 27.316406 41.875 29.472656 41.757813 C 32.085938 41.617188 35.113281 41.363281 37.964844 40.175781 C 40.574219 39.085938 42.480469 37.355469 43.625 35.035156 C 44.820313 32.613281 45.527344 29.992188 45.792969 27.019531 C 46.261719 21.792969 45.929688 17.257813 44.78125 13.15625 Z M 35.382813 33.480469 C 34.726563 34.546875 33.75 35.289063 32.597656 35.769531 C 31.753906 36.121094 30.894531 36.046875 30.0625 35.695313 C 23.097656 32.746094 17.632813 28.101563 14.023438 21.421875 C 13.277344 20.046875 12.761719 18.546875 12.167969 17.09375 C 12.046875 16.796875 12.054688 16.445313 12 16.117188 C 12.050781 13.769531 13.851563 12.445313 15.671875 12.046875 C 16.367188 11.890625 16.984375 12.136719 17.5 12.632813 C 18.929688 13.992188 20.058594 15.574219 20.910156 17.347656 C 21.28125 18.125 21.113281 18.8125 20.480469 19.390625 C 20.347656 19.511719 20.210938 19.621094 20.066406 19.730469 C 18.621094 20.816406 18.410156 21.640625 19.179688 23.277344 C 20.492188 26.0625 22.671875 27.933594 25.488281 29.09375 C 26.230469 29.398438 26.929688 29.246094 27.496094 28.644531 C 27.574219 28.566406 27.660156 28.488281 27.714844 28.394531 C 28.824219 26.542969 30.4375 26.726563 31.925781 27.78125 C 32.902344 28.476563 33.851563 29.210938 34.816406 29.917969 C 36.289063 31 36.277344 32.015625 35.382813 33.480469 Z M 26.144531 15 C 25.816406 15 25.488281 15.027344 25.164063 15.082031 C 24.617188 15.171875 24.105469 14.804688 24.011719 14.257813 C 23.921875 13.714844 24.289063 13.199219 24.835938 13.109375 C 25.265625 13.035156 25.707031 13 26.144531 13 C 30.476563 13 34 16.523438 34 20.855469 C 34 21.296875 33.964844 21.738281 33.890625 22.164063 C 33.808594 22.652344 33.386719 23 32.90625 23 C 32.851563 23 32.796875 22.996094 32.738281 22.984375 C 32.195313 22.894531 31.828125 22.378906 31.917969 21.835938 C 31.972656 21.515625 32 21.1875 32 20.855469 C 32 17.628906 29.371094 15 26.144531 15 Z M 31 21 C 31 21.550781 30.550781 22 30 22 C 29.449219 22 29 21.550781 29 21 C 29 19.347656 27.652344 18 26 18 C 25.449219 18 25 17.550781 25 17 C 25 16.449219 25.449219 16 26 16 C 28.757813 16 31 18.242188 31 21 Z M 36.710938 23.222656 C 36.605469 23.6875 36.191406 24 35.734375 24 C 35.660156 24 35.585938 23.992188 35.511719 23.976563 C 34.972656 23.851563 34.636719 23.316406 34.757813 22.777344 C 34.902344 22.140625 34.976563 21.480469 34.976563 20.816406 C 34.976563 15.957031 31.019531 12 26.160156 12 C 25.496094 12 24.835938 12.074219 24.199219 12.21875 C 23.660156 12.34375 23.125 12.003906 23.003906 11.464844 C 22.878906 10.925781 23.21875 10.390625 23.757813 10.269531 C 24.539063 10.089844 25.347656 10 26.160156 10 C 32.125 10 36.976563 14.851563 36.976563 20.816406 C 36.976563 21.628906 36.886719 22.4375 36.710938 23.222656 Z" />
-        </symbol>
-
-        <symbol id="service_weibo" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 35 6 C 34.222656 6 33.472656 6.078125 32.75 6.207031 C 32.207031 6.300781 31.84375 6.820313 31.9375 7.363281 C 32.03125 7.910156 32.550781 8.273438 33.09375 8.179688 C 33.726563 8.066406 34.359375 8 35 8 C 41.085938 8 46 12.914063 46 19 C 46 20.316406 45.757813 21.574219 45.328125 22.753906 C 45.195313 23.09375 45.253906 23.476563 45.484375 23.757813 C 45.71875 24.039063 46.082031 24.171875 46.441406 24.105469 C 46.800781 24.039063 47.09375 23.78125 47.207031 23.4375 C 47.710938 22.054688 48 20.566406 48 19 C 48 11.832031 42.167969 6 35 6 Z M 35 12 C 34.574219 12 34.171875 12.042969 33.789063 12.109375 C 33.246094 12.207031 32.878906 12.722656 32.976563 13.269531 C 33.070313 13.8125 33.589844 14.175781 34.132813 14.082031 C 34.425781 14.03125 34.714844 14 35 14 C 37.773438 14 40 16.226563 40 19 C 40 19.597656 39.890625 20.167969 39.691406 20.707031 C 39.503906 21.226563 39.773438 21.800781 40.292969 21.988281 C 40.8125 22.175781 41.386719 21.910156 41.574219 21.390625 C 41.84375 20.648438 42 19.84375 42 19 C 42 15.144531 38.855469 12 35 12 Z M 21.175781 12.40625 C 17.964844 12.34375 13.121094 14.878906 8.804688 19.113281 C 4.511719 23.40625 2 27.90625 2 31.78125 C 2 39.3125 11.628906 43.8125 21.152344 43.8125 C 33.5 43.8125 41.765625 36.699219 41.765625 31.046875 C 41.765625 27.59375 38.835938 25.707031 36.21875 24.871094 C 35.59375 24.660156 35.175781 24.558594 35.488281 23.71875 C 35.695313 23.21875 36 22.265625 36 21 C 36 19.5625 35 18.316406 33 18.09375 C 32.007813 17.984375 28 18 25.339844 19.113281 C 25.339844 19.113281 23.871094 19.746094 24.289063 18.59375 C 25.023438 16.292969 24.917969 14.40625 23.765625 13.359375 C 23.140625 12.730469 22.25 12.425781 21.175781 12.40625 Z M 20.3125 23.933594 C 28.117188 23.933594 34.441406 27.914063 34.441406 32.828125 C 34.441406 37.738281 28.117188 41.71875 20.3125 41.71875 C 12.511719 41.71875 6.1875 37.738281 6.1875 32.828125 C 6.1875 27.914063 12.511719 23.933594 20.3125 23.933594 Z M 19.265625 26.023438 C 16.246094 26.046875 13.3125 27.699219 12.039063 30.246094 C 10.46875 33.484375 11.933594 37.042969 15.699219 38.191406 C 19.464844 39.445313 23.960938 37.5625 25.53125 34.113281 C 27.097656 30.769531 25.113281 27.214844 21.347656 26.277344 C 20.660156 26.097656 19.960938 26.019531 19.265625 26.023438 Z M 20.824219 30.25 C 21.402344 30.25 21.871094 30.714844 21.871094 31.292969 C 21.871094 31.871094 21.402344 32.339844 20.824219 32.339844 C 20.246094 32.339844 19.777344 31.871094 19.777344 31.292969 C 19.777344 30.714844 20.246094 30.25 20.824219 30.25 Z M 16.417969 31.292969 C 16.746094 31.296875 17.074219 31.347656 17.382813 31.453125 C 18.722656 31.878906 19.132813 33.148438 18.308594 34.207031 C 17.589844 35.265625 15.945313 35.792969 14.707031 35.265625 C 13.476563 34.738281 13.167969 33.464844 13.886719 32.515625 C 14.425781 31.71875 15.429688 31.28125 16.417969 31.292969 Z" />
-        </symbol>
-
-        <symbol id="service_9gag" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 44 14 C 44 13.644531 43.8125 13.316406 43.507813 13.136719 C 40.453125 11.347656 28.46875 4.847656 25.535156 3.136719 C 25.222656 2.957031 24.839844 2.957031 24.527344 3.136719 C 21.128906 5.117188 10.089844 11.621094 7.496094 13.136719 C 7.1875 13.316406 7 13.644531 7 14 L 7 20 C 7 20.378906 7.214844 20.722656 7.550781 20.894531 C 7.660156 20.949219 18.597656 26.453125 24.5 29.867188 C 24.8125 30.046875 25.195313 30.046875 25.507813 29.863281 C 27.269531 28.828125 29.117188 27.859375 30.902344 26.921875 C 32.253906 26.214844 33.636719 25.488281 35.003906 24.722656 C 35.007813 26.820313 35.003906 29.296875 35 30.40625 L 25 35.859375 L 14.480469 30.121094 C 14.144531 29.9375 13.730469 29.964844 13.417969 30.1875 L 6.417969 35.1875 C 6.140625 35.386719 5.980469 35.714844 6.003906 36.054688 C 6.023438 36.398438 6.214844 36.707031 6.515625 36.871094 L 24.542969 46.871094 C 24.695313 46.957031 24.859375 47 25.027344 47 C 25.195313 47 25.363281 46.957031 25.515625 46.875 L 43.484375 36.875 C 43.804688 36.695313 44 36.363281 44 36 C 44 36 43.992188 21.011719 44 14 Z M 25 20 L 18 16 L 25 12 L 32 16 Z" />
-        </symbol>
-
-        <symbol id="service_telegram" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M46.137,6.552c-0.75-0.636-1.928-0.727-3.146-0.238l-0.002,0C41.708,6.828,6.728,21.832,5.304,22.445 c-0.259,0.09-2.521,0.934-2.288,2.814c0.208,1.695,2.026,2.397,2.248,2.478l8.893,3.045c0.59,1.964,2.765,9.21,3.246,10.758 c0.3,0.965,0.789,2.233,1.646,2.494c0.752,0.29,1.5,0.025,1.984-0.355l5.437-5.043l8.777,6.845l0.209,0.125 c0.596,0.264,1.167,0.396,1.712,0.396c0.421,0,0.825-0.079,1.211-0.237c1.315-0.54,1.841-1.793,1.896-1.935l6.556-34.077 C47.231,7.933,46.675,7.007,46.137,6.552z M22,32l-3,8l-3-10l23-17L22,32z" />
-        </symbol>
-
-        <symbol id="service_disneyplus" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M19.986,25.212c0,0,0.562-0.878,1.545-1.264s0.667,0.562,0.141,0.948C21.144,25.282,20.617,25.388,19.986,25.212z M20.512,23.631c-0.913,0.176-1.194,0.667-1.089,1.194C19.564,24.404,20.512,23.632,20.512,23.631z M34.771,27.882 c-0.387,0.351-1.159,1.616-1.159,1.616s1.194-0.141,1.546-1.089C35.508,27.46,35.157,27.531,34.771,27.882z M10.398,28.83 c0.667,0.597,1.861,1.089,1.861,1.089l0.07-2.247c-0.526,0-1.755,0.316-2.072,0.386C9.941,28.127,9.73,28.233,10.398,28.83z M46,13 v24c0,4.963-4.038,9-9,9H13c-4.962,0-9-4.037-9-9V13c0-4.963,4.038-9,9-9h24C41.962,4,46,8.037,46,13z M13.541,21.934l0.572,0.223 c0.073,0.006,0.143-0.029,0.182-0.091c2.349-3.742,6.583-6.256,11.456-6.256c5.798,0,10.708,3.552,12.578,8.508 c0.029,0.076,0.1,0.127,0.182,0.127h0.596c0.07,0,0.12-0.071,0.097-0.137c-1.904-5.398-7.217-9.294-13.46-9.294 c-5.214,0-9.786,2.724-12.282,6.764C13.421,21.842,13.466,21.927,13.541,21.934z M15.911,23.843c-2.81-1.37-3.793-1.546-5.971-1.405 c-2.177,0.141-2.177,1.229-1.651,1.265c0.311,0.021,0.487,0.044,0.58,0.055c0.078,0.009,0.089-0.011,0.115-0.046 c0.022-0.03,0.032-0.075,0.043-0.102c0.019-0.049-0.003-0.099-0.047-0.118c-0.045-0.02-0.55-0.245-0.55-0.245 s2.74-0.702,6.146,0.948c3.406,1.65,4.285,3.793,3.337,4.847c-0.948,1.054-2.599,1.581-4.636,1.124 c-0.035-1.44,0.035-2.494,0.035-2.494s1.897-0.07,2.389,0.281c0.42,0.3,0.174,0.497-0.103,0.614 c-0.047,0.02-0.052,0.107-0.009,0.132c0.393,0.218,0.706,0.269,0.99-0.078c0.316-0.386,0.667-2.037-3.196-1.932 c-0.07-0.667,0.141-1.124-0.421-1.791C12.4,24.228,12.4,26.722,12.4,26.722s-1.44,0.21-2.634,1.054 c-1.194,0.843,2.458,2.88,2.458,2.88s0.07,0.913,0.597,1.019c0.527,0.105,0.492-0.667,0.492-0.667s3.16,0.913,5.269-0.948 C20.688,28.197,18.721,25.212,15.911,23.843z M19.74,25.844c0.562,0.247,1.65,0.071,2.353-0.632c0.702-0.702,1.019-2.002-0.21-1.932 c0,0-0.457-0.597-1.44-0.316c-0.983,0.281-2.212,1.581-1.334,2.423C19.108,25.773,19.214,26.511,19.74,25.844z M20.723,30.305 c0-0.527-0.035-2.634-0.106-3.056c-0.07-0.421-0.456-0.773-0.667-0.351c0,0-0.176,2.037-0.106,3.301 C19.88,30.727,20.723,30.831,20.723,30.305z M22.654,27.53c0.737-0.07,1.265-0.106,1.897-0.21c0.632-0.105,0.667-0.562,0.175-0.667 c0,0-1.932-0.421-3.231,0.421c-0.632,0.421-0.457,1.194-0.106,1.229c0.351,0.035,2.142,0.106,2.564,0.386 c0.421,0.281,0.527,0.492,0.07,0.773c-0.457,0.281-1.475,0.421-1.897,0.281c-0.421-0.141-0.562-0.878,0.21-0.492 c0.773,0.386,2.177-0.07,1.229-0.386c-0.948-0.316-1.72-0.245-2.212,0.106c-0.492,0.351,0.176,1.089,0.737,1.334 c0.562,0.245,1.616,0.316,2.248-0.07c0.632-0.386,0.948-1.861-0.07-2.107c-1.019-0.245-1.651-0.21-2.107-0.281 C21.706,27.776,21.917,27.601,22.654,27.53z M27.783,26.338c-1.089-1.265-0.528,0.525-0.457,0.841 c0.07,0.316,0.351,1.51,0.351,2.002c-0.351-0.527-0.913-1.581-1.405-2.072c-0.492-0.492-0.632-0.07-0.632-0.07 s-0.492,1.791-0.351,2.95c0.141,1.159,0.737,0.351,0.773,0c0.035-0.351,0.106-1.51,0.106-1.826c0.316,0.702,0.808,1.51,1.194,1.897 c0.386,0.386,0.773,0.141,0.913-0.21S28.872,27.602,27.783,26.338z M31.54,29.917c0.386-0.316-0.071-0.631-0.457-0.595 c-0.386,0.035-1.51,0.21-1.51,0.21l0.245-0.737c0,0,0.737,0.035,1.334-0.035s0.176-0.737-0.035-0.737c-0.21,0-0.983,0-0.983,0 l0.176-0.492c0,0,1.299-0.035,1.72-0.106c0.421-0.07-0.245-0.773-0.737-0.808c-0.492-0.035-1.546,0.106-2.248,0.245 c-0.702,0.141,0.457,0.667,0.457,0.667s-0.106,0.351-0.245,0.597c-0.421,0.07-0.386,0.316-0.245,0.632 c-0.281,0.737-0.421,1.651,0.386,1.932C30.206,30.97,31.154,30.232,31.54,29.917z M35.826,27.882 c0.105-1.476-1.23-1.159-1.757-0.632c-0.527,0.527-1.44,1.897-1.44,1.897c0.106-0.913,0.351-1.159,0.913-2.072 c0.48-0.78-0.281-0.492-0.281-0.492s-1.791,1.51-1.019,3.231c-0.527,1.299-1.37,3.16-0.141,4.144c0.316,0.21,0.21-0.421,0.316-0.773 c0.106-0.351,0.457-2.142,0.808-2.634C34.07,30.481,35.58,30.165,35.826,27.882z M42.004,27.786c0.003-0.063-0.05-0.115-0.115-0.115 h-2.114c-0.044-0.699-0.128-1.445-0.282-2.146c-0.009-0.039-0.041-0.07-0.081-0.073c-0.287,0-0.331,0.002-0.601,0.002 c-0.078,0.002-0.131,0.075-0.111,0.149c0.088,0.323,0.216,1.147,0.258,2.067H36.95c-0.062,0-0.114,0.051-0.117,0.112l-0.053,0.532 c-0.004,0.085,0.069,0.155,0.154,0.146l2.048,0.007c0.012,0.754,0.018,1.207-0.046,2.004c-0.008,0.053,0.033,0.098,0.087,0.101 c0.322,0.02,0.526,0.045,0.647,0.047c0.049,0.001,0.089-0.036,0.093-0.085c0.019-0.256,0.068-1.06,0.044-2.064l2.08,0.007 c0.065,0,0.117-0.053,0.117-0.118V27.786z" />
-        </symbol>
-
-        <symbol id="service_hulu" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M 0 15 L 0 34 L 4 34 L 4 25 C 4 24.5 4.398438 24 5 24 L 8 24 C 8.5 24 9 24.398438 9 25 L 9 34 L 13 34 L 13 24 C 13 21.800781 11.199219 20 9 20 L 4 20 L 4 15 Z M 30 15 L 30 34 L 34 34 L 34 15 Z M 15 20 L 15 30 C 15 32.199219 16.800781 34 19 34 L 24 34 C 26.199219 34 27.992188 32.199219 28.09375 30 L 28.09375 20 L 24.09375 20 L 24.09375 28.90625 C 24.09375 29.507813 23.601563 30 23 30 L 20.09375 30 C 19.492188 30 19 29.507813 19 28.90625 L 19 20 Z M 36 20 L 36 30 C 36 32.199219 37.800781 34 40 34 L 45 34 C 47.199219 34 49 32.199219 49 30 L 49 20 L 45 20 L 45 29 C 45 29.5 44.601563 30 44 30 L 41 30 C 40.5 30 40 29.601563 40 29 L 40 20 Z" />
-        </symbol>
-
-        <symbol id="service_spotify" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M25.009,1.982C12.322,1.982,2,12.304,2,24.991S12.322,48,25.009,48s23.009-10.321,23.009-23.009S37.696,1.982,25.009,1.982z M34.748,35.333c-0.289,0.434-0.765,0.668-1.25,0.668c-0.286,0-0.575-0.081-0.831-0.252C30.194,34.1,26,33,22.5,33.001 c-3.714,0.002-6.498,0.914-6.526,0.923c-0.784,0.266-1.635-0.162-1.897-0.948s0.163-1.636,0.949-1.897 c0.132-0.044,3.279-1.075,7.474-1.077C26,30,30.868,30.944,34.332,33.253C35.022,33.713,35.208,34.644,34.748,35.333z M37.74,29.193 c-0.325,0.522-0.886,0.809-1.459,0.809c-0.31,0-0.624-0.083-0.906-0.26c-4.484-2.794-9.092-3.385-13.062-3.35 c-4.482,0.04-8.066,0.895-8.127,0.913c-0.907,0.258-1.861-0.272-2.12-1.183c-0.259-0.913,0.272-1.862,1.184-2.12 c0.277-0.079,3.854-0.959,8.751-1c4.465-0.037,10.029,0.61,15.191,3.826C37.995,27.328,38.242,28.388,37.74,29.193z M40.725,22.013 C40.352,22.647,39.684,23,38.998,23c-0.344,0-0.692-0.089-1.011-0.275c-5.226-3.068-11.58-3.719-15.99-3.725 c-0.021,0-0.042,0-0.063,0c-5.333,0-9.44,0.938-9.481,0.948c-1.078,0.247-2.151-0.419-2.401-1.495 c-0.25-1.075,0.417-2.149,1.492-2.4C11.729,16.01,16.117,15,21.934,15c0.023,0,0.046,0,0.069,0 c4.905,0.007,12.011,0.753,18.01,4.275C40.965,19.835,41.284,21.061,40.725,22.013z" />
-        </symbol>
-
-        <symbol id="service_tinder" viewBox="0 0 50 50" fill="currentColor">
-            <path d="M25,48C13.225,48,5,39.888,5,28.271c0-6.065,3.922-12.709,9.325-15.797c0.151-0.086,0.322-0.132,0.496-0.132 c0.803,0,1.407,0.547,1.407,1.271c0,1.18,0.456,3.923,1.541,5.738c4.455-1.65,9.074-5.839,7.464-16.308 c-0.008-0.051-0.012-0.102-0.012-0.152c0-0.484,0.217-0.907,0.579-1.132c0.34-0.208,0.764-0.221,1.14-0.034 C31.173,3.808,45,11.892,45,28.407C45,39.394,36.215,48,25,48z M26.052,3.519c0.003,0.001,0.005,0.002,0.008,0.004 C26.057,3.521,26.055,3.52,26.052,3.519z" />
-        </symbol>
    </svg>
 );

--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -13,7 +13,9 @@ export const R_MAC = /^((([a-fA-F0-9][a-fA-F0-9]+[-]){5}|([a-fA-F0-9][a-fA-F0-9]

 export const R_CIDR_IPV6 = /^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/(12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))$/;

-export const R_DOMAIN = /^([a-zA-Z0-9][a-zA-Z0-9-_]*\.)*[a-zA-Z0-9]*[a-zA-Z0-9-_]*[[a-zA-Z0-9]+$/;
+export const R_DOMAIN = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;
+
+export const R_SERVER_NAME = /^(\*\.)?[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;

 export const R_PATH_LAST_PART = /\/[^/]*$/;

@@ -23,8 +25,6 @@ export const R_UNIX_ABSOLUTE_PATH = /^(\/[^/\x00]+)+$/;
 // eslint-disable-next-line no-control-regex
 export const R_WIN_ABSOLUTE_PATH = /^([a-zA-Z]:)?(\\|\/)(?:[^\\/:*?"<>|\x00]+\\)*[^\\/:*?"<>|\x00]*$/;

-export const R_CLIENT_ID = /^[a-z0-9-]{1,64}$/;
-
 export const HTML_PAGES = {
    INSTALL: '/install.html',
    LOGIN: '/login.html',
@@ -199,146 +199,94 @@ export const FILTERS_URLS = {
 };

 export const SERVICES = [
-    {
-        id: '9gag',
-        name: '9Gag',
-    },
-    {
-        id: 'amazon',
-        name: 'Amazon',
-    },
-    {
-        id: 'cloudflare',
-        name: 'CloudFlare',
-    },
-    {
-        id: 'dailymotion',
-        name: 'Dailymotion',
-    },
-    {
-        id: 'discord',
-        name: 'Discord',
-    },
-    {
-        id: 'disneyplus',
-        name: 'Disney+',
-    },
-    {
-        id: 'ebay',
-        name: 'EBay',
-    },
-    {
-        id: 'epic_games',
-        name: 'Epic Games',
-    },
    {
        id: 'facebook',
        name: 'Facebook',
    },
-    {
-        id: 'hulu',
-        name: 'Hulu',
-    },
-    {
-        id: 'imgur',
-        name: 'Imgur',
-    },
-    {
-        id: 'instagram',
-        name: 'Instagram',
-    },
-    {
-        id: 'mail_ru',
-        name: 'Mail.ru',
-    },
-    {
-        id: 'netflix',
-        name: 'Netflix',
-    },
-    {
-        id: 'ok',
-        name: 'OK.ru',
-    },
-    {
-        id: 'origin',
-        name: 'Origin',
-    },
-    {
-        id: 'pinterest',
-        name: 'Pinterest',
-    },
-    {
-        id: 'qq',
-        name: 'QQ',
-    },
-    {
-        id: 'reddit',
-        name: 'Reddit',
-    },
-    {
-        id: 'skype',
-        name: 'Skype',
-    },
-    {
-        id: 'snapchat',
-        name: 'Snapchat',
-    },
-    {
-        id: 'spotify',
-        name: 'Spotify',
-    },
-    {
-        id: 'steam',
-        name: 'Steam',
-    },
-    {
-        id: 'telegram',
-        name: 'Telegram',
-    },
-    {
-        id: 'tiktok',
-        name: 'TikTok',
-    },
-    {
-        id: 'tinder',
-        name: 'Tinder',
-    },
-    {
-        id: 'twitch',
-        name: 'Twitch',
-    },
-    {
-        id: 'twitter',
-        name: 'Twitter',
-    },
-    {
-        id: 'viber',
-        name: 'Viber',
-    },
-    {
-        id: 'vimeo',
-        name: 'Vimeo',
-    },
-    {
-        id: 'vk',
-        name: 'VK.com',
-    },
-    {
-        id: 'wechat',
-        name: 'WeChat',
-    },
-    {
-        id: 'weibo',
-        name: 'Weibo',
-    },
    {
        id: 'whatsapp',
        name: 'WhatsApp',
    },
+    {
+        id: 'instagram',
+        name: 'Instagram',
+    },
+    {
+        id: 'twitter',
+        name: 'Twitter',
+    },
    {
        id: 'youtube',
        name: 'YouTube',
    },
+    {
+        id: 'netflix',
+        name: 'Netflix',
+    },
+    {
+        id: 'snapchat',
+        name: 'Snapchat',
+    },
+    {
+        id: 'twitch',
+        name: 'Twitch',
+    },
+    {
+        id: 'discord',
+        name: 'Discord',
+    },
+    {
+        id: 'skype',
+        name: 'Skype',
+    },
+    {
+        id: 'amazon',
+        name: 'Amazon',
+    },
+    {
+        id: 'ebay',
+        name: 'eBay',
+    },
+    {
+        id: 'origin',
+        name: 'Origin',
+    },
+    {
+        id: 'cloudflare',
+        name: 'Cloudflare',
+    },
+    {
+        id: 'steam',
+        name: 'Steam',
+    },
+    {
+        id: 'epic_games',
+        name: 'Epic Games',
+    },
+    {
+        id: 'reddit',
+        name: 'Reddit',
+    },
+    {
+        id: 'ok',
+        name: 'OK',
+    },
+    {
+        id: 'vk',
+        name: 'VK',
+    },
+    {
+        id: 'mail_ru',
+        name: 'mail.ru',
+    },
+    {
+        id: 'tiktok',
+        name: 'TikTok',
+    },
+    {
+        id: 'qq',
+        name: 'QQ',
+    },
 ];

 export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
@@ -395,7 +343,6 @@ export const FILTERED_STATUS = {
    FILTERED_BLOCKED_SERVICE: 'FilteredBlockedService',
    REWRITE: 'Rewrite',
    REWRITE_HOSTS: 'RewriteEtcHosts',
-    REWRITE_RULE: 'RewriteRule',
    FILTERED_SAFE_SEARCH: 'FilteredSafeSearch',
    FILTERED_SAFE_BROWSING: 'FilteredSafeBrowsing',
    FILTERED_PARENTAL: 'FilteredParental',
@@ -487,10 +434,6 @@ export const FILTERED_STATUS_TO_META_MAP = {
        LABEL: RESPONSE_FILTER.REWRITTEN.LABEL,
        COLOR: QUERY_STATUS_COLORS.BLUE,
    },
-    [FILTERED_STATUS.REWRITE_RULE]: {
-        LABEL: RESPONSE_FILTER.REWRITTEN.LABEL,
-        COLOR: QUERY_STATUS_COLORS.BLUE,
-    },
    [FILTERED_STATUS.FILTERED_SAFE_BROWSING]: {
        LABEL: RESPONSE_FILTER.BLOCKED_THREATS.LABEL,
        COLOR: QUERY_STATUS_COLORS.YELLOW,
@@ -570,7 +513,6 @@ export const FORM_NAME = {
    INSTALL: 'install',
    LOGIN: 'login',
    CACHE: 'cache',
-    MOBILE_CONFIG: 'mobileConfig',
    ...DHCP_FORM_NAMES,
 };

@@ -631,7 +573,6 @@ export const TOAST_TIMEOUTS = {
 export const ADDRESS_TYPES = {
    IP: 'IP',
    CIDR: 'CIDR',
-    CLIENT_ID: 'CLIENT_ID',
    UNKNOWN: 'UNKNOWN',
 };

@@ -643,8 +584,3 @@ export const CACHE_CONFIG_FIELDS = {

 export const isFirefox = navigator.userAgent.indexOf('Firefox') !== -1;
 export const COMMENT_LINE_DEFAULT_TOKEN = '#';
-
-export const MOBILE_CONFIG_LINKS = {
-    DOT: '/apple/dot.mobileconfig',
-    DOH: '/apple/doh.mobileconfig',
-};
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -54,11 +54,11 @@
            "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
            "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt"
        },
-        "windows-spy-blocker" : {
-            "name": "WindowsSpyBlocker - Hosts spy rules",
-            "categoryId": "general",
-            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
-            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
+        "malwaredomainlist-com-hosts-list": {
+            "name": "MalwareDomainList.com Hosts List",
+            "categoryId": "security",
+            "homepage": "https://www.malwaredomainlist.com/",
+            "source": "https://www.malwaredomainlist.com/hostslist/hosts.txt"
        },
        "spam404": {
            "name": "Spam404",
@@ -76,7 +76,7 @@
            "name": "The Big List of Hacked Malware Web Sites",
            "categoryId": "security",
            "homepage": "https://github.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites",
-            "source": "https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts"
+            "source": "https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hacked-domains.list"
        },
        "scam-blocklist-by-durable-napkin": {
            "name": "Scam Blocklist by DurableNapkin",
@@ -84,12 +84,6 @@
            "homepage": "https://github.com/durablenapkin/scamblocklist",
            "source": "https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/adguard.txt"
        },
-        "urlhaus-filter-online": {
-            "name": "Online Malicious URL Blocklist",
-            "categoryId": "security",
-            "homepage": "https://gitlab.com/curben/urlhaus-filter",
-            "source": "https://curben.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt"
-        },
        "NOR-dandelion-sprouts-nordiske-filtre": {
            "name": "NOR: Dandelion Sprouts nordiske filtre",
            "categoryId": "regional",
@@ -132,6 +126,12 @@
            "homepage": "https://filtri-dns.ga/",
            "source": "https://filtri-dns.ga/filtri.txt"
        },
+        "JPN-280blocker": {
+            "name": "JPN: 280blocker adblock domain lists",
+            "categoryId": "regional",
+            "homepage": "https://280blocker.net/",
+            "source": "https://280blocker.net/files/280blocker_domain.txt"
+        },
        "IRN-unwanted-iranian-domains": {
            "name": "IRN: Unwanted Iranian domains",
            "categoryId": "regional",
@@ -150,13 +150,7 @@
            "homepage": "https://anti-ad.net/",
            "source": "https://anti-ad.net/easylist.txt"
        },
-        "IDN-abpindo": {
-            "name": "IDN: ABPindo",
-            "categoryId": "regional",
-            "homepage": "https://github.com/ABPindo/indonesianadblockrules/",
-            "source": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt"
-        },
-        "barb-block": {
+        "BarbBlock": {
            "name": "BarbBlock",
            "categoryId": "other",
            "homepage": "https://github.com/paulgb/BarbBlock/",
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -4,9 +4,9 @@ import dateFormat from 'date-fns/format';
 import round from 'lodash/round';
 import axios from 'axios';
 import i18n from 'i18next';
+import uniqBy from 'lodash/uniqBy';
 import ipaddr from 'ipaddr.js';
 import queryString from 'query-string';
-import React from 'react';
 import { getTrackerData } from './trackers/trackers';

 import {
@@ -21,7 +21,6 @@ import {
    DHCP_VALUES_PLACEHOLDERS,
    FILTERED,
    FILTERED_STATUS,
-    R_CLIENT_ID,
    SERVICES_ID_NAME_MAP,
    STANDARD_DNS_PORT,
    STANDARD_HTTPS_PORT,
@@ -62,7 +61,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
        answer_dnssec,
        client,
        client_proto,
-        client_id,
        elapsedMs,
        question,
        reason,
@@ -70,7 +68,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
        time,
        filterId,
        rule,
-        rules,
        service_name,
        original_answer,
        upstream,
@@ -83,15 +80,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
        return `${type}: ${value} (ttl=${ttl})`;
    }) : []);

-    let newRules = rules;
-    /* TODO 'filterId' and 'rule' are deprecated, will be removed in 0.106 */
-    if (rule !== undefined && filterId !== undefined && rules !== undefined && rules.length === 0) {
-        newRules = {
-            filter_list_id: filterId,
-            text: rule,
-        };
-    }
-
    return {
        time,
        domain,
@@ -100,11 +88,8 @@ export const normalizeLogs = (logs) => logs.map((log) => {
        reason,
        client,
        client_proto,
-        client_id,
-        /* TODO 'filterId' and 'rule' are deprecated, will be removed in 0.106 */
        filterId,
        rule,
-        rules: newRules,
        status,
        service_name,
        originalAnswer: original_answer,
@@ -128,21 +113,12 @@ export const normalizeTopStats = (stats) => (
    }))
 );

-export const addClientInfo = (data, clients, ...params) => data.map((row) => {
-    let info = '';
-    params.find((param) => {
-        const id = row[param];
-        if (id) {
-            const client = clients.find((item) => item[id]) || '';
-            info = client?.[id] ?? '';
-        }
-
-        return info;
-    });
-
+export const addClientInfo = (data, clients, param) => data.map((row) => {
+    const clientIp = row[param];
+    const info = clients.find((item) => item[clientIp]) || '';
    return {
        ...row,
-        info,
+        info: info?.[clientIp] ?? '',
    };
 });

@@ -214,12 +190,7 @@ export const getIpList = (interfaces) => Object.values(interfaces)
    .reduce((acc, curr) => acc.concat(curr.ip_addresses), [])
    .sort();

-/**
- * @param {string} ip
- * @param {number} [port]
- * @returns {string}
- */
-export const getDnsAddress = (ip, port = 0) => {
+export const getDnsAddress = (ip, port = '') => {
    const isStandardDnsPort = port === STANDARD_DNS_PORT;
    let address = ip;

@@ -234,12 +205,7 @@ export const getDnsAddress = (ip, port = 0) => {
    return address;
 };

-/**
- * @param {string} ip
- * @param {number} [port]
- * @returns {string}
- */
-export const getWebAddress = (ip, port = 0) => {
+export const getWebAddress = (ip, port = '') => {
    const isStandardWebPort = port === STANDARD_WEB_PORT;
    let address = `http://${ip}`;

@@ -425,21 +391,14 @@ export const getPathWithQueryString = (path, params) => {
    return `${path}?${searchParams.toString()}`;
 };

-export const getParamsForClientsSearch = (data, param, additionalParam) => {
-    const clients = new Set();
-    data.forEach((e) => {
-        clients.add(e[param]);
-        if (e[additionalParam]) {
-            clients.add(e[additionalParam]);
-        }
-    });
-    const params = {};
-    const ids = Array.from(clients.values());
-    ids.forEach((id, i) => {
-        params[`ip${i}`] = id;
-    });
-
-    return params;
+export const getParamsForClientsSearch = (data, param) => {
+    const uniqueClients = uniqBy(data, param);
+    return uniqueClients
+        .reduce((acc, item, idx) => {
+            const key = `ip${idx}`;
+            acc[key] = item[param];
+            return acc;
+        }, {});
 };

 /**
@@ -552,7 +511,7 @@ export const isIpInCidr = (ip, cidr) => {
 /**
 *
 * @param ipOrCidr
- * @returns {'IP' | 'CIDR' | 'CLIENT_ID' | 'UNKNOWN'}
+ * @returns {'IP' | 'CIDR' | 'UNKNOWN'}
 *
 */
 export const findAddressType = (address) => {
@@ -565,9 +524,6 @@ export const findAddressType = (address) => {
        if (cidrMaybe && ipaddr.parseCIDR(address)) {
            return ADDRESS_TYPES.CIDR;
        }
-        if (R_CLIENT_ID.test(address)) {
-            return ADDRESS_TYPES.CLIENT_ID;
-        }

        return ADDRESS_TYPES.UNKNOWN;
    } catch (e) {
@@ -588,31 +544,20 @@ export const separateIpsAndCidrs = (ids) => ids.reduce((acc, curr) => {
    if (addressType === ADDRESS_TYPES.CIDR) {
        acc.cidrs.push(curr);
    }
-    if (addressType === ADDRESS_TYPES.CLIENT_ID) {
-        acc.clientIds.push(curr);
-    }
    return acc;
-}, { ips: [], cidrs: [], clientIds: [] });
+}, { ips: [], cidrs: [] });

 export const countClientsStatistics = (ids, autoClients) => {
-    const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids);
+    const { ips, cidrs } = separateIpsAndCidrs(ids);

    const ipsCount = ips.reduce((acc, curr) => {
        const count = autoClients[curr] || 0;
        return acc + count;
    }, 0);

-    const clientIdsCount = clientIds.reduce((acc, curr) => {
-        const count = autoClients[curr] || 0;
-        return acc + count;
-    }, 0);
-
    const cidrsCount = Object.entries(autoClients)
        .reduce((acc, curr) => {
            const [id, count] = curr;
-            if (!ipaddr.isValid(id)) {
-                return false;
-            }
            if (cidrs.some((cidr) => isIpInCidr(id, cidr))) {
            // eslint-disable-next-line no-param-reassign
                acc += count;
@@ -620,7 +565,7 @@ export const countClientsStatistics = (ids, autoClients) => {
            return acc;
        }, 0);

-    return ipsCount + cidrsCount + clientIdsCount;
+    return ipsCount + cidrsCount;
 };

 /**
@@ -771,75 +716,6 @@ export const getFilterName = (
    return resolveFilterName(filter);
 };

-/**
- * @param {array} rules
- * @param {array} filters
- * @param {array} whitelistFilters
- * @returns {string[]}
- */
-export const getFilterNames = (rules, filters, whitelistFilters) => rules.map(
-    ({ filter_list_id }) => getFilterName(filters, whitelistFilters, filter_list_id),
-);
-
-/**
- * @param {array} rules
- * @returns {string[]}
- */
-export const getRuleNames = (rules) => rules.map(({ text }) => text);
-
-/**
- * @param {array} rules
- * @param {array} filters
- * @param {array} whitelistFilters
- * @returns {object}
- */
-export const getFilterNameToRulesMap = (rules, filters, whitelistFilters) => rules.reduce(
-    (acc, { text, filter_list_id }) => {
-        const filterName = getFilterName(filters, whitelistFilters, filter_list_id);
-
-        acc[filterName] = (acc[filterName] || []).concat(text);
-        return acc;
-    }, {},
-);
-
-/**
- * @param {array} rules
- * @param {array} filters
- * @param {array} whitelistFilters
- * @param {object} classes
- * @returns {JSXElement}
- */
-export const getRulesToFilterList = (rules, filters, whitelistFilters, classes = {
-    list: 'filteringRules',
-    rule: 'filteringRules__rule font-monospace',
-    filter: 'filteringRules__filter',
-}) => {
-    const filterNameToRulesMap = getFilterNameToRulesMap(rules, filters, whitelistFilters);
-
-    return <dl className={classes.list}>
-        {Object.entries(filterNameToRulesMap).reduce(
-            (acc, [filterName, rulesArr]) => acc
-                .concat(rulesArr.map((rule, i) => <dd key={i} className={classes.rule}>{rule}</dd>))
-                .concat(<dt className={classes.filter} key={classes.filter}>{filterName}</dt>),
-            [],
-        )}
-</dl>;
-};
-
-/**
-* @param {array} rules
-* @param {array} filters
-* @param {array} whitelistFilters
-* @returns {string}
-*/
-export const getRulesAndFilterNames = (rules, filters, whitelistFilters) => {
-    const filterNameToRulesMap = getFilterNameToRulesMap(rules, filters, whitelistFilters);
-
-    return Object.entries(filterNameToRulesMap).map(
-        ([filterName, filterRules]) => filterRules.concat(filterName).join('\n'),
-    ).join('\n\n');
-};
-
 /**
 * @param ip {string}
 * @param gateway_ip {string}
--- a/client/src/helpers/renderFormattedClientCell.js
+++ b/client/src/helpers/renderFormattedClientCell.js
@@ -31,7 +31,7 @@ const getFormattedWhois = (whois) => {
 * @param {object} info.whois_info
 * @param {boolean} [isDetailed]
 * @param {boolean} [isLogs]
- * @returns {JSXElement}
+ * @returns {JSX.Element}
 */
 export const renderFormattedClientCell = (value, info, isDetailed = false, isLogs = false) => {
    let whoisContainer = null;
--- a/client/src/helpers/validators.js
+++ b/client/src/helpers/validators.js
@@ -9,8 +9,8 @@ import {
    R_URL_REQUIRES_PROTOCOL,
    STANDARD_WEB_PORT,
    UNSAFE_PORTS,
-    R_CLIENT_ID,
    R_DOMAIN,
+    R_SERVER_NAME,
 } from './constants';
 import { getLastIpv4Octet, isValidAbsolutePath } from './form';

@@ -18,7 +18,7 @@ import { getLastIpv4Octet, isValidAbsolutePath } from './form';
 // https://redux-form.com/8.3.0/examples/fieldlevelvalidation/
 // If the value is valid, the validation function should return undefined.
 /**
- * @param value {string|number}
+ * @param value {string}
 * @returns {undefined|string}
 */
 export const validateRequiredValue = (value) => {
@@ -66,14 +66,14 @@ export const validateClientId = (value) => {
    if (!value) {
        return undefined;
    }
-    const formattedValue = value.trim();
+    const formattedValue = value ? value.trim() : value;
    if (formattedValue && !(
        R_IPV4.test(formattedValue)
            || R_IPV6.test(formattedValue)
            || R_MAC.test(formattedValue)
            || R_CIDR.test(formattedValue)
            || R_CIDR_IPV6.test(formattedValue)
-            || R_CLIENT_ID.test(formattedValue)
+            || R_DOMAIN.test(formattedValue)
    )) {
        return 'form_error_client_id_format';
    }
@@ -89,7 +89,7 @@ export const validateServerName = (value) => {
        return undefined;
    }
    const formattedValue = value ? value.trim() : value;
-    if (formattedValue && !R_DOMAIN.test(formattedValue)) {
+    if (formattedValue && !R_SERVER_NAME.test(formattedValue)) {
        return 'form_error_server_name';
    }
    return undefined;
--- a/client/src/install/Setup/AddressList.js
+++ b/client/src/install/Setup/AddressList.js
@@ -41,13 +41,16 @@ const AddressList = ({
 AddressList.propTypes = {
    interfaces: PropTypes.object.isRequired,
    address: PropTypes.string.isRequired,
-    port: PropTypes.number.isRequired,
+    port: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+    ]),
    isDns: PropTypes.bool,
 };

 renderItem.propTypes = {
    ip: PropTypes.string.isRequired,
-    port: PropTypes.number.isRequired,
+    port: PropTypes.string.isRequired,
    isDns: PropTypes.bool.isRequired,
 };

--- a/client/src/install/Setup/Setup.css
+++ b/client/src/install/Setup/Setup.css
@@ -1,9 +1,3 @@
-@media screen and (max-width: 767px) {
-    input, select, textarea {
-        font-size: 16px !important;
-    }
-}
-
 .setup {
    min-height: calc(100vh - 71px);
    line-height: 1.48;
--- a/client/src/login/Login/Login.css
+++ b/client/src/login/Login/Login.css
@@ -1,9 +1,3 @@
-@media screen and (max-width: 767px) {
-    input, select, textarea {
-        font-size: 16px !important;
-    }
-}
-
 .login {
    display: flex;
    flex-direction: column;
--- a/client/src/reducers/access.js
+++ b/client/src/reducers/access.js
@@ -24,7 +24,13 @@ const access = handleActions(

        [actions.setAccessListRequest]: (state) => ({ ...state, processingSet: true }),
        [actions.setAccessListFailure]: (state) => ({ ...state, processingSet: false }),
-        [actions.setAccessListSuccess]: (state) => ({ ...state, processingSet: false }),
+        [actions.setAccessListSuccess]: (state) => {
+            const newState = {
+                ...state,
+                processingSet: false,
+            };
+            return newState;
+        },

        [actions.toggleClientBlockRequest]: (state) => ({ ...state, processingSet: true }),
        [actions.toggleClientBlockFailure]: (state) => ({ ...state, processingSet: false }),
--- a/client2/.eslintignore
+++ b/client2/.eslintignore
@@ -1,6 +0,0 @@
-scripts
-node_modules
-postcss.config.js
-src/lib/entities
-src/lib/apis
-openApi
--- a/client2/.eslintrc
+++ b/client2/.eslintrc
@@ -1,5 +0,0 @@
-{
-    "extends": [
-        "./scripts/lint/dev.js"
-    ]
-}
--- a/client2/declaration.d.ts
+++ b/client2/declaration.d.ts
@@ -1,18 +0,0 @@
-declare module '*.pcss' {
-    const content: {[className: string]: string};
-    export default content;
-}
-declare module '*.css' {
-    const content: {[className: string]: string};
-    export default content;
-}
-declare module '*.png'
-declare module '*.jpg'
-declare let AUTH_TOKEN: string;
-declare let MAIN_TOKEN: string | undefined;
-declare let NO_CAPTCHA: boolean | undefined;
-declare module 'dygraphs';
-declare module '@novnc/novnc/core/rfb';
-// cp - CloudPayments script
-declare let cp: any;
-declare const DEV: any;
--- a/client2/package.json
+++ b/client2/package.json
@@ -1,89 +0,0 @@
-{
-    "author": "Performix",
-    "private": true,
-    "name": "adguard-home",
-    "version": "0.1.0",
-    "scripts": {
-        "build": "rm -rf ../build2 && yarn install && webpack --config ./scripts/webpack/webpack.config.prod.js",
-        "start": "webpack serve --config ./scripts/webpack/webpack.config.dev.js",
-        "generate": "rm -rf ./src/lib/entities ./src/lib/apis && ts-node --compiler-options  '{ \"module\": \"CommonJS\" }' ./scripts/generator/index.ts",
-        "translations:check": "ts-node  --compiler-options  '{ \"module\": \"CommonJS\" }' ./scripts/plugins/checkTranslations.ts",
-        "lint": "eslint -c ./scripts/lint/prod.js --ext .tsx --ext .ts ./",
-        "go:build": "cd .. && make REBUILD_CLIENT=0 build",
-        "go:run": "sudo ../AdguardHome"
-    },
-    "license": "ISC",
-    "dependencies": {
-        "@adguard/translate": "^0.2.0",
-        "@ant-design/icons": "^4.4.0",
-        "@sentry/react": "^5.27.0",
-        "antd": "^4.7.2",
-        "classnames": "^2.2.6",
-        "dayjs": "^1.9.3",
-        "formik": "^2.2.0",
-        "mobx": "^6.0.1",
-        "mobx-react-lite": "^3.0.1",
-        "qs": "^6.9.4",
-        "react": "^17.0.0",
-        "react-dom": "^17.0.0",
-        "react-router-dom": "^5.2.0",
-        "recharts": "^2.0.3"
-    },
-    "devDependencies": {
-        "@types/classnames": "^2.2.10",
-        "@types/qs": "^6.9.5",
-        "@types/react": "^16.9.53",
-        "@types/react-dom": "^16.9.8",
-        "@types/react-redux": "^7.1.9",
-        "@types/react-router-dom": "^5.1.6",
-        "@typescript-eslint/eslint-plugin": "^4.5.0",
-        "@typescript-eslint/parser": "^4.5.0",
-        "antd-dayjs-webpack-plugin": "^1.0.1",
-        "autoprefixer": "^10.0.1",
-        "connect-history-api-fallback": "^1.6.0",
-        "copy-webpack-plugin": "^6.2.1",
-        "css-loader": "^5.0.0",
-        "eslint": "^7.11.0",
-        "eslint-config-airbnb-base": "^14.2.0",
-        "eslint-config-airbnb-typescript": "^12.0.0",
-        "eslint-import-resolver-typescript": "^2.3.0",
-        "eslint-loader": "^4.0.2",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-react": "^7.21.5",
-        "eslint-plugin-react-hooks": "^4.2.0",
-        "file-loader": "^6.1.1",
-        "html-webpack-plugin": "^4.5.0",
-        "http-proxy-middleware": "^1.0.6",
-        "less": "^3.12.2",
-        "less-loader": "^5.0.0",
-        "mini-css-extract-plugin": "^1.1.1",
-        "optimize-css-assets-webpack-plugin": "^5.0.4",
-        "postcss": "^8.1.2",
-        "postcss-calc": "^7.0.5",
-        "postcss-css-variables": "^0.17.0",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-import": "^13.0.0",
-        "postcss-inline-svg": "^4.1.0",
-        "postcss-loader": "^4.0.4",
-        "postcss-mixins": "^7.0.1",
-        "postcss-modules": "^3.2.2",
-        "postcss-nested": "^5.0.1",
-        "postcss-preset-env": "^6.7.0",
-        "postcss-reporter": "^7.0.1",
-        "postcss-variables": "^1.1.1",
-        "style-loader": "^2.0.0",
-        "stylelint": "^13.7.2",
-        "stylelint-webpack-plugin": "^2.1.1",
-        "terser-webpack-plugin": "^5.0.0",
-        "ts-loader": "^8.0.6",
-        "ts-morph": "^8.1.2",
-        "ts-node": "^9.0.0",
-        "typescript": "^4.0.3",
-        "url-loader": "^4.1.1",
-        "webpack": "^5.10.0",
-        "webpack-cli": "^4.2.0",
-        "webpack-dev-server": "^3.11.0",
-        "webpack-merge": "^5.2.0",
-        "yaml": "^1.10.0"
-    }
-}
--- a/client2/postcss.config.js
+++ b/client2/postcss.config.js
@@ -1,17 +0,0 @@
-module.exports = {
-    plugins: [
-        ['postcss-import', {}],
-        ['postcss-nested', {}],
-        ['postcss-custom-media', {}],
-        ['postcss-variables', {}],
-        ['postcss-calc', {}],
-        ['postcss-mixins', {}],
-        ['postcss-preset-env', { stage: 3, features: { 'nesting-rules': true } }],
-        ['postcss-reporter', { clearMessages: true }],
-        ['postcss-inline-svg', {
-            paths: ['frontend/icons', 'vendor/adguard/utils-bundle/src/Resources/frontend/icons'],
-            svgo: { plugins: [{ cleanupAttrs: true }] } 
-        }],
-        ['autoprefixer'],
-    ]
-};
--- a/client2/public/assets/apple-touch-icon-180x180.png
+++ b/client2/public/assets/apple-touch-icon-180x180.png
--- a/client2/public/assets/favicon.png
+++ b/client2/public/assets/favicon.png
--- a/client2/public/assets/safari-pinned-tab.svg
+++ b/client2/public/assets/safari-pinned-tab.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16pt" height="16pt"
-     viewBox="0 0 16 16" version="1.1">
-    <g id="surface1">
-        <path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,0%,0%);fill-opacity:1;"
-              d="M 8 0 C 10.5 0 13.515625 0.574219 16 1.835938 L 15.996094 2.542969 C 15.957031 5.605469 15.410156 11.71875 8 16 C 0.5 11.667969 0.03125 5.460938 0.00390625 2.433594 L 0 1.835938 C 2.484375 0.574219 5.5 0 8 0 Z M 11.769531 4.203125 L 11.761719 4.203125 L 7.890625 8.160156 L 6.433594 6.4375 C 5.738281 5.644531 4.792969 6.25 4.570312 6.40625 L 7.929688 10.285156 L 12.570312 4.136719 C 12.230469 3.867188 11.933594 4.054688 11.769531 4.203125 Z M 11.769531 4.203125 "/>
-    </g>
-</svg>
--- a/client2/public/index.html
+++ b/client2/public/index.html
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
-        <meta name="theme-color" content="#000000">
-        <meta name="google" content="notranslate">
-        <meta http-equiv="x-dns-prefetch-control" content="off">
-        <meta name="mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-status-bar-style" content="default">
-        <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
-        <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>
-    </head>
-    <body>
-        <noscript>
-            You need to enable JavaScript to run this app.
-        </noscript>
-        <div id="app"></div>
-    </body>
-</html>
--- a/client2/public/install.html
+++ b/client2/public/install.html
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
-        <meta name="theme-color" content="#000000">
-        <meta name="google" content="notranslate">
-        <meta name="mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-status-bar-style" content="default">
-        <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
-        <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>Setup AdGuard Home</title>
-    </head>
-    <body>
-        <noscript>
-            You need to enable JavaScript to run this app.
-        </noscript>
-        <div id="app"></div>
-    </body>
-</html>
--- a/client2/public/login.html
+++ b/client2/public/login.html
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
-        <meta name="theme-color" content="#000000">
-        <meta name="google" content="notranslate">
-        <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
-        <meta name="mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
-        <meta name="apple-mobile-web-app-status-bar-style" content="default">
-        <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>Login</title>
-    </head>
-    <body>
-        <noscript>
-            You need to enable JavaScript to run this app.
-        </noscript>
-        <div id="app"></div>
-    </body>
-</html>
--- a/client2/scripts/consts.ts
+++ b/client2/scripts/consts.ts
@@ -1,12 +0,0 @@
-export const OPEN_API_PATH = '../openapi/openapi.yaml';
-export const ENT_DIR = './src/lib/entities';
-export const API_DIR = './src/lib/apis';
-export const LOCALE_FOLDER_PATH = './src/lib/intl/__locales';
-export const TRANSLATOR_CLASS_NAME = 'Translator';
-export const USE_INTL_NAME = 'useIntl';
-
-export const trimQuotes = (str: string) => {
-    return str.replace(/\'|\"/g, '');
-};
-
-export const GENERATOR_ENTITY_ALLIAS = 'Entities/';
--- a/client2/scripts/generator/index.ts
+++ b/client2/scripts/generator/index.ts
@@ -1,18 +0,0 @@
-import * as fs from 'fs';
-import * as YAML from 'yaml';
-import { OPEN_API_PATH } from '../consts';
-
-import EntitiesGenerator from './src/generateEntities';
-import ApisGenerator from './src/generateApis';
-
-
-const generateApi = (openApi: Record<string, any>) => {
-    const ent = new EntitiesGenerator(openApi);
-    ent.save();
-
-    const api = new ApisGenerator(openApi);
-    api.save();
-}
-
-const openApiFile = fs.readFileSync(OPEN_API_PATH, 'utf8');
-generateApi(YAML.parse(openApiFile));
--- a/client2/scripts/generator/src/generateApis.ts
+++ b/client2/scripts/generator/src/generateApis.ts
@@ -1,317 +0,0 @@
-/* eslint-disable no-template-curly-in-string */
-/* eslint-disable @typescript-eslint/no-unused-expressions */
-import * as fs from 'fs';
-import * as path from 'path';
-import { stringify } from 'qs';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import * as morph from 'ts-morph';
-
-import {
-    API_DIR as API_DIR_CONST,
-    GENERATOR_ENTITY_ALLIAS,
-} from '../../consts';
-import { toCamel, capitalize, schemaParamParser } from './utils';
-
-
-const API_DIR = path.resolve(API_DIR_CONST);
-if (!fs.existsSync(API_DIR)) {
-    fs.mkdirSync(API_DIR);
-}
-
-const { Project, QuoteKind } = morph;
-
-
-class ApiGenerator {
-    project = new Project({
-        tsConfigFilePath: './tsconfig.json',
-        addFilesFromTsConfig: false,
-        manipulationSettings: {
-            quoteKind: QuoteKind.Single,
-            usePrefixAndSuffixTextForRename: false,
-            useTrailingCommas: true,
-        },
-    });
-
-    openapi: Record<string, any>;
-
-    serverUrl: string;
-
-    paths: any;
-
-    /* interface Controllers {
-        [controller: string]: {
-            [operationId: string]: { parameters - from opneApi, responses - from opneApi, method }
-        }
-    } */
-    controllers: Record<string, any> = {};
-
-    apis: morph.SourceFile[] = [];
-
-    constructor(openapi: Record<string, any>) {
-        this.openapi = openapi;
-        this.paths = openapi.paths;
-        this.serverUrl = openapi.servers[0].url;
-
-        Object.keys(this.paths).forEach((pathKey) => {
-            Object.keys(this.paths[pathKey]).forEach((method) => {
-                const {
-                    tags, operationId, parameters, responses, requestBody, security,
-                } = this.paths[pathKey][method];
-                const controller = toCamel((tags ? tags[0] : pathKey.split('/')[1]).replace('-controller', ''));
-
-                if (this.controllers[controller]) {
-                    this.controllers[controller][operationId] = {
-                        parameters,
-                        responses,
-                        method,
-                        requestBody,
-                        security,
-                        pathKey: pathKey.replace(/{/g, '${'),
-                    };
-                } else {
-                    this.controllers[controller] = { [operationId]: {
-                        parameters,
-                        responses,
-                        method,
-                        requestBody,
-                        security,
-                        pathKey: pathKey.replace(/{/g, '${'),
-                    } };
-                }
-            });
-        });
-
-        this.generateApiFiles();
-    }
-
-    generateApiFiles = () => {
-        Object.keys(this.controllers).forEach(this.generateApiFile);
-    };
-
-    generateApiFile = (cName: string) => {
-        const apiFile = this.project.createSourceFile(`${API_DIR}/${cName}.ts`);
-        apiFile.addStatements([
-            '// This file was autogenerated. Please do not change.',
-            '// All changes will be overwrited on commit.',
-            '',
-        ]);
-
-        // const schemaProperties = schemas[schemaName].properties;
-        const importEntities: any[] = [];
-
-        // add api class to file
-        const apiClass = apiFile.addClass({
-            name: `${capitalize(cName)}Api`,
-            isDefaultExport: true,
-        });
-
-        // get operations of controller
-        const controllerOperations = this.controllers[cName]; 
-        const operationList = Object.keys(controllerOperations).sort();
-        // for each operation add fetcher
-        operationList.forEach((operation) => {
-            const {
-                requestBody, responses, parameters, method, pathKey, security,
-            } = controllerOperations[operation];
-
-            const queryParams: any[] = []; // { name, type }
-            const bodyParam: any[] = []; // { name, type }
-
-            let hasResponseBodyType: /* boolean | ReturnType<schemaParamParser> */ false | [string, boolean, boolean, boolean, boolean] = false;
-            let contentType = '';
-            if (parameters) {
-                parameters.forEach((p: any) => {
-                    const [
-                        pType, isArray, isClass, isImport,
-                    ] = schemaParamParser(p.schema, this.openapi);
-
-                    if (isImport) {
-                        importEntities.push({ type: pType, isClass });
-                    }
-                    if (p.in === 'query') {
-                        queryParams.push({
-                            name: p.name, type: `${pType}${isArray ? '[]' : ''}`, hasQuestionToken: !p.required });
-                    }
-                });
-            }
-            if (queryParams.length > 0) {
-                const imp = apiFile.getImportDeclaration((i) => {
-                    return i.getModuleSpecifierValue() === 'qs';
-                }); if (!imp) {
-                    apiFile.addImportDeclaration({
-                        moduleSpecifier: 'qs',
-                        defaultImport: 'qs',
-                    });
-                }
-            }
-            if (requestBody) {
-                let content = requestBody.content;
-                const { $ref }: { $ref: string } = requestBody;
-
-                if (!content && $ref) {
-                    const name = $ref.split('/').pop() as string;
-                    content = this.openapi.components.requestBodies[name].content;
-                }
-                
-                [contentType] = Object.keys(content);
-                const data = content[contentType];
-
-                const [
-                    pType, isArray, isClass, isImport,
-                ] = schemaParamParser(data.schema, this.openapi);
-
-                if (isImport) {
-                    importEntities.push({ type: pType, isClass });
-                    bodyParam.push({ name: pType.toLowerCase(), type: `${isClass ? 'I' : ''}${pType}${isArray ? '[]' : ''}`, isClass, pType });
-                } else {
-                    bodyParam.push({ name: 'data', type: `${pType}${isArray ? '[]' : ''}` });
-                    
-                }
-            }
-            if (responses['200']) {
-                const { content, headers } = responses['200'];
-                if (content && (content['*/*'] || content['application/json'])) {
-                    const { schema, examples } = content['*/*'] || content['application/json'];
-
-                    if (!schema) {
-                        process.exit(0);
-                    }
-
-                    const propType = schemaParamParser(schema, this.openapi);
-                    const [pType, , isClass, isImport] = propType;
-
-                    if (isImport) {
-                        importEntities.push({ type: pType, isClass });
-                    }
-                    hasResponseBodyType = propType;
-                }
-            }
-            let returnType = '';
-            if (hasResponseBodyType) {
-                const [pType, isArray, isClass] = hasResponseBodyType as any;
-                let data = `Promise<${isClass ? 'I' : ''}${pType}${isArray ? '[]' : ''}`;
-                returnType = data;
-            } else {
-                returnType = 'Promise<number';
-            } 
-            const shouldValidate = bodyParam.filter(b => b.isClass);
-            if (shouldValidate.length > 0) {
-                returnType += ' | string[]';
-            }
-            // append Error to default type return;
-            returnType += ' | Error>';
-
-            const fetcher = apiClass.addMethod({
-                isAsync: true,
-                isStatic: true,
-                name: operation,
-                returnType,
-            });
-            const params = [...queryParams, ...bodyParam].sort((a, b) => (Number(!!a.hasQuestionToken) - Number(!!b.hasQuestionToken)));
-            fetcher.addParameters(params);
-
-            fetcher.setBodyText((w) => {
-                // Add data to URLSearchParams
-                if (contentType === 'text/plain') {
-                    bodyParam.forEach((b) => {
-                        w.writeLine(`const params =  String(${b.name});`);
-                    });
-                } else {
-                    if (shouldValidate.length > 0) {
-                        w.writeLine(`const haveError: string[] = [];`);
-                        shouldValidate.forEach((b) => {
-                            w.writeLine(`const ${b.name}Valid = new ${b.pType}(${b.name});`);
-                            w.writeLine(`haveError.push(...${b.name}Valid.validate());`);
-                        });
-                        w.writeLine(`if (haveError.length > 0) {`);
-                        w.writeLine(`    return Promise.resolve(haveError);`)
-                        w.writeLine(`}`);
-                    }
-                }
-                // Switch return of fetch in case on queryParams
-                if (queryParams.length > 0) {
-                    w.writeLine('const queryParams = {');
-                    queryParams.forEach((q) => {
-                        w.writeLine(`    ${q.name}: ${q.name},`);
-                    });
-                    w.writeLine('}');
-                    w.writeLine(`return await fetch(\`${this.serverUrl}${pathKey}?\${qs.stringify(queryParams, { arrayFormat: 'comma' })}\`, {`);
-                } else {
-                    w.writeLine(`return await fetch(\`${this.serverUrl}${pathKey}\`, {`);
-                }
-                // Add method
-                w.writeLine(`    method: '${method.toUpperCase()}',`);
-
-                // add Fetch options
-                if (contentType && contentType !== 'multipart/form-data') {
-                    w.writeLine('    headers: {');
-                    w.writeLine(`        'Content-Type': '${contentType}',`);
-                    w.writeLine('    },');
-                }
-                if (contentType) {
-                    switch (contentType) {
-                        case 'text/plain':
-                            w.writeLine('    body: params,');
-                            break;
-                        default:
-                            w.writeLine(`    body: JSON.stringify(${bodyParam.map((b) => b.isClass ? `${b.name}Valid.serialize()` : b.name).join(', ')}),`);
-                            break;
-                    }
-                }
-
-                // Handle response
-                if (hasResponseBodyType) {
-                    w.writeLine('}).then(async (res) => {');
-                    w.writeLine('    if (res.status === 200) {');
-                    w.writeLine('        return res.json();');
-                } else {
-                    w.writeLine('}).then(async (res) => {');
-                    w.writeLine('    if (res.status === 200) {');
-                    w.writeLine('        return res.status;');
-                }
-
-                // Handle Error
-                w.writeLine('    } else {');
-                w.writeLine('        return new Error(String(res.status));');
-                w.writeLine('    }');
-                w.writeLine('})');
-            });
-        });
-
-        const imports: any[] = [];
-        const types: string[] = [];
-        importEntities.forEach((i) => {
-            const { type } = i;
-            if (!types.includes(type)) {
-                imports.push(i);
-                types.push(type);
-            }
-        });
-        imports.sort((a,b) => a.type > b.type ? 1 : -1).forEach((ie) => {
-            const { type: pType, isClass } = ie;
-            if (isClass) {
-                apiFile.addImportDeclaration({
-                    moduleSpecifier: `${GENERATOR_ENTITY_ALLIAS}${pType}`,
-                    defaultImport: pType,
-                    namedImports: [`I${pType}`],
-                });
-            } else {
-                apiFile.addImportDeclaration({
-                    moduleSpecifier: `${GENERATOR_ENTITY_ALLIAS}${pType}`,
-                    namedImports: [pType],
-                });
-            }
-        });
-
-        this.apis.push(apiFile);
-    };
-
-    save = () => {
-        this.apis.forEach(async (e) => {
-            await e.saveSync();
-        });
-    };
-}
-
-
-export default ApiGenerator;
--- a/client2/scripts/generator/src/generateEntities.ts
+++ b/client2/scripts/generator/src/generateEntities.ts
@@ -1,603 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import * as morph from 'ts-morph';
-
-import { ENT_DIR } from '../../consts';
-import { TYPES, toCamel, schemaParamParser, uncapitalize } from './utils';
-
-const { Project, QuoteKind } = morph;
-
-
-const EntDir = path.resolve(ENT_DIR);
-if (!fs.existsSync(EntDir)) {
-    fs.mkdirSync(EntDir);
-}
-
-class EntitiesGenerator {
-    project = new Project({
-        tsConfigFilePath: './tsconfig.json',
-        addFilesFromTsConfig: false,
-        manipulationSettings: {
-            quoteKind: QuoteKind.Single,
-            usePrefixAndSuffixTextForRename: false,
-            useTrailingCommas: true,
-        },
-    });
-
-    openapi: Record<string, any>;
-
-    schemas: Record<string, any>;
-
-    schemaNames: string[];
-
-    entities: morph.SourceFile[] = [];
-
-    constructor(openapi: Record<string, any>) {
-        this.openapi = openapi;
-        this.schemas = openapi.components.schemas;
-        this.schemaNames = Object.keys(this.schemas);
-        this.generateEntities();
-    }
-
-    generateEntities = () => {
-        this.schemaNames.forEach(this.generateEntity);
-    };
-
-    generateEntity = (sName: string) => {
-        const { properties, type, oneOf } = this.schemas[sName];
-        const notAClass = !properties && TYPES[type as keyof typeof TYPES];
-
-        if (oneOf) {
-            this.generateOneOf(sName);
-            return;
-        }
-
-        if (notAClass) {
-            this.generateEnum(sName);
-        } else {
-            this.generateClass(sName);
-        } 
-    };
-
-    generateEnum = (sName: string) => {
-        const entityFile = this.project.createSourceFile(`${EntDir}/${sName}.ts`);
-        entityFile.addStatements([
-            '// This file was autogenerated. Please do not change.',
-            '// All changes will be overwrited on commit.',
-            '',
-        ]);
-
-        const { enum: enumMembers } = this.schemas[sName];
-        entityFile.addEnum({
-            name: sName,
-            members: enumMembers.map((e: string) => ({ name: e.toUpperCase(), value: e })),
-            isExported: true,
-        });
-
-        this.entities.push(entityFile);
-    };
-
-    generateOneOf = (sName: string) => {
-        const entityFile = this.project.createSourceFile(`${EntDir}/${sName}.ts`);
-        entityFile.addStatements([
-            '// This file was autogenerated. Please do not change.',
-            '// All changes will be overwrited on commit.',
-            '',
-        ]);
-        const importEntities: { type: string, isClass: boolean }[] = [];
-        const entities = this.schemas[sName].oneOf.map((elem: any) => {
-            const [
-                pType, isArray, isClass, isImport,
-            ] = schemaParamParser(elem, this.openapi);
-            importEntities.push({ type: pType, isClass });
-            return { type: pType, isArray };
-        });
-        entityFile.addTypeAlias({
-            name: sName,
-            isExported: true,
-            type: entities.map((e: any) => e.isArray ? `I${e.type}[]` : `I${e.type}`).join(' | '),
-        })
-
-        // add import
-        importEntities.sort((a, b) => a.type > b.type ? 1 : -1).forEach((ie) => {
-            const { type: pType, isClass } = ie;
-            if (isClass) {
-                entityFile.addImportDeclaration({
-                    moduleSpecifier: `./${pType}`,
-                    namedImports: [`I${pType}`],
-                });
-            } else {
-                entityFile.addImportDeclaration({
-                    moduleSpecifier: `./${pType}`,
-                    namedImports: [pType],
-                });
-            }
-        });
-        this.entities.push(entityFile);
-    }
-
-    generateClass = (sName: string) => {
-        const entityFile = this.project.createSourceFile(`${EntDir}/${sName}.ts`);
-        entityFile.addStatements([
-            '// This file was autogenerated. Please do not change.',
-            '// All changes will be overwrited on commit.',
-            '',
-        ]);
-
-
-        const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
-        if ($ref) {
-            const temp = $ref.split('/');
-            const importSchemaName = `${temp[temp.length - 1]}`;
-            entityFile.addImportDeclaration({
-                defaultImport: importSchemaName,
-                moduleSpecifier: `./${importSchemaName}`,
-                namedImports: [`I${importSchemaName}`],
-            });
-
-            entityFile.addTypeAlias({
-                name: `I${sName}`,
-                type: `I${importSchemaName}`,
-                isExported: true,
-            })
-
-            entityFile.addStatements(`export default ${importSchemaName};`);
-            this.entities.push(entityFile);
-            return;
-        }
-
-        const importEntities: { type: string, isClass: boolean }[] = [];
-        const entityInterface = entityFile.addInterface({
-            name: `I${sName}`,
-            isExported: true,
-        });
-        
-        const sortedSProps = Object.keys(sProps || {}).sort();
-        const additionalPropsOnly = additionalProperties && sortedSProps.length === 0;
-
-        // add server response interface to entityFile
-        sortedSProps.forEach((sPropName) => {
-            const [
-                pType, isArray, isClass, isImport, isAdditional
-            ] = schemaParamParser(sProps[sPropName], this.openapi);
-
-            if (isImport) {
-                importEntities.push({ type: pType, isClass });
-            }
-            const propertyType = isAdditional
-                ? `{ [key: string]: ${isClass ? 'I' : ''}${pType}${isArray ? '[]' : ''} }`
-                : `${isClass ? 'I' : ''}${pType}${isArray ? '[]' : ''}`;
-            entityInterface.addProperty({
-                name: sPropName,
-                type: propertyType,
-                hasQuestionToken: !(
-                    (required && required.includes(sPropName)) || sProps[sPropName].required
-                ),
-            });
-        });
-        if (additionalProperties) {
-            const [
-                pType, isArray, isClass, isImport, isAdditional
-            ] = schemaParamParser(additionalProperties, this.openapi);
-
-            if (isImport) {
-                importEntities.push({ type: pType, isClass });
-            }
-            const type = isAdditional
-                ? `{ [key: string]: ${isClass ? 'I' : ''}${pType}${isArray ? '[]' : ''} }`
-                : `${isClass ? 'I' : ''}${pType}${isArray ? '[]' : ''}`;
-            entityInterface.addIndexSignature({
-                keyName: 'key',
-                keyType: 'string',
-                returnType: additionalPropsOnly ? type : `${type} | undefined`,
-            });
-        }
-
-        // add import
-        const imports: { type: string, isClass: boolean }[] = [];
-        const types: string[] = [];
-        importEntities.forEach((i) => {
-            const { type } = i;
-            if (!types.includes(type)) {
-                imports.push(i);
-                types.push(type);
-            }
-        });
-        imports.sort((a, b) => a.type > b.type ? 1 : -1).forEach((ie) => {
-            const { type: pType, isClass } = ie;
-            if (isClass) {
-                entityFile.addImportDeclaration({
-                    defaultImport: pType,
-                    moduleSpecifier: `./${pType}`,
-                    namedImports: [`I${pType}`],
-                });
-            } else {
-                entityFile.addImportDeclaration({
-                    moduleSpecifier: `./${pType}`,
-                    namedImports: [pType],
-                });
-            }
-        });
-
-        const entityClass = entityFile.addClass({
-            name: sName,
-            isDefaultExport: true,
-        });
-
-        // addProperties to class;
-        sortedSProps.forEach((sPropName) => {
-            const [pType, isArray, isClass, isImport, isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
-
-            const isRequred = (required && required.includes(sPropName))
-                || sProps[sPropName].required;
-
-            const propertyType = isAdditional
-                ? `{ [key: string]: ${pType}${isArray ? '[]' : ''}${isRequred ? '' : ' | undefined'} }`
-                : `${pType}${isArray ? '[]' : ''}${isRequred ? '' : ' | undefined'}`;
-
-            entityClass.addProperty({
-                name: `_${sPropName}`,
-                isReadonly: true,
-                type: propertyType,
-            });
-            const getter = entityClass.addGetAccessor({
-                name: toCamel(sPropName),
-                returnType: propertyType,
-                statements: [`return this._${sPropName};`],
-            });
-            const { description, example, minItems, maxItems, maxLength, minLength, maximum, minimum } = sProps[sPropName];
-            if (description || example) {
-                getter.addJsDoc(`${example ? `Description: ${description}` : ''}${example ? `\nExample: ${example}` : ''}`);
-            }
-            if (minItems) {
-                entityClass.addGetAccessor({
-                    isStatic: true,
-                    name: `${toCamel(sPropName)}MinItems`,
-                    statements: [`return ${minItems};`],
-                });
-            }
-            if (maxItems) {
-                entityClass.addGetAccessor({
-                    isStatic: true,
-                    name: `${toCamel(sPropName)}MaxItems`,
-                    statements: [`return ${maxItems};`],
-                });
-            }
-            if (typeof minLength === 'number') {
-                entityClass.addGetAccessor({
-                    isStatic: true,
-                    name: `${toCamel(sPropName)}MinLength`,
-                    statements: [`return ${minLength};`],
-                });
-            }
-            if (maxLength) {
-                entityClass.addGetAccessor({
-                    isStatic: true,
-                    name: `${toCamel(sPropName)}MaxLength`,
-                    statements: [`return ${maxLength};`],
-                });
-            }
-            if (typeof minimum === 'number') {
-                entityClass.addGetAccessor({
-                    isStatic: true,
-                    name: `${toCamel(sPropName)}MinValue`,
-                    statements: [`return ${minimum};`],
-                });
-            }
-            if (maximum) {
-                entityClass.addGetAccessor({
-                    isStatic: true,
-                    name: `${toCamel(sPropName)}MaxValue`,
-                    statements: [`return ${maximum};`],
-                });
-            }
-
-            if (!(isArray && isClass) && !isClass) {
-                const isEnum = !isClass && isImport;
-                const isRequired = (required && required.includes(sPropName)) || sProps[sPropName].required;
-                const { maxLength, minLength, maximum, minimum } = sProps[sPropName];
-                const haveValidationFields = maxLength || typeof minLength === 'number' || maximum || typeof minimum === 'number';
-                if (isRequired || haveValidationFields) {
-                    const prop = toCamel(sPropName);
-                    const validateField = entityClass.addMethod({
-                        isStatic: true,
-                        name: `${prop}Validate`,
-                        returnType: `boolean`,
-                        parameters: [{
-                            name: prop,
-                            type: `${pType}${isArray ? '[]' : ''}${isRequred ? '' : ' | undefined'}`,
-                        }],
-                    })
-    
-                    validateField.setBodyText((w) => {
-                        w.write('return ');
-                            const nonRequiredCall = isRequired ? prop : `!${prop} ? true : ${prop}`;
-                            if (pType === 'string') {
-                                if (isArray) {
-                                    w.write(`${nonRequiredCall}.reduce<boolean>((result, p) => result && (typeof p === 'string' && !!p.trim()), true)`);
-                                } else {
-                                    if (typeof minLength === 'number' && maxLength) {
-                                        w.write(`(${nonRequiredCall}.length >${minLength > 0 ? '=' : ''} ${minLength}) && (${nonRequiredCall}.length <= ${maxLength})`);
-                                    }
-                                    if (typeof minLength !== 'number' || !maxLength) {
-                                        w.write(`${isRequired ? `typeof ${prop} === 'string'` : `!${prop} ? true : typeof ${prop} === 'string'`} && !!${nonRequiredCall}.trim()`);
-                                    }
-                                }
-                            } else if (pType === 'number') {
-                                if (isArray) {
-                                    w.write(`${nonRequiredCall}.reduce<boolean>((result, p) => result && typeof p === 'number', true)`);
-                                } else {
-                                    if (typeof minimum === 'number' && maximum) {
-                                        w.write(`${isRequired ? `${prop} >= ${minimum} && ${prop} <= ${maximum}` : `!${prop} ? true : ((${prop} >= ${minimum}) && (${prop} <= ${maximum}))`}`);
-                                    }
-                                    if (typeof minimum !== 'number' || !maximum) {
-                                        w.write(`${isRequired ? `typeof ${prop} === 'number'` : `!${prop} ? true : typeof ${prop} === 'number'`}`);
-                                    }
-                                }
-                            } else if (pType === 'boolean') {
-                                w.write(`${isRequired ? `typeof ${prop} === 'boolean'` : `!${prop} ? true : typeof ${prop} === 'boolean'`}`);
-                            } else if (isEnum) {
-                                if (isArray){
-                                    w.write(`${nonRequiredCall}.reduce<boolean>((result, p) => result && Object.keys(${pType}).includes(${prop}), true)`);
-                                } else {
-                                    w.write(`${isRequired ? `Object.keys(${pType}).includes(${prop})` : `!${prop} ? true : typeof ${prop} === 'boolean'`}`);
-                                }
-                            }
-                            
-                            w.write(';');
-                        });
-                }
-            }
-        });
-        if (additionalProperties) {
-            const [
-                pType, isArray, isClass, isImport, isAdditional
-            ] = schemaParamParser(additionalProperties, this.openapi);
-            const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
-                
-            entityClass.addProperty({
-                name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
-                isReadonly: true,
-                type: type,
-            });
-        }
-        // add constructor;
-        const ctor = entityClass.addConstructor({
-            parameters: [{
-                name: 'props',
-                type: `I${sName}`,
-            }],
-        });
-        ctor.setBodyText((w) => {
-            if (additionalProperties) {
-                const [
-                    pType, isArray, isClass, isImport, isAdditional
-                ] = schemaParamParser(additionalProperties, this.openapi);
-                w.writeLine(`this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`} = Object.entries(props).reduce<Record<string, ${pType}>>((prev, [key, value]) => {`);
-                if (isClass) {
-                    w.writeLine(`    prev[key] = new ${pType}(value!);`);
-                } else {
-                    w.writeLine('    prev[key] = value!;')
-                }
-                w.writeLine('    return prev;');
-                w.writeLine('}, {})');
-                return;
-            }
-            sortedSProps.forEach((sPropName) => {
-                const [
-                    pType, isArray, isClass, , isAdditional
-                ] = schemaParamParser(sProps[sPropName], this.openapi);
-                const req = (required && required.includes(sPropName))
-                    || sProps[sPropName].required;
-                if (!req) {
-                    if ((pType === 'boolean' || pType === 'number' || pType ==='string') && !isClass && !isArray) {
-                        w.writeLine(`if (typeof props.${sPropName} === '${pType}') {`);
-                    } else {
-                        w.writeLine(`if (props.${sPropName}) {`);
-                    }
-                }
-                if (isAdditional) {
-                    if (isArray && isClass) {
-                        w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = props.${sPropName}.map((p) => Object.keys(p).reduce((prev, key) => {
-                            return { ...prev, [key]: new ${pType}(p[key])};
-                        },{}))`);
-                    } else if (isClass) {
-                        w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = Object.keys(props.${sPropName}).reduce((prev, key) => {
-                            return { ...prev, [key]: new ${pType}(props.${sPropName}[key])};
-                        },{})`);
-                    } else {
-                        if (pType === 'string' && !isArray) {
-                            w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = Object.keys(props.${sPropName}).reduce((prev, key) => {
-                                return { ...prev, [key]: props.${sPropName}[key].trim()};
-                            },{})`);
-                        } else {
-                            w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = Object.keys(props.${sPropName}).reduce((prev, key) => {
-                                return { ...prev, [key]: props.${sPropName}[key]};
-                            },{})`);
-                        }
-                    }
-                } else {
-                    if (isArray && isClass) {
-                        w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = props.${sPropName}.map((p) => new ${pType}(p));`);
-                    } else if (isClass) {
-                        w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = new ${pType}(props.${sPropName});`);
-                    } else {
-                        if (pType === 'string' && !isArray) {
-                            w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = props.${sPropName}.trim();`);
-                        } else {
-                            w.writeLine(`${!req ? '    ' : ''}this._${sPropName} = props.${sPropName};`);
-                        }
-                    }
-                }
-                if (!req) {
-                    w.writeLine('}');
-                }
-            });
-
-        });
-
-        // add serialize method;
-        const serialize = entityClass.addMethod({
-            isStatic: false,
-            name: 'serialize',
-            returnType: `I${sName}`,
-        });
-        serialize.setBodyText((w) => {
-            if (additionalProperties) {
-                const [
-                    pType, isArray, isClass, isImport, isAdditional
-                ] = schemaParamParser(additionalProperties, this.openapi);
-                w.writeLine(`return Object.entries(this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`}).reduce<Record<string, ${isClass ? 'I' : ''}${pType}>>((prev, [key, value]) => {`);
-                if (isClass) {
-                    w.writeLine(`    prev[key] = value.serialize();`);
-                } else {
-                    w.writeLine('    prev[key] = value;')
-                }
-                w.writeLine('    return prev;');
-                w.writeLine('}, {})');
-                return;
-            }
-            w.writeLine(`const data: I${sName} = {`);
-            const unReqFields: string[] = [];
-            sortedSProps.forEach((sPropName) => {
-                const req = (required && required.includes(sPropName))
-                    || sProps[sPropName].required;
-                const [, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
-                if (!req) {
-                    unReqFields.push(sPropName);
-                    return;
-                }
-                if (isAdditional) {
-                    if (isArray && isClass) {
-                        w.writeLine(`    ${sPropName}: this._${sPropName}.map((p) => Object.keys(p).reduce((prev, key) => ({ ...prev, [key]: p[key].serialize() }))),`);
-                    } else if (isClass) {
-                        w.writeLine(`    ${sPropName}: Object.keys(this._${sPropName}).reduce<Record<string, any>>((prev, key) => ({ ...prev, [key]: this._${sPropName}[key].serialize() }), {}),`);
-                    } else {
-                        w.writeLine(`    ${sPropName}: Object.keys(this._${sPropName}).reduce((prev, key) => ({ ...prev, [key]: this._${sPropName}[key] })),`);
-                    }
-                } else {
-                    if (isArray && isClass) {
-                        w.writeLine(`    ${sPropName}: this._${sPropName}.map((p) => p.serialize()),`);
-                    } else if (isClass) {
-                        w.writeLine(`    ${sPropName}: this._${sPropName}.serialize(),`);
-                    } else {
-                        w.writeLine(`    ${sPropName}: this._${sPropName},`);
-                    }
-                }
-
-            });
-            w.writeLine('};');
-            unReqFields.forEach((sPropName) => {
-                const [, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
-                w.writeLine(`if (typeof this._${sPropName} !== 'undefined') {`);
-                if (isAdditional) {
-                    if (isArray && isClass) {
-                        w.writeLine(`    data.${sPropName} = this._${sPropName}.map((p) => Object.keys(p).reduce((prev, key) => ({ ...prev, [key]: p[key].serialize() }), {}));`);
-                    } else if (isClass) {
-                        w.writeLine(`    data.${sPropName} = Object.keys(this._${sPropName}).reduce((prev, key) => ({ ...prev, [key]: this._${sPropName}[key].serialize() }), {});`);
-                    } else {
-                        w.writeLine(`    data.${sPropName} = Object.keys(this._${sPropName}).reduce((prev, key) => ({ ...prev, [key]: this._${sPropName}[key] }), {});`);
-                    }
-                } else {
-                    if (isArray && isClass) {
-                        w.writeLine(`    data.${sPropName} = this._${sPropName}.map((p) => p.serialize());`);
-                    } else if (isClass) {
-                        w.writeLine(`    data.${sPropName} = this._${sPropName}.serialize();`);
-                    } else {
-                        w.writeLine(`    data.${sPropName} = this._${sPropName};`);
-                        
-                    }
-                }
-                
-                w.writeLine(`}`);
-            });
-            w.writeLine('return data;');
-        });
-
-        // add validate method
-        const validate = entityClass.addMethod({
-            isStatic: false,
-            name: 'validate',
-            returnType: `string[]`,
-        })
-        validate.setBodyText((w) => {
-            if (additionalPropsOnly) {
-                w.writeLine('return []')
-                return;
-            }
-            w.writeLine('const validate = {');
-            Object.keys(sProps || {}).forEach((sPropName) => {
-                const [pType, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
-
-                const { maxLength, minLength, maximum, minimum } = sProps[sPropName];
-
-                const isRequired = (required && required.includes(sPropName)) || sProps[sPropName].required;
-                const nonRequiredCall = isRequired ? `this._${sPropName}` : `!this._${sPropName} ? true : this._${sPropName}`;
-
-                if (isArray && isClass) {
-                    w.writeLine(`    ${sPropName}: ${nonRequiredCall}.reduce((result, p) => result && p.validate().length === 0, true),`);
-                } else if (isClass && !isAdditional) {
-                    w.writeLine(`    ${sPropName}: ${nonRequiredCall}.validate().length === 0,`);        
-                } else {
-                    if (pType === 'string') {
-                        if (isArray) {
-                            w.writeLine(`    ${sPropName}: ${nonRequiredCall}.reduce((result, p) => result && typeof p === 'string', true),`);
-                        } else {
-                            if (typeof minLength === 'number' && maxLength) {
-                                w.writeLine(`    ${sPropName}: (${nonRequiredCall}.length >${minLength > 0 ? '=' : ''} ${minLength}) && (${nonRequiredCall}.length <= ${maxLength}),`);
-                            }
-                            if (typeof minLength !== 'number' || !maxLength) {
-                                w.writeLine(`    ${sPropName}: ${isRequired ? `typeof this._${sPropName} === 'string'` : `!this._${sPropName} ? true : typeof this._${sPropName} === 'string'`} && !this._${sPropName} ? true : this._${sPropName},`);
-                            }
-                        }
-                    } else if (pType === 'number') {
-                        if (isArray) {
-                            w.writeLine(`    ${sPropName}: ${nonRequiredCall}.reduce((result, p) => result && typeof p === 'number', true),`);
-                        } else {
-                            if (typeof minimum === 'number' && maximum) {
-                                w.writeLine(`    ${sPropName}: ${isRequired ? `this._${sPropName} >= ${minimum} && this._${sPropName} <= ${maximum}` : `!this._${sPropName} ? true : ((this._${sPropName} >= ${minimum}) && (this._${sPropName} <= ${maximum}))`},`);
-                            }
-                            if (typeof minimum !== 'number' || !maximum) {
-                                w.writeLine(`    ${sPropName}: ${isRequired ? `typeof this._${sPropName} === 'number'` : `!this._${sPropName} ? true : typeof this._${sPropName} === 'number'`},`);
-                            }
-                        }
-                    } else if (pType === 'boolean') {
-                        w.writeLine(`    ${sPropName}: ${isRequired ? `typeof this._${sPropName} === 'boolean'` : `!this._${sPropName} ? true : typeof this._${sPropName} === 'boolean'`},`);
-                    }
-                }
-            });
-            w.writeLine('};');
-            w.writeLine('const isError: string[] = [];')
-            w.writeLine('Object.keys(validate).forEach((key) => {');
-            w.writeLine('    if (!(validate as any)[key]) {');
-            w.writeLine('        isError.push(key);');
-            w.writeLine('    }');
-            w.writeLine('});');
-            w.writeLine('return isError;');
-            
-        });
-
-        // add update method;
-        const update = entityClass.addMethod({
-            isStatic: false,
-            name: 'update',
-            returnType: `${sName}`,
-        });
-        update.addParameter({
-            name: 'props',
-            type: additionalPropsOnly ? `I${sName}` : `Partial<I${sName}>`,
-        });
-        update.setBodyText((w) => { w.writeLine(`return new ${sName}({ ...this.serialize(), ...props });`); });
-
-        this.entities.push(entityFile);
-    };
-
-    save = () => {
-        this.entities.forEach(async (e) => {
-            await e.saveSync();
-        });
-    };
-}
-
-export default EntitiesGenerator;
--- a/client2/scripts/generator/src/utils.ts
+++ b/client2/scripts/generator/src/utils.ts
@@ -1,83 +0,0 @@
-const toCamel = (s: string) => {
-    return s.replace(/([-_][a-z])/ig, ($1) => {
-        return $1.toUpperCase()
-            .replace('-', '')
-            .replace('_', '');
-    });
-};
-const capitalize = (s: string) => {
-    return s[0].toUpperCase() + s.slice(1);
-};
-const uncapitalize = (s: string) => {
-    return s[0].toLowerCase() + s.slice(1);
-};
-const TYPES = {
-    integer: 'number',
-    float: 'number',
-    number: 'number',
-    string: 'string',
-    boolean: 'boolean',
-};
-
-/**
- * @param schemaProp: valueof shema.properties[key]
- * @param openApi: openapi object
- * @returns [propType - basicType or import one, isArray, isClass, isImport]
- */
-const schemaParamParser = (schemaProp: any, openApi: any): [string, boolean, boolean, boolean, boolean] => {
-    let type = '';
-    let isImport = false;
-    let isClass = false;
-    let isArray = false;
-    let isAdditional = false;
-
-    if (schemaProp.$ref || schemaProp.additionalProperties?.$ref) {
-        const temp = (schemaProp.$ref || schemaProp.additionalProperties?.$ref).split('/');
-
-        if (schemaProp.additionalProperties) {
-            isAdditional = true;
-        }
-
-        type = `${temp[temp.length - 1]}`;
-
-        const cl = openApi ? openApi.components.schemas[type] : {};
-
-        if (cl.$ref) {
-            const link = schemaParamParser(cl, openApi);
-            link.shift();
-            return [type, ...link] as any;
-        }
-
-        if (cl.type === 'string' && cl.enum) {
-            isImport = true;
-        }
-
-        if (cl.type === 'object' && !cl.oneOf) {
-            isClass = true;
-            isImport = true;
-        } else if (cl.type === 'array') {
-            const temp: any = schemaParamParser(cl.items, openApi);
-            type = `${temp[0]}`;
-            isArray = true;
-            isClass = isClass || temp[2];
-            isImport = isImport || temp[3];
-        }
-    } else if (schemaProp.type === 'array') {
-        const temp: any = schemaParamParser(schemaProp.items, openApi);
-        type = `${temp[0]}`;
-        isArray = true;
-        isClass = isClass || temp[2];
-        isImport = isImport || temp[3];
-    } else {
-        type = (TYPES as Record<any, string>)[schemaProp.type];
-    }
-    if (!type) {
-        // TODO: Fix bug with Error fields.
-        type = 'any';
-        // throw new Error('Failed to find entity type');
-    }
-
-    return [type, isArray, isClass, isImport, isAdditional];
-};
-
-export { TYPES, toCamel, capitalize, uncapitalize, schemaParamParser };
--- a/client2/scripts/helpers/checkTranslations.ts
+++ b/client2/scripts/helpers/checkTranslations.ts
@@ -1,226 +0,0 @@
-import * as fs from 'fs';
-import {
-    Project,
-    VariableStatement,
-    SyntaxKind,
-    Node,
-    Statement,
-    ts,
-    Identifier,
-    SourceFile,
-} from 'ts-morph';
-import { 
-    LOCALE_FOLDER_PATH,
-    TRANSLATOR_CLASS_NAME,
-    USE_INTL_NAME,
-    trimQuotes,
-} from '../consts';
-import { checkForms, AvailableLocales } from '../../src/localization/Translator';
-
-const project = new Project({
-    tsConfigFilePath: './tsconfig.json',
-});
-
-let lang = 'ru';
-let option = '';
-
-if (process.argv.length > 2) { 
-    lang = process.argv[2];
-    option = process.argv[3];
-}
-
-const usedTranslations: string[] = [];
-const usedPluralTranslations: string[] = [];
-
-const problemFiles: string[] = [];
-const sourceFiles = project.getSourceFiles();
-const sourceFilesWithIntl = sourceFiles.filter((sf) => {
-    return !!sf.getImportDeclarations().find((id) => {
-        return !!id.getNamedImports().find((ni) => ni.getName() === USE_INTL_NAME)
-    })
-});
-const getFileUsedIntl = (statements: Statement<ts.Statement>[]) => {
-    statements.forEach((s) => {
-        if (s instanceof VariableStatement) {
-            s.forEachDescendant((node) => {
-                let intVariableDeclaration: Identifier = null;
-                switch (node.getKind()) {
-                    case SyntaxKind.VariableDeclaration:
-                        if (node.getSymbol()) {
-                            const name = node.getSymbol().getName();
-                            const callExp = node.getChildren().find((n) => n.getKind() === SyntaxKind.CallExpression);
-                            if (callExp) {
-                                const callExpIden = callExp.getChildren().find(n => n.getKind() === SyntaxKind.Identifier);
-                                if (callExpIden && callExpIden.getSymbol().getName() === USE_INTL_NAME) {
-                                    intVariableDeclaration = node as Identifier;
-                                }
-                            }
-                        }
-                        break;
-                    default:
-                        break;
-                }
-                if (intVariableDeclaration) {
-                    intVariableDeclaration.findReferencesAsNodes().forEach((fr) => {
-                        if (fr instanceof Node) {
-                            const parent = fr.getParentIfKind(SyntaxKind.PropertyAccessExpression);
-                            if (parent && (parent.getName() === 'getMessage' || parent.getName() === 'getPlural')) {
-                                const syntaxList = parent.getNextSiblings().find((n) => n.getKind() === SyntaxKind.SyntaxList);
-                                if (syntaxList) {
-                                    const id = syntaxList.getChildren()[0];
-                                    if (id && id.getKind() !== SyntaxKind.StringLiteral) {
-                                        problemFiles.push(fr.getSourceFile().getFilePath());
-                                    }
-                                    if (id) {
-                                        usedTranslations.push(trimQuotes(id.getText()));
-                                        if (parent.getName() === 'getPlural') {
-                                            usedPluralTranslations.push(trimQuotes(id.getText()));
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    })
-                }
-            });
-        }
-    })
-}
-
-const getFileUsedTranslations = (file: SourceFile) => {
-    const namedImport = file.getImportDeclarations().find((id) => !!id.getNamedImports().find((ni) => ni.getName() === TRANSLATOR_CLASS_NAME));
-    if (namedImport) {
-        const identifier = namedImport.getImportClause().getNamedImports().find((iden) => iden.getName() === TRANSLATOR_CLASS_NAME);
-        const translateReferences = identifier.getNodeProperty('name').findReferencesAsNodes();
-        if (translateReferences.length > 0) {
-            translateReferences.forEach((identifierNode) => {
-                if (identifierNode.getParentIfKind(SyntaxKind.TypeReference)) {
-                    const translatorVariable = identifierNode.getParent().getPreviousSibling().getPreviousSiblingIfKind(SyntaxKind.Identifier);
-                    if (translatorVariable) {
-                        translatorVariable.findReferencesAsNodes().forEach((node) => {
-                            const parent = node.getParentIfKind(SyntaxKind.PropertyAccessExpression);
-                            if (parent && (parent.getName() === 'getMessage' || parent.getName() === 'getPlural')) {
-                                    
-                                const syntaxList = parent.getNextSiblings().find((n) => n.getKind() === SyntaxKind.SyntaxList);
-                                if (syntaxList) {
-                                    const id = syntaxList.getChildren()[0];
-                                    if (id && id.getKind() !== SyntaxKind.StringLiteral) {
-                                        problemFiles.push(parent.getSourceFile().getFilePath());   
-                                    }
-                                    if (id) {
-                                        usedTranslations.push(trimQuotes(id.getText()));
-                                        if (parent.getName() === 'getPlural') {
-                                            usedPluralTranslations.push(trimQuotes(id.getText()));
-                                        }
-                                    }
-                                }
-                            }
-                        })
-                    }
-                }
-            })
-        }
-
-    }
-}
-sourceFilesWithIntl.forEach((file) => {
-    getFileUsedIntl(file.getStatements());
-})
-
-const sourceFilesWithTranslator = project.getSourceFiles().filter((sf) => {
-    return !!sf.getImportDeclarations().find((id) => {
-        return !!id.getNamedImports().find((ni) => ni.getName() === TRANSLATOR_CLASS_NAME)
-    })
-});
-sourceFilesWithTranslator.forEach((file) => {
-    getFileUsedTranslations(file);
-})
-const filteredUsedTranslations = Array.from(new Set(usedTranslations));
-const filteredUsedPluralTranslations = Array.from(new Set(usedPluralTranslations));
-
-if (problemFiles.length) {
-    console.warn(`\n============== Files where translation id provided not as string ==============\n`);
-    console.log(problemFiles.join('\n'));
-    process.exit(255);
-}
-
-const allFiles = fs.readdirSync(LOCALE_FOLDER_PATH);
-// Use ru or needed language
-const translationFile = allFiles.find((file) => file.includes(`${lang}.json`));
-
-if (!translationFile) {
-    console.error('File not found');
-    process.exit(255);
-}
-
-const translationsObject = JSON.parse(fs.readFileSync(`./src/lib/intl/__locales/${translationFile}`, { flag: 'r+' }) as unknown as string);
-const translations = { 
-    locale: translationFile,
-    messages: Object.keys(translationsObject),
-};
-
-const someMessagesNotFound: string[] = [];
-const notUsed: string[] = [];
-const notFound: string[] = [];
-const checkLocaleMessages = (locale: string, messages: string[]) => {
-    filteredUsedTranslations.forEach(f => {
-        if (!messages.includes(f)) {
-            notFound.push(f);
-        }
-    });
-    messages.forEach(t => {
-        if (!filteredUsedTranslations.includes(t)) {
-            notUsed.push(t);
-        }
-    });
-    if (notFound.length > 0) {
-        someMessagesNotFound.push(locale);
-    }
-}
-
-const render = (data: string[], title: string) => {
-    console.log(`============ ${title} ============`);
-    console.table(data);
-    console.log(`============ ${title} ============`);
-}
-
-checkLocaleMessages(translations.locale, translations.messages);
-
-const checkPluralForm = () => {
-    const pluralFormWrong: string[] = [];
-    filteredUsedPluralTranslations.forEach((id) => {
-        const message = translationsObject[id];
-        if (!checkForms(message, lang as AvailableLocales, id)) {
-            pluralFormWrong.push(id)
-        }
-    });
-    return pluralFormWrong;
-}
-
-const plural = checkPluralForm();
-if (!option && (someMessagesNotFound.length || plural.length > 0 )) {
-    someMessagesNotFound.forEach(locale => console.error(`\nSome translatins for ${locale} was not found!\n`));
-    plural.forEach(id => console.error(`\nTranslation with id: "${id}" - have wrong number of plural forms!\n`));
-    process.exit(255);
-}
-if (option) {
-    switch (option) {
-        case '--show-missing': {
-            render(notFound, 'NotFound')
-            break;
-        }
-        case '--show-unused': {
-            render(notUsed, 'notUsed')
-            break;
-        }
-        case '--check-plurals': {
-            render(plural, 'Wrong Plural Form')
-        }
-        default: {
-            if (someMessagesNotFound.length) {
-                someMessagesNotFound.forEach(locale => console.error(`\nSome translatins for ${locale} was not found!\n\n`)); 
-                process.exit(255);
-            }
-        }
-    } 
-}
--- a/client2/scripts/lint/common.js
+++ b/client2/scripts/lint/common.js
@@ -1,79 +0,0 @@
-module.exports = {
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-        project: './tsconfig.json',
-        ecmaFeatures: {
-            jsx: true
-        },
-        extraFileExtensions: ['mjs', 'tsx', 'ts'],
-        ecmaVersion: 2020,
-        sourceType: 'module'
-    },
-    plugins: ['react', '@typescript-eslint', 'import'],
-    env: {
-        browser: true,
-        commonjs: true,
-        es6: true,
-        es2020: true,
-        jest: true,
-    },
-    settings: {
-        react: {
-            pragma: 'React',
-            version: 'detect',
-        },
-        'import/resolver': {
-            typescript: {
-                alwaysTryTypes: true
-            }
-        },
-        'import/parsers': {
-            '@typescript-eslint/parser': ['.ts', '.tsx'],
-        },
-    },
-    rules: {
-        '@typescript-eslint/explicit-module-boundary-types': 0,
-        '@typescript-eslint/explicit-function-return-type': [0, { allowExpressions: true }],
-        '@typescript-eslint/indent': ['error', 4],
-        '@typescript-eslint/interface-name-prefix': [0, { prefixWithI: 'never' }],
-        '@typescript-eslint/no-explicit-any': [0],
-        '@typescript-eslint/naming-convention': [2, {
-            selector: 'enum', format: ['UPPER_CASE', 'PascalCase'],
-        }],
-        '@typescript-eslint/no-non-null-assertion': 0,
-        'arrow-body-style': 'off',
-        'consistent-return': 0,
-        curly: [2, 'all'],
-        'default-case': 0,
-        'import/no-cycle': 0,
-        'import/prefer-default-export': 'off',
-        'import/no-named-as-default': 0,
-        indent: [0, 4],
-        'no-alert': 2,
-        'no-console': 2,
-        'no-debugger': 2,
-        'no-underscore-dangle': 'off',
-        'no-useless-escape': 'off',
-        'object-curly-newline': 'off',
-        'react-hooks/exhaustive-deps': 0,
-        'react/display-name': 0,
-        'react/jsx-indent-props': ['error', 4],
-        'react/jsx-indent': ['error', 4],
-        'react/jsx-one-expression-per-line': 'off',
-        'react/jsx-props-no-spreading': 0,
-        'react/prop-types': 'off',
-        'react/state-in-constructor': 'off',
-    },
-    extends: [
-        'airbnb-base',
-        'airbnb-typescript/base',
-        'airbnb/hooks',
-        'plugin:react/recommended',
-        'plugin:@typescript-eslint/eslint-recommended',
-        'plugin:@typescript-eslint/recommended',
-        'plugin:import/errors',
-        'plugin:import/warnings',
-        'plugin:import/typescript',
-    ],
-    globals: {},
-};
--- a/client2/scripts/lint/dev.js
+++ b/client2/scripts/lint/dev.js
@@ -1,10 +0,0 @@
-module.exports = {
-    rules: {
-        'no-alert': 0,
-        'no-debugger': 0,
-        'no-console': 0,
-    },
-    extends: [
-        './common',
-    ],
-};
--- a/client2/scripts/lint/prod.js
+++ b/client2/scripts/lint/prod.js
@@ -1,5 +0,0 @@
-module.exports = {
-    extends: [
-        './common.js',
-    ],
-};
--- a/client2/scripts/webpack/helpers.js
+++ b/client2/scripts/webpack/helpers.js
@@ -1,40 +0,0 @@
-const yaml = require('yaml');
-const fs = require('fs');
-
-const ZERO_HOST = '0.0.0.0';
-const LOCALHOST = '127.0.0.1';
-const DEFAULT_PORT = 80;
-
-const importConfig = () => {
-    try {
-        const doc = yaml.parse(fs.readFileSync('../AdguardHome.yaml', 'utf8'));
-        const { bind_host, bind_port } = doc;
-        return {
-            bind_host,
-            bind_port,
-        };
-    } catch (e) {
-        return {
-            bind_host: ZERO_HOST,
-            bind_port: DEFAULT_PORT,
-        };
-    }
-};
-
-const getDevServerConfig = () => {
-    const { bind_host: host, bind_port: port } = importConfig();
-    const { DEV_SERVER_PORT } = process.env;
-
-    const devServerHost = host === ZERO_HOST ? LOCALHOST : host;
-    const devServerPort = 3000 || port + 8000;
-
-    return {
-        host: devServerHost,
-        port: devServerPort
-    };
-};
-
-module.exports = {
-    importConfig,
-    getDevServerConfig
-};
--- a/client2/scripts/webpack/webpack.config.base.js
+++ b/client2/scripts/webpack/webpack.config.base.js
@@ -1,74 +0,0 @@
-const path = require('path');
-const AntdDayjsWebpackPlugin = require('antd-dayjs-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const tsconfig = require('../../tsconfig.json');
-
-const RESOURCES_PATH = path.resolve(__dirname, '../../');
-const HTML_PATH = path.resolve(RESOURCES_PATH, 'public/index.html');
-const HTML_INSTALL_PATH = path.resolve(RESOURCES_PATH, 'public/install.html');
-
-module.exports = {
-    entry: {
-        install: './src/Install.tsx',
-        main: './src/App.tsx'
-    },
-    resolve: {
-        extensions: ['.tsx', '.ts', '.js', '.pcss'],
-        alias: Object.keys(tsconfig.compilerOptions.paths).reduce((aliases, key) => {
-            // Reduce to load aliases from ./tsconfig.json in appropriate for webpack form
-            const paths = tsconfig.compilerOptions.paths[key].map(p => p.replace('/*', ''));
-            aliases[key.replace('/*', '')] = path.resolve(
-                __dirname,
-                '../../',
-                tsconfig.compilerOptions.baseUrl,
-                ...paths,
-            );
-            return aliases;
-        }, {}),
-    },
-    module: {
-        rules: [
-            {
-                test: /\.tsx?$/,
-                use: 'ts-loader',
-                exclude: /node_modules/,
-            },
-            {
-                test: /\.(woff|woff2)$/,
-                use: [{
-                    loader: 'file-loader',
-                    options:{
-                        outputPath:'./',
-                    }
-                }],
-            },
-            {
-                test:/\.(png|jpe?g|gif)$/,
-                exclude: /(node_modules)/,
-                use:[{
-                    loader:'file-loader',
-                    options:{
-                        outputPath:'./images',
-                    }
-                }]
-            }
-        ],
-    },
-
-    plugins: [
-        // new AntdDayjsWebpackPlugin()
-        new HtmlWebpackPlugin({
-            inject: true,
-            cache: false,
-            chunks: ['main'],
-            template: HTML_PATH,
-        }),
-        new HtmlWebpackPlugin({
-            inject: true,
-            cache: false,
-            chunks: ['install'],
-            filename: 'install.html',
-            template: HTML_INSTALL_PATH,
-        }),
-    ],
-};
--- a/client2/scripts/webpack/webpack.config.dev.js
+++ b/client2/scripts/webpack/webpack.config.dev.js
@@ -1,114 +0,0 @@
-const history = require('connect-history-api-fallback');
-const { merge } = require('webpack-merge');
-const path = require('path');
-const proxy = require('http-proxy-middleware');
-const Webpack = require('webpack');
-
-const { getDevServerConfig } = require('./helpers');
-const baseConfig = require('./webpack.config.base');
-
-const devHost = process.env.DEV_HOST
-const target = getDevServerConfig();
-
-const options = {
-    target: devHost || `http://${target.host}:${target.port}`, // target host
-    changeOrigin: true, // needed for virtual hosted sites
-};
-const apiProxy = proxy.createProxyMiddleware(options);
-
-module.exports = merge(baseConfig, {
-    mode: 'development',
-    output: {
-        path: path.resolve(__dirname, '../../build2'),
-        filename: '[name].bundle.js',
-    },
-    optimization: {
-        noEmitOnErrors: true,
-    },
-    devServer: {
-        port: 4000,
-        historyApiFallback: true,
-        before: (app) => {
-            app.use('/control', apiProxy);
-            app.use(history({
-                rewrites: [
-                    {
-                        from: /\.(png|jpe?g|gif)$/,
-                        to: (context) => {
-                            const name = context.parsedUrl.pathname.split('/');
-                            return `/images/${name[name.length - 1]}`
-                        }
-                    }, {
-                        from: /\.(woff|woff2)$/,
-                        to: (context) => {
-                            const name = context.parsedUrl.pathname.split('/');
-                            return `/${name[name.length - 1]}`
-                        }
-                    }, {
-                        from: /\.(js|css)$/,
-                        to: (context) => {
-                            const name = context.parsedUrl.pathname.split('/');
-                            return `/${name[name.length - 1]}`
-                        }
-                    }
-                ],
-            }));
-        }
-    },
-    devtool: 'eval-source-map',
-    module: {
-        rules: [
-            {
-                enforce: 'pre',
-                test: /\.tsx?$/,
-                exclude: /node_modules/,
-                loader: 'eslint-loader',
-                options: {
-                    configFile: path.resolve(__dirname, '../lint/dev.js'),
-                }
-            },
-            {
-                test: (resource) => {
-                    return (
-                        resource.indexOf('.pcss')+1
-                        || resource.indexOf('.css')+1
-                        || resource.indexOf('.less')+1
-                    ) && !(resource.indexOf('.module.')+1);
-                },
-                use: ['style-loader', 'css-loader', 'postcss-loader', {
-                    loader: 'less-loader',
-                    options: {
-                        javascriptEnabled: true,
-                    },
-                }],
-            },
-            {
-                test: /\.module\.p?css$/,
-                use: [
-                        'style-loader',
-                        {
-                            loader: 'css-loader',
-                            options: {
-                                modules: true,
-                                sourceMap: true,
-                                importLoaders: 1,
-                                modules: {
-                                    localIdentName: "[name]__[local]___[hash:base64:5]",
-                                }
-                            },
-                        },
-                        'postcss-loader',
-                ],
-                exclude: /node_modules/,
-            },
-        ]
-    },
-    plugins: [
-        new Webpack.DefinePlugin({
-            DEV: true,
-            'process.env.DEV_SERVER_PORT': JSON.stringify(3000),
-        }),
-        new Webpack.HotModuleReplacementPlugin(),
-        new Webpack.ProgressPlugin(),
-    ],
-});
--- a/client2/scripts/webpack/webpack.config.prod.js
+++ b/client2/scripts/webpack/webpack.config.prod.js
@@ -1,85 +0,0 @@
-const path = require('path');
-const { merge } = require('webpack-merge');
-const baseConfig = require('./webpack.config.base');
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const TerserJSPlugin = require('terser-webpack-plugin');
-const Webpack = require('webpack');
-const CopyPlugin = require('copy-webpack-plugin');
-
-module.exports = merge(baseConfig, {
-    mode: 'production',
-    devtool: 'source-map',
-    output: {
-        path: path.resolve(__dirname, '../../../build2/static'),
-        filename: '[name].bundle.[hash:5].js',
-        publicPath: '/'
-    },
-    optimization: {
-        minimizer: [new TerserJSPlugin({terserOptions: {
-            output: {
-              comments: false,
-            },
-          },
-          extractComments: false,
-        }), new OptimizeCSSAssetsPlugin({})],
-        splitChunks: {
-            cacheGroups: {
-                styles: {
-                    name: 'styles',
-                    test: /\.css$/,
-                    chunks: 'all',
-                    enforce: true,
-                },
-            },
-        },
-    },
-    module: {
-        rules: [
-            {
-                test: (resource) => {
-                    return (
-                        resource.indexOf('.pcss')+1
-                        || resource.indexOf('.css')+1
-                        || resource.indexOf('.less')+1
-                    ) && !(resource.indexOf('.module.')+1);
-                },
-                use: [{
-                    loader: MiniCssExtractPlugin.loader,
-                }, 'css-loader', 'postcss-loader', {
-                    loader: 'less-loader',
-                    options: {
-                        javascriptEnabled: true,
-                    },
-                }],
-                exclude: /node_modules/,
-            },
-            {
-                test: /\.module\.p?css$/,
-                use: [
-                        {
-                            loader: MiniCssExtractPlugin.loader,
-                        },
-                        {
-                            loader: 'css-loader',
-                            options: {
-                                modules: true,
-                                sourceMap: true,
-                                importLoaders: 1,
-                            },
-                        },
-                        'postcss-loader',
-                ],
-                exclude: /node_modules/,
-            }
-        ]
-    },
-    plugins: [
-        new Webpack.DefinePlugin({
-            DEV: false,
-        }),
-        new MiniCssExtractPlugin({
-            filename: '[name].[hash:5].css',
-        }),
-    ]
-});
--- a/client2/src/App.tsx
+++ b/client2/src/App.tsx
@@ -1,18 +0,0 @@
-import './main.pcss';
-import './lib/ant/ant.less';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import Store, { storeValue } from 'Store';
-import './lib/ant';
-
-import App from './components/App';
-
-const Container = () => {
-    return (
-        <Store.Provider value={storeValue}>
-            <App/>
-        </Store.Provider>
-    );
-};
-
-ReactDOM.render(<Container />, document.getElementById('app'));
--- a/client2/src/Install.tsx
+++ b/client2/src/Install.tsx
@@ -1,18 +0,0 @@
-import './main.pcss';
-import './lib/ant/ant.less';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import Store, { storeValue } from 'Store/installStore';
-import './lib/ant';
-
-import Install from './components/Install';
-
-const Container = () => {
-    return (
-        <Store.Provider value={storeValue}>
-            <Install/>
-        </Store.Provider>
-    );
-};
-
-ReactDOM.render(<Container />, document.getElementById('app'));
--- a/client2/src/assets/img/install.png
+++ b/client2/src/assets/img/install.png
--- a/client2/src/components/App/App.tsx
+++ b/client2/src/components/App/App.tsx
@@ -1,20 +0,0 @@
-import React, { FC } from 'react';
-import { BrowserRouter } from 'react-router-dom';
-
-import Icons from 'Common/ui/Icons';
-import Routes from './Routes';
-
-import { ErrorBoundary } from './Errors';
-
-const App: FC = () => {
-    return (
-        <ErrorBoundary>
-            <BrowserRouter>
-                <Routes />
-                <Icons />
-            </BrowserRouter>
-        </ErrorBoundary>
-    );
-};
-
-export default App;
--- a/client2/src/components/App/Dashboard/Dashboard.tsx
+++ b/client2/src/components/App/Dashboard/Dashboard.tsx
@@ -1,136 +0,0 @@
-import React, { FC, useContext } from 'react';
-import { Row, Col } from 'antd';
-import { observer } from 'mobx-react-lite';
-
-import Store from 'Store';
-import { InnerLayout } from 'Common/ui/layouts';
-import theme from 'Lib/theme';
-import { BlockCard, TopDomains, BlockedQueries, TopClients, ServerStatistics } from './components';
-
-const Dashboard:FC = observer(() => {
-    const store = useContext(Store);
-    const {
-        dashboard: { stats, filteringConfig },
-        system: { status },
-        ui: { intl },
-    } = store;
-
-    if (!stats || !filteringConfig) {
-        return null;
-    }
-
-    const {
-        numBlockedFiltering,
-        numReplacedParental,
-        numReplacedSafebrowsing,
-        replacedParental,
-        replacedSafebrowsing,
-        avgProcessingTime,
-        blockedFiltering,
-
-        topBlockedDomains,
-        topQueriedDomains,
-        dnsQueries,
-        numDnsQueries,
-
-    } = stats;
-
-    const { filters } = filteringConfig!;
-    const allFilters = filters?.length;
-    const allRules = filters?.reduce((prev, e) => prev + (e.rulesCount || 0), 0);
-    const enabled = filters?.filter((e) => e.enabled).length;
-
-    return (
-        <InnerLayout title={`AdGuard Home ${status?.version}`}>
-            <div className={theme.content.container}>
-                <Row gutter={[24, 24]}>
-                    <Col span={24} md={12}>
-                        <TopDomains
-                            title={intl.getMessage('stats_query_domain')}
-                            overal={numDnsQueries!}
-                            chartData={dnsQueries!}
-                            tableData={topQueriedDomains!}
-                            color={theme.chartColors.green}
-                        />
-                    </Col>
-                    <Col span={24} md={12}>
-                        <TopDomains
-                            useValueColor
-                            title={intl.getMessage('top_blocked_domains')}
-                            overal={numBlockedFiltering!}
-                            chartData={blockedFiltering!}
-                            tableData={topBlockedDomains!}
-                            color={theme.chartColors.red}
-                        />
-                    </Col>
-                </Row>
-                <Row gutter={[24, 24]}>
-                    <Col span={24} md={18}>
-                        <Row gutter={[24, 24]}>
-                            <Col span={24} md={8}>
-                                <BlockCard
-                                    title={intl.getMessage('dashboard_blocked_ads')}
-                                    overal={numBlockedFiltering!}
-                                    data={blockedFiltering!}
-                                    color={theme.chartColors.red}
-                                />
-                            </Col>
-                            <Col span={24} md={8}>
-                                <BlockCard
-                                    title={intl.getMessage('dashboard_blocked_trackers')}
-                                    overal={numBlockedFiltering!}
-                                    data={blockedFiltering!}
-                                    color={theme.chartColors.orange}
-                                />
-                            </Col>
-                            <Col span={24} md={8}>
-                                <BlockCard
-                                    title={intl.getMessage('stats_adult')}
-                                    overal={numReplacedParental!}
-                                    data={replacedParental!}
-                                    color={theme.chartColors.purple}
-                                />
-                            </Col>
-                            <Col span={24} md={8}>
-                                <BlockCard
-                                    title={intl.getMessage('stats_malware_phishing')}
-                                    overal={numReplacedSafebrowsing!}
-                                    data={replacedSafebrowsing!}
-                                    color={theme.chartColors.red}
-                                />
-                            </Col>
-                            <Col span={24} md={8}>
-                                <BlockCard
-                                    title={intl.getMessage('average_processing_time')}
-                                    overal={`${Math.round(avgProcessingTime! * 100)} ${intl.getMessage('milliseconds_abbreviation')}`}
-                                    data={blockedFiltering!}
-                                    color={theme.chartColors.green}
-                                />
-                            </Col>
-                            <Col span={24} md={8}>
-                                <BlockCard
-                                    title={intl.getMessage('dashboard_filter_rules')}
-                                    overal={allRules!}
-                                    text={intl.getMessage('dashboard_filter_rules_count', { enabled, all: allFilters })}
-                                    color={theme.chartColors.green}
-                                />
-                            </Col>
-                        </Row>
-                    </Col>
-                    <Col span={24} md={6}>
-                        {/* TODO: fix chart */}
-                        <BlockedQueries
-                            other={numBlockedFiltering! / 3}
-                            ads={numBlockedFiltering!}
-                            trackers={numBlockedFiltering!}
-                        />
-                    </Col>
-                </Row>
-                <TopClients />
-                <ServerStatistics />
-            </div>
-        </InnerLayout>
-    );
-});
-
-export default Dashboard;
--- a/client2/src/components/App/Dashboard/components/BlockCard/BlockCard.module.pcss
+++ b/client2/src/components/App/Dashboard/components/BlockCard/BlockCard.module.pcss
@@ -1,20 +0,0 @@
-.container {
-    display: flex;
-    flex-flow: column;
-    padding: 24px;
-    background-color: var(--white);
-}
-
-.title {
-    font-size: 14px;
-    line-height: 22px;
-    margin-bottom: 4px;
-    color: var(--gray700);
-}
-
-.overal {
-    font-size: 30px;
-    line-height: 38px;
-    margin-bottom: 18px;
-    color: var(--gray900);
-}
--- a/client2/src/components/App/Dashboard/components/BlockCard/BlockCard.tsx
+++ b/client2/src/components/App/Dashboard/components/BlockCard/BlockCard.tsx
@@ -1,35 +0,0 @@
-import React, { FC } from 'react';
-import { AreaChart, Area, ResponsiveContainer } from 'recharts';
-
-import s from './BlockCard.module.pcss';
-
-interface BlockCardProps {
-    overal: number | string;
-    data?: number[];
-    text?: string;
-    color?: string;
-    title: string;
-}
-
-const BlockCard: FC<BlockCardProps> = ({ overal, data, color, title, text }) => {
-    return (
-        <div className={s.container}>
-            <div className={s.title}>{title}</div>
-            <div className={s.overal}>{overal}</div>
-            {data && (
-                <ResponsiveContainer width="100%" height={25}>
-                    <AreaChart data={data.map((n) => ({ name: 'data', value: n }))}>
-                        <Area dataKey="value" stroke={color} fill={color} dot={false} />
-                    </AreaChart>
-                </ResponsiveContainer>
-            )}
-            {text && (
-                <div>
-                    {text}
-                </div>
-            )}
-        </div>
-    );
-};
-
-export default BlockCard;
--- a/client2/src/components/App/Dashboard/components/BlockCard/index.ts
+++ b/client2/src/components/App/Dashboard/components/BlockCard/index.ts
@@ -1 +0,0 @@
-export { default as BlockCard } from './BlockCard';
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export { default as BlockCard } from './BlockCard';`