dnsforward/ipset: synchronize access to ipset cache

Resolves read/write and write/write races on the cache maps present since feature
introduction.

.codecov.yml

@@ -1,8 +1,8 @@
-'coverage':
-  'status':
-    'project':
-      'default':
-        'target': '40%'
-        'threshold': null
-    'patch': false
-    'changes': false
+coverage:
+  status:
+    project:
+      default:
+        target: 40%
+        threshold: null
+    patch: false
+    changes: false

.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

.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 lint-go || exit 1
+	go test ./... || exit 1
+fi
+
+exit 0;

.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:**

.github/stale.yml

@@ -1,20 +1,19 @@
-# Number of days of inactivity before an issue becomes stale.
-'daysUntilStale': 60
-# Number of days of inactivity before a stale issue is closed.
-'daysUntilClose': 7
-# Issues with these labels will never be considered stale.
-'exemptLabels':
-- 'bug'
-- '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.
-'markComment': >
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - 'bug'
+  - 'enhancement'
+  - 'feature request'
+  - 'localization'
+# 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
+markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable.
-'closeComment': false
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/build.yml

@@ -1,139 +1,172 @@
-'name': 'build'
+name: build
 
-'env':
-  'GO_VERSION': '1.14'
-  'NODE_VERSION': '14'
+env:
+  GO_VERSION: 1.14
+  NODE_VERSION: 13
 
-'on':
-  'push':
-    'branches':
-    - '*'
-    'tags':
-    - 'v*'
-  'pull_request':
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - v*
+  pull_request:
 
-'jobs':
-  'test':
-    'runs-on': '${{ matrix.os }}'
-    'env':
-      'GO111MODULE': 'on'
-      'GOPROXY': 'https://goproxy.io'
-    'strategy':
-      'fail-fast': false
-      'matrix':
-        'os':
-        - 'ubuntu-latest'
-        - 'macOS-latest'
-        - 'windows-latest'
-    'steps':
-    - 'name': 'Checkout'
-      'uses': 'actions/checkout@v2'
-      'with':
-        'fetch-depth': 0
-    - 'name': 'Set up Go'
-      'uses': 'actions/setup-go@v2'
-      'with':
-        'go-version': '${{ env.GO_VERSION }}'
-    - 'name': 'Set up Node'
-      'uses': 'actions/setup-node@v1'
-      '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'
-      'with':
-        'path': '~/go/pkg/mod'
-        'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
-        'restore-keys': '${{ runner.os }}-go-'
-    - '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'
-      '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'
-    - 'name': 'Upload coverage'
-      'uses': 'codecov/codecov-action@v1'
-      'if': "success() && matrix.os == 'ubuntu-latest'"
-      'with':
-        'token': '${{ secrets.CODECOV_TOKEN }}'
-        'file': './coverage.txt'
-  'build-release':
-    'runs-on': 'ubuntu-latest'
-    'needs': 'test'
-    'steps':
-    - 'name': 'Checkout'
-      'uses': 'actions/checkout@v2'
-      'with':
-        'fetch-depth': 0
-    - 'name': 'Set up Go'
-      'uses': 'actions/setup-go@v2'
-      'with':
-        'go-version': '${{ env.GO_VERSION }}'
-    - 'name': 'Set up Node'
-      'uses': 'actions/setup-node@v1'
-      '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'
-      'with':
-        'path': '~/go/pkg/mod'
-        'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
-        'restore-keys': '${{ runner.os }}-go-'
-    - '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'
-      '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 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'
+jobs:
 
-  'notify':
-    'needs':
-    - 'build-release'
-    # Secrets are not passed to workflows that are triggered by a pull request
-    # from a fork.
-    #
-    # Use always() to signal to the runner that this job must run even if the
-    # previous ones failed.
-    'if':
-      ${{ always() &&
-        (
-          github.event_name == 'push' ||
-          github.event.pull_request.head.repo.full_name == github.repository
-        )
-      }}
-    'runs-on': 'ubuntu-latest'
-    'steps':
-    - 'name': 'Conclusion'
-      'uses': 'technote-space/workflow-conclusion-action@v1'
-    - 'name': 'Send Slack notif'
-      'uses': '8398a7/action-slack@v3'
-      'with':
-        'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author, workflow'
-      'env':
-        'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
-        'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
+  test:
+    runs-on: ${{ matrix.os }}
+    env:
+      GO111MODULE: on
+      GOPROXY: https://goproxy.io
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      -
+        name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      -
+        name: Set up Go modules cache
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      -
+        name: Get npm cache directory
+        id: npm-cache
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      -
+        name: Set up npm 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: Run make ci
+        shell: bash
+        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
+
+  app:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      -
+        name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      -
+        name: Set up Go modules cache
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      -
+        name: Get npm cache directory
+        id: npm-cache
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      -
+        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: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v1
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Docker Buildx (build)
+        run: |
+          make docker-multi-arch
+      -
+        name: Clear
+        if: always() && startsWith(github.ref, 'refs/tags/v')
+        run: |
+          rm -f ${HOME}/.docker/config.json
+
+  notify:
+    needs: [app, docker]
+    # Secrets are not passed to workflows that are triggered by a pull request from a fork
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Conclusion
+        uses: technote-space/workflow-conclusion-action@v1
+      -
+        name: Send Slack notif
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ env.WORKFLOW_CONCLUSION }}
+          fields: repo,message,commit,author
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/lint.yml

@@ -1,52 +1,47 @@
-'name': 'lint'
-'on':
-  'push':
-    'tags':
-    - 'v*'
-    'branches':
-    - '*'
-  'pull_request':
-'jobs':
-  'go-lint':
-    'runs-on': 'ubuntu-latest'
-    'steps':
-    - 'uses': 'actions/checkout@v2'
-    - 'name': 'run-lint'
-      'run': >
-        make go-deps go-tools go-lint
-  'eslint':
-    'runs-on': 'ubuntu-latest'
-    'steps':
-    - 'uses': 'actions/checkout@v2'
-    - 'name': 'Install modules'
-      'run': 'npm --prefix="./client" ci'
-    - 'name': 'Run ESLint'
-      'run': 'npm --prefix="./client" run lint'
-  'notify':
-    'needs':
-    - 'go-lint'
-    - 'eslint'
-    # Secrets are not passed to workflows that are triggered by a pull request
-    # from a fork.
-    #
-    # Use always() to signal to the runner that this job must run even if the
-    # previous ones failed.
-    'if':
-      ${{ always() &&
-        (
-          github.event_name == 'push' ||
-          github.event.pull_request.head.repo.full_name == github.repository
-        )
-      }}
-    'runs-on': 'ubuntu-latest'
-    'steps':
-    - 'name': 'Conclusion'
-      'uses': 'technote-space/workflow-conclusion-action@v1'
-    - 'name': 'Send Slack notif'
-      'uses': '8398a7/action-slack@v3'
-      'with':
-        'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author, workflow'
-      'env':
-        'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
-        'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - '*'
+  pull_request:
+jobs:
+  golangci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v1
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.27
+
+  eslint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install modules
+        run: npm --prefix client ci
+      - name: Run ESLint
+        run: npm --prefix client run lint
+
+
+  notify:
+    needs: [golangci,eslint]
+    # Secrets are not passed to workflows that are triggered by a pull request from a fork
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Conclusion
+        uses: technote-space/workflow-conclusion-action@v1
+      -
+        name: Send Slack notif
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ env.WORKFLOW_CONCLUSION }}
+          fields: repo,message,commit,author
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.gitignore

@@ -1,25 +1,30 @@
-# Please, DO NOT put your text editors' temporary files here.  The more are
-# added, the harder it gets to maintain and manage projects' gitignores.  Put
-# them into your global gitignore file instead.
-#
-# See https://stackoverflow.com/a/7335487/1892060.
-#
-# Only build, run, and test outputs here.  Sorted.
-*-packr.go
-*.db
-*.log
-*.snap
-/bin/
-/build/
-/build2/
+.DS_Store
+/.vscode
+.idea
+/AdGuardHome
+/AdGuardHome.exe
+/AdGuardHome.yaml
+/AdGuardHome.log
 /data/
+/build/
 /dist/
-/dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
-/dnsfilter/tests/top-1m.csv
-/launchpad_credentials
-/querylog.json*
-/snapcraft_login
-AdGuardHome*
+/client/node_modules/
+/querylog.json
+/querylog.json.1
 coverage.txt
-leases.db
-node_modules/
+
+# 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

.golangci.yml

@@ -0,0 +1,79 @@
+# options for analysis running
+run:
+  # default concurrency is a available CPU number
+  concurrency: 4
+
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  deadline: 2m
+
+  # which files to skip: they will be analyzed, but issues from them
+  # won't be reported. Default value is empty list, but there is
+  # no need to include all autogenerated files, we confidently recognize
+  # autogenerated files. If it's not please let us know.
+  skip-files:
+    - ".*generated.*"
+    - dnsfilter/rule_to_regexp.go
+    - util/pprof.go
+    - ".*_test.go"
+    - client/.*
+    - build/.*
+    - dist/.*
+
+
+# all available settings of specific linters
+linters-settings:
+  errcheck:
+    # [deprecated] comma-separated list of pairs of the form pkg:regex
+    # the regex is used to ignore names within pkg. (default "fmt:.*").
+    # see https://github.com/kisielk/errcheck#the-deprecated-method for details
+    ignore: fmt:.*,net:SetReadDeadline,net/http:^Write
+  gocyclo:
+    min-complexity: 20
+  lll:
+    line-length: 200
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - unused
+    - varcheck
+    - bodyclose
+    - depguard
+    - dupl
+    - gocyclo
+    - goimports
+    - golint
+    - gosec
+    - misspell
+    - stylecheck
+    - unconvert
+  disable-all: true
+  fast: true
+
+issues:
+  # List of regexps of issue texts to exclude, empty list by default.
+  # But independently from this option we use default exclude patterns,
+  # it can be disabled by `exclude-use-default: false`. To list all
+  # excluded by default patterns execute `golangci-lint run --help`
+  exclude:
+    # structcheck cannot detect usages while they're there
+    - .parentalServer. is unused
+    - .safeBrowsingServer. is unused
+    # errcheck
+    - Error return value of .s.closeConn. is not checked
+    - Error return value of ..*.Shutdown.
+    # goconst
+    - string .forcesafesearch.google.com. has 3 occurrences
+    # gosec: Profiling endpoint is automatically exposed on /debug/pprof
+    - G108
+    # gosec: Subprocess launched with function call as argument or cmd arguments
+    - G204
+    # gosec: Potential DoS vulnerability via decompression bomb
+    - G110
+    # gosec: Expect WriteFile permissions to be 0600 or less
+    - G306

.goreleaser.yml

@@ -0,0 +1,100 @@
+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: core18
+    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: [ network-bind ]
+        daemon: simple
+      adguard-home-web:
+        command: adguard-home-web.sh
+        plugs: [ desktop ]
+
+checksum:
+  name_template: 'checksums.txt'

AGHTechDoc.md

@@ -1587,7 +1587,7 @@ Response:
 		"upstream":"...", // Upstream URL starting with tcp://, tls://, https://, or with an IP address
 		"answer_dnssec": true,
 		"client":"127.0.0.1",
-		"client_proto": "" (plain) | "doh" | "dot" | "doq",
+		"client_proto": "" (plain) | "doh" | "dot",
 		"elapsedMs":"0.098403",
 		"filterId":1,
 		"question":{
@@ -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
 

CHANGELOG.md

@@ -1,159 +0,0 @@
-# AdGuard Home Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on
-[*Keep a Changelog*](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to
-[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-<!--
-## [v0.106.0] - 2021-04-26
--->
-
-## [v0.105.0] - 2021-02-10
-
-### 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
-  `/etc/network/interfaces` ([#2302]).
-- 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]).
-
-### 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], [#2639], [#2646]).
-
-### 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]).
-
-### 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
-[#2639]: https://github.com/AdguardTeam/AdGuardHome/issues/2639
-[#2646]: https://github.com/AdguardTeam/AdGuardHome/issues/2646
-
-## [v0.104.3] - 2020-11-19
-
-### Fixed
-
-- The accidentally exposed profiler HTTP API ([#2336]).
-
-[#2336]: https://github.com/AdguardTeam/AdGuardHome/issues/2336
-
-
-
-## [v0.104.2] - 2020-11-19
-
-### Added
-
-- This changelog :-) ([#2294]).
-- `HACKING.md`, a guide for developers.
-
-### Changed
-
-- Improved tests output ([#2273]).
-
-### Fixed
-
-- 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
-  correctly shows that DHCP is not currently available on that OS ([#2295]).
-- Infinite loop in `/dhcp/find_active_dhcp` ([#2301]).
-
-[#2273]: https://github.com/AdguardTeam/AdGuardHome/issues/2273
-[#2294]: https://github.com/AdguardTeam/AdGuardHome/issues/2294
-[#2295]: https://github.com/AdguardTeam/AdGuardHome/issues/2295
-[#2301]: https://github.com/AdguardTeam/AdGuardHome/issues/2301
-[#2324]: https://github.com/AdguardTeam/AdGuardHome/issues/2324
-[#2325]: https://github.com/AdguardTeam/AdGuardHome/issues/2325
-
-
-
-<!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.0...HEAD
-[v0.105.0]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.3...v0.105.0
--->
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.3...HEAD
-[v0.104.3]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.2...v0.104.3
-[v0.104.2]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.1...v0.104.2

Dockerfile

@@ -0,0 +1,78 @@
+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 \
+    tzdata \
+  && 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"]

HACKING.md

@@ -1,315 +0,0 @@
- #  AdGuard Home Developer Guidelines
-
-As of **February 2021**, 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>
-
- *  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.
-
- *  Follow the commit message header format:
-
-    ```none
-    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`.
-
- *  Keep your commit messages, including headers, to eighty (**80**) columns.
-
- *  Only use lowercase letters in your commit message headers.  The rest of the
-    message should follow the plain text conventions below.
-
-    The only exceptions are direct mentions of identifiers from the source code
-    and filenames like `HACKING.md`.
-
-##  <a id="go" href="#go">Go</a>
-
-> 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>
-
- *  Avoid `goto`.
-
- *  Avoid `init` and use explicit initialization functions instead.
-
- *  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.
-
- *  Don't use naked `return`s.
-
- *  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.
-
- *  Eschew external dependencies, including transitive, unless
-    absolutely necessary.
-
- *  Name benchmarks and tests using the same convention as examples.  For
-    example:
-
-    ```go
-    func TestFunction(t *testing.T) { /* … */ }
-    func TestFunction_suffix(t *testing.T) { /* … */ }
-    func TestType_Method(t *testing.T) { /* … */ }
-    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
-    errors.
-
- *  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.
-
- *  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>
-
- *  See also the “[Text, Including Comments]” section below.
-
- *  Document everything, including unexported top-level identifiers, to build
-    a habit of writing documentation.
-
- *  Don't put identifiers into any kind of quotes.
-
- *  Put comments above the documented entity, **not** to the side, to improve
-    readability.
-
- *  When a method implements an interface, start the doc comment with the
-    standard template:
-
-    ```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>
-
- *  Add an empty line before `break`, `continue`, `fallthrough`, and `return`,
-    unless it's the only statement in that block.
-
- *  Use `gofumpt --extra -s`.
-
- *  Write slices of struct like this:
-
-    ```go
-    ts := []T{{
-            Field: Value0,
-            // …
-    }, {
-            Field: Value1,
-            // …
-    }, {
-            Field: Value2,
-            // …
-    }}
-    ```
-
- ###  <a id="recommended-reading" href="#recommended-reading">Recommended Reading</a>
-
- *  <https://github.com/golang/go/wiki/CodeReviewComments>.
-
- *  <https://github.com/golang/go/wiki/TestComments>.
-
- *  <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
-
-##  <a id="markdown" href="#markdown">Markdown</a>
-
- *  **TODO(a.garipov):** Define more Markdown conventions.
-
- *  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.
-
- *  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.
-
- *  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>
-
- *  End sentences with appropriate punctuation.
-
- *  Headers should be written with all initial letters capitalized, except for
-    references to variable names that start with a lowercase letter.
-
- *  Start sentences with a capital letter, unless the first word is a reference
-    to a variable name that starts with a lowercase letter.
-
- *  Text should wrap at eighty (**80**) columns to be more readable, to use
-    a common standard, and to allow editing or diffing side-by-side without
-    wrapping.
-
-    The only exception are long hyperlinks.
-
- *  Use U.S. English, as it is the most widely used variety of English in the
-    code right now as well as generally.
-
- *  Use double spacing between sentences to make sentence borders more clear.
-
- *  Use the serial comma (a.k.a. Oxford comma) to improve comprehension,
-    decrease ambiguity, and use a common standard.
-
- *  Write todos like this:
-
-    ```go
-    // TODO(usr1): Fix the frobulation issue.
-    ```
-
-    Or, if several people need to look at the code:
-
-    ```go
-    // TODO(usr1, usr2): Fix the frobulation issue.
-    ```
-
-##  <a id="yaml" href="#yaml">YAML</a>
-
- *  **TODO(a.garipov):** Define naming conventions for schema names in our
-    OpenAPI YAML file.  And just generally OpenAPI conventions.
-
- *  **TODO(a.garipov):** Find a YAML formatter or write our own.
-
- *  All strings, including keys, must be quoted.  Reason: the “[NO-rway Law]”.
-
- *  Indent with two (**2**) spaces.  YAML documents can get pretty
-    deeply-nested.
-
- *  No extra indentation in multiline arrays:
-
-    ```yaml
-    'values':
-    - 'value-1'
-    - 'value-2'
-    - 'value-3'
-    ```
-
- *  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).
-
- *  Use `>` for multiline strings, unless you need to keep the line breaks.
-
-[NO-rway Law]: https://news.ycombinator.com/item?id=17359376

Makefile

@@ -1,103 +1,346 @@
-# 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)'\
+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)
 
-# 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
 
-deps: js-deps go-deps
-lint: js-lint go-lint
-test: js-test go-test
+# 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
 
-# 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
+# Version properties
+COMMIT=$(shell git rev-parse --short HEAD)
+TAG_NAME=$(shell git describe --abbrev=0)
+RELEASE_VERSION=$(TAG_NAME)
+SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
 
-build-release: deps js-build
-	$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
+# 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
 
-clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
-init:  ; git config core.hooksPath ./scripts/hooks
+# 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')
 
-js-build:
-	$(NPM) $(NPM_FLAGS) run build-prod
-	$(YARN) $(YARN_FLAGS) build
-js-deps:
-	$(NPM) $(NPM_FLAGS) ci
-	$(YARN) $(YARN_FLAGS) install
+# 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
 
-# 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.
+# Validate docker build arguments
+ifndef DOCKER_IMAGE_NAME
+$(error DOCKER_IMAGE_NAME value is not set)
+endif
 
-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
+# OS-specific flags
+TEST_FLAGS := -race
+ifeq ($(OS),Windows_NT)
+	TEST_FLAGS :=
+endif
 
-go-check: go-tools go-lint go-test
+.PHONY: all build client client-watch docker lint lint-js lint-go test dependencies clean release docker-multi-arch
+all: build
 
-openapi-lint: ; cd ./openapi/ && $(YARN) test
-openapi-show: ; cd ./openapi/ && $(YARN) start
+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)
+
+lint: lint-js lint-go
+
+lint-js: dependencies
+	@echo Running js linter
+	npm --prefix client run lint
+
+lint-go:
+	@echo Running go linter
+	golangci-lint run
+
+test:
+	@echo Running JS unit-tests
+	npm run test --prefix client
+	@echo Running Go unit-tests
+	go test $(TEST_FLAGS) -v -coverprofile=coverage.txt -covermode=atomic ./...
+
+ci: client_with_deps
+	go mod download
+	$(MAKE) test
 
-# 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:
+	# make build output
+	rm -f AdGuardHome
+	rm -f AdGuardHome.exe
+	# tests output
+	rm -rf data
+	rm -f coverage.txt
+	# static build output
+	rm -rf build
+	# dist folder
+	rm -rf $(DIST_DIR)
+	# client deps
+	rm -rf client/node_modules
+	# packr-generated files
+	PATH=$(GOPATH)/bin:$(PATH) packr clean || true
+
 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

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,9 +58,8 @@ 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)
 
 <a id="getting-started"></a>
 ## Getting Started
@@ -87,21 +86,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 +122,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,9 +168,11 @@ 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.
 
+Optionally, for Go devs:
+ * [golangci-lint](https://github.com/golangci/golangci-lint)
+ 
 ### Building
 
 Open Terminal and execute these commands:
@@ -194,33 +185,31 @@ make
 
 Check the [`Makefile`](https://github.com/AdguardTeam/AdGuardHome/blob/master/Makefile) to learn about other commands.
 
-**Building for a different platform.** You can build AdGuard for any OS/ARCH just like any other Go project.
+**Building for a different platform.** You can build AdGuard for any OS/ARCH just like any other Golang project.
 In order to do this, specify `GOOS` and `GOARCH` env variables before running make.
 
 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 +257,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 +266,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 +292,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/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,11 +323,6 @@ 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 id="privacy"></a>
-## Privacy
-
-Our main idea is that you are the one, who should be in control of your data. So it is only natural, that AdGuard Home does not collect any usage statistics, and does not use any web services unless you configure it to do so. Full policy with every bit that _could in theory be_ sent by AdGuard Home is available [here](https://adguard.com/en/privacy/home.html).

client/constants.js

@@ -3,7 +3,7 @@ const BUILD_ENVS = {
     prod: 'production',
 };
 
-const BASE_URL = 'control';
+const BASE_URL = '/control';
 
 module.exports = {
     BUILD_ENVS,

client/package-lock.json

@@ -2014,168 +2014,72 @@
         }
       }
     },
-    "@nivo/annotations": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.64.0.tgz",
-      "integrity": "sha512-b9VAVuAn2HztOZckU2GcBwptjCobYV5VgX/jwZTSFeZFLtjZza+QinNL2AbQ2cnmeU3nVCw1dTbJMMZ9fTCCNQ==",
-      "requires": {
-        "@nivo/colors": "0.64.0",
-        "lodash": "^4.17.11",
-        "react-spring": "^8.0.27"
-      }
-    },
     "@nivo/axes": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.64.0.tgz",
-      "integrity": "sha512-Pm+Y3C67OuBb3JqHpyFKWAoPAnNojb1s5/LFQYVYN1QpKyjeqilGAoLCjHK6ckgfzreiGf7NG+oBgpH8Ncz2fQ==",
+      "version": "0.49.1",
+      "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.49.1.tgz",
+      "integrity": "sha512-2ZqpKtnZ9HE30H+r565VCrypKRQzAoMbAg1hsht88dlNQRtghBSxbAS0Y4IUW/wgN/AzvOIBJHvxH7bgaB8Oow==",
       "requires": {
-        "@nivo/scales": "0.64.0",
-        "d3-format": "^1.4.4",
-        "d3-time": "^1.0.11",
+        "@nivo/core": "0.49.0",
+        "d3-format": "^1.3.2",
         "d3-time-format": "^2.1.3",
-        "react-spring": "^8.0.27"
-      },
-      "dependencies": {
-        "d3-format": {
-          "version": "1.4.5",
-          "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
-          "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
-        },
-        "d3-time": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-          "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
-      }
-    },
-    "@nivo/colors": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.64.0.tgz",
-      "integrity": "sha512-3CKIkSjKgwSgBsiJoTlZpFUUpaGTl60pF6rFsIiFT30os9jMxP/J4ikQGQ/vMLPTXskZYoxByaMHGKJy5wypqg==",
-      "requires": {
-        "d3-color": "^1.2.3",
-        "d3-scale": "^3.0.0",
-        "d3-scale-chromatic": "^1.3.3",
-        "lodash.get": "^4.4.2",
-        "lodash.isplainobject": "^4.0.6",
-        "react-motion": "^0.5.2"
+        "lodash": "^4.17.4",
+        "react-motion": "^0.5.2",
+        "recompose": "^0.26.0"
       }
     },
     "@nivo/core": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.64.0.tgz",
-      "integrity": "sha512-tupETbvxgv4B9y3pcXy/lErMwY2aZht+FKSyah1dPFd88LnMD/DOL+to6ociBHmpLQNUMA7wid6R7BlXRY/bmg==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.49.0.tgz",
+      "integrity": "sha512-TCPMUO2aJ7fI+ZB6t3d3EBQtNxJnTzaxLJsrVyn/3AQIjUwccAeo2aIy81wLBGWGtlGNUDNdAbnFzXiJosH0yg==",
       "requires": {
-        "d3-color": "^1.2.3",
-        "d3-format": "^1.4.4",
+        "d3-color": "^1.0.3",
+        "d3-format": "^1.3.2",
         "d3-hierarchy": "^1.1.8",
-        "d3-interpolate": "^2.0.1",
-        "d3-scale": "^3.0.0",
+        "d3-interpolate": "^1.3.2",
+        "d3-scale": "^2.1.2",
         "d3-scale-chromatic": "^1.3.3",
-        "d3-shape": "^1.3.5",
+        "d3-shape": "^1.2.2",
         "d3-time-format": "^2.1.3",
-        "lodash": "^4.17.11",
-        "react-spring": "^8.0.27",
-        "recompose": "^0.30.0",
-        "resize-observer-polyfill": "^1.5.1"
-      },
-      "dependencies": {
-        "d3-format": {
-          "version": "1.4.5",
-          "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
-          "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
-        },
-        "d3-time": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-          "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
+        "lodash": "^4.17.4",
+        "react-measure": "^2.0.2",
+        "react-motion": "^0.5.2",
+        "recompose": "^0.26.0"
       }
     },
     "@nivo/legends": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.64.0.tgz",
-      "integrity": "sha512-L7Mp/of/jY4qE7ef6PXJ8/e3aASBTfsf5BTOh3imSXZT6I4hXa5ppmGAgZ0gOSpcPXuMEjBc0aSIEJoeoytQ/g==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.49.0.tgz",
+      "integrity": "sha512-8KbUFYozqwD+/rj4in0mnF9b9CuyNFjVgXqm2KW3ODVlWIgYgjTVlEhlg9VZIArFPlIyyAjEYC88YSRcALHugg==",
       "requires": {
-        "@nivo/core": "0.64.0",
-        "lodash": "^4.17.11",
-        "recompose": "^0.30.0"
+        "lodash": "^4.17.4",
+        "recompose": "^0.26.0"
       }
     },
     "@nivo/line": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/line/-/line-0.64.0.tgz",
-      "integrity": "sha512-WkQU28ZL9Mxq42AdmybWe+2qFh/TiUXu+7e6nj41e/8DO95Guxg1XQ+i5zQKuw/UZlqXZs6WOsMW8EMNE4GzXw==",
+      "version": "0.49.1",
+      "resolved": "https://registry.npmjs.org/@nivo/line/-/line-0.49.1.tgz",
+      "integrity": "sha512-wKkOmpnwK2psmZbJReDq+Eh/WV9r1JA8V4Vl4eIRuf971CW0KUT9nCAoc/FcKio0qsiq5wyFt3J5LuAhfzlV/w==",
       "requires": {
-        "@nivo/annotations": "0.64.0",
-        "@nivo/axes": "0.64.0",
-        "@nivo/colors": "0.64.0",
-        "@nivo/legends": "0.64.0",
-        "@nivo/scales": "0.64.0",
-        "@nivo/tooltip": "0.64.0",
-        "@nivo/voronoi": "0.64.0",
-        "d3-shape": "^1.3.5",
-        "react-spring": "^8.0.27"
+        "@nivo/axes": "0.49.1",
+        "@nivo/core": "0.49.0",
+        "@nivo/legends": "0.49.0",
+        "@nivo/scales": "0.49.0",
+        "d3-format": "^1.3.2",
+        "d3-scale": "^2.1.2",
+        "d3-shape": "^1.2.2",
+        "lodash": "^4.17.4",
+        "react-motion": "^0.5.2",
+        "recompose": "^0.26.0"
       }
     },
     "@nivo/scales": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.64.0.tgz",
-      "integrity": "sha512-Jbr1rlfe/gLCippndPaCM7doJzzx1K9oXPxS4JiyvrIUkQoMWiozymZQdEp8kgigI6uwWu5xvPwCOFXalCIhKg==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.49.0.tgz",
+      "integrity": "sha512-+5Leu4zX6mDSAunf4ZJHeqVlT+ZsqiKXLB6hT/u7r3GjxZP9A+n3rHePhIzikBiBRMlLjyiBlylLzhKBAYbGWQ==",
       "requires": {
-        "d3-scale": "^3.0.0",
+        "d3-scale": "^2.1.2",
         "d3-time-format": "^2.1.3",
-        "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "d3-time": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-          "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
-      }
-    },
-    "@nivo/tooltip": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.64.0.tgz",
-      "integrity": "sha512-iGsuCi42uw/8F7OVvPyWdQgxJXVOPTEdtl2WK2FlSJIH7bfnEsZ+R/lTdElY2JAvGHuNW6hQwpNUZdC/2rOatg==",
-      "requires": {
-        "react-spring": "^8.0.27"
-      }
-    },
-    "@nivo/voronoi": {
-      "version": "0.64.0",
-      "resolved": "https://registry.npmjs.org/@nivo/voronoi/-/voronoi-0.64.0.tgz",
-      "integrity": "sha512-YdNRzD2rFc1NcAZe9D8gxos+IT2CRPOV/7fUfBCG9SoNw1TtSwSKtEs4xsxmUFmLT1FadWcyKeKuhgJUQnof/A==",
-      "requires": {
-        "@nivo/core": "0.64.0",
-        "d3-delaunay": "^5.1.1",
-        "d3-scale": "^3.0.0",
-        "recompose": "^0.30.0"
+        "lodash": "^4.17.4"
       }
     },
     "@nodelib/fs.scandir": {
@@ -3066,6 +2970,12 @@
             "pkg-up": "^2.0.0"
           }
         },
+        "caniuse-lite": {
+          "version": "1.0.30001062",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001062.tgz",
+          "integrity": "sha512-ei9ZqeOnN7edDrb24QfJ0OZicpEbsWxv7WusOiQGz/f2SfvBgHHbOEwBJ8HKGVSyx8Z6ndPjxzR6m0NQq+0bfw==",
+          "dev": true
+        },
         "postcss": {
           "version": "7.0.30",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
@@ -3922,9 +3832,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001165",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz",
-      "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==",
+      "version": "1.0.30001059",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz",
+      "integrity": "sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==",
       "dev": true
     },
     "capture-exit": {
@@ -4771,27 +4681,24 @@
       "dev": true
     },
     "d3-array": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.8.0.tgz",
-      "integrity": "sha512-6V272gsOeg7+9pTW1jSYOR1QE37g95I3my1hBmY+vOUNHRrk9yt4OTz/gK7PMkVAVDrYYq4mq3grTiZ8iJdNIw=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
+      "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
+    },
+    "d3-collection": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
+      "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
       "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
-    "d3-delaunay": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz",
-      "integrity": "sha512-amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w==",
-      "requires": {
-        "delaunator": "4"
-      }
-    },
     "d3-format": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
-      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.4.tgz",
+      "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw=="
     },
     "d3-hierarchy": {
       "version": "1.1.9",
@@ -4799,11 +4706,11 @@
       "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
     },
     "d3-interpolate": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
-      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
+      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "requires": {
-        "d3-color": "1 - 2"
+        "d3-color": "1"
       }
     },
     "d3-path": {
@@ -4812,15 +4719,16 @@
       "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
     "d3-scale": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-      "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
+      "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
       "requires": {
-        "d3-array": "^2.3.0",
-        "d3-format": "1 - 2",
-        "d3-interpolate": "1.2.0 - 2",
-        "d3-time": "1 - 2",
-        "d3-time-format": "2 - 3"
+        "d3-array": "^1.2.0",
+        "d3-collection": "1",
+        "d3-format": "1",
+        "d3-interpolate": "1",
+        "d3-time": "1",
+        "d3-time-format": "2"
       }
     },
     "d3-scale-chromatic": {
@@ -4830,16 +4738,6 @@
       "requires": {
         "d3-color": "1",
         "d3-interpolate": "1"
-      },
-      "dependencies": {
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        }
       }
     },
     "d3-shape": {
@@ -4851,16 +4749,16 @@
       }
     },
     "d3-time": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz",
-      "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+      "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "d3-time-format": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
-      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.3.tgz",
+      "integrity": "sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==",
       "requires": {
-        "d3-time": "1 - 2"
+        "d3-time": "1"
       }
     },
     "damerau-levenshtein": {
@@ -5065,11 +4963,6 @@
         }
       }
     },
-    "delaunator": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz",
-      "integrity": "sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -5360,21 +5253,11 @@
       "dev": true
     },
     "encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "^0.6.2"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
+        "iconv-lite": "~0.4.13"
       }
     },
     "end-of-stream": {
@@ -6883,6 +6766,11 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-node-dimensions": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz",
+      "integrity": "sha512-2MSPMu7S1iOTL+BOa6K1S62hB2zUAYNF/lV0gSVlOaacd087lc6nR1H1r0e3B1CerTo+RceOmi1iJW+vp21xcQ=="
+    },
     "get-package-type": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
@@ -7542,7 +7430,6 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -10307,16 +10194,6 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
       "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
     },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -12526,6 +12403,17 @@
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
+    "react-measure": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-measure/-/react-measure-2.3.0.tgz",
+      "integrity": "sha512-dwAvmiOeblj5Dvpnk8Jm7Q8B4THF/f1l1HtKVi0XDecsG6LXwGvzV5R1H32kq3TW6RW64OAf5aoQxpIgLa4z8A==",
+      "requires": {
+        "@babel/runtime": "^7.2.0",
+        "get-node-dimensions": "^1.2.1",
+        "prop-types": "^15.6.2",
+        "resize-observer-polyfill": "^1.5.0"
+      }
+    },
     "react-modal": {
       "version": "3.11.2",
       "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.11.2.tgz",
@@ -12688,15 +12576,6 @@
         }
       }
     },
-    "react-spring": {
-      "version": "8.0.27",
-      "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz",
-      "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "prop-types": "^15.5.8"
-      }
-    },
     "react-table": {
       "version": "6.11.4",
       "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.11.4.tgz",
@@ -12784,15 +12663,13 @@
       }
     },
     "recompose": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
-      "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.26.0.tgz",
+      "integrity": "sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog==",
       "requires": {
-        "@babel/runtime": "^7.0.0",
         "change-emitter": "^0.1.2",
         "fbjs": "^0.8.1",
         "hoist-non-react-statics": "^2.3.1",
-        "react-lifecycles-compat": "^3.0.2",
         "symbol-observable": "^1.0.4"
       }
     },
@@ -15190,9 +15067,9 @@
       }
     },
     "ua-parser-js": {
-      "version": "0.7.22",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz",
-      "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="
+      "version": "0.7.21",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
+      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="
     },
     "unherit": {
       "version": "1.1.3",
@@ -16209,9 +16086,9 @@
       }
     },
     "whatwg-fetch": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz",
-      "integrity": "sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
     },
     "whatwg-mimetype": {
       "version": "2.3.0",

client/package.json

@@ -13,7 +13,7 @@
         "test:watch": "jest --watch"
     },
     "dependencies": {
-        "@nivo/line": "^0.64.0",
+        "@nivo/line": "^0.49.1",
         "axios": "^0.19.2",
         "classnames": "^2.2.6",
         "date-fns": "^1.29.0",

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

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" />

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" />

client/src/__locales/be.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Налады кліентаў",
     "example_upstream_reserved": "Вы можаце паказаць DNS-сервер <0>для канкрэтнага дамена(аў)</0>",
-    "example_upstream_comment": "Вы можаце паказаць каментар",
     "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту",
     "parallel_requests": "Паралельныя запыты",
     "load_balancing": "Размеркаванне нагрузкі",
@@ -115,7 +114,7 @@
     "average_processing_time": "Сярэдні час апрацоўкі запыту",
     "average_processing_time_hint": "Сярэдні час для апрацоўкі запыту DNS  у мілісекундах",
     "block_domain_use_filters_and_hosts": "Блакаваць дамены з выкарыстаннем фільтраў і файлаў хастоў",
-    "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў <a> \"Фільтрах\"</a>.",
+    "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў <a href='#filters'> \"Фільтрах\"</a>.",
     "use_adguard_browsing_sec": "Выкарыстаць Бяспечную навігацыю AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home праверыць, ці ўлучаны дамен у ўэб-службу бяспекі браўзара. Ён будзе выкарыстоўваць API, каб выканаць праверку: на сервер адсылаецца толькі кароткі прэфікс імя дамена SHA256.",
     "use_adguard_parental": "Ужывайце модуль Бацькоўскага кантролю AdGuard ",
@@ -134,7 +133,6 @@
     "dhcp_settings": "Налады DHCP",
     "upstream_dns": "Upstream DNS-серверы",
     "upstream_dns_help": "Увядзіце адрасы сервераў па адным у радку. <a>Даведацца больш </a> пра наладжванне DNS-сервераў.",
-    "upstream_dns_configured_in_file": "Наладжаны ў {{path}}",
     "test_upstream_btn": "Тэст upstream сервераў",
     "upstreams": "Upstreams",
     "apply_btn": "Ужыць",
@@ -188,7 +186,6 @@
     "example_upstream_regular": "звычайны DNS (наўзверх UDP)",
     "example_upstream_dot": "зашыфраваны <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-па-над-TLS</a>",
     "example_upstream_doh": "зашыфраваны <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
-    "example_upstream_doq": "зашыфраваны <0>DNS-over-QUIC</0>",
     "example_upstream_sdns": "вы можаце выкарыстоўваць <a href='https://dnscrypt.info/stamps/' target='_blank'>DNS Stamps</a> для <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> ці <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a> рэзалвераў",
     "example_upstream_tcp": "звычайны DNS (наўзверх TCP)",
     "all_lists_up_to_date_toast": "Усе спісы ўжо абноўлены",
@@ -197,10 +194,6 @@
     "dns_test_not_ok_toast": "Сервер \"{{key}}\": немагчыма выкарыстоўваць, праверце слушнасць напісання",
     "unblock": "Адблакаваць",
     "block": "Заблакаваць",
-    "disallow_this_client": "Забараніць доступ гэтаму кліенту",
-    "allow_this_client": "Дазволіць доступ гэтаму кліенту",
-    "block_for_this_client_only": "Заблакаваць толькі для гэтага кліента",
-    "unblock_for_this_client_only": "Адблакаваць толькі для гэтага кліента",
     "time_table_header": "Час",
     "date": "Дата",
     "domain_name_table_header": "Дамен",
@@ -242,15 +235,12 @@
     "blocking_mode": "Рэжым блакавання",
     "default": "Стандартны",
     "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
     "null_ip": "Нулёвы IP",
     "custom_ip": "Свой IP",
     "blocking_ipv4": "Блакаванне IPv4",
     "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": "Ограничение скорости",
@@ -259,8 +249,7 @@
     "rate_limit_desc": "Абмежаванне на колькасць запытаў у секунду для кожнага кліента (0 — неабмежавана)",
     "blocking_ipv4_desc": "IP-адрас, што вяртаецца пры блакаванню A-запыту",
     "blocking_ipv6_desc": "IP-адрас, што вяртаецца пры блакаванню AAAA-запыту",
-    "blocking_mode_default": "Стандартны: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA), калі заблакавана правілам у стылі Adblock; адказвае з IP-адрасам, паказаным у правіле, калі заблакавана правілам у стылі /etc/hosts-style",
-    "blocking_mode_refused": "REFUSED: Адказвае з кодам REFUSED",
+    "blocking_mode_default": "Стандартны: Адказвае з REFUSED, калі заблакавана правілам у стылі Adblock; адказвае з IP-адрасам, паказаным у правіле, калі заблакавана правілам у стылі /etc/hosts",
     "blocking_mode_nxdomain": "NXDOMAIN: Адказвае з кодам NXDOMAIN\n",
     "blocking_mode_null_ip": "Нулёвы IP: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA)",
     "blocking_mode_custom_ip": "Карыстацкі IP: Адказвае з ручна наладжаным IP-адрасам",
@@ -269,6 +258,7 @@
     "source_label": "Крыніца",
     "found_in_known_domain_db": "Знойдзены ў базе вядомых даменаў.",
     "category_label": "Катэгорыя",
+    "rule_label": "Правіла",
     "list_label": "Спіс",
     "unknown_filter": "Невядомы фільтр {{filterId}}",
     "known_tracker": "Вядомы трэкер",
@@ -329,14 +319,13 @@
     "encryption_config_saved": "Налады шыфравання захаваны",
     "encryption_server": "Імя сервера",
     "encryption_server_enter": "Увядзіце ваша даменавае імя",
+    "encryption_server_desc": "Для выкарыстання HTTPS вам трэба ўвесці імя сервера, якое падыходзіць вашаму SSL-сертыфікату.",
     "encryption_redirect": "Аўтаматычна перанакіроўваць на HTTPS",
     "encryption_redirect_desc": "Калі ўлучана, AdGuard Home будзе аўтаматычна перанакіроўваць вас з HTTP на HTTPS адрас.",
     "encryption_https": "Порт HTTPS",
     "encryption_https_desc": "Калі порт HTTPS наладжаны, ўэб-інтэрфейс адміністравання AdGuard Home будзе даступны праз HTTPS, а таксама DNS-over-HTTPS сервер будзе даступны па шляху '/dns-query'.",
     "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_certificates": "Сертыфікаты",
     "encryption_certificates_desc": "Для выкарыстання шыфравання вам трэба падаць валідны ланцужок SSL-сертыфікатаў для вашага дамена. Вы можаце атрымаць дармовы сертыфікат на <0>{{link}}</0> ці вы можаце купіць яго ў аднаго з давераных Цэнтраў Сертыфікацыі.",
     "encryption_certificates_input": "Скапіюйце сюды сертыфікаты ў PEM-кадоўцы.",
@@ -384,6 +373,7 @@
     "client_edit": "Рэдагаваць кліента",
     "client_identifier": "Ідэнтыфікатар",
     "ip_address": "IP-адрас",
+    "client_identifier_desc": "Кліенты могуць быць ідэнтыфікаваны па IP-адрасе, CIDR ці MAC-адрасу. Звярніце ўвагу, што выкарыстанне MAC як ідэнтыфікатара магчыма, толькі калі AdGuard Home таксама з'яўляецца і <0>DHCP-серверам</0>",
     "form_enter_ip": "Увядзіце IP",
     "form_enter_mac": "Увядзіце MAC",
     "form_enter_id": "Увядзіце ідэнтыфікатар",
@@ -414,8 +404,7 @@
     "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 вы можаце спампаваць адмысловы файл '.mobileconfig', які дадае <highlight>DNS-over-HTTPS</highlight> ці <highlight>DNS-over-TLS</highlight> серверы ў налады DNS.",
+    "setup_dns_privacy_3": "<0>Звярніце ўвагу, што зашыфраваны DNS-пратакол падтрымваецца толькі на Android 9. Для іншых аперацыйных сістэм вам трэба будзе ўсталяваць дадатковае ПА.</0><0>Вось спіс ПА, якое вы можаце выкарыстоўваць.</0>",
     "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.",
@@ -526,8 +515,8 @@
     "check_ip": "IP-адрасы: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Прычына: {{reason}}",
+    "check_rule": "Правіла: {{rule}}",
     "check_service": "Назва сэрвісу: {{service}}",
-    "service_name": "Назва сэрвіса",
     "check_not_found": "Не знойдзена ў вашым спісе фільтраў",
     "client_confirm_block": "Вы ўпэўнены, што хочаце заблакаваць кліента \"{{ip}}\"?",
     "client_confirm_unblock": "Вы ўпэўнены, што хочаце адблакаваць кліента \"{{ip}}\"?",
@@ -562,12 +551,11 @@
     "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 (секунды)",
+    "enter_cache_size": "Увядзіце памер кэша",
+    "enter_cache_ttl_min_override": "Увядзіце мінімальны TTL",
+    "enter_cache_ttl_max_override": "Увядзіце максімальны TTL",
     "cache_ttl_min_override_desc": "Перавызначыць TTL-значэнне (мінімальнае), атрыманае з upstream-сервера",
-    "cache_ttl_max_override_desc": "Усталюйце максімальнае TTL-значэнне (секунды) для запісаў у кэшы DNS",
-    "ttl_cache_validation": "Мінімальнае значэнне TTL кэша павінна быць менш ці роўна максімальнаму значэнню",
+    "cache_ttl_max_override_desc": "Перавызначыць TTL-значэнне (максімальнае), атрыманае з сервера для выгрузкі даных",
     "filter_category_general": "Галоўныя",
     "filter_category_security": "Бяспека",
     "filter_category_regional": "Рэгіянальныя",
@@ -579,8 +567,5 @@
     "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": "Эксперыментальны"
+    "port_53_faq_link": "Порт 53 часта заняты службамі \"DNSStubListener\" ці \"systemd-resolved\". Азнаёмцеся з <0>інструкцыяй</0> пра тое, як гэта дазволіць."
 }

client/src/__locales/bg.json

@@ -71,7 +71,7 @@
     "average_processing_time": "Средно време за обработка",
     "average_processing_time_hint": "Средно време за обработка на DNS заявки в милисекунди",
     "block_domain_use_filters_and_hosts": "Блокирани домейни - общи и местни филтри",
-    "filters_block_toggle_hint": "Може да зададете собствени настройки в <a>Филтри</a>.",
+    "filters_block_toggle_hint": "Може да зададете собствени настройки в <a href='#filters'>Филтри</a>.",
     "use_adguard_browsing_sec": "Използвайте AdGuard модул за сигурността",
     "use_adguard_browsing_sec_hint": "Модул Сигурност в AdGuard Home проверява всяка страница която отваряте дали е в черните списъци застрашаващи вашата сигурност. Използва се програмен интерфейс който защитава вашата анонимност и изпраща само SHA256 сума базирана на част от домейна който посещавате.",
     "use_adguard_parental": "Включи AdGuard Родителски Надзор",
@@ -144,6 +144,7 @@
     "source_label": "Източник",
     "found_in_known_domain_db": "Намерен в списъците с домейни.",
     "category_label": "Категория",
+    "rule_label": "Правило",
     "unknown_filter": "Непознат филтър {{filterId}}",
     "install_welcome_title": "Добре дошли в AdGuard Home!",
     "install_welcome_desc": "AdGuard Home e мрежово решение за блокиране на реклами и тракери на DNS ниво. Създадено е за да ви даде пълен контрол над мрежата и всичките ви устройства, без да е необходимо допълнително инсталиране на друг софтуер.",
@@ -201,6 +202,7 @@
     "encryption_config_saved": "Конфигурацията е успешно записана",
     "encryption_server": "Име на сървъра",
     "encryption_server_enter": "Въведете име на домейна",
+    "encryption_server_desc": "За да използвате HTTPS, трябва името на сървъра да съвпада с това на SSL сертификата.",
     "encryption_redirect": "Автоматично пренасочване към HTTPS",
     "encryption_redirect_desc": "Служи за автоматично пренасочване от HTTP към HTTPS на страницата за Администрация в AdGuard Home.",
     "encryption_https": "HTTPS порт",

client/src/__locales/cs.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Nastavení klienta",
     "example_upstream_reserved": "Můžete zadat DNS upstream <0>pro konkrétní doménu(y)</0>",
-    "example_upstream_comment": "Můžete zadat komentář",
     "upstream_parallel": "Použijte paralelní požadavky na urychlení řešení simultánním dotazováním na všechny navazující servery",
     "parallel_requests": "Paralelní požadavky",
     "load_balancing": "Optimalizace vytížení",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Neplatný formát IP",
     "form_error_mac_format": "Neplatný formát MAC",
     "form_error_client_id_format": "Neplatný formát ID klienta",
-    "form_error_server_name": "Neplatný název serveru",
     "form_error_positive": "Musí být větší než 0",
     "form_error_negative": "Musí být rovno nebo větší než 0",
     "range_end_error": "Musí být větší než začátek rozsahu",
@@ -116,7 +114,7 @@
     "average_processing_time": "Průměrný čas zpracování",
     "average_processing_time_hint": "Průměrný čas zpracování požadavků DNS v milisekundách",
     "block_domain_use_filters_and_hosts": "Blokovat domény pomocí filtrů a seznamů adres",
-    "filters_block_toggle_hint": "Pravidla blokování můžete nastavit v nastavení <a>Filtry</a>.",
+    "filters_block_toggle_hint": "Pravidla blokování můžete nastavit v nastavení <a href='#filters'>Filtry</a>.",
     "use_adguard_browsing_sec": "Použít službu AdGuard Bezpečné prohlížení",
     "use_adguard_browsing_sec_hint": "AdGuard Home zkontroluje, zda je doména na seznamu zakázaných ve službě Bezpečné prohlížení. Použije vyhledávací API přátelské k ochraně soukromí na provedení kontroly: na server je odeslána pouze krátká předpona SHA256 otisku názvu domény.",
     "use_adguard_parental": "Použít službu AdGuard Rodičovská kontrola",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Blokování IPv6",
     "dns_over_https": "DNS přes HTTPS",
     "dns_over_tls": "DNS přes TLS",
-    "dns_over_quic": "DNS skrze QUIC",
-    "client_id": "ID klienta",
-    "client_id_placeholder": "Zadejte ID klienta",
-    "client_id_desc": "Různé klienty lze identifikovat pomocí speciálního ID klienta. <a>Zde</a> se můžete dozvědět více o tom, jak klienty identifikovat.",
-    "download_mobileconfig_doh": "Stáhnout .mobileconfig pro DNS skrze HTTPS",
-    "download_mobileconfig_dot": "Stáhnout .mobileconfig pro DNS skrze TLS",
-    "download_mobileconfig": "Stáhnout konfigurační soubor",
     "plain_dns": "Čisté DNS",
     "form_enter_rate_limit": "Zadejte rychlostní limit",
     "rate_limit": "Rychlostní limit",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Počet požadavků za sekundu, které smí jeden klient provádět (0: neomezeno)",
     "blocking_ipv4_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku typu A",
     "blocking_ipv6_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku typu AAAA",
-    "blocking_mode_default": "Výchozí: Odezva s nulovou IP adresou (0.0.0.0 pro A; :: pro AAAA), pokud je blokováno pravidlem ve stylu Adblock; odezva pomocí IP adresy uvedené v pravidle, pokud je blokováno pravidlem /etc/hosts-style",
+    "blocking_mode_default": "Výchozí: Odezva pomocí REFUSED, pokud je blokováno pravidlem ve stylu Adblock; odezva pomocí IP adresy uvedené v pravidle, pokud je blokováno pravidlem /etc/hosts-style",
     "blocking_mode_refused": "REFUSED: Odezva pomocí kódu REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Odezva s kódem NXDOMAIN",
     "blocking_mode_null_ip": "Nulová IP: Odezva s nulovou IP adresou (0.0.0.0 pro A; :: pro AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Zdroj",
     "found_in_known_domain_db": "Nalezeno v databázi známých domén",
     "category_label": "Kategorie",
-    "rule_label": "Pravidla",
+    "rule_label": "Pravidlo",
     "list_label": "Seznam",
     "unknown_filter": "Neznámý filtr {{filterId}}",
     "known_tracker": "Známý slídič",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Konfigurace šifrování byla uložena",
     "encryption_server": "Název serveru",
     "encryption_server_enter": "Zadejte název domény",
-    "encryption_server_desc": "Abyste mohli používat HTTPS, musíte zadat název serveru, který odpovídá vašemu certifikátu SSL nebo zástupnému certifikátu. Pokud není pole nastaveno, bude přijímat připojení TLS pro libovolnou doménu.",
+    "encryption_server_desc": "Abyste mohli používat protokol HTTPS, musíte zadat název serveru, který odpovídá vašemu certifikátu SSL.",
     "encryption_redirect": "Automaticky přesměrovat na HTTPS",
     "encryption_redirect_desc": "Pokud je zaškrtnuto, AdGuard Home vás automaticky přesměruje z adres HTTP na HTTPS.",
     "encryption_https": "HTTPS port",
@@ -392,7 +383,7 @@
     "client_edit": "Upravit klienta",
     "client_identifier": "Identifikátor",
     "ip_address": "IP adresa",
-    "client_identifier_desc": "Klienti můžou být identifikováni podle IP adresy, CIDR, MAC adresy nebo speciálního ID klienta (může být použito pro DoT/DoH/DoQ). <0>Zde</0> se můžete dozvědět více o tom, jak klienty identifikovat.",
+    "client_identifier_desc": "Klienti můžou být identifikováni podle IP adresy, CIDR nebo MAC adresy. Upozorňujeme, že použití MAC jako identifikátoru je možné pouze v případě, že je AdGuard Home také <0>DHCP server</0>",
     "form_enter_ip": "Zadejte IP",
     "form_enter_mac": "Zadejte MAC",
     "form_enter_id": "Zadejte identifikátor",
@@ -423,8 +414,7 @@
     "dns_privacy": "Soukromí DNS",
     "setup_dns_privacy_1": "<0>DNS-přes-TLS:</0> Použít <1>{{address}}</1> řetězec.",
     "setup_dns_privacy_2": "<0>DNS-přes-HTTPS:</0> Použít <1>{{address}}</1> řetězec.",
-    "setup_dns_privacy_3": "<0>Zde je seznam softwaru, který můžete použít.</0>",
-    "setup_dns_privacy_4": "Na zařízení se systémem iOS 14 nebo macOS Big Sur si můžete stáhnout speciální soubor '.mobileconfig', který do nastavení DNS přidává servery <highlight>DNS skrze HTTPS</highlight> nebo <highlight> DNS skrze TLS</highlight>.",
+    "setup_dns_privacy_3": "<0>Upozorňujeme, že šifrované protokoly DNS jsou podporovány pouze v systému Android 9. Proto je třeba nainstalovat další software pro jiné operační systémy.</0><0>Zde je seznam softwaru, který můžete použít.</0>",
     "setup_dns_privacy_android_1": "Android 9 podporuje DNS-přes-TLS nativně. Pokud ho chcete konfigurovat, přejděte na Nastavení → Síť & internet → Pokročilé → Soukromé DNS a tam zadejte název vaší domény.",
     "setup_dns_privacy_android_2": "<0>AdGuard pro Android</0> podporuje <1>DNS-přes-HTTPS</1> a <1>DNS-přes-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> přidává podporu <1>DNS-přes-HTTPS</1> pro Android.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> podporuje <1>DNS-přes-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> podporuje <1>DNS-přes-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Další implementace naleznete <0>zde</0> a <1>zde</1>.",
-    "setup_dns_privacy_ioc_mac": "Konfigurace pro iOS a macOS",
     "setup_dns_notice": "Pro použití <1>DNS-přes-HTTPS</1> nebo <1>DNS-přes-TLS</1> potřebujete v nastaveních AdGuard Home <0>nakonfigurovat šifrování</0>.",
     "rewrite_added": "Přesměrování DNS pro „{{key}}“ úspěšně přidáno",
     "rewrite_deleted": "Přesměrování DNS pro „{{key}}“ úspěšně smazáno",
@@ -536,8 +525,8 @@
     "check_ip": "IP adresy: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Důvod: {{reason}}",
+    "check_rule": "Pravidlo: {{rule}}",
     "check_service": "Název služby: {{service}}",
-    "service_name": "Název služby",
     "check_not_found": "Nenalezeno ve Vašich seznamech filtrů",
     "client_confirm_block": "Opravdu chcete zablokovat klienta „{{ip}}“?",
     "client_confirm_unblock": "Opravdu chcete odblokovat klienta „{{ip}}“?",
@@ -572,11 +561,11 @@
     "cache_size_desc": "Velikost mezipaměti DNS (v bajtech)",
     "cache_ttl_min_override": "Přepsat minimální hodnotu TTL",
     "cache_ttl_max_override": "Přepsat maximální hodnotu TTL",
-    "enter_cache_size": "Zadejte velikost mezipaměti (v bajtech)",
-    "enter_cache_ttl_min_override": "Zadejte minimální hodnotu TTL (v sekundách)",
-    "enter_cache_ttl_max_override": "Zadejte maximální hodnotu TTL (v sekundách)",
-    "cache_ttl_min_override_desc": "Prodlužte nejkratší hodnotu TTL (v sekundách) obdrženou z odchozího serveru při ukládání DNS odpovědí do mezipaměti",
-    "cache_ttl_max_override_desc": "Nastavte maximální hodnotu TTL (v sekundách) pro položky v mezipaměti DNS",
+    "enter_cache_size": "Zadejte velikost mezipaměti",
+    "enter_cache_ttl_min_override": "Zadejte minimální hodnotu TTL",
+    "enter_cache_ttl_max_override": "Zadejte maximální hodnotu TTL",
+    "cache_ttl_min_override_desc": "Přepište hodnotu TTL (minimální) obdrženou z odchozího serveru",
+    "cache_ttl_max_override_desc": "Přepište hodnotu TTL (maximální) obdrženou z odchozího serveru",
     "ttl_cache_validation": "Minimální hodnota TTL mezipaměti musí být menší nebo rovna maximální hodnotě",
     "filter_category_general": "Obecné",
     "filter_category_security": "Bezpečnost",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Klikněte pro zobrazení dotazů",
     "port_53_faq_link": "Port 53 je často obsazen službami \"DNSStubListener\" nebo \"systemd-resolved\". Přečtěte si <0>tento návod</0> o tom, jak to vyřešit.",
     "adg_will_drop_dns_queries": "AdGuard Home zruší všechny DNS dotazy tohoto klienta.",
-    "client_not_in_allowed_clients": "Tento klient není povolen, protože není na seznamu \"Povolení klienti\".",
     "experimental": "Experimentální"
 }

client/src/__locales/da.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Klient-indstillinger",
     "example_upstream_reserved": "Du kan specificere DNS upstream <0>for det(de) specifikke domæne(r)</0>",
-    "example_upstream_comment": "Du kan uddybe kommentaren",
     "upstream_parallel": "Brug parallelle forespørgsler til at fremskynde behandlingen ved samtidig at spørge alle upstream servere",
     "parallel_requests": "Parallelle forespørgsler",
     "load_balancing": "Belastningsfordeling",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Ugyldigt IP-format",
     "form_error_mac_format": "Ugyldigt MAC-format",
     "form_error_client_id_format": "Ugyldigt klient-ID-format",
-    "form_error_server_name": "Ugyldigt servernavn",
     "form_error_positive": "Skal være større end 0",
     "form_error_negative": "Skal være lig med 0 eller større",
     "range_end_error": "Skal være større end starten af ​​intervallet",
@@ -116,7 +114,7 @@
     "average_processing_time": "Gennemsnitlig behandlingstid",
     "average_processing_time_hint": "Gennemsnitlig behandlingstid i millisekunder af DNS-forespørgsel",
     "block_domain_use_filters_and_hosts": "Bloker domæner ved hjælp af filtre og værtsfiler",
-    "filters_block_toggle_hint": "Du kan oprette blokeringsregler i <a>Filterindstillingerne</a>.",
+    "filters_block_toggle_hint": "Du kan oprette blokeringsregler i <a href='#filters'>Filterindstillingerne</a>.",
     "use_adguard_browsing_sec": "Brug AdGuards browsing sikkerhedstjeneste",
     "use_adguard_browsing_sec_hint": "AdGuard Home vil kontrollere om domænet er sortlistet af browsing sikkerhedstjenesten. Den vil bruge privatlivsvenlig lookup API til at udføre kontrollen: kun et kort præfiks af domænenavnet SHA256 hash bliver sendt til serveren.",
     "use_adguard_parental": "Brug AdGuards forældrekontrol",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "IPv6-blokering",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-Quic",
-    "client_id": "Klient-ID",
-    "client_id_placeholder": "Indtast klient-ID",
-    "client_id_desc": "Forskellige klienter kan identificeres ved hjælp af et specielt klient-ID. <a>Her</a> kan du lære mere om, hvordan du identificerer klienter.",
-    "download_mobileconfig_doh": "Download .mobileconfig til DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Download .mobileconfig til DNS-over-TLS",
-    "download_mobileconfig": "Download konfigurationsfil",
     "plain_dns": "Almindelig DNS",
     "form_enter_rate_limit": "Indtast hyppighedsgrænse",
     "rate_limit": "Hyppighedsgrænse",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Antallet af anmodninger pr. sekund, som en enkelt klient får lov til at fremsætte (indstilles den til 0 betyder det ubegrænset)",
     "blocking_ipv4_desc": "IP-adresse, der skal returneres for en blokeret A-anmodning",
     "blocking_ipv6_desc": "IP-adresse, der skal returneres for en blokeret AAAA-anmodning",
-    "blocking_mode_default": "Standard: Svar med nul IP-adresse (0.0.0.0 for A; :: for AAAA), når den blokeres af Adblock-stil-reglen; svar med den IP-adresse, der er angivet i reglen, når den blokeres af /etc/hosts-style-reglen",
+    "blocking_mode_default": "Standard: Svar med REFUSED, når det blokeres af Adblock-stil-reglen; svar med den IP-adresse, der er angivet i reglen, når den blokeres af /etc/hosts-style-reglen",
     "blocking_mode_refused": "REFUSED: Svar med en REFUSED kode",
     "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-kode",
     "blocking_mode_null_ip": "Null IP: Svar med nul IP-adresse (0.0.0.0 for A; :: for AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Kilde",
     "found_in_known_domain_db": "Fundet i databasen med kendte domæner.",
     "category_label": "Kategori",
-    "rule_label": "Regel(regler)",
+    "rule_label": "Regel",
     "list_label": "Liste",
     "unknown_filter": "Ukendt filter {{filterId}}",
     "known_tracker": "Kendt tracker",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Krypteringskonfiguration gemt",
     "encryption_server": "Servernavn",
     "encryption_server_enter": "Indtast dit domænenavn",
-    "encryption_server_desc": "For at kunne bruge HTTPS skal du indtaste det servernavn, der matcher dit SSL-certifikat eller wildcard-certifikat. Hvis feltet ikke er indstillet, accepterer det TLS-forbindelser til ethvert domæne.",
+    "encryption_server_desc": "For at kunne bruge HTTPS skal du indtaste servernavnet, der matcher dit SSL-certifikat.",
     "encryption_redirect": "Omdiriger automatisk til HTTPS",
     "encryption_redirect_desc": "Hvis afkrydset, vil AdGuard Home automatisk omdirigere dig fra HTTP til HTTPS-adresser.",
     "encryption_https": "HTTPS-port",
@@ -392,7 +383,7 @@
     "client_edit": "Rediger Klient",
     "client_identifier": "Identifikator",
     "ip_address": "IP-adresse",
-    "client_identifier_desc": "Klienter kan identificeres ud fra IP-adressen, CIDR eller MAC-adressen eller et specielt klient-ID (kan bruges til DoT/DoH/DoQ). <0>Her</0> kan du lære mere om, hvordan du identificerer klienter.",
+    "client_identifier_desc": "Klienter kan identificeres ud fra IP-adressen, CIDR eller MAC-adressen. Bemærk, at det kun er muligt at bruge MAC som identifikator, hvis AdGuard Home også er en <0>DHCP-server</0>",
     "form_enter_ip": "Indtast IP",
     "form_enter_mac": "Indtast MAC",
     "form_enter_id": "Indtast identifikator",
@@ -423,8 +414,7 @@
     "dns_privacy": "DNS Privatliv",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Brug <1>{{address}}</1> streng.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Brug <1>{{address}}</1> streng.",
-    "setup_dns_privacy_3": "<0>Her er en liste over software, du kan bruge.</0>",
-    "setup_dns_privacy_4": "På en iOS 14 eller macOS Big Sur-enhed kan du downloade en særlig '.mobileconfig' -fil, der tilføjer <highlight>DNS-over-HTTPS</highlight> eller <highlight>DNS-over-TLS</highlight> servere til DNS-indstillingerne.",
+    "setup_dns_privacy_3": "<0>Bemærk venligst, at krypterede DNS-protokoller kun understøttes på Android 9. Så du skal installere ekstra software til andre styresystemer.</0><0>Her er en liste af software, du kan bruge.</0>",
     "setup_dns_privacy_android_1": "Android 9 understøtter den indbyggede DNS-over-TLS. For at konfigurere den, gå til Indstillinger → Netværk & internet → Avanceret → Privat DNS og indtast dit domænenavn.",
     "setup_dns_privacy_android_2": "<0>AdGuard til Android</0> understøtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> tilføjer <1>DNS-over-HTTPS</1> understøttelse til Android.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> understøtter <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> understøtter <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Du kan finde flere implementeringer <0>her</0> og <1>her</1>.",
-    "setup_dns_privacy_ioc_mac": "iOS- og macOS-konfiguration",
     "setup_dns_notice": "For at kunne bruge <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, skal du <0>konfigurere Krypteringen</0> i indstillingerne i AdGuard Home.",
     "rewrite_added": "DNS-omskrivning for \"{{key}}\" blev tilføjet",
     "rewrite_deleted": "DNS-omskrivning for \"{{key}}\" blev slettet",
@@ -536,8 +525,8 @@
     "check_ip": "IP-adresser: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Årsag: {{reason}}",
+    "check_rule": "Regel: {{rule}}",
     "check_service": "Servicenavn: {{service}}",
-    "service_name": "Navn på tjeneste",
     "check_not_found": "Ikke fundet i dine filterlister",
     "client_confirm_block": "Er du sikker på, at du vil blokere klienten \"{{ip}}\"?",
     "client_confirm_unblock": "Er du sikker på, at du vil fjerne blokeringen af klienten \"{{ip}}\"?",
@@ -572,11 +561,11 @@
     "cache_size_desc": "Størrelse på DNS-cache (i bytes)",
     "cache_ttl_min_override": "Overskriv minimum TTL",
     "cache_ttl_max_override": "Overskriv maksimal TTL",
-    "enter_cache_size": "Indtast cache-størrelse (bytes)",
-    "enter_cache_ttl_min_override": "Indtast minimum TTL (sekunder)",
-    "enter_cache_ttl_max_override": "Indtast maksimum TTL (sekunder)",
-    "cache_ttl_min_override_desc": "Udvid korte time-to-live værdier (sekunder) modtaget fra upstream-serveren, når DNS-svar cachelagres",
-    "cache_ttl_max_override_desc": "Indstil en maksimal time-to-live (sekunder) for registreringer i DNS-cachen",
+    "enter_cache_size": "Indtast cache-størrelse",
+    "enter_cache_ttl_min_override": "Indtast minimum TTL",
+    "enter_cache_ttl_max_override": "Indtast maksimum TTL",
+    "cache_ttl_min_override_desc": "Overskriv TTL-værdi (minimum) modtaget fra upstream-serveren",
+    "cache_ttl_max_override_desc": "Overskriv TTL-værdi (maksimum) modtaget fra upstream-serveren",
     "ttl_cache_validation": "Minimum cache TTL-værdi skal være mindre end eller lig med den maksimale værdi",
     "filter_category_general": "Generelt",
     "filter_category_security": "Sikkerhed",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Klik for at se forespørgsler",
     "port_53_faq_link": "Port 53 optages ofte af \"DNSStubListener\" eller \"systemd-resolved\" tjenester. Læs <0>denne instruktion</0> om, hvordan du løser dette.",
     "adg_will_drop_dns_queries": "AdGuard Home vil afbryde alle DNS-forespørgsler fra denne klient.",
-    "client_not_in_allowed_clients": "Klienten er ikke tilladt, fordi den ikke er på listen \"Tilladte klienter\".",
     "experimental": "Eksperimentel"
 }

client/src/__locales/de.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Client-Einstellungen",
     "example_upstream_reserved": "Sie können DNS-Upstream <0>für bestimmte Domain(s)</0> angeben",
-    "example_upstream_comment": "Sie können den Kommentar angeben",
     "upstream_parallel": "Parallele Abfragen verwenden, um die Lösung zu beschleunigen, indem Sie alle Upstream-Server gleichzeitig abfragen",
     "parallel_requests": "Parallele Abfragen",
     "load_balancing": "Lastverteilung",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Ungültiges IPv4-Format",
     "form_error_mac_format": "Ungültiges MAC-Format",
     "form_error_client_id_format": "Ungültiges Client-ID-Format",
-    "form_error_server_name": "Ungültiger Servername",
     "form_error_positive": "Muss größer als 0 sein.",
     "form_error_negative": "Muss gleich oder größer als 0 (Null) sein",
     "range_end_error": "Muss größer als der Bereichsbeginn sein",
@@ -92,16 +90,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",
@@ -110,13 +108,13 @@
     "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",
     "average_processing_time_hint": "Durchschnittliche Zeit in Millisekunden zur Bearbeitung von DNS-Anfragen",
     "block_domain_use_filters_and_hosts": "Domains durch Filter und Host-Dateien sperren",
-    "filters_block_toggle_hint": "Sie können Blockierregeln in den <a>Filter</a>einstellungen erstellen.",
+    "filters_block_toggle_hint": "Sie können Blockierregeln in den <a href='#filters'>Filter</a>einstellungen erstellen",
     "use_adguard_browsing_sec": "AdGuard Webservice für Internetsicherheit nutzen",
     "use_adguard_browsing_sec_hint": "AdGuard Home prüft, ob die Domain durch den Webdienst für Internetsicherheit auf eine Sperrliste gesetzt wurde. Um Ihre Privatsphäre zu wahren, wird eine API verwendet, bei der nur ein kurzer Präfix des Domainnamens als SHA256 gehasht an den Server gesendet wird.",
     "use_adguard_parental": "AdGuard Webservice für Kindersicherung verwenden",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "IPv6-Sperren",
     "dns_over_https": "DNS-over-HTTPS (DNS-Abrage über HTTPS)",
     "dns_over_tls": "DNS-over-TLS (DNS-Abrage über TLS)",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "Client-ID",
-    "client_id_placeholder": "Client-ID eingeben",
-    "client_id_desc": "Verschiedene Clients können durch eine spezielle Client-ID identifiziert werden. <a>Hier</a> können Sie mehr darüber erfahren, wie Sie Clients identifizieren können.",
-    "download_mobileconfig_doh": ".mobileconfig für DNS-über-HTTPS herunterladen",
-    "download_mobileconfig_dot": ".mobileconfig für DNS-über-TLS herunterladen",
-    "download_mobileconfig": "Konfigurationsdatei herunterladen",
     "plain_dns": "Einfaches DNS",
     "form_enter_rate_limit": "Begrenzungswert eingeben",
     "rate_limit": "Begrenzungswert",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Die Anzahl der Anfragen pro Sekunde, die ein einzelner Client stellen darf (0: unbegrenzt)",
     "blocking_ipv4_desc": "IP-Adresse, die für eine gesperrte A-Anfrage zurückgegeben werden soll",
     "blocking_ipv6_desc": "IP-Adresse, die für eine gesperrte AAAA-Anfrage zurückgegeben werden soll",
-    "blocking_mode_default": "Standard: Mit Null IP Adress (0.0.0.0 for A; :: for AAAA) antworten, wenn sie durch eine Regel im Adblock-Stil gesperrt sind; mit der in der Regel angegebenen IP-Adresse antworten, wenn sie durch eine Regel im /etc/hosts-Stil gesperrt wurde",
+    "blocking_mode_default": "Standard: Mit REFUSED antworten, wenn sie durch eine Regel im Adblock-Stil gesperrt sind; mit der in der Regel angegebenen IP-Adresse antworten, wenn sie durch eine Regel im /etc/hosts-Stil gesperrt wurde",
     "blocking_mode_refused": "REFUSED: mit abgelehntem Code REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Mit NXDOMAIN-Code antworten",
     "blocking_mode_null_ip": "Null-IP: Antworten mit Null-IP-Adresse (0.0.0.0.0 für A; :: für AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Quelle",
     "found_in_known_domain_db": "In der Datenbank der bekannten Domains gefunden.",
     "category_label": "Kategorie",
-    "rule_label": "Regel(n)",
+    "rule_label": "Regel",
     "list_label": "Liste",
     "unknown_filter": "Unbekannter Filter {{filterId}}",
     "known_tracker": "Bekannte Tracker",
@@ -423,8 +414,7 @@
     "dns_privacy": "DNS-Datenschutz",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
-    "setup_dns_privacy_3": "<0>Hier ist eine Liste von Software, die Sie verwenden können.</0>",
-    "setup_dns_privacy_4": "Auf einem iOS 14 oder macOS Big Sur-Gerät können Sie eine spezielle Datei „.mobileconfig” herunterladen, die Server für <highlight>DNS-über-HTTPS</highlight> oder <highlight>DNS-über-TLS</highlight> zu den DNS-Einstellungen hinzufügt.",
+    "setup_dns_privacy_3": "<0>Bitte beachten Sie, dass verschlüsselte DNS-Protokolle nur von Android 9 unterstützt werden. Sie müssen also zusätzliche Software für andere Betriebssysteme installieren.</0><0>Hier eine Liste der Apps, die Sie verwenden könnten.</0>",
     "setup_dns_privacy_android_1": "Android 9 unterstützt DNS-over-TLS nativ. Um es zu konfigurieren, gehen Sie zu „Einstellungen” → „Netzwerk & Internet” → „Erweitert” → „Privater DNS” und geben Sie dort Ihren Domainnamen ein.",
     "setup_dns_privacy_android_2": "<0>AdGuard für Android</0> unterstützt <1>DNS-over-HTTTPS</1> und <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "„<0>Intra</0>” fügt <1>DNS-over-HTTPS</1>-Unterstützung zu Android hinzu.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> unterstützt <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> unterstützt <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Weitere Umsetzungen finden Sie <0>hier</0> und <1>hier</1>.",
-    "setup_dns_privacy_ioc_mac": "Konfiguration für iOS und macOS",
     "setup_dns_notice": "Um <1>DNS-over-HTTTPS</1> oder <1>DNS-over-TLS</1> verwenden zu können, müssen Sie in den AdGuard Home Einstellungen die <0>Verschlüsselung konfigurieren</0>.",
     "rewrite_added": "DNS-Umschreibung für „{{key}}” erfolgreich hinzugefügt",
     "rewrite_deleted": "DNS-Umschreibung für „{{key}}” erfolgreich entfernt",
@@ -505,7 +494,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.",
@@ -536,8 +525,8 @@
     "check_ip": "IP-Adressen: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Grund: {{reason}}",
+    "check_rule": "Regel: {{rule}}",
     "check_service": "Dienstname: {{service}}",
-    "service_name": "Name des Dienstes",
     "check_not_found": "Nicht in Ihren Filterlisten enthalten",
     "client_confirm_block": "Möchten Sie den Client „{{ip}}” wirklich sperren?",
     "client_confirm_unblock": "Möchten Sie den Client „{{ip}}” wirklich entsperren?",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Anklicken, um Abfragen anzuzeigen",
     "port_53_faq_link": "Port 53 wird oft von Diensten wie „DNSStubListener” oder „systemresolved” belegt. Bitte lesen Sie <0>diese Anweisung</0>, wie dies behoben werden kann.",
     "adg_will_drop_dns_queries": "AdGuard Home wird alle DNS-Abfragen von diesem Client verwerfen.",
-    "client_not_in_allowed_clients": "Diese Anwendung ist nicht erlaubt, weil diese nicht in der Liste „Erlaubte Anwendungen” aufgeführt ist.",
     "experimental": "Experimentell"
 }

client/src/__locales/en.json

@@ -32,7 +32,6 @@
     "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",
     "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",
@@ -116,7 +115,7 @@
     "average_processing_time": "Average processing time",
     "average_processing_time_hint": "Average time in milliseconds on processing a DNS request",
     "block_domain_use_filters_and_hosts": "Block domains using filters and hosts files",
-    "filters_block_toggle_hint": "You can setup blocking rules in the <a>Filters</a> settings.",
+    "filters_block_toggle_hint": "You can setup blocking rules in the <a href='#filters'>Filters</a> settings.",
     "use_adguard_browsing_sec": "Use AdGuard browsing security web service",
     "use_adguard_browsing_sec_hint": "AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.",
     "use_adguard_parental": "Use AdGuard parental control web service",
@@ -250,13 +249,8 @@
     "blocking_ipv6": "Blocking IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "Client ID",
-    "client_id_placeholder": "Enter client ID",
-    "client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
     "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
     "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
-    "download_mobileconfig": "Download configuration file",
     "plain_dns": "Plain DNS",
     "form_enter_rate_limit": "Enter rate limit",
     "rate_limit": "Rate limit",
@@ -275,7 +269,7 @@
     "source_label": "Source",
     "found_in_known_domain_db": "Found in the known domains database.",
     "category_label": "Category",
-    "rule_label": "Rule(s)",
+    "rule_label": "Rule",
     "list_label": "List",
     "unknown_filter": "Unknown filter {{filterId}}",
     "known_tracker": "Known tracker",
@@ -336,7 +330,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 or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
+    "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
     "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",
@@ -392,7 +386,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 or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
+    "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>",
     "form_enter_ip": "Enter IP",
     "form_enter_mac": "Enter MAC",
     "form_enter_id": "Enter identifier",
@@ -424,7 +418,7 @@
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_3": "<0>Here's a list of software you can use.</0>",
-    "setup_dns_privacy_4": "On an iOS 14 or macOS Big Sur device you can download special '.mobileconfig' file that adds <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> servers to the DNS settings.",
+    "setup_dns_privacy_4": "On an iOS 14 or MacOS Big Sur device you can download special '.mobileconfig' file that adds <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> servers to the DNS settings.",
     "setup_dns_privacy_android_1": "Android 9 supports DNS-over-TLS natively. To configure it, go to Settings → Network & internet → Advanced → Private DNS and enter your domain name there.",
     "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> supports <1>DNS-over-HTTPS</1> and <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> adds <1>DNS-over-HTTPS</1> support to Android.",
@@ -436,7 +430,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> supports <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supports <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "You will find more implementations <0>here</0> and <1>here</1>.",
-    "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
     "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
     "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
     "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
@@ -536,6 +529,7 @@
     "check_ip": "IP addresses: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Reason: {{reason}}",
+    "check_rule": "Rule: {{rule}}",
     "check_service": "Service name: {{service}}",
     "service_name": "Service name",
     "check_not_found": "Not found in your filter lists",
@@ -593,4 +587,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"
-}
+}

client/src/__locales/es.json

@@ -1,13 +1,12 @@
 {
     "client_settings": "Configuración de clientes",
     "example_upstream_reserved": "puedes especificar el DNS de subida <0>para un dominio específico</0>",
-    "example_upstream_comment": "puedes especificar el comentario",
     "upstream_parallel": "Usar peticiones paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores de subida",
     "parallel_requests": "Peticiones paralelas",
     "load_balancing": "Balanceo de carga",
     "load_balancing_desc": "Consulta un servidor a la vez. AdGuard Home utilizará el algoritmo aleatorio ponderado para elegir el servidor más rápido y sea utilizado con más frecuencia.",
     "bootstrap_dns": "Servidores DNS de arranque",
-    "bootstrap_dns_desc": "Los servidores DNS de arranque se utilizan para resolver las direcciones IP de los resolutores DoH/DoT que especifiques como DNS de subida.",
+    "bootstrap_dns_desc": "Los servidores DNS de arranque se utilizan para resolver las direcciones IP de los resolutores DoH/DoT que usted especifique como DNS de subida.",
     "check_dhcp_servers": "Comprobar si hay servidores DHCP",
     "save_config": "Guardar configuración",
     "enabled_dhcp": "Servidor DHCP habilitado",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Formato IP no válido",
     "form_error_mac_format": "Formato MAC no válido",
     "form_error_client_id_format": "Formato de ID de cliente no válido",
-    "form_error_server_name": "Nombre de servidor no válido",
     "form_error_positive": "Debe ser mayor que 0",
     "form_error_negative": "Debe ser igual o mayor que 0",
     "range_end_error": "Debe ser mayor que el inicio de rango",
@@ -51,7 +49,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",
@@ -116,7 +114,7 @@
     "average_processing_time": "Tiempo promedio de procesamiento",
     "average_processing_time_hint": "Tiempo promedio en milisegundos al procesar una petición DNS",
     "block_domain_use_filters_and_hosts": "Bloquear dominios usando filtros y archivos hosts",
-    "filters_block_toggle_hint": "Puedes configurar las reglas de bloqueo en la configuración de <a>filtros</a>.",
+    "filters_block_toggle_hint": "Puedes configurar las reglas de bloqueo en la configuración de <a href='#filters'>filtros</a>.",
     "use_adguard_browsing_sec": "Usar el servicio web de seguridad de navegación de AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home comprobará si el dominio está en la lista negra del servicio web de seguridad de navegación. Utilizará la API de búsqueda amigable con la privacidad para realizar la comprobación: solo se envía al servidor un prefijo corto del nombre de dominio con hash SHA256.",
     "use_adguard_parental": "Usar el control parental de AdGuard",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Bloqueo de IPv6",
     "dns_over_https": "DNS mediante HTTPS",
     "dns_over_tls": "DNS mediante TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID de cliente",
-    "client_id_placeholder": "Ingresa tu ID de cliente",
-    "client_id_desc": "Varios clientes se pueden identificar mediante un ID de cliente especial. <a>Aquí</a> puede aprender más sobre cómo identificar clientes.",
-    "download_mobileconfig_doh": "Descargar .mobileconfig para DNS mediante HTTPS",
-    "download_mobileconfig_dot": "Descargar .mobileconfig para DNS mediante TLS",
-    "download_mobileconfig": "Descargar el archivo de configuración",
     "plain_dns": "DNS simple",
     "form_enter_rate_limit": "Ingresa el límite de cantidad",
     "rate_limit": "Límite de cantidad",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Número de peticiones por segundo que un solo cliente puede hacer (establecerlo en 0 significa ilimitado)",
     "blocking_ipv4_desc": "Dirección IP devolverá una petición A bloqueada",
     "blocking_ipv6_desc": "Dirección IP devolverá una petición AAAA bloqueada",
-    "blocking_mode_default": "Predeterminado: Responde con dirección IP cero (0.0.0.0 para A; :: para AAAA) cuando está bloqueado por la regla de estilo Adblock; responde con la dirección IP especificada en la regla cuando está bloqueado por una regla de estilo /etc/hosts",
+    "blocking_mode_default": "Predeterminado: Responde con REFUSED cuando está bloqueado por la regla de estilo Adblock; responde con la dirección IP especificada en la regla cuando está bloqueado por una regla de estilo /etc/hosts",
     "blocking_mode_refused": "REFUSED: Responde con el código REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Responde con el código NXDOMAIN",
     "blocking_mode_null_ip": "IP nulo: Responde con dirección IP cero (0.0.0.0 para A; :: para AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Fuente",
     "found_in_known_domain_db": "Encontrado en la base de datos de dominios conocidos.",
     "category_label": "Categoría",
-    "rule_label": "Regla(s)",
+    "rule_label": "Regla",
     "list_label": "Lista",
     "unknown_filter": "Filtro desconocido {{filterId}}",
     "known_tracker": "Rastreador conocido",
@@ -300,7 +291,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",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Configuración de cifrado guardado",
     "encryption_server": "Nombre del servidor",
     "encryption_server_enter": "Ingresa el nombre del dominio",
-    "encryption_server_desc": "Para utilizar HTTPS, debes ingresar el nombre del servidor que coincida con tu certificado SSL o certificado Wildcard. Si el campo no está establecido, el servidor aceptará conexiones TLS para cualquier dominio.",
+    "encryption_server_desc": "Para utilizar HTTPS, debes ingresar el nombre del servidor que coincida con tu certificado SSL.",
     "encryption_redirect": "Redireccionar a HTTPS automáticamente",
     "encryption_redirect_desc": "Si está marcado, AdGuard Home redireccionará automáticamente de HTTP a las direcciones HTTPS.",
     "encryption_https": "Puerto HTTPS",
@@ -392,7 +383,7 @@
     "client_edit": "Editar cliente",
     "client_identifier": "Identificador",
     "ip_address": "Dirección IP",
-    "client_identifier_desc": "Los clientes pueden ser identificados por la dirección IP, MAC, CIDR o un especial ID de cliente (puede ser utilizado para DoT/DoH/DoQ). <0>Aquí</0> puede obtener más información sobre cómo identificar clientes.",
+    "client_identifier_desc": "Los clientes pueden ser identificados por la dirección IP, MAC y CIDR. Tenga en cuenta que el uso de MAC como identificador solo es posible si AdGuard Home también es un <0>servidor DHCP</0>",
     "form_enter_ip": "Ingresa la IP",
     "form_enter_mac": "Ingresa la MAC",
     "form_enter_id": "Ingresa el identificador",
@@ -423,8 +414,7 @@
     "dns_privacy": "DNS cifrado",
     "setup_dns_privacy_1": "<0>DNS mediante TLS:</0> Utiliza la cadena <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS mediante HTTPS:</0> Utiliza la cadena <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Aquí hay una lista de software que puedes usar.</0>",
-    "setup_dns_privacy_4": "En un dispositivo iOS 14 o macOS Big Sur puedes descargar el archivo especial '.mobileconfig' que añade servidores <highlight>DNS mediante HTTPS</highlight> o <highlight>DNS mediante TLS</highlight> a la configuración del DNS.",
+    "setup_dns_privacy_3": "<0>Tenga en cuenta que los protocolos DNS cifrados solo son compatibles con Android 9. Por lo tanto, necesita instalar software adicional para otros sistemas operativos.</0><0>Aquí hay una lista de software que puedes usar.</0>",
     "setup_dns_privacy_android_1": "Android 9 soporta DNS mediante TLS de forma nativa. Para configurarlo, ve a Configuración → Red e Internet → Avanzado → DNS privado e ingresa el nombre del dominio allí.",
     "setup_dns_privacy_android_2": "<0>AdGuard para Android</0> soporta <1>DNS mediante HTTPS</1> y <1>DNS mediante TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> añade soporte a Android para <1>DNS mediante HTTPS</1>.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> soporta <1>DNS mediante HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> soporta <1>DNS mediante HTTPS</1>.",
     "setup_dns_privacy_other_5": "Encontrarás más implementaciones <0>aquí</0> y <1>aquí</1>.",
-    "setup_dns_privacy_ioc_mac": "La configuración de iOS y macOS ",
     "setup_dns_notice": "Para utilizar <1>DNS mediante HTTPS</1> o <1>DNS mediante TLS</1>, debes <0>configurar el cifrado</0> en la configuración de AdGuard Home.",
     "rewrite_added": "Reescritura DNS para \"{{key}}\" añadido correctamente",
     "rewrite_deleted": "Reescritura DNS para \"{{key}}\" eliminado correctamente",
@@ -536,8 +525,8 @@
     "check_ip": "Direcciones IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Razón: {{reason}}",
+    "check_rule": "Regla: {{rule}}",
     "check_service": "Nombre del servicio: {{service}}",
-    "service_name": "Nombre del servicio",
     "check_not_found": "No se ha encontrado en tus listas de filtros",
     "client_confirm_block": "¿Está seguro de que desea bloquear al cliente \"{{ip}}\"?",
     "client_confirm_unblock": "¿Está seguro de que desea desbloquear al cliente \"{{ip}}\"?",
@@ -572,11 +561,11 @@
     "cache_size_desc": "Tamaño de la caché DNS (en bytes)",
     "cache_ttl_min_override": "Anular TTL mínimo",
     "cache_ttl_max_override": "Anular TTL máximo",
-    "enter_cache_size": "Ingresa el tamaño de la caché (bytes)",
-    "enter_cache_ttl_min_override": "Ingresa el TTL mínimo (en segundos)",
-    "enter_cache_ttl_max_override": "Ingresa el TTL máximo (en segundos)",
-    "cache_ttl_min_override_desc": "Amplia el corto tiempo de vida de los valores recibidos del servidor DNS de subida al almacenar en caché las respuestas DNS",
-    "cache_ttl_max_override_desc": "Establece un valor de tiempo de vida máximo para las entradas en la caché DNS",
+    "enter_cache_size": "Ingresa el tamaño de la caché",
+    "enter_cache_ttl_min_override": "Ingresa el TTL mínimo",
+    "enter_cache_ttl_max_override": "Ingresa el TTL máximo",
+    "cache_ttl_min_override_desc": "Anula el valor TTL (mínimo) recibido del servidor DNS de subida",
+    "cache_ttl_max_override_desc": "Anula el valor TTL (máximo) recibido del servidor DNS de subida",
     "ttl_cache_validation": "El valor TTL mínimo de la caché debe ser menor o igual al valor máximo",
     "filter_category_general": "General",
     "filter_category_security": "Seguridad",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Clic para ver las consultas",
     "port_53_faq_link": "El puerto 53 suele estar ocupado por los servicios \"DNSStubListener\" o \"systemd-resolved\". Por favor lee <0>esta instrucción</0> sobre cómo resolver esto.",
     "adg_will_drop_dns_queries": "AdGuard Home descartará todas las consultas DNS de este cliente.",
-    "client_not_in_allowed_clients": "El cliente no está permitido porque no está en la lista de \"Clientes permitidos\".",
     "experimental": "experimental"
 }

client/src/__locales/fa.json

@@ -106,7 +106,7 @@
     "average_processing_time": "میانگین زمان پردازش",
     "average_processing_time_hint": "زمان میانگین بر هزارم ثانیه در پردازش درخواست DNS",
     "block_domain_use_filters_and_hosts": "مسدودسازی دامنه ها توسط فیلترها و فایل های میزبان",
-    "filters_block_toggle_hint": "میتوانید دستورات مسدودسازی را در تنظیمات <a>فیلترها</a> راه اندازی کنید.",
+    "filters_block_toggle_hint": "میتوانید دستورات مسدودسازی را در تنظیمات <a href='#filters'>فیلترها</a> راه اندازی کنید.",
     "use_adguard_browsing_sec": "استفاده از سرویس وب امنیت وب گردی AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home بررسی می کند اگر دامنه در سرویس وب امنیت وب گردی در لیست سیاه است.آن از اِی پی آی دارای حریم خصوصی برای بررسی استفاده می کند:فقط پیشوند کوتاه نام دامنه هش SHA256 به سرور ارسال خواهد شد.",
     "use_adguard_parental": "از سرویس وب نظارت والدین AdGuard استفاده کن",
@@ -232,6 +232,7 @@
     "edns_cs_desc": "اگر فعال باشد،AdGuard Home زیرشبکه های کلاینت ها را به سرورهای DNS می فرستد.",
     "blocking_ipv4_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده A",
     "blocking_ipv6_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده AAAA",
+    "blocking_mode_default": "پیش فرض: وقتی مسدود شود با دستور سبک-مسدودساز تبلیغ REFUSED پاسخ میدهد،پاسخ با آدرس آی پی تعیین شده در دستور وقتی با دستور /etc/hosts-style rule مسدود شود",
     "blocking_mode_nxdomain": "NXDOMAIN: پاسخ با کُد NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: پاسخ با آدرس آی پی صفر(0.0.0.0 برای A; :: برای AAAA)",
     "blocking_mode_custom_ip": "آی پی دستی: پاسخ با آدرس آی پی دستی تنظیم شده",
@@ -239,6 +240,7 @@
     "source_label": "منبع",
     "found_in_known_domain_db": "در پایگاه داده دامنه های شناخته شده پیدا شد",
     "category_label": "دسته بندی",
+    "rule_label": "دستور",
     "list_label": "لیست",
     "unknown_filter": "فیلتر ناشناخته {{filterId}}",
     "known_tracker": "ردیاب های شناخته شده",
@@ -299,6 +301,7 @@
     "encryption_config_saved": "پیکربندی رمزگذاری ذخیره شد",
     "encryption_server": "نام سرور",
     "encryption_server_enter": "نام دامنه خود را وارد کنید",
+    "encryption_server_desc": "به منظور استفاده از HTTPS،شما باید نام سرور مطابق با گواهینامه اِس اِس اِل را وارد کنید.",
     "encryption_redirect": "تغییر مسیر خودکار به HTTPS",
     "encryption_redirect_desc": "اگر انتخاب شده باشد،AdGuard Home  خودکار شما را از آدرس HTTP به HTTPS منتقل می کند",
     "encryption_https": "پورت HTTPS",
@@ -352,6 +355,7 @@
     "client_edit": "ویرایش کلاینت",
     "client_identifier": "احراز با",
     "ip_address": "آدرس آی پی",
+    "client_identifier_desc": "کلاینت میتواند با آدرس آی پی یا آدرس مَک احراز شود. لطفا توجه کنید،که استفاده از مَک بعنوان عامل احراز زمانی امکان دارد که  AdGuard Home نیز <0>سرور DHCP </0> باشد",
     "form_enter_ip": "آی پی را وارد کنید",
     "form_enter_mac": "مَک را وارد کنید",
     "form_enter_id": "خطای احرازکننده",
@@ -382,6 +386,7 @@
     "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>لطفا توجه کنید که پروتکل های رمزگذاری شده DNS فقط در آندروئید 9 پشتیبانی می شود. پس برای سیستم عامل های دیگر نیاز است که برنامه دیگری نصب کنید.</0><0>در اینجا میتوانید لیست نرم افزارهای قابل استفاده را ببینید.</0>",
     "setup_dns_privacy_android_1": "آندروئید 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> قابلیت <1>DNS-over-HTTPS</1> را به آندروئید اضافه می کند.",
@@ -484,6 +489,7 @@
     "check_ip": "آدرس آی پی: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "علت: {{reason}}",
+    "check_rule": "دستور: {{rule}}",
     "check_service": "نام سرویس: {{service}}",
     "check_not_found": "در لیست فیلترهای شما یافت نشد",
     "client_confirm_block": "آیا واقعا میخواهید کلاینت \"{{ip}}\" را مسدود کنید؟",

client/src/__locales/fr.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Paramètres du client",
     "example_upstream_reserved": "Vous pouvez spécifier un DNS en amont <0>pour un/des domaine(s) spécifique(s)</0>",
-    "example_upstream_comment": "Vous pouvez spécifier un commentaire",
     "upstream_parallel": "Utiliser des requêtes parallèles pour accélérer la résolution en requêtant simultanément tous les serveurs upstream",
     "parallel_requests": "Demandes en parallèle",
     "load_balancing": "Équilibrage de charge",
@@ -12,8 +11,6 @@
     "save_config": "Sauvegarder la configuration",
     "enabled_dhcp": "Serveur DHCP activé",
     "disabled_dhcp": "Serveur DHCP désactivé",
-    "unavailable_dhcp": "Le DHCP n’est pas disponible",
-    "unavailable_dhcp_desc": "AdGuard Home ne peut pas exécuter un serveur DHCP sur votre système d’exploitation",
     "dhcp_title": "Serveur DHCP (experimental !)",
     "dhcp_description": "Si votre routeur ne fonctionne pas avec les réglages DHCP, vous pouvez utiliser le serveur DHCP par défaut d'AdGuard.",
     "dhcp_enable": "Activer le serveur DHCP",
@@ -22,20 +19,16 @@
     "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",
     "form_error_required": "Champ requis",
     "form_error_ip4_format": "Format IPv4 invalide",
     "form_error_ip6_format": "Format IPv6 invalide",
     "form_error_ip_format": "Format IPv4 invalide",
     "form_error_mac_format": "Format MAC invalide",
     "form_error_client_id_format": "Format d'ID client non valide",
-    "form_error_server_name": "Nom de serveur invalide",
     "form_error_positive": "Doit être supérieur à 0",
     "form_error_negative": "Doit être égal à 0 ou supérieur",
-    "range_end_error": "Doit être supérieur au début de la gamme",
     "dhcp_form_gateway_input": "IP de la passerelle",
     "dhcp_form_subnet_input": "Masque de sous-réseau",
     "dhcp_form_range_title": "Rangée des adresses IP",
@@ -93,7 +86,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",
@@ -116,7 +109,7 @@
     "average_processing_time": "Temps moyen de traitement",
     "average_processing_time_hint": "Temps moyen (en millisecondes) de traitement d'une requête DNS",
     "block_domain_use_filters_and_hosts": "Bloquez les domaines à l'aide des filtres et fichiers hosts",
-    "filters_block_toggle_hint": "Vous pouvez configurer les règles de filtrage dans les paramètres des <a>Filtres</a>.",
+    "filters_block_toggle_hint": "Vous pouvez configurer les règles de filtrage dans les paramètres des <a href='#filters'>Filtres</a>.",
     "use_adguard_browsing_sec": "Utilisez le service Sécurité de navigation d'AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home va vérifier si le domaine est dans la liste noire du service de sécurité de navigation. Pour cela il va utiliser un lookup API discret : le préfixe court du hash du nom de domaine SHA256 sera envoyé au serveur.",
     "use_adguard_parental": "Utiliser le contrôle parental d'AdGuard",
@@ -134,8 +127,6 @@
     "encryption_settings": "Paramètres de chiffrement",
     "dhcp_settings": "Paramètres DHCP",
     "upstream_dns": "Serveurs DNS upstream",
-    "upstream_dns_help": "Saisissez les adresses des serveurs, une par ligne. <a>En savoir plus</a> sur la configuration des serveurs DNS en amont.",
-    "upstream_dns_configured_in_file": "Configuré dans {{path}}",
     "test_upstream_btn": "Tester les upstreams",
     "upstreams": "En amont",
     "apply_btn": "Appliquer",
@@ -179,17 +170,16 @@
     "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é",
-    "example_upstream_doq": "<0>DNS-over-QUIC</0> chiffré",
     "example_upstream_sdns": "vous pouvez utiliser <0>DNS Stamps</0> pour <1>DNSCrypt</1> ou les resolveurs <2>DNS_over_HTTPS</2>",
     "example_upstream_tcp": "DNS classique (au-dessus de TCP)",
     "all_lists_up_to_date_toast": "Toutes les listes sont déjà à jour",
@@ -198,10 +188,6 @@
     "dns_test_not_ok_toast": "Impossible d'utiliser le serveur \"{{key}}\": veuillez vérifier si le nom saisi est bien correct",
     "unblock": "Débloquer",
     "block": "Bloquer",
-    "disallow_this_client": "Interdire ce client",
-    "allow_this_client": "Autoriser ce client",
-    "block_for_this_client_only": "Bloquer uniquement pour ce client",
-    "unblock_for_this_client_only": "Débloquer uniquement pour ce client",
     "time_table_header": "Temps",
     "date": "Date",
     "domain_name_table_header": "Nom de domaine",
@@ -250,22 +236,14 @@
     "blocking_ipv6": "Blocage IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID du client",
-    "client_id_placeholder": "Saisissez le ID du client",
-    "client_id_desc": "Les clients différents peuvent être identifiés par aide d'un ID client spécial. Vous trouverez plus d'information sur l'identification des clients <a>ici</a> .",
-    "download_mobileconfig_doh": "Télécharger .mobileconfig pour DNS-sur-HTTPS",
-    "download_mobileconfig_dot": "Télécharger .mobileconfig pour DNS-sur-TLS",
-    "download_mobileconfig": "Télécharger le fichier de configuration",
     "plain_dns": "DNS brut",
     "form_enter_rate_limit": "Entrez la limite de taux",
     "rate_limit": "Limite de taux",
     "edns_enable": "Activer le sous-réseau du client EDNS",
     "edns_cs_desc": "Si activé, AdGuard Home enverra les sous-réseaux des clients aux serveurs DNS.",
-    "rate_limit_desc": "Le nombre de requêtes par seconde qu’un seul client est autorisé à faire (le réglage 0 fait illimité)",
     "blocking_ipv4_desc": "Adresse IP à renvoyer pour une demande A bloquée",
     "blocking_ipv6_desc": "Adresse IP à renvoyer pour une demande AAAA bloquée",
-    "blocking_mode_default": "Par défaut : Répondre avec adresse IP zéro (0.0.0.0 pour A; :: pour AAAA) lorsque bloqué par la règle de style Adblock; répondre avec l’adresse IP spécifiée dans la règle lorsque bloquée par la règle du style /etc/hosts",
+    "blocking_mode_default": "Par défaut : Répondre avec REFUSED lorsque bloqué par la règle de style Adblock; répondre avec l’adresse IP spécifiée dans la règle lorsque bloquée par la règle de style /etc/hosts",
     "blocking_mode_refused": "REFUSED: Répondre avec le code REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN : Répondre avec le code NXDOMAIN",
     "blocking_mode_null_ip": "IP nulle : Répondre avec une adresse IP nulle (0.0.0.0 pour A; :: pour AAAA)",
@@ -275,7 +253,7 @@
     "source_label": "Source",
     "found_in_known_domain_db": "Trouvé dans la base de données des domaines connus",
     "category_label": "Catégorie",
-    "rule_label": "Règle(s)",
+    "rule_label": "Règle",
     "list_label": "Liste",
     "unknown_filter": "Filtre inconnu {{filterId}}",
     "known_tracker": "Pisteur connu",
@@ -336,15 +314,13 @@
     "encryption_config_saved": "Configuration de chiffrement enregistrée",
     "encryption_server": "Nom du serveur",
     "encryption_server_enter": "Entrez votre nom de domaine",
-    "encryption_server_desc": "Pour utiliser HTTPS, vous devez saisir le nom du serveur qui correspond à votre certificat SSL ou wildcard. Si le champ n'est pas configuré, les connexions TLS pour tous les domaines seront acceptées.",
+    "encryption_server_desc": "Pour utiliser HTTPS, vous devez entrer le nom du serveur qui correspond à votre certificat SSL.",
     "encryption_redirect": "Redirection automatiquement vers HTTPS",
     "encryption_redirect_desc": "Si coché, AdGuard Home vous redirigera automatiquement d'adresses HTTP vers HTTPS.",
     "encryption_https": "Port HTTPS",
     "encryption_https_desc": "Si le port HTTPS est configuré, l'interface administrateur de AdGuard Home sera accessible via HTTPS et fournira aussi un service DNS-over-HTTPS sur l'emplacement '/dns-query'.",
     "encryption_dot": "Port DNS-over-TLS",
     "encryption_dot_desc": "Si ce port est configuré, AdGuard Home exécutera un serveur DNS-over-TLS sur ce port.",
-    "encryption_doq": "Port DNS sur QUIC",
-    "encryption_doq_desc": "Si ce port est configuré, AdGuard Home exécutera un serveur DNS sur QUIC sur ce port. Ceci est expérimental et possiblement pas entièrement fiable. Peu de clients le prennent en charge actuellement.",
     "encryption_certificates": "Certificats",
     "encryption_certificates_desc": "Pour utiliser le chiffrement, vous devez fournir une chaîne de certificats SSL valide pour votre domaine. Vous pouvez en obtenir une gratuitement sur <0>{{link}}</0> ou vous pouvez en acheter une via les Autorités de Certification de confiance.",
     "encryption_certificates_input": "Copiez/coller vos certificats encodés PEM ici.",
@@ -392,7 +368,7 @@
     "client_edit": "Modifier le client",
     "client_identifier": "Identifiant",
     "ip_address": "Adresse IP",
-    "client_identifier_desc": "Les clients peuvent être identifiés par les adresses IP, CIDR, MAC ou un ID client spécial (qui peut être utilisé pour DoT/DoH/DoQ). Vous trouverez plus d'information sur l'identification des clients <0>ici</0> .",
+    "client_identifier_desc": "Les clients peuvent être identifiés par les adresses IP ou MAC. Veuillez noter que l'utilisation de l'adresse MAC comme identifiant est possible uniquement si AdGuard Home est aussi un <0>serveur DHCP</0>",
     "form_enter_ip": "Saisissez l'IP",
     "form_enter_mac": "Saisissez MAC",
     "form_enter_id": "Entrer identifiant",
@@ -423,8 +399,7 @@
     "dns_privacy": "Confidentialité DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS :</0> Utiliser le string <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS :</0> Utiliser le string <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Voici une liste de logiciels que vous pouvez utiliser.</0>",
-    "setup_dns_privacy_4": "Si vous utilisez un appareil sur iOS 14 ou macOS Big Sur, vous pouvez télécharger un fichier spécial '.mobileconfig' pour ajouter les serveurs <highlight>DNS-sur-HTTPS</highlight> ou <highlight>DNS-sur-TLS</highlight> aux configurations DNS.",
+    "setup_dns_privacy_3": "<0>Veuillez noter que les protocoles DNS chiffrés sont supportés que sur Android 9. Donc vous devez installer un logiciel complémentaire pour les autres systèmes opérationnels.</0><0>Voici une liste de logiciels que vous pouvez utiliser.</0>",
     "setup_dns_privacy_android_1": "Android 9 supporte nativement le DNS-over-TLS. Pour le configurer, allez dans Paramètres → Réseau et Internet → Avancés → DNS privé et saisissez votre nom de domaine ici.",
     "setup_dns_privacy_android_2": "<0>AdGuard pour Android</0> supporte le <1>DNS-over-HTTPS</1> et le <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> ajoute le support <1>DNS-over-HTTPS</1> sur Android.",
@@ -436,8 +411,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_privacy_ioc_mac": "Configuration sur iOS et macOS",
-    "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",
@@ -506,7 +480,6 @@
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Apprenez-en plus</0> à propos de la création de vos propres listes de blocage d’hôtes.",
     "blocked_by_response": "Bloqué par un CNAME ou une réponse IP",
-    "blocked_by_cname_or_ip": "Bloqué par CNAME ou adresse IP",
     "try_again": "Réessayer",
     "domain_desc": "Saisissez le nom de domaine ou le caractère générique que vous souhaitez réécrire.",
     "example_rewrite_domain": "réécrivez les réponses pour ce nom de domaine uniquement.",
@@ -536,8 +509,8 @@
     "check_ip": "Adresses IP : {{ip}}",
     "check_cname": "CNAME : {{cname}}",
     "check_reason": "Raison : {{reason}}",
+    "check_rule": "Règle : {{rule}}",
     "check_service": "Nom du service : {{service}}",
-    "service_name": "Nom du service",
     "check_not_found": "Introuvable dans vos listes de filtres",
     "client_confirm_block": "Voulez-vous vraiment bloquer le client « {{ip}} »?",
     "client_confirm_unblock": "Voulez-vous vraiment débloquer le client « {{ip}} »?",
@@ -555,7 +528,6 @@
     "dnssec_enable": "Activer DNSSEC",
     "dnssec_enable_desc": "Définir l’indicateur DNSSEC dans les requêtes DNS sortantes et vérifier le résultat (résolveur compatible DNSSEC requis)",
     "validated_with_dnssec": "Validé avec DNSSEC",
-    "all_queries": "Toutes les requêtes",
     "show_blocked_responses": "Bloqué",
     "show_whitelisted_responses": "Ajouté à la liste blanche",
     "show_processed_responses": "Traité",
@@ -572,12 +544,10 @@
     "cache_size_desc": "Taille du cache DNS (en bytes)",
     "cache_ttl_min_override": "Remplacer le TTL minimum",
     "cache_ttl_max_override": "Remplacer le TTL maximum",
-    "enter_cache_size": "Entrer la taille du cache (octets)",
-    "enter_cache_ttl_min_override": "Entrez le TTL minimum (secondes)",
-    "enter_cache_ttl_max_override": "Entrez le TTL maximum (secondes)",
-    "cache_ttl_min_override_desc": "Prolonger les valeurs courtes de durée de vie (en secondes) reçues du serveur en amont lors de la mise en cache des réponses DNS",
-    "cache_ttl_max_override_desc": "Établir la valeur de durée de vie TTL maximale (en secondes) pour les saisies dans le cache du DNS",
-    "ttl_cache_validation": "La valeur TTL minimale du cache doit être inférieure ou égale à la valeur maximale",
+    "enter_cache_size": "Entrer la taille du cache",
+    "enter_cache_ttl_min_override": "Entrez le TTL minimum",
+    "enter_cache_ttl_max_override": "Entrez le TTL maximum",
+    "cache_ttl_max_override_desc": "Remplacer la valeur TTL (maximale) reçue du serveur en amont",
     "filter_category_general": "Général",
     "filter_category_security": "Sécurité",
     "filter_category_regional": "Régional",
@@ -586,11 +556,6 @@
     "filter_category_security_desc": "Listes spécialisées dans le blocage de logiciels malveillants, d’hameçonnage ou de domaines frauduleux",
     "filter_category_regional_desc": "Listes axées sur les annonces régionales et les serveurs de pistage",
     "filter_category_other_desc": "Autres listes noires",
-    "setup_config_to_enable_dhcp_server": "Configurer les paramètres pour activer le serveur DHCP",
-    "original_response": "Réponse originale",
     "click_to_view_queries": "Cliquez pour voir les requêtes",
-    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème.",
-    "adg_will_drop_dns_queries": "AdGuard Home ignorera toutes les requêtes DNS de ce client.",
-    "client_not_in_allowed_clients": "Le client n’est pas autorisé car il ne figure pas dans la liste « Clients autorisés ».",
-    "experimental": "Expérimental"
+    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème."
 }

client/src/__locales/hr.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Postavke klijenta",
     "example_upstream_reserved": "VI možete odrediti DNS upstream-ove <0>za određene domene</0>",
-    "example_upstream_comment": "Možete odrediti komentar",
     "upstream_parallel": "Koristi paralelne upite kako bi ubrzali rješavanje istovremenim ispitavanjem svih upstream poslužitelja",
     "parallel_requests": "Paralelni zahtjevi",
     "load_balancing": "Load-balancing",
@@ -115,7 +114,7 @@
     "average_processing_time": "Prosječno vrijeme obrade",
     "average_processing_time_hint": "Prosječno vrijeme u milisekundama za obradu DNS zahtjeva",
     "block_domain_use_filters_and_hosts": "Blokiraj domene koristeći filtre ili hosts datoteke",
-    "filters_block_toggle_hint": "Pravila blokiranja možete postaviti u postavkama <a>filtara</a>.",
+    "filters_block_toggle_hint": "Pravila blokiranja možete postaviti u postavkama <a href='#filters'>filtara</a>.",
     "use_adguard_browsing_sec": "Koristi AdGuard uslugu zaštite pregledavanja",
     "use_adguard_browsing_sec_hint": "AdGuard Home će provjeriti nalazi li se domena na popisu nedopuštenih domena od usluge zaštite pregledavanja. Za provjeru će se koristiti API za provjeru koji poštuje vašu privatnost. Samo mali dio SHA256 hash-a od naziva domene se šalje poslužitelju.",
     "use_adguard_parental": "Koristi web uslugu AdGuard roditeljske zaštite",
@@ -249,8 +248,6 @@
     "blocking_ipv6": "Blokiranje IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": "Preuzmi .mobileconfig za DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Preuzmi .mobileconfig za DNS-over-TLS",
     "plain_dns": "Obični DNS",
     "form_enter_rate_limit": "Unesite ograničenje",
     "rate_limit": "Ograničenje",
@@ -259,7 +256,7 @@
     "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu (postavljanje na 0 znači neograničeno)",
     "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve",
     "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve",
-    "blocking_mode_default": "Zadano: Odgovori s nultom IP adresom (0.0.0.0 za A; :: za AAAA) kada ga blokira Adblock slično pravilo; odgovorite s IP adresom definiranom u pravilu kada je blokirano od /etc/hosts sličnog pravila",
+    "blocking_mode_default": "Zadano: Odgovor s REFUSED kada je blokirano od Adblock sličnog pravila; odgovor s IP adresom definiranom u pravilu kada je blokirano od /etc/hosts sličnog pravila",
     "blocking_mode_refused": "REFUSED: Odgovorite s REFUSED kôdom",
     "blocking_mode_nxdomain": "NXDOMAIN: Odgovor s NXDOMAIN kôdom",
     "blocking_mode_null_ip": "Nuliran IP: Odgovor s nuliranom IP adresom (0.0.0.0 za A; :: za AAAA)",
@@ -269,6 +266,7 @@
     "source_label": "Izvor",
     "found_in_known_domain_db": "Pronađeno u bazi poznatih domena.",
     "category_label": "Kategorija",
+    "rule_label": "Pravilo",
     "list_label": "Popis",
     "unknown_filter": "Nepoznati filtar {{filterId}}",
     "known_tracker": "Poznati pratitelj",
@@ -329,6 +327,7 @@
     "encryption_config_saved": "Spremljene postavke šifriranja",
     "encryption_server": "Naziv poslužitelja",
     "encryption_server_enter": "Unesite naziv domene",
+    "encryption_server_desc": "Kako biste koristili HTTPS, morate unijeti naziv poslužitelja koji odgovara vašem SSL certifikatu.",
     "encryption_redirect": "Automatski preusmjeri na HTTPS",
     "encryption_redirect_desc": "Ako je omogućeno, AdGuard Home će vas automatski preusmjeravati s HTTP na HTTPS adrese.",
     "encryption_https": "HTTPS port",
@@ -384,6 +383,7 @@
     "client_edit": "Uredi klijenta",
     "client_identifier": "Identifikator",
     "ip_address": "IP adresa",
+    "client_identifier_desc": "Klijenti se mogu prepoznati po IP adresi, CIDR-u ili MAC adresi. Imajte na umu da je upotreba MAC-a kao identifikatora, moguća samo ako je AdGuard Home također i <0>DHCP poslužitelj</0>",
     "form_enter_ip": "Unesite IP adresu",
     "form_enter_mac": "Unesite MAC adresu",
     "form_enter_id": "Unesi identifikator",
@@ -414,8 +414,7 @@
     "dns_privacy": "DNS privatnost",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Koristite <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Koristite <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Evo popisa programa koje možete koristiti.</0>",
-    "setup_dns_privacy_4": "Na iOS 14 ili macOS Big Sur uređaju možete preuzeti posebnu datoteku '.mobileconfig' koja dodaje <highlight>DNS-over-HTTPS</highlight> ili <highlight>DNS-over-TLS</highlight> poslužitelje u postavke DNS-a.",
+    "setup_dns_privacy_3": "<0>Imajte na umu da su šifrirani DNS protokoli podržani samo na Androidu 9. Stoga morate instalirati dodatni program za ostale operativne sustave.</0><0>Evo popisa programa koje možete koristiti.</0>",
     "setup_dns_privacy_android_1": "Android 9 nativno podržava DNS-over-TLS. Da biste ga postavili, idite na Postavke → Mreža i internet → Napredno → Privatni DNS i tamo unesite svoje naziv domene.",
     "setup_dns_privacy_android_2": "<0>AdGuard za Android</0> podržava <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> dodaje <1>DNS-over-HTTPS</1> podršku za Android.",
@@ -526,8 +525,8 @@
     "check_ip": "IP adrese: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Razlog: {{reason}}",
+    "check_rule": "Pravilo: {{rule}}",
     "check_service": "Naziv usluge: {{service}}",
-    "service_name": "Naziv usluge",
     "check_not_found": "Nije pronađeno na vašoj listi filtara",
     "client_confirm_block": "Jeste li sigurni da želite blokirati \"{{ip}}\" klijenta?",
     "client_confirm_unblock": "Jeste li sigurni da želite odblokirati \"{{ip}}\" klijenta?",
@@ -562,11 +561,11 @@
     "cache_size_desc": "Veličina DNS predmemorije (u bajtovima)",
     "cache_ttl_min_override": "Nadjačaj minimum TTL-a",
     "cache_ttl_max_override": "Nadjačaj maksimum TTL-a",
-    "enter_cache_size": "Unesite veličinu predmemorije (u bajtovima)",
-    "enter_cache_ttl_min_override": "Unesite minimalni TTL (u sekundama)",
-    "enter_cache_ttl_max_override": "Unesite maksimalni TTL (u sekundama)",
-    "cache_ttl_min_override_desc": "Povećajte kratke vrijednosti TTL-a (u sekundama) primljene od upstream poslužitelja prilikom predmemoriranja DNS odgovora",
-    "cache_ttl_max_override_desc": "Postavite maksimalnu vrijednost TTL-a (u sekundama) za zapise u DNS predmemoriju",
+    "enter_cache_size": "Unesite veličinu predmemorije",
+    "enter_cache_ttl_min_override": "Unesite minimalni TTL",
+    "enter_cache_ttl_max_override": "Unesite maksimalni TTL",
+    "cache_ttl_min_override_desc": "Nadjačaj TTL vrijednost (minimum) dobivenu od upstream poslužitelja",
+    "cache_ttl_max_override_desc": "Nadjačaj TTL vrijednost (maksimum) dobivenu od upstream poslužitelja",
     "ttl_cache_validation": "Minimalna vrijednost TTL predmemorije mora biti manja ili jednaka maksimalnoj vrijednosti",
     "filter_category_general": "Općenito",
     "filter_category_security": "Sigurnost",
@@ -581,6 +580,5 @@
     "click_to_view_queries": "Kliknite za pregled upita",
     "port_53_faq_link": "Port 53 često zauzimaju usluge \"DNSStubListener\" ili \"systemd-resolved\". Molimo pročitajte <0>ove upute</0> o tome kako to riješiti.",
     "adg_will_drop_dns_queries": "AdGuard Home odbaciti će sve DNS upite od ovog klijenta.",
-    "client_not_in_allowed_clients": "Klijent nije dopušten jer nije na popisu \"Dopuštenih klijenata\".",
     "experimental": "Eksperimentalno"
 }

client/src/__locales/hu.json

@@ -1,13 +1,12 @@
 {
     "client_settings": "Kliens beállítások",
     "example_upstream_reserved": "Megadhat egy DNS kiszolgálót <0>egy adott domainhez vagy domainekhez</0>",
-    "example_upstream_comment": "Megadhat egy megjegyzést",
     "upstream_parallel": "Használjon párhuzamos lekéréseket a domainek feloldásának felgyorsításához az összes upstream kiszolgálóra való egyidejű lekérdezéssel",
     "parallel_requests": "Párhuzamos lekérések",
     "load_balancing": "Terheléselosztás",
     "load_balancing_desc": "Egyszerre csak egy szerverről történjen lekérdezés. Az AdGuard Home egy súlyozott, véletlenszerű algoritmust fog használni a megfelelő szerver kiválasztására, így a leggyorsabb szervert gyakrabban fogja használni.",
     "bootstrap_dns": "Bootstrap DNS kiszolgálók",
-    "bootstrap_dns_desc": "A Bootstrap DNS szerverek a DoH/DoT feloldók IP-címeinek feloldására szolgálnak.",
+    "bootstrap_dns_desc": "Bootstrap DNS szerverek feloldják a megadott DoH/DoT feloldók IP-címeit.",
     "check_dhcp_servers": "DHCP szerverek keresése",
     "save_config": "Konfiguráció mentése",
     "enabled_dhcp": "DHCP szerver engedélyezve",
@@ -88,12 +87,12 @@
     "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",
+    "dns_query": "DNS lekérdezések",
     "blocked_by": "<0>Szűrők által blokkolt</0>",
     "stats_malware_phishing": "Blokkolt kártevő/adathalászat",
-    "stats_adult": "Blokkolt felnőtt tartalom",
+    "stats_adult": "Blokkolva a felnőtt tartalmak által",
     "stats_query_domain": "Leglátogatottabb domainek",
     "for_last_24_hours": "az utóbbi 24 órában",
     "for_last_days": "az utóbbi {{count}} napban",
@@ -115,7 +114,7 @@
     "average_processing_time": "Átlagos feldolgozási idő",
     "average_processing_time_hint": "A DNS lekérdezések feldolgozásához szükséges átlagos idő milliszekundumban",
     "block_domain_use_filters_and_hosts": "Domainek blokkolása szűrők és hosztfájlok használatával",
-    "filters_block_toggle_hint": "A <a> szűrőbeállításoknál</a> megadhatja a blokkolási szabályokat.",
+    "filters_block_toggle_hint": "A <a href='#filters'> szűrőbeállításoknál</a> megadhatja a blokkolási szabályokat.",
     "use_adguard_browsing_sec": "Használja az AdGuard böngészési biztonság webszolgáltatását",
     "use_adguard_browsing_sec_hint": "Az AdGuard Home ellenőrzi, hogy a böngészési biztonsági modul a domaint tiltólistára tette-e. Az ellenőrzés elvégzéséhez egy adatvédelmet tiszteletben tartó API-t fog használni: a domain név egy rövid előtagját elküldi SHA256 kódolással a szerver felé.",
     "use_adguard_parental": "Használja az AdGuard szülői felügyelet webszolgáltatását",
@@ -133,8 +132,6 @@
     "encryption_settings": "Titkosítási beállítások",
     "dhcp_settings": "DHCP beállítások",
     "upstream_dns": "Upstream DNS-kiszolgálók",
-    "upstream_dns_help": "Adja meg a szerverek címeit soronként. <a>Tudjon meg többet</a> a DNS szerverek bekonfigurálásáról.",
-    "upstream_dns_configured_in_file": "Beállítva itt: {{path}}",
     "test_upstream_btn": "Upstreamek tesztelése",
     "upstreams": "Upstream-ek",
     "apply_btn": "Alkalmaz",
@@ -188,7 +185,6 @@
     "example_upstream_regular": "hagyományos DNS (UDP felett)",
     "example_upstream_dot": "titkosított <0>DNS-over-TLS</0>",
     "example_upstream_doh": "titkosított <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "titkosított <0>DNS-over-QUIC</0>",
     "example_upstream_sdns": "használhatja a <0> DNS Stamps</0>-ot a <1>DNSCrypt</1> vagy a <2>DNS-over-HTTPS</2> feloldások érdekében",
     "example_upstream_tcp": "hagyományos DNS (TCP felett)",
     "all_lists_up_to_date_toast": "Már minden lista naprakész",
@@ -197,10 +193,6 @@
     "dns_test_not_ok_toast": "Szerver \"{{key}}\": nem használható, ellenőrizze, hogy helyesen írta-e be",
     "unblock": "Feloldás",
     "block": "Blokkolás",
-    "disallow_this_client": "Tiltás ennek a kliensnek",
-    "allow_this_client": "Engedélyezés ennek a kliensnek",
-    "block_for_this_client_only": "Tiltás csak ennek a kliensnek",
-    "unblock_for_this_client_only": "Feloldás csak ennek a kliensnek",
     "time_table_header": "Idő",
     "date": "Dátum",
     "domain_name_table_header": "Domain név",
@@ -242,25 +234,20 @@
     "blocking_mode": "Blokkolás módja",
     "default": "Alapértelmezett",
     "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
     "null_ip": "Null IP-cím",
     "custom_ip": "Egyedi IP",
     "blocking_ipv4": "IPv4 blokkolása",
     "blocking_ipv6": "IPv6 blokkolása",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": ".mobileconfig letöltése DNS-over-HTTPS-hez",
-    "download_mobileconfig_dot": ".mobileconfig letöltése DNS-over-TLS-hez",
     "plain_dns": "Egyszerű DNS",
     "form_enter_rate_limit": "Adja meg a kérések maximális számát",
     "rate_limit": "Kérések korlátozása",
     "edns_enable": "EDNS kliens alhálózat engedélyezése",
     "edns_cs_desc": "Ha engedélyezve van, az AdGuard Home a kliensek alhálózatait küldi el a DNS-kiszolgálóknak.",
-    "rate_limit_desc": "Maximálisan hány kérést küldhet egy kliens másodpercenként (0: korlátlan)",
     "blocking_ipv4_desc": "A blokkolt A kéréshez visszaadandó IP-cím",
     "blocking_ipv6_desc": "A blokkolt AAAA kéréshez visszaadandó IP-cím",
-    "blocking_mode_default": "Alapértelmezés: Válaszoljon nulla IP-címmel (vagyis 0.0.0.0 az A-hoz, :: pedig az AAAA-hoz), amikor a blokkolás egy adblock-stílusú szabállyal történik; illetve válaszoljon egy, a szabály által meghatározott IP címmel, amikor a blokkolás egy /etc/hosts stílusú szabállyal történik",
-    "blocking_mode_refused": "REFUSED: Válaszoljon REFUSED kóddal",
+    "blocking_mode_default": "Alapértelmezés: Adblock-stílusú szabály esetén REFUSED válasz küldése, /etc/hosts-stílusú szabály esetén pedig a szabályban meghatározott IP-címmel való válasz küldése",
     "blocking_mode_nxdomain": "NXDOMAIN: Az NXDOMAIN kóddal fog válaszolni",
     "blocking_mode_null_ip": "Null IP: Nullákból álló IP-címmel válaszol (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Egyedi IP: Válasz egy kézzel beállított IP címmel",
@@ -269,11 +256,12 @@
     "source_label": "Forrás",
     "found_in_known_domain_db": "Benne van az ismert domainek listájában.",
     "category_label": "Kategória",
+    "rule_label": "Szabály",
     "list_label": "Lista",
     "unknown_filter": "Ismeretlen szűrő: {{filterId}}",
     "known_tracker": "Ismert követő",
     "install_welcome_title": "Üdvözli az AdGuard Home!",
-    "install_welcome_desc": "Az AdGuard Home egy, a teljes hálózatot lefedő DNS szerver, amely blokkolja a hirdetéseket és a nyomkövető rendszereket. Az a célja, hogy lehetővé tegye a teljes hálózat és az összes eszköz felügyeletét, emellett pedig nem igényel kliensoldali programot.",
+    "install_welcome_desc": "Az AdGuard Home egy, a teljes hálózatot lefedő hirdetés és követő blokkoló DNS szerver. Az a célja, hogy lehetővé tegye a teljes hálózat és az összes eszköz vezérlését, és nem igényel kliensoldali programot.",
     "install_settings_title": "Webes admin felület",
     "install_settings_listen": "Figyelő felület",
     "install_settings_port": "Port",
@@ -329,14 +317,13 @@
     "encryption_config_saved": "Titkosítási beállítások mentve",
     "encryption_server": "Szerver neve",
     "encryption_server_enter": "Adja meg az Ön domain címét",
+    "encryption_server_desc": "A HTTPS használatához be kell írnia egy, az SSL-tanúsítvánnyal megegyező kiszolgálónevet.",
     "encryption_redirect": "Automatikus átirányítás HTTPS kapcsolatra",
     "encryption_redirect_desc": "Ha be van jelölve, az AdGuard Home automatikusan átirányítja a HTTP kapcsolatokat a biztonságos HTTPS protokollra.",
     "encryption_https": "HTTPS port",
     "encryption_https_desc": "Ha a HTTPS port konfigurálva van, akkor az AdGuard Home admin felülete elérhető lesz a HTTPS-en keresztül, és ezenkívül DNS-over-HTTPS-t is biztosít a '/dns-query' helyen.",
     "encryption_dot": "DNS-over-TLS port",
     "encryption_dot_desc": "Ha ez a port be van állítva, az AdGuard Home DNS-over-TLS szerverként tud futni ezen a porton.",
-    "encryption_doq": "DNS-over-TLS port",
-    "encryption_doq_desc": "Ha ez a port be van állítva, akkor az AdGuard Home egy DNS-over-QUIC szerverként fog futni ezen a porton. Ez egy kísérleti funkció és nem biztos, hogy megbízható. Emellett nincs sok olyan kliens, ami támogatná ezt jelenleg.",
     "encryption_certificates": "Tanúsítványok",
     "encryption_certificates_desc": "A titkosítás használatához érvényes SSL tanúsítványláncot kell megadnia a domainjéhez. Ingyenes tanúsítványt kaphat a <0>{{link}}</0> webhelyen, vagy megvásárolhatja az egyik megbízható tanúsítványkibocsátó hatóságtól.",
     "encryption_certificates_input": "Másolja be ide a PEM-kódolt tanúsítványt.",
@@ -384,6 +371,7 @@
     "client_edit": "Kliens módosítása",
     "client_identifier": "Azonosító",
     "ip_address": "IP cím",
+    "client_identifier_desc": "A klienseket be lehet azonosítani IP-cím, CIDR, valamint MAC-cím alapján. Kérjük, vegye figyelembe, hogy a MAC-cím alapján történő azonosítás csak akkor működik, ha az AdGuard Home egyben <0>DHCP szerverként</0> is funkcionál",
     "form_enter_ip": "IP-cím megadása",
     "form_enter_mac": "MAC-cím megadása",
     "form_enter_id": "Azonosító megadása",
@@ -406,7 +394,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",
@@ -414,8 +402,7 @@
     "dns_privacy": "DNS Adatvédelem",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Használja a(z) <1>{{address}}</1> szöveget.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Használja a(z) <1>{{address}}</1> szöveget.",
-    "setup_dns_privacy_3": "<0>Azon szoftverek listája, amelyeket használhat.</0>",
-    "setup_dns_privacy_4": "Az iOS14-en vagy a macOS Big Sur eszközökön le tud tölteni egy speciális, '.mobileconfig' nevű fájlt, ami hozzáadja a <highlight>DNS-over-HTTPS</highlight> vagy a <highlight>DNS-over-TLS</highlight> szervereket a DNS beállításokhoz.",
+    "setup_dns_privacy_3": "<0>Kérjük, vegye figyelembe, hogy a titkosított DNS protokollok csak Android 9-től vannak támogatva. Tehát további szoftvert kell telepítenie más operációs rendszerekhez.</0><0>Itt megtalálja azon szoftverek listáját, amelyeket használhat.</0>",
     "setup_dns_privacy_android_1": "Az Android 9 natív módon támogatja a DNS-over-TLS-t. A beállításához menjen a Beállítások → Hálózat & internet → Speciális → Privát DNS menübe, és adja meg itt a domaint.",
     "setup_dns_privacy_android_2": "Az <0>AdGuard for Android</0> támogatja a <1>DNS-over-HTTPS</1>-t és a <1>DNS-over-TLS</1>-t.",
     "setup_dns_privacy_android_3": "Az <0>Intra</0> hozzáadja a <1>DNS-over-HTTPS</1> támogatást az Androidhoz.",
@@ -526,8 +513,8 @@
     "check_ip": "IP-címek: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Indok: {{reason}}",
+    "check_rule": "Szabály: {{rule}}",
     "check_service": "Szolgáltatás neve: {{service}}",
-    "service_name": "Szolgáltatás neve",
     "check_not_found": "Nem található az Ön szűrőlistái között",
     "client_confirm_block": "Biztosan blokkolni szeretné a(z) \"{{ip}}\" klienst?",
     "client_confirm_unblock": "Biztosan fel szeretné oldani a(z) \"{{ip}}\" kliens blokkolását?",
@@ -560,14 +547,10 @@
     "milliseconds_abbreviation": "ms",
     "cache_size": "Gyorsítótár mérete",
     "cache_size_desc": "DNS gyorsítótár mérete (bájtokban)",
-    "cache_ttl_min_override": "A minimális TTL felülírása",
-    "cache_ttl_max_override": "A maximális TTL felülírása",
     "enter_cache_size": "Adja meg a gyorsítótár méretét",
-    "enter_cache_ttl_min_override": "Adja meg a minimális TTL-t (másodpercben)",
-    "enter_cache_ttl_max_override": "Adja meg a maximális TTL-t (másodpercben)",
-    "cache_ttl_min_override_desc": "Megnöveli a DNS kiszolgálótól kapott rövid TTL értékeket (másodpercben), ha gyorsítótárazza a DNS kéréseket",
-    "cache_ttl_max_override_desc": "Állítson be egy maximális TTL értéket (másodpercben) a DNS gyorsítótár bejegyzéseihez",
-    "ttl_cache_validation": "A minimális gyorsítótár TTL értéknek kisebbnek vagy egyenlőnek kell lennie a maximum értékkel",
+    "enter_cache_ttl_min_override": "Adja meg a minimális TTL-t",
+    "enter_cache_ttl_max_override": "Adja meg a maximális TTL-t",
+    "cache_ttl_max_override_desc": "Felülbírálja az upstream kiszolgálótól kapott (maximális) TTL értéket",
     "filter_category_general": "Általános",
     "filter_category_security": "Biztonság",
     "filter_category_regional": "Regionális",
@@ -579,8 +562,5 @@
     "setup_config_to_enable_dhcp_server": "Konfiguráció beállítása a DHCP-kiszolgáló engedélyezéséhez",
     "original_response": "Eredeti válasz",
     "click_to_view_queries": "Kattintson a lekérésekért",
-    "port_53_faq_link": "Az 53-as portot gyakran a \"DNSStubListener\" vagy a \"systemd-resolved\" (rendszer által feloldott) szolgáltatások használják. Kérjük, olvassa el <0>ezt az útmutatót</0> a probléma megoldásához.",
-    "adg_will_drop_dns_queries": "Az AdGuard Home eldobja az összes DNS kérést erről a kliensről.",
-    "client_not_in_allowed_clients": "Ez a kliens nincs engedélyezve, mivel nincs rajta az \"Engedélyezett kliensek\" listáján.",
-    "experimental": "Kísérleti"
+    "port_53_faq_link": "Az 53-as portot gyakran a \"DNSStubListener\" vagy a \"systemd-resolved\" (rendszer által feloldott) szolgáltatások használják. Kérjük, olvassa el <0>ezt az útmutatót</0> a probléma megoldásához."
 }

client/src/__locales/id.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Pengaturan klien",
     "example_upstream_reserved": "Anda dapat menetapkan DNS upstream <0>untuk domain spesifik</0>",
-    "example_upstream_comment": "Anda dapat menentukan komentar",
     "upstream_parallel": "Gunakan kueri paralel untuk mempercepat resoluasi dengan menanyakan semua server upstream secara bersamaan",
     "parallel_requests": "Permintaan paralel",
     "load_balancing": "Penyeimbang beban",
@@ -115,7 +114,7 @@
     "average_processing_time": "Rata-rata waktu pemrosesan",
     "average_processing_time_hint": "Rata-rata waktu dalam milidetik untuk pemrosesan sebuah permintaan DNS",
     "block_domain_use_filters_and_hosts": "Blokir domain menggunakan filter dan file hosts",
-    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran di pengaturan <a>Penyaringan</a>.",
+    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran di pengaturan <a href='#filters'>Penyaringan</a>.",
     "use_adguard_browsing_sec": "Gunakan layanan web Keamanan Penjelajahan AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home akan mengecek jika domain diblacklist oleh layanan web keamanan penjelajahan. Akan menggunakan lookup API yang ramah privasi untuk melakukan cek: hanya awalan singkat hash SHA256 dari nama domain yang dikirim ke server.",
     "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
@@ -133,8 +132,6 @@
     "encryption_settings": "Pengaturan enkripsi",
     "dhcp_settings": "Pengaturan DHCP",
     "upstream_dns": "Server DNS hulu",
-    "upstream_dns_help": "Masukkan alamat server per baris. <a>Pelajari lebih</a> mengenai konfigurasi upstream server DNS.",
-    "upstream_dns_configured_in_file": "Diatur dalam {{path}}",
     "test_upstream_btn": "Uji hulu",
     "upstreams": "Upstream",
     "apply_btn": "Terapkan",
@@ -188,7 +185,6 @@
     "example_upstream_regular": "DNS reguler (melalui UDP)",
     "example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>",
     "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>",
     "example_upstream_sdns": "anda bisa menggunakan <0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>",
     "example_upstream_tcp": "DNS reguler (melalui TCP)",
     "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
@@ -197,10 +193,6 @@
     "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
     "unblock": "Buka Blokir",
     "block": "Blok",
-    "disallow_this_client": "Cabut ijin untuk klien ini",
-    "allow_this_client": "Ijinkan klien ini",
-    "block_for_this_client_only": "Blok hanya untuk klien ini",
-    "unblock_for_this_client_only": "Jangan diblok hanya untuk klien ini",
     "time_table_header": "Waktu",
     "date": "Tanggal",
     "domain_name_table_header": "Nama domain",
@@ -242,25 +234,20 @@
     "blocking_mode": "Mode blokir",
     "default": "Standar",
     "nxdomain": "NXDOMAIN",
-    "refused": "DITOLAK",
     "null_ip": "Null IP",
     "custom_ip": "Custom IP",
     "blocking_ipv4": "Blokiran IPv4",
     "blocking_ipv6": "Blokiran IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": "Unduh .mobileconfig untuk DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Unduh .mobileconfig untuk DNS-over-TLS",
     "plain_dns": "Plain DNS",
     "form_enter_rate_limit": "Masukkan batas nilai",
     "rate_limit": "Batas nilai",
     "edns_enable": "Aktifkan EDNS Klien Subnet",
     "edns_cs_desc": "Apabila dinyalakan, AdGuard Home akan mengirim subnet klien ke server-server DNS.",
-    "rate_limit_desc": "Jumlah permintaan per detik yang diperbolehkan untuk satu klien (atur ke 0 untuk tidak terbatas)",
     "blocking_ipv4_desc": "Alamat IP akan dikembalikan untuk permintaan A yang diblokir",
     "blocking_ipv6_desc": "Alamat IP akan dipulihkan untuk permintaan AAAA yang diblokir",
-    "blocking_mode_default": "Default: Tanggapi dengan alamat IP nol (0.0.0.0 untuk A; :: untuk AAAA) saat diblokir oleh aturan gaya Adblock; tanggapi dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh aturan gaya host /etc/",
-    "blocking_mode_refused": "DITOLAK: Respon dengan kode DITOLAK",
+    "blocking_mode_default": "Standar: Respon pakai REFUSED saat diblokir oleh aturan gaya Adblock; membalas dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh /et /aturan hosts-style",
     "blocking_mode_nxdomain": "NXDOMAIN: Respon pakai kode NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Respon pakai alamat IP kosong (0.0.0.0 untuk A; :: untuk AAAA)",
     "blocking_mode_custom_ip": "IP kustom: respon dengan alamat IP yang diset secara manual",
@@ -269,6 +256,7 @@
     "source_label": "Sumber",
     "found_in_known_domain_db": "Ditemukan di database domain dikenal",
     "category_label": "Kategori",
+    "rule_label": "Aturan",
     "list_label": "Daftar",
     "unknown_filter": "Penyaringan {{filterId}} tidak dikenal",
     "known_tracker": "Pelacak yang dikenal",
@@ -329,14 +317,13 @@
     "encryption_config_saved": "Pengaturan enkripsi telah tersimpan",
     "encryption_server": "Nama server",
     "encryption_server_enter": "Masukkan nama domain anda",
+    "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
     "encryption_redirect": "Alihkan ke HTTPS secara otomatis",
     "encryption_redirect_desc": "Jika dicentang, AdGuard Home akan secara otomatis mengarahkan anda dari HTTP ke alamat HTTPS.",
     "encryption_https": "Port HTTPS",
     "encryption_https_desc": "Jika port HTTPS dikonfigurasi, antarmuka admin Home AdGuard akan dapat diakses melalui HTTPS, dan itu juga akan memberikan DNS-over-HTTPS di lokasi '/ dns-query'.",
     "encryption_dot": "Port DNS-over-TLS",
     "encryption_dot_desc": "Jika port ini terkonfigurasi, AdGuard Home akan menjalankan server DNS-over-TLS dalam port ini",
-    "encryption_doq": "Port DNS-lewat-QUIC",
-    "encryption_doq_desc": "Jika port ini diatur secara sepesifik, AdGuard Home akan menjalankan server DNS-lewat-QUIC pada port ini. Ini adalah eksperimental dan mungkin tidak dapat diandalkan. Juga, tidak banyak klien yang mendukungnya saat ini.",
     "encryption_certificates": "Sertifikat",
     "encryption_certificates_desc": "Untuk menggunakan enkripsi, Anda perlu memberikan rantai sertifikat SSL yang valid untuk domain Anda. Anda bisa mendapatkan sertifikat gratis di <0>{{link}}</0> atau Anda dapat membelinya dari salah satu Otoritas Sertifikat tepercaya.",
     "encryption_certificates_input": "Salin / rekatkan sertifikat PEM yang disandikan di sini.",
@@ -384,6 +371,7 @@
     "client_edit": "Ubah Klien",
     "client_identifier": "Identifikasi",
     "ip_address": "Alamat IP",
+    "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
     "form_enter_ip": "Masukkan IP",
     "form_enter_mac": "Masukkan MAC",
     "form_enter_id": "Masukkan pengenal",
@@ -414,8 +402,7 @@
     "dns_privacy": "DNS Privasi",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Berikut daftar perangkat lunak yang dapat Anda gunakan.</0>",
-    "setup_dns_privacy_4": "Di perangkat iOS 14 atau macOS Big Sur, Anda dapat mengunduh file '.mobileconfig' khusus yang menambahkan server <highlight>DNS-over-HTTPS</highlight> atau <highlight>DNS-over-TLS</highlight> ke pengaturan DNS.",
+    "setup_dns_privacy_3": "<0>Harap dicatat bahwa protokol DNS terenkripsi hanya didukung pada Android 9. Jadi Anda perlu memasang perangkat lunak tambahan untuk sistem operasi lain.</0><0>Berikut daftar perangkat lunak yang dapat Anda gunakan.</0>",
     "setup_dns_privacy_android_1": "Android 9 mendukung DNS-over-TLS secara asli. Untuk mengkonfigurasinya, buka Pengaturan → Jaringan & internet → Tingkat Lanjut → DNS Pribadi dan masukkan nama domain Anda di sana.",
     "setup_dns_privacy_android_2": "<0>AdGuard untuk Android</0> mendukung <1>DNS-over-HTTPS</1> dan <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> menambahkan dukungan <1>DNS-over-HTTPS</1> untuk Android.",
@@ -526,8 +513,8 @@
     "check_ip": "Alamat IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Alasan: {{reason}}",
+    "check_rule": "Aturan: {{rule}}",
     "check_service": "Nama layanan: {{service}}",
-    "service_name": "Nama layanan",
     "check_not_found": "Tidak di temukan di daftar penyaringan anda",
     "client_confirm_block": "Apa anda yakin ingin mem-blokir klien ini \"{{ip}}\"?",
     "client_confirm_unblock": "Apa anda yakin ingin meng-unblock klien ini \"{{ip}}\"?",
@@ -562,12 +549,10 @@
     "cache_size_desc": "Ukuran DNS cache (dalam bit)",
     "cache_ttl_min_override": "Tumpuk TTL minimum",
     "cache_ttl_max_override": "Tumpuk TTL maksimum",
-    "enter_cache_size": "Masukkan ukuran cache (bytes)",
-    "enter_cache_ttl_min_override": "Masukkan TTL minimum (detik)",
-    "enter_cache_ttl_max_override": "Masukkan TTL maksimum (detik)",
-    "cache_ttl_min_override_desc": "Perpanjang nilai waktu-online singkat (detik) yang diterima dari server upstream saat menyimpan respons DNS",
-    "cache_ttl_max_override_desc": "Tetapkan nilai waktu-online maksimum (detik) untuk entri di cache DNS",
-    "ttl_cache_validation": "Nilai TTL cache minimum harus kurang dari atau sama dengan nilai maksimum",
+    "enter_cache_size": "Masukkan ukuran cache",
+    "enter_cache_ttl_min_override": "Masukkan TTL minimum",
+    "enter_cache_ttl_max_override": "Masukkan TTL maksimum",
+    "cache_ttl_max_override_desc": "Ganti nilai TTL (maksimum) yang diterima dari server upstream",
     "filter_category_general": "Umum",
     "filter_category_security": "Keamanan",
     "filter_category_regional": "Wilayah",
@@ -579,8 +564,5 @@
     "setup_config_to_enable_dhcp_server": "Setel konfigurasi untuk aktifkan server DHCP",
     "original_response": "Respon asli",
     "click_to_view_queries": "Klik untuk lihat permintaan",
-    "port_53_faq_link": "Port 53 sering ditempati oleh layanan \"DNSStubListener\" atau \"systemd-resolved\". Silakan baca <0>instruksi ini</0> tentang cara menyelesaikan ini.",
-    "adg_will_drop_dns_queries": "AdGuard Home akan menghapus semua permintaan DNS dari klien ini.",
-    "client_not_in_allowed_clients": "Klien tidak diizinkan karena tidak ada dalam daftar \"Klien yang diizinkan\".",
-    "experimental": "Eksperimental"
+    "port_53_faq_link": "Port 53 sering ditempati oleh layanan \"DNSStubListener\" atau \"systemd-resolved\". Silakan baca <0>instruksi ini</0> tentang cara menyelesaikan ini."
 }

client/src/__locales/it.json

@@ -1,13 +1,12 @@
 {
     "client_settings": "Impostazioni client",
     "example_upstream_reserved": "Puoi specificare un server DNS<0>per uno specifico dominio(i)</0>",
-    "example_upstream_comment": "Puoi specificare il commento",
     "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server",
     "parallel_requests": "Richieste parallele",
     "load_balancing": "Bilanciamento del carico",
     "load_balancing_desc": "Interroga un server per volta. AdGuard Home utilizzerà un algoritmo casuale per la selezione del server, in maniera tale da propendere il maggior numero di volte per quello più veloce.",
-    "bootstrap_dns": "Server DNS bootstrap",
-    "bootstrap_dns_desc": "Server DNS bootstrap sono utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
+    "bootstrap_dns": "Server DNS di avvio",
+    "bootstrap_dns_desc": "Server DNS utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
     "check_dhcp_servers": "Controlla la presenza di server DHCP",
     "save_config": "Salva configurazione",
     "enabled_dhcp": "Server DHCP attivo",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Formato IPv4 non valido",
     "form_error_mac_format": "Formato MAC non valido",
     "form_error_client_id_format": "Formato ID cliente non valido",
-    "form_error_server_name": "Nome server non valido",
     "form_error_positive": "Deve essere maggiore di 0",
     "form_error_negative": "Deve essere maggiore o uguale a 0 (zero)",
     "range_end_error": "Deve essere maggiore dell'intervallo di inizio",
@@ -116,7 +114,7 @@
     "average_processing_time": "Tempo di elaborazione medio",
     "average_processing_time_hint": "Tempo medio in millisecondi per elaborare una richiesta DNS",
     "block_domain_use_filters_and_hosts": "Blocca domini utilizzando filtri e file hosts",
-    "filters_block_toggle_hint": "Puoi impostare le regole di blocco nelle impostazioni dei <a>Filtri</a>.",
+    "filters_block_toggle_hint": "Puoi impostare le regole di blocco nelle impostazioni dei <a href='#filters'>Filtri</a>.",
     "use_adguard_browsing_sec": "Utilizza il servizio web AdGuard \"sicurezza di navigazione\"",
     "use_adguard_browsing_sec_hint": "AdGuard Home verificherà se il dominio è stato bloccato dal servizio web \"sicurezza di navigazione\". Per eseguire il controllo utilizzerà delle API privacy-friendly: verrà inviato al server solo un breve prefisso dell'hash SHA256 del nome del dominio.",
     "use_adguard_parental": "Utilizza il Controllo Parentale di AdGuard",
@@ -187,10 +185,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",
@@ -248,15 +246,8 @@
     "custom_ip": "IP personalizzato",
     "blocking_ipv4": "Blocca IPv4",
     "blocking_ipv6": "Blocca IPv6",
-    "dns_over_https": "DNS su HTTPS",
-    "dns_over_tls": "DNS su TLS",
-    "dns_over_quic": "DNS su Quic",
-    "client_id": "ID client",
-    "client_id_placeholder": "Inserisci ID client",
-    "client_id_desc": "Client differenti possono essere identificati da uno speciale ID. <a>Qui</a> potrai saperne di più sui metodi per identificarli.",
-    "download_mobileconfig_doh": "Scarica .mobileconfig per DNS su HTTPS",
-    "download_mobileconfig_dot": "Scarica .mobileconfig per DNS su TLS",
-    "download_mobileconfig": "Scarica file di configurazione",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
     "plain_dns": "DNS semplice",
     "form_enter_rate_limit": "Imposta limite delle richieste",
     "rate_limit": "Limite delle richieste",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Il numero di richieste al secondo che un singolo client può fare (0: illimitato)",
     "blocking_ipv4_desc": "Indirizzo IP per una richiesta DNS IPv4 bloccata",
     "blocking_ipv6_desc": "Indirizzo IP restituito per una richiesta DNS IPv6 bloccata",
-    "blocking_mode_default": "Predefinito: Rispondi con IP address zero (0.0.0.0 per A; :: per AAAA) quando bloccato da una regola di blocco annunci; rispondi con l'indirizzo IP specificato nella regola quando bloccato dalla regola /etc/hosts-style",
+    "blocking_mode_default": "Predefinito: Rispondi con REFUSED quando bloccato da una regola di blocco annunci; rispondi con l'indirizzo IP specificato nella regola quando bloccato dalla regola / etc / hosts-style",
     "blocking_mode_refused": "REFUSED: Risposta con codice di REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Rispondi con il codice NXDOMAIN",
     "blocking_mode_null_ip": "IP nullo: Rispondi con indirizzo IP zero (0.0.0.0 per A; :: per AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Fonte",
     "found_in_known_domain_db": "Trovato nel database dei domini conosciuti.",
     "category_label": "Categoria",
-    "rule_label": "Regola(e)",
+    "rule_label": "Regola",
     "list_label": "Lista",
     "unknown_filter": "Filtro sconosciuto {{filterId}}",
     "known_tracker": "Tracker conosciuto",
@@ -336,14 +327,14 @@
     "encryption_config_saved": "Configurazione della crittografia salvata",
     "encryption_server": "Nome server",
     "encryption_server_enter": "Inserisci il tuo nome di dominio",
-    "encryption_server_desc": "Per utilizzare HTTPS, è necessario immettere il nome del server che corrisponde al certificato SSL o al certificato wildcard. Se il campo risulterà vuoto, accetterà connessioni TLS per qualsiasi dominio.",
+    "encryption_server_desc": "Per utilizzare HTTPS, è necessario inserire il nome del server che corrisponde al certificato SSL.",
     "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.",
@@ -352,8 +343,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",
@@ -392,7 +383,7 @@
     "client_edit": "Modifica Client",
     "client_identifier": "Identificatore",
     "ip_address": "Indirizzo IP",
-    "client_identifier_desc": "I client possono essere identificati dall'indirizzo IP, CIDR, indirizzo MAC o un ID speciale (che può essere utilizzato per DoT/DoH/DoQ). <0>Qui</0> potrai saperne di più sui metodi per identificarli.",
+    "client_identifier_desc": "I client possono essere identificati dall indirizzo IP o dall' indirizzo MAC. Nota che l' utilizzo dell' indirizzo MAC come identificatore è consentito solo se AdGuard Home è anche il <0>server DHCP</0>",
     "form_enter_ip": "Inserisci IP",
     "form_enter_mac": "Inserisci MAC",
     "form_enter_id": "Inserisci identificatore",
@@ -421,23 +412,21 @@
     "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_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_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>Nota che i protocolli DNS crittografati sono supportati solo su Android 9. Quindi è necessario installare software aggiuntivo per altri sistemi operativi.</0><0>Ecco un elenco di software che è possibile utilizzare.</0>",
+    "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_privacy_ioc_mac": "configurazione iOS e macOS",
-    "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",
@@ -536,8 +525,8 @@
     "check_ip": "Indirizzi IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Motivo: {{reason}}",
+    "check_rule": "Regola: {{rule}}",
     "check_service": "Nome servizio: {{service}}",
-    "service_name": "Nome servizio",
     "check_not_found": "Non trovato negli elenchi dei filtri",
     "client_confirm_block": "Sei sicuro di voler bloccare il client \"{{ip}}\"?",
     "client_confirm_unblock": "Sei sicuro di voler sbloccare il client \"{{ip}}\"?",
@@ -572,11 +561,11 @@
     "cache_size_desc": "Dimensioni cache DNS (in byte)",
     "cache_ttl_min_override": "Sovrascrivi TTL minimo",
     "cache_ttl_max_override": "Sovrascrivi TTL massimo",
-    "enter_cache_size": "Immetti dimensioni cache (in byte)",
-    "enter_cache_ttl_min_override": "Immetti TTL minimo (in secondi)",
-    "enter_cache_ttl_max_override": "Immetti TTL massimo (in secondi)",
-    "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
-    "cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
+    "enter_cache_size": "Immetti dimensioni cache",
+    "enter_cache_ttl_min_override": "Immetti TTL minimo",
+    "enter_cache_ttl_max_override": "Immetti TTL massimo",
+    "cache_ttl_min_override_desc": "Sovrascrivi il valore TTL (minimo) ricevuto dall'upstream del server",
+    "cache_ttl_max_override_desc": "Sovrascrivi valore TTL (massimo) ricevuto dall'upstream del server",
     "ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
     "filter_category_general": "Generali",
     "filter_category_security": "Sicurezza",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Clicca per visualizzare le richieste",
     "port_53_faq_link": "La Porta 53 è spesso occupata dai servizi \"DNSStubListener\" o \"systemd-resolved\". Si prega di leggere <0>queste istruzioni</0> per risolvere il problema.",
     "adg_will_drop_dns_queries": "AdGuard Home eliminerà tutte le richieste DNS da questo client.",
-    "client_not_in_allowed_clients": "Il client non è consentito perché non è nell'elenco \"Client consentiti\".",
     "experimental": "Sperimentale"
 }

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": "ロードバランシング",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "IPv4フォーマットではありません",
     "form_error_mac_format": "MACフォーマットではありません",
     "form_error_client_id_format": "Client IDの形式が無効です",
-    "form_error_server_name": "サーバ名が無効です",
     "form_error_positive": "0より大きい必要があります",
     "form_error_negative": "0以上である必要があります",
     "range_end_error": "範囲開始よりも大きくなければなりません",
@@ -116,7 +114,7 @@
     "average_processing_time": "平均処理時間",
     "average_processing_time_hint": "DNSリクエストの処理にかかる平均時間（ミリ秒単位）",
     "block_domain_use_filters_and_hosts": "フィルタとhostsファイルを使用してドメインをブロックする",
-    "filters_block_toggle_hint": "<a>フィルタ</a>の設定でブロックするルールを設定することができます。",
+    "filters_block_toggle_hint": "<a href='#filters'>フィルタ</a>の設定でブロックするルールを設定することができます。",
     "use_adguard_browsing_sec": "AdGuardブラウジングセキュリティ・ウェブサービスを使用する",
     "use_adguard_browsing_sec_hint": "AdGuard Homeは、ブラウジングセキュリティ・ウェブサービスによってドメインがブラックリストに登録されているかどうかを確認します。 これはプライバシーを考慮したAPIを使用してチェックを実行します。ドメイン名SHA256ハッシュの短いプレフィックスのみがサーバに送信されます。",
     "use_adguard_parental": "AdGuardペアレンタルコントロール・ウェブサービスを使用する",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "ブロック中のIPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "Client ID（クライアントID）",
-    "client_id_placeholder": "クライアントIDを入力してください",
-    "client_id_desc": "それぞれのクライアントは、特別なクライアントIDで識別できます。 <a>ここ</a>では、クライアントを特定する方法について詳しく知ることができます。",
-    "download_mobileconfig_doh": "DNS-over-HTTPS用の .mobileconfig をダウンロード",
-    "download_mobileconfig_dot": "DNS-over-TLS用の .mobileconfig をダウンロード",
-    "download_mobileconfig": "設定ファイルをダウンロードする",
     "plain_dns": "通常のDNS",
     "form_enter_rate_limit": "頻度制限を入力してください",
     "rate_limit": "頻度制限",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "単一のクライアントに対して許可される1秒あたりのリクエスト数（「0」に設定すると無制限になります）",
     "blocking_ipv4_desc": "ブロックされたAリクエストに対して応答されるIPアドレス",
     "blocking_ipv6_desc": "ブロックされたAAAAリクエストに対して応答されるIPアドレス",
-    "blocking_mode_default": "デフォルト：Adblock系ルールによってブロックされると、ゼロIPアドレス（Aに対しては「0.0.0.0」、AAAAに対しては「::」）で応答します。/etc/hosts系ルールによってブロックされると、ルールにて指定されているIPアドレスで応答します。",
+    "blocking_mode_default": "デフォルト：Adblockスタイルのルールによってブロックされると、REFUSEDで応答します。 /etc/hostsスタイルのルールによってブロックされると、ルールで指定されたIPアドレスで応答します",
     "blocking_mode_refused": "REFUSED: 「REFUSED」コードで応答します",
     "blocking_mode_nxdomain": "NXDOMAIN：NXDOMAINコードで応答します",
     "blocking_mode_null_ip": "Null IP：ゼロのIPアドレスで応答します（Aの場合は0.0.0.0; AAAAの場合は::）",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "暗号化の設定を保存しました",
     "encryption_server": "サーバ名",
     "encryption_server_enter": "ドメイン名を入力してください",
-    "encryption_server_desc": "HTTPSを使用するには、SSL証明書またはワイルドカード証明書と一致するサーバー名を入力する必要があります。このフィールドが設定されていない場合は、任意のドメインのTLS接続を受け入れます。",
+    "encryption_server_desc": "HTTPSを使用するには、SSL証明書と一致するサーバ名を入力する必要があります。",
     "encryption_redirect": "HTTPSに自動的にリダイレクト",
     "encryption_redirect_desc": "チェックすると、AdGuard Homeは自動的にHTTPからHTTPSアドレスへリダイレクトします。",
     "encryption_https": "HTTPS ポート",
@@ -392,7 +383,7 @@
     "client_edit": "クライアントの編集",
     "client_identifier": "識別子",
     "ip_address": "IPアドレス",
-    "client_identifier_desc": "クライアントは、IPアドレス、CIDR、MACアドレス、または特別なクライアントID(DoT/DoH/DoQで使用可能)によって識別することができます。<0>ここ</0>では、クライアントの識別方法についてより詳しく説明しています。",
+    "client_identifier_desc": "クライアントはIPアドレスまたはMACアドレスで識別できます。AdGuard Homeが<0>DHCPサーバ</0>でもある場合にのみ、識別子としてMACを使用することが可能であることにご注意ください。",
     "form_enter_ip": "IPアドレスを入力してください",
     "form_enter_mac": "MACアドレスを入力してください",
     "form_enter_id": "識別子を入力してください",
@@ -423,8 +414,7 @@
     "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_3": "<0>暗号化されたDNSプロトコルはAndroid 9でのみサポートされていることに注意してください。そのため、他のオペレーティングシステムでは追加のソフトウェアをインストールする必要があります。</0> <0>使用できるソフトウェアの一覧です。</0>",
     "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>サポートを追加します。",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0>は<1>DNS-over-HTTPS</1>をサポートします。",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0>は<1>DNS-over-HTTPS</1>をサポートしています。",
     "setup_dns_privacy_other_5": "もっと多くの実装を<0>ここ</0>や<1>ここ</1>で見つけられます。",
-    "setup_dns_privacy_ioc_mac": "iOS と macOS での設定",
     "setup_dns_notice": "<1>DNS-over-HTTPS</1>または<1>DNS-over-TLS</1>を使用するには、AdGuard Home 設定の<0>暗号化設定</0>が必要です。",
     "rewrite_added": "\"{{key}}\" のためのDNS書き換え情報を追加完了しました",
     "rewrite_deleted": "\"{{key}}\" のためのDNS書き換え情報を削除完了しました",
@@ -521,7 +510,7 @@
     "fastest_addr_desc": "すべてのDNSサーバーを照会し、全応答の中で最速のIPアドレスを返します",
     "autofix_warning_text": "\"改善\"をクリックすると、AdGuardHomeはAdGuardHome DNSサーバを使用するようにシステムを構成します。",
     "autofix_warning_list": "次のタスクを実行します：<0>システムDNSStubListenerを非アクティブ化します</0> <0>DNSサーバのアドレスを127.0.0.1に設定します</0> <0>/etc/resolv.confのシンボリックリンクの対象を/run/systemd/resolve/resolv.confに置換します</0> <0>DNSStubListenerを停止します（systemd-resolvedサービスをリロードします）</0>",
-    "autofix_warning_result": "その結果、システムからのすべてのDNSリクエストは、デフォルトでAdGuard Homeによって処理されます。",
+    "autofix_warning_result": "その結果、システムからのすべてのDNS要求は、デフォルトでAdGuardHomeによって処理されます。",
     "tags_title": "タグ",
     "tags_desc": "クライアントに対応するタグを選択できます。タグはフィルタリングルールに含めることができ、より正確に適用できます。 <0>詳細</0>",
     "form_select_tags": "クライアントのタグを選択する",
@@ -536,8 +525,8 @@
     "check_ip": "IPアドレス: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "理由: {{reason}}",
+    "check_rule": "ルール: {{rule}}",
     "check_service": "サービス名: {{service}}",
-    "service_name": "サービス名",
     "check_not_found": "フィルタ一覧には見つかりません",
     "client_confirm_block": "クライアント\"{{ip}}\"をブロックしてもよろしいですか？",
     "client_confirm_unblock": "クライアント\"{{ip}}\"のブロックを解除してもよろしいですか？",
@@ -572,11 +561,11 @@
     "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（秒単位）を設定します",
+    "enter_cache_size": "キャッシュサイズを入力してください",
+    "enter_cache_ttl_min_override": "最小TTLを入力してください",
+    "enter_cache_ttl_max_override": "最大TTLを入力してください",
+    "cache_ttl_min_override_desc": "アップストリームサーバから受信したTTL値（最小値）をオーバーライドする",
+    "cache_ttl_max_override_desc": "上流サーバから受信したTTL値（最大）を上書き。",
     "ttl_cache_validation": "最小キャッシュTTL値は最大値以下にする必要があります",
     "filter_category_general": "一般",
     "filter_category_security": "セキュリティ",
@@ -586,11 +575,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": "実験用"
 }

client/src/__locales/ko.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "클라이언트 설정",
     "example_upstream_reserved": "<0>특정 도메인에 대한</0> DNS 업스트림을 지정할 수 있습니다.",
-    "example_upstream_comment": "설명을 맞춤 지정할 수 있습니다.",
     "upstream_parallel": "쿼리 처리 속도를 높이려면 모든 업스트림 서버에서 동시에 병렬 쿼리를 사용해주세요.",
     "parallel_requests": "병렬 처리 요청",
     "load_balancing": "로드 밸런싱",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "잘못된 IP 형식",
     "form_error_mac_format": "잘못된 MAC 형식",
     "form_error_client_id_format": "잘못된 클라이언트 ID 형식",
-    "form_error_server_name": "유효하지 않은 서버 이름입니다",
     "form_error_positive": "0보다 커야 합니다",
     "form_error_negative": "반드시 0 이상이여야 합니다",
     "range_end_error": "입력 값은 범위의 시작 지점보다 큰 값 이여야 합니다.",
@@ -116,7 +114,7 @@
     "average_processing_time": "평균처리 시간",
     "average_processing_time_hint": "DNS 요청 처리시 평균 시간(밀리초)",
     "block_domain_use_filters_and_hosts": "필터 및 호스트 파일을 사용하여 도메인 차단",
-    "filters_block_toggle_hint": "차단규칙<a>필터</a>을 설정할 수 있습니다.",
+    "filters_block_toggle_hint": "차단규칙<a href='#filters'>필터</a>을 설정할 수 있습니다.",
     "use_adguard_browsing_sec": "AdGuard 브라우징 보안 웹 서비스 사용",
     "use_adguard_browsing_sec_hint": "AdGuard Home은 개인정보를 보호하는 API를 사용하여 브라우징 보안 웹 서비스를 통해 도메인이 블랙리스트에 올라 있는지 확인합니다. 참고: 도메인 이름의 SHA256 해시의 짧은 접두사만 서버로 전송됩니다.",
     "use_adguard_parental": "AdGuard 자녀 보호 웹 서비스 사용",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "IPv6 차단",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "클라이언트 ID",
-    "client_id_placeholder": "클라이언트 ID 입력",
-    "client_id_desc": "클라이언트는 특별한 클라이언트 ID를 기반으로 구분됩니다. <a>여기</a>에서 클라이언트를 구분하는 방법을 자세히 알아보세요.",
-    "download_mobileconfig_doh": "DNS-over-HTTPS용 .mobileconfig 다운로드",
-    "download_mobileconfig_dot": "DNS-over-TLS용 .mobileconfig 다운로드",
-    "download_mobileconfig": "설정 파일 내려받기",
     "plain_dns": "평문 DNS",
     "form_enter_rate_limit": "한도 제한 입력하기",
     "rate_limit": "한도 제한",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "단일 클라이언트에서 허용 가능한 초 당 요청 생성 숫자 (0: 무제한)",
     "blocking_ipv4_desc": "차단된 A 요청에 대해서 반환할 IP 주소",
     "blocking_ipv6_desc": "차단된 AAAA 요청에 대해서 반환할 IP 주소",
-    "blocking_mode_default": "기본: Adblock 스타일 규칙에 의해 차단되면 제로 IP 주소(A는 0.0.0.0; AAAA는 ::)로 응답합니다; /etc/hosts 스타일 규칙에 의해 차단되면 규칙에 정의된 IP 주소로 응답합니다",
+    "blocking_mode_default": "기본: Adblock 스타일 규칙에 의해 차단되면 REFUSED으로 응답합니다; /etc/hosts 스타일 규칙에 의해 차단되면 규칙에 정의된 IP 주소로 응답합니다",
     "blocking_mode_refused": "REFUSED: REFUSED 코드로 응답",
     "blocking_mode_nxdomain": "NXDOMAIN: NXDOMAIN 코드로 응답",
     "blocking_mode_null_ip": "Null IP: 제로 IP 주소 (A는 0.0.0.0; AAAA는 ::) 로 응답합니다",
@@ -307,7 +298,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": "화면 왼쪽에서 어댑터 설정 변경을 찾아 클릭하세요.",
@@ -376,7 +367,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가 업데이트 중입니다.",
@@ -392,7 +383,7 @@
     "client_edit": "클라이언트 수정",
     "client_identifier": "식별자",
     "ip_address": "IP 주소",
-    "client_identifier_desc": "클라이언트는 IP 주소, CIDR, MAC 주소 또는 특수 클라이언트 ID로 식별할 수 있습니다 (DoT/DoH/DoQ에 사용 가능). <0>여기에서</0> 클라이언트를 식별하는 방법에 대한 자세한 내용은 확인하실 수 있습니다.",
+    "client_identifier_desc": "사용자는 IP 주소 또는 MAC 주소로 식별할 수 있지만 AdGuard Home이 <0>DHCP 서버인 </0> 경우에만 사용자는 MAC 주소로 식별할 수 있습니다.",
     "form_enter_ip": "IP 입력",
     "form_enter_mac": "MAC 입력",
     "form_enter_id": "식별자 입력",
@@ -423,8 +414,7 @@
     "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 기기에서 DNS 설정에 <highlight>DNS-over-HTTPS</highlight> 또는 <highlight>DNS-over-TLS</highlight> 서버를 추가하는 특수 '.mobileconfig' 파일을 다운로드할 수 있습니다.",
+    "setup_dns_privacy_3": "<0>암호화된 DNS 프로토콜은 Android 9에서만 지원됩니다. 다른 운영 체제를 위한 추가 소프트웨어를 설치해야 합니다.</0><0>사용할 수 있는 소프트웨어 목록입니다. </0>",
     "setup_dns_privacy_android_1": "Android 9는 기본적으로 DNS-over-TLS를 지원합니다. 구성하려면 설정 → 네트워크 및 인터넷 → 고급 → 개인 DNS로 이동하여 도메인 이름을 입력하세요.",
     "setup_dns_privacy_android_2": "<0>Android용 AdGuard</0>DNS-over-HTTPS <1>및</1> DNS-over-TLS <1>지원합니다</1>",
     "setup_dns_privacy_android_3": "<0>인트라</0> 안드로이드에 <1>DNS-over-HTTPS </1>지원 추가합니다.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> <1>DNS-over-HTTPS</1> 지원합니다.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0><1>DNS-over-HTTPS</1>지원합니다.",
     "setup_dns_privacy_other_5": "<0>이곳이나</0> <1>이곳을</1> 클릭하여 더 많은 구현에 대한 정보를 확인하세요.",
-    "setup_dns_privacy_ioc_mac": "iOS 및 macOS 설정",
     "setup_dns_notice": "<1>DNS-over-HTTPS</1> 또는 <1>DNS-over-TLS를</1> 사용하려면 AdGuard Home 설정에서 <0>암호화를 구성해야 합니다.</0>",
     "rewrite_added": "\"{{key}}\"에 대한 DNS 수정 정보를 성공적으로 추가 됩니다.",
     "rewrite_deleted": "\"{{key}}\"에 대한 DNS 수정 정보를 성공적으로 삭제 됩니다.",
@@ -536,8 +525,8 @@
     "check_ip": "IP 주소: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "이유: {{reason}}",
+    "check_rule": "규칙: {{rule}}",
     "check_service": "서비스 이름: {{service}}",
-    "service_name": "서비스 이름",
     "check_not_found": "필터 목록에서 찾을 수 없음",
     "client_confirm_block": "정말로 클라이언트 \"{{ip}}\"을(를) 차단하시겠습니까?",
     "client_confirm_unblock": "정말로 클라이언트 \"{{ip}}\"의 차단을 해제하시겠습니까?",
@@ -591,6 +580,5 @@
     "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": "실험"
 }

client/src/__locales/nl.json

@@ -1,12 +1,11 @@
 {
-    "client_settings": "Cliënt Instellingen",
+    "client_settings": "cliënt Instellingen",
     "example_upstream_reserved": "Je kan DNS upstream <0>specifiëren voor specifieke domein(en)</0>",
-    "example_upstream_comment": "Het commentaar kan gespecificeerd worden",
     "upstream_parallel": "Gebruik parallelle verzoeken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers",
     "parallel_requests": "Parallelle verzoeken",
     "load_balancing": "Volume balanceren",
     "load_balancing_desc": "Eén server per keer bevragen. AdGuard Home gebruikt hiervoor een gewogen willekeurig algoritme om de server te kiezen zodat de snelste server meer zal gebruikt worden.",
-    "bootstrap_dns": "Bootstrap DNS-servers",
+    "bootstrap_dns": "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 +22,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",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Ongeldig IPv4 formaat",
     "form_error_mac_format": "Ongeldig MAC formaat.",
     "form_error_client_id_format": "Opmaak cliënt-ID is ongeldig",
-    "form_error_server_name": "Ongeldige servernaam",
     "form_error_positive": "Moet groter zijn dan 0",
     "form_error_negative": "Moet 0 of hoger dan 0 zijn",
     "range_end_error": "Moet groter zijn dan het startbereik",
@@ -116,7 +114,7 @@
     "average_processing_time": "Gemiddelde procestijd",
     "average_processing_time_hint": "Gemiddelde verwerkingstijd in milliseconden van een DNS aanvraag",
     "block_domain_use_filters_and_hosts": "Blokkeerd domeinen dmv filters en host bestanden",
-    "filters_block_toggle_hint": "Je kan blokkeringsregels toevoegen in de <a>Filters</a> instellingen.",
+    "filters_block_toggle_hint": "Je kunt blokkeer regels toevoegen in de <a href='#filters'>Filters</a>instellingen",
     "use_adguard_browsing_sec": "Gebruik AdGuardBrowsing Security web service",
     "use_adguard_browsing_sec_hint": "AdGuard Home controleert of het domein in de blokkeerlijst voorkomt dmv Browsing Security web service. Dit gebeurt dmv een privacy vriendelijk API verzoek:een korte prefix van de domein naam met SHA256 hash wordt verzonden naar de server.",
     "use_adguard_parental": "Gebruik AdGuard Ouderlijk toezicht web service",
@@ -133,8 +131,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",
@@ -187,15 +185,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",
@@ -213,7 +211,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",
@@ -236,8 +234,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",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Blokkeren IP6",
     "dns_over_https": "DNS-via-HTTPS",
     "dns_over_tls": "DNS-via-TLS",
-    "dns_over_quic": "DNS-via-QUIC",
-    "client_id": "Apparaat-ID",
-    "client_id_placeholder": "Apparaat-ID invoeren",
-    "client_id_desc": "Verschillende apparaten kunnen worden geïdentificeerd door hun specifiek apparaat-ID. <a>Hier</a> vind je meer informatie over het identificeren van apparaten.",
-    "download_mobileconfig_doh": ".mobileconfig voor DNS-via-HTTPS downloaden",
-    "download_mobileconfig_dot": ".mobileconfig voor DNS-via-TLS downloaden",
-    "download_mobileconfig": "Configuratiebestand downloaden",
     "plain_dns": "Gewone DNS",
     "form_enter_rate_limit": "Voer ratio limiet in",
     "rate_limit": "Ratio limiet",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0 betekent onbeperkt)",
     "blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
     "blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
-    "blocking_mode_default": "Standaard: Reageer met een nul IP adres (0.0.0.0 for A; :: voor AAAA) wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer geblokkeerd door een /etc/hosts type regel",
+    "blocking_mode_default": "Standaard: Reageer met REFUSED wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
     "blocking_mode_refused": "REFUSED: Antwoorden met REFUSED code",
     "blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
     "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
@@ -275,19 +266,19 @@
     "source_label": "Bron",
     "found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
     "category_label": "Categorie",
-    "rule_label": "Regel(s)",
+    "rule_label": "Regel",
     "list_label": "Lijst",
     "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.",
@@ -307,26 +298,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",
@@ -336,13 +327,13 @@
     "encryption_config_saved": "Encryptie configuratie opgeslagen",
     "encryption_server": "Server naam",
     "encryption_server_enter": "Voer domein naam in",
-    "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
+    "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
     "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",
@@ -352,8 +343,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",
@@ -372,8 +363,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.",
@@ -386,13 +377,13 @@
     "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",
     "client_identifier": "Identificeer via",
     "ip_address": "IP adres",
-    "client_identifier_desc": "Apparaten kunnen worden geïdentificeerd door hun IP-adres, CIDR, MAC-adres of een speciaal apparaat-ID (kan gebruikt worden voor DoT/DoH/DoQ). <0>Hier</0> kan je meer lezen over het identificeren van apparaten.",
+    "client_identifier_desc": "Gebruikers kunnen worden geïdentificeerd door het IP-adres, CIDR of MAC-adres. Hou er rekening mee dat het gebruik van MAC als ID alleen mogelijk is als AdGuard Home ook een <0>DHCP-server</0> is",
     "form_enter_ip": "Vul IP in",
     "form_enter_mac": "Vul MAC in",
     "form_enter_id": "ID invoeren",
@@ -409,35 +400,33 @@
     "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_privacy_ioc_mac": "iOS en macOS configuratie",
-    "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",
@@ -518,8 +507,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",
@@ -536,8 +525,8 @@
     "check_ip": "IP-adressen: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Reden: {{reason}}",
+    "check_rule": "Regel: {{rule}}",
     "check_service": "Servicenaam: {{service}}",
-    "service_name": "Naam service",
     "check_not_found": "Niet in je lijst met filters gevonden",
     "client_confirm_block": "Weet je zeker dat je client \"{{ip}}\" wil blokkeren?",
     "client_confirm_unblock": "Weet je zeker dat je client \"{{ip}}\" niet meer wil blokkeren?",
@@ -572,11 +561,11 @@
     "cache_size_desc": "DNS cache grootte (in bytes)",
     "cache_ttl_min_override": "Minimale TTL overschrijven",
     "cache_ttl_max_override": "Maximale TTL overschrijven",
-    "enter_cache_size": "Cache grootte invoeren (bytes)",
-    "enter_cache_ttl_min_override": "Minimum TTL invoeren (seconden)",
-    "enter_cache_ttl_max_override": "Maximum TTL invoeren (seconden)",
-    "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
-    "cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
+    "enter_cache_size": "Cache grootte invoeren",
+    "enter_cache_ttl_min_override": "Minimale TTL invoeren",
+    "enter_cache_ttl_max_override": "Maximale TTL invoeren",
+    "cache_ttl_min_override_desc": "Overschrijf de TTL waarde (minimum) ontvangen van de upstream server",
+    "cache_ttl_max_override_desc": "Overschrijft TTL waarde (maximaal) ontvangen van de upstream server",
     "ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
     "filter_category_general": "Algemeen",
     "filter_category_security": "Beveiliging",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Klik om queries te bekijken",
     "port_53_faq_link": "Poort 53 wordt vaak gebruikt door services als DNSStubListener- of de systeem DNS-resolver. Lees a.u.b. <0>deze instructie</0> hoe dit is op te lossen.",
     "adg_will_drop_dns_queries": "AdGuard Home zal alle DNS verzoeken van deze toepassing/dit systeem negeren.",
-    "client_not_in_allowed_clients": "De toepassing is niet toegestaan omdat deze niet in de lijst \"Toegestane toepassingen\" voorkomt.",
     "experimental": "Experimenteel"
 }

client/src/__locales/no.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Klientinnstillinger",
     "example_upstream_reserved": "du kan bestemme en oppstrøms-DNS <0>for et spesifikt domene(r)</0>",
-    "example_upstream_comment": "Du kan spesifisere kommentaren",
     "upstream_parallel": "Bruk parallele forespørsler for å få oppfarten på behandlinger, ved å forespørre til alle oppstrømstjenerne samtidig",
     "parallel_requests": "Parallelle forespørsler",
     "load_balancing": "Pågangstrykk-utjevning",
@@ -115,7 +114,7 @@
     "average_processing_time": "Gjennomsnittlig behandlingstid",
     "average_processing_time_hint": "Gjennomsnittstid for behandling av DNS-forespørsler i millisekunder",
     "block_domain_use_filters_and_hosts": "Blokker domener ved hjelp av filtre, «hosts»-filer, og rå domener",
-    "filters_block_toggle_hint": "Du kan sette opp blokkeringsoppføringer i <a>Filtre</a>-innstillingene.",
+    "filters_block_toggle_hint": "Du kan sette opp blokkeringsoppføringer i <a href='#filters'>Filtre</a>-innstillingene.",
     "use_adguard_browsing_sec": "Benytt AdGuard sin nettlesersikkerhetstjeneste",
     "use_adguard_browsing_sec_hint": "AdGuard Home vil sjekke om domenet har blitt svartelistet av nettlesersikkerhetstjenesten. Den vil bruke en privatlivsvennlig søke-API til å utføre sjekken: kun en kort prefiks av domenenavnet med SHA256-salting blir sendt til tjeneren.",
     "use_adguard_parental": "Benytt AdGuard sin foreldrekontroll-nettjeneste",
@@ -133,7 +132,6 @@
     "encryption_settings": "Krypteringsinnstillinger",
     "dhcp_settings": "DHCP-innstillinger",
     "upstream_dns": "Oppstrøms-DNS-tjenere",
-    "upstream_dns_help": "Skriv inn tjeneradresser, én per linje. <a>Lær mer</a> om å konfigurere oppstrøms-DNS-tjenere.",
     "upstream_dns_configured_in_file": "Satt opp i {{path}}",
     "test_upstream_btn": "Test oppstrømstilkoblinger",
     "upstreams": "Oppstrømstjenere",
@@ -249,17 +247,14 @@
     "blocking_ipv6": "IPv6-blokkering",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": "Last ned .mobileconfig for DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Last ned .mobileconfig for DNS-over-TLS",
     "plain_dns": "Ordinær DNS",
     "form_enter_rate_limit": "Skriv inn forespørselsfrekvensgrense",
     "rate_limit": "Forespørselsfrekvensgrense",
     "edns_enable": "Aktiver EDNS-klientundernett",
     "edns_cs_desc": "Hvis det er skrudd på, vil AdGuard Home sende klientenes undernett til DNS-tjenerne.",
-    "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_default": "Standardmodus: Svar med REFUSED når det blokkeres med en adblockoppføring; svar med IP-adressen spesifisert i oppføringen når det blokkeres av en «Hosts»-oppføring",
     "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)",
@@ -269,6 +264,7 @@
     "source_label": "Kilde",
     "found_in_known_domain_db": "Funnet i databasen over kjente domener.",
     "category_label": "Kategori",
+    "rule_label": "Oppføring",
     "list_label": "Liste",
     "unknown_filter": "Ukjent filter {{filterId}}",
     "known_tracker": "Kjent sporer",
@@ -329,6 +325,7 @@
     "encryption_config_saved": "Krypteringsoppsettet ble lagret",
     "encryption_server": "Tjenerens navn",
     "encryption_server_enter": "Skriv inn domenenavnet ditt",
+    "encryption_server_desc": "For å kunne bruke HTTPS, må du skrive inn tjenernavnet som samsvarer med ditt SSL-sertifikat.",
     "encryption_redirect": "Automatisk omdiriger til HTTPS",
     "encryption_redirect_desc": "Dersom dette er valgt, vil AdGuard Home automatisk omdirigere deg fra HTTP til HTTPS-adresser.",
     "encryption_https": "HTTPS-port",
@@ -336,7 +333,6 @@
     "encryption_dot": "'DNS-over-TLS'-port",
     "encryption_dot_desc": "Dersom denne porten er satt opp, vil AdGuard Home kjøre en 'DNS-over-TLS'-tjener på denne porten.",
     "encryption_doq": "'DNS-over-QUIC'-port",
-    "encryption_doq_desc": "Dersom denne porten er satt opp, vil AdGuard Home kjøre en DNS-over-QUIC-tjener på denne porten. Den er eksperimentell og vil kanskje ikke være pålitelig. I tillegg er det ikke så altfor mange klienter som støtter det for øyeblikket.",
     "encryption_certificates": "Sertifikater",
     "encryption_certificates_desc": "For å bruke kryptering, må du skrive inn et gyldig SSL-sertifikatkjede for domenet ditt. Du kan få et gratis sertifikat hos <0>{{link}}</0>, eller kjøpe et fra en av de troverdige sertifikatsautoritetene.",
     "encryption_certificates_input": "Kopier / lim inn dine PEM-kodede sertifikater her.",
@@ -384,6 +380,7 @@
     "client_edit": "Rediger klienten",
     "client_identifier": "Identifikator",
     "ip_address": "IP-adresse",
+    "client_identifier_desc": "Klienter kan bli identifisert gjennom IP-adressen eller MAC-adressen. Vennligst bemerk at å bruke MAC som en identifikator, bare er mulig dersom AdGuard Home også er en <0>DHCP-tjener</0>",
     "form_enter_ip": "Skriv inn IP",
     "form_enter_mac": "Skriv inn MAC",
     "form_enter_id": "Skriv inn identifikator",
@@ -414,7 +411,7 @@
     "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_3": "<0>Vennligst bemerk at krypterte DNS-protokoller bare er støttet på Android 9. Så du må installere ytterligere programvare for andre operativsystemer.</0><0>Her er en liste over programvare som 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.",
@@ -525,8 +522,8 @@
     "check_ip": "IP-adresser: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Årsak: {{reason}}",
+    "check_rule": "Oppføring: {{rule}}",
     "check_service": "Tjenestenavn: {{service}}",
-    "service_name": "Tjenestenavn",
     "check_not_found": "Ikke funnet i filterlistene dine",
     "client_confirm_block": "Er du sikker på at du vil blokkere klienten «{{ip}}»?",
     "client_confirm_unblock": "Er du sikker på at du vil oppheve blokkeringen av klienten «{{ip}}»?",
@@ -561,12 +558,10 @@
     "cache_size_desc": "DNS-mellomlagerstørrelse (i bytes)",
     "cache_ttl_min_override": "Overstyr minimumslevetiden",
     "cache_ttl_max_override": "Overstyr maksimallevetiden",
-    "enter_cache_size": "Skriv inn mellomlagerstørrelse (i bytes)",
-    "enter_cache_ttl_min_override": "Skriv inn minimumslevetiden (i sekunder)",
-    "enter_cache_ttl_max_override": "Skriv inn maksimallevetiden (i sekunder)",
-    "cache_ttl_min_override_desc": "Overstyr korte levetidsverdier (i sekunder) som mottas fra oppstrømstjeneren under mellomlagring av DNS-responser",
-    "cache_ttl_max_override_desc": "Velg en maks-levetidsverdi (i sekunder) for oppføringer i DNS-mellomlageret",
-    "ttl_cache_validation": "Minimums-mellomlagringslevetidsverdien må være mindre enn eller det samme som maksverdien",
+    "enter_cache_size": "Skriv inn mellomlagerstørrelse",
+    "enter_cache_ttl_min_override": "Skriv inn minimumslevetiden",
+    "enter_cache_ttl_max_override": "Skriv inn maksimallevetiden",
+    "cache_ttl_max_override_desc": "Overstyr levetidsverdien (maksimal) som mottas fra oppstrømstjeneren",
     "filter_category_general": "Generelt",
     "filter_category_security": "Sikkerhet",
     "filter_category_regional": "Regional",
@@ -578,8 +573,5 @@
     "setup_config_to_enable_dhcp_server": "Oppsett for å skru på DHCP-tjeneren",
     "original_response": "Opprinnelig svar",
     "click_to_view_queries": "Klikk for å vise forespørsler",
-    "port_53_faq_link": "Port 53 er ofte opptatt av «DNSStubListener»- eller «systemd-resolved»-tjenestene. Vennligst les <0>denne instruksjonen</0> om hvordan man løser dette.",
-    "adg_will_drop_dns_queries": "AdGuard Home vil droppe alle DNS-forespørsler fra denne klienten.",
-    "client_not_in_allowed_clients": "Klienten er ikke tillatt, fordi den ikke er i «Tillatte klienter»-listen.",
     "experimental": "Eksperimentell"
 }

client/src/__locales/pl.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Ustawienia klienta",
     "example_upstream_reserved": "możesz określić serwer DNS <0>dla konkretnych domen</0>",
-    "example_upstream_comment": "Możesz wpisać komentarz",
     "upstream_parallel": "Używaj równoległych żądań, aby przyspieszyć rozwiązywanie adresów domen, jednocześnie wysyłając zapytania do wszystkich głównych serwerów DNS",
     "parallel_requests": "Równoległe żądania",
     "load_balancing": "Równoważenie obciążenia",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Nieprawidłowy format IP",
     "form_error_mac_format": "Nieprawidłowy format MAC",
     "form_error_client_id_format": "Nieprawidłowy format identyfikatora klienta",
-    "form_error_server_name": "Nieprawidłowa nazwa serwera",
     "form_error_positive": "Musi być większa niż 0",
     "form_error_negative": "Musi być równy 0 lub większy",
     "range_end_error": "Zakres musi być większy niż początkowy",
@@ -116,7 +114,7 @@
     "average_processing_time": "Średni czas przetwarzania",
     "average_processing_time_hint": "Średni czas przetwarzania żądania DNS liczony w milisekundach",
     "block_domain_use_filters_and_hosts": "Zablokuj domeny za pomocą filtrów i plików host",
-    "filters_block_toggle_hint": "Możesz skonfigurować reguły blokowania w ustawieniach <a>Filtry</a>.",
+    "filters_block_toggle_hint": "Możesz skonfigurować reguły blokowania w ustawieniach <a href='#filters'>Filtry</a> ",
     "use_adguard_browsing_sec": "Użyj usługi sieciowej Bezpieczne Przeglądanie AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home sprawdzi, czy domena jest na czarnej liście przez serwis internetowy Bezpieczne Przeglądanie. Będzie korzystać z interfejsu API przyjaznego dla prywatności w celu przeprowadzenia kontroli: na serwer wysyłany jest tylko krótki prefiks nazwy domeny SHA256.",
     "use_adguard_parental": "Użyj usługi Kontrola Rodzicielska AdGuard",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Blokowanie IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID klienta",
-    "client_id_placeholder": "Wpisz ID klienta",
-    "client_id_desc": "Różnych klientów można zidentyfikować za pomocą specjalnego ID klienta. <a>Tutaj</a> możesz dowiedzieć się więcej o tym, jak identyfikować klientów.",
-    "download_mobileconfig_doh": "Pobierz plik .mobileconfig dla DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Pobierz plik .mobileconfig dla DNS-over-TLS",
-    "download_mobileconfig": "Pobierz plik konfiguracyjny",
     "plain_dns": "Zwykły DNS",
     "form_enter_rate_limit": "Wpisz limit ilościowy",
     "rate_limit": "Limit ilościowy",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Liczba żądań na sekundę, które może wykonać pojedynczy klient (ustawienie 0 oznacza nieograniczoną liczbę)",
     "blocking_ipv4_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania A",
     "blocking_ipv6_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania AAAA",
-    "blocking_mode_default": "Domyślna: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA) po zablokowaniu przez regułę Adblock; odpowiedź adresem IP wpisanym w regule, jeśli jest blokowany przez regułę w stylu /etc/hosts",
+    "blocking_mode_default": "Domyślny: Odpowiedz kodem REFUSED, gdy zostanie zablokowany przez regułę w stylu Adblock; odpowiedz na adres IP określony w regule, gdy zostanie zablokowany przez regułę w stylu /etc/hosts",
     "blocking_mode_refused": "REFUSED: Odpowiedz kodem REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Odpowiedz kodem NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Źródło",
     "found_in_known_domain_db": "Znaleziono w bazie danych znanych domen.",
     "category_label": "Kategoria",
-    "rule_label": "Reguła(y)",
+    "rule_label": "Reguła",
     "list_label": "Lista",
     "unknown_filter": "Nieznany filtr {{filterId}}",
     "known_tracker": "Znany element śledzący",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Zapisano konfigurację szyfrowania",
     "encryption_server": "Nazwa serwera",
     "encryption_server_enter": "Wpisz swoją nazwę domeny",
-    "encryption_server_desc": "Aby korzystać z protokołu HTTPS, musisz wprowadzić nazwę serwera, która jest zgodna z certyfikatem SSL lub certyfikatem typu wildcard. Jeśli pole nie jest ustawione, będzie akceptować połączenia TLS dla dowolnej domeny.",
+    "encryption_server_desc": "Aby korzystać z protokołu HTTPS, musisz wprowadzić nazwę serwera zgodną z certyfikatem SSL.",
     "encryption_redirect": "Przekieruj automatycznie do HTTPS",
     "encryption_redirect_desc": "Jeśli zaznaczone, AdGuard Home automatycznie przekieruje Cię z adresów HTTP na HTTPS.",
     "encryption_https": "Port HTTPS",
@@ -392,7 +383,7 @@
     "client_edit": "Edytuj klienta",
     "client_identifier": "Identyfikator",
     "ip_address": "Adres IP",
-    "client_identifier_desc": "Klientów można zidentyfikować po adresie IP, CIDR, adresie MAC lub specjalnym identyfikatorze klienta (może służyć do DoT/DoH/DoQ). <0>Tutaj</0> możesz dowiedzieć się więcej o tym, jak identyfikować klientów.",
+    "client_identifier_desc": "Klienci mogą być identyfikowani na podstawie adresu IP, CIDR, adresu MAC. Pamiętaj, że użycie MAC jako identyfikatora jest możliwe tylko wtedy, gdy AdGuard Home jest również <0>serwerem DHCP</0>",
     "form_enter_ip": "Wpisz adres IP",
     "form_enter_mac": "Wpisz adres MAC",
     "form_enter_id": "Wpisz identyfikator",
@@ -423,8 +414,7 @@
     "dns_privacy": "Prywatny DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Skorzystaj z adresu <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Skorzystaj z adresu <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Oto lista oprogramowania, którego możesz użyć.</0>",
-    "setup_dns_privacy_4": "Na urządzeniu iOS 14 lub macOS Big Sur możesz pobrać specjalny plik '.mobileconfig', który dodaje serwery <highlight>DNS-over-HTTPS</highlight> lub <highlight>DNS-over-TLS</highlight> do ustawień DNS.",
+    "setup_dns_privacy_3": "<0>Należy pamiętać, że szyfrowane protokoły DNS są obsługiwane tylko w systemie Android 9. Musisz zainstalować dodatkowe oprogramowanie dla innych systemów operacyjnych.</0><0>Oto lista oprogramowania, którego możesz użyć.</0>",
     "setup_dns_privacy_android_1": "System Android 9 obsługuje natywnie DNS-over-TLS. Aby go skonfigurować, przejdź do Ustawienia → Sieć i Internet → Zaawansowane → Prywatny DNS i wpisz tam swoją nazwę domeny.",
     "setup_dns_privacy_android_2": "Aplikacja <0>AdGuard dla Androida</0> obsługuje <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "Aplikacja <0>Intra</0> dodaje obsługę <1>DNS-over-HTTPS</1> dla Androida.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> obsługuje <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> obsługuje <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Znajdziesz więcej implementacji <0>tutaj</0> i <1>tutaj</1>.",
-    "setup_dns_privacy_ioc_mac": "Konfiguracja iOS i macOS",
     "setup_dns_notice": "Aby skorzystać z <1>DNS-over-HTTPS</1> lub <1>DNS-over-TLS</1>, musisz w ustawieniach AdGuard Home <0>skonfigurować szyfrowanie</0>.",
     "rewrite_added": "Pomyślnie dodano przepisanie DNS dla „{{key}}”",
     "rewrite_deleted": "Przepisanie DNS dla „{{key}}” zostało pomyślnie usunięte",
@@ -536,8 +525,8 @@
     "check_ip": "Adresy IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Powód: {{reason}}",
+    "check_rule": "Reguła: {{rule}}",
     "check_service": "Nazwa usługi: {{service}}",
-    "service_name": "Nazwa usługi",
     "check_not_found": "Nie znaleziono na Twoich listach filtrów",
     "client_confirm_block": "Czy na pewno chcesz zablokować klienta \"{{ip}}\"?",
     "client_confirm_unblock": "Czy na pewno chcesz odblokować klienta \"{{ip}}\"?",
@@ -572,12 +561,11 @@
     "cache_size_desc": "Rozmiar pamięci podręcznej DNS (w bajtach)",
     "cache_ttl_min_override": "Nadpisz minimalną wartość TTL",
     "cache_ttl_max_override": "Nadpisz maksymalną wartość TTL",
-    "enter_cache_size": "Wpisz rozmiar pamięci podręcznej (w bajtach)",
-    "enter_cache_ttl_min_override": "Wpisz minimalną wartość TTL (w sekundach)",
-    "enter_cache_ttl_max_override": "Wpisz maksymalną wartość TTL (w sekundach)",
-    "cache_ttl_min_override_desc": "Zastąp wartość TTL (w sekundach) otrzymaną z serwera nadrzędnego podczas buforowania odpowiedzi DNS",
-    "cache_ttl_max_override_desc": "Ustaw maksymalną wartość TTL (w sekundach) dla wpisów w pamięci podręcznej DNS",
-    "ttl_cache_validation": "Minimalna pamięć podręczna wartości TTL musi być mniejsza lub równa maksymalnej wartości",
+    "enter_cache_size": "Wpisz rozmiar pamięci podręcznej",
+    "enter_cache_ttl_min_override": "Wpisz minimalną wartość TTL",
+    "enter_cache_ttl_max_override": "Wpisz maksymalną wartość TTL",
+    "cache_ttl_min_override_desc": "Nadpisz wartość TTL (minimalną) otrzymaną od serwera nadrzędnego",
+    "cache_ttl_max_override_desc": "Nadpisz wartość TTL (maksymalną) otrzymaną od serwera nadrzędnego",
     "filter_category_general": "Ogólne",
     "filter_category_security": "Bezpieczeństwo",
     "filter_category_regional": "Regionalne",
@@ -591,6 +579,5 @@
     "click_to_view_queries": "Kliknij, aby wyświetlić zapytania",
     "port_53_faq_link": "Port 53 jest często zajęty przez usługi \"DNSStubListener\" lub \"systemd-resolved\". Przeczytaj <0>tę instrukcję</0> jak to rozwiązać.",
     "adg_will_drop_dns_queries": "AdGuard Home odrzuci zapytanie DNS od tego klienta.",
-    "client_not_in_allowed_clients": "Klient nie jest dozwolony, ponieważ nie ma go na liście „Dozwoleni klienci”.",
     "experimental": "Funkcja eksperymentalna"
 }

client/src/__locales/pt-br.json

@@ -1,7 +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_comment": "Você pode especificar o comentário",
+    "example_upstream_reserved": "Você pode especificar o DNS upstream <0>para o domínio(s) especifico</0>",
     "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",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Formato de endereço IPv inválido",
     "form_error_mac_format": "Formato do endereço MAC inválido",
     "form_error_client_id_format": "Formato do ID de cliente inválido",
-    "form_error_server_name": "Nome de servidor inválido",
     "form_error_positive": "Deve ser maior que 0",
     "form_error_negative": "Deve ser igual ou superior a 0",
     "range_end_error": "Deve ser maior que o início do intervalo",
@@ -74,7 +72,7 @@
     "filters": "Filtros",
     "filter": "Filtro",
     "query_log": "Registro de consultas",
-    "compact": "Compacto",
+    "compact": "Compactar",
     "nothing_found": "Nada encontrado",
     "faq": "FAQ",
     "version": "Versão",
@@ -116,7 +114,7 @@
     "average_processing_time": "Tempo médio de processamento",
     "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
     "block_domain_use_filters_and_hosts": "Bloquear domínios usando arquivos de filtros e hosts",
-    "filters_block_toggle_hint": "Você pode configurar as regras de bloqueio nas configurações de <a>Filtros</a>.",
+    "filters_block_toggle_hint": "Você pode configurar as regras de bloqueio nas configurações de <a href='#filters'>Filtros</a>.",
     "use_adguard_browsing_sec": "Usar o serviço de segurança da navegação do AdGuard",
     "use_adguard_browsing_sec_hint": "O AdGuard Home irá verificar se o domínio está na lista negra do serviço de segurança da navegação. Ele usará a API de pesquisa de privacidade para executar a verificação: apenas um prefixo curto do hash do nome de domínio SHA256 é enviado para o servidor.",
     "use_adguard_parental": "Usar o serviço de controle parental do AdGuard",
@@ -126,18 +124,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",
@@ -158,22 +156,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": "Escolha as listas negras",
+    "choose_allowlist": "Escolha 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",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Bloqueando IPv6",
     "dns_over_https": "DNS-sobre-HTTPS",
     "dns_over_tls": "DNS-sobre-TLS",
-    "dns_over_quic": "DNS-sobre-QUIC",
-    "client_id": "ID do cliente",
-    "client_id_placeholder": "Digite o ID do cliente",
-    "client_id_desc": "Diferentes clientes podem ser identificados por um ID de cliente especial. <a>Aqui</a> você pode aprender mais sobre como identificar clientes.",
-    "download_mobileconfig_doh": "BAixar .mobileconfig para DNS-sobre-HTTPS",
-    "download_mobileconfig_dot": "BAixar .mobileconfig para DNS-sobre-TLS",
-    "download_mobileconfig": "Baixar arquivo de configuração",
     "plain_dns": "DNS simples",
     "form_enter_rate_limit": "Insira a taxa limite",
     "rate_limit": "Taxa limite",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "O número de solicitações por segundo que um único cliente pode fazer (0: ilimitado)",
     "blocking_ipv4_desc": "Endereço de IP a ser retornado para uma solicitação bloqueada",
     "blocking_ipv6_desc": "Endereço de IP a ser retornado para uma solicitação AAAA bloqueada",
-    "blocking_mode_default": "Padrão: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
+    "blocking_mode_default": "Por padrão: Responder com REFUSED quando bloqueado pela regra estilo Adblock e responde com o endereço de IP especificado na regra quando bloqueado pela regra estilo /etc/hosts-style",
     "blocking_mode_refused": "REFUSED: responder com o código REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Responder com o código NXDOMAIN",
     "blocking_mode_null_ip": "IP nulo: Responder com endereço IP zero (0.0.0.0 para A; :: para AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Fonte",
     "found_in_known_domain_db": "Encontrado no banco de dados de domínios conhecidos.",
     "category_label": "Categoria",
-    "rule_label": "Regra(s)",
+    "rule_label": "Regra",
     "list_label": "Lista",
     "unknown_filter": "Filtro desconhecido {{filterId}}",
     "known_tracker": "Rastreador conhecido",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Configuração de criptografia salva",
     "encryption_server": "Nome do servidor",
     "encryption_server_enter": "Digite seu nome de domínio",
-    "encryption_server_desc": "Para usar HTTPS, você precisa inserir o nome do servidor que corresponda ao seu certificado SSL ou certificado curinga. Se o campo não estiver definido, ele aceitará conexões TLS para qualquer domínio.",
+    "encryption_server_desc": "Para usar o protocolo HTTPS, você precisa digitar o nome do servidor que corresponde ao seu certificado SSL.",
     "encryption_redirect": "Redirecionar automaticamente para HTTPS",
     "encryption_redirect_desc": "Se marcado, o AdGuard Home irá redirecionar automaticamente os endereços HTTP para HTTPS.",
     "encryption_https": "Porta HTTPS",
@@ -392,7 +383,7 @@
     "client_edit": "Editar cliente",
     "client_identifier": "Identificador",
     "ip_address": "Endereço de IP",
-    "client_identifier_desc": "Os clientes podem ser identificados pelo endereço IP, CIDR, Endereço MAC ou um ID de cliente especial (pode ser usado para DoT/DoH/DoQ). <0>Aqui</0> você pode aprender mais sobre como identificar clientes.",
+    "client_identifier_desc": "Clientes podem ser identificados pelo endereço de IP ou pelo endereço MAC. Observe que o uso do endereço MAC como identificador só é possível se o AdGuard Home também for um <0>servidor DHCP</0>",
     "form_enter_ip": "Digite o endereço de IP",
     "form_enter_mac": "Digite o endereço MAC",
     "form_enter_id": "Inserir identificador",
@@ -423,8 +414,7 @@
     "dns_privacy": "Privacidade de DNS",
     "setup_dns_privacy_1": "<0>DNS-sobre-TLS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-sobre-HTTPS:</0> Use <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Aqui está uma lista de softwares que você pode usar.</0>",
-    "setup_dns_privacy_4": "Em um dispositivo iOS 14 ou macOS Big Sur, você pode baixar o arquivo especial '.mobileconfig' que adiciona os servidores <highlight>DNS-sobre-HTTPS</highlight> ou <highlight>DNS-sobre-TLS</highlight> nas configurações de DNS.",
+    "setup_dns_privacy_3": "<0>Por favor, note que os protocolos de DNS criptografados são suportados apenas no Android 9. Então, você irá precisa instalar um software adicional em outros sistemas operacionais.</0><0>Aqui está a lista de softwares que você pode usar.</0>",
     "setup_dns_privacy_android_1": "O Android 9 suporta o DNS-sobre-TLS de forma nativa. Para configurá-lo, vá para Configurações → Rede e internet → Avançado → DNS privado e digite seu nome de domínio lá.",
     "setup_dns_privacy_android_2": "O <0>AdGuard para Android</0> suporta <1>DNS-sobre-HTTPS</1> e <1>DNS-sobre-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> adiciona o suporte <1>DNS-sobre-HTTPS</1> para o Android.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> suporta <1>DNS-sobre-HTTPS</1>",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> suporta <1>DNS-sobre-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Você encontrará mais implementações <0>aqui</0> e <1>aqui</1>.",
-    "setup_dns_privacy_ioc_mac": "configuração para iOS e macOS",
     "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, você precisa <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
     "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
     "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
@@ -514,14 +503,14 @@
     "rewrite_ip_address": "Endereço IP: use esse IP em uma resposta A ou AAAA",
     "rewrite_domain_name": "Nome de domínio: adicione um registro CNAME",
     "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registros do upstream",
-    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do servidor DNS primário",
+    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do upstream",
     "disable_ipv6": "Desativar IPv6",
     "disable_ipv6_desc": "Se este recurso estiver ativado, todas as consultas de DNS para endereços IPv6 (tipo AAAA) serão ignoradas.",
     "fastest_addr": "Endereço de IP mais rápido",
     "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso irá retardar as consultas ao DNS, pois temos que esperar por respostas de todos os servidores DNS, porém melhorando a conectividade em geral.",
     "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
     "autofix_warning_list": "Ele irá realizar estas tarefas: <0>Desativar sistema DNSStubListener</0> <0>Definir endereço do servidor DNS para 127.0.0.1</0> <0>Substituir o alvo simbólico do link /etc/resolv.conf para /run/systemd/resolv.conf</0> <0>Parar DNSStubListener (recarregar serviço resolvido pelo sistema)</0>",
-    "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuard Home por padrão.",
+    "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuardHome por padrão.",
     "tags_title": "Marcadores",
     "tags_desc": "Você pode selecionar as tags que correspondem ao cliente. As tags podem ser incluídas nas regras de filtragem e permitir que você as aplique com mais precisão. <0>Saiba mais</0>",
     "form_select_tags": "Selecione as tags do cliente",
@@ -536,8 +525,8 @@
     "check_ip": "Endereços de IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Motivo: {{reason}}",
+    "check_rule": "Regra: {{rule}}",
     "check_service": "Nome do serviço: {{service}}",
-    "service_name": "Nome do serviço",
     "check_not_found": "Não encontrado em suas listas de filtros",
     "client_confirm_block": "Você tem certeza de que deseja bloquear o cliente \"{{ip}}\"?",
     "client_confirm_unblock": "Você tem certeza de que deseja desbloquear o cliente \"{{ip}}\"?",
@@ -566,17 +555,17 @@
     "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)",
     "cache_ttl_min_override": "Sobrepor o TTL mínimo",
     "cache_ttl_max_override": "Sobrepor o TTL máximo",
-    "enter_cache_size": "Digite o tamanho do cache (bytes)",
-    "enter_cache_ttl_min_override": "Digite o TTL máximo (segundos)",
-    "enter_cache_ttl_max_override": "Digite o TTL máximo (segundos)",
-    "cache_ttl_min_override_desc": "Prolongue os valores de curta duração (segundos) recebidos do servidor primário ao armazenar em cache as respostas DNS",
-    "cache_ttl_max_override_desc": "Defina um valor máximo de tempo de vida (segundos) para entradas no cache DNS",
+    "enter_cache_size": "Digite o tamanho do cache",
+    "enter_cache_ttl_min_override": "Digite o TTL mínimo",
+    "enter_cache_ttl_max_override": "Digite o TTL máximo",
+    "cache_ttl_min_override_desc": "Substituição do valor TTL (mínimo) recebido do servidor servidor DNS primário. Esse valor não pode exceder 3600 (1 hora)",
+    "cache_ttl_max_override_desc": "Substituição do valor TTL (máximo) recebido do servidor de DNS primário",
     "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
     "filter_category_general": "Geral",
     "filter_category_security": "Segurança",
@@ -585,12 +574,11 @@
     "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",
     "port_53_faq_link": "A porta 53 é frequentemente ocupada por serviços \"DNSStubListener\" ou \"systemd-resolved\". Por favor leia <0>essa instrução</0> para resolver isso.",
     "adg_will_drop_dns_queries": "O AdGuard Home descartará todas as consultas DNS deste cliente.",
-    "client_not_in_allowed_clients": "O cliente não é permitido porque não está na lista \"Clientes permitidos\".",
     "experimental": "Experimental"
 }

client/src/__locales/pt-pt.json

@@ -1,19 +1,13 @@
 {
     "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_comment": "Tu podes especificar o comentário",
+    "example_upstream_reserved": "pode especificar um DNS upstream <0>para domínio(s) especifico(s)</0>",
     "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",
+    "save_config": "Guardar configuração",
     "enabled_dhcp": "Servidor DHCP activado",
     "disabled_dhcp": "Servidor DHCP desactivado",
-    "unavailable_dhcp": "DHCP não está disponível",
-    "unavailable_dhcp_desc": "O AdGuard Home não pode executar um servidor DHCP em seu sistema operacional",
     "dhcp_title": "Servidor DHCP (experimental)",
     "dhcp_description": "Se o seu router não fornecer configurações de DHCP, poderá usar o servidor DHCP integrado do AdGuard.",
     "dhcp_enable": "Activar servidor DHCP",
@@ -23,19 +17,15 @@
     "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_ipv4_settings": "Definições DHCP IPv4",
-    "dhcp_ipv6_settings": "Definições DHCP IPv6",
+    "dhcp_config_saved": "Configurações DHCP guardadas com sucesso",
     "form_error_required": "Campo obrigatório",
     "form_error_ip4_format": "Formato de endereço IPv4 inválido",
     "form_error_ip6_format": "Formato de endereço IPv6 inválido",
     "form_error_ip_format": "Formato de endereço IPv4 inválido",
     "form_error_mac_format": "Formato do endereço MAC inválido",
     "form_error_client_id_format": "Formato inválido",
-    "form_error_server_name": "Nome de servidor inválido",
     "form_error_positive": "Deve ser maior que 0",
     "form_error_negative": "Deve ser igual ou superior a 0",
-    "range_end_error": "Deve ser maior que o início do intervalo",
     "dhcp_form_gateway_input": "IP do gateway",
     "dhcp_form_subnet_input": "Máscara de sub-rede",
     "dhcp_form_range_title": "Faixa de endereços IP",
@@ -46,7 +36,6 @@
     "dhcp_interface_select": "Seleccione a interface DHCP",
     "dhcp_hardware_address": "Endereço de hardware",
     "dhcp_ip_addresses": "Endereços de IP",
-    "ip": "IP",
     "dhcp_table_hostname": "Nome do servidor",
     "dhcp_table_expires": "Expira",
     "dhcp_warning": "Se quiser activar o servidor DHCP, verifique se não há outro servidor DHCP activo na sua rede. Caso contrário, a internet pode parar de funcionar noutros dispositivos ligados!",
@@ -58,28 +47,18 @@
     "dhcp_new_static_lease": "Nova concessão estática",
     "dhcp_static_leases_not_found": "Nenhuma concessão DHCP estática foi encontrada",
     "dhcp_add_static_lease": "Adicionar nova concessão estática",
-    "dhcp_reset": "Tem a certeza de que deseja repor a definição de DHCP?",
-    "country": "País",
-    "city": "Cidade",
+    "dhcp_reset": "Tem a certeza de que deseja redefinir a configuração DHCP?",
     "delete_confirm": "Tem a certeza de que deseja excluir \"{{key}}\"?",
     "form_enter_hostname": "Insira o hostname",
     "error_details": "Detalhes do erro",
-    "response_details": "Detalhes da resposta",
-    "request_details": "Detalhes da solicitação",
-    "client_details": "Detalhes do cliente",
-    "details": "Detalhes",
     "back": "Retroceder",
     "dashboard": "Painel",
     "settings": "Definições",
     "filters": "Filtros",
-    "filter": "Filtro",
     "query_log": "Registo de consultas",
-    "compact": "Compacto",
-    "nothing_found": "Nada encontrado",
-    "faq": "FAQ",
+    "faq": "Perguntas frequentes",
     "version": "Versão",
     "address": "Endereço",
-    "protocol": "Protocolo",
     "on": "LIGADO",
     "off": "DESLIGADO",
     "copyright": "Copyright",
@@ -92,7 +71,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",
@@ -116,7 +95,7 @@
     "average_processing_time": "Tempo médio de processamento",
     "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
     "block_domain_use_filters_and_hosts": "Bloquear domínios usando arquivos de filtros e hosts",
-    "filters_block_toggle_hint": "Pode configurar as regras de bloqueio nas configurações de <a>Filtros</a>.",
+    "filters_block_toggle_hint": "Pode configurar as regras de bloqueio nas configurações de <a href='#filters'>Filtros</a>.",
     "use_adguard_browsing_sec": "Usar o serviço de segurança da navegação do AdGuard",
     "use_adguard_browsing_sec_hint": "O AdGuard Home irá verificar se o domínio está na lista negra do serviço de segurança da navegação. Usará a API de pesquisa de privacidade para executar a verificação: apenas um prefixo curto do hash do nome de domínio SHA256 é enviado para o servidor.",
     "use_adguard_parental": "Usar o serviço de controlo parental do AdGuard",
@@ -126,18 +105,11 @@
     "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.",
-    "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",
-    "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",
+    "encryption_settings": "Configurações de criptografia",
+    "dhcp_settings": "Configurações de DHCP",
+    "upstream_dns": "Servidores DNS upstream",
+    "test_upstream_btn": "Testar upstreams",
+    "upstreams": "Upstreams",
     "apply_btn": "Aplicar",
     "disabled_filtering_toast": "Filtragem desactivada",
     "enabled_filtering_toast": "Filtragem activada",
@@ -149,33 +121,15 @@
     "enabled_save_search_toast": "Pesquisa segura activada",
     "enabled_table_header": "Activados",
     "name_table_header": "Nome",
-    "list_url_table_header": "URL da lista",
     "rules_count_table_header": "Total de Regras",
     "last_time_updated_table_header": "Última actualização",
     "actions_table_header": "Acções",
-    "request_table_header": "Solicitação",
     "edit_table_action": "Editar",
     "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",
     "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.",
-    "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",
     "custom_filter_rules_hint": "Insira uma regra por linha. Pode usar regras de bloqueio de anúncios ou a sintaxe de arquivos de hosts.",
     "examples_title": "Exemplos",
@@ -186,29 +140,21 @@
     "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",
     "example_upstream_sdns": "pode usar <0>DNS Stamps</0>para o <1>DNSCrypt</1>ou usar os resolvedores <2>DNS-sobre-HTTPS</2>",
     "example_upstream_tcp": "dNS regular (através do TCP)",
-    "all_lists_up_to_date_toast": "Todas as listas já estão atualizadas",
     "updated_upstream_dns_toast": "A actualizar os servidores DNS upstream",
     "dns_test_ok_toast": "Os servidores DNS especificados estão a funcionar correctamente",
     "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se o escreveu correctamente",
     "unblock": "Desbloquear",
     "block": "Bloquear",
-    "disallow_this_client": "Não permitir este cliente",
-    "allow_this_client": "Permitir este cliente",
-    "block_for_this_client_only": "Bloquear apenas para este cliente",
-    "unblock_for_this_client_only": "Desbloquear apenas para este cliente",
     "time_table_header": "Data",
     "date": "Data",
     "domain_name_table_header": "Nome do domínio",
-    "domain_or_client": "Domínio ou cliente",
     "type_table_header": "Tipo",
     "response_table_header": "Resposta",
-    "response_code": "Código de resposta",
     "client_table_header": "Cliente",
     "empty_response_status": "Vazio",
     "show_all_filter_type": "Mostrar todos",
@@ -227,7 +173,6 @@
     "query_log_filtered": "Filtrado por {{filter}}",
     "query_log_confirm_clear": "Tem a certeza de que deseja limpar todo o registo de consulta?",
     "query_log_cleared": "O registo de consulta foi limpo com sucesso",
-    "query_log_updated": "O registro da consulta foi actualizado com sucesso",
     "query_log_clear": "Limpar registos de consulta",
     "query_log_retention": "Retenção de registos de consulta",
     "query_log_enable": "Activar registo",
@@ -235,50 +180,25 @@
     "query_log_disabled": "O registo de consulta está desactivado e pode ser configurado em <0>definições</0>",
     "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
     "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
-    "anonymize_client_ip": "Tornar anônimo o IP do cliente",
-    "anonymize_client_ip_desc": "Não salva o endereço de IP completo do cliente em registros e estatísticas",
-    "dns_config": "Definição do servidor DNS",
-    "dns_cache_config": "Definição de cache DNS",
-    "dns_cache_config_desc": "Aqui você pode configurar o cache do DNS",
+    "dns_config": "Configuração do servidor DNS",
     "blocking_mode": "Modo de bloqueio",
-    "default": "Padrão",
     "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
     "null_ip": "IP nulo",
     "custom_ip": "IP Personalizado",
     "blocking_ipv4": "A bloquear IPv4",
     "blocking_ipv6": "A bloquear IPv6",
-    "dns_over_https": "DNS-sobre-HTTPS",
-    "dns_over_tls": "DNS-sobre-TLS",
-    "dns_over_quic": "DNS-sobre-QUIC",
-    "client_id": "ID do cliente",
-    "client_id_placeholder": "Insira o ID do cliente",
-    "client_id_desc": "Diferentes clientes podem ser identificados por um ID de cliente especial. <a>Aqui</a> você pode aprender mais sobre como identificar clientes.",
-    "download_mobileconfig_doh": "Transferir .mobileconfig para DNS-sobre-HTTPS",
-    "download_mobileconfig_dot": "Transferir .mobileconfig para DNS-sobre-TLS",
-    "download_mobileconfig": "Transferir arquivo de configuração",
-    "plain_dns": "DNS simples",
     "form_enter_rate_limit": "Insira o limite de taxa",
     "rate_limit": "Limite de taxa",
     "edns_enable": "Activar sub-rede do cliente EDNS",
     "edns_cs_desc": "Se activado, o AdGuard Home enviará sub-redes dos clientes para os servidores DNS.",
-    "rate_limit_desc": "O número de solicitações por segundo que um único cliente pode fazer (0: ilimitado)",
     "blocking_ipv4_desc": "Endereço IP a ser devolvido para uma solicitação A bloqueada",
     "blocking_ipv6_desc": "Endereço IP a ser devolvido para uma solicitação AAAA bloqueada",
-    "blocking_mode_default": "Padrão: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
-    "blocking_mode_refused": "REFUSED: responder com o código REFUSED",
-    "blocking_mode_nxdomain": "NXDOMAIN: Responder com o código NXDOMAIN",
-    "blocking_mode_null_ip": "IP nulo: Responder com endereço IP zero (0.0.0.0 para A; :: para AAAA)",
-    "blocking_mode_custom_ip": "IP personalizado: Responder com um endereço IP definido manualmente",
     "upstream_dns_client_desc": "Se mantiver esse campo vazio, o AdGuard Home usará os servidores configurados nas <0>Definições de DNS</0>.",
-    "tracker_source": "Fonte do rastreador",
     "source_label": "Fonte",
     "found_in_known_domain_db": "Encontrado no banco de dados de domínios conhecido.",
     "category_label": "Categoria",
-    "rule_label": "Regra(s)",
-    "list_label": "Lista",
+    "rule_label": "Regra",
     "unknown_filter": "Filtro desconhecido {{filterId}}",
-    "known_tracker": "Rastreador conhecido",
     "install_welcome_title": "Bem-vindo ao AdGuard Home!",
     "install_welcome_desc": "O AdGuard Home é um servidor de DNS para bloqueio de anúncios e monitorização em toda a rede. A sua finalidade é permitir que controle toda a sua rede e os seus dispositivos sem precisar de ter um programa instalado.",
     "install_settings_title": "Interface web de administrador",
@@ -300,14 +220,13 @@
     "install_devices_title": "Configure os seus dispositivos",
     "install_devices_desc": "Para que o AdGuard Home comece a funcionar, precisa de configurar os seus dispositivos para o poder usar.",
     "install_submit_title": "Parabéns!",
-    "install_submit_desc": "O procedimento de definição está concluído e está pronto para começar a usar o AdGuard Home.",
+    "install_submit_desc": "O procedimento de configuração está concluído e está pronto para começar a usar o AdGuard Home.",
     "install_devices_router": "Router",
-    "install_devices_router_desc": "Esta definição cobrirá automaticamente todos os dispositivos ligados ao seu router doméstico e não irá precisar de configurar cada um deles manualmente.",
+    "install_devices_router_desc": "Esta configuração cobrirá automaticamente todos os dispositivos ligados ao seu router doméstico e não irá precisar de configurar cada um deles manualmente.",
     "install_devices_address": "O servidor de DNS do AdGuard Home está a capturar os seguintes endereços",
-    "install_devices_router_list_1": "Abra as configurações do seu router. No navegador insira o IP do router, o padrão é (http://192.168.0.1/ ou http://192.168.1.1/), e o login e a palavra-passe é admin/admin; Se não se lembra da palavra-passe, pode repor a palavra-passe rapidamente pressionando um botão no próprio router. Alguns routers têm um aplicação específica que já deve estar instalada no seu computador/telefone.",
+    "install_devices_router_list_1": "Abra as configurações do seu router. No navegador insira o IP do router, o padrão é (http://192.168.0.1/ ou http://192.168.1.1/), e o login e a palavra-passe é admin/admin; Se não se lembra da palavra-passe, pode redefinir a palavra-passe rapidamente pressionando um botão no próprio router. Alguns routers têm um aplicação específica que já deve estar instalada no seu computador/telefone.",
     "install_devices_router_list_2": "Encontre as configurações de DNS. Procure as letras DNS ao lado de um campo que permite dois ou três conjuntos de números, cada um dividido em quatro grupos de um a três números.",
     "install_devices_router_list_3": "Insira aqui seu servidor do AdGuard Home.",
-    "install_devices_router_list_4": "Você não pode definir um servidor DNS personalizado em alguns tipos de roteadores. Nesse caso, pode ajudar se você configurar o AdGuard Home como um <0>servidor DHCP</0>. Caso contrário, você deve procurar o manual sobre como personalizar os servidores DNS para o seu modelo de roteador específico.",
     "install_devices_windows_list_1": "Abra o Painel de Controlo através do Menu Iniciar ou pela Pesquisa do Windows.",
     "install_devices_windows_list_2": "Entre na categoria Rede e Internet e depois clique em Central de Rede e Partilha.",
     "install_devices_windows_list_3": "No lado esquerdo da janela clique em Alterar as definições do adaptador.",
@@ -333,18 +252,16 @@
     "install_saved": "Guardado com sucesso",
     "encryption_title": "Encriptação",
     "encryption_desc": "Suporta a criptografia (HTTPS/TLS) para DNS e interface de administração web",
-    "encryption_config_saved": "Definição de criptografia guardada",
+    "encryption_config_saved": "Configuração de criptografia guardada",
     "encryption_server": "Nome do servidor",
     "encryption_server_enter": "Insira o seu nome de domínio",
-    "encryption_server_desc": "Para usar HTTPS, você precisa inserir o nome do servidor que corresponda ao seu certificado SSL ou certificado curinga. Se o campo não estiver definido, ele aceitará conexões TLS para qualquer domínio.",
+    "encryption_server_desc": "Para usar o protocolo HTTPS, precisa de inserir o nome do servidor que corresponde ao seu certificado SSL.",
     "encryption_redirect": "Redireccionar automaticamente para HTTPS",
     "encryption_redirect_desc": "Se marcado, o AdGuard Home irá redireccionar automaticamente os endereços HTTP para HTTPS.",
     "encryption_https": "Porta HTTPS",
     "encryption_https_desc": "Se a porta HTTPS estiver configurada, a interface administrativa do AdGuard Home será acessível via HTTPS e também fornecerá o DNS-sobre-HTTPS no local '/dns-query'.",
     "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_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.",
@@ -361,14 +278,14 @@
     "encryption_subject": "Assunto",
     "encryption_issuer": "Emissor",
     "encryption_hostnames": "Nomes dos servidores",
-    "encryption_reset": "Tem a certeza de que deseja repor a definição de criptografia?",
+    "encryption_reset": "Tem a certeza de que deseja redefinir a configuração de criptografia?",
     "topline_expiring_certificate": "O seu certificado SSL está prestes a expirar. Actualize as suas <0>definições de criptografia</0>.",
     "topline_expired_certificate": "O seu certificado SSL está expirado. Actualize as suas <0>definições de criptografia</0>.",
     "form_error_port_range": "Digite um porta entre 80 e 65535",
     "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": "Redefinir 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",
@@ -378,7 +295,7 @@
     "fix": "Corrigido",
     "dns_providers": "Aqui está uma <0>lista de provedores de DNS conhecidos</0> para escolher.",
     "update_now": "Actualizar agora",
-    "update_failed": "A actualização automática falhou. Por favor, <a>siga estes passos</a> para actualizar manualmente.",
+    "update_failed": "A atualização automática falhou. Por favor, <a>siga estes passos</a> para actualizar manualmente.",
     "processing_update": "Por favor espere, o AdGuard Home está a actualizar-se",
     "clients_title": "Clientes",
     "clients_desc": "Configure os dispositivos ligados ao AdGuard",
@@ -392,23 +309,22 @@
     "client_edit": "Editar cliente",
     "client_identifier": "Identificador",
     "ip_address": "Endereço de IP",
-    "client_identifier_desc": "Os clientes podem ser identificados pelo endereço IP, CIDR, Endereço MAC ou um ID de cliente especial (pode ser usado para DoT/DoH/DoQ). <0>Aqui</0> você pode aprender mais sobre como identificar clientes.",
+    "client_identifier_desc": "Os clientes podem ser identificados pelo endereço de IP, CIDR, ou pelo endereço MAC. Observe que o uso do endereço MAC como identificador só é possível se o AdGuard Home também for um <0>servidor DHCP</0>",
     "form_enter_ip": "Insira IP",
     "form_enter_mac": "Insira o endereço MAC",
     "form_enter_id": "Inserir identificador",
     "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",
     "clients_not_found": "Nenhum cliente foi encontrado",
     "client_confirm_delete": "Tem a certeza de que deseja excluir o cliente \"{{key}}\"?",
-    "list_confirm_delete": "Você tem certeza de que deseja excluir essa lista?",
     "auto_clients_title": "Clientes (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",
+    "auto_clients_desc": "Dados dos clientes que usam o AdGuard Home, que não são armazenados na configuração",
+    "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.",
@@ -416,27 +332,25 @@
     "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",
     "dns_privacy": "Privacidade de DNS",
     "setup_dns_privacy_1": "<0>DNS-sobre-TLS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-sobre-HTTPS:</0> Use <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Aqui está uma lista de softwares que você pode usar.</0>",
-    "setup_dns_privacy_4": "Em um dispositivo iOS 14 ou macOS Big Sur, você pode transferir o ficheiro especial '.mobileconfig' que adiciona os servidores <highlight>DNS-sobre-HTTPS</highlight> ou <highlight>DNS-sobre-TLS</highlight> nas definições de DNS.",
+    "setup_dns_privacy_3": "<0>Por favor, note que os protocolos de DNS criptografados são suportados apenas no Android 9. Então, irá precisar de instalar um software adicional noutros sistemas operacionais.</0><0>Aqui está a lista de software que pode usar.</0>",
     "setup_dns_privacy_android_1": "O Android 9 suporta o DNS-sobre-TLS de forma nativa. Para o configurar, vá a Definições → Rede e internet → Avançado → DNS privado e digite o seu nome de domínio.",
     "setup_dns_privacy_android_2": "O <0>AdGuard para Android</0> suporta <1>DNS-sobre-HTTPS</1> e <1>DNS-sobre-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> adiciona o suporte <1>DNS-sobre-HTTPS</1> para o Android.",
     "setup_dns_privacy_ios_1": "<0>DNSCloak</0> suporta <1>DNS-sobre-HTTPS</1>, mas para o configurar para usar o seu próprio servidor, precisará de gerar um <2>DNS Stamp</2>.",
-    "setup_dns_privacy_ios_2": "O <0>AdGuard para iOS</0> suporta a definição do <1>DNS-sobre-HTTPS</1> e <1>DNS-sobre-TLS</1>.",
+    "setup_dns_privacy_ios_2": "O <0>AdGuard para iOS</0> suporta a configuração do <1>DNS-sobre-HTTPS</1> e <1>DNS-sobre-TLS</1>.",
     "setup_dns_privacy_other_title": "Outras implementações",
     "setup_dns_privacy_other_1": "O próprio AdGuard Home pode ser usado como um cliente DNS seguro em qualquer plataforma.",
     "setup_dns_privacy_other_2": "<0>dnsproxy</0> suporta todos os protocolos de DNS seguros conhecidos.",
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> suporta <1>DNS-sobre-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> suporta <1>DNS-sobre-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Encontrará mais implementações <0>aqui</0> e <1>aqui</1>.",
-    "setup_dns_privacy_ioc_mac": "configuração para iOS e macOS",
     "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, precisa de <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
     "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
     "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
@@ -445,7 +359,6 @@
     "rewrite_confirm_delete": "Tem a certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
     "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
     "rewrite_applied": "Regra de reescrita aplicada",
-    "rewrite_hosts_applied": "Reescrito pela regra do arquivo de hosts",
     "dns_rewrites": "Reescritas de DNS",
     "form_domain": "Inserir domínio",
     "form_answer": "Insira o endereço de IP ou nome de domínio",
@@ -467,17 +380,15 @@
     "encryption_certificates_source_content": "Colar o conteúdo dos certificados",
     "encryption_key_source_path": "Definir um arquivo de chave privada",
     "encryption_key_source_content": "Colar o conteúdo da chave privada",
-    "stats_params": "Definição de estatísticas",
-    "config_successfully_saved": "Definição guardada com sucesso",
+    "stats_params": "Configuração de estatísticas",
+    "config_successfully_saved": "Configuração guardada com sucesso",
     "interval_24_hour": "24 horas",
     "interval_days": "{{count}} dias",
     "interval_days_plural": "{{count}} dias",
     "domain": "Domínio",
     "answer": "Resposta",
     "filter_added_successfully": "O filtro foi adicionado com sucesso",
-    "filter_removed_successfully": "A lista foi removida com sucesso",
-    "filter_updated": "O filtro atualizado com sucesso",
-    "statistics_configuration": "Definição das estatísticas",
+    "statistics_configuration": "Configuração das estatísticas",
     "statistics_retention": "Retenção de estatísticas",
     "statistics_retention_desc": "Se diminuir o valor do intervalo, alguns dados serão perdidos",
     "statistics_clear": " Limpar estatísticas",
@@ -486,7 +397,7 @@
     "statistics_cleared": "As estatísticas foram apagadas com sucesso",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
-    "filters_configuration": "Definição dos filtros",
+    "filters_configuration": "Configuração dos filtros",
     "filters_enable": "Activar filtros",
     "filters_interval": "Intervalo de actualização de filtros",
     "disabled": "Desactivado",
@@ -494,7 +405,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.",
@@ -506,91 +417,12 @@
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Saiba mais</0>sobre como criar as suas próprias listas negras de servidores.",
     "blocked_by_response": "Bloqueado por CNAME ou IP em resposta",
-    "blocked_by_cname_or_ip": "Bloqueado por CNAME ou IP",
     "try_again": "Tente novamente",
     "domain_desc": "Insere o nome do domínio para ser reescrito.",
     "example_rewrite_domain": "reescrever resposta apenas para este domínio.",
     "example_rewrite_wildcard": "reescrever resposta para todos <0>example.org</0> sub-domínios.",
-    "rewrite_ip_address": "Endereço IP: use esse IP em uma resposta A ou AAAA",
-    "rewrite_domain_name": "Nome de domínio: adicione um registro CNAME",
-    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registros do upstream",
-    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do servidor DNS primário",
-    "disable_ipv6": "Desactivar IPv6",
-    "disable_ipv6_desc": "Se este recurso estiver ativado, todas as consultas de DNS para endereços IPv6 (tipo AAAA) serão ignoradas.",
-    "fastest_addr": "Endereço de IP mais rápido",
-    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso irá retardar as consultas ao DNS, pois temos que esperar por respostas de todos os servidores DNS, porém melhorando a conectividade em geral.",
-    "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
-    "autofix_warning_list": "Ele irá realizar estas tarefas: <0>Desactivar sistema DNSStubListener</0> <0>Definir endereço do servidor DNS para 127.0.0.1</0> <0>Substituir o alvo simbólico do link /etc/resolv.conf para /run/systemd/resolv.conf</0> <0>Parar DNSStubListener (recarregar serviço resolvido pelo sistema)</0>",
-    "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuard Home por padrão.",
-    "tags_title": "Etiquetas",
-    "tags_desc": "Você pode selecionar as etiquetas que correspondem ao cliente. As tags podem ser incluídas nas regras de filtragem e permitir que você as aplique com mais precisão. <0>Saiba mais</0>",
-    "form_select_tags": "Seleccione as tags do cliente",
-    "check_title": "Verifique a filtragem",
-    "check_desc": "Verificar se o nome do host está sendo filtrado",
-    "check": "Verificar",
     "form_enter_host": "Insira o hostname",
-    "filtered_custom_rules": "Filtrado pelas regras de filtragem personalizadas",
-    "choose_from_list": "Escolher na lista",
-    "add_custom_list": "Adicionar uma lista personalizada",
-    "host_whitelisted": "O host está na lista branca",
-    "check_ip": "Endereços de IP: {{ip}}",
-    "check_cname": "CNAME: {{cname}}",
-    "check_reason": "Motivo: {{reason}}",
-    "check_service": "Nome do serviço: {{service}}",
-    "service_name": "Nome do serviço",
-    "check_not_found": "Não encontrado nas tuas listas de filtros",
-    "client_confirm_block": "Você tem certeza de que deseja bloquear o cliente \"{{ip}}\"?",
-    "client_confirm_unblock": "Você tem certeza de que deseja desbloquear o cliente \"{{ip}}\"?",
-    "client_blocked": "Cliente \"{{ip}}\" foi bloqueado com sucesso",
-    "client_unblocked": "Cliente \"{{ip}}\" foi desbloqueado com sucesso",
-    "static_ip": "Endereço de IP estático",
-    "static_ip_desc": "O AdGuard Home é um servidor, portanto, ele precisa de um endereço de IP estático para funcionar corretamente. Caso contrário, em algum momento, seu roteador poderá atribuir um novo endereço de IP neste dispositivo.",
-    "set_static_ip": "Definir um endereço de IP estático",
-    "install_static_ok": "Boas notícias! O endereço de IP estático já está configurado",
-    "install_static_error": "O AdGuard Home não pode configurar automaticamente para esta interface de rede. Por favor, procure uma instrução sobre como fazer isso manualmente.",
-    "install_static_configure": "Detectamos que um endereço de IP dinâmico é sendo usado — <0>{{ip}}</0>. Deseja utilizar como seu endereço estático?",
-    "confirm_static_ip": "O AdGuard Home irá configurar {{ip}} para ser seu endereço IP estático. Deseja continuar?",
-    "list_updated": "{{count}} lista actualizada",
-    "list_updated_plural": "{{count}} listas actualizadas",
-    "dnssec_enable": "Activar DNSSEC",
-    "dnssec_enable_desc": "Definir a flag DNSSEC nas consultas de DNS em andamento e verificar o resultado (é necessário um resolvedor DNSSEC ativado)",
-    "validated_with_dnssec": "Validado com DNSSEC",
-    "all_queries": "Todas as consultas",
     "show_blocked_responses": "Bloqueado",
-    "show_whitelisted_responses": "Na lista branca",
-    "show_processed_responses": "Processado",
-    "blocked_safebrowsing": "Bloqueado pela navegação segura",
-    "blocked_adult_websites": "Sítios adultos bloqueados",
-    "blocked_threats": "Ameaças bloqueadas",
-    "allowed": "Permitido",
-    "filtered": "Filtrado",
-    "rewritten": "Reescrito",
-    "safe_search": "Pesquisa segura",
-    "blocklist": "Lista de bloqueio",
-    "milliseconds_abbreviation": "ms",
-    "cache_size": "Tamanho do cache",
-    "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
-    "cache_ttl_min_override": "Sobrepor o TTL mínimo",
-    "cache_ttl_max_override": "Sobrepor o TTL máximo",
-    "enter_cache_size": "Digite o tamanho do cache (bytes)",
-    "enter_cache_ttl_min_override": "Digite o TTL máximo (segundos)",
-    "enter_cache_ttl_max_override": "Digite o TTL máximo (segundos)",
-    "cache_ttl_min_override_desc": "Prolongue os valores de curta duração (segundos) recebidos do servidor primário ao armazenar em cache as respostas DNS",
-    "cache_ttl_max_override_desc": "Defina um valor máximo de tempo de vida (segundos) para entradas no cache DNS",
-    "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
-    "filter_category_general": "Geral",
-    "filter_category_security": "Segurança",
-    "filter_category_regional": "Regional",
-    "filter_category_other": "Noutro",
-    "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",
-    "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",
-    "port_53_faq_link": "A porta 53 é frequentemente ocupada por serviços \"DNSStubListener\" ou \"systemd-resolved\". Por favor leia <0>essa instrução</0> para resolver isso.",
-    "adg_will_drop_dns_queries": "O AdGuard Home descartará todas as consultas DNS deste cliente.",
-    "client_not_in_allowed_clients": "O cliente não é permitido porque não está na lista \"Clientes permitidos\".",
-    "experimental": "Experimental"
+    "show_whitelisted_responses": "Lista Branca",
+    "show_processed_responses": "Processado"
 }

client/src/__locales/ro.json

@@ -1,7 +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_comment": "Puteți specifica comentariul",
+    "example_upstream_reserved": "Puteți preciza un DNS upstream <0>de domeniu(ii) specific(e)</0>",
     "upstream_parallel": "Folosiți interogări paralele pentru rezolvări rapide interogând simultan toate serverele în amonte",
     "parallel_requests": "Solicitări paralele",
     "load_balancing": "Echilibrare-sarcini",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Format IP invalid",
     "form_error_mac_format": "Format MAC invalid",
     "form_error_client_id_format": "Format ID de client invalid",
-    "form_error_server_name": "Nume de server nevalid",
     "form_error_positive": "Trebuie să fie mai mare de 0",
     "form_error_negative": "Trebuie să fie egală cu 0 sau mai mare",
     "range_end_error": "Trebuie să fie mai mare decât începutul intervalului",
@@ -108,7 +106,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ă",
@@ -116,9 +114,9 @@
     "average_processing_time": "Timpul mediu de procesare",
     "average_processing_time_hint": "Timp mediu în milisecunde la procesarea unei cereri DNS",
     "block_domain_use_filters_and_hosts": "Blocați domenii folosind filtre și fișiere hosts",
-    "filters_block_toggle_hint": "Puteți configura regulile de blocare în setările <a>Filtre</a>.",
+    "filters_block_toggle_hint": "Puteți configura regulile de blocare în setările <a href='#filters'> 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ă",
@@ -126,14 +124,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",
@@ -171,7 +169,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",
@@ -193,7 +191,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",
@@ -213,7 +211,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",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Blocarea IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID Client",
-    "client_id_placeholder": "Introduceți ID client",
-    "client_id_desc": "Diferiți clienți pot fi identificați printr-un ID special al clientului. <a>Aici</a> puteți afla mai multe despre cum să identificați clienții.",
-    "download_mobileconfig_doh": "Descărcați .mobileconfig pentru DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Descărcați .mobileconfig pentru DNS-over-TLS",
-    "download_mobileconfig": "Descărcați fișierul de configurare",
     "plain_dns": "DNS simplu",
     "form_enter_rate_limit": "Introduceți limita ratei",
     "rate_limit": "Limita ratei",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Numărul de solicitări pe secundă pe care un singur client este permis să le facă (setând-o la 0 înseamnă nelimitat)",
     "blocking_ipv4_desc": "Adresa IP de returnat pentru o cerere A de blocare",
     "blocking_ipv6_desc": "Adresa IP de returnat pentru o cerere AAAA de blocare",
-    "blocking_mode_default": "Implicit: Răspunde cu adresa IP (0.0.0.0 for A; :: pentru AAAA) când sunt blocate de regulă tip Adblock; răspunde cu adresa IP specificată în regulă când sunt blocate de regula tip /etc/hosts",
+    "blocking_mode_default": "Implicit: Răspunde cu REFUSED când sunt blocate de regulă tip Adblock; răspunde cu adresa IP specificată în regulă când sunt blocate de regula tip /etc/hosts",
     "blocking_mode_refused": "REFUZAT: Răspunde cu codul REFUZAT",
     "blocking_mode_nxdomain": "NXDOMAIN: Răspunde cu codul NXDOMAIN",
     "blocking_mode_null_ip": "IP nul: răspunde cu o adresă IP zero (0.0.0.0 pentru A; :: pentru AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Sursă",
     "found_in_known_domain_db": "Găsit în baza de date de domenii cunoscută.",
     "category_label": "Categorie",
-    "rule_label": "Regulă(reguli)",
+    "rule_label": "Regulă",
     "list_label": "Listă",
     "unknown_filter": "Filtru necunoscut {{filterId}}",
     "known_tracker": "Tracker cunoscut",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Configurația de criptare salvată",
     "encryption_server": "Nume de server",
     "encryption_server_enter": "Introduceți numele domeniului",
-    "encryption_server_desc": "Pentru a utiliza HTTPS, trebuie să introduceți numele serverului care se potrivește cu certificatul SSL sau certificatul wildcard al dvs. În cazul în care câmpul nu este setat, va accepta conexiuni TLS pentru orice domeniu.",
+    "encryption_server_desc": "Pentru a utiliza HTTPS, trebuie introdus numele serverului care corespunde certificatului SSL.",
     "encryption_redirect": "Redirecționați automat la HTTPS",
     "encryption_redirect_desc": "Dacă este bifat, AdGuard Home vă va redirecționa automat de la adrese HTTP la HTTPS.",
     "encryption_https": "Port HTTPS",
@@ -392,7 +383,7 @@
     "client_edit": "Editare client",
     "client_identifier": "Identificator",
     "ip_address": "Adresa IP",
-    "client_identifier_desc": "Clienții pot fi identificați prin adresa IP, CIDR, adresa MAC sau un ID special al clientului (poate fi folosit pentru DoT/DoH/DoQ). <0>Aici</0> puteți afla mai multe despre cum să identificați clienții.",
+    "client_identifier_desc": "Clienții pot fi identificați prin adresa IP, CIDR, adresa MAC. Vă rugăm să rețineți că utilizarea MAC ca identificator este posibilă numai dacă AdGuard Home este și un <0>server DHCP</0>",
     "form_enter_ip": "Introduceți IP",
     "form_enter_mac": "Introduceți MAC",
     "form_enter_id": "Introduceți identificator",
@@ -423,8 +414,7 @@
     "dns_privacy": "Confidențialitate DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Folosiți stringul <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Folosiți stringul <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>lată o listă de software pe care le puteți utiliza.</0>",
-    "setup_dns_privacy_4": "Pe un dispozitiv iOS 14 sau macOS Big Sur puteți descărca fișierul special '.mobileconfig' care adaugă servere <highlight>DNS-over-HTTPS</highlight> sau <highlight>DNS-over-TLS</highlight> la setările DNS.",
+    "setup_dns_privacy_3": "<0>Rețineți că protocoalele DNS criptate sunt acceptate numai pe Android 9. Așadar, trebuie să instalați programe suplimentare pentru alte sisteme de operare.</0><0>Iată o listă de software pe care o puteți utiliza.</0>",
     "setup_dns_privacy_android_1": "Android 9 acceptă DNS-over-TLS nativ. Pentru a-l configura, accesați Setări → Rețea și internet → Advanced → Private DNS și introduceți numele de domeniu acolo.",
     "setup_dns_privacy_android_2": "<0>AdGuard pentru Android</0> acceptă <1>DNS-over-HTTPS</1> și <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> adaugă <1>DNS-over-HTTPS</1> suport pentru Android.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> acceptă <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> acceptă <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Veți găsi mai multe implementări <0>aici</0> și <1>aici</1>.",
-    "setup_dns_privacy_ioc_mac": "Configurarea iOS și macOS",
     "setup_dns_notice": "Pentru a utiliza <1>DNS-over-HTTPS</1> sau <1>DNS-over-TLS</1>, trebuie să <0>configurați Criptarea</0> în setările AdGuard Home.",
     "rewrite_added": "Rescriere DNS pentru \"{{key}}\" adăugată cu succes",
     "rewrite_deleted": "Rescriere DNS pentru \"{{key}}\" ștearsă cu succes",
@@ -536,8 +525,8 @@
     "check_ip": "Adrese IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Cauza: {{reason}}",
+    "check_rule": "Regula: {{rule}}",
     "check_service": "Nume servici: {{service}}",
-    "service_name": "Numele serviciului",
     "check_not_found": "Nu se găsește în listele de filtre",
     "client_confirm_block": "Sunteți sigur că doriți să blocați clientul \"{{ip}}\"?",
     "client_confirm_unblock": "Sunteți sigur că doriți să deblocați clientul \"{{ip}}\"?",
@@ -566,17 +555,17 @@
     "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)",
     "cache_ttl_min_override": "Suprascrieți minimum TTL",
     "cache_ttl_max_override": "Suprascrieți maximum TTL",
-    "enter_cache_size": "Introduceți mărimea cache-ului (bytes)",
-    "enter_cache_ttl_min_override": "Introduceți minimum TTL (secunde)",
-    "enter_cache_ttl_max_override": "Introduceți maximum TTL (secunde)",
-    "cache_ttl_min_override_desc": "Extinde valorile timp-de-viață scurte (secunde) primite de la serverul din amonte la stocarea în cache a răspunsurilor DNS",
-    "cache_ttl_max_override_desc": "Setează o valoare maximă a timpului-de-viață (secunde) pentru intrările din memoria cache DNS",
+    "enter_cache_size": "Introduceți mărime cache",
+    "enter_cache_ttl_min_override": "Introduceți minimum TTL",
+    "enter_cache_ttl_max_override": "Introduceți maximum TTL",
+    "cache_ttl_min_override_desc": "Suprascrie valoarea TTL (minimum) primită de la serverul din amonte",
+    "cache_ttl_max_override_desc": "Suprascrie valoarea TTL (maximum) primită de la serverul din amonte",
     "ttl_cache_validation": "Valoarea TTL cache minimă trebuie să fie mai mică sau egală cu valoarea maximă",
     "filter_category_general": "General",
     "filter_category_security": "Securitate",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Clicați pentru a vizualiza interogări",
     "port_53_faq_link": "Portul 53 este adesea ocupat de serviciile \"DNSStubListener\" sau \"systemd-resolved\". Vă rugăm să citiți <0>această instrucțiune</0> despre cum să rezolvați aceasta.",
     "adg_will_drop_dns_queries": "AdGuard Home va renunța la toate interogările DNS de la acest client.",
-    "client_not_in_allowed_clients": "Clientul nu este permis deoarece nu este în lista de \"Clienți permiși\".",
     "experimental": "Experimental"
 }

client/src/__locales/ru.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Настройки клиентов",
     "example_upstream_reserved": "Вы можете указать DNS-сервер <0>для конкретного домена(-ов)</0>",
-    "example_upstream_comment": "Вы можете указать комментарий",
     "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса",
     "parallel_requests": "Параллельные запросы",
     "load_balancing": "Распределение нагрузки\n",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Неверный формат IP-адреса",
     "form_error_mac_format": "Некорректный формат MAC",
     "form_error_client_id_format": "Неверный формат ID клиента",
-    "form_error_server_name": "Неверное имя сервера",
     "form_error_positive": "Должно быть больше 0",
     "form_error_negative": "Должно быть не меньше 0",
     "range_end_error": "Должно превышать начало диапазона",
@@ -116,7 +114,7 @@
     "average_processing_time": "Среднее время обработки запроса",
     "average_processing_time_hint": "Среднее время для обработки запроса DNS  в миллисекундах",
     "block_domain_use_filters_and_hosts": "Блокировать домены с использованием фильтров и файлов хостов",
-    "filters_block_toggle_hint": "Вы можете настроить правила блокировки в <a>\"Фильтрах\"</a>.",
+    "filters_block_toggle_hint": "Вы можете настроить правила блокировки в <a href='#filters'> \"Фильтрах\"</a>.",
     "use_adguard_browsing_sec": "Включить Безопасную навигацию AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home проверит, включен ли домен в веб-службу безопасности браузера. Он будет использовать API, чтобы выполнить проверку: на сервер отправляется только короткий префикс имени домена SHA256.",
     "use_adguard_parental": "Включить модуль Родительского контроля AdGuard ",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Блокировка IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "Идентификатор клиента",
-    "client_id_placeholder": "Введите идентификатор клиента",
-    "client_id_desc": "Различные клиенты могут идентифицироваться по специальному идентификатору клиента. <a>Здесь</a> вы можете узнать больше об идентификации клиентов.",
-    "download_mobileconfig_doh": "Скачать .mobileconfig для DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Скачать .mobileconfig для DNS-over-TLS",
-    "download_mobileconfig": "Загрузить файл конфигурации",
     "plain_dns": "Нешифрованный DNS",
     "form_enter_rate_limit": "Введите rate limit",
     "rate_limit": "Rate limit",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Ограничение на количество запросов в секунду для каждого клиента (0 — неограниченно)",
     "blocking_ipv4_desc": "IP-адрес, возвращаемый при блокировке A-запроса",
     "blocking_ipv6_desc": "IP-адрес, возвращаемый при блокировке AAAA-запроса",
-    "blocking_mode_default": "Стандартный: Отвечает с нулевым IP-адресом, (0.0.0.0 для A; :: для AAAA) когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле /etc/hosts-style",
+    "blocking_mode_default": "Стандартный: Отвечает с REFUSED, когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле /etc/hosts",
     "blocking_mode_refused": "REFUSED: Отвечает с кодом REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Отвечает с кодом NXDOMAIN\n",
     "blocking_mode_null_ip": "Нулевой IP: Отвечает с нулевым IP-адресом (0.0.0.0 для A; :: для AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Источник",
     "found_in_known_domain_db": "Найден в базе известных доменов.",
     "category_label": "Категория",
-    "rule_label": "Правило(-а)",
+    "rule_label": "Правило",
     "list_label": "Список",
     "unknown_filter": "Неизвестный фильтр {{filterId}}",
     "known_tracker": "Известный трекер",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "Настройки шифрования сохранены",
     "encryption_server": "Имя сервера",
     "encryption_server_enter": "Введите ваше доменное имя",
-    "encryption_server_desc": "Для использования HTTPS вам необходимо ввести имя сервера, которое подходит вашему SSL-сертификату или сертификату с поддержкой поддоменов. Если это поле не задано, сервер будет принимать TLS-соединения для любого домена.",
+    "encryption_server_desc": "Для использования HTTPS вам необходимо ввести имя сервера, которое подходит вашему SSL-сертификату.",
     "encryption_redirect": "Автоматически перенаправлять на HTTPS",
     "encryption_redirect_desc": "Если включено, AdGuard Home будет автоматически перенаправлять вас с HTTP на HTTPS адрес.",
     "encryption_https": "Порт HTTPS",
@@ -392,7 +383,7 @@
     "client_edit": "Редактировать клиента",
     "client_identifier": "Идентификатор",
     "ip_address": "IP-адрес",
-    "client_identifier_desc": "Клиенты могут быть идентифицированы по IP-адресу, CIDR или MAC-адресу или специальному ID (можно использовать для DoT/DoH/DoQ). <0>Здесь</0> вы можете узнать больше об идентификации клиентов.",
+    "client_identifier_desc": "Клиенты могут быть идентифицированы по IP-адресу, CIDR или MAC-адресу. Обратите внимание, что использование MAC как идентификатора возможно, только если AdGuard Home также является и <0>DHCP-сервером</0>",
     "form_enter_ip": "Введите IP",
     "form_enter_mac": "Введите MAC",
     "form_enter_id": "Введите идентификатор",
@@ -423,8 +414,7 @@
     "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 вы можете скачать специальный файл '.mobileconfig', который добавляет <highlight>DNS-over-HTTPS</highlight> или <highlight>DNS-over-TLS</highlight> серверы в настройки DNS.",
+    "setup_dns_privacy_3": "<0>Обратите внимание, что зашифрованный DNS-протокол поддерживается только на Android 9. Для других операционных систем вам нужно будет установить дополнительное ПО.</0><0>Вот список ПО, которое вы можете использовать.</0>",
     "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.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> поддерживает <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> поддерживает <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Вы можете найти еще варианты <0>тут</0> и <1>тут</1>.",
-    "setup_dns_privacy_ioc_mac": "Конфигурация для iOS и macOS",
     "setup_dns_notice": "Чтобы использовать <1>DNS-over-HTTPS</1> или <1>DNS-over-TLS</1>, вам нужно <0>настроить шифрование</0> в настройках AdGuard Home.",
     "rewrite_added": "Правило перенаправления DNS для \"{{key}}\" успешно добавлено",
     "rewrite_deleted": "Правило перенаправления DNS для \"{{key}}\" успешно удалено",
@@ -518,7 +507,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",
@@ -536,8 +525,8 @@
     "check_ip": "IP-адреса: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Причина: {{reason}}",
+    "check_rule": "Правило: {{rule}}",
     "check_service": "Название сервиса: {{service}}",
-    "service_name": "Имя сервиса",
     "check_not_found": "Не найдено в вашем списке фильтров",
     "client_confirm_block": "Вы уверены, что хотите заблокировать клиента \"{{ip}}\"?",
     "client_confirm_unblock": "Вы уверены, что хотите разблокировать клиента \"{{ip}}\"?",
@@ -572,11 +561,11 @@
     "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": "Расширить короткие TTL-значения (в секундах), полученные с upstream-сервера при кешировании DNS-ответов",
-    "cache_ttl_max_override_desc": "Установить максимальное TTL-значение (в секундах) для записей в DNS-кэше",
+    "enter_cache_size": "Введите размер кеша",
+    "enter_cache_ttl_min_override": "Введите минимальный TTL",
+    "enter_cache_ttl_max_override": "Введите максимальный TTL",
+    "cache_ttl_min_override_desc": "Переопределить TTL-значение (минимальное), полученное с upstream-сервера",
+    "cache_ttl_max_override_desc": "Переопределить TTL-значение (максимальное), полученное с upstream-сервера",
     "ttl_cache_validation": "Минимальное значение TTL кеша должно быть меньше или равно максимальному значению",
     "filter_category_general": "Общие",
     "filter_category_security": "Безопасность",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
     "port_53_faq_link": "Порт 53 часто занят службами \"DNSStubListener\" или \"systemd-resolved\". Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить.",
     "adg_will_drop_dns_queries": "AdGuard Home AdGuard Home сбросит все DNS-запросы от этого клиента.",
-    "client_not_in_allowed_clients": "Клиент не разрешён, так как его нет в списке \"Разрешённых клиентов\".",
     "experimental": "Экспериментальный"
 }

client/src/__locales/si-lk.json

@@ -1,42 +1,36 @@
 {
     "client_settings": "අනුග්‍රාහක සැකසුම්",
-    "example_upstream_comment": "ඔබට අදහසක් සඳහන් කළ හැකිය",
-    "parallel_requests": "සමාන්තර ඉල්ලීම්",
-    "load_balancing": "ධාරිතාව තුලනය",
-    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
+    "check_dhcp_servers": "DHCP සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
     "save_config": "වින්‍යාසය සුරකින්න",
-    "enabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය සබල කර ඇත",
-    "disabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය අබල කර ඇත",
-    "unavailable_dhcp_desc": "ඇඩ්ගාර්ඩ් හෝම් හට ඔබගේ මෙහෙයුම් පද්ධතියේ ග.ධා.වි.කෙ. සේවාදායකයක් ධාවනය කළ නොහැක",
+    "enabled_dhcp": "DHCP සේවාදායකය සබල කර ඇත",
+    "disabled_dhcp": "DHCP සේවාදායකය අබල කර ඇත",
     "dhcp_title": "ග.ධා.වි.කෙ. සේවාදායකය (පර්යේෂණාත්මක!)",
-    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට ඇඩ්ගාර්ඩ් හි ඇති ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
-    "dhcp_enable": "ග.ධා.වි.කෙ. සේවාදායකය සබල කරන්න",
-    "dhcp_disable": "ග.ධා.වි.කෙ. සේවාදායකය අබල කරන්න",
-    "dhcp_config_saved": "ග.ධා.වි.කෙ. වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. අයිපීවී 4 සැකසුම්",
-    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අයිපීවී 6 සැකසුම්",
+    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට AdGuardHome හි ඇති ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
+    "dhcp_enable": "DHCP සේවාදායකය සබල කරන්න",
+    "dhcp_disable": "DHCP සේවාදායකය අබල කරන්න",
+    "dhcp_config_saved": "DHCP වින්‍යාසය සාර්ථකව සුරකින ලදි",
     "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 හෝ ඊට වැඩි විය යුතුය",
     "dhcp_form_range_title": "අ.ජා. කෙ. (IP) ලිපින පරාසය",
     "dhcp_form_range_start": "පරාසය ආරම්භය",
     "dhcp_form_range_end": "පරාසය අවසානය",
-    "dhcp_interface_select": "ග.ධා.වි.කෙ. අතුරුමුහුණත තෝරන්න",
+    "dhcp_interface_select": "ග.ධා.වි.කෙ. (DHCP) අතුරුමුහුණත තෝරන්න",
     "dhcp_hardware_address": "දෘඩාංග ලිපිනය",
     "dhcp_ip_addresses": "අ.ජා. කෙ. (IP) ලිපින",
     "ip": "අ.ජා. කෙ. (IP)",
     "dhcp_table_hostname": "ධාරක නාමය",
     "dhcp_table_expires": "කල් ඉකුත් වීම",
-    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. එසේ නොමැති නම්, එය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
-    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. සේවාදායකයක් තිබේද යන්න අපට තීරණය කළ නොහැකි විය.",
-    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට අප අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
-    "dhcp_dynamic_ip_found": "ඔබේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ ග.ධා.වි.කෙ. සබල කරන්න බොත්තම එබුවහොත් අපි ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසන්නෙමු.",
-    "dhcp_reset": "ග.ධා.වි.කෙ. වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
+    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. (DHCP) සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. එසේ නොමැති නම්, එය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
+    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. (DHCP) සේවාදායකයක් තිබේද යන්න අපට තීරණය කළ නොහැකි විය.",
+    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. (DHCP) සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට අප අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
+    "dhcp_dynamic_ip_found": "ඔබේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. (DHCP) සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ ග.ධා.වි.කෙ. සබල කරන්න බොත්තම එබුවහොත් අපි ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසන්නෙමු.",
+    "dhcp_reset": "ග.ධා.වි.කෙ. (DHCP) වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
     "country": "රට",
     "city": "නගරය",
     "delete_confirm": "\"{{key}}\" මකා දැමීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
@@ -52,7 +46,6 @@
     "filters": "පෙරහන්",
     "filter": "පෙරහන",
     "query_log": "විමසුම් ලොගය",
-    "compact": "සංක්ෂිප්ත",
     "nothing_found": "කිසිවක් සොයාගත නොහැක",
     "faq": "නිති අසන පැණ",
     "version": "අනුවාදය",
@@ -72,7 +65,7 @@
     "dns_query": "ව.නා.ප. (DNS) විමසුම්",
     "blocked_by": "<0>පෙරහන් මගින් අවහිර කරන ලද</0>",
     "stats_malware_phishing": "අවහිර කළ ද්වේශාංග/තතුබෑම්",
-    "stats_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි",
+    "stats_adult": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි",
     "stats_query_domain": "ජනප්‍රිය විමසන ලද වසම්",
     "for_last_24_hours": "පසුගිය පැය 24 සඳහා",
     "for_last_days": "පසුගිය දින {{count}} සඳහා",
@@ -81,38 +74,32 @@
     "requests_count": "ඉල්ලීම් ගණන",
     "top_blocked_domains": "ජනප්‍රිය අවහිර කළ වසම්",
     "top_clients": "ජනප්‍රිය අනුග්‍රාහකයන්",
-    "general_statistics": "පොදු සංඛ්‍යාලේඛන",
-    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්ෂණ ඒකකය මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි ගණන",
+    "general_statistics": "පොදු සංඛ්යාලේඛන",
+    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කරන ලද DNS ඉල්ලීම් ගණන",
+    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard browsing security ඒකකය මගින් අවහිර කරන ලද DNS ඉල්ලීම් ගණන",
+    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි ගණන",
     "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන ලද",
-    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
+    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා DNS ඉල්ලීම් ගණන",
     "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
-    "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
+    "average_processing_time_hint": "DNS ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
     "block_domain_use_filters_and_hosts": "පෙරහන් සහ ධාරක ගොනු භාවිතා කරමින් වසම් අවහිර කරන්න",
-    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
-    "use_adguard_browsing_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්ෂණ වියමන සේවාව භාවිතා කරන්න",
-    "use_adguard_parental": "ඇඩ්ගාර්ඩ් දෙමාපිය පාලන වියමන සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය පිරික්සුම් ආරක්ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
+    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a href='#filters'>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
+    "use_adguard_browsing_sec": "AdGuard browsing security web service භාවිතා කරන්න",
+    "use_adguard_parental": "AdGuard parental control වෙබ් සේවාව භාවිතා කරන්න",
+    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි AdGuard Home විසින් පරීක්ෂා කරනු ඇත. එය browsing security වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී API භාවිතා කරයි.",
     "enforce_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන්න",
-    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
+    "enforce_save_search_hint": "AdGuard Home හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: Google, Youtube, Bing, DuckDuckGo සහ Yandex.",
     "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
     "general_settings": "පොදු සැකසුම්",
-    "dns_settings": "ව.නා.ප. සැකසුම්",
-    "dns_blocklists": "ව.නා.ප. අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "dns_allowlists": "ව.නා.ප. අවසර දීමේ ලැයිස්තු",
-    "dns_blocklists_desc": "ඇඩ්ගාර්ඩ් හෝම් විසින් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු වලට ගැලපෙන වසම් අවහිර කරනු ඇත.",
-    "dns_allowlists_desc": "අවසර දීමේ ව.නා.ප. ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක අඩංගු වුවද එය නොසලකා හැර අවසර දෙනු ලැබේ.",
+    "dns_settings": "DNS සැකසුම්",
+    "dns_blocklists": "DNS අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
+    "dns_allowlists": "DNS අවසර දීමේ ලැයිස්තු",
+    "dns_allowlists_desc": "DNS අවසර දීමේ ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව අඩංගු වුවද එය න‌ොසලකා හැර අවසර දෙනු ලැබේ.",
     "custom_filtering_rules": "අභිරුචි පෙරීමේ නීති",
     "encryption_settings": "සංකේතාංකන සැකසුම්",
-    "dhcp_settings": "ග.ධා.වි.කෙ. සැකසුම්",
-    "upstream_dns": "Upstream ව.නා.ප. සේවාදායකයන්",
-    "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුළත් කරන්න. upstream ව.නා.ප. (DNS) \n සේවාදායකයන් වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
-    "apply_btn": "යොදන්න",
+    "dhcp_settings": "DHCP සැකසුම්",
     "disabled_filtering_toast": "පෙරීම අබල කර ඇත",
     "enabled_filtering_toast": "පෙරීම සබල කර ඇත",
-    "disabled_safe_browsing_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
-    "enabled_safe_browsing_toast": "ආරක්ෂිත සෙවීම සබල කර ඇත",
     "disabled_parental_toast": "Parental control අබල කර ඇත",
     "enabled_parental_toast": "Parental control සබල කර ඇත",
     "disabled_safe_search_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
@@ -126,8 +113,6 @@
     "request_table_header": "ඉල්ලීම",
     "edit_table_action": "සංස්කරණය කරන්න",
     "delete_table_action": "මකන්න",
-    "elapsed": "ගත වූූූ කාලය",
-    "filters_and_hosts_hint": "ඇඩ්ගාර්ඩ් හෝම් මූලික දැන්වීම් වාරණ නීති සහ ධාරක ගොනු පද ගැලපුම් තේරුම් ගනී.",
     "no_blocklist_added": "අවහිර කිරීමේ ලැයිස්තු එකතු කර නැත",
     "no_whitelist_added": "අවසර දීමේ ලැයිස්තු එකතු කර නැත",
     "add_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක් එකතු කරන්න",
@@ -140,36 +125,28 @@
     "new_allowlist": "නව අවසර දීමේ ලැයිස්තුව",
     "edit_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව සංස්කරණය කරන්න",
     "edit_allowlist": "අවසර දීමේ ලැයිස්තුව සංස්කරණය කරන්න",
-    "choose_blocklist": "අවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
-    "choose_allowlist": "අනවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
     "enter_valid_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
     "enter_valid_allowlist": "අවසර දීමේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
     "form_error_url_format": "වලංගු නොවන URL ආකෘතියකි",
     "form_error_url_or_path_format": "ලැයිස්තුවක වලංගු නොවන URL හෝ ස්ථීර මාර්ගයකි",
     "custom_filter_rules": "අභිරුචි පෙරීමේ නීති",
-    "custom_filter_rules_hint": "පේළියකට එක් නීතියක් බැගින් ඇතුළත් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ ධාරක ගොනු පද ගැලපුම් භාවිතා කළ හැකිය.",
     "examples_title": "උදාහරණ",
-    "example_meaning_filter_block": "example.org වසමට සහ එහි සියලුම උප වසම් වලට පිවිසීම අවහිර කරයි",
-    "example_meaning_filter_whitelist": "example.org වසමට සහ එහි සියලුම උප වසම් වලට ප්‍රවේශය අවහිර නොකරයි",
-    "example_meaning_host_block": "ඇඩ්ගාර්ඩ් හෝම් දැන් example.org වසම සඳහා 127.0.0.1 ලිපිනය ලබා දෙනු ඇත (නමුත් එහි උප ලිපින නොවේ).",
+    "example_meaning_filter_block": "example.org වසමට සහ එහි සියලුම උප වසම් වලට පිවිසීම අවහිර කරන්න",
+    "example_meaning_filter_whitelist": "example.org වසමට සහ එහි සියලුම උප වසම් වලට ප්‍රවේශය අවහිර නොකරන්න",
+    "example_meaning_host_block": "AdGuard Home දැන් example.org වසම සඳහා 127.0.0.1 ලිපිනය ලබා දෙනු ඇත (නමුත් එහි උප ලිපින නොවේ).",
     "example_comment": "! මෙතැන අදහස් දැක්වීමක්",
-    "example_comment_meaning": "විස්තර කිරීමක්",
+    "example_comment_meaning": "විස්තර කිිරීමක්",
     "example_comment_hash": "# එසේම අදහස් දැක්වීමක්",
-    "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත පිවිසීම අවහිර කරයි",
-    "example_upstream_regular": "සාමාන්‍ය ව.නා.ප. (UDP හරහා)",
+    "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත පිවිසීම අවහිර කරන්න",
+    "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_tcp": "සාමාන්‍ය ව.නා.ප. (TCP/ස.පා.කෙ. හරහා) ",
+    "example_upstream_tcp": "සාමාන්‍ය DNS (TCP හරහා)",
     "all_lists_up_to_date_toast": "සියලුම ලැයිස්තු දැනටමත් යාවත්කාලීනයි",
-    "dns_test_ok_toast": "සඳහන් කළ ව.නා.ප. සේවාදායකයන් නිවැරදිව ක්‍රියා කරයි",
-    "dns_test_not_ok_toast": "සේවාදායක \"{{key}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
-    "unblock": "අනවහිර",
-    "block": "අවහිර",
-    "disallow_this_client": "මෙම අනුග්‍රාහකයට අවසර නොදෙන්න",
-    "allow_this_client": "මෙම අනුග්‍රාහකයට අවසර දෙන්න",
-    "block_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අවහිර කරන්න",
-    "unblock_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අනවහිර කරන්න",
+    "dns_test_ok_toast": "සඳහන් කළ DNS සේවාදායකයන් නිවැරදිව ක්‍රියා කරයි",
+    "dns_test_not_ok_toast": "සේවාදායකය \"{{key}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
+    "unblock": "අනවහිර කරන්න",
+    "block": "අවහිර කරන්න",
     "time_table_header": "වේලාව",
     "date": "දිනය",
     "domain_name_table_header": "වසම් නාමය",
@@ -200,48 +177,38 @@
     "query_log_strict_search": "ඉතා නිවැරදිව සෙවීම සඳහා ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
     "query_log_retention_confirm": "විමසුම් ලොගය රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
     "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා. කෙ. (IP) නිර්නාමික කරන්න",
-    "anonymize_client_ip_desc": "ලොග සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ සම්පූර්ණ අ.ජා. කෙ. ලිපිනය සුරකීමෙන් වලකින්න",
-    "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
-    "dns_cache_config": "ව.නා.ප. නිහිත වින්‍යාසය",
-    "dns_cache_config_desc": "මෙහිදී ඔබට ව.නා.ප. නිහිතය වින්‍යාසගත කළ හැකිය",
-    "blocking_mode": "අවහිර කරන ආකාරය",
+    "dns_config": "DNS සේවාදායක වින්‍යාසය",
     "default": "සුපුරුදු",
     "nxdomain": "නොපවතින වසම",
-    "refused": "REFUSED",
-    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ.",
-    "custom_ip": "අභිරුචි අ.ජා. කෙ.",
-    "blocking_ipv4": "අයි.පී.වී.4 අවහිර කිරීම\n",
-    "blocking_ipv6": "අයි.පී.වී.6 අවහිර කිරීම",
+    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ. (IP)",
+    "custom_ip": "අභිරුචි අ.ජා. කෙ. (IP)",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
     "form_enter_rate_limit": "අනුපාත සීමාව ඇතුළත් කරන්න",
     "rate_limit": "අනුපාත සීමාව",
     "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
     "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
     "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
-    "blocking_mode_default": "පොදු: දැන්වීම් අවහිර කරන ආකාරයේ නීතියක් මගින් අවහිර කළ විට REFUSED සමඟ ප්‍රතිචාර දක්වයි; /etc/host-style ආකාරයේ නීතියක් මගින් අවහිර කළ විට නීතියේ දක්වා ඇති අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි",
-    "blocking_mode_refused": "REFUSED: REFUSED කේතය සමඟ ප්‍රතිචාර දක්වයි",
     "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> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
-    "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
+    "blocking_mode_null_ip": "අභිශූන්‍යය අන්තර්ජාල කෙටුම්පත: ශුන්‍ය අ.ජා. කෙ. (IP) ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
+    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. (IP) ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
+    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, AdGuard Home විසින් <0>DNS සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
     "source_label": "මූලාශ්‍රය",
-    "found_in_known_domain_db": "දැනුවත් වසම් දත්ත ගබඩාවේ හමු විය.",
     "category_label": "ප්‍රවර්ගය",
+    "rule_label": "නීතිය",
     "list_label": "ලැයිස්තුව",
     "unknown_filter": "{{filterId}} නොදන්නා පෙරහනකි",
-    "known_tracker": "දැනුවත් ලුහුබැඳීමක්",
-    "install_welcome_title": "ඇඩ්ගාර්ඩ් හෝම් වෙත සාදරයෙන් පිළිගනිමු!",
-    "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
-    "install_settings_title": "පරිපාලක වියමන අතුරු මුහුණත",
+    "known_tracker": "දන්නා ලුහුබැඳීමක්",
+    "install_welcome_title": "AdGuard Home වෙත සාදරයෙන් පිළිගනිමු!",
+    "install_welcome_desc": "AdGuard Home යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන DNS සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
+    "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": "DNS සේවාදායකය",
     "install_settings_all_interfaces": "සියලුම අතුරුමුහුණත්",
     "install_auth_title": "සත්‍යාපනය",
-    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
+    "install_auth_desc": "ඔබගේ AdGuard Home පරිපාලක වෙබ් අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌ය‌ෙ‌න් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
     "install_auth_username": "පරිශීලක නාමය",
     "install_auth_password": "මුරපදය",
     "install_auth_confirm": "මුරපදය තහවුරු කරන්න",
@@ -249,52 +216,47 @@
     "install_auth_password_enter": "මුරපදය ඇතුළත් කරන්න",
     "install_step": "පියවර",
     "install_devices_title": "ඔබගේ උපාංග වින්‍යාසගත කරන්න",
-    "install_devices_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කිරීම අවශ්‍ය වේ.",
+    "install_devices_desc": "AdGuard Home භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කිරීම අවශ්‍ය වේ.",
     "install_submit_title": "සුභ පැතුම්!",
-    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ ඇඩ්ගාර්ඩ් හෝම් භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
+    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ AdGuard Home භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
     "install_devices_router": "මාර්ගකාරකය",
     "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධ සියලුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒවා අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවනු ඇත.",
-    "install_devices_address": "ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය පහත ලිපිනයන්ට සවන් දෙමින් පවතී",
-    "install_devices_router_list_1": "ඔබේ මාර්ගකාරකය සඳහා වූ මනාපයන් විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ අතිරික්සුවෙන් ඒ.ස.නි.(URL) ක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) පිවිසිය හැකිය. මුර පදය ඇතුළත් කිරීමට ඔබෙන් ඉල්ලා සිටිය හැකිය. ඔබට එය මතක නැතිනම්, බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසිය හැක. සමහර මාර්ගකාරක සඳහා විශේෂිත යෙදුමක් අවශ්‍ය වන අතර, එය දැනටමත් ඔබේ පරිගණකයේ/දුරකථනයේ ස්ථාපනය කර තිබිය යුතුය.",
-    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. ඉලක්කම් කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අක්ෂර සොයන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
-    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
-    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ මාර්ගකාරකය වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
+    "install_devices_router_list_3": "ඔබගේ AdGuard Home සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
+    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ රවුටර වල අභිරුචි ව.නා.ප. (DNS) සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී AdGuard Home <0>ග.ධා.වි.කෙ. (DHCP) සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබග‌ේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
     "install_devices_windows_list_1": "ආරම්භක මෙනුව හෝ වින්ඩෝස් සෙවුම හරහා පාලක පැනලය විවෘත කරන්න.",
     "install_devices_windows_list_2": "ජාල සහ අන්තර්ජාල ප්‍රවර්ගයට ගොස් පසුව ජාල සහ බෙදාගැනීමේ මධ්‍යස්ථානය වෙත යන්න.",
     "install_devices_windows_list_3": "උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම තිරයේ වම් පසින් සොයාගෙන එය මත ක්ලික් කරන්න.",
     "install_devices_windows_list_4": "ඔබගේ ක්‍රියාකාරී සම්බන්ධතාවය තෝරන්න, එය මත දකුණු-ක්ලික් කර ගුණාංග තෝරන්න.",
     "install_devices_windows_list_5": "ලැයිස්තුවේ ඇති අන්තර්ජාල කෙටුම්පත් අනුවාදය 4 (TCP/IP) සොයාගෙන එය තෝරා ඉන්පසු ගුණාංග මත නැවත ක්ලික් කරන්න.",
-    "install_devices_windows_list_6": "'පහත සඳහන් ව.නා.ප. සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_windows_list_6": "'පහත දැක්වෙන DNS සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
     "install_devices_macos_list_1": "ඇපල් අයිකනය මත ක්ලික් කර පද්ධති මනාපයන් වෙත යන්න.",
     "install_devices_macos_list_2": "ජාලය මත ක්ලික් කරන්න.",
     "install_devices_macos_list_3": "ඔබගේ ලැයිස්තුවේ පළමු සම්බන්ධතාවය තෝරා උසස් මත ක්ලික් කරන්න.",
-    "install_devices_macos_list_4": "ව.නා.ප. (DNS) තීරුව තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_macos_list_4": "DNS තීරුව තෝරා ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
     "install_devices_android_list_1": "ඇන්ඩ්‍රොයිඩ් මෙනුවෙහි මුල් තිරයෙන්, සැකසීම් මත තට්ටු කරන්න.",
-    "install_devices_android_list_2": "මෙනුවේ වයි-ෆයි මත තට්ටු කරන්න. පවතින සියලුම ජාල ලැයිස්තුගත කර ඇති තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි ව.නා.ප. සැකසිය නොහැක).",
+    "install_devices_android_list_2": "මෙනුවේ Wi-Fi මත තට්ටු කරන්න. පවතින සියලුම ජාල ලැයිස්තුගත කර ඇති තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි DNS සැකසිය නොහැක).",
     "install_devices_android_list_3": "ඔබ සම්බන්ධ වී ඇති ජාලය මත දිගු වේලාවක් ඔබන්න, ඉන්පසුව ජාලය වෙනස් කිරීම මත තට්ටු කරන්න.",
-    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල වැඩිදුර සැකසුම් බැලීමට \"උසස්\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් ව.නා.ප. (DNS) සැකසුම් වෙනස් කිරීමට අ.ජා. කෙ. (IP) සැකසුම්, ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
-    "install_devices_android_list_5": "ව.නා.ප. 1 සහ ව.නා.ප. 2 පිහිටුවීම් අගයන් ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින වලට වෙනස් කරන්න.",
+    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල වැඩිදුර සැකසුම් බැලීමට \"උසස්\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් DNS සැකසුම් වෙනස් කිරීමට, අ.ජා. කෙ. (IP) සැකසුම් ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
+    "install_devices_android_list_5": "DNS 1 සහ DNS 2 පිහිටුවීම් අගයන් ඔබගේ AdGuard Home සේවාදායක ලිපින වලට වෙනස් කරන්න.",
     "install_devices_ios_list_1": "මුල් තිරයේ සිට, සැකසුම් මත තට්ටු කරන්න.",
-    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි වයි-ෆයි තෝරන්න (ජංගම දුරකථන සඳහා ව.නා.ප. වින්‍යාසගත කිරීමට නොහැකිය).",
+    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි Wi-Fi තෝරන්න (ජංගම දුරකථන සඳහා DNS වින්‍යාසගත කිරීමට නොහැකිය).",
     "install_devices_ios_list_3": "දැනට ක්‍රියාකාරී ජාලයයහෙි නම මත තට්ටු කරන්න.",
-    "install_devices_ios_list_4": "ව.නා.ප. (DNS) ක්ෂේත්‍රය තුළ ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_ios_list_4": "DNS ක්ෂේත්‍රය තුළ ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
     "get_started": "ආරම්භ කර ගන්න",
     "next": "ඊළඟ",
     "open_dashboard": "උපකරණ පුවරුව විවෘත කරන්න",
     "install_saved": "සාර්ථකව සුරකින ලදි",
     "encryption_title": "සංකේතාංකනය",
-    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වියමන අතුරු මුහුණත සහය දක්වයි",
+    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා DNS සහ පරිපාලක වෙබ් අතුරු මුහුණත සහය දක්වයි",
     "encryption_config_saved": "සංකේතාංකන වින්‍යාසය සුරකින ලදි",
     "encryption_server": "සේවාදායක‌‌‌‌යේ නම",
     "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුළත් කරන්න",
     "encryption_redirect": "ස්වයංක්‍රීයව HTTPS වෙත හරවා යවන්න",
-    "encryption_redirect_desc": "සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
+    "encryption_redirect_desc": "සබල කර ඇත්නම්, AdGuard Home ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
     "encryption_https": "HTTPS කවුළුව",
-    "encryption_https_desc": "HTTPS කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
+    "encryption_https_desc": "HTTPS කවුළුව වින්‍යාසගත කර ඇත්නම්, AdGuard Home පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/ dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
     "encryption_dot": "DNS-over-TLS කවුළුව",
-    "encryption_dot_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත.",
-    "encryption_doq": "DNS-over-QUIC කවුළුව",
-    "encryption_doq_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-QUIC සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත. එය පර්යේෂණාත්මක වන අතර විශ්වාසදායක නොවිය හැකිය. එසේම, මේ වන විට එයට සහාය දක්වන බොහෝ අනුග්‍රාහකයින් නොමැත.",
+    "encryption_dot_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත.",
     "encryption_certificates": "සහතික",
     "encryption_certificates_input": "ඔබගේ PEM-කේතාංකනය කළ සහතික පිටපත් කර මෙහි අලවන්න.",
     "encryption_status": "තත්ත්වය",
@@ -302,7 +264,7 @@
     "encryption_key": "පුද්ගලික යතුර",
     "encryption_key_input": "ඔබගේ සහතිකය සඳහා PEM-කේතාංකනය කළ පුද්ගලික යතුර පිටපත් කර මෙහි අලවන්න.",
     "encryption_enable": "සංකේතාංකනය සබල කරන්න (HTTPS, DNS-over-HTTPS සහ DNS-over-TLS)",
-    "encryption_enable_desc": "සංකේතාංකනය සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර ව.නා.ප. සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
+    "encryption_enable_desc": "සංකේතාංකනය සබල කර ඇත්නම්, AdGuard Home පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර DNS සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
     "encryption_key_valid": "මෙය වලංගු {{type}} පුද්ගලික යතුරකි",
     "encryption_key_invalid": "මෙය වලංගු නොවන {{type}} පුද්ගලික යතුරකි",
     "encryption_subject": "මාතෘකාව",
@@ -316,19 +278,18 @@
     "form_error_equal": "සමාන නොවිය යුතුය",
     "form_error_password": "මුරපදය නොගැලපුුුුුුණි",
     "reset_settings": "සැකසුම් යළි පිහිටුවන්න",
-    "update_announcement": "ඇඩ්ගාර්ඩ් හෝම් {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
+    "update_announcement": "AdGuard Home {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
     "setup_guide": "පිහිටුවීමේ මාර්ගෝපදේශය",
-    "dns_addresses": "ව.නා.ප. ලිපින",
-    "dns_start": "ව.නා.ප. සේවාදායකය ආරම්භ වෙමින් පවතී",
-    "dns_status_error": "ව.නා.ප. සේවාදායකයේ තත්වය පරීක්ෂා කිරීමේදී දෝෂයකි",
+    "dns_addresses": "DNS ලිපින",
+    "dns_start": "DNS සේවාදායකය ආරම්භ වෙමින් පවතී",
     "down": "පහත",
     "fix": "නිරාකරණය කරන්න",
-    "dns_providers": "මෙහි තෝරා ගැනීමට <0>දැනුවත් ව.නා.ප. සපයන්නන්ගේ ලැයිස්තුවක්</0> ඇත.",
+    "dns_providers": "මෙහි තෝරා ගැනීමට <0>දන්නා DNS සපයන්නන්ගේ ලැයිස්තුවක්</0> ඇත.",
     "update_now": "දැන් \tයාවත්කාල කරන්න",
     "update_failed": "ස්වයංක්‍රීය යාවත්කාල කිරීම අසාර්ථක විය. අතින් යාවත්කාල කිරීමට කරුණාකර <a>පියවර අනුගමනය කරන්න</a>.",
-    "processing_update": "කරුණාකර රැඳී සිටින්න, ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීන වෙමින් පවතී",
+    "processing_update": "කරුණාකර රැඳී සිටින්න, AdGuard Home යාවත්කාලීන වෙමින් පවතී",
     "clients_title": "අනුග්‍රාහකයන්",
-    "clients_desc": "ඇඩ්ගාර්ඩ් හෝම් වෙත සම්බන්ධ කර ඇති උපාංග වින්‍යාසගත කරන්න",
+    "clients_desc": "AdGuard Home වෙත සම්බන්ධ කර ඇති උපාංග වින්‍යාසගත කරන්න",
     "settings_global": "ගෝලීය",
     "settings_custom": "අභිරුචි",
     "table_client": "අනුග්‍රාහකය",
@@ -339,8 +300,9 @@
     "client_edit": "අනුග්‍රාහකය සංස්කරණය කරන්න",
     "client_identifier": "හඳුන්වනය",
     "ip_address": "අ.ජා. කෙ. (IP) ලිපිනය",
+    "client_identifier_desc": "අනුග්‍රාහකයන් අ.ජා. කෙ. (IP) ලිපිනයක් හෝ මා.ප්‍ර.පා. (MAC) ලිපිනයක් මගින් හඳුනාගත හැකිය. මා.ප්‍ර.පා. හඳුන්වනයක් ලෙස  භාවිතා කළ හැක්කේ AdGuard Home ද <0>DHCP සේවාදායකයක්</0> නම් පමණක් බව කරුණාවෙන් සලකන්න. ",
     "form_enter_ip": "අ.ජා. කෙ. (IP) ඇතුළත් කරන්න",
-    "form_enter_mac": "මා.ප්‍ර.පා. (MAC) ඇතුළත් කරන්න",
+    "form_enter_mac": "MAC ඇතුළත් කරන්න",
     "form_enter_id": "හඳුන්වනය ඇතුළත් කරන්න",
     "form_add_id": "හඳුන්වනයක් එක් කරන්න",
     "form_client_name": "අනුග්‍රාහකයේ නම ඇතුළත් කරන්න",
@@ -351,32 +313,32 @@
     "client_updated": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව යාවත්කාල කරන ලදි",
     "client_confirm_delete": "\"{{key}}\" අනුග්‍රාහකය ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
     "list_confirm_delete": "මෙම ලැයිස්තුව ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන අනුග්‍රාහකයන්‌ගේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
+    "auto_clients_desc": "AdGuard Home භාවිතා කරන අනුග්‍රාහකයන්‌ග‌ේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
     "access_title": "ප්‍රවේශවීමට සැකසුම්",
-    "access_desc": "මෙහිදී ඔබට ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
+    "access_desc": "මෙහිදී ඔබට AdGuard Home DNS සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
     "access_allowed_title": "අවසර ලත් අනුග්‍රාහකයන්",
-    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
+    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. (IP) ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
     "access_disallowed_title": "අවසර නොලත් අනුග්‍රාහකයන්",
-    "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
+    "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. (IP) ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
     "access_blocked_title": "අවහිර කළ වසම්",
     "access_settings_saved": "ප්‍රවේශ වීමේ සැකසුම් සාර්ථකව සුරකින ලදි",
     "updates_checked": "යාවත්කාලීන කිරීම් සාර්ථකව පරික්ෂා කර ඇත",
-    "updates_version_equal": "ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීනයි",
+    "updates_version_equal": "AdGuard Home යාවත්කාලීනයි",
     "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_3": "<0>සංකේතාංකන ව.නා.ප. (DNS) කෙටුම්පත් සඳහා සහය දක්වන්නේ ඇන්ඩ්‍රොයිඩ් 9 පමණක් බව කරුණාවෙන් සලකන්න. එබැවින් ඔබ වෙනත් මෙහෙයුම් පද්ධති සඳහා අතිරේක මෘදුකාංග ස්ථාපනය කළ යුතුය.</0><0> ඔබට භාවිතා කළ හැකි මෘදුකාංග ලැයිස්තුවක් පහත දැක්‌වේ.</0>",
+    "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_desc": "විශේෂිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
-    "rewrite_applied": "නැවත ලිවීමේ නීතිය යොදා ඇත",
-    "rewrite_hosts_applied": "ධාරක ගොනු නීතිය මගින් නැවත ලියා ඇත",
-    "dns_rewrites": "ව.නා.ප. නැවත ලිවීම්",
+    "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතා කිරීම සඳහා AdGuard Home සැකසුම් තුළ <0>සංකේතාංකනය වින්‍යාසගත</0> කිරීමට අවශ්‍ය වේ.",
+    "rewrite_add": "DNS නැවත ලිවීමක් එකතු කරන්න",
+    "rewrite_confirm_delete": "\"{{key}}\" සඳහා DNS නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
+    "dns_rewrites": "DNS නැවත ලිවීම්",
+    "form_domain": "වසම ඇතුළත් කරන්න",
     "form_answer": "අ.ජා. කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුළත් කරන්න ",
     "form_error_domain_format": "වලංගු නොවන වසම් ආකෘතියකි",
     "form_error_answer_format": "වලංගු නොවන පිළිතුරු ආකෘතියකි",
@@ -388,8 +350,8 @@
     "blocked_services_saved": "අවහිර කළ සේවාවන් සාර්ථකව සුරකින ලදි",
     "blocked_services_global": "ගෝලීය අවහිර කළ සේවාවන් භාවිතා කරන්න",
     "blocked_service": "අවහිර කළ සේවාව",
-    "block_all": "සියල්ල අවහිර",
-    "unblock_all": "සියල්ල අනවහිර",
+    "block_all": "සියල්ල අවහිර කරන්න",
+    "unblock_all": "සියල්ල අනවහිර කරන්න",
     "encryption_certificate_path": "සහතිකයේ මාර්ගය",
     "encryption_private_key_path": "පුද්ගලික යතුරෙහි මාර්ගය",
     "encryption_certificates_source_path": "සහතික ගොනු‌ව‌ෙහි මාර්ගය සකසන්න",
@@ -404,7 +366,6 @@
     "domain": "වසම",
     "answer": "පිළිතුර",
     "filter_added_successfully": "පෙරහන සාර්ථකව එකතු කරන ලදි",
-    "filter_removed_successfully": "ලැයිස්තුව සාර්ථකව ඉවත් කරන ලදි",
     "filter_updated": "ලැයිස්තුව සාර්ථකව යාවත්කාලීන කර ඇත",
     "statistics_configuration": "සංඛ්‍යාලේඛන වින්‍යාසය",
     "statistics_retention": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම",
@@ -433,83 +394,50 @@
     "network": "ජාලය",
     "descr": "විස්තරය",
     "whois": "Whois",
-    "filtering_rules_learn_more": "ඔබගේ ම ධාරක ලැයිස්තු සෑදීම පිළිබඳව <0>තව දැනගන්න</0>.",
-    "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
-    "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
+    "blocked_by_response": "ප්‍රතිචාරය අන්වර්ථ නාමයක් (CNAME) හෝ අ.ජා. කෙ. (IP) මගින් අවහිර කර ඇත",
     "try_again": "නැවත උත්සහා කරන්න",
     "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
-    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
-    "rewrite_ip_address": "අ.ජා. කෙ. ලිපිනය: මෙම අ.ජා. කෙටුම්පත A හෝ AAAA ප්‍රතිචාරයකට භාවිතා කරන්න",
-    "rewrite_domain_name": "වසම් නාමය: අන්. නා. (CNAME) වාර්තාවක් එක් කරන්න",
+    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියන්න.",
     "disable_ipv6": "IPv6 අබල කරන්න",
-    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම ව.නා.ප. විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
+    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම DNS විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
     "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "fastest_addr_desc": "සියලුම ව.නා.ප. සේවාදායකයන් හරහා විමසා සියලු ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා. කෙ. ලිපිනය ලබා දෙයි. සියලුම ව.නා.ප. සේවාදායකයන්ගේ ප්‍රතිචාර සඳහා අප බලා සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
-    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" බොත්තම එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
+    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" මත ක්ලික් කළහොත්, AdGuard Home ඔබගේ පද්ධතිය AdGuard Home DNS සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
     "tags_title": "හැඳුනුම් සංකේත",
     "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>වැඩිදුර ඉගෙන ගන්න</0>",
     "form_select_tags": "අනුග්‍රාහක හැඳුනුම් සංකේත",
     "check_title": "පෙරීම පරීක්ෂා කරන්න",
-    "check_desc": "ධාරක නාමය පෙරහන් කර ඇත්දැයි පරීක්ෂා කරන්න",
     "check": "පරීක්ෂා කරන්න",
     "form_enter_host": "ධාරක නාමයක් ඇතුළත් කරන්න",
     "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
-    "choose_from_list": "ලැයිස්තුවෙන් තෝරන්න",
-    "add_custom_list": "අභිරුචි ලැයිස්තුවක් එකතු කරන්න",
-    "host_whitelisted": "ධාරකය සුදු ලැයිස්තු ගත කර ඇත",
     "check_ip": "අ.ජා. කෙ. (IP) ලිපින: {{ip}}",
-    "check_cname": "අන්. නාමය (CNAME): {{cname}}",
+    "check_cname": "CNAME: {{cname}}",
     "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_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
+    "static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය",
+    "static_ip_desc": "AdGuard Home යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
     "set_static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනයක් සකසන්න",
     "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
-    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා ඇඩ්ගාර්ඩ් හෝම් හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
+    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා AdGuard Home හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
     "install_static_configure": "ගතික අ.ජා. කෙ. (IP) ලිපිනයක් භාවිතා කරන බව අපි අනාවරණය කර ‌ග‌ෙන ඇත්තෙමු - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
-    "confirm_static_ip": "ඇඩ්ගාර්ඩ් හෝම් ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
+    "confirm_static_ip": "AdGuard Home ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
     "list_updated": "{{count}} ලැයිස්තුව යාවත්කාලීන කරන ලදි",
     "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාලීන කරන ලදි",
-    "all_queries": "සියලුම විමසුම්",
+    "dnssec_enable": "DNSSEC සබල කරන්න",
+    "validated_with_dnssec": "DNSSEC සමඟ තහවුරු කර ඇත",
     "show_blocked_responses": "අවහිර කර ඇත",
-    "show_whitelisted_responses": "සුදු ලැයිස්තුගත කර ඇත",
     "blocked_safebrowsing": "ආරක්ෂිත සෙවීම මගින් අවහිර කරන ලද",
-    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වියමන අඩවි",
+    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි",
     "blocked_threats": "අවහිර කළ තර්ජන",
     "allowed": "අවසර ලත්",
     "filtered": "පෙරහන් කරන ලද",
     "rewritten": "නැවත ලියන ලද",
     "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": "ප්‍රාදේශ්‍රීය",
-    "filter_category_other": "වෙනත්",
-    "filter_category_general_desc": "බොහෝ උපාංගවල ලුහුබැඳීම් සහ දැන්වීම් අවහිර කරන ලැයිස්තු",
-    "filter_category_security_desc": "අනිෂ්ට මෘදුකාංග, තතුබෑම් හෝ වංචනික වසම් අවහිර කිරීමට විශේෂ වූ ලැයිස්තු",
-    "filter_category_regional_desc": "ප්‍රාදේශ්‍රීය දැන්වීම් සහ ලුහුබැඳීමේ සේවාදායකයන් කෙරෙහි අවධානය යොමු කරන ලැයිස්තු",
-    "filter_category_other_desc": "වෙනත් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "setup_config_to_enable_dhcp_server": "ග.ධා.වි.කෙ. සේවාදායකය සක්‍රීය කිරීම සඳහා වින්‍යාසය පිහිටුවන්න",
-    "original_response": "මුල් ප්‍රතිචාරය",
-    "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": "පරීක්ෂණාත්මක"
+    "milliseconds_abbreviation": "මිලි තත්."
 }

client/src/__locales/sk.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Nastavenie klienta",
     "example_upstream_reserved": "Môžete zadať DNS upstream <0>pre konkrétnu doménu (domény)</0>",
-    "example_upstream_comment": "Môžete napísať komentár",
     "upstream_parallel": "Používať paralelné dopyty na zrýchlenie súčasným dopytovaním všetkých serverov",
     "parallel_requests": "Paralelné dopyty",
     "load_balancing": "Vyrovnávanie záťaže",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Nesprávny formát IPv4",
     "form_error_mac_format": "Nesprávny MAC formát",
     "form_error_client_id_format": "Neplatný formát client ID",
-    "form_error_server_name": "Neplatné meno servera",
     "form_error_positive": "Musí byť väčšie ako 0",
     "form_error_negative": "Musí byť číslo 0 alebo viac",
     "range_end_error": "Musí byť väčšie ako začiatok rozsahu",
@@ -51,7 +49,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ý",
@@ -116,7 +114,7 @@
     "average_processing_time": "Priemerný čas spracovania",
     "average_processing_time_hint": "Priemerný čas spracovania DNS dopytu v milisekundách",
     "block_domain_use_filters_and_hosts": "Blokovať domény pomocou filtrov a zoznamov adries",
-    "filters_block_toggle_hint": "Pravidlá blokovania môžete nastaviť v nastaveniach <a>Filtre</a>.",
+    "filters_block_toggle_hint": "Pravidlá blokovania môžete nastaviť v nastaveniach <a href='#filters'>Filtre</a>.",
     "use_adguard_browsing_sec": "Použiť  AdGuard službu Bezpečného prehliadania",
     "use_adguard_browsing_sec_hint": "AdGuard Home skontroluje, či je doména na čiernej listine službou Bezpečného prehliadania. Použije API vyhľadávania priateľské k ochrane súkromia na vykonanie kontroly: na server je poslaná iba krátka predpona názvu domény SHA256 hash.",
     "use_adguard_parental": "Použiť AdGuard službu Rodičovská kontrola",
@@ -250,22 +248,14 @@
     "blocking_ipv6": "Blokovanie IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID klienta",
-    "client_id_placeholder": "Zadať ID klienta",
-    "client_id_desc": "Rôznych klientov možno identifikovať podľa špeciálneho ID klienta. <a>Tu</a> sa dozviete viac o tom, ako identifikovať klientov.",
-    "download_mobileconfig_doh": "Prevziať .mobileconfig pre DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Prevziať .mobileconfig pre DNS-over-TLS",
-    "download_mobileconfig": "Stiahnuť konfiguračný súbor",
     "plain_dns": "Obyčajné DNS",
     "form_enter_rate_limit": "Zadajte rýchlostný limit",
     "rate_limit": "Rýchlostný limit",
     "edns_enable": "Povoliť klientsku podsiete EDNS",
     "edns_cs_desc": "Ak je zapnuté, program AdGuard Home bude odosielať podsiete klientov na DNS servery.",
-    "rate_limit_desc": "Počet požiadaviek za sekundu, ktoré môže jeden klient vykonať (nastavenie na hodnotu 0 znamená neobmedzene)",
     "blocking_ipv4_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti A",
     "blocking_ipv6_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti AAAA",
-    "blocking_mode_default": "Predvolené: Odpovedať nulovou adresou IP (0,0.0.0 pre A; :: pre AAAA), keď je blokovaná pravidlom v štýle Adblock; odpovedať IP adresou uvedenou v pravidle, keď je blokovaná pravidlom v štýle /etc/hosts",
+    "blocking_mode_default": "Predvolená hodnota: Odpovedať pomocou REFUSED, ak je blokovaný pravidlom v štýle Adblock; odpovedať pomocou IP adresy určenej v pravidle, ak je blokovaná pravidlom v štýle /etc/hosts",
     "blocking_mode_refused": "REFUSED: Odpovedať kódom REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Odpovedať kódom NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Odpoveď s nulovou IP adresou (0.0.0.0 pre A; :: pre AAAA)",
@@ -275,6 +265,7 @@
     "source_label": "Zdroj",
     "found_in_known_domain_db": "Nájdené v databáze známych domén.",
     "category_label": "Kategória",
+    "rule_label": "Pravidlo",
     "list_label": "Zoznam",
     "unknown_filter": "Neznámy filter {{filterId}}",
     "known_tracker": "Známy sledovač",
@@ -335,6 +326,7 @@
     "encryption_config_saved": "Konfigurácia šifrovania uložená",
     "encryption_server": "Meno servera",
     "encryption_server_enter": "Zadajte meno Vašej domény",
+    "encryption_server_desc": "Ak chcete používať HTTPS, musíte zadať meno servera, ktoré zodpovedá Vášmu SSL certifikátu.",
     "encryption_redirect": "Automaticky presmerovať na HTTPS",
     "encryption_redirect_desc": "Ak je táto možnosť začiarknutá, služba AdGuard Home Vás automaticky presmeruje z adresy HTTP na adresy HTTPS.",
     "encryption_https": "HTTPS port",
@@ -390,6 +382,7 @@
     "client_edit": "Upraviť klienta",
     "client_identifier": "Identifikátor",
     "ip_address": "IP adresa",
+    "client_identifier_desc": "Klienti môžu byť identifikovaní podľa IP adresy, CIDR alebo MAC adresy. Upozorňujeme, že používanie MAC ako identifikátora je možné len vtedy, ak je AdGuard Home tiež <0>DHCP server</0>",
     "form_enter_ip": "Zadajte IP adresu",
     "form_enter_mac": "Zadajte MAC adresu",
     "form_enter_id": "Zadajte identifikátor",
@@ -420,8 +413,7 @@
     "dns_privacy": "DNS súkromie",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Použiť <1>{{address}}</1> reťazec.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Použiť <1>{{address}}</1> reťazec.",
-    "setup_dns_privacy_3": "<0>Tu je zoznam softvéru, ktorý môžete použiť.</0>",
-    "setup_dns_privacy_4": "Na zariadení so systémom iOS 14 alebo macOS Big Sur si môžete stiahnuť špeciálny súbor „.mobileconfig“, ktorý do nastavení DNS pridáva servery <highlight> DNS-over-HTTPS </highlight> alebo <highlight> DNS-over-TLS </highlight>.",
+    "setup_dns_privacy_3": "<0>Upozorňujeme, že šifrované protokoly DNS sú podporované iba v systéme Android 9. Preto je potrebné nainštalovať ďalší softvér pre iné operačné systémy.</0><0>Tu je zoznam softvéru, ktorý môžete používať.</0>",
     "setup_dns_privacy_android_1": "Android 9 podporuje DNS-over-TLS natívne. Ak ho chcete konfigurovať, prejdite na Nastavenia → Sieť a internet → Pokročilé → Súkromné DNS a zadajte tam meno Vašej domény.",
     "setup_dns_privacy_android_2": "<0>AdGuard pre Android</0> podporuje <1>DNS-over-HTTPS</1> a <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> pridáva <1>DNS-over-HTTPS</1> podporu pre Android.",
@@ -433,7 +425,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> podporuje <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> podporuje <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Viac implementácií nájdete <0>tu</0> a <1>tu</1>.",
-    "setup_dns_privacy_ioc_mac": "Konfigurácia iOS a macOS",
     "setup_dns_notice": "Pre použitie <1>DNS-over-HTTPS</1> alebo <1>DNS-over-TLS</1>, potrebujete v nastaveniach AdGuard Home <0>nakonfigurovať šifrovanie</0>.",
     "rewrite_added": "DNS prepísanie pre \"{{key}}\" bolo úspešne pridané",
     "rewrite_deleted": "DNS prepísanie pre \"{{key}}\" bolo úspešne vymazané",
@@ -533,8 +524,8 @@
     "check_ip": "IP adresy: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Dôvod: {{reason}}",
+    "check_rule": "Pravidlo: {{rule}}",
     "check_service": "Meno služby: {{service}}",
-    "service_name": "Názov služby",
     "check_not_found": "Nenašlo sa vo Vašom zozname filtrov",
     "client_confirm_block": "Naozaj chcete zablokovať klienta \"{{ip}}\"?",
     "client_confirm_unblock": "Naozaj chcete odblokovať klienta \"{{ip}}\"?",
@@ -569,11 +560,10 @@
     "cache_size_desc": "Veľkosť DNS cache (v bajtoch)",
     "cache_ttl_min_override": "Prepísať minimálne TTL",
     "cache_ttl_max_override": "Prepísať maximálne TTL",
-    "enter_cache_size": "Zadať veľkosť cache (v bajtoch)",
-    "enter_cache_ttl_min_override": "Zadať minimálne TTL (v sekundách)",
-    "enter_cache_ttl_max_override": "Zadať maximálne TTL (v sekundách)",
-    "cache_ttl_min_override_desc": "Predĺži krátke hodnoty TTL (v sekundách) prijaté od servera typu upstream pri ukladaní odpovedí DNS do cache pamäte",
-    "cache_ttl_max_override_desc": "Nastaví maximálnu hodnotu TTL (v sekundách) pre záznamy v DNS cache pamäti",
+    "enter_cache_size": "Zadať veľkosť cache",
+    "enter_cache_ttl_min_override": "Zadať minimálne TTL",
+    "enter_cache_ttl_max_override": "Zadať maximálne TTL",
+    "cache_ttl_max_override_desc": "Prepíše hodnotu TTL (maximálnu) prijatú z upstream servera",
     "ttl_cache_validation": "Minimálna hodnota TTL cache musí byť menšia alebo rovná maximálnej hodnote",
     "filter_category_general": "Všeobecné",
     "filter_category_security": "Bezpečnosť",
@@ -588,6 +578,5 @@
     "click_to_view_queries": "Kliknite pre zobrazenie dopytov",
     "port_53_faq_link": "Port 53 je často obsadený službami \"DNSStubListener\" alebo \"systemd-resolved\". Prečítajte si <0>tento návod</0> o tom, ako to vyriešiť.",
     "adg_will_drop_dns_queries": "AdGuard Home zruší všetky DNS dopyty od tohto klienta.",
-    "client_not_in_allowed_clients": "Klient nemá povolenie, pretože sa nenachádza v zozname „Povolení klienti“.",
     "experimental": "Experimentálne"
 }

client/src/__locales/sl.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Nastavitve odjemalca",
     "example_upstream_reserved": "lahko določite nazgornji DNS <0>za določene domene</0>",
-    "example_upstream_comment": "Lahko določite komentar",
     "upstream_parallel": "Uporabite vzporedne zahteve za pospešitev reševanja s hkratnim poizvedovanjem vseh gorvodnih strežnikov",
     "parallel_requests": "Vzporedne zahteve",
     "load_balancing": "Uravnavanje obremenitve",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Neveljaven format IP",
     "form_error_mac_format": "Neveljaven MAC format",
     "form_error_client_id_format": "Neveljaven format ID odjemalca",
-    "form_error_server_name": "Neveljavno ime strežnika",
     "form_error_positive": "Mora biti večja od 0",
     "form_error_negative": "Mora biti enako ali več kot 0",
     "range_end_error": "Mora biti večji od začtka razpona",
@@ -116,7 +114,7 @@
     "average_processing_time": "Povprečni čas obdelave",
     "average_processing_time_hint": "Povprečni čas v milisekundah pri obdelavi zahteve DNS",
     "block_domain_use_filters_and_hosts": "Onemogoči domene s filtri in gostiteljskimi datotekami",
-    "filters_block_toggle_hint": "Pravila zaviranja lahko nastavite v nastavitvah <a>Filtri</a>.",
+    "filters_block_toggle_hint": "Pravila zaviranja lahko nastavite v nastavitvah <a href='#filters'>Filtri</a>.",
     "use_adguard_browsing_sec": "Uporabi AdGuardovo spletno storitev 'Varnost brskanja'",
     "use_adguard_browsing_sec_hint": "AdGuard Home bo preveril s spletno storitivijo 'Varnost brskanja', ali je domena na seznamu nedovoljenih. Za preverjanje bo uporabila za zasebnost prijazno API povezavo: strežniku se pošlje le kratka predpona imena domene SHA256 hash.",
     "use_adguard_parental": "Uporabi AdGuardovo spletno storitev 'Starševski nadzor'",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "Onemogočanje IPv6",
     "dns_over_https": "DNS-prek-HTTPS",
     "dns_over_tls": "DNS-prek-TLS",
-    "dns_over_quic": "DNS-prek-QIUC",
-    "client_id": "ID odjemalca",
-    "client_id_placeholder": "Vnesite ID odjemalca",
-    "client_id_desc": "Različne odjemalce je mogoče prepoznati s posebnim ID-jem odjemalca. <a>Tukaj</a> lahko izveste več o prepoznavanju odjemalcev.",
-    "download_mobileconfig_doh": "Prenos .mobileconfig za DNS-preko-HTTPS",
-    "download_mobileconfig_dot": "Prenos .mobileconfig za DNS-preko-TLS",
-    "download_mobileconfig": "Prenesi nastavitveno datoteko",
     "plain_dns": "Navadni DNS",
     "form_enter_rate_limit": "Vnesite omejitev hitrosti",
     "rate_limit": "Omejitev hitrosti",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "Število zahtev na sekundo, ki jih sme narediti posamezen odjemalec (nastavitev na 0 pomeni neomejeno)",
     "blocking_ipv4_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo A",
     "blocking_ipv6_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo AAAA",
-    "blocking_mode_default": "Privzeto: odgovori z ničelnim naslovom IP (0.0.0.0 za A; :: za AAAA), ko je onemogočen s pravilom v slogu Adblocka; odgovor z naslovom IP, določenim v pravilu, ko je onemogočen s pravilom /etc/hosts",
+    "blocking_mode_default": "Privzeto: odziv z REFUSED, kadar je onemogočen s slogom pravila zaviranja oglasov; odziv z navedenim naslovom IP v pravilu, kadar je onemogočen s pravilom /etc/gostitelji",
     "blocking_mode_refused": "REFUSED: Odziv s kodo REFUSED",
     "blocking_mode_nxdomain": "NXDOMAIN: Odziv s kodo NXDOMAIN",
     "blocking_mode_null_ip": "Prazen IP: Odziv z ničelnim naslovom IP (0.0.0.0 za A; :: za AAAA)",
@@ -275,7 +266,7 @@
     "source_label": "Vir",
     "found_in_known_domain_db": "Najdeno v zbirki podatkov znanih domen.",
     "category_label": "Kategorija",
-    "rule_label": "Pravila",
+    "rule_label": "Pravilo",
     "list_label": "Seznam",
     "unknown_filter": "Neznan filter {{filterId}}",
     "known_tracker": "Znan sledilec",
@@ -392,7 +383,7 @@
     "client_edit": "Uredi odjemalca",
     "client_identifier": "Identifikator",
     "ip_address": "IP naslov",
-    "client_identifier_desc": "Odjemalce je mogoče prepoznati po naslovu IP, CIDR, naslovu MAC ali posebnem ID-ju odjemalca (lahko se uporablja za DoT/DoH/DoQ). <0>Tukaj</0> lahko izveste več o prepoznavanju odjemalcev.",
+    "client_identifier_desc": "Odjemalce je mogoče identificirati po naslovu IP, CIDR, MAC naslovu. Upoštevajte, da je uporaba MAC kot identifikatorja mogoča le, če je AdGuard Home tudi <0>strežnik DHCP</0>",
     "form_enter_ip": "Vnesite IP",
     "form_enter_mac": "Vnesite MAC",
     "form_enter_id": "Vnesi identifikatorja",
@@ -423,8 +414,7 @@
     "dns_privacy": "Zasebnost DNS",
     "setup_dns_privacy_1": "<0>DNS-prek-TLS:</0> Uporabite niz <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-prek-HTTPS:</0> Uporabite niz <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Tu je seznam programov, ki jo lahko uporabite.</0>",
-    "setup_dns_privacy_4": "Na napravo iOS 14 ali macOS Big Sur lahko prenesete posebno datoteko '.mobileconfig', ki v nastavitve DNS doda strežnike <highlight>DNS-preko-HTTPS</highlight> ali <highlight>DNS-preko-TLS</highlight>.",
+    "setup_dns_privacy_3": "<0>Upoštevajte, da so šifrirani protokoli DNS podprti samo v sistemu Android 9. Zato morate namestiti dodatni program za druge operacijske sisteme.</0><0>Tu je seznam programov, ki jih lahko uporabite..</0>",
     "setup_dns_privacy_android_1": "Android 9 izvirno podpira DNS-prek-TLS. Če ga želite konfigurirati, pojdite v Nastavitve → Omrežje in internet → Napredno → Zasebni DNS, in tam vnesite svoje ime domene.",
     "setup_dns_privacy_android_2": "<0>AdGuard za Android</0> podpira <1>DNS-prek-HTTPS</1> in <1>DNS-prek-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> doda podporo <1>DNS-prek-HTTPS</1> za Android.",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> podpira <1>DNS-prek-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> podpira <1>DNS-prek-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Našli boste več izvedb <0>tukaj</0> in <1>tukaj</1>.",
-    "setup_dns_privacy_ioc_mac": "Nastavitve iOS in macOS",
     "setup_dns_notice": "Za uporabo <1>DNS-prek-HTTPS</1> ali <1>DNS-prek-TLS</1>, morate <0>konfigurirati šifriranje</0> v nastavitvah AdGuard Home.",
     "rewrite_added": "Uspešno je dodano DNS prepisovanje za \"{{key}}\"",
     "rewrite_deleted": "Uspešno je izbrisano DNS prepisovanje za \"{{key}}\"",
@@ -536,8 +525,8 @@
     "check_ip": "IP naslovi: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Razlog: {{reason}}",
+    "check_rule": "Pravilo: {{rule}}",
     "check_service": "Ime storitve: {{service}}",
-    "service_name": "Ime storitve",
     "check_not_found": "Ni najdeno na vašem seznamu filtrov",
     "client_confirm_block": "Ali ste prepričani, da želite onemogočiti odjemalca \"{{ip}}\"?",
     "client_confirm_unblock": "Ali ste prepričani, da želite omogočiti odjemalca \"{{ip}}\"?",
@@ -572,11 +561,11 @@
     "cache_size_desc": "Velikost predpomnilnika DNS (v bajtih)",
     "cache_ttl_min_override": "Preglasi najmanjši TTL",
     "cache_ttl_max_override": "Preglasi največji TTL",
-    "enter_cache_size": "Vnesite velikost predpomnilnika (v bajtih)",
-    "enter_cache_ttl_min_override": "Vnesite najmanjši TTL (v sekundah)",
-    "enter_cache_ttl_max_override": "Vnesite največji TTL (v sekundah)",
-    "cache_ttl_min_override_desc": "Razširite kratke vrednosti časa v živo (v sekundah), ki jih prejme strežnik za predpomnjenje, ko predpomni odzive DNS",
-    "cache_ttl_max_override_desc": "Nastavi največjo vrednost časa v živo (v sekundah) za vnose v predpomnilnik DNS",
+    "enter_cache_size": "Vnesite velikost predpomnilnika",
+    "enter_cache_ttl_min_override": "Vnesite najmanjši TTL",
+    "enter_cache_ttl_max_override": "Vnesite največji TTL",
+    "cache_ttl_min_override_desc": "Vrednost preglasovanja TTL (najmanjša), prejeta od zgornjega strežnika",
+    "cache_ttl_max_override_desc": "Vrednost preglasovanja TTL (največja), prejeta od zgornjega strežnika",
     "ttl_cache_validation": "Najmanjša vrednost predpomnilnika TTL mora biti manjša ali enaka največji vrednosti",
     "filter_category_general": "Splošno",
     "filter_category_security": "Varnost",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "Kliknite za prikaz poizvedb",
     "port_53_faq_link": "Vrata 53 pogosto zasedajo storitve 'DNSStubListener' ali 'Sistemsko razrešene storitve'. Preberite <0>to navodilo</0> o tem, kako to rešiti.",
     "adg_will_drop_dns_queries": "AdGuard Home bo izpustil vse poizvedbe DNS iz tega odjemalca.",
-    "client_not_in_allowed_clients": "Odjemalec ni dovoljen, ker ga ni na seznamu \"Dovoljeni odjemalci\".",
     "experimental": "Eksperimentalno"
 }

client/src/__locales/sr-cs.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Postavke klijenta",
     "example_upstream_reserved": "možete odrediti DNS upstream <0>za određene domene</0>",
-    "example_upstream_comment": "Možete upisati komentar",
     "upstream_parallel": "Koristite paralelne zahteve da ubrzate rešavanje istovremenim zahtevanjem svih servera",
     "parallel_requests": "Paralelni zahtevi",
     "load_balancing": "Load-balancing",
@@ -115,7 +114,7 @@
     "average_processing_time": "Prosečno vreme obrade",
     "average_processing_time_hint": "Prosečno vreme u milisekundama za obradu DNS zahteva",
     "block_domain_use_filters_and_hosts": "Blokiraj domene koristeći filtere i hosts datoteke",
-    "filters_block_toggle_hint": "Možete postaviti pravila blokiranja u <a>Filters</a> postavkama.",
+    "filters_block_toggle_hint": "Možete postaviti pravila blokiranja u <a href='#filters'>Filters</a> postavkama.",
     "use_adguard_browsing_sec": "Koristi AdGuard-ovu uslugu bezbednog pregledanja",
     "use_adguard_browsing_sec_hint": "AdGuard Home će proveriti da li je domen blokiran od strane usluge za bezbednosno pregledanje. Koristiće prijateljski API privatni pregled da izvrši proveru. Samo će se kratak prefiks domena SHA256 hash poslati na server.",
     "use_adguard_parental": "Koristi AdGuard-ovu uslugu roditeljske kontrole",
@@ -133,8 +132,6 @@
     "encryption_settings": "Postavke šifrovanja",
     "dhcp_settings": "DHCP postavke",
     "upstream_dns": "Upstream DNS serveri",
-    "upstream_dns_help": "Unesite adrese servera, jednu po redu. <a>Saznajte više</a> o konfigurisanju upstream DNS servera.",
-    "upstream_dns_configured_in_file": "Konfiguriši u {{path}}",
     "test_upstream_btn": "Testiraj upstreams",
     "upstreams": "Upstreams",
     "apply_btn": "Primeni",
@@ -188,7 +185,6 @@
     "example_upstream_regular": "uobičajeno DNS (preko UDP)",
     "example_upstream_dot": "šifrovano <0>DNS-over-TLS</0>",
     "example_upstream_doh": "šifrovano <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "šifrovano <0>DNS-over-QUIC</0>",
     "example_upstream_sdns": "možete koristiti <0>DNS brojeve</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2>",
     "example_upstream_tcp": "uobičajeni DNS (preko TCP)",
     "all_lists_up_to_date_toast": "Sve liste su već ažurirane",
@@ -197,10 +193,6 @@
     "dns_test_not_ok_toast": "Server \"{{key}}\": se ne može koristiti. Proverite da li ste ga ispravno uneli",
     "unblock": "Odblokiraj",
     "block": "Blokiraj",
-    "disallow_this_client": "Zabrani ovaj klijent",
-    "allow_this_client": "Dozvoli ovaj klijent",
-    "block_for_this_client_only": "Blokiraj samo za ovaj klijent",
-    "unblock_for_this_client_only": "Odblokiraj samo za ovaj klijent",
     "time_table_header": "Vreme",
     "date": "Datum",
     "domain_name_table_header": "Ime domena",
@@ -242,25 +234,20 @@
     "blocking_mode": "Način blokiranja",
     "default": "Podrazumevano",
     "nxdomain": "NXDOMAIN",
-    "refused": "Odbijeno",
     "null_ip": "Null IP",
     "custom_ip": "Prilagođeni IP",
     "blocking_ipv4": "Blokiranje IPv4",
     "blocking_ipv6": "Blokiranje IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "download_mobileconfig_doh": "Preuzimanja",
-    "download_mobileconfig_dot": "Preuzmi .mobileconfig za DNS-over-TLS",
     "plain_dns": "Plain DNS",
     "form_enter_rate_limit": "Unesite ograničenje brzine",
     "rate_limit": "Ograničenje brzine",
     "edns_enable": "Uključi EDNS Client Subnet",
     "edns_cs_desc": "Ako je uključeno, AdGuard Home će slati klijente na DNS servere.",
-    "rate_limit_desc": "Broj zahteva po sekundi koje pojedinačni klijent dozvoljava (0: neograničeno)",
     "blocking_ipv4_desc": "IP adresa koja će biti vraćena za blokirane zahteve",
     "blocking_ipv6_desc": "IP adresa koja će biti vraćena za blokirane AAAA zahteve",
     "blocking_mode_default": "Podrazumevano: Odgovara sa REFUSED kada je blokirano od Adblock-style pravila; odgovara sa IP adresom koja je određena u pravilu kada je blokiran od /etc/hosts-style pravila",
-    "blocking_mode_refused": "Odbijeno: Odgovor sa kodom odbijanja",
     "blocking_mode_nxdomain": "NXDOMAIN: Odgovara sa NXDOMAIN kodom",
     "blocking_mode_null_ip": "Null IP: Odgovara sa zero IP adresom (0.0.0.0 za A; :: za AAAA)",
     "blocking_mode_custom_ip": "Prilagođeni IP: Odgovara sa ručno podešenom IP adresom",
@@ -269,6 +256,7 @@
     "source_label": "Izvor",
     "found_in_known_domain_db": "Pronađeno u poznatim bazama podataka domena.",
     "category_label": "Kategorija",
+    "rule_label": "Pravilo",
     "list_label": "Lista",
     "unknown_filter": "Nepoznat filter {{filterId}}",
     "known_tracker": "Poznato praćenje",
@@ -329,14 +317,13 @@
     "encryption_config_saved": "Konfiguracija šifrovanja je sačuvana",
     "encryption_server": "Ime servera",
     "encryption_server_enter": "Unesite vaše ime domena",
+    "encryption_server_desc": "Kako biste koristili HTTPS, potrebno je da unesete ime servera koje se podudara sa SSL sertifikatom.",
     "encryption_redirect": "Automatski preusmeri na HTTPS",
     "encryption_redirect_desc": "Ako je označeno, AdGuard Home će vas automatski preusmeravati sa HTTP na HTTPS adrese.",
     "encryption_https": "HTTPS port",
     "encryption_https_desc": "Ako je HTTPS port konfigurisan, AdGuard Home administratorskom okruženju će se moći pristupati preko HTTPS, a to će takođe omogućiti DNS-over-HTTPS na '/dns-query' lokaciji.",
     "encryption_dot": "DNS-over-TLS port",
     "encryption_dot_desc": "Ako je ovaj port konfigurisan, AdGuard Home će pokretati DNS-over-TLS server na ovom portu.",
-    "encryption_doq": "DNS-over-QUIC port",
-    "encryption_doq_desc": "Ako je ovaj port konfigurisan, AdGuard Home će pokrenuti DNS-over-QUIC server na tom portu. To je eksperiment i možda neće biti stabilno. Takođe, u ovom trenutku ne postoji puno klijenata koji ovo podržavaju.",
     "encryption_certificates": "Sertifikati",
     "encryption_certificates_desc": "Da biste koristili šifrovanje, morate obezbediti važeći lanac SSL sertifikata za vaš domen. Besplatan sertifikat možete nabaviti na <0>{{link}}</0> ili ga možete kupiti od nekog od pouzdanih izdavalaca sertifikata.",
     "encryption_certificates_input": "Kopirajte/nalepite vaše PEM-kodirane sertifikate ovde.",
@@ -384,6 +371,7 @@
     "client_edit": "Izmeni klijent",
     "client_identifier": "Identifikator",
     "ip_address": "IP adresa",
+    "client_identifier_desc": "Klijenti mogu da budu prepoznati po IP adresi ili MAC adresi. Imajte na umu da je korišćenje MAC adrese kao identifikatora moguće samo ako je AdGuard Home takođe a <0>DHCP server</0>",
     "form_enter_ip": "Unesite IP",
     "form_enter_mac": "Unesite MAC",
     "form_enter_id": "Unesite identifikator",
@@ -414,8 +402,7 @@
     "dns_privacy": "DNS privatnost",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> koristi <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> koristi <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Ovde je lista softvera koje možete koristiti.</0>",
-    "setup_dns_privacy_4": "Na iOS 14 ili macOS Big Sur uređaju možete preuzeti posebnu '.mobileconfig' datotteku koja dodaje <highlight>DNS-over-HTTPS</highlight> ili <highlight>DNS-over-TLS</highlight> servere u DNS postavke.",
+    "setup_dns_privacy_3": "<0>Imajte na umu da su protokoli šifrovanog DNS-a podržani samo od Androida 9. Biće potrebno da instalirate dodatni softver za druge operativne sisteme.</0><0>Ovde je spisak softvera koje možete koristiti.</0>",
     "setup_dns_privacy_android_1": "Android 9 podržava DNS-over-TLS. Za konfiguraciju, idite u postavke → mreža i internet → Napredno → Privatni DNS i tamo unesite ime vašeg domena.",
     "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> podržava <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> dodaje <1>DNS-over-HTTPS</1> podršku za Android.",
@@ -526,8 +513,8 @@
     "check_ip": "IP adrese: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Razlog: {{reason}}",
+    "check_rule": "Pravilo: {{rule}}",
     "check_service": "Ime usluge: {{service}}",
-    "service_name": "Ime usluge",
     "check_not_found": "Nije pronađeno na vašoj listi filtera",
     "client_confirm_block": "Jeste li sigurni da želite da blokirate klijent \"{{ip}}\"?",
     "client_confirm_unblock": "Jeste li sigurni da želite da odblokirate klijent \"{{ip}}\"?",
@@ -565,9 +552,7 @@
     "enter_cache_size": "Unesite veličinu predmemorije",
     "enter_cache_ttl_min_override": "Unesite najmanji TTL",
     "enter_cache_ttl_max_override": "Unesite najveći TTL",
-    "cache_ttl_min_override_desc": "Prepiši TTL vrednost (minimum) dobijen od apstrim servera. Ova vrednost ne može biti veća od 3600 (1 sat)",
     "cache_ttl_max_override_desc": "Prepiši TTL vrednost (maksimum) dobijen od apstrim servera",
-    "ttl_cache_validation": "Minimalna TTL vrednost mora biti manja ili jednaka najvišij vrednosti",
     "filter_category_general": "Opšte",
     "filter_category_security": "Bezbednost",
     "filter_category_regional": "Region",
@@ -579,8 +564,5 @@
     "setup_config_to_enable_dhcp_server": "Podesite konfiguraciju kako biste omogućili DHCP server",
     "original_response": "Izvorni odgovor",
     "click_to_view_queries": "Kliknite da pogledate zahteve",
-    "port_53_faq_link": "Port 53 je najčešće zauzet od \"DNSStubListener\" ili \"systemd-resolved\" usluga. Pročitajte <0>ovo uputstvo</0> kako da to rešite.",
-    "adg_will_drop_dns_queries": "AdGuard Home će odbacivati sve DNS unose od ovog klijenta.",
-    "client_not_in_allowed_clients": "Klijent nije dozvoljen zato što se ne nalazi na spisku dozvoljenih klijenata.",
-    "experimental": "Eksperimentalno"
+    "port_53_faq_link": "Port 53 je najčešće zauzet od \"DNSStubListener\" ili \"systemd-resolved\" usluga. Pročitajte <0>ovo uputstvo</0> kako da to rešite."
 }

client/src/__locales/sv.json

@@ -90,7 +90,7 @@
     "average_processing_time": "Genomsnittlig processtid",
     "average_processing_time_hint": "Genomsnittlig processtid i millisekunder för DNS-förfrågning",
     "block_domain_use_filters_and_hosts": "Blockera domäner med filter- och värdfiler",
-    "filters_block_toggle_hint": "Du kan ställa in egna blockerings regler i <a>Filterinställningar</a>.",
+    "filters_block_toggle_hint": "Du kan ställa in egna blockerings regler i <a href='#filters'>Filterinställningar</a>.",
     "use_adguard_browsing_sec": "Amvänd AdGuards webbservice för surfsäkerhet",
     "use_adguard_browsing_sec_hint": "AdGuard Home kommer att kontrollera om en domän är svartlistad i webbservicens surfsäkerhet. Med en integritetsvänlig metod görs en API-lookup för att kontrollera : endast en kort prefix i domännamnet SHA256 hash skickas till servern.",
     "use_adguard_parental": "Använda AdGuards webbservice för färäldrakontroll",
@@ -177,6 +177,7 @@
     "source_label": "Källa",
     "found_in_known_domain_db": "Hittad i domändatabas.",
     "category_label": "Kategori",
+    "rule_label": "Regel",
     "unknown_filter": "Okänt filter {{filterId}}",
     "install_welcome_title": "Välkommen till AdGuard Home!",
     "install_welcome_desc": "AdGuard Home är en DNS-server för nätverkstäckande annons- och spårningsblockering. Dess syfte är att de dig kontroll över hela nätverket och alla dina enheter, utan behov av att använda klientbaserade program.",
@@ -234,6 +235,7 @@
     "encryption_config_saved": "Krypteringsinställningar sparade",
     "encryption_server": "Servernamn",
     "encryption_server_enter": "Skriv in ditt domännamn",
+    "encryption_server_desc": "För att använda HTTPS behöver du skriva in servernamnet som stämmer överens med ditt SSL-certifikat.",
     "encryption_redirect": "Omdirigera till HTTPS automatiskt",
     "encryption_redirect_desc": "Om bockad kommer AdGuard Home automatiskt att omdirigera dig från HTTP till HTTPS-adresser.",
     "encryption_https": "HTTPS-port",
@@ -285,6 +287,7 @@
     "client_edit": "Redigera klient",
     "client_identifier": "Identifikator",
     "ip_address": "IP-adress",
+    "client_identifier_desc": "Klienter kan identifieras genom IP-adresser eller MAC-adresser. Notera att användning av MAC som identifierare bara är möjligt om AdGuard Home också är en <0>DHCP-server</0>",
     "form_enter_ip": "Skriv in IP",
     "form_enter_mac": "Skriv in MAC",
     "form_client_name": "Skriv in klientnamn",
@@ -311,6 +314,7 @@
     "dns_privacy": "DNS-Integritet",
     "setup_dns_privacy_1": "<0>DNS-över-TLS:</0> Använd: <1>{{address}}</1>",
     "setup_dns_privacy_2": "<0>DNS-över-HTTPS:</0> Använd: <1>{{address}}</1>",
+    "setup_dns_privacy_3": "<0>Notera att krypterade DNS-protokoll endast stöds på Android 9. Du behöver därför installera ytterligare mjukvara för andra operativsystem.</0><0>Här är en lista över program du kan använda.</0>",
     "setup_dns_privacy_android_1": "Android 9 har inbyggt stöd för DNS-över-TLS. Konfigurera och uppge domännamn under Inställningar → Nätverk & Internet → Avancerat → Privat DNS.",
     "setup_dns_privacy_android_2": "<0>AdGuard för Android</0> stödjer <1>DNS-över-HTTPS</1> samt <1>DNS-över-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> lägger till stöd för <1>DNS-ÖVER-HTTPS</1> till Android.",

client/src/__locales/th.json

@@ -95,7 +95,7 @@
     "average_processing_time": "เวลาประมวลผลโดยเฉลี่ย",
     "average_processing_time_hint": "เวลาเฉลี่ยเป็นมิลลิวินาทีในการประมวลผลคำขอ DNS",
     "block_domain_use_filters_and_hosts": "ปิดกั้นโดเมนโดยใช้ตัวกรองและไฟล์โฮสต์",
-    "filters_block_toggle_hint": "คุณสามารถตั้งค่ากฎการปิดกั้นในการตั้งค่า<a>ตัวกรอง</a>",
+    "filters_block_toggle_hint": "คุณสามารถตั้งค่ากฎการปิดกั้นในการตั้งค่า<a href='#filters'>ตัวกรอง</a>",
     "use_adguard_browsing_sec": "ใช้บริการเว็บการรักษาความปลอดภัยการเรียกดู AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home จะตรวจสอบว่าโดเมนอยู่ในรายการที่ไม่อนุญาตโดยเว็บเซอร์วิสความปลอดภัยการสืบค้นหรือไม่ จะใช้ API การค้นหาที่เป็นมิตรกับข้อมูลส่วนบุคคลเพื่อทำการตรวจสอบ: มีการส่งคำนำหน้าสั้น ๆ ของชื่อโดเมน SHA256 แฮชไปยังเซิร์ฟเวอร์",
     "use_adguard_parental": "ใช้บริการเว็บการควบคุมโดยผู้ปกครองของ AdGuard",
@@ -193,6 +193,7 @@
     "edns_cs_desc": "หากเปิดใช้งาน AdGuard Home จะส่งซับเน็ตของไคลเอนต์ไปยังเซิร์ฟเวอร์ DNS",
     "blocking_ipv4_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอที่ถูกปิดกั้น",
     "blocking_ipv6_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอ AAAA ที่ถูกปิดกั้น",
+    "blocking_mode_default": "เริ่มต้น: ตอบสนองด้วย REFUSED เมื่อถูกปิดกั้นโดยกฎสไตล์ปิดกั้นโฆษณา; ตอบกลับด้วยที่อยู่ IP ที่ระบุในกฎเมื่อถูกปิดกั้นโดยกฎ /etc/hosts-hosts",
     "blocking_mode_nxdomain": "NXDOMAIN: ตอบสนองด้วยรหัส NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: ตอบกลับด้วยที่อยู่เลขศูนย์ IP (0.0.0.0 สำหรับ A; :: สำหรับ AAAA)",
     "blocking_mode_custom_ip": "IP ที่กำหนดเอง: ตอบกลับด้วยที่อยู่ IP ที่ตั้งค่าด้วยตนเอง",
@@ -200,6 +201,7 @@
     "source_label": "ที่มา",
     "found_in_known_domain_db": "พบในฐานข้อมูลโดเมนที่รู้จัก",
     "category_label": "ประเภท",
+    "rule_label": "กฎ",
     "unknown_filter": "ตัวกรองที่ไม่รู้จัก {{filterId}}",
     "install_welcome_title": "ยินดีต้อนรับสู่ AdGuard Home",
     "install_welcome_desc": "AdGuard Home เป็นเซิร์ฟเวอร์ DNS ปิดกั้นโฆษณาและติดตามทั่วทั้งเครือข่าย วัตถุประสงค์คือเพื่อให้คุณควบคุมเครือข่ายทั้งหมดและอุปกรณ์ทั้งหมดของคุณและไม่จำเป็นต้องใช้โปรแกรมฝั่งไคลเอ็นต์",
@@ -257,6 +259,7 @@
     "encryption_config_saved": "บันทึกการตั้งค่าเข้ารหัสเรียบร้อยแล้ว",
     "encryption_server": "ชื่อเซิร์ฟเวอร์",
     "encryption_server_enter": "ป้อนชื่อโดเมน",
+    "encryption_server_desc": "ในการใช้ HTTPS คุณต้องป้อนชื่อเซิร์ฟเวอร์ที่ตรงกับใบรับรอง SSL ของคุณ",
     "encryption_redirect": "ไปเส้นทาง HTTPS อัตโนมัติ",
     "encryption_redirect_desc": "หากเลือกตัวเลือกนี้ AdGuard Home จะเปลี่ยนเส้นทางคุณจากที่อยู่ HTTP ไปยัง HTTPS โดยอัตโนมัติ",
     "encryption_https": "พอร์ท HTTPS",
@@ -310,6 +313,7 @@
     "client_edit": "แก้ไขเครื่องลูกข่าย",
     "client_identifier": "ตรวจสอบโดย",
     "ip_address": "IP addresses",
+    "client_identifier_desc": "ลูกค้าสามารถระบุได้โดยที่อยู่ IP, CIDR, ที่อยู่ MAC โปรดทราบว่าการใช้ MAC เป็นตัวระบุเป็นไปได้ก็ต่อเมื่อ AdGuard Home เป็น <0>เซิร์ฟเวอร์ DHCP</0> ด้วย",
     "form_enter_ip": "กรอก IP",
     "form_enter_mac": "กรอก MAC",
     "form_enter_id": "ป้อนตัวระบุ",

client/src/__locales/tr.json

@@ -1,21 +1,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,16 +20,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_server_name": "Geçersiz sunucu adı",
+    "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ı",
@@ -46,10 +42,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.",
@@ -62,10 +58,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",
@@ -74,7 +68,6 @@
     "filters": "Filtreler",
     "filter": "Filtre",
     "query_log": "Sorgu Günlüğü",
-    "compact": "Kompakt",
     "nothing_found": "Hiçbir şey bulunamadı",
     "faq": "SSS",
     "version": "Sürüm",
@@ -82,7 +75,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ı",
@@ -93,7 +86,7 @@
     "refresh_statics": "İstatistikleri yenile",
     "dns_query": "DNS Sorguları",
     "blocked_by": "<0>Filtreler tarafından engellendi</0>",
-    "stats_malware_phishing": "Kötü amaçlı yazılım/kimlik avı engellendi",
+    "stats_malware_phishing": "Zararlı yazılım/kimlik hırsızlığı engellendi",
     "stats_adult": "Yetişkin içerikli site engellendi",
     "stats_query_domain": "En fazla sorgulanan alan adları",
     "for_last_24_hours": "son 24 saat içindekiler",
@@ -115,8 +108,8 @@
     "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",
-    "filters_block_toggle_hint": "<a>Filtreler</a> sayfasından engelleme kurallarını ayarlayabilirsiniz.",
+    "block_domain_use_filters_and_hosts": "Filtreleri ve hosts listelerini kullanarak alan adlarını engelle",
+    "filters_block_toggle_hint": "<a href='#filters'>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.",
     "use_adguard_parental": "AdGuard ebeveyn kontrolü web hizmetini kullan",
@@ -127,17 +120,16 @@
     "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ı",
     "upstream_dns": "Üst DNS sunucusu",
     "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",
@@ -157,11 +149,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",
@@ -174,22 +166,21 @@
     "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)",
-    "example_upstream_dot": "şifrelenmiş <0>DNS-over-TLS</0>",
-    "example_upstream_doh": "şifrelenmiş <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "şifrelenmiş <0>DNS-over-QUIC</0>",
+    "example_upstream_dot": "<0>DNS-over-TLS</0> şifrelemesi",
+    "example_upstream_doh": "<0>DNS-over-HTTPS</0> şifrelemesi",
     "example_upstream_sdns": "<1>DNSCrypt</1> veya <2>DNS-over-HTTPS</2> çözücüleri için <0>DNS Damgaları</0> kullanabilirsiniz.",
     "example_upstream_tcp": "normal DNS (TCP üzerinden)",
     "all_lists_up_to_date_toast": "Tüm listeler zaten güncel",
@@ -208,7 +199,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",
@@ -227,10 +217,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",
@@ -248,24 +237,14 @@
     "custom_ip": "Özel IP",
     "blocking_ipv4": "IPv4 engelleme",
     "blocking_ipv6": "IPv6 engelleme",
-    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "İstemci Kimliği",
-    "client_id_placeholder": "İstemci Kimliği girin",
-    "client_id_desc": "Farklı istemciler, özel bir istemci kimliği ile tanımlanabilir. <a>Burada</a> istemcileri nasıl belirleyeceğiniz hakkında daha fazla bilgi edinebilirsiniz.",
-    "download_mobileconfig_doh": "DNS-over-HTTPS için .mobileconfig dosyasını indir",
-    "download_mobileconfig_dot": "DNS-over-TLS için .mobileconfig dosyasını indir",
-    "download_mobileconfig": "Yapılandırma dosyasını indir",
-    "plain_dns": "Sade DNS",
+    "dns_over_https": "DNS üzerinden HTTPS",
     "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",
+    "blocking_mode_default": "Varsayılan: Reklam Engelleme tarzı kural tarafından engellendiğinde REDDEDİLDİ ile yanıt verin; /etc/hosts-style kuralı tarafından engellendiğinde kuralda belirtilen IP adresiyle yanıt verin",
     "blocking_mode_refused": "REFUSED: REFUSED kod ile yanıt verin",
     "blocking_mode_nxdomain": "NXDOMAIN: NXDOMAIN koduyla yanıt",
     "blocking_mode_null_ip": "Boş IP: Sıfır IP adresiyle yanıt verin (A için 0.0.0.0; :: AAAA için)",
@@ -283,17 +262,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",
@@ -304,7 +283,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.",
@@ -328,7 +307,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",
@@ -336,36 +315,34 @@
     "encryption_config_saved": "Şifreleme ayarı kaydedildi",
     "encryption_server": "Sunucu adı",
     "encryption_server_enter": "Alan adınızı girin",
-    "encryption_server_desc": "HTTPS kullanmak için, SSL sertifikanız veya joker karakter sertifikanızla eşleşen sunucu adını girmeniz gerekir. Alan ayarlanmazsa, herhangi bir alan adı için TKG bağlantılarını kabul eder.",
+    "encryption_server_desc": "HTTPS kullanmak için SSL sertifikanızla eşleşen sunucu adını girmeniz gerekir",
     "encryption_redirect": "Otomatik olarak HTTPS'e yönlendir",
     "encryption_redirect_desc": "Etkinleştirirseniz AdGuard Home sizi HTTP yerine HTTPS adreslerine yönlendirir.",
     "encryption_https": "HTTPS bağlantı noktası",
     "encryption_https_desc": "Eğer HTTPS portu yapılandırılmışsa, AdGuard Home yönetici arayüzü HTTPS ile ulaşılabilir olacak, ayrıca '/dns-query' üzerinden DNS-over-HTTPS hizmeti de çalışacak.",
-    "encryption_dot": "DNS-over-TLS bağlantı noktası",
+    "encryption_dot": "DNS-over-TLS portu",
     "encryption_dot_desc": "Eğer bu portu yapılandırırsanız AdGuard Home bu port üzerinden DNS-over-TLS sunucusu çalıştıracak.",
-    "encryption_doq": "DNS-over-QUIC bağlantı noktası",
-    "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_enable_desc": "Şifrelemeyi etkinleştirirseniz AdGuard Home yönetici arayüzü HTTPS ile çalışacak, ayrıca DNS sunucusu  DNS-over-HTTPS ve DNS-over-TLS üzerinden gelen istekleri dinleyecektir.",
     "encryption_chain_valid": "Sertifika zinciri geçerli",
     "encryption_chain_invalid": "Sertifika zinciri geçersiz",
     "encryption_key_valid": "Bu geçerli bir {{type}} özel anahtar",
     "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,13 +369,12 @@
     "client_edit": "İstemciyi düzenle",
     "client_identifier": "Tanımlayıcı",
     "ip_address": "IP adresi",
-    "client_identifier_desc": "İstemciler IP adresi, CIDR, MAC adresi veya özel bir istemci kimliği ile tanımlanabilir (DoT/DoH/DoQ için kullanılabilir). <0>Burada</0> istemcileri nasıl belirleyeceğiniz hakkında daha fazla bilgi edinebilirsiniz.",
+    "client_identifier_desc": "İstemciler IP adresleri veya MAC adresleri ile tanımlanabilir. Lütfen not edin, MAC adresi ile tanımlamayı kullanmak için AdGuard Home'un <0>DHCP Sunucusu</0> olması gerekir.",
     "form_enter_ip": "IP Girin",
     "form_enter_mac": "MAC Girin",
     "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",
@@ -421,10 +397,9 @@
     "updates_version_equal": "AdGuard Home yazılımı  günceldir",
     "check_updates_now": "Güncellemeleri şimdi denetle",
     "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_1": "<0>DNS-over-TLS:</0> Kullanımı <1>{{address}}</1> string.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Kullanımı <1>{{address}}</1> string.",
+    "setup_dns_privacy_3": "<0>Lütfen şifrelenmiş DNS protokollerinin yalnızca Android 9'da desteklendiğini unutmayın. Bu yüzden diğer işletim sistemleri için ek yazılım yüklemeniz gerekir..</0><0>İşte kullanabileceğiniz yazılımların bir listesi.</0>",
     "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.",
@@ -436,7 +411,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0>, <1>DNS-over-HTTPS</1> destekler.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0>, <1>DNS-over-HTTPS</1> desteklemektedir.",
     "setup_dns_privacy_other_5": "<0>Burada</0> ve <1>burada</1> daha fazla uygulama bulacaksınız.",
-    "setup_dns_privacy_ioc_mac": "iOS ve macOS yapılandırması",
     "setup_dns_notice": "<1>DNS-over-HTTPS</1> veya <1>DNS-over-TLS</1> kullanmak için, AdGuard Home ayarlarında <0>Şifreleme yapılandırmasını</0> yapmanız gerekir.",
     "rewrite_added": "\"{{key}}\" için DNS yeniden yazımı başarıyla eklendi",
     "rewrite_deleted": "\"{{key}}\" için DNS yeniden yazımı başarıyla silindi",
@@ -445,12 +419,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",
@@ -501,48 +475,44 @@
     "location": "Konum",
     "orgname": "Organizasyon adı",
     "netname": "Ağ adı",
-    "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.",
+    "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",
     "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}}",
+    "check_rule": "Kural: {{rule}}",
     "check_service": "Hizmet adı: {{service}}",
-    "service_name": "Servis adı",
     "check_not_found": "Filtre listelerinizde bulunamadı",
     "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",
@@ -554,7 +524,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",
@@ -564,7 +533,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",
@@ -572,25 +540,21 @@
     "cache_size_desc": "DNS önbelleği boyutu (byte cinsinden)",
     "cache_ttl_min_override": "Minimum TTL'yi değiştir",
     "cache_ttl_max_override": "Maksimum TTL'yi değiştir",
-    "enter_cache_size": "Önbellek boyutunu girin (byte)",
-    "enter_cache_ttl_min_override": "Minimum TTL değerini girin (saniye)",
-    "enter_cache_ttl_max_override": "Maksimum TTL değerini girin (saniye)",
-    "cache_ttl_min_override_desc": "DNS yanıtlarını önbelleğe alırken üst sunucusundan alınan kullanım süresi değerini (saniye) uzatın",
-    "cache_ttl_max_override_desc": "DNS önbelleğindeki girişler için maksimum kullanım süresi değerini (saniye) ayarlayın",
+    "enter_cache_size": "Önbellek boyutunu girin",
+    "enter_cache_ttl_min_override": "Minimum TTL değerini girin",
+    "enter_cache_ttl_max_override": "Maksimum TTL değerini girin",
+    "cache_ttl_min_override_desc": "Üst sunucudan alınan (minimum) TTL değerini değiştirin",
+    "cache_ttl_max_override_desc": "Üst sunucudan alınan (maksimum) TTL değerini değiştirin",
     "ttl_cache_validation": "Minimum önbellek TTL değeri, maksimum değerden küçük veya bu değere eşit olmalıdır",
     "filter_category_general": "Genel",
     "filter_category_security": "Güvenlik",
     "filter_category_regional": "Bölgesel",
     "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"
 }

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",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "Định dạng IPv4 không hợp lệ",
     "form_error_mac_format": "Định dạng MAC không hợp lệ",
     "form_error_client_id_format": "Định dạng client ID không hợp lệ",
-    "form_error_server_name": "Tên máy chủ không hợp lệ",
     "form_error_positive": "Phải lớn hơn 0",
     "form_error_negative": "Phải lớn hơn hoặc bằng 0",
     "range_end_error": "Phải lớn hơn khoảng bắt đầu",
@@ -116,7 +114,7 @@
     "average_processing_time": "Thời gian xử lý trung bình",
     "average_processing_time_hint": "Thời gian trung bình cho một yêu cầu DNS tính bằng mili giây",
     "block_domain_use_filters_and_hosts": "Chặn tên miền sử dụng các bộ lọc và file hosts",
-    "filters_block_toggle_hint": "Bạn có thể thiết lập quy tắc chặn tại cài đặt <a>Bộ lọc</a>.",
+    "filters_block_toggle_hint": "Bạn có thể thiết lập quy tắc chặn tại cài đặt <a href='#filters'>Bộ lọc</a>.",
     "use_adguard_browsing_sec": "Sử dụng dịch vụ bảo vệ duyệt web AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home sẽ kiểm tra tên miền với dịch vụ bảo vệ duyệt web. Tính năng sử dụng một API thân thiện với quyền riêng tư: chỉ một phần ngắn tiền tố mã băm SHA256 được gửi đến máy chủ",
     "use_adguard_parental": "Sử dụng dịch vụ quản lý của phụ huynh AdGuard",
@@ -134,8 +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_help": "Nhập địa chỉ máy chủ một trên mỗi dòng. <a>Tìm hiểu thêm</a> về cách định cấu hình máy chủ DNS ngược dòng.",
-    "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",
@@ -189,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",
@@ -198,10 +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",
-    "allow_this_client": "Cho phép ứng dụng khách này",
-    "block_for_this_client_only": "Chỉ chặn ứng dụng khách này",
-    "unblock_for_this_client_only": "Chỉ hủy chặn ứng dụng khách này",
     "time_table_header": "Thời gian",
     "date": "Ngày",
     "domain_name_table_header": "Tên miền",
@@ -243,30 +234,19 @@
     "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",
     "blocking_ipv6": "Chặn IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID khách hàng",
-    "client_id_placeholder": "Nhập ID khách hàng",
-    "client_id_desc": "Các khách hàng khác nhau có thể được xác định bằng một ID khách hàng đặc biệt. <a>Tại đây</a> bạn có thể tìm hiểu thêm về cách xác định khách hàng.",
-    "download_mobileconfig_doh": "Tải xuống .mobileconfig cho DNS-over-HTTPS",
-    "download_mobileconfig_dot": "Tải xuống .mobileconfig cho DNS-over-TLS",
-    "download_mobileconfig": "Tải xuống tệp cấu hình",
     "plain_dns": "DNS thuần",
     "form_enter_rate_limit": "Nhập giới hạn yêu cầu",
     "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_refused": "REFUSED: Trả lời bằng mã REFUSED",
     "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",
@@ -275,6 +255,7 @@
     "source_label": "Nguồn",
     "found_in_known_domain_db": "Tìm thấy trong cơ sở dữ liệu tên miền",
     "category_label": "Thể loại",
+    "rule_label": "Quy tắc",
     "list_label": "Danh sách",
     "unknown_filter": "Bộ lọc không rõ {{filterId}}",
     "known_tracker": "Theo dõi đã biết",
@@ -335,14 +316,13 @@
     "encryption_config_saved": "Đã lưu cấu hình mã hóa",
     "encryption_server": "Tên máy chủ",
     "encryption_server_enter": "Nhập tên miền của bạn",
+    "encryption_server_desc": "Để sử dụng HTTPS, bạn cần nhập tên máy chủ phù hợp với chứng chỉ SSL của bạn.",
     "encryption_redirect": "Tự động chuyển hướng đến HTTPS",
     "encryption_redirect_desc": "Nếu được chọn, AdGuard Home sẽ tự động chuyển hướng bạn từ địa chỉ HTTP sang địa chỉ HTTPS.",
     "encryption_https": "Cổng HTTPS",
     "encryption_https_desc": "Nếu cổng HTTPS được định cấu hình, giao diện quản trị viên AdGuard Home sẽ có thể truy cập thông qua HTTPS và nó cũng sẽ cung cấp DNS-over-HTTPS trên vị trí '/dns-query'.",
     "encryption_dot": "Cổng DNS-over-TLS",
     "encryption_dot_desc": "Nếu cổng này được định cấu hình, AdGuard Home sẽ chạy máy chủ DNS-over-TLS trên cổng này.",
-    "encryption_doq": "Cổng DNS-over-QUIC",
-    "encryption_doq_desc": "Nếu cổng này được định cấu hình, AdGuard Home sẽ chạy máy chủ DNS qua QUIC trên cổng này. Đó là thử nghiệm và có thể không đáng tin cậy. Ngoài ra, không có quá nhiều khách hàng hỗ trợ nó vào lúc này.",
     "encryption_certificates": "Chứng chỉ",
     "encryption_certificates_desc": "Để sử dụng mã hóa, bạn cần cung cấp chuỗi chứng chỉ SSL hợp lệ cho miền của mình. Bạn có thể nhận chứng chỉ miễn phí trên <0>{{link}}</0> hoặc bạn có thể mua chứng chỉ từ một trong các Cơ Quan Chứng Nhận tin cậy.",
     "encryption_certificates_input": "Sao chép/dán chứng chỉ được mã hóa PEM của bạn tại đây.",
@@ -390,6 +370,7 @@
     "client_edit": "Chỉnh Sửa Máy Khách",
     "client_identifier": "Định danh",
     "ip_address": "Địa chỉ IP",
+    "client_identifier_desc": "Các máy khách có thể được xác định bằng địa chỉ IP hoặc địa chỉ MAC. Xin lưu ý rằng chỉ có thể sử dụng MAC làm định danh nếu AdGuard Home cũng là <0>máy chủ DHCP</0>",
     "form_enter_ip": "Nhập IP",
     "form_enter_mac": "Nhập MAC",
     "form_enter_id": "Nhập định danh",
@@ -420,8 +401,7 @@
     "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_3": "<0>Đây là danh sách phần mềm bạn có thể sử dụng.</0>",
-    "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_3": "<0>Xin lưu ý rằng các giao thức DNS được mã hóa chỉ được hỗ trợ trên Android 9. Vì vậy, bạn cần cài đặt phần mềm bổ sung cho các hệ điều hành khác.</0><0>Đây là danh sách các phần mềm bạn có thể sử dụng.</0>",
     "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.",
@@ -433,7 +413,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> hỗ trợ <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> hỗ trợ <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Bạn sẽ tìm thấy nhiều triển khai hơn <0>tại đây</0> và <1>tại đây</1>.",
-    "setup_dns_privacy_ioc_mac": "Cấu hình iOS và macOS",
     "setup_dns_notice": "Để sử dụng <1>DNS-over-HTTPS</1> hoặc <1>DNS-over-TLS</1>, bạn cần <0>định cấu hình Mã hóa</0> trong cài đặt AdGuard Home.",
     "rewrite_added": "DNS viết lại cho \"{{key}}\" đã thêm thành công",
     "rewrite_deleted": "DNS viết lại cho \"{{key}}\" đã xóa thành công",
@@ -533,8 +512,8 @@
     "check_ip": "Địa chỉ IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Lý do: {{reason}}",
+    "check_rule": "Quy tắc: {{rule}}",
     "check_service": "Tên dịch vụ: {{service}}",
-    "service_name": "Tên dịch vụ",
     "check_not_found": "Không tìm thấy trong danh sách bộ lọc của bạn",
     "client_confirm_block": "Bạn có muốn chặn người dùng {{ip}}?",
     "client_confirm_unblock": "Bạn có muốn bỏ chặn người dùng {{ip}}?",
@@ -567,14 +546,10 @@
     "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",
-    "enter_cache_size": "Nhập kích thước bộ nhớ cache (byte)",
-    "enter_cache_ttl_min_override": "Nhập TTL tối thiểu (giây)",
-    "enter_cache_ttl_max_override": "Nhập TTL tối đa (giây)",
-    "cache_ttl_min_override_desc": "Mở rộng giá trị thời gian tồn tại ngắn (giây) nhận được từ máy chủ ngược dòng khi phản hồi DNS vào bộ nhớ đệm",
-    "cache_ttl_max_override_desc": "Đặt giá trị thời gian tồn tại tối đa (giây) cho các mục nhập trong bộ nhớ cache DNS",
-    "ttl_cache_validation": "Giá trị TTL trong bộ nhớ cache tối thiểu phải nhỏ hơn hoặc bằng giá trị lớn nhất",
+    "enter_cache_size": "Nhập kích thước cache",
+    "enter_cache_ttl_min_override": "Nhập TTL tối thiểu",
+    "enter_cache_ttl_max_override": "Nhập TTL tối đa",
+    "cache_ttl_max_override_desc": "Ghi đè giá trị TTL (tối đa) nhận được từ máy chủ ngược dòng",
     "filter_category_general": "Chung",
     "filter_category_security": "Bảo mật",
     "filter_category_regional": "Khu vực",
@@ -586,8 +561,5 @@
     "setup_config_to_enable_dhcp_server": "Thiết lập cấu hình để bật máy chủ DHCP",
     "original_response": "Phản hồi gốc",
     "click_to_view_queries": "Nhấp để xem truy xuất",
-    "port_53_faq_link": "Cổng 53 thường được sử dụng \"DNSStubListener\" hoặc \"systemd-resolved\". Vui lòng đọc <0>hướng dẫn</0> để giải quyết vấn đề này.",
-    "adg_will_drop_dns_queries": "AdGuard Home sẽ loại bỏ tất cả các truy vấn DNS từ ứng dụng khách này.",
-    "client_not_in_allowed_clients": "Ứng dụng khách không được phép vì nó không có trong danh sách \"Ứng dụng khách được phép\".",
-    "experimental": "Thử nghiệm"
+    "port_53_faq_link": "Cổng 53 thường được sử dụng \"DNSStubListener\" hoặc \"systemd-resolved\". Vui lòng đọc <0>hướng dẫn</0> để giải quyết vấn đề này."
 }

client/src/__locales/zh-cn.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "客户端设置",
-    "example_upstream_reserved": "您可以<0>为特定域名</0>指定上游 DNS 服务器",
-    "example_upstream_comment": "您可以指定注解",
+    "example_upstream_reserved": "您可以将上游DNS 服务器<0>指定为特定域名</0>",
     "upstream_parallel": "通过同时查询所有上游服务器，使用并行请求以加速解析",
     "parallel_requests": "并行请求",
     "load_balancing": "负载均衡",
@@ -32,7 +31,6 @@
     "form_error_ip_format": "无效的 IPv4 格式",
     "form_error_mac_format": "无效的 MAC 格式",
     "form_error_client_id_format": "无效的客户端 ID 格式",
-    "form_error_server_name": "无效的服务器名",
     "form_error_positive": "必须大于 0",
     "form_error_negative": "必须大于等于 0",
     "range_end_error": "必须大于范围起始值",
@@ -90,7 +88,7 @@
     "enabled_protection": "保护已启用",
     "disable_protection": "禁用保护",
     "disabled_protection": "保护已禁用",
-    "refresh_statics": "刷新统计数据",
+    "refresh_statics": "刷新状态",
     "dns_query": "DNS查询",
     "blocked_by": "<0>已被过滤器拦截</0>",
     "stats_malware_phishing": "被拦截的恶意/钓鱼网站",
@@ -116,7 +114,7 @@
     "average_processing_time": "平均处理时间",
     "average_processing_time_hint": "处理 DNS 请求的平均时间（毫秒）",
     "block_domain_use_filters_and_hosts": "使用过滤器和 Hosts 文件以拦截指定域名",
-    "filters_block_toggle_hint": "你可以在 <a>过滤器</a> 设置中添加过滤规则。",
+    "filters_block_toggle_hint": "你可以在 <a href='#filters'>过滤器</a> 设置中添加过滤规则。",
     "use_adguard_browsing_sec": "使用 AdGuard【浏览安全】网页服务",
     "use_adguard_browsing_sec_hint": "AdGuard Home 将检查域名是否被浏览安全服务列入黑名单。它将使用隐私性强的检索 API 来执行检查，只有域名的 SHA256 的短前缀会被发送到服务器。",
     "use_adguard_parental": "使用 AdGuard 【家长控制】服务",
@@ -200,10 +198,10 @@
     "block": "拦截",
     "disallow_this_client": "不允许这个客户端",
     "allow_this_client": "允许这个客户端",
-    "block_for_this_client_only": "仅对此客户端拦截",
+    "block_for_this_client_only": "仅拦截这个客户端",
     "unblock_for_this_client_only": "仅解除对此客户端的拦截",
     "time_table_header": "时间",
-    "date": "日期",
+    "date": "日起",
     "domain_name_table_header": "域名",
     "domain_or_client": "域名或客户端",
     "type_table_header": "类型",
@@ -250,13 +248,6 @@
     "blocking_ipv6": "拦截 IPv6",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "客户端 ID",
-    "client_id_placeholder": "输入客户端 ID",
-    "client_id_desc": "可根据一个特殊的客户端 ID 识别不同客户端。在 <a>这里</a>你可以了解到更多关于如何识别客户端的信息。",
-    "download_mobileconfig_doh": "下载适用于 DNS-over-HTTPS 的 .mobileconfig",
-    "download_mobileconfig_dot": "下载适用于 DNS-over-TLS 的 .mobileconfig",
-    "download_mobileconfig": "下载配置文件",
     "plain_dns": "无加密DNS",
     "form_enter_rate_limit": "输入限制速率",
     "rate_limit": "速度限制",
@@ -265,7 +256,7 @@
     "rate_limit_desc": "每个客户端每秒钟查询次数的限制 (设置为 0 意味着不限制)",
     "blocking_ipv4_desc": "拦截 A 记录请求返回的 IP 地址",
     "blocking_ipv6_desc": "拦截 AAAA 记录请求返回的 IP 地址",
-    "blocking_mode_default": "默认：被 Adblock 规则拦截时反应为零 IP 地址（A记录：0.0.0.0；AAAA记录：::）；被/etc/hosts 规则拦截时反应为规则中指定 IP 地址",
+    "blocking_mode_default": "默认：被Adblock规则拦截时以REFUSED码响应；被/etc/hosts规则拦截时返回规则中指定IP",
     "blocking_mode_refused": "REFUSED：以 REFUSED 码响应请求",
     "blocking_mode_nxdomain": "NXDOMAIN：以NXDOMAIN码响应",
     "blocking_mode_null_ip": "空IP：以零IP地址响应(A记录 0.0.0.0；AAAA记录 ::)",
@@ -322,7 +313,7 @@
     "install_devices_android_list_2": "点击菜单上的 ”无线局域网“ 选项。在屏幕上将列出所有可用的网络（蜂窝移动网络不支持修改 DNS ）。",
     "install_devices_android_list_3": "长按当前已连接的网络，然后点击 ”修改网络设置“ 。",
     "install_devices_android_list_4": "在某些设备上，您可能需要选中 ”高级“ 复选框以查看进一步的设置。您可能需要调整您安卓设备的 DNS 设置，或是需要将 IP 设置从 DHCP 切换到静态。",
-    "install_devices_android_list_5": "将 DNS 1 和 DNS 2 的值改为您的 AdGuard Home 服务器地址。",
+    "install_devices_android_list_5": "将 \"DNS 1 / 主 DNS\" 和 ”DNS 2 / 副 DNS“ 的值改为您的 AdGuard Home 服务器地址。",
     "install_devices_ios_list_1": "从主屏幕中点击 ”设置“ 。",
     "install_devices_ios_list_2": "从左侧目录中选择 ”无线局域网“（移动数据网络环境下不支持修改 DNS ）。",
     "install_devices_ios_list_3": "点击当前已连接网络的名称。",
@@ -336,7 +327,7 @@
     "encryption_config_saved": "加密配置已保存",
     "encryption_server": "服务器名称",
     "encryption_server_enter": "输入您的域名",
-    "encryption_server_desc": "为了使用 HTTPS，请您输入与 SSL 证书或通配证书相匹配的服务器名称。如此字段未设置，服务器将要为所有域名接受 TLS 连接。",
+    "encryption_server_desc": "若要使用 HTTPS ，您需要输入与 SSL 证书相匹配的服务器名称。",
     "encryption_redirect": "HTTPS 自动重定向",
     "encryption_redirect_desc": "如果勾选此选项，AdGuard Home 将自动将您从 HTTP 重定向到 HTTPS 地址。",
     "encryption_https": "HTTPS 端口",
@@ -392,7 +383,7 @@
     "client_edit": "编辑客户端",
     "client_identifier": "标识符",
     "ip_address": "IP 地址",
-    "client_identifier_desc": "客户端可通过 IP 、MAC 地址、CIDR 或特殊 ID（可用于 DoT/DoH/DoQ）被识别。<0>这里</0>您可多了解如何识别客户端。",
+    "client_identifier_desc": "客户端可通过 IP 地址或 MAC 地址识别。请注意，如 AdGuard Home 也是 <0>DHCP 服务器</0>，则仅能将 MAC 用作标识符",
     "form_enter_ip": "输入 IP",
     "form_enter_mac": "输入 MAC",
     "form_enter_id": "输入标识符",
@@ -423,8 +414,7 @@
     "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 设备上，您可以下载特定的 '.mobileconfig' 文件。此文件将<highlight>DNS-over-HTTPS</highlight> 或 <highlight>DNS-over-TLS</highlight> 服务器添加于 DNS 设置。",
+    "setup_dns_privacy_3": "<0>请注意，加密的 DNS 协议仅适用于 Android 9。所以您需要为其他操作系统上安装额外的软件。</0><0>以下是您可以使用软件的列表。</0>",
     "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> 的支持。",
@@ -436,7 +426,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> 支持 <1>DNS-over-HTTPS</1>。",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> 支持 <1>DNS-over-HTTPS</1>。",
     "setup_dns_privacy_other_5": "您可以从 <0>这里</0> 和 <1>这里</1> 找到更多的实施方案。",
-    "setup_dns_privacy_ioc_mac": "iOS 和 macOS 配置",
     "setup_dns_notice": "为了使用 <1>DNS-over-HTTPS</1> 或者 <1>DNS-over-TLS</1> ，您需要在 AdGuard Home 设置中 <0>配置加密</0> 。",
     "rewrite_added": "已成功添加 \"{{key}}\" 的 DNS 重写",
     "rewrite_deleted": "已成功删除 \"{{key}}\" 的 DNS 重写",
@@ -536,8 +525,8 @@
     "check_ip": "IP地址：{{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "原因：{{reason}}",
+    "check_rule": "规则：{{rule}}",
     "check_service": "服务名称：{{service}}",
-    "service_name": "服务名称",
     "check_not_found": "未在您的筛选列表中找到",
     "client_confirm_block": "您确定要阻止客户端\"{{ip}}\"?",
     "client_confirm_unblock": "您确定要解除对客户端\"{{ip}}\"的封锁吗？",
@@ -572,11 +561,11 @@
     "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 值（秒）",
+    "enter_cache_size": "输入缓存大小",
+    "enter_cache_ttl_min_override": "输入最小TTL值",
+    "enter_cache_ttl_max_override": "输入最大TTL值",
+    "cache_ttl_min_override_desc": "覆盖从上游服务器接收到的 TTL 值 (最小值)",
+    "cache_ttl_max_override_desc": "覆盖从上游服务器接收到的TTL值(最大)",
     "ttl_cache_validation": "最小缓存TTL值必须小于或等于最大值",
     "filter_category_general": "常规",
     "filter_category_security": "安全",
@@ -591,6 +580,5 @@
     "click_to_view_queries": "点击查看查询",
     "port_53_faq_link": "53端口常被DNSStubListener或systemdn解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>",
     "adg_will_drop_dns_queries": "AdGuard Home 会终止所有来自此客户端的DNS查询。",
-    "client_not_in_allowed_clients": "此客户端不被允许，因为它不在“允许的客户端”列表中。",
     "experimental": "实验性的"
 }

client/src/__locales/zh-hk.json

@@ -1,13 +1,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 伺服器已啟動",
@@ -115,11 +114,11 @@
     "average_processing_time": "平均的處理時間",
     "average_processing_time_hint": "處理 DNS 請求的平均時間(毫秒)",
     "block_domain_use_filters_and_hosts": "使用過濾器與 hosts 檔案阻擋網域查詢",
-    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設定封鎖規則。",
+    "filters_block_toggle_hint": "您可在<a href='#filters'>過濾器</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 +132,6 @@
     "encryption_settings": "加密設定",
     "dhcp_settings": "DHCP 設定",
     "upstream_dns": "上游 DNS 伺服器",
-    "upstream_dns_help": "每行輸入一個伺服器位址。<a>了解更多</a>有關設定上游 DNS 伺服器的內容",
-    "upstream_dns_configured_in_file": "設定在 {{path}}",
     "test_upstream_btn": "測試上游 DNS",
     "upstreams": "上游",
     "apply_btn": "套用",
@@ -188,19 +185,15 @@
     "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": "僅解除封鎖此用戶端",
     "time_table_header": "時間",
     "date": "日期",
     "domain_name_table_header": "域名",
@@ -242,25 +235,21 @@
     "blocking_mode": "封鎖模式",
     "default": "預設",
     "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
     "null_ip": "Null IP",
     "custom_ip": "自訂 IP 位址",
     "blocking_ipv4": "封鎖 IPv4",
     "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": "速率限制",
-    "edns_enable": "啟用 EDNS Client Subnet",
+    "edns_enable": "編輯 EDNS 用戶端子網路",
     "edns_cs_desc": "開啟後 AdGuard Home 將會傳送用戶端的子網路給 DNS 伺服器。",
     "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
     "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
     "blocking_ipv6_desc": "回覆指定 IPv6 位址給被封鎖的網域的 AAAA 紀錄查詢",
-    "blocking_mode_default": "預設：被 Adblock 規則封鎖時回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）；被 /etc/hosts 規則封鎖時回應規則中指定 IP 位址",
-    "blocking_mode_refused": "REFUSED：以 REFUSED 碼回應",
+    "blocking_mode_default": "預設：符合「adblock 樣式」的規則將回應 REFUSED，而「hosts 檔案」則回應設定的 IP 位址。",
     "blocking_mode_nxdomain": "NXDOMAIN：回應 NXDOMAIN 狀態碼",
     "blocking_mode_null_ip": "Null IP：回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）",
     "blocking_mode_custom_ip": "自訂 IP 位址：回應一個自訂的 IP 位址",
@@ -269,6 +258,7 @@
     "source_label": "來源",
     "found_in_known_domain_db": "在已知網域資料庫中找到。",
     "category_label": "類別",
+    "rule_label": "規則",
     "list_label": "清單",
     "unknown_filter": "未知過濾器 {{filterId}}",
     "known_tracker": "已知追蹤器",
@@ -329,14 +319,15 @@
     "encryption_config_saved": "加密設定已儲存",
     "encryption_server": "伺服器名稱",
     "encryption_server_enter": "輸入您的網域名稱",
-    "encryption_redirect": "自動重新導向到 HTTPS",
+    "encryption_server_desc": "要使用 HTTPS，您必須輸入與您 SSL 憑證相符的伺服器名稱。",
+    "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 憑證。",
@@ -368,7 +359,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 正在更新",
@@ -384,13 +375,14 @@
     "client_edit": "編輯用戶端",
     "client_identifier": "識別碼",
     "ip_address": "IP 位址",
+    "client_identifier_desc": "可通過 IP 地址、CIDR、MAC 地址來辨識使用者裝置。注意：必須使用 AdGuard Home 內建 <0>DHCP 伺服器</0> 才能偵測 MAC 地址。",
     "form_enter_ip": "輸入 IP",
     "form_enter_mac": "輸入 MAC 地址",
     "form_enter_id": "輸入識別碼",
     "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}}」",
@@ -414,14 +406,13 @@
     "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 裝置上，您可以下載特定的 '.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_3": "<0>注意：加密 DNS 僅適用於 Android 9 或以上，除此之外您可能需要安裝其他軟體。</0><0>這些是您可以使用的軟體清單</0>",
+    "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>。",
@@ -437,7 +428,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": "回應格式無效",
@@ -494,11 +485,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 紀錄回應",
@@ -506,28 +497,28 @@
     "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": "主機已列入白名單",
     "check_ip": "IP 位址：{{ip}}",
     "check_cname": "CNAME：{{cname}}",
     "check_reason": "原因：{{reason}}",
+    "check_rule": "規則：{{rule}}",
     "check_service": "服務名稱：{{service}}",
-    "service_name": "服務名稱",
     "check_not_found": "未在您的過濾清單中找到",
     "client_confirm_block": "您確定要封鎖「{{ip}}」用戶端？",
     "client_confirm_unblock": "您確定要將「{{ip}}」解除封鎖嗎？",
@@ -562,12 +553,11 @@
     "cache_size_desc": "DNS 快取大小（bytes）",
     "cache_ttl_min_override": "覆寫最小 TTL 值",
     "cache_ttl_max_override": "覆寫最大 TTL 值",
-    "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_max_override_desc": "設定 DNS 快取條目的最大 TTL 值（秒）",
-    "ttl_cache_validation": "最小快取 TTL 值必須小於或等於最大值",
+    "enter_cache_size": "輸入快取大小",
+    "enter_cache_ttl_min_override": "輸入最小 TTL 值",
+    "enter_cache_ttl_max_override": "輸入最大 TTL 值",
+    "cache_ttl_min_override_desc": "從上游查詢結果中修改 TTL 值（最小）",
+    "cache_ttl_max_override_desc": "從上游查詢結果中修改 TTL 最大值",
     "filter_category_general": "一般",
     "filter_category_security": "安全性",
     "filter_category_regional": "區域性",
@@ -580,7 +570,5 @@
     "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": "實驗性"
 }

client/src/__locales/zh-tw.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "用戶端設定",
-    "example_upstream_reserved": "您可以<0>為特定網域</0>指定上游 DNS",
-    "example_upstream_comment": "您可明確指定註解",
+    "example_upstream_reserved": "您可明確指定<0>用於特定的網域</0>之 DNS 上游",
     "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析網域",
     "parallel_requests": "並行的請求",
     "load_balancing": "負載平衡",
@@ -74,7 +73,7 @@
     "filter": "過濾器",
     "query_log": "查詢記錄",
     "compact": "精簡的",
-    "nothing_found": "沒找到什麼",
+    "nothing_found": "無什麼被找到",
     "faq": "常見問答集",
     "version": "版本",
     "address": "位址",
@@ -115,7 +114,7 @@
     "average_processing_time": "平均的處理時間",
     "average_processing_time_hint": "在處理一項 DNS 請求時以毫秒（ms）計的平均時間",
     "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域",
-    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設置封鎖規則。",
+    "filters_block_toggle_hint": "您可在<a href='#filters'>過濾器</a>設定中設置封鎖規則。",
     "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
     "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查網域是否被瀏覽安全網路服務列入黑名單。它將使用友好的隱私查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到伺服器。",
     "use_adguard_parental": "使用 AdGuard 家長監控之網路服務",
@@ -211,7 +210,7 @@
     "client_table_header": "用戶端",
     "empty_response_status": "空無的",
     "show_all_filter_type": "顯示全部",
-    "show_filtered_type": "顯示受過濾的",
+    "show_filtered_type": "顯示已過濾的",
     "no_logs_found": "無已發現之記錄",
     "refresh_btn": "重新整理",
     "previous_btn": "上一頁",
@@ -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": "速率限制",
@@ -259,12 +256,12 @@
     "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": "預設：當被廣告封鎖樣式的規則封鎖時，以 REFUSED 回覆；當被 /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）回覆",
     "blocking_mode_custom_ip": "自訂的 IP：以一組手動地被設定的 IP 位址回覆",
-    "upstream_dns_client_desc": "如果您將此欄位留空，AdGuard Home 將使用在 <0>DNS 設定</0>中被配置的伺服器。",
+    "upstream_dns_client_desc": "如果您將該欄位留空，AdGuard Home 將使用在 <0>DNS 設定</0>中被配置的伺服器。",
     "tracker_source": "追蹤器來源",
     "source_label": "來源",
     "found_in_known_domain_db": "在已知的域名資料庫中被發現。",
@@ -284,7 +281,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": "確認密碼",
@@ -304,12 +301,12 @@
     "install_devices_router_list_4": "您無法於某些類型的路由器上設定自訂的 DNS 伺服器。在這種情況下，如果您設置 AdGuard Home 作為 <0>DHCP 伺服器</0>，其可能有所幫助。否則，您應搜尋有關如何為您的特定路由器型號自訂 DNS 伺服器之用法說明。",
     "install_devices_windows_list_1": "通過開始功能表或 Windows 搜尋，開啟控制台。",
     "install_devices_windows_list_2": "去網路和網際網路類別，然後去網路和共用中心。",
-    "install_devices_windows_list_3": "於畫面之左側上找到變更介面卡設定並向它點擊。",
-    "install_devices_windows_list_4": "選擇您現行的連線，向它點擊滑鼠右鍵，然後選擇內容。",
-    "install_devices_windows_list_5": "在清單中找到網際網路通訊協定第 4 版（TCP/IPv4），選擇它，然後再次向內容點擊。",
+    "install_devices_windows_list_3": "於畫面之左側上找到變更介面卡設定並於它上點擊。",
+    "install_devices_windows_list_4": "選擇您現行的連線，於它上點擊滑鼠右鍵，然後選擇內容。",
+    "install_devices_windows_list_5": "在清單中找到網際網路通訊協定第 4 版（TCP/IPv4），選擇它，然後再次於內容上點擊。",
     "install_devices_windows_list_6": "選擇使用下列的 DNS 伺服器位址，然後輸入您的 AdGuard Home 伺服器位址。",
-    "install_devices_macos_list_1": "向 Apple 圖像點擊，然後去系統偏好設定。",
-    "install_devices_macos_list_2": "向網路點擊。",
+    "install_devices_macos_list_1": "於 Apple 圖像上點擊，然後去系統偏好設定。",
+    "install_devices_macos_list_2": "於網路上點擊。",
     "install_devices_macos_list_3": "選擇在您的清單中之首要的連線，然後點擊進階的。",
     "install_devices_macos_list_4": "選擇該 DNS 分頁，然後輸入您的 AdGuard Home 伺服器位址。",
     "install_devices_android_list_1": "從 Android 選單主畫面中，輕觸設定。",
@@ -330,7 +327,7 @@
     "encryption_config_saved": "加密配置被儲存",
     "encryption_server": "伺服器名稱",
     "encryption_server_enter": "輸入您的域名",
-    "encryption_server_desc": "為了使用 HTTPS，您需要輸入與您的安全通訊端層（SSL）憑證或萬用字元憑證相符的伺服器名稱。如果此欄位未被設定，它將接受向任何網域的傳輸層安全性協定（TLS）連線。",
+    "encryption_server_desc": "為了使用 HTTPS，您需要輸入與您的安全通訊端層（SSL）憑證相符的伺服器名稱。",
     "encryption_redirect": "自動地重新導向到 HTTPS",
     "encryption_redirect_desc": "如果被勾選，AdGuard Home 將自動地重新導向您從 HTTP 到 HTTPS 位址。",
     "encryption_https": "HTTPS 連接埠",
@@ -338,7 +335,7 @@
     "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_desc": "如果此連接埠被配置，AdGuard Home 將於此連接埠上執行 DNS-over-QUIC 伺服器。它是實驗性的並可能為不可靠的。再者，此刻沒有太多支援它的用戶端。",
     "encryption_certificates": "憑證",
     "encryption_certificates_desc": "為了使用加密，您需要提供有效的安全通訊端層（SSL）憑證鏈結供您的網域。於 <0>{{link}}</0> 上您可取得免費的憑證或您可從受信任的憑證授權單位之一購買它。",
     "encryption_certificates_input": "於此複製/貼上您的隱私增強郵件編碼之（PEM-encoded）憑證。",
@@ -386,6 +383,7 @@
     "client_edit": "編輯用戶端",
     "client_identifier": "識別碼",
     "ip_address": "IP 位址",
+    "client_identifier_desc": "用戶端可被 IP 位址、無類別網域間路由（CIDR）或媒體存取控制（MAC）位址識別。請注意，只要 AdGuard Home 也是<0>動態主機設定協定（DHCP）伺服器</0>，使用 MAC 作為識別碼是可能的",
     "form_enter_ip": "輸入 IP",
     "form_enter_mac": "輸入媒體存取控制（MAC）",
     "form_enter_id": "輸入識別碼",
@@ -416,8 +414,7 @@
     "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_3": "<0>請注意，加密的 DNS 協定僅於 Android 9 上被支援。所以您需要安裝額外的軟體供其它的作業系統。</0><0>這裡是您可使用的軟體之清單。</0>",
     "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> 支援。",
@@ -528,8 +525,8 @@
     "check_ip": "IP 位址：{{ip}}",
     "check_cname": "正規名稱（CNAME）：{{cname}}",
     "check_reason": "原因：{{reason}}",
+    "check_rule": "規則：{{rule}}",
     "check_service": "服務名稱：{{service}}",
-    "service_name": "服務名稱",
     "check_not_found": "未在您的過濾器中被找到",
     "client_confirm_block": "您確定您想要封鎖該用戶端 \"{{ip}}\" 嗎？",
     "client_confirm_unblock": "您確定您想要解除封鎖該用戶端 \"{{ip}}\" 嗎？",
@@ -555,20 +552,20 @@
     "blocked_adult_websites": "已封鎖的成人網站",
     "blocked_threats": "已封鎖的威脅",
     "allowed": "已允許的",
-    "filtered": "受過濾的",
+    "filtered": "已過濾的",
     "rewritten": "已改寫的",
     "safe_search": "安全搜尋",
     "blocklist": "封鎖清單",
     "milliseconds_abbreviation": "ms",
     "cache_size": "快取大小",
     "cache_size_desc": "DNS 快取大小（以位元組）",
-    "cache_ttl_min_override": "覆寫最小的存活時間（TTL）",
-    "cache_ttl_max_override": "覆寫最大的存活時間（TTL）",
-    "enter_cache_size": "輸入快取大小（位元組）",
-    "enter_cache_ttl_min_override": "輸入最小的存活時間（秒）",
-    "enter_cache_ttl_max_override": "輸入最大的存活時間（秒）",
-    "cache_ttl_min_override_desc": "當快取 DNS 回應時，延長從上游的伺服器收到的短存活時間數值（秒）",
-    "cache_ttl_max_override_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": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最小值）",
+    "cache_ttl_max_override_desc": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最大值）",
     "ttl_cache_validation": "最小的快取存活時間（TTL）數值必須小於或等於最大的數值",
     "filter_category_general": "一般的",
     "filter_category_security": "安全性",
@@ -583,6 +580,5 @@
     "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": "實驗性的"
 }

client/src/__tests__/helpers.test.js

@@ -273,15 +273,15 @@ describe('sortIp', () => {
         });
     });
     describe('invalid input', () => {
-        const originalWarn = console.warn;
+        const originalError = console.error;
 
         beforeEach(() => {
-            console.warn = jest.fn();
+            console.error = jest.fn();
         });
 
         afterEach(() => {
-            expect(console.warn).toHaveBeenCalled();
-            console.warn = originalWarn;
+            expect(console.error).toHaveBeenCalled();
+            console.error = originalError;
         });
 
         test('invalid strings', () => {

client/src/actions/access.js

@@ -51,10 +51,9 @@ export const toggleClientBlockSuccess = createAction('TOGGLE_CLIENT_BLOCK_SUCCES
 export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dispatch) => {
     dispatch(toggleClientBlockRequest());
     try {
-        const accessList = await apiClient.getAccessList();
-        const allowed_clients = accessList.allowed_clients ?? [];
-        const blocked_hosts = accessList.blocked_hosts ?? [];
-        const disallowed_clients = accessList.disallowed_clients ?? [];
+        const {
+            allowed_clients, blocked_hosts, disallowed_clients = [],
+        } = await apiClient.getAccessList();
 
         const updatedDisallowedClients = disallowed
             ? disallowed_clients.filter((client) => client !== disallowed_rule)

client/src/actions/index.js

@@ -287,7 +287,7 @@ export const getDnsStatus = () => async (dispatch) => {
     try {
         checkStatus(handleRequestSuccess, handleRequestError);
     } catch (error) {
-        handleRequestError();
+        handleRequestError(error);
     }
 };
 
@@ -373,14 +373,10 @@ export const getDhcpStatusFailure = createAction('GET_DHCP_STATUS_FAILURE');
 export const getDhcpStatus = () => async (dispatch) => {
     dispatch(getDhcpStatusRequest());
     try {
+        const status = await apiClient.getDhcpStatus();
         const globalStatus = await apiClient.getGlobalStatus();
-        if (globalStatus.dhcp_available) {
-            const status = await apiClient.getDhcpStatus();
-            status.dhcp_available = globalStatus.dhcp_available;
-            dispatch(getDhcpStatusSuccess(status));
-        } else {
-            dispatch(getDhcpStatusFailure());
-        }
+        status.dhcp_available = globalStatus.dhcp_available;
+        dispatch(getDhcpStatusSuccess(status));
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(getDhcpStatusFailure());

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;

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;
 }
@@ -69,6 +63,10 @@ body {
     cursor: not-allowed;
 }
 
+.select--no-warning {
+    margin-bottom: 1.375rem;
+}
+
 .button-action {
     visibility: hidden;
 }
@@ -77,11 +75,3 @@ body {
 .button-action--active {
     visibility: visible;
 }
-
-.ReactModal__Body--open {
-    overflow: hidden;
-}
-
-a.btn-success.disabled {
-    color: #fff;
-}

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 = {

client/src/components/Dashboard/Dashboard.css

@@ -22,30 +22,14 @@
     border-bottom: 6px solid #585965;
 }
 
+.card-chart-bg {
+    left: -20px;
+    width: calc(100% + 20px);
+}
+
 @media (max-width: 1279.98px) {
     .table__action {
         position: absolute;
         right: 0;
     }
 }
-
-.page-title--dashboard {
-    display: flex;
-    align-items: center;
-}
-
-.dashboard-title__button {
-    margin: 0 0.5rem;
-}
-
-@media (max-width: 767.98px) {
-    .page-title--dashboard {
-        flex-direction: column;
-        align-items: flex-start;
-    }
-
-    .dashboard-title__button {
-        margin: 0.5rem 0;
-        display: block;
-    }
-}

client/src/components/Dashboard/index.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
-import classNames from 'classnames';
+
 import Statistics from './Statistics';
 import Counters from './Counters';
 import Clients from './Clients';
@@ -17,7 +17,6 @@ const Dashboard = ({
     getStats,
     getStatsConfig,
     dashboard,
-    dashboard: { protectionEnabled, processingProtection },
     toggleProtection,
     stats,
     access,
@@ -34,17 +33,24 @@ const Dashboard = ({
         getAllStats();
     }, []);
 
-    const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
+    const getToggleFilteringButton = () => {
+        const { protectionEnabled, processingProtection } = dashboard;
+        const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
+        const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
 
-    const buttonClass = classNames('btn btn-sm dashboard-title__button', {
-        'btn-gray': protectionEnabled,
-        'btn-success': !protectionEnabled,
-    });
+        return <button
+                type="button"
+                className={`btn btn-sm mr-2 ${buttonClass}`}
+                onClick={() => toggleProtection(protectionEnabled)}
+                disabled={processingProtection}
+        >
+            <Trans>{buttonText}</Trans>
+        </button>;
+    };
 
     const refreshButton = <button
             type="button"
             className="btn btn-icon btn-outline-primary btn-sm"
-            title={t('refresh_btn')}
             onClick={() => getAllStats()}
     >
         <svg className="icons">
@@ -56,27 +62,24 @@ const Dashboard = ({
         ? t('for_last_24_hours')
         : t('for_last_days', { count: stats.interval });
 
+    const refreshFullButton = <button
+            type="button"
+            className="btn btn-outline-primary btn-sm"
+            onClick={() => getAllStats()}
+    >
+        <Trans>refresh_statics</Trans>
+    </button>;
+
     const statsProcessing = stats.processingStats
             || stats.processingGetConfig
             || access.processing;
 
     return <>
-        <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
-            <button
-                    type="button"
-                    className={buttonClass}
-                    onClick={() => toggleProtection(protectionEnabled)}
-                    disabled={processingProtection}
-            >
-                <Trans>{buttonText}</Trans>
-            </button>
-            <button
-                    type="button"
-                    className="btn btn-outline-primary btn-sm"
-                    onClick={getAllStats}
-            >
-                <Trans>refresh_statics</Trans>
-            </button>
+        <PageTitle title={t('dashboard')}>
+            <div className="page-title__actions">
+                {getToggleFilteringButton()}
+                {refreshFullButton}
+            </div>
         </PageTitle>
         {statsProcessing && <Loading />}
         {!statsProcessing && <div className="row row-cards dashboard">

client/src/components/Filters/Actions.js

@@ -4,23 +4,29 @@ import { withTranslation, Trans } from 'react-i18next';
 
 const Actions = ({
     handleAdd, handleRefresh, processingRefreshFilters, whitelist,
-}) => <div className="card-actions">
-    <button
-            className="btn btn-success btn-standard mr-2 btn-large mb-2"
+}) => (
+    <div className="card-actions">
+        <button
+            className="btn btn-success btn-standard mr-2 btn-large"
             type="submit"
             onClick={handleAdd}
-    >
-        {whitelist ? <Trans>add_allowlist</Trans> : <Trans>add_blocklist</Trans>}
-    </button>
-    <button
-            className="btn btn-primary btn-standard mb-2"
+        >
+            {whitelist ? (
+                <Trans>add_allowlist</Trans>
+            ) : (
+                <Trans>add_blocklist</Trans>
+            )}
+        </button>
+        <button
+            className="btn btn-primary btn-standard"
             type="submit"
             onClick={handleRefresh}
             disabled={processingRefreshFilters}
-    >
-        <Trans>check_updates_btn</Trans>
-    </button>
-</div>;
+        >
+            <Trans>check_updates_btn</Trans>
+        </button>
+    </div>
+);
 
 Actions.propTypes = {
     handleAdd: PropTypes.func.isRequired,

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>}

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

@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { withTranslation } from 'react-i18next';
-import { sortIp } from '../../../helpers/helpers';
 
 class Table extends Component {
     cellWrap = ({ value }) => (
@@ -22,7 +21,6 @@ class Table extends Component {
         {
             Header: this.props.t('answer'),
             accessor: 'answer',
-            sortMethod: sortIp,
             Cell: this.cellWrap,
         },
         {

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}

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,

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;

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

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,

client/src/components/Logs/Logs.css

@@ -9,18 +9,20 @@
     --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 +39,7 @@
 }
 
 .logs__text--bold {
-    font-weight: 600;
+    font-weight: bold;
 }
 
 .logs__time {
@@ -84,7 +86,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 +166,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 +359,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 +430,3 @@
     margin-right: 1px;
     opacity: 0.5;
 }
-
-.filteringRules__rule {
-    margin-bottom: 0;
-}
-
-.filteringRules__filter {
-    font-style: italic;
-    font-weight: normal;
-    margin-bottom: 1rem;
-}

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

@@ -259,7 +259,7 @@ let Form = (props) => {
                         </div>
                         <div className="form__desc mt-0 mb-2">
                             <Trans components={[
-                                <a target="_blank" rel="noopener noreferrer" href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
+                                <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
                                    key="0">link</a>,
                             ]}>
                                 tags_desc
@@ -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>,
                                 ]}

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

@@ -46,7 +46,7 @@ const renderInterfaceValues = ({
     gateway_ip,
     hardware_address,
     ip_addresses,
-}) => <div className='d-flex align-items-end dhcp__interfaces-info'>
+}) => <div className='d-flex align-items-end col-6'>
     <ul className="list-unstyled m-0">
         {getInterfaceValues({
             gateway_ip,
@@ -72,30 +72,30 @@ const Interfaces = () => {
         (store) => store.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name,
     );
 
-    if (processingInterfaces || !interfaces) {
-        return null;
-    }
-
     const interfaceValue = interface_name && interfaces[interface_name];
 
-    return <div className="row dhcp__interfaces">
-        <div className="col col__dhcp">
-            <Field
-                    name="interface_name"
-                    component={renderSelectField}
-                    className="form-control custom-select pl-4 col-md"
-                    validate={[validateRequiredValue]}
-                    label='dhcp_interface_select'
-            >
-                <option value='' disabled={enabled}>
-                    {t('dhcp_interface_select')}
-                </option>
-                {renderInterfaces(interfaces)}
-            </Field>
-        </div>
-        {interfaceValue
-        && renderInterfaceValues(interfaceValue)}
-    </div>;
+    return !processingInterfaces
+            && interfaces
+            && <>
+                <div className="row align-items-center pb-2">
+                    <div className="col-6">
+                        <Field
+                                name="interface_name"
+                                component={renderSelectField}
+                                className="form-control custom-select"
+                                validate={[validateRequiredValue]}
+                                label='dhcp_interface_select'
+                        >
+                            <option value='' disabled={enabled}>
+                                {t('dhcp_interface_select')}
+                            </option>
+                            {renderInterfaces(interfaces)}
+                        </Field>
+                    </div>
+                    {interfaceValue
+                    && renderInterfaceValues(interfaceValue)}
+                </div>
+            </>;
 };
 
 renderInterfaceValues.propTypes = {

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

@@ -1,47 +0,0 @@
-.dhcp-form__button {
-    margin: 0 1rem;
-}
-
-.page-title--dhcp {
-    display: flex;
-    align-items: center;
-}
-
-.col__dhcp {
-    flex: 0 0 50%;
-    max-width: 50%;
-    padding-right: 0;
-}
-
-.dhcp__interfaces {
-    padding-bottom: 1rem;
-}
-
-.dhcp__interfaces-info {
-    padding: 0.5rem 0.75rem 0;
-    line-break: anywhere;
-}
-
-@media (max-width: 991.98px) {
-    .dhcp-form__button {
-        margin: 0.5rem 0;
-        display: block;
-    }
-
-    .page-title--dhcp {
-        flex-direction: column;
-        align-items: flex-start;
-        padding-bottom: 0.5rem;
-    }
-
-    .col__dhcp {
-        flex: 0 0 100%;
-        max-width: 100%;
-        padding-right: 0.75rem;
-    }
-
-    .dhcp__interfaces {
-        flex-direction: column;
-        padding-bottom: 0.5rem;
-    }
-}

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

@@ -31,7 +31,6 @@ import {
     calculateDhcpPlaceholdersIpv4,
     calculateDhcpPlaceholdersIpv6,
 } from '../../../helpers/helpers';
-import './index.css';
 
 const Dhcp = () => {
     const { t } = useTranslation();
@@ -65,14 +64,9 @@ const Dhcp = () => {
 
     useEffect(() => {
         dispatch(getDhcpStatus());
+        dispatch(getDhcpInterfaces());
     }, []);
 
-    useEffect(() => {
-        if (dhcp_available) {
-            dispatch(getDhcpInterfaces());
-        }
-    }, [dhcp_available]);
-
     useEffect(() => {
         const [ipv4] = interfaces?.[interface_name]?.ipv4_addresses ?? [];
         const [ipv6] = interfaces?.[interface_name]?.ipv6_addresses ?? [];
@@ -113,11 +107,14 @@ const Dhcp = () => {
     const enteredSomeValue = enteredSomeV4Value || enteredSomeV6Value || interfaceName;
 
     const getToggleDhcpButton = () => {
+        const otherDhcpFound = check && (check.v4.other_server.found === STATUS_RESPONSE.YES
+                || check.v6.other_server.found === STATUS_RESPONSE.YES);
+
         const filledConfig = interface_name && (Object.values(v4)
             .every(Boolean) || Object.values(v6)
             .every(Boolean));
 
-        const className = classNames('btn btn-sm', {
+        const className = classNames('btn btn-sm mr-2', {
             'btn-gray': enabled,
             'btn-outline-success': !enabled,
         });
@@ -138,13 +135,13 @@ const Dhcp = () => {
             className={className}
             onClick={enabled ? onClickDisable : onClickEnable}
             disabled={processingDhcp || processingConfig
-            || (!enabled && (!filledConfig || !check))}
+            || (!enabled && (!filledConfig || !check || otherDhcpFound))}
         >
             <Trans>{enabled ? 'dhcp_disable' : 'dhcp_enable'}</Trans>
         </button>;
     };
 
-    const statusButtonClass = classNames('btn btn-sm dhcp-form__button', {
+    const statusButtonClass = classNames('btn btn-sm mx-2', {
         'btn-loading btn-primary': processingStatus,
         'btn-outline-primary': !processingStatus,
     });
@@ -174,24 +171,28 @@ const Dhcp = () => {
     const toggleDhcpButton = getToggleDhcpButton();
 
     return <>
-        <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')} containerClass="page-title--dhcp">
-            {toggleDhcpButton}
-            <button
-                    type="button"
-                    className={statusButtonClass}
-                    onClick={onClick}
-                    disabled={enabled || !interface_name || processingConfig}
-            >
-                <Trans>check_dhcp_servers</Trans>
-            </button>
-            <button
-                    type="button"
-                    className='btn btn-sm btn-outline-secondary'
-                    disabled={!enteredSomeValue || processingConfig}
-                    onClick={clear}
-            >
-                <Trans>reset_settings</Trans>
-            </button>
+        <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')}>
+            <div className="page-title__actions">
+                <div className="mb-3">
+                    {toggleDhcpButton}
+                    <button
+                        type="button"
+                        className={statusButtonClass}
+                        onClick={onClick}
+                        disabled={enabled || !interface_name || processingConfig}
+                    >
+                        <Trans>check_dhcp_servers</Trans>
+                    </button>
+                    <button
+                        type="button"
+                        className='btn btn-sm mx-2 btn-outline-secondary'
+                        disabled={!enteredSomeValue || processingConfig}
+                        onClick={clear}
+                    >
+                        <Trans>reset_settings</Trans>
+                    </button>
+                </div>
+            </div>
         </PageTitle>
         {!processing && !processingInterfaces
         && <>

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

@@ -8,10 +8,10 @@ const Examples = (props) => (
         <Trans>examples_title</Trans>:
         <ol className="leading-loose">
             <li>
-                <code>94.140.14.140</code> - {props.t('example_upstream_regular')}
+                <code>9.9.9.9</code> - {props.t('example_upstream_regular')}
             </li>
             <li>
-                <code>tls://dns-unfiltered.adguard.com</code> –&nbsp;
+                <code>tls://dns.quad9.net</code> –&nbsp;
                 <span>
                     <Trans
                         components={[
@@ -30,7 +30,7 @@ const Examples = (props) => (
                 </span>
             </li>
             <li>
-                <code>https://dns-unfiltered.adguard.com/dns-query</code> –&nbsp;
+                <code>https://dns.quad9.net/dns-query</code> –&nbsp;
                 <span>
                     <Trans
                         components={[
@@ -70,7 +70,7 @@ const Examples = (props) => (
                 </span>
             </li>
             <li>
-                <code>tcp://94.140.14.140</code> – <Trans>example_upstream_tcp</Trans>
+                <code>tcp://9.9.9.9</code> – <Trans>example_upstream_tcp</Trans>
             </li>
             <li>
                 <code>sdns://...</code> –&nbsp;
@@ -108,7 +108,7 @@ const Examples = (props) => (
                 </span>
             </li>
             <li>
-                <code>[/example.local/]94.140.14.140</code> –&nbsp;
+                <code>[/example.local/]9.9.9.9</code> –&nbsp;
                 <span>
                     <Trans
                         components={[

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

@@ -50,7 +50,7 @@ const CertificateStatus = ({
                     {dnsNames && (
                         <li>
                             <Trans>encryption_hostnames</Trans>:&nbsp;
-                            {dnsNames.join(', ')}
+                            {dnsNames}
                         </li>
                     )}
                 </Fragment>
@@ -65,7 +65,7 @@ CertificateStatus.propTypes = {
     subject: PropTypes.string,
     issuer: PropTypes.string,
     notAfter: PropTypes.string,
-    dnsNames: PropTypes.arrayOf(PropTypes.string),
+    dnsNames: PropTypes.string,
 };
 
 export default withTranslation()(CertificateStatus);

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

@@ -12,7 +12,7 @@ import {
     toNumber,
 } from '../../../helpers/form';
 import {
-    validateServerName, validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
+    validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
 } from '../../../helpers/validators';
 import i18n from '../../../i18n';
 import KeyStatus from './KeyStatus';
@@ -127,7 +127,6 @@ let Form = (props) => {
                             placeholder={t('encryption_server_enter')}
                             onChange={handleChange}
                             disabled={!isEnabled}
-                            validate={validateServerName}
                         />
                         <div className="form__desc">
                             <Trans>encryption_server_desc</Trans>
@@ -233,7 +232,7 @@ let Form = (props) => {
                             <Trans
                                 values={{ link: 'letsencrypt.org' }}
                                 components={[
-                                    <a target="_blank" rel="noopener noreferrer" href="https://letsencrypt.org/" key="0">
+                                    <a href="https://letsencrypt.org/" key="0">
                                         link
                                     </a>,
                                 ]}
@@ -414,7 +413,7 @@ Form.propTypes = {
     valid_key: PropTypes.bool,
     valid_cert: PropTypes.bool,
     valid_pair: PropTypes.bool,
-    dns_names: PropTypes.arrayOf(PropTypes.string),
+    dns_names: PropTypes.string,
     key_type: PropTypes.string,
     issuer: PropTypes.string,
     subject: PropTypes.string,

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

@@ -5,11 +5,7 @@ import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 
 import { CheckboxField, toNumber } from '../../../helpers/form';
-import {
-    FILTERS_INTERVALS_HOURS,
-    FILTERS_RELATIVE_LINK,
-    FORM_NAME,
-} from '../../../helpers/constants';
+import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants';
 
 const getTitleForInterval = (interval, t) => {
     if (interval === 0) {
@@ -44,10 +40,6 @@ const Form = (props) => {
         handleSubmit, handleChange, processing, t,
     } = props;
 
-    const components = {
-        a: <a href={FILTERS_RELATIVE_LINK} rel="noopener noreferrer" />,
-    };
-
     return (
         <form onSubmit={handleSubmit}>
             <div className="row">
@@ -59,9 +51,7 @@ const Form = (props) => {
                             modifier="checkbox--settings"
                             component={CheckboxField}
                             placeholder={t('block_domain_use_filters_and_hosts')}
-                            subtitle={<Trans components={components}>
-                                filters_block_toggle_hint
-                            </Trans>}
+                            subtitle={t('filters_block_toggle_hint')}
                             onChange={handleChange}
                             disabled={processing}
                         />

client/src/components/Settings/FormButton.css

@@ -1,11 +0,0 @@
-.form__button {
-    margin-left: 1.5rem;
-}
-
-@media (max-width: 500px) {
-    .form__button {
-        margin-left: 0;
-        margin-top: 1rem;
-        display: block;
-    }
-}

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

@@ -6,7 +6,6 @@ import flow from 'lodash/flow';
 
 import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
 import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
-import '../FormButton.css';
 
 const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
     const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
@@ -69,7 +68,7 @@ const Form = (props) => {
                 </button>
                 <button
                     type="button"
-                    className="btn btn-outline-secondary btn-standard form__button"
+                    className="btn btn-outline-secondary btn-standard ml-5"
                     onClick={() => handleClear()}
                     disabled={processingClear}
                 >

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

@@ -6,7 +6,6 @@ import flow from 'lodash/flow';
 
 import { renderRadioField, toNumber } from '../../../helpers/form';
 import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants';
-import '../FormButton.css';
 
 const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
     const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
@@ -53,7 +52,7 @@ const Form = (props) => {
                 </button>
                 <button
                     type="button"
-                    className="btn btn-outline-secondary btn-standard form__button"
+                    className="btn btn-outline-secondary btn-standard ml-5"
                     onClick={() => handleReset()}
                     disabled={processingReset}
                 >

client/src/components/ui/Card.css

@@ -80,6 +80,7 @@
 .card-body-stats {
     position: relative;
     flex: 1 1 auto;
+    height: calc(100% - 3rem);
     margin: 0;
     padding: 1rem 1.5rem;
 }

client/src/components/ui/EncryptionTopline.js

@@ -6,50 +6,6 @@ import { useSelector } from 'react-redux';
 import Topline from './Topline';
 import { EMPTY_DATE } from '../../helpers/constants';
 
-const EXPIRATION_ENUM = {
-    VALID: 'VALID',
-    EXPIRED: 'EXPIRED',
-    EXPIRING: 'EXPIRING',
-};
-
-const EXPIRATION_STATE = {
-    [EXPIRATION_ENUM.EXPIRED]: {
-        toplineType: 'danger',
-        i18nKey: 'topline_expired_certificate',
-    },
-    [EXPIRATION_ENUM.EXPIRING]: {
-        toplineType: 'warning',
-        i18nKey: 'topline_expiring_certificate',
-    },
-};
-
-const getExpirationFlags = (not_after) => {
-    const DAYS_BEFORE_EXPIRATION = 5;
-
-    const now = Date.now();
-    const isExpiring = isAfter(addDays(now, DAYS_BEFORE_EXPIRATION), not_after);
-    const isExpired = isAfter(now, not_after);
-
-    return {
-        isExpiring,
-        isExpired,
-    };
-};
-
-const getExpirationEnumKey = (not_after) => {
-    const { isExpiring, isExpired } = getExpirationFlags(not_after);
-
-    if (isExpired) {
-        return EXPIRATION_ENUM.EXPIRED;
-    }
-
-    if (isExpiring) {
-        return EXPIRATION_ENUM.EXPIRING;
-    }
-
-    return EXPIRATION_ENUM.VALID;
-};
-
 const EncryptionTopline = () => {
     const not_after = useSelector((state) => state.encryption.not_after);
 
@@ -57,21 +13,30 @@ const EncryptionTopline = () => {
         return null;
     }
 
-    const expirationStateKey = getExpirationEnumKey(not_after);
+    const isAboutExpire = isAfter(addDays(Date.now(), 30), not_after);
+    const isExpired = isAfter(Date.now(), not_after);
 
-    if (expirationStateKey === EXPIRATION_ENUM.VALID) {
-        return null;
-    }
-
-    const { toplineType, i18nKey } = EXPIRATION_STATE[expirationStateKey];
-
-    return (
-            <Topline type={toplineType}>
+    if (isExpired) {
+        return (
+            <Topline type="danger">
                 <Trans components={[<a href="#encryption" key="0">link</a>]}>
-                    {i18nKey}
+                    topline_expired_certificate
                 </Trans>
             </Topline>
-    );
+        );
+    }
+
+    if (isAboutExpire) {
+        return (
+            <Topline type="warning">
+                <Trans components={[<a href="#encryption" key="0">link</a>]}>
+                    topline_expiring_certificate
+                </Trans>
+            </Topline>
+        );
+    }
+
+    return false;
 };
 
 export default EncryptionTopline;

client/src/components/ui/Guide.js

@@ -2,13 +2,25 @@ import React, { useState } from 'react';
 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 { 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';
+const renderMobileconfigInfo = ({ label, components }) => <li key={label}>
+    <Trans components={components}>{label}</Trans>
+    <ul>
+        <li>
+            <a href={MOBILE_CONFIG_LINKS.DOT} download>{i18next.t('download_mobileconfig_dot')}</a>
+        </li>
+        <li>
+            <a href={MOBILE_CONFIG_LINKS.DOH} download>{i18next.t('download_mobileconfig_doh')}</a>
+        </li>
+    </ul>
+</li>;
 
 const renderLi = ({ label, components }) => <li key={label}>
     <Trans components={components?.map((props) => {
@@ -26,135 +38,140 @@ const renderLi = ({ label, components }) => <li key={label}>
     </Trans>
 </li>;
 
-const getDnsPrivacyList = () => [
-    {
-        title: 'Android',
-        list: [
-            {
-                label: 'setup_dns_privacy_android_1',
+const dnsPrivacyList = [{
+    title: 'Android',
+    list: [
+        {
+            label: 'setup_dns_privacy_android_1',
+        },
+        {
+            label: 'setup_dns_privacy_android_2',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://adguard.com/adguard-android/overview.html',
+                },
+                <code key="1">text</code>,
+            ],
+        },
+        {
+            label: 'setup_dns_privacy_android_3',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://getintra.org/',
+                },
+                <code key="1">text</code>,
+            ],
+        },
+    ],
+},
+{
+    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_4',
+            components: {
+                highlight: <code />,
             },
-            {
-                label: 'setup_dns_privacy_android_2',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://adguard.com/adguard-android/overview.html',
-                    },
-                    <code key="1">text</code>,
-                ],
-            },
-            {
-                label: 'setup_dns_privacy_android_3',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://getintra.org/',
-                    },
-                    <code key="1">text</code>,
-                ],
-            },
-        ],
-    },
-    {
-        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',
-                    },
+            renderComponent: renderMobileconfigInfo,
+        },
+        {
+            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',
                     },
-                ],
-            },
-        ],
-    },
-    {
-        title: 'setup_dns_privacy_other_title',
-        list: [
-            {
-                label: 'setup_dns_privacy_other_1',
-            },
-            {
-                label: 'setup_dns_privacy_other_2',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://github.com/AdguardTeam/dnsproxy',
-                    },
-                ],
-            },
-            {
-                href: 'https://github.com/jedisct1/dnscrypt-proxy',
-                label: 'setup_dns_privacy_other_3',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://github.com/jedisct1/dnscrypt-proxy',
-                    },
-                        <code key="1">text</code>,
-                ],
-            },
-            {
-                label: 'setup_dns_privacy_other_4',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://support.mozilla.org/kb/firefox-dns-over-https',
-                    },
-                        <code key="1">text</code>,
-                ],
-            },
-            {
-                label: 'setup_dns_privacy_other_5',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://dnscrypt.info/implementations',
-                    },
-                    {
-                        key: 1,
-                        href: 'https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients',
-                    },
-                ],
-            },
-        ],
-    },
+
+            ],
+        },
+    ],
+},
+{
+    title: 'setup_dns_privacy_other_title',
+    list: [
+        {
+            label: 'setup_dns_privacy_other_1',
+        },
+        {
+            label: 'setup_dns_privacy_other_2',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://github.com/AdguardTeam/dnsproxy',
+                },
+            ],
+        },
+        {
+            href: 'https://github.com/jedisct1/dnscrypt-proxy',
+            label: 'setup_dns_privacy_other_3',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://github.com/jedisct1/dnscrypt-proxy',
+                },
+                    <code key="1">text</code>,
+            ],
+        },
+        {
+            label: 'setup_dns_privacy_other_4',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://github.com/jedisct1/dnscrypt-proxy',
+                },
+                    <code key="1">text</code>,
+            ],
+        },
+        {
+            label: 'setup_dns_privacy_other_5',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://dnscrypt.info/implementations',
+                },
+                {
+                    key: 1,
+                    href: 'https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients',
+                },
+            ],
+        },
+    ],
+},
 ];
 
-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,
     httpsAddress,
     showDnsPrivacyNotice,
-    server_name,
     t,
 }) => ({
     Router: {
@@ -236,8 +253,8 @@ const getTabs = ({
                         </Trans>
                     </div>
                 )}
-                {showDnsPrivacyNotice ? (
-                    <div className="tab__paragraph">
+                {showDnsPrivacyNotice
+                    ? <div className="tab__paragraph">
                         <Trans
                             components={[
                                 <a
@@ -254,64 +271,34 @@ 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,
-                            }}
-                        />
-                    </>
-                )}
+                        {dnsPrivacyList.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 tlsAddress = dnsAddresses?.filter((item) => item.includes('tls://')) ?? '';
     const httpsAddress = dnsAddresses?.filter((item) => item.includes('https://')) ?? '';
     const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
@@ -322,7 +309,6 @@ const Guide = ({ dnsAddresses }) => {
         tlsAddress,
         httpsAddress,
         showDnsPrivacyNotice,
-        server_name,
         t,
     });
 
@@ -330,14 +316,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 +348,6 @@ renderLi.propTypes = {
     components: PropTypes.string,
 };
 
+renderMobileconfigInfo.propTypes = renderLi.propTypes;
+
 export default Guide;

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);

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

@@ -1 +0,0 @@
-export { default } from './Guide';

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

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"
@@ -239,16 +245,6 @@ const Icons = () => (
                 d="M41 4H9C6.243 4 4 6.243 4 9v32c0 2.757 2.243 5 5 5h32c2.757 0 5-2.243 5-5V9c0-2.757-2.243-5-5-5zm-3.994 18.323a7.482 7.482 0 0 1-.69.035 7.492 7.492 0 0 1-6.269-3.388v11.537a8.527 8.527 0 1 1-8.527-8.527c.178 0 .352.016.527.027v4.202c-.175-.021-.347-.053-.527-.053a4.351 4.351 0 1 0 0 8.704c2.404 0 4.527-1.894 4.527-4.298l.042-19.594h4.016a7.488 7.488 0 0 0 6.901 6.685v4.67z" />
         </symbol>
 
-        <symbol id="service_qq" viewBox="0 0 32 32" >
-            <g fill="none" fillRule="evenodd">
-                <path d="M0 0h32v32H0z" />
-                <g fill="currentColor" fillRule="nonzero">
-                    <path d="M11.25 32C8.342 32 6 30.74 6 29.242c0-1.497 2.342-2.757 5.25-2.757s5.25 1.26 5.25 2.757S14.158 32 11.25 32zM27 29.242c0-1.497-2.342-2.757-5.25-2.757s-5.25 1.26-5.25 2.757S18.842 32 21.75 32 27 30.74 27 29.242zM14.885 7.182c0 .63-.323 1.182-.808 1.182-.485 0-.808-.552-.808-1.182 0-.63.323-1.182.808-1.182.485 0 .808.552.808 1.182zM18.923 6c-.485 0-.808.552-.808 1.182 0 .63.323-.394.808-.394.485 0 .808 1.024.808.394S19.408 6 18.923 6z" />
-                    <path d="M6.653 12.638s4.685 2.465 9.926 2.465c5.242 0 9.927-2.465 9.927-2.465.112-.09.217-.161.316-.212-.002-1.088-.078-2.026-.078-2.808C26.744 4.292 22.138 0 16.5 0S6.176 4.292 6.176 9.618v2.78c.146.042.3.113.477.24zm12.626-8.664c1.112 0 1.986 1.272 1.986 2.782s-.874 2.782-1.986 2.782c-1.111 0-1.985-1.271-1.985-2.782 0-1.51.874-2.782 1.985-2.782zm-5.558 0c1.111 0 1.985 1.272 1.985 2.782s-.874 2.782-1.985 2.782c-1.112 0-1.986-1.271-1.986-2.782 0-1.51.874-2.782 1.986-2.782zm2.779 6.624c2.912 0 5.294.464 5.294.994s-2.382 1.656-5.294 1.656c-2.912 0-5.294-1.126-5.294-1.656s2.382-.994 5.294-.994zm11.374 5.182c-.058.038-.108.076-.177.117-.159.08-5.241 3.18-11.038 3.18-1.43 0-2.7-.239-3.97-.477-.239 1.67-.239 3.259-.239 3.974 0 1.272-1.032 1.193-2.303 1.272-1.27 0-2.223.16-2.303-1.033 0-.16-.08-2.782.397-5.564-1.588-.716-2.62-1.272-2.7-1.352a3.293 3.293 0 01-.335-.216C4.012 17.55 3 19.598 3 21.223c0 3.815 1.112 3.418 1.112 3.418.476 0 1.27-.795 1.985-1.67C7.765 27.662 11.735 31 16.5 31c4.765 0 8.735-3.338 10.403-8.028.715.874 1.509 1.669 1.985 1.669 0 0 1.112.397 1.112-3.418 0-1.588-.968-3.631-2.126-5.443z" />
-                </g>
-            </g>
-        </symbol>
-
         <symbol id="question" width="20px" height="20px">
             <g transform="translate(-982.000000, -454.000000) translate(416.000000, 440.000000) translate(564.000000, 12.000000)"
                fill="none" fillRule="evenodd">
@@ -356,58 +352,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>
 );
 

client/src/components/ui/Line.css

@@ -1,16 +1,9 @@
 .line__tooltip {
     padding: 2px 10px 7px;
     line-height: 1.1;
-    color: var(--white);
-    background-color: var(--gray-3);
-    border-radius: 4px;
-    opacity: 90%;
+    color: #fff;
 }
 
 .line__tooltip-text {
     font-size: 0.7rem;
 }
-
-.card-chart-bg path[d^="M0,32"] {
-    transform: translateY(32px);
-}

client/src/components/ui/Line.js

@@ -1,75 +1,56 @@
 import React from 'react';
-import { ResponsiveLine } from '@nivo/line';
-import addDays from 'date-fns/add_days';
-import addHours from 'date-fns/add_hours';
-import subDays from 'date-fns/sub_days';
-import subHours from 'date-fns/sub_hours';
-import dateFormat from 'date-fns/format';
-import round from 'lodash/round';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
+import { ResponsiveLine } from '@nivo/line';
+
 import './Line.css';
 
-const Line = ({
-    data, color = 'black',
-}) => {
-    const interval = useSelector((state) => state.stats.interval);
-
-    return <ResponsiveLine
-        enableArea
-        animate
-        enableSlices="x"
-        curve="linear"
-        colors={[color]}
+const Line = ({ data, color }) => data
+    && <ResponsiveLine
         data={data}
+        margin={{
+            top: data[0].data.every(({ y }) => y === 0) ? 62 : 15,
+            right: 0,
+            bottom: 1,
+            left: 20,
+        }}
+        minY="auto"
+        stacked={false}
+        curve='linear'
+        axisBottom={null}
+        axisLeft={null}
+        enableGridX={false}
+        enableGridY={false}
+        enableDots={false}
+        enableArea={true}
+        animate={false}
+        colorBy={() => (color)}
+        tooltip={(slice) => (
+            <div>
+                {slice.data.map((d) => (
+                    <div key={d.serie.id} className="line__tooltip">
+                            <span className="line__tooltip-text">
+                                <strong>{d.data.y}</strong>
+                                <br />
+                                <small>{d.data.x}</small>
+                            </span>
+                    </div>
+                ))}
+            </div>
+        )}
         theme={{
-            crosshair: {
-                line: {
-                    stroke: 'black',
-                    strokeWidth: 1,
-                    strokeOpacity: 0.35,
+            tooltip: {
+                container: {
+                    padding: '0',
+                    background: '#333',
+                    borderRadius: '4px',
                 },
             },
         }}
-        xScale={{
-            type: 'linear',
-            min: 0,
-            max: 'auto',
-        }}
-        crosshairType="x"
-        axisLeft={false}
-        axisBottom={false}
-        enableGridX={false}
-        enableGridY={false}
-        enablePoints={false}
-        xFormat={(x) => {
-            if (interval === 1 || interval === 7) {
-                const hoursAgo = subHours(Date.now(), 24 * interval);
-                return dateFormat(addHours(hoursAgo, x), 'D MMM HH:00');
-            }
-
-            const daysAgo = subDays(Date.now(), interval - 1);
-            return dateFormat(addDays(daysAgo, x), 'D MMM YYYY');
-        }}
-        yFormat={(y) => round(y, 2)}
-        sliceTooltip={(slice) => {
-            const { xFormatted, yFormatted } = slice.slice.points[0].data;
-            return <div className="line__tooltip">
-                <span className="line__tooltip-text">
-                    <strong>{yFormatted}</strong>
-                    <br />
-                    <small>{xFormatted}</small>
-                </span>
-            </div>;
-        }}
     />;
-};
 
 Line.propTypes = {
     data: PropTypes.array.isRequired,
-    color: PropTypes.string,
-    width: PropTypes.number,
-    height: PropTypes.number,
+    color: PropTypes.string.isRequired,
 };
 
 export default Line;

client/src/components/ui/PageTitle.css

@@ -36,3 +36,15 @@
     font-size: 36px;
     line-height: 46px;
 }
+
+.page-title__actions {
+    display: block;
+}
+
+@media screen and (min-width: 768px) {
+    .page-title__actions {
+        display: inline-block;
+        vertical-align: baseline;
+        margin-left: 20px;
+    }
+}

client/src/components/ui/PageTitle.js

@@ -3,23 +3,24 @@ import PropTypes from 'prop-types';
 
 import './PageTitle.css';
 
-const PageTitle = ({
-    title, subtitle, children, containerClass,
-}) => <div className="page-header">
-    <div className={containerClass}>
-        <h1 className="page-title pr-2">{title}</h1>
-        {children}
+const PageTitle = ({ title, subtitle, children }) => (
+    <div className="page-header">
+        <h1 className="page-title">
+            {title}
+            {children}
+        </h1>
+        {subtitle && (
+            <div className="page-subtitle">
+                {subtitle}
+            </div>
+        )}
     </div>
-    {subtitle && <div className="page-subtitle">
-        {subtitle}
-    </div>}
-</div>;
+);
 
 PageTitle.propTypes = {
     title: PropTypes.string.isRequired,
     subtitle: PropTypes.string,
     children: PropTypes.node,
-    containerClass: PropTypes.string,
 };
 
 export default PageTitle;

client/src/components/ui/Tabler.css

@@ -13452,8 +13452,10 @@ a.icon:hover {
 
 .card-chart-bg {
     height: 4rem;
+    margin-top: -1rem;
     position: relative;
     z-index: 1;
+    overflow: hidden;
 }
 
 .card-options {

client/src/helpers/constants.js

@@ -13,8 +13,6 @@ 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_PATH_LAST_PART = /\/[^/]*$/;
 
 // eslint-disable-next-line no-control-regex
@@ -23,8 +21,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',
@@ -57,9 +53,8 @@ export const REPOSITORY = {
 export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html';
 export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse';
 export const UPSTREAM_CONFIGURATION_WIKI_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams';
-export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';
 
-export const FILTERS_RELATIVE_LINK = '#filters';
+export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';
 
 export const ADDRESS_IN_USE_TEXT = 'address already in use';
 
@@ -199,146 +194,90 @@ 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',
+    },
 ];
 
 export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
@@ -395,7 +334,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 +425,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,
@@ -536,7 +470,6 @@ export const BLOCK_ACTIONS = {
 export const SCHEME_TO_PROTOCOL_MAP = {
     doh: 'dns_over_https',
     dot: 'dns_over_tls',
-    doq: 'dns_over_quic',
     '': 'plain_dns',
 };
 
@@ -570,7 +503,6 @@ export const FORM_NAME = {
     INSTALL: 'install',
     LOGIN: 'login',
     CACHE: 'cache',
-    MOBILE_CONFIG: 'mobileConfig',
     ...DHCP_FORM_NAMES,
 };
 
@@ -631,7 +563,6 @@ export const TOAST_TIMEOUTS = {
 export const ADDRESS_TYPES = {
     IP: 'IP',
     CIDR: 'CIDR',
-    CLIENT_ID: 'CLIENT_ID',
     UNKNOWN: 'UNKNOWN',
 };
 
@@ -643,8 +574,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',
-};

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/",

client/src/helpers/form.js

@@ -1,6 +1,7 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Trans } from 'react-i18next';
+import classNames from 'classnames';
 import { createOnBlurHandler } from './helpers';
 import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';
 
@@ -184,7 +185,7 @@ export const CheckboxField = ({
 CheckboxField.propTypes = {
     input: PropTypes.object.isRequired,
     placeholder: PropTypes.string,
-    subtitle: PropTypes.node,
+    subtitle: PropTypes.string,
     disabled: PropTypes.bool,
     onClick: PropTypes.func,
     modifier: PropTypes.string,
@@ -202,10 +203,13 @@ export const renderSelectField = ({
     label,
 }) => {
     const showWarning = touched && error;
+    const selectClass = classNames('form-control custom-select', {
+        'select--no-warning': !showWarning,
+    });
 
     return <>
         {label && <label><Trans>{label}</Trans></label>}
-        <select {...input} className='form-control custom-select'>{children}</select>
+        <select {...input} className={selectClass}>{children}</select>
         {showWarning
         && <span className="form__message form__message--error form__message--left-pad"><Trans>{error}</Trans></span>}
     </>;

client/src/helpers/helpers.js

@@ -1,12 +1,16 @@
 import 'url-polyfill';
 import dateParse from 'date-fns/parse';
 import dateFormat from 'date-fns/format';
+import subHours from 'date-fns/sub_hours';
+import addHours from 'date-fns/add_hours';
+import addDays from 'date-fns/add_days';
+import subDays from 'date-fns/sub_days';
 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 +25,6 @@ import {
     DHCP_VALUES_PLACEHOLDERS,
     FILTERED,
     FILTERED_STATUS,
-    R_CLIENT_ID,
     SERVICES_ID_NAME_MAP,
     STANDARD_DNS_PORT,
     STANDARD_HTTPS_PORT,
@@ -62,7 +65,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
         answer_dnssec,
         client,
         client_proto,
-        client_id,
         elapsedMs,
         question,
         reason,
@@ -70,7 +72,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
         time,
         filterId,
         rule,
-        rules,
         service_name,
         original_answer,
         upstream,
@@ -83,15 +84,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 +92,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,
@@ -116,10 +105,21 @@ export const normalizeLogs = (logs) => logs.map((log) => {
     };
 });
 
-export const normalizeHistory = (history) => history.map((item, idx) => ({
-    x: idx,
-    y: item,
-}));
+export const normalizeHistory = (history, interval) => {
+    if (interval === 1 || interval === 7) {
+        const hoursAgo = subHours(Date.now(), 24 * interval);
+        return history.map((item, index) => ({
+            x: dateFormat(addHours(hoursAgo, index), 'D MMM HH:00'),
+            y: round(item, 2),
+        }));
+    }
+
+    const daysAgo = subDays(Date.now(), interval - 1);
+    return history.map((item, index) => ({
+        x: dateFormat(addDays(daysAgo, index), 'D MMM YYYY'),
+        y: round(item, 2),
+    }));
+};
 
 export const normalizeTopStats = (stats) => (
     stats.map((item) => ({
@@ -128,21 +128,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 +205,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 +220,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 +406,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 +526,7 @@ export const isIpInCidr = (ip, cidr) => {
 /**
  *
  * @param ipOrCidr
- * @returns {'IP' | 'CIDR' | 'CLIENT_ID' | 'UNKNOWN'}
+ * @returns {'IP' | 'CIDR' | 'UNKNOWN'}
  *
  */
 export const findAddressType = (address) => {
@@ -565,9 +539,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 +559,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 +580,7 @@ export const countClientsStatistics = (ids, autoClients) => {
             return acc;
         }, 0);
 
-    return ipsCount + cidrsCount + clientIdsCount;
+    return ipsCount + cidrsCount;
 };
 
 /**
@@ -742,7 +702,7 @@ export const sortIp = (a, b) => {
 
         return 0;
     } catch (e) {
-        console.warn(e);
+        console.error(e);
         return 0;
     }
 };
@@ -771,75 +731,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}

client/src/helpers/highlightTextareaComments.js

@@ -17,7 +17,7 @@ export const getTextareaCommentsHighlight = (
 ) => {
     const renderLine = (line, idx) => renderHighlightedLine(line, idx, commentLineTokens);
 
-    return <code className={classnames('text-output font-monospace', className)} ref={ref}>{lines?.split('\n').map(renderLine)}</code>;
+    return <code className={classnames('text-output', className)} ref={ref}>{lines?.split('\n').map(renderLine)}</code>;
 };
 
 export const syncScroll = (e, ref) => {