client: 1383 Support device identifier - DOT and DOH

.dockerignore

@@ -1,3 +1,40 @@
-# Ignore everything except for explicitly allowed stuff.
+.DS_Store
-*
+/.git
-!dist/docker
+/.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 go-lint || exit 1
+	go test ./... || exit 1
+fi
+
+exit 0;

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,9 +1,11 @@
 ---
 name: Bug report
 about: Create a bug report to help us improve AdGuard Home
+
 ---
 
-Have a question or an idea? Please search it [on our forum](https://github.com/AdguardTeam/AdGuardHome/discussions) to make sure it was not yet asked. If you cannot find what you had in mind, please [submit it here](https://github.com/AdguardTeam/AdGuardHome/discussions/new).
+<!--  As an open-source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
 
 ### Prerequisites
 
@@ -15,18 +17,14 @@ Please answer the following questions for yourself before submitting an issue. *
 
 ### Issue Details
 
-<!-- Please include all relevant details about the environment you experienced the bug in.  If possible, include the result of running `./AdGuardHome -v --version` from the installation directory. -->
+<!--- Please include all relevant details about the environment you experienced the bug in -->
 
 * **Version of AdGuard Home server:**
-  * <!-- (e.g. v0.123.4) -->
+  * <!-- (e.g. v1.0) -->
-* **How did you install AdGuard Home:**
-  * <!-- (e.g. Built from source, Snapcraft, Docker, Github releases, etc.) -->
 * **How did you setup DNS configuration:**
   * <!-- (System/Router/IoT) -->
 * **If it's a router or IoT, please write device model:**
   * <!-- (e.g. Raspberry Pi 3 Model B) -->
-* **CPU architecture:**
-  * <!-- (e.g. AMD64, MIPS, etc.) -->
 * **Operating system and version:**
   * <!-- (e.g. Ubuntu 18.04.1) -->
 

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,9 +1,11 @@
 ---
 name: Feature request
-about: Suggest a feature request for AdGuard Home
+about: Suggest an idea for AdGuard Home
+
 ---
 
-Have a question or an idea? Please search it [on our forum](https://github.com/AdguardTeam/AdGuardHome/discussions) to make sure it was not yet asked. If you cannot find what you had in mind, please [submit it here](https://github.com/AdguardTeam/AdGuardHome/discussions/new).
+<!--  As an open-source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
 
 ### Prerequisites
 

.github/stale.yml

@@ -1,22 +1,19 @@
 # Number of days of inactivity before an issue becomes stale.
-'daysUntilStale': 90
+'daysUntilStale': 60
 # Number of days of inactivity before a stale issue is closed.
-'daysUntilClose': 15
+'daysUntilClose': 7
 # Issues with these labels will never be considered stale.
 'exemptLabels':
 - 'bug'
 - 'enhancement'
 - 'feature request'
 - 'localization'
-- 'needs investigation'
-- 'recurrent'
-- 'research'
 # 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
+  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

.github/workflows/build.yml

@@ -1,8 +1,8 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.15'
+  'GO_VERSION': '1.14'
-  'NODE_VERSION': '14'
+  'NODE_VERSION': '13'
 
 'on':
   'push':
@@ -17,7 +17,7 @@
     'runs-on': '${{ matrix.os }}'
     'env':
       'GO111MODULE': 'on'
-      'GOPROXY': 'https://goproxy.cn'
+      'GOPROXY': 'https://goproxy.io'
     'strategy':
       'fail-fast': false
       'matrix':
@@ -55,14 +55,14 @@
         'restore-keys': '${{ runner.os }}-node-'
     - 'name': 'Run make ci'
       'shell': 'bash'
-      'run': 'make VERBOSE=1 ci'
+      'run': 'make ci'
     - 'name': 'Upload coverage'
       'uses': 'codecov/codecov-action@v1'
       'if': "success() && matrix.os == 'ubuntu-latest'"
       'with':
         'token': '${{ secrets.CODECOV_TOKEN }}'
         'file': './coverage.txt'
-  'build-release':
+  'app':
     'runs-on': 'ubuntu-latest'
     'needs': 'test'
     'steps':
@@ -87,7 +87,7 @@
     - 'name': 'Get npm cache directory'
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$(npm config get cache)"'
-    - 'name': 'Set up npm cache'
+    - 'name': 'Set up node_modules cache'
       'uses': 'actions/cache@v2'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
@@ -95,16 +95,30 @@
         'restore-keys': '${{ runner.os }}-node-'
     - 'name': 'Set up Snapcraft'
       'run': 'sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft'
+    - 'name': 'Set up GoReleaser'
+      'run': 'curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | BINDIR="$(go env GOPATH)/bin" sh'
+    - 'name': 'Run snapshot build'
+      'run': 'make release'
+
+  'docker':
+    'runs-on': 'ubuntu-latest'
+    'needs': 'test'
+    'steps':
+    - 'name': 'Checkout'
+      'uses': 'actions/checkout@v2'
+      'with':
+        'fetch-depth': 0
     - 'name': 'Set up QEMU'
       'uses': 'docker/setup-qemu-action@v1'
     - 'name': 'Set up Docker Buildx'
       'uses': 'docker/setup-buildx-action@v1'
-    - 'name': 'Run snapshot build'
+    - 'name': 'Docker Buildx (build)'
-      'run': 'make SIGN=0 VERBOSE=1 build-release build-docker'
+      'run': 'make docker-multi-arch'
 
   'notify':
     'needs':
-    - 'build-release'
+    - 'app'
+    - 'docker'
     # Secrets are not passed to workflows that are triggered by a pull request
     # from a fork.
     #
@@ -125,7 +139,7 @@
       'uses': '8398a7/action-slack@v3'
       'with':
         'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author, workflow'
+        'fields': 'repo, message, commit, author, job'
       'env':
         'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
         'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'

.github/workflows/lint.yml

@@ -13,15 +13,15 @@
     - 'uses': 'actions/checkout@v2'
     - 'name': 'run-lint'
       'run': >
-        make go-deps go-tools go-lint
+        make go-install-tools go-lint
   'eslint':
     'runs-on': 'ubuntu-latest'
     'steps':
     - 'uses': 'actions/checkout@v2'
     - 'name': 'Install modules'
-      'run': 'npm --prefix="./client" ci'
+      'run': 'npm --prefix client ci'
     - 'name': 'Run ESLint'
-      'run': 'npm --prefix="./client" run lint'
+      'run': 'npm --prefix client run lint'
   'notify':
     'needs':
     - 'go-lint'
@@ -46,7 +46,7 @@
       'uses': '8398a7/action-slack@v3'
       'with':
         'status': '${{ env.WORKFLOW_CONCLUSION }}'
-        'fields': 'repo, message, commit, author, workflow'
+        'fields': 'repo, message, commit, author, job'
       'env':
         'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
         'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'

.gitignore

@@ -7,11 +7,9 @@
 # Only build, run, and test outputs here.  Sorted.
 *-packr.go
 *.db
-*.log
 *.snap
 /bin/
 /build/
-/build2/
 /data/
 /dist/
 /dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
@@ -21,5 +19,4 @@
 /snapcraft_login
 AdGuardHome*
 coverage.txt
-leases.db
 node_modules/

.goreleaser.yml

@@ -0,0 +1,115 @@
+'project_name': 'AdGuardHome'
+
+'env':
+- 'GO111MODULE=on'
+- 'GOPROXY=https://goproxy.io'
+
+'before':
+  'hooks':
+  - 'go mod download'
+  - 'go generate ./...'
+
+'builds':
+- 'main': './main.go'
+  'ldflags':
+  - '-s -w -X main.version={{.Version}} -X main.channel={{.Env.CHANNEL}} -X main.goarm={{.Env.GOARM}}'
+  'env':
+  - 'CGO_ENABLED=0'
+  'goos':
+  - 'darwin'
+  - 'linux'
+  - 'freebsd'
+  - 'windows'
+  'goarch':
+  - '386'
+  - 'amd64'
+  - 'arm'
+  - 'arm64'
+  - 'mips'
+  - 'mipsle'
+  - 'mips64'
+  - 'mips64le'
+  'goarm':
+  - '5'
+  - '6'
+  - '7'
+  'gomips':
+  - 'softfloat'
+  'ignore':
+  - 'goos': 'freebsd'
+    'goarch': 'mips'
+  - 'goos': 'freebsd'
+    'goarch': 'mipsle'
+
+'archives':
+- # Archive name template.
+  # Defaults:
+  # - if format is `tar.gz`, `tar.xz`, `gz` or `zip`:
+  #   - `{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}`
+  # - if format is `binary`:
+  #   - `{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}`
+  'name_template': '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
+  'wrap_in_directory': 'AdGuardHome'
+  'format_overrides':
+  - 'goos': 'windows'
+    'format': 'zip'
+  - 'goos': 'darwin'
+    'format': 'zip'
+  'files':
+  - 'LICENSE.txt'
+  - 'README.md'
+
+'snapcrafts':
+- 'name': 'adguard-home'
+  'base': 'core20'
+  'name_template': '{{ .ProjectName }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+  'summary': 'Network-wide ads & trackers blocking DNS server'
+  'description': |
+    AdGuard Home is a network-wide software for blocking ads & tracking. After
+    you set it up, it'll cover ALL your home devices, and you don't need any
+    client-side software for that.
+
+    It operates as a DNS server that re-routes tracking domains to a "black hole,"
+    thus preventing your devices from connecting to those servers. It's based
+    on software we use for our public AdGuard DNS servers -- both share a lot
+    of common code.
+  'grade': 'stable'
+  'confinement': 'strict'
+  'publish': false
+  'license': 'GPL-3.0'
+  'extra_files':
+  - 'source': 'scripts/snap/local/adguard-home-web.sh'
+    'destination': 'adguard-home-web.sh'
+    'mode': 0755
+  - 'source': 'scripts/snap/gui/adguard-home-web.desktop'
+    'destination': 'meta/gui/adguard-home-web.desktop'
+    'mode': 0644
+  - 'source': 'scripts/snap/gui/adguard-home-web.png'
+    'destination': 'meta/gui/adguard-home-web.png'
+    'mode': 0644
+  'apps':
+    'adguard-home':
+      'command': 'AdGuardHome -w $SNAP_DATA --no-check-update'
+      'plugs':
+      # Add the "netrwork-bind" plug to bind to interfaces.
+      - 'network-bind'
+      # Add the "netrwork-observe" plug to be able to bind to ports below 1024
+      # (cap_net_bind_service) and also to bind to a particular interface using
+      # SO_BINDTODEVICE (cap_net_raw).
+      - 'network-observe'
+      'daemon': 'simple'
+    'adguard-home-web':
+      'command': 'adguard-home-web.sh'
+      'plugs':
+      - 'desktop'
+
+'checksum':
+  'name_template': 'checksums.txt'
+
+'snapshot':
+  # TODO(a.garipov): A temporary solution to trim the prerelease versions.
+  # A real solution would consist of making a better versioning scheme that also
+  # doesn't break SemVer or Snapcraft.
+  #
+  # See https://github.com/AdguardTeam/AdGuardHome/issues/2412.
+  'name_template': '{{ slice .Tag 0 8 }}-SNAPSHOT-{{ .ShortCommit }}'

AGHTechDoc.md

@@ -1833,22 +1833,16 @@ Response:
 	200 OK
 
 	{
-		"reason":"FilteredBlackList",
+	"reason":"FilteredBlackList",
-		"rules":{
+	"filter_id":1,
-			"filter_list_id":42,
+	"rule":"||doubleclick.net^",
-			"text":"||doubleclick.net^",
+	"service_name": "...", // set if reason=FilteredBlockedService
-		},
+
-		// If we have "reason":"FilteredBlockedService".
+	// if reason=ReasonRewrite:
-		"service_name": "...",
+	"cname": "...",
-		// If we have "reason":"Rewrite".
+	"ip_addrs": ["1.2.3.4", ...],
-		"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

@@ -10,302 +10,57 @@ and this project adheres to
 ## [Unreleased]
 
 <!--
-## [v0.107.0] - 2021-06-21 (APPROX.)
+## [v0.105.0] - 2020-12-28
 -->
 
-<!--
-## [v0.106.3] - 2021-05-17 (APPROX.)
--->
-
-
-
-## [v0.106.2] - 2021-05-06
-
-### Fixed
-
-- Uniqueness validation for dynamic DHCP leases ([#3056]).
-
-[#3056]: https://github.com/AdguardTeam/AdGuardHome/issues/3056
-
-
-
-## [v0.106.1] - 2021-04-30
-
-### Fixed
-
-- Local domain name handling when the DHCP server is disabled ([#3028]).
-- Normalization of perviously-saved invalid static DHCP leases ([#3027]).
-- Validation of IPv6 addresses with zones in system resolvers ([#3022]).
-
-[#3022]: https://github.com/AdguardTeam/AdGuardHome/issues/3022
-[#3027]: https://github.com/AdguardTeam/AdGuardHome/issues/3027
-[#3028]: https://github.com/AdguardTeam/AdGuardHome/issues/3028
-
-
-
-## [v0.106.0] - 2021-04-28
-
 ### Added
 
-- The ability to block user for login after configurable number of unsuccessful
+- Detecting of network interface configurated to have static IP address via
-  attempts for configurable time ([#2826]).
-- `$denyallow` modifier for filters ([#2923]).
-- Hostname uniqueness validation in the DHCP server ([#2952]).
-- Hostname generating for DHCP clients which don't provide their own ([#2723]).
-- New flag `--no-etc-hosts` to disable client domain name lookups in the
-  operating system's /etc/hosts files ([#1947]).
-- The ability to set up custom upstreams to resolve PTR queries for local
-  addresses and to disable the automatic resolving of clients' addresses
-  ([#2704]).
-- Logging of the client's IP address after failed login attempts ([#2824]).
-- Search by clients' names in the query log ([#1273]).
-- Verbose version output with `-v --version` ([#2416]).
-- The ability to set a custom TLD or domain name for known hosts in the local
-  network ([#2393], [#2961]).
-- The ability to serve DNS queries on multiple hosts and interfaces ([#1401]).
-- `ips` and `text` DHCP server options ([#2385]).
-- `SRV` records support in `$dnsrewrite` filters ([#2533]).
-
-### Changed
-
-- Our DoQ implementation is now updated to conform to the latest standard
-  [draft][doq-draft-02] ([#2843]).
-- Quality of logging ([#2954]).
-- Normalization of hostnames sent by DHCP clients ([#2945], [#2952]).
-- The access to the private hosts is now forbidden for users from external
-  networks ([#2889]).
-- The reverse lookup for local addresses is now performed via local resolvers
-  ([#2704]).
-- Stricter validation of the IP addresses of static leases in the DHCP server
-  with regards to the netmask ([#2838]).
-- Stricter validation of `$dnsrewrite` filter modifier parameters ([#2498]).
-- New, more correct versioning scheme ([#2412]).
-
-### Deprecated
-
-- Go 1.15 support.  v0.107.0 will require at least Go 1.16 to build.
-
-### Fixed
-
-- Multiple answers for `$dnsrewrite` rule matching requests with repeating
-  patterns in it ([#2981]).
-- Root server resolving when custom upstreams for hosts are specified ([#2994]).
-- Inconsistent resolving of DHCP clients when the DHCP server is disabled
-  ([#2934]).
-- Comment handling in clients' custom upstreams ([#2947]).
-- Overwriting of DHCPv4 options when using the HTTP API ([#2927]).
-- Assumption that MAC addresses always have the length of 6 octets ([#2828]).
-- Support for more than one `/24` subnet in DHCP ([#2541]).
-- Invalid filenames in the `mobileconfig` API responses ([#2835]).
-
-### Removed
-
-- Go 1.14 support.
-
-[#1273]: https://github.com/AdguardTeam/AdGuardHome/issues/1273
-[#1401]: https://github.com/AdguardTeam/AdGuardHome/issues/1401
-[#1947]: https://github.com/AdguardTeam/AdGuardHome/issues/1947
-[#2385]: https://github.com/AdguardTeam/AdGuardHome/issues/2385
-[#2393]: https://github.com/AdguardTeam/AdGuardHome/issues/2393
-[#2412]: https://github.com/AdguardTeam/AdGuardHome/issues/2412
-[#2416]: https://github.com/AdguardTeam/AdGuardHome/issues/2416
-[#2498]: https://github.com/AdguardTeam/AdGuardHome/issues/2498
-[#2533]: https://github.com/AdguardTeam/AdGuardHome/issues/2533
-[#2541]: https://github.com/AdguardTeam/AdGuardHome/issues/2541
-[#2704]: https://github.com/AdguardTeam/AdGuardHome/issues/2704
-[#2723]: https://github.com/AdguardTeam/AdGuardHome/issues/2723
-[#2824]: https://github.com/AdguardTeam/AdGuardHome/issues/2824
-[#2826]: https://github.com/AdguardTeam/AdGuardHome/issues/2826
-[#2828]: https://github.com/AdguardTeam/AdGuardHome/issues/2828
-[#2835]: https://github.com/AdguardTeam/AdGuardHome/issues/2835
-[#2838]: https://github.com/AdguardTeam/AdGuardHome/issues/2838
-[#2843]: https://github.com/AdguardTeam/AdGuardHome/issues/2843
-[#2889]: https://github.com/AdguardTeam/AdGuardHome/issues/2889
-[#2923]: https://github.com/AdguardTeam/AdGuardHome/issues/2923
-[#2927]: https://github.com/AdguardTeam/AdGuardHome/issues/2927
-[#2934]: https://github.com/AdguardTeam/AdGuardHome/issues/2934
-[#2945]: https://github.com/AdguardTeam/AdGuardHome/issues/2945
-[#2947]: https://github.com/AdguardTeam/AdGuardHome/issues/2947
-[#2952]: https://github.com/AdguardTeam/AdGuardHome/issues/2952
-[#2954]: https://github.com/AdguardTeam/AdGuardHome/issues/2954
-[#2961]: https://github.com/AdguardTeam/AdGuardHome/issues/2961
-[#2981]: https://github.com/AdguardTeam/AdGuardHome/issues/2981
-[#2994]: https://github.com/AdguardTeam/AdGuardHome/issues/2994
-
-[doq-draft-02]: https://tools.ietf.org/html/draft-ietf-dprive-dnsoquic-02
-
-
-
-## [v0.105.2] - 2021-03-10
-
-### Fixed
-
-- Incomplete hostnames with trailing zero-bytes handling ([#2582]).
-- Wrong DNS-over-TLS ALPN configuration ([#2681]).
-- Inconsistent responses for messages with EDNS0 and AD when DNS caching is
-  enabled ([#2600]).
-- Incomplete OpenWrt detection ([#2757]).
-- DHCP lease's `expired` field incorrect time format ([#2692]).
-- Incomplete DNS upstreams validation ([#2674]).
-- Wrong parsing of DHCP options of the `ip` type ([#2688]).
-
-[#2582]: https://github.com/AdguardTeam/AdGuardHome/issues/2582
-[#2600]: https://github.com/AdguardTeam/AdGuardHome/issues/2600
-[#2674]: https://github.com/AdguardTeam/AdGuardHome/issues/2674
-[#2681]: https://github.com/AdguardTeam/AdGuardHome/issues/2681
-[#2688]: https://github.com/AdguardTeam/AdGuardHome/issues/2688
-[#2692]: https://github.com/AdguardTeam/AdGuardHome/issues/2692
-[#2757]: https://github.com/AdguardTeam/AdGuardHome/issues/2757
-
-### Security
-
-- Session token doesn't contain user's information anymore ([#2470]).
-
-[#2470]: https://github.com/AdguardTeam/AdGuardHome/issues/2470
-
-
-
-## [v0.105.1] - 2021-02-15
-
-### Changed
-
-- Increased HTTP API timeouts ([#2671], [#2682]).
-- "Permission denied" errors when checking if the machine has a static IP no
-  longer prevent the DHCP server from starting ([#2667]).
-- The server name sent by clients of TLS APIs is not only checked when
-  `strict_sni_check` is enabled ([#2664]).
-- HTTP API request body size limit for the `POST /control/access/set` and `POST
-  /control/filtering/set_rules` HTTP APIs is increased ([#2666], [#2675]).
-
-### Fixed
-
-- Error when enabling the DHCP server when AdGuard Home couldn't determine if
-  the machine has a static IP.
-- Optical issue on custom rules ([#2641]).
-- Occasional crashes during startup.
-- The field `"range_start"` in the `GET /control/dhcp/status` HTTP API response
-  is now correctly named again ([#2678]).
-- DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` settings aren't reset to
-  `false` on update any more ([#2653]).
-- The `Vary` header is now added along with `Access-Control-Allow-Origin` to
-  prevent cache-related and other issues in browsers ([#2658]).
-- The request body size limit is now set for HTTPS requests as well.
-- Incorrect version tag in the Docker release ([#2663]).
-- DNSCrypt queries weren't marked as such in logs ([#2662]).
-
-[#2641]: https://github.com/AdguardTeam/AdGuardHome/issues/2641
-[#2653]: https://github.com/AdguardTeam/AdGuardHome/issues/2653
-[#2658]: https://github.com/AdguardTeam/AdGuardHome/issues/2658
-[#2662]: https://github.com/AdguardTeam/AdGuardHome/issues/2662
-[#2663]: https://github.com/AdguardTeam/AdGuardHome/issues/2663
-[#2664]: https://github.com/AdguardTeam/AdGuardHome/issues/2664
-[#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666
-[#2667]: https://github.com/AdguardTeam/AdGuardHome/issues/2667
-[#2671]: https://github.com/AdguardTeam/AdGuardHome/issues/2671
-[#2675]: https://github.com/AdguardTeam/AdGuardHome/issues/2675
-[#2678]: https://github.com/AdguardTeam/AdGuardHome/issues/2678
-[#2682]: https://github.com/AdguardTeam/AdGuardHome/issues/2682
-
-
-
-## [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]).
+- DNSCrypt protocol support [#1361].
 - A 5 second wait period until a DHCP server's network interface gets an IP
   address ([#2304]).
 - `$dnstype` modifier for filters ([#2337]).
 - HTTP API request body size limit ([#2305]).
 
+[#1361]: https://github.com/AdguardTeam/AdGuardHome/issues/1361
+[#2302]: https://github.com/AdguardTeam/AdGuardHome/issues/2302
+[#2304]: https://github.com/AdguardTeam/AdGuardHome/issues/2304
+[#2305]: https://github.com/AdguardTeam/AdGuardHome/issues/2305
+[#2337]: https://github.com/AdguardTeam/AdGuardHome/issues/2337
+
 ### Changed
 
-- `Access-Control-Allow-Origin` is now only set to the same origin as the
-  domain, but with an HTTP scheme as opposed to `*` ([#2484]).
-- `workDir` now supports symlinks.
-- Stopped mounting together the directories `/opt/adguardhome/conf` and
-  `/opt/adguardhome/work` in our Docker images ([#2589]).
-- When `dns.bogus_nxdomain` option is used, the server will now transform
-  responses if there is at least one bogus address instead of all of them
-  ([#2394]).  The new behavior is the same as in `dnsmasq`.
 - Post-updating relaunch possibility is now determined OS-dependently ([#2231],
   [#2391]).
 - Made the mobileconfig HTTP API more robust and predictable, add parameters and
   improve error response ([#2358]).
 - Improved HTTP requests handling and timeouts ([#2343]).
 - Our snap package now uses the `core20` image as its base ([#2306]).
-- New build system and various internal improvements ([#2271], [#2276], [#2297],
+- Various internal improvements ([#2267], [#2271], [#2297]).
-  [#2509], [#2552], [#2639], [#2646]).
 
-### Deprecated
+[#2231]: https://github.com/AdguardTeam/AdGuardHome/issues/2231
-
+[#2267]: https://github.com/AdguardTeam/AdGuardHome/issues/2267
-- Go 1.14 support.  v0.106.0 will require at least Go 1.15 to build.
+[#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271
-- The `darwin/386` port.  It will be removed in v0.106.0.
+[#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297
-- The `"rule"` and `"filter_id"` fields in `GET /filtering/check_host` and
+[#2306]: https://github.com/AdguardTeam/AdGuardHome/issues/2306
-  `GET /querylog` responses.  They will be removed in v0.106.0 ([#2102]).
+[#2343]: https://github.com/AdguardTeam/AdGuardHome/issues/2343
+[#2358]: https://github.com/AdguardTeam/AdGuardHome/issues/2358
+[#2391]: https://github.com/AdguardTeam/AdGuardHome/issues/2391
 
 ### Fixed
 
-- Autoupdate bug in the Darwin (macOS) version ([#2630]).
-- Unnecessary conversions from `string` to `net.IP`, and vice versa ([#2508]).
-- Inability to set DNS cache TTL limits ([#2459]).
-- Possible freezes on slower machines ([#2225]).
 - A mitigation against records being shown in the wrong order on the query log
   page ([#2293]).
 - A JSON parsing error in query log ([#2345]).
 - Incorrect detection of the IPv6 address of an interface as well as another
   infinite loop in the `/dhcp/find_active_dhcp` HTTP API ([#2355]).
 
-### Removed
-
-- The undocumented ability to use hostnames as any of `bind_host` values in
-  configuration.  Documentation requires them to be valid IP addresses, and now
-  the implementation makes sure that that is the case ([#2508]).
-- `Dockerfile` ([#2276]).  Replaced with the script
-  `scripts/make/build-docker.sh` which uses `scripts/make/Dockerfile`.
-- Support for pre-v0.99.3 format of query logs ([#2102]).
-
-[#1361]: https://github.com/AdguardTeam/AdGuardHome/issues/1361
-[#1383]: https://github.com/AdguardTeam/AdGuardHome/issues/1383
-[#2102]: https://github.com/AdguardTeam/AdGuardHome/issues/2102
-[#2179]: https://github.com/AdguardTeam/AdGuardHome/issues/2179
-[#2224]: https://github.com/AdguardTeam/AdGuardHome/issues/2224
-[#2225]: https://github.com/AdguardTeam/AdGuardHome/issues/2225
-[#2231]: https://github.com/AdguardTeam/AdGuardHome/issues/2231
-[#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271
-[#2276]: https://github.com/AdguardTeam/AdGuardHome/issues/2276
 [#2293]: https://github.com/AdguardTeam/AdGuardHome/issues/2293
-[#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297
-[#2302]: https://github.com/AdguardTeam/AdGuardHome/issues/2302
-[#2304]: https://github.com/AdguardTeam/AdGuardHome/issues/2304
-[#2305]: https://github.com/AdguardTeam/AdGuardHome/issues/2305
-[#2306]: https://github.com/AdguardTeam/AdGuardHome/issues/2306
-[#2337]: https://github.com/AdguardTeam/AdGuardHome/issues/2337
-[#2343]: https://github.com/AdguardTeam/AdGuardHome/issues/2343
 [#2345]: https://github.com/AdguardTeam/AdGuardHome/issues/2345
 [#2355]: https://github.com/AdguardTeam/AdGuardHome/issues/2355
-[#2358]: https://github.com/AdguardTeam/AdGuardHome/issues/2358
+
-[#2391]: https://github.com/AdguardTeam/AdGuardHome/issues/2391
+
-[#2394]: https://github.com/AdguardTeam/AdGuardHome/issues/2394
-[#2401]: https://github.com/AdguardTeam/AdGuardHome/issues/2401
-[#2459]: https://github.com/AdguardTeam/AdGuardHome/issues/2459
-[#2484]: https://github.com/AdguardTeam/AdGuardHome/issues/2484
-[#2508]: https://github.com/AdguardTeam/AdGuardHome/issues/2508
-[#2509]: https://github.com/AdguardTeam/AdGuardHome/issues/2509
-[#2552]: https://github.com/AdguardTeam/AdGuardHome/issues/2552
-[#2589]: https://github.com/AdguardTeam/AdGuardHome/issues/2589
-[#2630]: https://github.com/AdguardTeam/AdGuardHome/issues/2630
-[#2639]: https://github.com/AdguardTeam/AdGuardHome/issues/2639
-[#2646]: https://github.com/AdguardTeam/AdGuardHome/issues/2646
 
 ## [v0.104.3] - 2020-11-19
 
@@ -332,7 +87,7 @@ and this project adheres to
 
 - Query logs from file not loading after the ones buffered in memory ([#2325]).
 - Unnecessary errors in query logs when switching between log files ([#2324]).
-- `404 Not Found` errors on the DHCP settings page on Windows.  The page now
+- `404 Not Found` errors on the DHCP settings page on *Windows*.  The page now
   correctly shows that DHCP is not currently available on that OS ([#2295]).
 - Infinite loop in `/dhcp/find_active_dhcp` ([#2301]).
 
@@ -346,17 +101,9 @@ and this project adheres to
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.3...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.0...HEAD
-[v0.107.0]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.3...v0.107.0
-[v0.106.3]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.2...v0.106.3
--->
-
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.2...HEAD
-[v0.106.2]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.1...v0.106.2
-[v0.106.1]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.0...v0.106.1
-[v0.106.0]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.2...v0.106.0
-[v0.105.2]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.1...v0.105.2
-[v0.105.1]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.0...v0.105.1
 [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,77 @@
+FROM --platform=${BUILDPLATFORM:-linux/amd64} tonistiigi/xx:golang AS xgo
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-alpine as builder
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION=dev
+ARG CHANNEL=release
+
+ENV CGO_ENABLED 0
+ENV GO111MODULE on
+ENV GOPROXY https://goproxy.io
+
+COPY --from=xgo / /
+RUN go env
+
+RUN apk --update --no-cache add \
+    build-base \
+    gcc \
+    git \
+    npm \
+  && rm -rf /tmp/* /var/cache/apk/*
+
+WORKDIR /app
+
+COPY . ./
+
+# Prepare the client code
+RUN npm --prefix client ci && npm --prefix client run build-prod
+
+# Download go dependencies
+RUN go mod download
+RUN go generate ./...
+
+# It's important to place TARGET* arguments here to avoid running npm and go mod download for every platform
+ARG TARGETPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
+RUN go build -ldflags="-s -w -X main.version=${VERSION} -X main.channel=${CHANNEL} -X main.goarm=${GOARM}"
+
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:latest
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+ARG CHANNEL
+
+LABEL maintainer="AdGuard Team <devteam@adguard.com>" \
+  org.opencontainers.image.created=$BUILD_DATE \
+  org.opencontainers.image.url="https://adguard.com/adguard-home.html" \
+  org.opencontainers.image.source="https://github.com/AdguardTeam/AdGuardHome" \
+  org.opencontainers.image.version=$VERSION \
+  org.opencontainers.image.revision=$VCS_REF \
+  org.opencontainers.image.vendor="AdGuard" \
+  org.opencontainers.image.title="AdGuard Home" \
+  org.opencontainers.image.description="Network-wide ads & trackers blocking DNS server" \
+  org.opencontainers.image.licenses="GPL-3.0"
+
+RUN apk --update --no-cache add \
+    ca-certificates \
+    libcap \
+    libressl \
+  && rm -rf /tmp/* /var/cache/apk/*
+
+COPY --from=builder --chown=nobody:nogroup /app/AdGuardHome /opt/adguardhome/AdGuardHome
+COPY --from=builder --chown=nobody:nogroup /usr/local/go/lib/time/zoneinfo.zip /usr/local/go/lib/time/zoneinfo.zip
+
+RUN /opt/adguardhome/AdGuardHome --version \
+  && mkdir -p /opt/adguardhome/conf /opt/adguardhome/work \
+  && chown -R nobody: /opt/adguardhome \
+  && setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
+
+EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 853/tcp 3000/tcp
+WORKDIR /opt/adguardhome/work
+VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"]
+
+ENTRYPOINT ["/opt/adguardhome/AdGuardHome"]
+CMD ["-h", "0.0.0.0", "-c", "/opt/adguardhome/conf/AdGuardHome.yaml", "-w", "/opt/adguardhome/work", "--no-check-update"]

HACKING.md

@@ -1,39 +1,17 @@
- #  AdGuard Home Developer Guidelines
+ #  *AdGuardHome* Developer Guidelines
 
-As of **March 2021**, following this document is obligatory for all new code.
+As of **December 2020**, this document is partially a work-in-progress, but
-Some of the rules aren't enforced as thoroughly or remain broken in old code,
+should still be followed.  Some of the rules aren't enforced as thoroughly or
-but this is still the place to find out about what we **want** our code to look
+remain broken in old code, but this is still the place to find out about what we
-like and how to improve it.
+**want** our code to look like.
 
 The rules are mostly sorted in the alphabetical order.
 
-
+##  *Git*
-
-## Contents
-
- *  [Git](#git)
- *  [Go](#go)
-     *  [Code](#code)
-     *  [Commenting](#commenting)
-     *  [Formatting](#formatting)
-     *  [Naming](#naming)
-     *  [Testing](#testing)
-     *  [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 you worked on in this branch) or just `fix-foo` if there was
-    GitHub issue.
+    no *GitHub* issue.
 
  *  Follow the commit message header format:
 
@@ -41,9 +19,8 @@ on GitHub and most other Markdown renderers. -->
     pkg: fix the network error logging issue
     ```
 
-    Where `pkg` is the directory or Go package (without the `internal/` part)
+    Where `pkg` is the package where most changes took place.  If there are
-    where most changes took place.  If there are several such packages, or the
+    several such packages, or the change is top-level only, write `all`.
-    change is top-level only, write `all`.
 
  *  Keep your commit messages, including headers, to eighty (**80**) columns.
 
@@ -53,22 +30,14 @@ on GitHub and most other Markdown renderers. -->
     The only exceptions are direct mentions of identifiers from the source code
     and filenames like `HACKING.md`.
 
-
+##  *Go*
-
-##  <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" href="#code">Code</a>
+ ###  Code And Naming
-
- *  Always `recover` from panics in new goroutines.  Preferably in the very
-    first statement.  If all you want there is a log message, use
-    `agherr.LogPanic`.
-
- *  Avoid `errors.New`, use `aghnet.Error` instead.
 
  *  Avoid `goto`.
 
@@ -76,68 +45,32 @@ on GitHub and most other Markdown renderers. -->
 
  *  Avoid `new`, especially with structs.
 
- *  Check against empty strings like this:
-
-    ```go
-    if s == "" {
-            // …
-    }
-    ```
-
-    Except when the check is done to then use the first character:
-
-    ```go
-    if len(s) > 0 {
-            c := s[0]
-    }
-    ```
-
  *  Constructors should validate their arguments and return meaningful errors.
     As a corollary, avoid lazy initialization.
 
- *  Don't mix horizontal and vertical placement of arguments in function and
-    method calls.  That is, either this:
-
-    ```go
-    err := f(a, b, c)
-    ```
-
-    Or, when the arguments are too long, this:
-
-    ```go
-    err := functionWithALongName(
-            firstArgumentWithALongName,
-            secondArgumentWithALongName,
-            thirdArgumentWithALongName,
-    )
-    ```
-
-    But **never** this:
-
-    ```go
-    err := functionWithALongName(firstArgumentWithALongName,
-            secondArgumentWithALongName,
-            thirdArgumentWithALongName,
-    )
-    ```
-
- *  Don't use `fmt.Sprintf` where a more structured approach to string
-    conversion could be used.  For example, `net.JoinHostPort` or
-    `url.(*URL).String`.
-
  *  Don't use naked `return`s.
 
- *  Don't write non-test code with more than four (**4**) levels of indentation.
+ *  Don't use underscores in file and package names, unless they're build tags
-    Just like [Linus said], plus an additional level for an occasional error
+    or for tests.  This is to prevent accidental build errors with weird tags.
-    check or struct initialization.
 
-    The exception proving the rule is the table-driven test code, where an
+ *  Don't write code with more than four (**4**) levels of indentation.  Just
-    additional level of indentation is allowed.
+    like [Linus said], plus an additional level for an occasional error check or
+    struct initialization.
 
  *  Eschew external dependencies, including transitive, unless
     absolutely necessary.
 
- *  Minimize scope of variables as much as possible.
+ *  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 the deferred errors (e.g. when closing something) `cerr`.
 
  *  No shadowing, since it can often lead to subtle bugs, especially with
     errors.
@@ -145,19 +78,19 @@ on GitHub and most other Markdown renderers. -->
  *  Prefer constants to variables where possible.  Reduce global variables.  Use
     [constant errors] instead of `errors.New`.
 
- *  Prefer to use named functions for goroutines.
+ *  Use linters.
 
- *  Program code lines should not be longer than one hundred (**100**) columns.
+ *  Use named returns to improve readability of function signatures.
-    For comments, see the text section below.
-
- *  Use linters.  `make go-lint`.
 
  *  Write logs and error messages in lowercase only to make it easier to `grep`
     logs and error messages without using the `-i` flag.
 
- ###  <a id="commenting" href="#commenting">Commenting</a>
+[constant errors]: https://dave.cheney.net/2016/04/07/constant-errors
+[Linus said]:      https://www.kernel.org/doc/html/v4.17/process/coding-style.html#indentation
 
- *  See also the “[Text, Including Comments]” section below.
+ ###  Commenting
+
+ *  See also the *Text, Including Comments* section below.
 
  *  Document everything, including unexported top-level identifiers, to build
     a habit of writing documentation.
@@ -173,23 +106,14 @@ on GitHub and most other Markdown renderers. -->
     ```go
     // Foo implements the Fooer interface for *foo.
     func (f *foo) Foo() {
-            // …
+        // …
     }
     ```
 
-    When the implemented interface is unexported:
+ ###  Formatting
 
-    ```go
+ *  Add an empty line before `break`, `continue`, `fallthrough`, and `return`,
-    // Unwrap implements the hidden wrapper interface for *fooError.
+    unless it's the only statement in that block.
-    func (err *fooError) Unwrap() (unwrapped error) {
-            // …
-    }
-    ```
-
- ###  <a id="formatting" href="#formatting">Formatting</a>
-
- *  Decorate `break`, `continue`, `fallthrough`, `return`, and other function
-    exit points with empty lines unless it's the only statement in that block.
 
  *  Use `gofumpt --extra -s`.
 
@@ -208,77 +132,7 @@ on GitHub and most other Markdown renderers. -->
     }}
     ```
 
- ###  <a id="naming" href="#naming">Naming</a>
+ ###  Recommended Reading
-
- *  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.
-
- *  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) `derr`.
-
- *  Unused arguments in anonymous functions must be called `_`:
-
-    ```go
-    v.onSuccess = func(_ int, msg string) {
-            // …
-    }
-    ```
-
- *  Use named returns to improve readability of function signatures.
-
- *  When naming a file which defines an enitity, use singular nouns, unless the
-    entity is some form of a container for other entities:
-
-    ```go
-    // File: client.go
-
-    package foo
-
-    type Client struct {
-            // …
-    }
-    ```
-
-    ```go
-    // File: clients.go
-
-    package foo
-
-    type Clients []*Client
-
-    // …
-
-    type ClientsWithCache struct {
-            // …
-    }
-    ```
-
- ###  <a id="testing" href="#testing">Testing</a>
-
- *  Use `assert.NoError` and `require.NoError` instead of `assert.Nil` and
-    `require.Nil` on errors.
-
- *  Use functions like `require.Foo` instead of `assert.Foo` when the test
-    cannot continue if the condition is false.
-
- ###  <a id="recommended-reading" href="#recommended-reading">Recommended Reading</a>
 
  *  <https://github.com/golang/go/wiki/CodeReviewComments>.
 
@@ -286,78 +140,26 @@ on GitHub and most other Markdown renderers. -->
 
  *  <https://go-proverbs.github.io/>
 
-[constant errors]:          https://dave.cheney.net/2016/04/07/constant-errors
+##  *Markdown*
-[Linus said]:               https://www.kernel.org/doc/html/v4.17/process/coding-style.html#indentation
-[Text, Including Comments]: #text-including-comments
 
+ *  **TODO(a.garipov):** Define our *Markdown* conventions.
 
+##  Shell Scripting
 
-##  <a id="markdown" href="#markdown">Markdown</a>
+ *  Avoid bashisms, prefer *POSIX* features only.
-
- *  **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
+ *  `snake_case`, not `camelCase`.
-    example, `ls -1 -A -q`.
-
- *  Script code lines should not be longer than one hundred (**100**) columns.
-    For comments, see the text section below.
-
- *  `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
+##  Text, Including Comments
-    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
-    ```
-
- *  When using `test` (aka `[`), spell compound conditions with `&&`, `||`, and
-    `!` **outside** of `test` instead of `-a`, `-o`, and `!` inside of `test`
-    correspondingly.  The latter ones are pretty much deprecated in POSIX.
-
-    See also: “[Problems With the `test` Builtin: What Does `-a` Mean?]”.
-
-    [Problems With the `test` Builtin: What Does `-a` Mean?]: https://www.oilshell.org/blog/2017/08/31.html
-
-##  <a id="text-including-comments" href="#text-including-comments">Text, Including Comments</a>
 
  *  End sentences with appropriate punctuation.
 
@@ -378,7 +180,7 @@ on GitHub and most other Markdown renderers. -->
 
  *  Use double spacing between sentences to make sentence borders more clear.
 
- *  Use the serial comma (a.k.a. Oxford comma) to improve comprehension,
+ *  Use the serial comma (a.k.a. *Oxford* comma) to improve comprehension,
     decrease ambiguity, and use a common standard.
 
  *  Write todos like this:
@@ -393,16 +195,16 @@ on GitHub and most other Markdown renderers. -->
     // TODO(usr1, usr2): Fix the frobulation issue.
     ```
 
-##  <a id="yaml" href="#yaml">YAML</a>
+##  *YAML*
 
  *  **TODO(a.garipov):** Define naming conventions for schema names in our
-    OpenAPI YAML file.  And just generally OpenAPI conventions.
+    *OpenAPI* *YAML* file.  And just generally OpenAPI conventions.
 
- *  **TODO(a.garipov):** Find a YAML formatter or write our own.
+ *  **TODO(a.garipov):** Find a *YAML* formatter or write our own.
 
- *  All strings, including keys, must be quoted.  Reason: the “[NO-rway Law]”.
+ *  All strings, including keys, must be quoted.  Reason: the [*NO-rway Law*].
 
- *  Indent with two (**2**) spaces.  YAML documents can get pretty
+ *  Indent with two (**2**) spaces.  *YAML* documents can get pretty
     deeply-nested.
 
  *  No extra indentation in multiline arrays:
@@ -416,9 +218,8 @@ on GitHub and most other Markdown renderers. -->
 
  *  Prefer single quotes for strings to prevent accidental escaping, unless
     escaping is required or there are single quotes inside the string (e.g. for
-    GitHub Actions).
+    *GitHub Actions*).
 
- *  Use `>` for multiline strings, unless you need to keep the line breaks.  Use
+ *  Use `>` for multiline strings, unless you need to keep the line breaks.
-    `|` for multiline strings when you do.
 
-[NO-rway Law]: https://news.ycombinator.com/item?id=17359376
+[*NO-rway Law*]: https://news.ycombinator.com/item?id=17359376

Makefile

@@ -1,108 +1,345 @@
-# Keep the Makefile POSIX-compliant.  We currently allow hyphens in
-# target names, but that may change in the future.
 #
-# See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html.
+# Available targets
-.POSIX:
-
-CHANNEL = development
-CLIENT_BETA_DIR = client2
-CLIENT_DIR = client
-COMMIT = $$( git rev-parse --short HEAD )
-DIST_DIR = dist
-# Don't name this macro "GO", because GNU Make apparenly makes it an
-# exported environment variable with the literal value of "${GO:-go}",
-# which is not what we need.  Use a dot in the name to make sure that
-# users don't have an environment variable with the same name.
 #
-# See https://unix.stackexchange.com/q/646255/105635.
+# * build -- builds AdGuardHome for the current platform
-GO.MACRO = $${GO:-go}
+# * client -- builds client-side code of AdGuard Home
-GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
+# * client-watch -- builds client-side code of AdGuard Home and watches for changes there
-GPG_KEY = devteam@adguard.com
+# * docker -- builds a docker image for the current platform
-GPG_KEY_PASSPHRASE = not-a-real-password
+# * clean -- clean everything created by previous builds
-NPM = npm
+# * lint -- run all linters
-NPM_FLAGS = --prefix $(CLIENT_DIR)
+# * test -- run all unit-tests
-NPM_INSTALL_FLAGS = $(NPM_FLAGS) --quiet --no-progress --ignore-engines\
+# * dependencies -- installs dependencies (go and npm modules)
-	--ignore-optional --ignore-platform --ignore-scripts
+# * ci -- installs dependencies, runs linters and tests, intended to be used by CI/CD
-RACE = 0
+#
-SIGN = 1
+# Building releases:
-VERBOSE = 0
+#
-VERSION = v0.0.0
+# * release -- builds AdGuard Home distros. CHANNEL must be specified (edge, release or beta).
-YARN = yarn
+# * release_and_sign -- builds AdGuard Home distros and signs the binary files.
-YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
+#   CHANNEL must be specified (edge, release or beta).
-YARN_INSTALL_FLAGS = $(YARN_FLAGS) --network-timeout 120000 --silent\
+# * sign -- Repacks all release archive files and signs the binary files inside them.
-	--ignore-engines --ignore-optional --ignore-platform\
+#   For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
-	--ignore-scripts
+#     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\
+GO := go
-	COMMIT='$(COMMIT)'\
+GOPATH := $(shell $(GO) env GOPATH)
-	CHANNEL='$(CHANNEL)'\
+PWD := $(shell pwd)
-	GPG_KEY='$(GPG_KEY)'\
+TARGET=AdGuardHome
-	GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
+BASE_URL="https://static.adguard.com/adguardhome/$(CHANNEL)"
-	DIST_DIR='$(DIST_DIR)'\
+GPG_KEY := devteam@adguard.com
-	GO="$(GO.MACRO)"\
+GPG_KEY_PASSPHRASE :=
-	GOPROXY='$(GOPROXY)'\
+GPG_CMD := gpg --detach-sig --default-key $(GPG_KEY) --pinentry-mode loopback --passphrase $(GPG_KEY_PASSPHRASE)
-	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
+VERBOSE := -v
-	RACE='$(RACE)'\
-	SIGN='$(SIGN)'\
-	VERBOSE='$(VERBOSE)'\
-	VERSION='$(VERSION)'\
 
-# Keep the line above blank.
+# See release target
+DIST_DIR=dist
 
-# Keep this target first, so that a naked make invocation triggers
+# Update channel. Can be release, beta or edge. Uses edge by default.
-# a full build.
+CHANNEL ?= edge
-build: deps quick-build
 
-quick-build: js-build go-build
+# Validate channel
+ifneq ($(CHANNEL),release)
+ifneq ($(CHANNEL),beta)
+ifneq ($(CHANNEL),edge)
+$(error CHANNEL value is not valid. Valid values are release,beta or edge)
+endif
+endif
+endif
 
-ci: deps test
+# Version history URL (see
+VERSION_HISTORY_URL="https://github.com/AdguardTeam/AdGuardHome/releases"
+ifeq ($(CHANNEL),edge)
+	VERSION_HISTORY_URL="https://github.com/AdguardTeam/AdGuardHome/commits/master"
+endif
+
+# goreleaser command depends on the $CHANNEL
+GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --snapshot --parallelism 1
+ifneq ($(CHANNEL),edge)
+	# If this is not an "edge" build, use normal release command
+	GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --parallelism 1
+endif
+
+# Version properties
+COMMIT=$(shell git rev-parse --short HEAD)
+# TODO(a.garipov): The cut call is a temporary solution to trim
+# prerelease versions.  See the comment in .goreleaser.yml.
+TAG_NAME=$(shell git describe --abbrev=0 | cut -c 1-8)
+RELEASE_VERSION=$(TAG_NAME)
+SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
+
+# Set proper version
+VERSION=
+ifeq ($(TAG_NAME),$(shell git describe --abbrev=4))
+	ifeq ($(CHANNEL),edge)
+		VERSION=$(SNAPSHOT_VERSION)
+	else
+		VERSION=$(RELEASE_VERSION)
+	endif
+else
+	VERSION=$(SNAPSHOT_VERSION)
+endif
+
+# Docker target parameters
+DOCKER_IMAGE_NAME ?= adguardhome-dev
+DOCKER_IMAGE_FULL_NAME = $(DOCKER_IMAGE_NAME):$(VERSION)
+DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le
+DOCKER_OUTPUT ?= type=image,name=$(DOCKER_IMAGE_NAME),push=false
+BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+# Docker tags (can be redefined)
+DOCKER_TAGS ?=
+ifndef DOCKER_TAGS
+	ifeq ($(CHANNEL),release)
+		DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):latest
+	endif
+	ifeq ($(CHANNEL),beta)
+		DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):beta
+	endif
+	ifeq ($(CHANNEL),edge)
+		# Don't set the version tag when pushing to "edge"
+		DOCKER_IMAGE_FULL_NAME := $(DOCKER_IMAGE_NAME):edge
+		# DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge
+	endif
+endif
+
+# Validate docker build arguments
+ifndef DOCKER_IMAGE_NAME
+$(error DOCKER_IMAGE_NAME value is not set)
+endif
+
+# OS-specific flags
+TEST_FLAGS := --race $(VERBOSE)
+ifeq ($(OS),Windows_NT)
+	TEST_FLAGS :=
+endif
+
+.PHONY: all build client client-watch docker lint lint-js lint-go test dependencies clean release docker-multi-arch
+all: build
+
+init:
+	git config core.hooksPath .githooks
+
+build: client_with_deps
+	$(GO) mod download
+	PATH=$(GOPATH)/bin:$(PATH) $(GO) generate ./...
+	CGO_ENABLED=0 $(GO) build -ldflags="-s -w -X main.version=$(VERSION) -X main.channel=$(CHANNEL) -X main.goarm=$(GOARM)"
+	PATH=$(GOPATH)/bin:$(PATH) packr clean
+
+client:
+	npm --prefix client run build-prod
+
+client_with_deps:
+	npm --prefix client ci
+	npm --prefix client run build-prod
+
+client-watch:
+	npm --prefix client run watch
+
+docker:
+	DOCKER_CLI_EXPERIMENTAL=enabled \
+	docker buildx build \
+	--build-arg VERSION=$(VERSION) \
+	--build-arg CHANNEL=$(CHANNEL) \
+	--build-arg VCS_REF=$(COMMIT) \
+	--build-arg BUILD_DATE=$(BUILD_DATE) \
+	$(DOCKER_TAGS) \
+	--load \
+	-t "$(DOCKER_IMAGE_NAME)" -f ./Dockerfile .
+
+	@echo Now you can run the docker image:
+	@echo docker run --name "adguard-home" -p 53:53/tcp -p 53:53/udp -p 80:80/tcp -p 443:443/tcp -p 853:853/tcp -p 3000:3000/tcp $(DOCKER_IMAGE_NAME)
 
-deps: js-deps go-deps
 lint: js-lint go-lint
+
+js-lint: dependencies
+	npm --prefix client run lint
+
+go-install-tools:
+	env GO=$(GO) sh ./scripts/go-install-tools.sh
+
+go-lint:
+	env GO=$(GO) PATH="$$PWD/bin:$$PATH" sh ./scripts/go-lint.sh
+
 test: js-test go-test
 
-# Here and below, keep $(SHELL) in quotes, because on Windows this will
+js-test:
-# expand to something like "C:/Program Files/Git/usr/bin/sh.exe".
+	npm run test --prefix client
-build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
 
-build-release: deps js-build
+go-test:
-	$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
+	$(GO) test $(TEST_FLAGS) --coverprofile coverage.txt ./...
 
-clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
+ci: client_with_deps
-init:  ; git config core.hooksPath ./scripts/hooks
+	$(GO) mod download
+	$(MAKE) test
 
-js-build:
+dependencies:
-	$(NPM) $(NPM_FLAGS) run build-prod
+	npm --prefix client ci
-	$(YARN) $(YARN_FLAGS) build
+	$(GO) mod download
-js-deps:
-	$(NPM) $(NPM_INSTALL_FLAGS) ci
-	$(YARN) $(YARN_INSTALL_FLAGS) install
 
-# TODO(a.garipov): Remove the legacy client tasks support once the new
+clean:
-# client is done and the old one is removed.
+	rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt
-js-lint: ; $(NPM) $(NPM_FLAGS) run lint
+	rm -f -r ./build/ ./client/node_modules/ ./data/ ./$(DIST_DIR)/
-js-test: ; $(NPM) $(NPM_FLAGS) run test
+# Set the GOPATH explicitly in case make clean is called from under sudo
-js-beta-lint: ; $(YARN) $(YARN_FLAGS) lint
+# after a Docker build.
-js-beta-test: ; # TODO(v.abdulmyanov): Add tests for the new client.
+	env PATH="$(GOPATH)/bin:$$PATH" packr clean
+	rm -f -r ./bin/
 
-go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
+docker-multi-arch:
-go-deps:  ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
+	DOCKER_CLI_EXPERIMENTAL=enabled \
-go-lint:  ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
+	docker buildx build \
-go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
+	--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 .
 
-# TODO(a.garipov): Think about making RACE='1' the default for all
+	@echo If the image was pushed to the registry, you can now run it:
-# targets.
+	@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)
-go-test:  ; $(ENV) RACE='1' "$(SHELL)" ./scripts/make/go-test.sh
 
-go-check: go-tools go-lint go-test
+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
 
-# A quick check to make sure that all supported operating systems can be
+release_and_sign: client_with_deps
-# typechecked and built successfully.
+	$(MAKE) release
-go-os-check:
+	$(call repack_dist)
-	env GOOS='darwin'  "$(GO.MACRO)" vet ./internal/...
-	env GOOS='freebsd' "$(GO.MACRO)" vet ./internal/...
-	env GOOS='linux'   "$(GO.MACRO)" vet ./internal/...
-	env GOOS='windows' "$(GO.MACRO)" vet ./internal/...
 
-openapi-lint: ; cd ./openapi/ && $(YARN) test
+sign:
-openapi-show: ; cd ./openapi/ && $(YARN) start
+	$(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,7 +58,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
     * [Reporting issues](#reporting-issues)
     * [Help with translations](#translate)
     * [Other](#help-other)
-* [Projects that use AdGuard Home](#uses)
+* [Projects that use AdGuardHome](#uses)
 * [Acknowledgments](#acknowledgments)
 * [Privacy](#privacy)
 
@@ -87,21 +87,12 @@ If you're running **Linux**, there's a secure and easy way to install AdGuard Ho
 
 ### Guides
 
-* [Getting Started](https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started)
+* [FAQ](https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ)
-    * [FAQ](https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ)
+* [Configuration](https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration)
-    * [How to Write Hosts Blocklists](https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists)
+* [AdGuard Home as a DNS-over-HTTPS or DNS-over-TLS server](https://github.com/AdguardTeam/AdGuardHome/wiki/Encryption)
-    * [Comparing AdGuard Home to Other Solutions](https://github.com/AdguardTeam/AdGuardHome/wiki/Comparison)
+* [How to install and run AdGuard Home on Raspberry Pi](https://github.com/AdguardTeam/AdGuardHome/wiki/Raspberry-Pi)
-* Configuring AdGuard
+* [How to install and run AdGuard Home on a Virtual Private Server](https://github.com/AdguardTeam/AdGuardHome/wiki/VPS)
-    * [Configuration](https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration)
+* [How to write your own hosts blocklists properly](https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists)
-    * [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)
 
 ### API
 
@@ -132,21 +123,20 @@ AdGuard Home provides a lot of features out-of-the-box with no need to install a
 
 > Disclaimer: some of the listed features can be added to Pi-Hole by installing additional software or by manually using SSH terminal and reconfiguring one of the utilities Pi-Hole consists of. However, in our opinion, this cannot be legitimately counted as a Pi-Hole's feature.
 
-| Feature                                                                 | AdGuard Home | Pi-Hole                                                   |
+| Feature                                                                 | AdGuard Home | Pi-Hole                                                |
-|-------------------------------------------------------------------------|-------------------|-----------------------------------------------------------|
+|-------------------------------------------------------------------------|--------------|--------------------------------------------------------|
-| Blocking ads and trackers                                               | ✅                | ✅                                                        |
+| Blocking ads and trackers                                               | ✅            | ✅                                                      |
-| Customizing blocklists                                                  | ✅                | ✅                                                        |
+| Customizing blocklists                                                  | ✅            | ✅                                                      |
-| Built-in DHCP server                                                    | ✅                | ✅                                                        |
+| Built-in DHCP server                                                    | ✅            | ✅                                                      |
-| HTTPS for the Admin interface                                           | ✅                | Kind of, but you'll need to manually configure lighthttpd |
+| 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)                         |
+| Encrypted DNS upstream servers (DNS-over-HTTPS, DNS-over-TLS, DNSCrypt) | ✅            | ❌ (requires additional software)                       |
-| Cross-platform                                                          | ✅                | ❌ (not natively, only via Docker)                        |
+| Cross-platform                                                          | ✅            | ❌ (not natively, only via Docker)                      |
-| Running as a DNS-over-HTTPS or DNS-over-TLS server                      | ✅                | ❌ (requires additional software)                         |
+| Running as a DNS-over-HTTPS or DNS-over-TLS server                      | ✅            | ❌ (requires additional software)                       |
-| Blocking phishing and malware domains                                   | ✅                | ❌ (requires non-default blocklists)                      |
+| Blocking phishing and malware domains                                   | ✅            | ❌ (requires non-default blocklists)                    |
-| Parental control (blocking adult domains)                               | ✅                | ❌                                                        |
+| Parental control (blocking adult domains)                               | ✅            | ❌                                                      |
-| Force Safe search on search engines                                     | ✅                | ❌                                                        |
+| Force Safe search on search engines                                     | ✅            | ❌                                                      |
-| Per-client (device) configuration                                       | ✅                | ✅                                                        |
+| Per-client (device) configuration                                       | ✅            | ✅                                                      |
-| Access settings (choose who can use AGH DNS)                            | ✅                | ❌                                                        |
+| Access settings (choose who can use AGH DNS)                            | ✅            | ❌                                                      |
-| Running [without root privileges](https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser)                                         | ✅                | ❌                                                        |
 
 <a id="comparison-adblock"></a>
 ### How does AdGuard Home compare to traditional ad blockers
@@ -155,7 +145,7 @@ It depends.
 
 "DNS sinkholing" is capable of blocking a big percentage of ads, but it lacks flexibility and power of traditional ad blockers. You can get a good impression about the difference between these methods by reading [this article](https://adguard.com/en/blog/adguard-vs-adaway-dns66/). It compares AdGuard for Android (a traditional ad blocker) to hosts-level ad blockers (which are almost identical to DNS-based blockers in their capabilities).
 
-However, this level of protection is enough for some users. Additionally, using a DNS-based blocker can help to block ads, tracking and analytics requests on other types of devices, such as SmartTVs, smart speakers or other kinds of IoT devices (on which you can't install traditional ad blockers).
+However, this level of protection is enough for some users. Additionally, using a DNS-based blocker can help to block ads, tracking and analytics requests on other types of devices, such as SmartTVs, smart speakers or other kinds of IoT devices (on which you can't install tradtional ad blockers).
 
 **Known limitations**
 
@@ -177,10 +167,9 @@ Run `make init` to prepare the development environment.
 
 You will need this to build AdGuard Home:
 
- * [go](https://golang.org/dl/) v1.15 or later.
+ * [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).
+ * [npm](https://www.npmjs.com/) v6.14 or later.
- * [yarn](https://yarnpkg.com/) v1.22.5 or later.
 
 ### Building
 
@@ -192,12 +181,6 @@ cd AdGuardHome
 make
 ```
 
-Please note, that the non-standard `-j` flag is currently not supported, so
-building with `make -j 4` or setting your `MAKEFLAGS` to include, for example,
-`-j 4` is likely to break the build.  If you do have your `MAKEFLAGS` set to
-that, and you don't want to change it, you can override it by running
-`make -j 1`.
-
 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.
@@ -205,28 +188,26 @@ In order to do this, specify `GOOS` and `GOARCH` env variables before running ma
 
 For example:
 ```
-env GOOS='linux' GOARCH='arm64' make
+GOOS=linux GOARCH=arm64 make
-```
-Or:
-```
-make GOOS='linux' GOARCH='arm64'
 ```
 
 #### Preparing release
 
 You'll need this to prepare a release build:
 
+* [goreleaser](https://goreleaser.com/)
 * [snapcraft](https://snapcraft.io/)
 
 Commands:
 
-```
+* `make release` - builds a snapshot build (CHANNEL=edge)
-make build-release CHANNEL='...' VERSION='...'
+* `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.
 
@@ -274,7 +255,7 @@ curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scrip
 
 * Beta channel builds
     * Linux: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_386.tar.gz)
-    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi), [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz)
+    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz) (recommended for Rapsberry Pi), [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz)
     * Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64le_softfloat.tar.gz)
     * Windows: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_386.zip)
     * MacOS: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_386.zip)
@@ -283,7 +264,7 @@ curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scrip
 
 * Edge channel builds
     * Linux: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_386.tar.gz)
-    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi), [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv7.tar.gz)
+    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv6.tar.gz) (recommended for Rapsberry Pi), [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv7.tar.gz)
     * Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64le_softfloat.tar.gz)
     * Windows: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_386.zip)
     * MacOS: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_386.zip)
@@ -309,20 +290,17 @@ Here is a link to AdGuard Home project: https://crowdin.com/project/adguard-appl
 Here's what you can also do to contribute:
 
 1. [Look for issues](https://github.com/AdguardTeam/AdGuardHome/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22+) marked as "help wanted".
-2. Actualize the list of *Blocked services*. It it can be found in [dnsfilter/blocked.go](https://github.com/AdguardTeam/AdGuardHome/blob/master/internal/dnsfilter/blocked.go).
+2. Actualize the list of *Blocked services*. It it can be found in [dnsfilter/blocked_services.go](https://github.com/AdguardTeam/AdGuardHome/blob/master/internal/dnsfilter/blocked_services.go).
 3. Actualize the list of known *trackers*. It it can be found in [client/src/helpers/trackers/adguard.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/trackers/adguard.json).
 4. Actualize the list of vetted *blocklists*. It it can be found in [client/src/helpers/filters/filters.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/filters/filters.json).
 
 <a id="uses"></a>
-## Projects that use AdGuard Home
+## Projects that use AdGuardHome
+
+* Python library (https://github.com/frenck/python-adguardhome)
+* Hass.io add-on (https://github.com/hassio-addons/addon-adguard-home)
+* OpenWrt LUCI app (https://github.com/rufengsuixing/luci-app-adguardhome)
 
-* [AdGuard Home Remote](https://apps.apple.com/app/apple-store/id1543143740) - iOS app by [Joost](https://rocketscience-it.nl/)
-* [Python library](https://github.com/frenck/python-adguardhome) by [@frenck](https://github.com/frenck)
-* [Home Assistant add-on](https://github.com/hassio-addons/addon-adguard-home) by [@frenck](https://github.com/frenck)
-* [OpenWrt LUCI app](https://github.com/kongfl888/luci-app-adguardhome) by [@kongfl888](https://github.com/kongfl888) (originally by [@rufengsuixing](https://github.com/rufengsuixing))
-* [Prometheus exporter for AdGuard Home](https://github.com/ebrianne/adguard-exporter) by [@ebrianne](https://github.com/ebrianne)
-* [AdGuard Home on GLInet routers](https://forum.gl-inet.com/t/adguardhome-on-gl-routers/10664) by [Gl-Inet](https://gl-inet.com/)
-* [Cloudron app](https://git.cloudron.io/cloudron/adguard-home-app) by [@gramakri](https://github.com/gramakri)
 
 <a id="acknowledgments"></a>
 ## Acknowledgments
@@ -343,7 +321,7 @@ This software wouldn't have been possible without:
    * And many more node.js packages.
  * [whotracks.me data](https://github.com/cliqz-oss/whotracks.me)
 
-You might have seen that [CoreDNS](https://coredns.io) was mentioned here before — we've stopped using it in AdGuard Home. While we still use it on our servers for [AdGuard DNS](https://adguard.com/adguard-dns/overview.html) service, it seemed like an overkill for Home as it impeded with Home features that we plan to implement.
+You might have seen that [CoreDNS](https://coredns.io) was mentioned here before — we've stopped using it in AdGuardHome. While we still use it on our servers for [AdGuard DNS](https://adguard.com/adguard-dns/overview.html) service, it seemed like an overkill for Home as it impeded with Home features that we plan to implement.
 
 For a full list of all node.js packages in use, please take a look at [client/package.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/package.json) file.
 

bamboo-specs/bamboo.yaml

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

bamboo-specs/release.yaml

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

bamboo-specs/test.yaml

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

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

@@ -8,11 +8,6 @@
     "load_balancing_desc": "Запытвайце па адным серверы за раз. AdGuard Home будзе выкарыстоўваць выпадковы алгарытм для выбару сервера, так што самы хуткі сервер будзе выкарыстоўвацца часцей.",
     "bootstrap_dns": "Bootstrap DNS-серверы",
     "bootstrap_dns_desc": "Bootstrap DNS-серверы выкарыстоўваюцца для пошуку IP-адрасоў DoH/DoT сервераў, якія вы паказалі.",
-    "local_ptr_title": "Прыватныя DNS-серверы",
-    "local_ptr_desc": "DNS-сервер ці серверы, якія AdGuard Home будзе выкарыстоўваць для запытаў на лакальныя рэсурсы. Напрыклад, гэтыя серверы будуць выкарыстоўвацца, каб атрымаць даменавыя імёны кліентаў у прыватных сетках. Калі спіс пусты, AdGuard Home будзе выкарыстоўваць сістэмны DNS-сервер па змаўчанні.",
-    "local_ptr_placeholder": "Увядзіце па адным адрасе на радок",
-    "resolve_clients_title": "Уключыць запытванне даменавых імёнаў для кліентаў",
-    "resolve_clients_desc": "AdGuard Home будзе спрабаваць аўтаматычна вызначыць даменавыя імёны кліентаў праз PTR-запыты да адпаведных сервераў (прыватны DNS-сервер для лакальных кліентаў, upstream-серверы для кліентаў з публічным IP-адрасам).",
     "check_dhcp_servers": "Праверыць DHCP-серверы",
     "save_config": "Захаваць канфігурацыю",
     "enabled_dhcp": "DHCP-сервер улучаны",
@@ -37,8 +32,6 @@
     "form_error_ip_format": "Няслушны фармат IP-адраса",
     "form_error_mac_format": "Некарэктны фармат MAC",
     "form_error_client_id_format": "Няслушны фармат ID кліента",
-    "form_error_server_name": "Няслушнае імя сервера",
-    "form_error_subnet": "Падсетка «{{cidr}}» не ўтрымвае IP-адраса «{{ip}}»",
     "form_error_positive": "Павінна быць больш 0",
     "form_error_negative": "Павінна быць не менш 0",
     "range_end_error": "Павінен перавышаць пачатак дыяпазону",
@@ -254,16 +247,8 @@
     "custom_ip": "Свой IP",
     "blocking_ipv4": "Блакаванне IPv4",
     "blocking_ipv6": "Блакаванне IPv6",
-    "dnscrypt": "DNSCrypt",
     "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": "Ограничение скорости",
@@ -282,7 +267,7 @@
     "source_label": "Крыніца",
     "found_in_known_domain_db": "Знойдзены ў базе вядомых даменаў.",
     "category_label": "Катэгорыя",
-    "rule_label": "Правіла(ы)",
+    "rule_label": "Правіла",
     "list_label": "Спіс",
     "unknown_filter": "Невядомы фільтр {{filterId}}",
     "known_tracker": "Вядомы трэкер",
@@ -311,7 +296,7 @@
     "install_devices_router": "Роўтар",
     "install_devices_router_desc": "Такая наладка аўтаматычна пакрые ўсе прылады, што выкарыстоўваюць ваш хатні роўтар, і вам не трэба будзе наладжваць кожнае з іх у асобнасці.",
     "install_devices_address": "DNS-сервер AdGuard Home даступны па наступных адрасах",
-    "install_devices_router_list_1": "Адкрыйце налады вашага роўтара. Звычайна вы можаце адкрыць іх у вашым браўзары, напрыклад, http://192.168.0.1/ ці http://192.168.1.1/. Вас могуць папрасіць увесці пароль. Калі вы не помніце яго, пароль часта можна скінуць, націснуўшы на кнопку на самым роўтары. Некаторыя роўтары патрабуюць адмысловага дадатку, які ў гэтым выпадку павінен быць ужо ўсталявана на ваш кампутар ці тэлефон.",
+    "install_devices_router_list_1": "Адкрыйце налады вашага рутара. Звычайна вы можаце адкрыць іх у вашым браўзары (напрыклад, http://192.168.0.1/ ці http://192.168.1.1/). Вас могуць папрасіць увесці пароль. Калі вы не помніце яго, пароль часта можна скінуць, націснуўшы на кнопку на самым роўтары. Некаторыя роўтары патрабуюць адмысловага дадатку, які ў гэтым выпадку павінен быць ужо ўсталявана на ваш кампутар ці тэлефон.",
     "install_devices_router_list_2": "Знайдзіце налады DHCP ці DNS. Знайдзіце літары \"DNS\" поруч з тэкставым полем, у якое можна ўвесці два ці тры шэрагі лічбаў, падзеленых на 4 групы ад адной до трох лічбаў.",
     "install_devices_router_list_3": "Увядзіце туды адрас вашага AdGuard Home.",
     "install_devices_router_list_4": "Вы не можаце ўсталяваць уласны DNS-сервер на некаторых тыпах маршрутызатараў. У гэтым выпадку можа дапамагчы налада AdGuard Home у якасці <a href='#dhcp'>DHCP-сервера</a>. У адваротным выпадку вам трэба звярнуцца да кіраўніцтва па наладзе DNS-сервераў для вашай пэўнай мадэлі маршрутызатара.",
@@ -401,7 +386,6 @@
     "ip_address": "IP-адрас",
     "client_identifier_desc": "Кліенты могуць быць ідэнтыфікаваны па IP-адрасе, CIDR ці MAC-адрасу. Звярніце ўвагу, што выкарыстанне MAC як ідэнтыфікатара магчыма, толькі калі AdGuard Home таксама з'яўляецца і <0>DHCP-серверам</0>",
     "form_enter_ip": "Увядзіце IP",
-    "form_enter_subnet_ip": "Увядзіце IP-адрас у падсеткі «{{cidr}}»",
     "form_enter_mac": "Увядзіце MAC",
     "form_enter_id": "Увядзіце ідэнтыфікатар",
     "form_add_id": "Дадаць ідэнтыфікатар",
@@ -432,7 +416,6 @@
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Ужывайце радок <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Ужывайце радок <1>{{address}}</1>.",
     "setup_dns_privacy_3": "<0>Вось спіс ПА, якое вы можаце выкарыстоўваць.</0>",
-    "setup_dns_privacy_4": "На прыладах з iOS 14 і macOS Big Sur вы можаце спампаваць адмысловы файл '.mobileconfig', які дадае <highlight>DNS-over-HTTPS</highlight> ці <highlight>DNS-over-TLS</highlight> серверы ў налады DNS.",
     "setup_dns_privacy_android_1": "Android 9 натыўна падтрымвае DNS-over-TLS. Для налады, перайдзіце ў Налады → Сеціва і Інтэрнэт → Дадаткова → Персанальны DNS сервер, і ўвядзіце туды ваша даменавае імя.",
     "setup_dns_privacy_android_2": "<0>AdGuard для Android</0> падтрымвае <1>DNS-over-HTTPS</1> і <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> дадае падтрымка <1>DNS-over-HTTPS</1> на Android.",
@@ -444,7 +427,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}}\" паспяхова выдалена",
@@ -544,6 +526,7 @@
     "check_ip": "IP-адрасы: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Прычына: {{reason}}",
+    "check_rule": "Правіла: {{rule}}",
     "check_service": "Назва сэрвісу: {{service}}",
     "service_name": "Назва сэрвіса",
     "check_not_found": "Не знойдзена ў вашым спісе фільтраў",
@@ -601,4 +584,4 @@
     "adg_will_drop_dns_queries": "AdGuard Home скіне ўсе DNS-запыты ад гэтага кліента.",
     "client_not_in_allowed_clients": "Кліент не дазволены, бо яго няма ў спісе \"Дазволеных кліентаў\".",
     "experimental": "Эксперыментальны"
-}
+}

client/src/__locales/bg.json

@@ -1,14 +1,17 @@
 {
     "check_dhcp_servers": "Проверка за активен DHCP сървър",
+    "save_config": "Запиши настройките",
     "enabled_dhcp": "DHCP е разрешен",
     "disabled_dhcp": "DHCP е забранен",
     "dhcp_title": "DHCP сървър (тестови!)",
     "dhcp_description": "Ако рутера ви не раздава DHCP адреси, може да използвате вградения в AdGuard DHCP сървър.",
     "dhcp_enable": "Рзреши DHCP сървъра",
     "dhcp_disable": "Забрани DHCP сървъра",
+    "dhcp_not_found": "Вашата мрежа няма активен DHCP сървър. Безопасно е ползването на вградения DHCP сървър.",
     "dhcp_found": "Вашата мрежа вече има активен DHCP сървър. Не е безопасно ползването на втори!",
     "dhcp_leases": "DHCP раздадени адреси",
     "dhcp_leases_not_found": "Няма намерени активни DHCP адреси",
+    "dhcp_config_saved": "Запиши конфигурацията на DHCP сървъра",
     "form_error_required": "Задължително поле",
     "form_error_ip_format": "Невалиден IPv4 адрес",
     "form_error_positive": "Проверете дали е положително число",
@@ -24,6 +27,7 @@
     "dhcp_ip_addresses": "IP адреси",
     "dhcp_table_hostname": "Име на устройство",
     "dhcp_table_expires": "История",
+    "dhcp_warning": "Ако искате да използвате вградения DHCP сървър, трябва да няма друг активен DHCP в мрежата Ви!",
     "city": "Град",
     "response_details": "Подробности за отговора",
     "request_details": "Поискайте подробности",
@@ -58,7 +62,12 @@
     "top_clients": "Най-активни IP адреси",
     "no_clients_found": "Нямa намерени адреси",
     "general_statistics": "Обща статисика",
+    "number_of_dns_query_24_hours": "Сума на DNS заявки за последните 24 часа",
+    "number_of_dns_query_blocked_24_hours": "Сума на блокирани DNS заявки от филтрите за реклама и местни",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Сума на блокирани DNS заявки от AdGuard свързани със сигурността",
+    "number_of_dns_query_blocked_24_hours_adult": "Сума на блокирани сайтове за възрастни",
     "enforced_save_search": "Активирано Безопасно Търсене",
+    "number_of_dns_query_to_safe_search": "Сума на DNS заявки при който е приложено Безопасно Търсене",
     "average_processing_time": "Средно време за обработка",
     "average_processing_time_hint": "Средно време за обработка на DNS заявки в милисекунди",
     "block_domain_use_filters_and_hosts": "Блокирани домейни - общи и местни филтри",
@@ -68,6 +77,7 @@
     "use_adguard_parental": "Включи AdGuard Родителски Надзор",
     "use_adguard_parental_hint": "Модул XXX в AdGuard Home ще провери дали страницата има материали за възвъстни. Използва се същия API за анонимност като при модула за Сигурност.",
     "enforce_safe_search": "Включи Безопасно Търсене",
+    "enforce_save_search_hint": "AdGuard Home прилага Безопасно Търсене в следните търсачки и сайтове: Google, Youtube, Bing, и Yandex.",
     "no_servers_specified": "Няма избрани услуги",
     "general_settings": "Общи настройки",
     "upstream_dns": "Главен DNS сървър",
@@ -134,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 ниво. Създадено е за да ви даде пълен контрол над мрежата и всичките ви устройства, без да е необходимо допълнително инсталиране на друг софтуер.",
@@ -141,6 +152,7 @@
     "install_settings_listen": "Активни интерфейси",
     "install_settings_port": "Порт",
     "install_settings_interface_link": "Вашата AdGuard Home страница за администрация ще е достъпна на този адрес:",
+    "form_error_port": "Моля въведете валиден порт",
     "install_settings_dns": "DNS сървър",
     "install_settings_dns_desc": "За да работи, ще трябва да настроите вашият рутер или устройства да ползват DNS сървър с адрес:",
     "install_settings_all_interfaces": "Всички интерфейси",
@@ -159,6 +171,7 @@
     "install_devices_router": "Рутер",
     "install_devices_router_desc": "Ако настроите вашият рутер няма нужда ръчно да настройвате всяко едно от устрйствата в мрежата.",
     "install_devices_address": "AdGuard Home DNS сървърът е на следния адрес",
+    "install_devices_router_list_1": "Отворете страницата за настройки на вашия рутер. Обикновено тя се намира на URL (тук http://192.168.0.1/ или тук http://192.168.1.1/). За достъп може да ви трябва парола. Ако сте забравили паролата може да я ресетнете като натиснета скрития ресет бутон - внимание това ще ресетне всички настройки на рутера до фабрични! Някой рутери могат да бъдате администрирани от софтуер или приложение, който би трябвало да е вече инсталиран на компютъра/телефона ви.",
     "install_devices_router_list_2": "Намерета DHCP/DNS настройки. В под раздел DHCP рзгледайте и намерете къде е полето за DNS настройка в което може да въведете персонализирани настройки за DNS сървъри.",
     "install_devices_router_list_3": "Въведете адресът на AdGuard Home сървъра.",
     "install_devices_windows_list_1": "Отворете Контролния Панел през Старт меню или чрез функция търсене на Windows.",
@@ -186,8 +199,10 @@
     "install_saved": "Успешно записано",
     "encryption_title": "Криптиране",
     "encryption_desc": "Подържа се сигурна връзка (HTTPS/TLS) включително за DNS и страницата за администрация",
+    "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 порт",
@@ -213,11 +228,13 @@
     "encryption_reset": "Сигурни ли сте че искате да изтриете настройките за криптиране?",
     "topline_expiring_certificate": "Вашият SSL сертификат изтича. Обнови <0>Настройки за криптиране</0>.",
     "topline_expired_certificate": "Вашият SSL сертификат е изтекъл. Обнови <0>Настройки за криптиране</0>.",
+    "form_error_port_range": "Въведете порт в диапазона 80-65535",
     "form_error_port_unsafe": "Не е безопасно да използвате този порт",
+    "form_error_equal": "Не трябва да съвпада",
     "form_error_password": "Паролата не съвпада",
     "reset_settings": "Изтрий всички настройки",
     "update_announcement": "Има нова AdGuard Home {{version}}! <0>Цъкни тук</0> за повече информация.",
     "disable_ipv6": "Изключете IPv6 протокола",
     "show_blocked_responses": "Блокирано",
     "port_53_faq_link": "Порт 53 често е зает от \"DNSStubListener\" или \"systemd-resolved\" услуги. Моля, прочетете <0>тази инструкция</0> как да решите това."
-}
+}

client/src/__locales/cs.json

@@ -1,18 +1,13 @@
 {
     "client_settings": "Nastavení klienta",
-    "example_upstream_reserved": "Můžete zadat odchozí DNS připojení <0>pro konkrétní doménu(y)</0>",
+    "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.",
+    "upstream_parallel": "Použijte paralelní požadavky na urychlení řešení simultánním dotazováním na všechny navazující servery",
     "parallel_requests": "Paralelní požadavky",
     "load_balancing": "Optimalizace vytížení",
-    "load_balancing_desc": "Optimalizovaný dotaz na odchozí server. AdGuard Home použije vážený náhodný algoritmus k výběru serveru, takže nejrychlejší server je používán častěji.",
+    "load_balancing_desc": "Optimalizovaný dotaz na server. AdGuard Home použije vážený náhodný algoritmus k výběru serveru, takže nejrychlejší server bude používán častěji.",
     "bootstrap_dns": "Bootstrap DNS servery",
     "bootstrap_dns_desc": "Servery Bootstrap DNS se používají k řešení IP adres DoH/DoT, které zadáváte jako upstreamy.",
-    "local_ptr_title": "Soukromé DNS servery",
-    "local_ptr_desc": "Servery DNS, které AdGuard Home používá pro lokální dotazy PTR. Tyto servery se používají k rozlišení názvů hostitelů klientů se soukromými adresami IP, například \"192.168.12.34\" pomocí rDNS. Pokud není nastaveno, AdGuard Home automaticky použije výchozí řešitele vašeho OS.",
-    "local_ptr_placeholder": "Zadejte jednu adresu serveru na řádek",
-    "resolve_clients_title": "Povolit zpětné řešení IP adres klientů",
-    "resolve_clients_desc": "Pokud je povoleno, AdGuard Home se pokusí obráceně vyřešit IP adresy klientů na jejich názvy hostitelů zasláním dotazů PTR příslušným řešitelům (soukromé DNS servery pro místní klienty, odchozí server pro klienty s veřejnou IP adresou).",
     "check_dhcp_servers": "Zkontrolovat DHCP servery",
     "save_config": "Uložit konfiguraci",
     "enabled_dhcp": "DHCP server zapnutý",
@@ -28,7 +23,7 @@
     "dhcp_leases": "Pronájem DHCP",
     "dhcp_static_leases": "Statické pronájmy DHCP",
     "dhcp_leases_not_found": "Nebyly nalezeny žádné pronájmy DHCP",
-    "dhcp_config_saved": "Konfigurace DHCP byla úspěšně uložena",
+    "dhcp_config_saved": "Konfigurace DHCP serveru byla uložena",
     "dhcp_ipv4_settings": "Nastavení DHCP IPv4",
     "dhcp_ipv6_settings": "Nastavení DHCP IPv6",
     "form_error_required": "Povinné pole",
@@ -37,8 +32,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_subnet": "Podsíť \"{{cidr}}\" neobsahuje IP adresu \"{{ip}}\"",
     "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",
@@ -55,10 +48,10 @@
     "ip": "IP adresa",
     "dhcp_table_hostname": "Název hostitele",
     "dhcp_table_expires": "Vyprší",
-    "dhcp_warning": "Pokud přesto chcete server DHCP povolit, ujistěte se, že ve Vaší síti není žádný jiný aktivní server DHCP, protože by to mohlo narušit připojení k Internetu pro zařízení v síti!",
+    "dhcp_warning": "Pokud chcete server DHCP povolit, ujistěte se, že ve Vaší síti není žádný aktivní server DHCP. V opačném případě může dojít k přerušení internetu pro připojená zařízení!",
-    "dhcp_error": "AdGuard Home nemohl určit, zda je v síti jiný aktivní server DHCP.",
+    "dhcp_error": "Nebylo možné určit, zda je v síti jiný server DHCP.",
-    "dhcp_static_ip_error": "Pro použití serveru DHCP musí být nastavena statická IP adresa. AdGuard Home nemohl zjistit, zda je toto síťové rozhraní nakonfigurováno pomocí statické adresy IP. Nastavte prosím statickou IP adresu ručně.",
+    "dhcp_static_ip_error": "Pro použití serveru DHCP musí být nastavena statická IP adresa. Nepodařilo se zjistit, zda je toto síťové rozhraní nakonfigurováno pomocí statické adresy IP. Nastavte prosím statickou IP adresu ručně.",
-    "dhcp_dynamic_ip_found": "Váš systém používá konfiguraci dynamické IP adresy pro rozhraní <0>{{interfaceName}}</0>. Pro použití serveru DHCP musí být nastavena statická IP adresa. Vaše aktuální IP adresa je <0>{{ipAddress}}</0>. AdGuard Home automaticky nastaví tuto IP adresu jako statickou, pokud stisknete tlačítko \"Zapnout DHCP server\".",
+    "dhcp_dynamic_ip_found": "Váš systém používá konfiguraci dynamické IP adresy pro rozhraní <0>{{interfaceName}}</0>. Pro použití serveru DHCP musí být nastavena statická IP adresa. Vaše aktuální IP adresa je <0>{{ipAddress}}</0>. Automaticky nastavíme tuto IP adresu jako statickou, pokud stisknete tlačítko Zapnout DHCP.",
     "dhcp_lease_added": "Statický pronájem \"{{key}}\" byl úspěšně přidán",
     "dhcp_lease_deleted": "Statický pronájem \"{{key}}\" byl úspěšně odstraněn",
     "dhcp_new_static_lease": "Nový statický pronájem",
@@ -111,7 +104,7 @@
     "top_clients": "Nejčastější klienti",
     "no_clients_found": "Nenalezeny žádní klienti",
     "general_statistics": "Obecné statistiky",
-    "number_of_dns_query_days": "Počet DNS dotazů zpracovaných za posledních {{count}} den",
+    "number_of_dns_query_days": "Počet DNS dotazů zpracovaných za posledních {{count}} dní",
     "number_of_dns_query_days_plural": "Počet DNS dotazů zpracovaných za posledních {{count}} dní",
     "number_of_dns_query_24_hours": "Počet DNS dotazů zpracovaných za posledních 24 hodin",
     "number_of_dns_query_blocked_24_hours": "Počet požadavků DNS zablokovaných filtrem reklam a seznamy blokování hostitelů",
@@ -140,7 +133,7 @@
     "encryption_settings": "Nastavení šifrování",
     "dhcp_settings": "Nastavení DHCP",
     "upstream_dns": "Odchozí DNS servery",
-    "upstream_dns_help": "Zadejte adresu serveru, jedno připojení na řádek. <a>Zjistěte více</a> o konfiguraci odchozích DNS serverů.",
+    "upstream_dns_help": "Zadejte adresy serverů, jedno připojení na řádek. <a>Zjistěte více</a> o konfiguraci odchozích DNS serverů.",
     "upstream_dns_configured_in_file": "Konfigurováno v {{path}}",
     "test_upstream_btn": "Test upstreamů",
     "upstreams": "Odesláno",
@@ -254,16 +247,10 @@
     "custom_ip": "Vlastní IP",
     "blocking_ipv4": "Blokování IPv4",
     "blocking_ipv6": "Blokování IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
@@ -282,7 +269,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č",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Síťové rozhraní",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Vaše administrátorské webové rozhraní AdGuard Home bude k dispozici na těchto adresách:",
-    "form_error_port": "Zadejte platné číslo portu",
+    "form_error_port": "Zadejte platnou hodnotu portu",
     "install_settings_dns": "DNS server",
     "install_settings_dns_desc": "Budete muset nakonfigurovat Vaše zařízení nebo router, aby používali DNS server na následujících adresách:",
     "install_settings_all_interfaces": "Všechna rozhraní",
@@ -311,10 +298,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Toto nastavení automaticky pokryje všechna zařízení připojená k Vašemu domácímu routeru a nebudete je muset konfigurovat ručně.",
     "install_devices_address": "DNS server AdGuard Home používá následujíce adresy",
-    "install_devices_router_list_1": "Otevřete předvolby pro router. Obvykle k němu můžete přistupovat z prohlížeče prostřednictvím adresy URL, např. http://192.168.0.1/ nebo http://192.168.1.1/. Můžete být vyzváni k zadání hesla. Pokud si ho nepamatujete, můžete heslo resetovat stisknutím tlačítka na samotném routeru, ale mějte na paměti, že pokud zvolíte tento postup, pravděpodobně ztratíte celou konfiguraci routeru. Pokud váš router vyžaduje k nastavení aplikaci, nainstalujte si ji do telefonu nebo počítače a použijte ji pro přístup k nastavení routeru.",
+    "install_devices_router_list_1": "Otevřete předvolby pro router. Obvykle k němu můžete přistupovat z prohlížeče prostřednictvím adresy URL (např. http://192.168.0.1/ nebo http://192.168.1.1/). Můžete být vyzváni k zadání hesla. Pokud si ho nepamatujete, můžete heslo resetovat stisknutím tlačítka na samotném routeru. Některé routery vyžadují specifickou aplikaci, která by v takovém případě měla být již nainstalována v počítači/telefonu.",
     "install_devices_router_list_2": "Vyhledejte nastavení DHCP/DNS. Hledejte zkratku DNS vedle pole, které umožňuje vložit dvě nebo tři sady čísel, každé rozděleno do čtyř skupin s jedním až třemi číslicemi.",
     "install_devices_router_list_3": "Zadejte adresy Vašeho serveru AdGuard Home.",
-    "install_devices_router_list_4": "Na některých typech routerů nemůžete nastavit vlastní DNS server. V tomto případě může AdGuard Home pomoci, pokud jej nastavíte jako <0>DHCP server</0>. V ostatních případech byste si v manuálu k Vašemu routeru měli zjistit, jak přizpůsobit vlastní DNS servery.",
+    "install_devices_router_list_4": "Na některých typech routerů nemůžete nastavit vlastní DNS server. V tomto případě může AdGuard Home pomoci, pokud jej nastavíte jako <0>DHCP server</0>. V ostatních případech byste si v manuálu k Vašemu routeru měli zjistit, jak nastavit vlastní DNS servery.",
     "install_devices_windows_list_1": "Otevřete ovládací panel prostřednictvím nabídky Start nebo vyhledání v systému Windows.",
     "install_devices_windows_list_2": "Přejděte na kategorii Síť a Internet a poté na Centrum sítí a sdílení.",
     "install_devices_windows_list_3": "Na levé straně obrazovky najděte možnost Změnit nastavení adaptéru a klepněte na něj.",
@@ -343,7 +330,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",
@@ -371,9 +358,9 @@
     "encryption_reset": "Opravdu chcete obnovit nastavení šifrování?",
     "topline_expiring_certificate": "Váš SSL certifikát brzy vyprší. Aktualizujte <0>Nastavení šifrování</0>.",
     "topline_expired_certificate": "Váš SSL certifikát vypršel. Aktualizujte <0>Nastavení šifrování</0>.",
-    "form_error_port_range": "Zadejte číslo portu v rozmezí 80-65535",
+    "form_error_port_range": "Zadejte hodnotu portu v rozmezí 80-65535",
     "form_error_port_unsafe": "Toto není bezpečný port",
-    "form_error_equal": "Nesmí se shodovat",
+    "form_error_equal": "Neměla by se shodovat",
     "form_error_password": "Heslo se neshoduje",
     "reset_settings": "Resetovat nastavení",
     "update_announcement": "AdGuard Home {{version}} je nyní k dispozici! <0>Klikněte zde<0> pro více informací.",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "Zadejte adresu IP adresu do podsítě \"{{cidr}}\"",
     "form_enter_mac": "Zadejte MAC",
     "form_enter_id": "Zadejte identifikátor",
     "form_add_id": "Přidat identifikátor",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Blokovaní klienti",
     "access_disallowed_desc": "Seznam adres CIDR nebo IP. Pokud je nakonfigurován, AdGuard Home bude odmítat požadavky pouze z těchto IP adres.",
     "access_blocked_title": "Blokované domény",
-    "access_blocked_desc": "Nezaměňujte to s filtry. AdGuard Home odstraní dotazy DNS s těmito doménami v otázce dotazu. Zde můžete určit přesné názvy domén, zástupné znaky a pravidla filtrování URL adres, např. 'example.org', '*.example.org' nabo '||example.org^'.",
+    "access_blocked_desc": "Nezaměňujte to s filtry. AdGuard Home odstraní dotazy DNS s těmito doménami v otázce dotazu. Zde můžete určit přesné názvy domén, zástupné znaky a pravidla URL adres, např. 'example.org', '*.example.org' nabo '||example.org^'.",
     "access_settings_saved": "Nastavení přístupu bylo úspěšně uloženo",
     "updates_checked": "Aktualizace úspěšně zkontrolovány",
     "updates_version_equal": "AdGuard Home je aktuální",
@@ -444,7 +430,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",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Zakázat IPv6",
     "disable_ipv6_desc": "Pokud je tato funkce povolena, budou všechny dotazy DNS pro adresy IPv6 (typ AAAA) zrušeny.",
     "fastest_addr": "Nejrychlejší IP adresa",
-    "fastest_addr_desc": "Dotazovat všechny DNS servery a vrátit nejrychlejší IP adresu ze všech odpovědí. To zpomalí dotazy DNS, protože AdGuard Home musí čekat na odpovědi ze všech serverů DNS, ale celková konektivita se zlepší.",
+    "fastest_addr_desc": "Dotazovat všechny DNS servery a vrátit nejrychlejší IP adresu ze všech odpovědí. To zpomalí dotazy DNS, protože musíme čekat na odpovědi ze všech serverů DNS, ale celková konektivita se zlepší.",
     "autofix_warning_text": "Pokud kliknete na „Opravit“, AdGuard Home nakonfiguruje váš systém tak, aby používal DNS server AdGuard Home.",
     "autofix_warning_list": "Jsou prováděny následující úlohy: <0>Deaktivace systému DNSStubListener</0> <0>Nastavení adresy serveru DNS na 127.0.0.1</0> <0>Nahrazení cíle symbolického odkazu z /etc/resolv.conf do /run/systemd/resolve/resolv.conf</0> <0>Zastavení služby DNSStubListener (znovu načtení služby systemd-resolved)</0>",
     "autofix_warning_result": "Výsledkem je, že všechny požadavky DNS z vašeho systému jsou ve výchozím nastavení zpracovány službou AdGuard Home.",
@@ -544,6 +529,7 @@
     "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ů",
@@ -556,7 +542,7 @@
     "set_static_ip": "Nastavit statickou IP adresu",
     "install_static_ok": "Skvělá zpráva! Statická IP adresa je již nakonfigurována",
     "install_static_error": "AdGuard Home nemůže automaticky nakonfigurovat toto síťové rozhraní. Prosím vyhledejte návod, jak to provést ručně.",
-    "install_static_configure": "AdGuard Home detekoval, že se používá dynamická IP adresa <0>{{ip}}</0>. Chcete ji použít jako statickou adresu?",
+    "install_static_configure": "Detekovali jsme, že se používá dynamická IP adresa — <0>{{ip}}</0>. Chcete ji použít jako statickou adresu?",
     "confirm_static_ip": "AdGuard Home nakonfiguruje {{ip}} jako statickou IP adresu. Chcete pokračovat?",
     "list_updated": "Byl aktualizován {{count}} seznam",
     "list_updated_plural": "Aktualizované seznamy: {{count}}",
@@ -601,4 +587,4 @@
     "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,74 +1,67 @@
 {
-    "client_settings": "Klientindstillinger",
+    "client_settings": "Klient-indstillinger",
-    "example_upstream_reserved": "DNS-upstream kan agives <0>for et eller flere specifikke domæner</0>",
+    "example_upstream_reserved": "Du kan specificere DNS upstream <0>for det(de) specifikke domæne(r)</0>",
-    "example_upstream_comment": "Du kan angive en kommentaren",
+    "example_upstream_comment": "Du kan uddybe kommentaren",
-    "upstream_parallel": "Brug parallelforespørgsler til at accelerere fortolkningen ved at forespørge alle upstream-servere samtidigt.",
+    "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",
-    "load_balancing_desc": "Forespørg én server ad gangen. AdGuard Home vil bruge en vægtet randomiseringsalgoritme til valg af server, så den hurtigste server oftere anvendes.",
+    "load_balancing_desc": "Forespørg en server ad gangen. AdGuard Home bruger den vægtede tilfældige algoritme til at vælge serveren, så den hurtigste server bliver brugt oftere.",
     "bootstrap_dns": "Bootstrap DNS-servere",
-    "bootstrap_dns_desc": "Bootstrap DNS-servere bruges til at fortolke IP-adresser for de DoH-/DoT-resolvere, du angiver som upstream.",
+    "bootstrap_dns_desc": "Bootstrap DNS-servere bliver brugt til at behandle IP-adresser af de DoH/DoT resolvere, som du angiver som upstream.",
-    "local_ptr_title": "Private DNS-servere",
+    "check_dhcp_servers": "Tjek for DHCP-servere",
-    "local_ptr_desc": "De DNS-servere, som AdGuard Home bruger til lokale PTR-forespørgsler. Disse servere bruges til at opløse klientværtsnavne med private IP-adresser, f.eks. \"192.168.12.34\", vha. rDNS. Hvis ikke indstillet, bruger AdGuard Home dit operativsystems standard DNS-opløsere.",
+    "save_config": "Gem konfiguration",
-    "local_ptr_placeholder": "Indtast en serveradresse pr. Linje",
-    "resolve_clients_title": "Aktivér omvendt løsning af klienters IP-adresser",
-    "resolve_clients_desc": "Hvis aktiveret, forsøger AdGuard Home automatisk at løse klienters værtsnavne fra deres IP-adresser ved at sende en PTR-forespørgsel til en tilsvarende resolver (privat DNS-server til lokale klienter, upstream-server til klienter med offentlig IP-adresse).",
-    "check_dhcp_servers": "Søg efter DHCP-servere",
-    "save_config": "Gem opsætning",
     "enabled_dhcp": "DHCP-server aktiveret",
     "disabled_dhcp": "DHCP-server deaktiveret",
-    "unavailable_dhcp": "DHCP utilgængelig",
+    "unavailable_dhcp": "DHCP er ikke tilgængelig",
-    "unavailable_dhcp_desc": "AdGuard Home kan ikke køre en DHCP-server i dit OS",
+    "unavailable_dhcp_desc": "AdGuard Home kan ikke køre en DHCP-server på dit OS",
     "dhcp_title": "DHCP-server (eksperimentel!)",
-    "dhcp_description": "Har din router ingen DHCP-indstillinger, kan du bruge AdGuards egen, indbyggede DHCP-server.",
+    "dhcp_description": "Hvis din router ikke tilbyder DHCP-indstillinger, kan du bruge AdGuards egen indbyggede DHCP-server.",
-    "dhcp_enable": "Aktivere DHCP-server",
+    "dhcp_enable": "Aktiver DHCP-server",
-    "dhcp_disable": "Deaktivere DHCP-server",
+    "dhcp_disable": "Deaktiver DHCP-server",
-    "dhcp_not_found": "Det er sikkert at aktivere den indbyggede DHCP-server, da AdGuard Home ingen aktive DHCP-servere fandt på netværket. Du bør dog stadig tjekke dette manuelt, da den automatiske skanning pt. ikke giver en 100% garanti.",
+    "dhcp_not_found": "Det er sikkert at aktivere den indbyggede DHCP-server - vi fandt ikke nogen aktive DHCP-servere på netværket. Alligevel opfordrer vi dig til at tjekke det manuelt, da vores automatiske test i øjeblikket ikke virker 100%.",
     "dhcp_found": "En aktiv DHCP-server er fundet på netværket. Det er ikke sikkert at aktivere den indbyggede DHCP-server.",
     "dhcp_leases": "DHCP-leases",
-    "dhcp_static_leases": "DHCP statiske leases",
+    "dhcp_static_leases": "DHCP static leases",
     "dhcp_leases_not_found": "Ingen DHCP-leases fundet",
-    "dhcp_config_saved": "DHCP-opsætning gemt",
+    "dhcp_config_saved": "DHCP-konfiguration gemt",
-    "dhcp_ipv4_settings": "DHCP IPv4-indstillinger",
+    "dhcp_ipv4_settings": "DHCP IPv4 Indstillinger",
-    "dhcp_ipv6_settings": "DHCP IPv6-indstillinger",
+    "dhcp_ipv6_settings": "DHCP IPv6 Indstillinger",
     "form_error_required": "Obligatorisk felt",
     "form_error_ip4_format": "Ugyldigt IPv4-format",
     "form_error_ip6_format": "Ugyldigt IPv6-format",
     "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_client_id_format": "Ugyldigt klient-ID-format",
-    "form_error_server_name": "Ugyldigt servernavn",
-    "form_error_subnet": "Subnet \"{{cidr}}\" indeholder ikke IP-adressen \"{{ip}}\"",
     "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 på ​​intervallet",
+    "range_end_error": "Skal være større end starten af ​​intervallet",
     "dhcp_form_gateway_input": "Gateway IP",
-    "dhcp_form_subnet_input": "Undernetmaske",
+    "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Interval af IP-adresser",
-    "dhcp_form_range_start": "Intervalstart",
+    "dhcp_form_range_start": "Start interval",
-    "dhcp_form_range_end": "Intervalslut",
+    "dhcp_form_range_end": "Slut interval",
     "dhcp_form_lease_title": "DHCP-lease tid (i sekunder)",
-    "dhcp_form_lease_input": "Lease-varighed",
+    "dhcp_form_lease_input": "Lease varighed",
     "dhcp_interface_select": "Vælg DHCP-interface",
     "dhcp_hardware_address": "Hardware-adresse",
     "dhcp_ip_addresses": "IP-adresser",
     "ip": "IP",
     "dhcp_table_hostname": "Værtsnavn",
     "dhcp_table_expires": "Udløber",
-    "dhcp_warning": "Vil du alligevel aktivere DHCP-serveren, så sørg for at der ikke er nogen anden aktiv DHCP-server på dit netværk, da dette kan ødelægge Internetkonnektiviteten for netværksenhederne!",
+    "dhcp_warning": "Hvis du vil aktivere DHCP-serveren alligevel, skal du sørge for, at der ikke er nogen anden aktiv DHCP-server på dit netværk. Ellers kan det ødelægge internettet for tilsluttede enheder!",
-    "dhcp_error": "AdGuard Home kunne ikke afgøres, om der findes en anden DHCP-server på netværket.",
+    "dhcp_error": "Vi kunne ikke afgøre, om der er en anden DHCP-server på netværket.",
-    "dhcp_static_ip_error": "For at kunne bruge DHCP-serveren skal der opsættes en statisk IP-adresse. Da det ikke kunne afgøres, om denne netværksinterface er opsat vha. en statisk IP-adresse, bedes du opsætte en manuelt.",
+    "dhcp_static_ip_error": "For at kunne bruge DHCP-serveren skal en statisk IP-adresse indstilles. Vi fejlede i at afgøre, om denne netværksgrænseflade er konfigureret ved hjælp af en statisk IP-adresse. Indstil venligst manuelt en statisk IP-adresse.",
-    "dhcp_dynamic_ip_found": "Dit system bruger en dynamisk IP-adresseopsætning til interface <0>{{interfaceName}}</0>. For at kunne bruge DHCP-serveren skal en statisk IP-adresse indstilles. Din aktuelle IP-adresse er <0>{{ipAddress}}</0>. AdGuard Home vil automatisk indstille denne IP-adresse som din statiske hvis du trykker på knappen \"Aktivér DHCP-server\".",
+    "dhcp_dynamic_ip_found": "Dit system bruger en dynamisk IP-adresse konfiguration til grænsefladen <0>{{interfaceName}}</0>. For at kunne bruge DHCP-serveren skal en statisk IP-adresse indstilles. Din nuværende IP-adresse er <0>{{ipAddress}}</0>. Vi vil automatisk indstille denne IP-adresse som en statisk, hvis du trykker på Aktiver DHCP knappen.",
-    "dhcp_lease_added": "Statisk lease \"{{key}}\" tilføjet",
+    "dhcp_lease_added": "Static lease \"{{key}}\" succesfuldt tilføjet",
-    "dhcp_lease_deleted": "Statisk lease \"{{key}}\" slettet",
+    "dhcp_lease_deleted": "Static lease \"{{key}}\" succesfuldt slettet",
-    "dhcp_new_static_lease": "Ny statisk lease",
+    "dhcp_new_static_lease": "Ny static lease",
-    "dhcp_static_leases_not_found": "Intet DHCP statisk leases fundet",
+    "dhcp_static_leases_not_found": "Ingen DHCP static leases fundet",
-    "dhcp_add_static_lease": "Tilføj statisk lease",
+    "dhcp_add_static_lease": "Tilføj static lease",
-    "dhcp_reset": "Sikker på, at du vil nulstille DHCP-opsætningen?",
+    "dhcp_reset": "Er du sikker på, at du vil nulstille DHCP-konfigurationen?",
     "country": "Land",
     "city": "By",
-    "delete_confirm": "Sikker på, at du vil slette \"{{key}}\"?",
+    "delete_confirm": "Er du sikker på, at du vil slette \"{{key}}\"?",
-    "form_enter_hostname": "Angiv værtsnavn",
+    "form_enter_hostname": "Indtast værtsnavn",
     "error_details": "Fejloplysninger",
     "response_details": "Svardetaljer",
     "request_details": "Anmod om detaljer",
@@ -86,62 +79,62 @@
     "version": "Version",
     "address": "Adresse",
     "protocol": "Protokol",
-    "on": "TIL",
+    "on": "TÆNDT",
-    "off": "FRA",
+    "off": "SLUKKET",
-    "copyright": "Ophavsrettighed",
+    "copyright": "Copyright",
     "homepage": "Hjemmeside",
-    "report_an_issue": "Anmeld et problem",
+    "report_an_issue": "Rapporter et problem",
-    "privacy_policy": "Fortrolighedspolitik",
+    "privacy_policy": "Privatlivspolitik",
-    "enable_protection": "Aktivér beskyttelse",
+    "enable_protection": "Aktiver beskyttelse",
     "enabled_protection": "Beskyttelse aktiveret",
-    "disable_protection": "Deaktivér beskyttelse",
+    "disable_protection": "Deaktiver beskyttelse",
     "disabled_protection": "Beskyttelse deaktiveret",
-    "refresh_statics": "Opdatér statistikerne",
+    "refresh_statics": "Opdater statistikerne",
-    "dns_query": "DNS-forespørgsler",
+    "dns_query": "DNS-Forespørgsler",
     "blocked_by": "<0>Blokeret af Filtre</0>",
     "stats_malware_phishing": "Blokeret malware/phishing",
     "stats_adult": "Blokerede voksne websteder",
-    "stats_query_domain": "Mest forespurgte domæner",
+    "stats_query_domain": "Mest eftertragtede domæner",
-    "for_last_24_hours": "de seneste 24 timer",
+    "for_last_24_hours": "i løbet af de sidste 24 timer",
-    "for_last_days": "den seneste {{count}} dag",
+    "for_last_days": "for den sidste {{count}} dag",
-    "for_last_days_plural": "de seneste {{count}} dage",
+    "for_last_days_plural": "for de sidste {{count}} dage",
     "no_domains_found": "Ingen domæner fundet",
-    "requests_count": "Antal forespørgsler",
+    "requests_count": "Antal anmodninger",
-    "top_blocked_domains": "Hyppigst blokerede domæner",
+    "top_blocked_domains": "De mest blokerede domæner",
-    "top_clients": "Hyppigste klienter",
+    "top_clients": "De bedste klienter",
     "no_clients_found": "Ingen klienter fundet",
     "general_statistics": "Generelle statistikker",
-    "number_of_dns_query_days": "Antallet af DNS-forespørgsler behandlet den seneste {{count}} dag",
+    "number_of_dns_query_days": "Antallet af DNS-forespørgsler behandlet i løbet af den sidste {{count}} dag",
-    "number_of_dns_query_days_plural": "Antallet af DNS-forespørgsler behandlet de seneste {{count}} dage",
+    "number_of_dns_query_days_plural": "Antallet af DNS-forespørgsler behandlet i løbet af de sidste {{count}} dage",
-    "number_of_dns_query_24_hours": "Antallet af DNS-forespørgsler behandlet de seneste 24 timer",
+    "number_of_dns_query_24_hours": "Antallet af DNS-forespørgsler behandlet i løbet af de sidste 24 timer",
-    "number_of_dns_query_blocked_24_hours": "Antallet af DNS-forespørgsler blokeret af adblockfiltre og værtssortlister",
+    "number_of_dns_query_blocked_24_hours": "Antallet af DNS-forespørgsler blokeret af adblock filtre og værternes blokeringslister",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Antallet af DNS-forespørgsler blokeret af AdGuards browsingsikkerhedsmodul",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Antallet af DNS-forespørgsler blokeret af AdGuards browsing sikkerhedsmodul",
-    "number_of_dns_query_blocked_24_hours_adult": "Antallet af blokerede voksenwebsteder",
+    "number_of_dns_query_blocked_24_hours_adult": "Antallet af voksensider blokeret",
-    "enforced_save_search": "Håndhævet sikker søgning",
+    "enforced_save_search": "Håndhæv sikker søgning",
     "number_of_dns_query_to_safe_search": "Antallet af DNS-forespørgsler til søgemaskiner, hvor Sikker Søgning blev håndhævet",
     "average_processing_time": "Gennemsnitlig behandlingstid",
     "average_processing_time_hint": "Gennemsnitlig behandlingstid i millisekunder af DNS-forespørgsel",
-    "block_domain_use_filters_and_hosts": "Blokér domæner vha. filtre og værtsfiler",
+    "block_domain_use_filters_and_hosts": "Bloker domæner ved hjælp af filtre og værtsfiler",
-    "filters_block_toggle_hint": "Du kan opsætte blokeringsregler i <a>Filterindstillingerne</a>.",
+    "filters_block_toggle_hint": "Du kan oprette blokeringsregler i <a>Filterindstillingerne</a>.",
-    "use_adguard_browsing_sec": "Brug AdGuards webtjeneste til browsingsikkerhed",
+    "use_adguard_browsing_sec": "Brug AdGuards browsing sikkerhedstjeneste",
-    "use_adguard_browsing_sec_hint": "AdGuard Homevil tjekke, om domænet er sortlistet af browsingsikkerhedswebtjenesten vha. en fortrolighedsvenlig lookup-API til at udføre tjekket. Kun et kort præfiks af domænenavns SHA256-hashen sendes til serveren.",
+    "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ældrekontrolwebtjeneste",
+    "use_adguard_parental": "Brug AdGuards forældrekontrol",
-    "use_adguard_parental_hint": "AdGuard Home vil tjekke, om domænet indeholder voksenindhold vha. den samme fortrolighedsvenlige API som browsingsikkerhedswebtjenesten.",
+    "use_adguard_parental_hint": "AdGuard Home vil kontrollere, om domænet indeholder voksenindhold. Den bruger den samme privatlivsvenlige API som browsing sikkerhedstjenesten.",
     "enforce_safe_search": "Håndhæv sikker søgning",
-    "enforce_save_search_hint": "AdGuard Home kan håndhæve sikker søgning i flg. søgemaskiner: Google, YouTube, Bing, DuckDuckGo, Yandex og Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home kan håndhæve sikker søgning i følgende søgemaskiner: Google, Youtube, Bing, DuckDuckGo, Yandex og Pixabay.",
-    "no_servers_specified": "Ingen servere angivet",
+    "no_servers_specified": "Ingen servere specificeret",
     "general_settings": "Generelle indstillinger",
     "dns_settings": "DNS-indstillinger",
-    "dns_blocklists": "DNS-sortlister",
+    "dns_blocklists": "DNS-blokeringslister",
-    "dns_allowlists": "DNS-hvidlister",
+    "dns_allowlists": "Lister over tilladte DNS",
-    "dns_blocklists_desc": "AdGuard Home blokerer domæner matchende sortlisterne.",
+    "dns_blocklists_desc": "AdGuard Home vil blokere domæner, der matcher blokeringslisterne.",
-    "dns_allowlists_desc": "Domæner fra DNS-hvidlisterne tillades, selv hvis de er på nogle af sortlisterne.",
+    "dns_allowlists_desc": "Domæner fra listerne over tilladte DNS vil være tilladt, selvom de er i nogen af blokeringslisterne.",
-    "custom_filtering_rules": "Tilpassede filtreringsregler",
+    "custom_filtering_rules": "Brugerdefinerede filtreringsregler",
     "encryption_settings": "Krypteringsindstillinger",
     "dhcp_settings": "DHCP-indstillinger",
     "upstream_dns": "Upstream DNS-servere",
-    "upstream_dns_help": "Angiv én serveradresse pr. linje. <a>Læs mere</a> om opsætning af upstream DNS-servere.",
+    "upstream_dns_help": "Indtast serveradresserne en pr. linje. <a>Lær mere</a> om konfiguration af upstream DNS-servere.",
-    "upstream_dns_configured_in_file": "Opsat i {{path}}",
+    "upstream_dns_configured_in_file": "Konfigureret i {{path}}",
     "test_upstream_btn": "Test upstreams",
     "upstreams": "Upstreams",
     "apply_btn": "Anvend",
@@ -155,59 +148,59 @@
     "enabled_save_search_toast": "Sikker søgning aktiveret",
     "enabled_table_header": "Aktiveret",
     "name_table_header": "Navn",
-    "list_url_table_header": "Liste-URL",
+    "list_url_table_header": "Listernes URL",
     "rules_count_table_header": "Antal regler",
-    "last_time_updated_table_header": "Senest opdateret",
+    "last_time_updated_table_header": "Sidst opdateret",
     "actions_table_header": "Handlinger",
     "request_table_header": "Forespørgsel",
-    "edit_table_action": "Redigér",
+    "edit_table_action": "Rediger",
     "delete_table_action": "Slet",
     "elapsed": "Varighed",
-    "filters_and_hosts_hint": "AdGuard Home forstår basis adblockingregler og værtsfilsyntaks.",
+    "filters_and_hosts_hint": "AdGuard Home forstår de grundlæggende annonceblokeringsregler og værtsfilsyntaks.",
-    "no_blocklist_added": "Ingen sortlister tilføjet",
+    "no_blocklist_added": "Ingen blokeringslister tilføjet",
-    "no_whitelist_added": "Ingen hvidlister tilføjet",
+    "no_whitelist_added": "Ingen lister over tilladte tilføjet",
-    "add_blocklist": "Tilføj sortliste",
+    "add_blocklist": "Tilføj blokeringsliste",
-    "add_allowlist": "Tilføj hvidliste",
+    "add_allowlist": "Tilføj liste over tilladte",
-    "cancel_btn": "Afbryd",
+    "cancel_btn": "Annuller",
-    "enter_name_hint": "Angiv navn",
+    "enter_name_hint": "Indtast navn",
-    "enter_url_or_path_hint": "Angiv en URL eller en absolut listesti",
+    "enter_url_or_path_hint": "Indtast en URL eller en absolut sti på listen",
     "check_updates_btn": "Søg efter opdateringer",
-    "new_blocklist": "Ny sortliste",
+    "new_blocklist": "Ny blokeringsliste",
-    "new_allowlist": "Ny hvidliste",
+    "new_allowlist": "Ny liste over tilladte",
-    "edit_blocklist": "Sortlisteredigering",
+    "edit_blocklist": "Rediger blokeringsliste",
-    "edit_allowlist": "Hvidlisteredigering",
+    "edit_allowlist": "Rediger liste over tilladte",
-    "choose_blocklist": "Vælg sortlister",
+    "choose_blocklist": "Vælg blokeringslister",
-    "choose_allowlist": "Vælg hvidlister",
+    "choose_allowlist": "Vælg lister over tilladte",
-    "enter_valid_blocklist": "Angiv en gyldig URL til sortlisten.",
+    "enter_valid_blocklist": "Indtast en gyldig URL til blokeringslisten.",
-    "enter_valid_allowlist": "Angiv en gyldig URL til hvidlisten.",
+    "enter_valid_allowlist": "Indtast en gyldig URL til listen over tilladte.",
     "form_error_url_format": "Ugyldigt URL-format",
-    "form_error_url_or_path_format": "Ugyldig URL eller absolut listesti",
+    "form_error_url_or_path_format": "Ugyldig URL eller en absolut sti på listen",
-    "custom_filter_rules": "Tilpassede filtreringsregler",
+    "custom_filter_rules": "Brugerdefinerede filtreringsregler",
-    "custom_filter_rules_hint": "Angiv én regel pr. linje. Du kan bruge enten adblockingregler eller værtsfilsyntaks.",
+    "custom_filter_rules_hint": "Indtast en regel per linje. Du kan enten bruge annonceblokeringsregler eller værtsfilsyntaks.",
     "examples_title": "Eksempler",
-    "example_meaning_filter_block": "blokér adgang til example.org-domænet samt alle underdomæner",
+    "example_meaning_filter_block": "bloker adgang til domænet example.org og alle dens subdomæner",
-    "example_meaning_filter_whitelist": "afblokér adgang til example.ord-domænet samt alle underdomæner",
+    "example_meaning_filter_whitelist": "fjern blokering af adgangen til domænet example.ord og alle dens subdomæner",
-    "example_meaning_host_block": "AdGuard Home returnerer nu adressen 127.0.0.1 for example.org-domænet (men ikke underdomænerne).",
+    "example_meaning_host_block": "AdGuard Home vil nu returnere adressen 127.0.0.1 til example.org domænet (men ikke dens underdomæner)",
-    "example_comment": "! Hér angives en evt. kommentar",
+    "example_comment": "! Her er en kommentar",
     "example_comment_meaning": "bare en kommentar",
     "example_comment_hash": "# Også en kommentar",
-    "example_regex_meaning": "blokér adgang til domæner matchernde det angivne regulære udtryk",
+    "example_regex_meaning": "bloker adgangen til de domæner, der matcher det angivne regulære udtryk",
     "example_upstream_regular": "almindelig DNS (over UDP)",
     "example_upstream_dot": "krypteret <0>DNS-over-TLS</0>",
     "example_upstream_doh": "krypteret <0>DNS-over-HTTPS</0>",
     "example_upstream_doq": "krypteret <0>DNS-over-QUIC</0>",
-    "example_upstream_sdns": "du kan bruge <0>DNS Stamps</0> til <1>DNSCrypt</1> eller <2>DNS-over-HTTPS</2>-resolvers",
+    "example_upstream_sdns": "du kan bruge <0>DNS Stamps<0> til <1>DNSCrypt>/1> eller <2>DNS-over-HTTPS</2> resolvers",
     "example_upstream_tcp": "almindelig DNS (over TCP)",
     "all_lists_up_to_date_toast": "Alle lister er allerede opdaterede",
-    "updated_upstream_dns_toast": "Opdaterede upstream DNS-serverene",
+    "updated_upstream_dns_toast": "Opdaterede upstream DNS-servere",
-    "dns_test_ok_toast": "Angivne DNS-servere fungerer korrekt",
+    "dns_test_ok_toast": "De angivne DNS-servere fungerer korrekt",
-    "dns_test_not_ok_toast": "Server \"{{key}}\": Kunne ikke bruges. Tjek, at du har angivet den korrekt",
+    "dns_test_not_ok_toast": "Server \"{{key}}\": kunne ikke bruges, kontroller venligst at du har skrevet det korrekt",
-    "unblock": "Afblokering",
+    "unblock": "Fjern blokering",
-    "block": "Blokering",
+    "block": "Bloker",
     "disallow_this_client": "Afvis denne klient",
     "allow_this_client": "Tillad denne klient",
-    "block_for_this_client_only": "Blokér kun for denne klient",
+    "block_for_this_client_only": "Bloker kun for denne klient",
-    "unblock_for_this_client_only": "Afblokér kun for denne klient",
+    "unblock_for_this_client_only": "Fjern blokering kun for denne klient",
     "time_table_header": "Tid",
     "date": "Dato",
     "domain_name_table_header": "Domænenavn",
@@ -216,36 +209,36 @@
     "response_table_header": "Svar",
     "response_code": "Responskode",
     "client_table_header": "Klient",
-    "empty_response_status": "Tomt",
+    "empty_response_status": "Tom",
     "show_all_filter_type": "Vis alle",
     "show_filtered_type": "Vis filtrerede",
-    "no_logs_found": "Ingen logger fundet",
+    "no_logs_found": "Ingen logfiler fundet",
-    "refresh_btn": "Opdatér",
+    "refresh_btn": "Opdater",
-    "previous_btn": "Foregående",
+    "previous_btn": "Forrige",
     "next_btn": "Næste",
     "loading_table_status": "Indlæser...",
     "page_table_footer_text": "Side",
     "rows_table_footer_text": "rækker",
-    "updated_custom_filtering_toast": "Tilpassede filtreringsregler er nu opdateret",
+    "updated_custom_filtering_toast": "De brugerdefinerede filtreringsregler er blevet opdateret",
-    "rule_removed_from_custom_filtering_toast": "Regel fjernet fra de tilpassede filtreringsregler: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regel fjernet fra de brugerdefinerede filtreringsregler: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regel føjet til de tilpassede filtreringsregler: {{rule}}",
+    "rule_added_to_custom_filtering_toast": "Regel tilføjet til de brugerdefinerede filtreringsregler: {{rule}}",
     "query_log_response_status": "Status: {{value}}",
     "query_log_filtered": "Filtreret af {{filter}}",
-    "query_log_confirm_clear": "Sikker på, at du vil rydde hele forespørgselsloggen?",
+    "query_log_confirm_clear": "Er du sikker på, at du vil rydde hele forespørgselsloggen?",
     "query_log_cleared": "Forespørgselsloggen er blevet ryddet",
     "query_log_updated": "Forespørgselsloggen er blevet opdateret",
     "query_log_clear": "Ryd forespørgselslogfiler",
-    "query_log_retention": "Opbevar forespørgselslogger i",
+    "query_log_retention": "Opbevaring af forespørgselslogfiler",
     "query_log_enable": "Aktivér log",
-    "query_log_configuration": "Opsætning af logger",
+    "query_log_configuration": "Konfiguration af logfiler",
-    "query_log_disabled": "Forespørgselsloggen er deaktiveret og kan opsættes i <0>indstillingerne</0>",
+    "query_log_disabled": "Forespørgselsloggen er deaktiveret og kan konfigureres i <0>indstillinger</0>",
-    "query_log_strict_search": "Brug dobbelt anførselstegn til stringent søgning",
+    "query_log_strict_search": "Brug dobbelt anførselstegn til streng søgning",
-    "query_log_retention_confirm": "Sikker på, at du vil ændre forespørgselsloggens opbevaringperiode? Mindskes intervalværdien, mistes data",
+    "query_log_retention_confirm": "Er du sikker på, at du vil ændre opbevaring af forespørgselsloggen? Hvis du mindsker intervalværdien, vil nogle data gå tabt",
-    "anonymize_client_ip": "Anonymisér klient-IP",
+    "anonymize_client_ip": "Anonymiser klient-IP",
     "anonymize_client_ip_desc": "Gem ikke klientens fulde IP-adresse i logfiler og statistikker",
-    "dns_config": "DNS-serveropsætning",
+    "dns_config": "DNS-serverkonfiguration",
-    "dns_cache_config": "DNS-cacheopsætning",
+    "dns_cache_config": "Konfiguration af DNS-cache",
-    "dns_cache_config_desc": "Hér kan du opsætte DNS-cache",
+    "dns_cache_config_desc": "Her kan du konfigurere DNS-cache",
     "blocking_mode": "Blokeringstilstand",
     "default": "Standard",
     "nxdomain": "NXDOMAIN",
@@ -254,113 +247,107 @@
     "custom_ip": "Tilpasset IP",
     "blocking_ipv4": "IPv4-blokering",
     "blocking_ipv6": "IPv6-blokering",
-    "dnscrypt": "DNSCrypt",
     "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": "Angiv klient-ID",
-    "client_id_desc": "Forskellige klienter kan identificeres via et specielt klient-ID. <a>Hér</a> finder du ud af mere om, hvordan klienter identificeres.",
     "download_mobileconfig_doh": "Download .mobileconfig til DNS-over-HTTPS",
     "download_mobileconfig_dot": "Download .mobileconfig til DNS-over-TLS",
-    "download_mobileconfig": "Download opsætningsfil",
     "plain_dns": "Almindelig DNS",
-    "form_enter_rate_limit": "Angiv hyppighedsgrænse",
+    "form_enter_rate_limit": "Indtast hyppighedsgrænse",
     "rate_limit": "Hyppighedsgrænse",
-    "edns_enable": "Aktivér EDNS-klientundernet",
+    "edns_enable": "Aktiver EDNS Client Subnet",
-    "edns_cs_desc": "Hvis aktiveret, sender AdGuard Home klienters undernet til DNS-serverne.",
+    "edns_cs_desc": "Hvis det er aktiveret, vil AdGuard Home sende klienters subnets til DNS-serverne.",
-    "rate_limit_desc": "Antallet af forespørgsler pr. sekund tilladt pr. klient (værdien 0 = ubegrænset)",
+    "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": "Returneret IP-adresse for en blokeret A-forespørgsel",
+    "blocking_ipv4_desc": "IP-adresse, der skal returneres for en blokeret A-anmodning",
-    "blocking_ipv6_desc": "Returneret IP-adresse for en blokeret AAAA-forespørgsel",
+    "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 blokeret af Adblock-lignende regel. Svar med IP-adressen angivet i reglen, når blokeret af /etc/hosts-lignende regel",
+    "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_refused": "NÆGTET: Svar med en NÆGTET-kode",
+    "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)",
-    "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt indstillet IP-adresse",
+    "blocking_mode_custom_ip": "Brugerdefineret IP: Svar med en manuelt indstillet IP-adresse",
-    "upstream_dns_client_desc": "Holdes dette felt tomt, bruger AdGuard Home de i <0>DNS-indstillingerne</0> opsatte servere.",
+    "upstream_dns_client_desc": "Hvis du lader dette felt være tomt, vil AdGuard Home bruge de servere, der er konfigureret i <0>DNS-indstillingerne</0>.",
     "tracker_source": "Tracker-kilde",
     "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",
     "install_welcome_title": "Velkommen til AdGuard Home!",
-    "install_welcome_desc": "AdGuard Home er en netværksbaseret tracker- og adblocking DNS-server, hvis formål er at lade dig kontrollere hele dit netværk og alle dine enheder, og det kræver ikke brug af klientsoftware.",
+    "install_welcome_desc": "AdGuard Home er en netværksbaseret annonce-og-tracker blokerende DNS-server. Formålet er at lade dig kontrollere hele dit netværk og alle dine enheder, og det kræver ikke at man bruger klientsoftware.",
-    "install_settings_title": "Admin Webgrænseflade",
+    "install_settings_title": "Administrator Webgrænseflade",
     "install_settings_listen": "Overvågningsgrænseflade",
     "install_settings_port": "Port",
-    "install_settings_interface_link": "Din AdGuard Home admin webgrænseflade vil være tilgængelig på flg. adresser:",
+    "install_settings_interface_link": "Din AdGuard Home administrator webgrænseflade vil være tilgængelig på følgende adresser:",
-    "form_error_port": "Angiv gyldig portnummer",
+    "form_error_port": "Indtast gyldig portværdi",
     "install_settings_dns": "DNS-server",
-    "install_settings_dns_desc": "Du skal opsætte dine enheder eller router til at bruge DNS-serveren på flg. adresser:",
+    "install_settings_dns_desc": "Du skal konfigurere dine enheder eller router til at bruge DNS-serveren på følgende adresser:",
     "install_settings_all_interfaces": "Alle grænseflader",
-    "install_auth_title": "Godkendelse",
+    "install_auth_title": "Autentificering",
-    "install_auth_desc": "Det anbefales stærkt at opsætte adgangskodegodkendelse på din AdGuard Home admin webgrænseflade. Selvom den kun er tilgængelig på dit lokalnetværk, er det stadig vigtigt at få den beskyttet mod ubegrænset adgang.",
+    "install_auth_desc": "Det anbefales stærkt at konfigurere adgangskodeautentificering til din AdGuard Home administrator webgrænseflade. Selvom det kun er tilgængeligt på dit lokale netværk, er det stadig vigtigt at få det beskyttet mod ubegrænset adgang.",
     "install_auth_username": "Brugernavn",
     "install_auth_password": "Adgangskode",
     "install_auth_confirm": "Bekræft adgangskode",
-    "install_auth_username_enter": "Angiv brugernavn",
+    "install_auth_username_enter": "Indtast brugernavn",
-    "install_auth_password_enter": "Angiv adgangskode",
+    "install_auth_password_enter": "Indtast adgangskode",
     "install_step": "Trin",
-    "install_devices_title": "Opsæt dine enheder",
+    "install_devices_title": "Konfigurer dine enheder",
-    "install_devices_desc": "For brug af AdGuard Home, skal dine enheder opsættes til at bruge den.",
+    "install_devices_desc": "For at kunne bruge AdGuard Home, skal du konfigurere dine enheder til at bruge den.",
     "install_submit_title": "Tillykke!",
-    "install_submit_desc": "Opsætningsproceduren er færdig, og AdGuard Home er nu klar til brug.",
+    "install_submit_desc": "Installationsproceduren er færdig, og du er klar til at starte med at bruge AdGuard Home.",
     "install_devices_router": "Router",
-    "install_devices_router_desc": "Denne opsætning dækker automatisk alle enheder tilsluttet din hjemmerouter, og du behøver ikke at skulle opsætte hver af dem manuelt.",
+    "install_devices_router_desc": "Denne opsætning dækker automatisk alle enheder, der er tilsluttet din hjemmerouter, og du behøver ikke konfigurere hver af dem manuelt.",
-    "install_devices_address": "AdGuard Home DNS-server lytter på flg. adresser",
+    "install_devices_address": "AdGuard Home DNS-server lytter på følgende adresser",
-    "install_devices_router_list_1": "Åbn præferencerne for din router. Normalt kan du tilgå disse fra din browser via en URL såsom http://192.168.0.1/ eller http://192.168.1.1/. Du anmodes muligvis om at angive en adgangskode. Kan du ikke huske den, kan du ofte nulstille adgangskoden ved hjælp af en knap på selve routeren, men vær opmærksom på, at vælges denne procedure, mister du sandsynligvis hele routerkonfigureringen. Hvis din router kræver en app for at konfigurere den, skal du installere appen på din telefon eller pc og bruge den til at få adgang til routerens indstillinger.",
+    "install_devices_router_list_1": "Åbn præferencerne for din router. Normalt kan du få adgang til den fra din browser via en URL (som http://192.168.0.1/ eller http://192.168.1.1/). Du bliver muligvis bedt om at indtaste adgangskoden. Hvis du ikke kan huske den, kan du ofte nulstille adgangskoden ved at trykke på en knap på selve routeren. Nogle routere kræver et bestemt program, som i det tilfælde allerede skulle være installeret på din computer/telefon.",
-    "install_devices_router_list_2": "Find DHCP-/DNS-indstillingerne. Kig efter DNS-bogstaverne ved siden af et felt, der tillader input af to eller tre sæt tal, hver opdelt i fire grupper med et til tre cifre.",
+    "install_devices_router_list_2": "Find DHCP/DNS-indstillingerne. Kig efter DNS-bogstaverne ved siden af et felt, der tillader to eller tre sæt tal, hver opdelt i fire grupper med et til tre cifre.",
-    "install_devices_router_list_3": "Angiv dine AdGuard Home-serveradresser dér.",
+    "install_devices_router_list_3": "Indtast dine AdGuard Home serveradresser der.",
-    "install_devices_router_list_4": "På visse routertyper kan en tilpasset DNS-server ikke opsættes. I så tilfælde kan det hjælpe, hvis du opsætter AdGuard Home som en <0>DHCP-server</0>. Ellers bør du tjekke i routermanualen, hvordan du tilpasser DNS-servere i din givne routermodel.",
+    "install_devices_router_list_4": "Du kan ikke opsætte en tilpasset DNS-server på nogle typer routere. I dette tilfælde kan det hjælpe, hvis du konfigurerer AdGuard Home som en <0>DHCP-server</0>. Du kan ellers søge efter manualen om, hvordan du tilpasser DNS-servere til din bestemte routermodel.",
-    "install_devices_windows_list_1": "Åbn Kontrolpanel via menuen Start eller Windows-søgning.",
+    "install_devices_windows_list_1": "Åbn Kontrolpanel gennem menuen Start eller Windows søgning.",
-    "install_devices_windows_list_2": "Gå til kategorien Netværk og Internet og derefter til Netværks- og delingscenter.",
+    "install_devices_windows_list_2": "Gå til Netværk og internet kategorien og derefter til Netværks- og delingscenter.",
-    "install_devices_windows_list_3": "Til venstre finder du punktet Skift adapterindstillinger, klik på dette.",
+    "install_devices_windows_list_3": "På venstre side af skærmen finder du Skift adapterindstillinger og klik på den.",
     "install_devices_windows_list_4": "Vælg din aktive forbindelse, højreklik på den og vælg Egenskaber.",
     "install_devices_windows_list_5": "Find Internet Protocol Version 4 (TCP/IP) på listen, vælg den og klik derefter på Egenskaber igen.",
-    "install_devices_windows_list_6": "Vælg Brug følgende DNS-serveradresser og angiv dine AdGuard Home-serveradresser.",
+    "install_devices_windows_list_6": "Vælg Brug følgende DNS-serveradresser og indtast dine AdGuard Home serveradresser.",
     "install_devices_macos_list_1": "Klik på Apple-ikonet og gå til Systemindstillinger.",
     "install_devices_macos_list_2": "Klik på Netværk.",
     "install_devices_macos_list_3": "Vælg den første forbindelse på din liste, og klik på Avanceret.",
-    "install_devices_macos_list_4": "Vælg fanen DNS og angiv dine AdGuard Home-serveradresser.",
+    "install_devices_macos_list_4": "Vælg fanen DNS og indtast dine AdGuard Home serveradresser.",
     "install_devices_android_list_1": "Tryk på Indstillinger på Android-startskærmen.",
-    "install_devices_android_list_2": "Tryk på Wi-Fi i menuen. Alle tilgængelige netværk vises på skærmen (det er umuligt at angive tilpasset DNS til mobilforbindelse).",
+    "install_devices_android_list_2": "Tryk på Wi-Fi i menuen. Alle tilgængelige netværk vil blive vist på skærmen (det er umuligt at angive brugerdefineret DNS til mobilforbindelse).",
-    "install_devices_android_list_3": "Langt tryk på det netværk, du er forbundet til, og tryk på Redigér Netværk.",
+    "install_devices_android_list_3": "Tryk lang tid på det netværk, du har forbindelse til, og tryk på Rediger Netværk.",
-    "install_devices_android_list_4": "På visse enheder skal du muligvis afkrydse feltet Avanceret for at se yderligere indstillinger. For at ændre dine Android DNS-indstillinger skal du skifte IP-indstillingerne fra DHCP til Statisk.",
+    "install_devices_android_list_4": "På nogle enheder skal du muligvis afkrydse afkrydsningsfeltet Avanceret for at se yderligere indstillinger. For at justere dine Android DNS-indstillinger skal du skifte IP-indstillingerne fra DHCP til Statisk.",
-    "install_devices_android_list_5": "Skift de aktuelle DNS 1- og DNS 2-værdier til dine AdGuard Home-serveradresser.",
+    "install_devices_android_list_5": "Skift sæt DNS 1 og DNS 2 værdierne til dine AdGuard Home serveradresser.",
-    "install_devices_ios_list_1": "Tryk på Indstillinger på Hjem-skærmen.",
+    "install_devices_ios_list_1": "Tryk på Indstillinger på startskærmen.",
-    "install_devices_ios_list_2": "Vælg Wi-Fi i menuen til venstre (det er umuligt at opsætte DNS for mobilnetværker).",
+    "install_devices_ios_list_2": "Vælg Wi-Fi i menuen til venstre (det er umuligt at konfigurere DNS til mobilnetværker).",
-    "install_devices_ios_list_3": "Tryk på navnet på det aktuelt aktive netværk.",
+    "install_devices_ios_list_3": "Tryk på navnet på det nuværende aktive netværk.",
-    "install_devices_ios_list_4": "Angiv dine AdGuard Home-serveradresser i DNS-feltet.",
+    "install_devices_ios_list_4": "Indtast dine AdGuard Home serveradresser i DNS-feltet.",
-    "get_started": "Komme I Gang",
+    "get_started": "Kom I Gang",
     "next": "Næste",
     "open_dashboard": "Åbn Dashboard",
-    "install_saved": "Gemt",
+    "install_saved": "Succesfuldt gemt",
     "encryption_title": "Kryptering",
     "encryption_desc": "Kryptering (HTTPS/TLS) understøtter både DNS og admin webgrænseflade",
-    "encryption_config_saved": "Krypteringsopsætning gemt",
+    "encryption_config_saved": "Krypteringskonfiguration gemt",
     "encryption_server": "Servernavn",
-    "encryption_server_enter": "Angiv dit domænenavn",
+    "encryption_server_enter": "Indtast dit domænenavn",
-    "encryption_server_desc": "For at kunne bruge HTTPS skal du angive det servernavn, der matcher dit SSL-certifikat eller wildcard-certifikat. Er feltet ikke er opsat, 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": "Omdirigér automatisk til HTTPS",
+    "encryption_redirect": "Omdiriger automatisk til HTTPS",
-    "encryption_redirect_desc": "Hvis afkrydset, omdirigerer AdGuard Home dig automatisk fra HTTP- til HTTPS-adresser.",
+    "encryption_redirect_desc": "Hvis afkrydset, vil AdGuard Home automatisk omdirigere dig fra HTTP til HTTPS-adresser.",
     "encryption_https": "HTTPS-port",
-    "encryption_https_desc": "Er HTTPS-porten opsat, vil AdGuard Home admin grænsefladen være tilgængelig via HTTPS, og den vil muliggøre DNS-over-HTTPS på '/dns-query' placeringen.",
+    "encryption_https_desc": "Hvis HTTPS-porten er konfigureret, vil AdGuard Home admin grænsefladen være tilgængelig via HTTPS, og den vil give DNS-over-HTTPS på '/dns-query' placeringen.",
     "encryption_dot": "DNS-over-TLS port",
-    "encryption_dot_desc": "Er denne port opsat, vil AdGuard Home køre en DNS-over-TLS server på denne port.",
+    "encryption_dot_desc": "Hvis denne port er konfigureret, vil AdGuard Home køre en DNS-over-TLS server over denne port.",
     "encryption_doq": "DNS-over-QUIC port",
-    "encryption_doq_desc": "Er denne port opsat, vil AdGuard Home køre en DNS-over-QUIC server på denne port. Den er eksperimentel og er måske ikke pålidelig. Derudover understøttes den pt. heller ikke af ret mange klienter.",
+    "encryption_doq_desc": "Hvis denne port er konfigureret, vil AdGuard Home køre en DNS-over-QUIC server på denne port. Den er eksperimentel og er måske ikke pålidelig. Der er heller ikke mange klienter, der understøtter den i øjeblikket.",
     "encryption_certificates": "Certifikater",
-    "encryption_certificates_desc": "For at kunne bruge kryptering skal du angive en gyldig SSL-certifikatkæde til dit domæne. Du kan få et gratis certifikat via <0>{{link}}</ 0>, eller du kan købe det via en af de betroede Certifikatmyndigheder.",
+    "encryption_certificates_desc": "For at kunne bruge kryptering skal du angive en gyldig SSL-certifikatkæde til dit domæne. Du kan få et gratis certifikat på <0>{{link}}</ 0> eller du kan købe det fra en af de pålidelige Certifikatmyndigheder.",
-    "encryption_certificates_input": "Kopiér/indsæt dine PEM-kodede certifikater hér.",
+    "encryption_certificates_input": "Kopier/indsæt dine PEM-kodede certifikater her.",
     "encryption_status": "Status",
     "encryption_expire": "Udløber",
     "encryption_key": "Privat nøgle",
-    "encryption_key_input": "Kopiér/indsæt dine PEM-kodede private nøgle til dit certifikat hér.",
+    "encryption_key_input": "Kopier/indsæt dine PEM-kodede private nøgle til dit certifikat her.",
-    "encryption_enable": "Aktivér Kryptering (HTTPS, DNS-over-HTTPS og DNS-over-TLS)",
+    "encryption_enable": "Aktiver Kryptering (HTTPS, DNS-over-HTTPS og DNS-over-TLS)",
-    "encryption_enable_desc": "Er kryptering aktiveret, fungerer AdGuard Home admin grænsefladen over HTTPS, og DNS-serveren lytter efter forespørgsler via DNS-over-HTTPS og DNS-over-TLS.",
+    "encryption_enable_desc": "Hvis kryptering er aktiveret, vil AdGuard Home admin grænseflade fungere over HTTPS og DNS-serveren vil lytte efter forespørgsler via DNS-over-HTTPS og DNS-over-TLS.",
     "encryption_chain_valid": "Certifikatkæden er gyldig",
     "encryption_chain_invalid": "Certifikatkæden er ugyldig",
     "encryption_key_valid": "Dette er en gyldig {{type}} privat nøgle",
@@ -368,115 +355,113 @@
     "encryption_subject": "Emne",
     "encryption_issuer": "Udsteder",
     "encryption_hostnames": "Værtsnavne",
-    "encryption_reset": "Sikker på, at du vil nulstille krypteringsindstillingerne?",
+    "encryption_reset": "Er du sikker på, at du vil nulstille krypteringsindstillingerne?",
-    "topline_expiring_certificate": "Dit SSL-certifikat er ved at udløbe. Opdatér <0>Krypteringsindstillinger</0>.",
+    "topline_expiring_certificate": "Dit SSL-certifikat er ved at udløbe. Opdater <0>Krypteringsindstillinger</ 0>.",
-    "topline_expired_certificate": "Dit SSL-certifikat er udløbet. Opdatér <0>Krypteringsindstillinger</0>.",
+    "topline_expired_certificate": "Dit SSL-certifikat er udløbet. Opdater <0>Krypteringsindstillinger</ 0>.",
-    "form_error_port_range": "Angiv portnummer i intervallet 80-65535",
+    "form_error_port_range": "Indtast portværdi i intervallet 80-65535",
     "form_error_port_unsafe": "Dette er en usikker port",
-    "form_error_equal": "Må ikke være ens",
+    "form_error_equal": "Burde ikke være lige",
     "form_error_password": "Adgangskoden matcher ikke",
     "reset_settings": "Nulstil indstillinger",
-    "update_announcement": "AdGuard Home {{version}} er nu tilgængelig! <0>Kik hér</0> for mere info.",
+    "update_announcement": "AdGuard Home {{version}} er nu tilgængelig! <0>Kik her</0> for mere info.",
     "setup_guide": "Installationsvejledning",
     "dns_addresses": "DNS-adresser",
     "dns_start": "DNS-server starter",
-    "dns_status_error": "Fejl ved tjek af DNS-serverstatus",
+    "dns_status_error": "Fejl ved at få DNS-serverstatus",
     "down": "Ned",
-    "fix": "Korrigér",
+    "fix": "Reparer",
     "dns_providers": "Her er en <0>liste over kendte DNS-udbydere</ 0> at vælge imellem.",
-    "update_now": "Opdatér nu",
+    "update_now": "Opdater nu",
-    "update_failed": "Autoopdatering mislykkedes. Følg <a>disse trin</a> for at opdatere manuelt.",
+    "update_failed": "Automatisk opdatering mislykkedes. Følg <a>disse trin</a> for at opdatere manuelt.",
     "processing_update": "Vent venligst, AdGuard Home bliver opdateret",
     "clients_title": "Klienter",
-    "clients_desc": "Opsæt enheder forbundet til AdGuard Home",
+    "clients_desc": "Konfigurer enheder, der er forbundet til AdGuard Home",
     "settings_global": "Global",
-    "settings_custom": "Tilpasset",
+    "settings_custom": "Brugerdefineret",
     "table_client": "Klient",
     "table_name": "Navn",
     "save_btn": "Gem",
     "client_add": "Tilføj Klient",
     "client_new": "Ny Klient",
-    "client_edit": "Redigér Klient",
+    "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>Hér</0> kan du læse mere om, hvordan klienter identificeres.",
+    "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": "Angiv IP",
+    "form_enter_ip": "Indtast IP",
-    "form_enter_subnet_ip": "Indtast en IP-adresse i subnettet \"{{cidr}}\"",
+    "form_enter_mac": "Indtast MAC",
-    "form_enter_mac": "Angiv MAC",
+    "form_enter_id": "Indtast identifikator",
-    "form_enter_id": "Angiv identifikator",
     "form_add_id": "Tilføj identifikator",
-    "form_client_name": "Angiv klientnavn",
+    "form_client_name": "Indtast klientnavn",
     "name": "Navn",
     "client_global_settings": "Brug globale indstillinger",
-    "client_deleted": "Klient \"{{key}}\" slettet",
+    "client_deleted": "Klient \"{{key}}\" succesfuldt slettet",
-    "client_added": "Klient \"{{key}}\" tilføjet",
+    "client_added": "Klient \"{{key}}\" succesfuldt tilføjet",
-    "client_updated": "Klient \"{{key}}\" opdateret",
+    "client_updated": "Klient \"{{key}}\" succesfuldt opdateret",
     "clients_not_found": "Ingen klienter fundet",
-    "client_confirm_delete": "Sikker på, at du vil slette klient \"{{key}}\"?",
+    "client_confirm_delete": "Er du sikker på, at du vil slette klient \"{{key}}\"?",
-    "list_confirm_delete": "Sikker på, at du vil slette denne liste?",
+    "list_confirm_delete": "Er du sikker på, at du vil slette denne liste?",
     "auto_clients_title": "Klienter (runtime)",
-    "auto_clients_desc": "Data om de klienter, som bruger AdGuard Home, men ikke gemt i opsætningen",
+    "auto_clients_desc": "Data om de klienter, der bruger AdGuard Home, men ikke gemt i konfigurationen",
     "access_title": "Adgangsindstillinger",
-    "access_desc": "Her kan du opsætte adgangsregler for AdGuard Home DNS-serveren.",
+    "access_desc": "Her kan du konfigurere adgangsregler for AdGuard Home DNS-serveren.",
     "access_allowed_title": "Tilladte klienter",
-    "access_allowed_desc": "En liste over CIDR- eller IP-adresser. Hvis opsat, accepterer AdGuard Home kun forespørgsler fra disse IP-adresser.",
+    "access_allowed_desc": "En liste over CIDR- eller IP-adresser. Hvis den er konfigureret, vil AdGuard Home kun acceptere anmodninger fra disse IP-adresser.",
     "access_disallowed_title": "Ikke tilladte klienter",
-    "access_disallowed_desc": "En liste over CIDR- eller IP-adresser. Hvis opsat, dropper AdGuard Home forespørgsler fra disse IP-adresser.",
+    "access_disallowed_desc": "En liste over CIDR- eller IP-adresser. Hvis den er konfigureret, vil AdGuard Home droppe anmodninger fra disse IP-adresser.",
     "access_blocked_title": "Ikke tilladte domæner",
-    "access_blocked_desc": "Forveksl ikke dette med filtre. AdGuard Home dropper DNS-forespørgsler, hvori der forespørges på disse domæner. Her kan du specificere de præcisee domænenavne, jokertegn og URL-filterregler, f.eks. 'eksempel.org', '*.eksempel.org' eller '||eksempel.org^'.",
+    "access_blocked_desc": "Forveksl det ikke med filtre. AdGuard Home vil droppe DNS-forespørgsler for disse domæner i forespørgselsspørgsmål. Her kan du specificere de nøjagtige domænenavne, wildcards og urlfilter-regler, f.eks. 'example.org', '*.example.org' eller '||example.org^'.",
-    "access_settings_saved": "Adgangsindstillinger gemt",
+    "access_settings_saved": "Adgangsindstillinger succesfuldt gemt",
-    "updates_checked": "Opdateringstjek foretaget",
+    "updates_checked": "Søgt succesfuldt efter opdateringer",
     "updates_version_equal": "AdGuard Home er opdateret",
     "check_updates_now": "Søg efter opdateringer nu",
-    "dns_privacy": "DNS-fortrolighed",
+    "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 føjer <highlight>DNS-over-HTTPS</highlight> eller <highlight>DNS-over-TLS</highlight> servere til DNS-indstillingerne.",
+    "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_android_1": "Android 9 har indbygget understøttelse af DNS-over-TLS. For at opsætte den, gå til Indstillinger → Netværk og Internet → Avanceret → Privat DNS og angiv dit domænenavn.",
+    "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> føjer <1>DNS-over-HTTPS</1> understøttelse til Android.",
+    "setup_dns_privacy_android_3": "<0>Intra</0> tilføjer <1>DNS-over-HTTPS</1> understøttelse til Android.",
-    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> understøtter <1>DNS-over-HTTPS</1>, men for at opsætte den til brug af din egen server, skal du generere et <2>DNS Stamp</2> til den.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> understøtter <1>DNS-over-HTTPS</1>, men for at konfigurere den, så den bruger din egen server, skal du generere et <2>DNS Stamp</2> til den.",
-    "setup_dns_privacy_ios_2": "<0>AdGuard til iOS</0> understøtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1> opsætning.",
+    "setup_dns_privacy_ios_2": "<0>AdGuard til iOS</0> understøtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1> installation.",
     "setup_dns_privacy_other_title": "Andre implementeringer",
     "setup_dns_privacy_other_1": "AdGuard Home kan være en sikker DNS-klient på enhver platform.",
     "setup_dns_privacy_other_2": "<0>dnsproxy</0> understøtter alle kendte sikre DNS-protokoller.",
     "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>hér</0> og <1>hér</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-opsætning",
+    "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.",
-    "setup_dns_notice": "For at kunne bruge <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, skal du <0>opsætte Krypteringen</0> i AdGuard Homes indstillinger.",
     "rewrite_added": "DNS-omskrivning for \"{{key}}\" blev tilføjet",
     "rewrite_deleted": "DNS-omskrivning for \"{{key}}\" blev slettet",
     "rewrite_add": "Tilføj DNS-omskrivning",
     "rewrite_not_found": "Ingen DNS-omskrivninger fundet",
-    "rewrite_confirm_delete": "Sikker på, at du vil slette DNS-omskrivning for \"{{key}}\"?",
+    "rewrite_confirm_delete": "Er du sikker på, at du vil slette DNS-omskrivning for \"{{key}}\"?",
-    "rewrite_desc": "Gør det nemt at opsætte det tilpassede DNS-svar for et specifikt domænenavn.",
+    "rewrite_desc": "Gør det nemt at konfigurere det tilpassede DNS-svar for et specifikt domænenavn.",
-    "rewrite_applied": "Omskrivningsregel effektueret",
+    "rewrite_applied": "Anvendt omskrivningsregel",
     "rewrite_hosts_applied": "Omskrevet af værtsfilreglen",
     "dns_rewrites": "DNS-omskrivninger",
-    "form_domain": "Angiv domænenavn eller jokertegn",
+    "form_domain": "Indtast domænenavn eller wildcard",
-    "form_answer": "Angiv IP-adresse eller domænenavn",
+    "form_answer": "Indtast IP-adresser eller domænenavne",
     "form_error_domain_format": "Ugyldigt domæneformat",
     "form_error_answer_format": "Ugyldigt svarformat",
-    "configure": "Opsæt",
+    "configure": "Konfigurer",
     "main_settings": "Hovedindstillinger",
-    "block_services": "Blokere specifikke tjenester",
+    "block_services": "Bloker specifikke tjenester",
     "blocked_services": "Blokerede tjenester",
     "blocked_services_desc": "Gør det muligt hurtigt at blokere populære websteder og tjenester.",
     "blocked_services_saved": "Blokerede tjenester er gemt",
     "blocked_services_global": "Brug globale blokerede tjenester",
     "blocked_service": "Blokeret tjeneste",
-    "block_all": "Blokér alle",
+    "block_all": "Bloker alle",
-    "unblock_all": "Afblokér alle",
+    "unblock_all": "Fjern blokering af alle",
     "encryption_certificate_path": "Certifikatsti",
-    "encryption_private_key_path": "Private nøgle-sti",
+    "encryption_private_key_path": "Placering af den private nøgle",
-    "encryption_certificates_source_path": "Opsæt en certifikatfilsti",
+    "encryption_certificates_source_path": "Indstil en sti for certifikatfilen",
     "encryption_certificates_source_content": "Indsæt certifikatets indhold",
-    "encryption_key_source_path": "Opsæt en private nøgle-fil",
+    "encryption_key_source_path": "Indstil en fil for den private nøgle",
     "encryption_key_source_content": "Indsæt indholdet af den private nøgle",
-    "stats_params": "Statistikopsætning",
+    "stats_params": "Konfiguration af statistik",
-    "config_successfully_saved": "Opsætning er gemt",
+    "config_successfully_saved": "Konfiguration er gemt",
     "interval_24_hour": "24 timer",
     "interval_days": "{{count}} dag",
     "interval_days_plural": "{{count}} dage",
@@ -485,120 +470,121 @@
     "filter_added_successfully": "Listen er tilføjet",
     "filter_removed_successfully": "Listen er blevet fjernet",
     "filter_updated": "Listen er blevet opdateret",
-    "statistics_configuration": "Statistikopsætning",
+    "statistics_configuration": "Konfiguration af statistik",
-    "statistics_retention": "Statistikbevarelse",
+    "statistics_retention": "Tilbageholdelse af statistikker",
-    "statistics_retention_desc": "Mindskes intervalværdien, vil nogle data gå tabt",
+    "statistics_retention_desc": "Hvis du mindsker intervalværdien, vil nogle data gå tabt",
     "statistics_clear": " Ryd statistikker",
-    "statistics_clear_confirm": "Sikker på, at du vil slette statistikkerne?",
+    "statistics_clear_confirm": "Er du sikker på, at du vil slette statistikkerne?",
-    "statistics_retention_confirm": "Sikker på, at du vil ændre på statistikbevaring? Mindskes intervalværdien, vil nogle data gå tabt",
+    "statistics_retention_confirm": "Er du sikker på, at du vil ændre opbevaring af statistikker? Hvis du mindsker intervalværdien, vil nogle data gå tabt",
-    "statistics_cleared": "Statistikkerne er ryddet",
+    "statistics_cleared": "Statistikkerne blev slettet",
     "interval_hours": "{{count}} time",
     "interval_hours_plural": "{{count}} timer",
-    "filters_configuration": "Filteropsætninger",
+    "filters_configuration": "Konfiguration af filtre",
     "filters_enable": "Aktivér filtre",
     "filters_interval": "Filtrenes opdateringsinterval",
     "disabled": "Deaktiveret",
     "username_label": "Brugernavn",
-    "username_placeholder": "Angiv brugernavn",
+    "username_placeholder": "Indtast brugernavn",
     "password_label": "Adgangskode",
-    "password_placeholder": "Angiv adgangskode",
+    "password_placeholder": "Indtast adgangskode",
     "sign_in": "Log ind",
     "sign_out": "Log ud",
     "forgot_password": "Glemt adgangskode?",
     "forgot_password_desc": "Følg <0>disse trin</0> for at oprette en ny adgangskode til din brugerkonto.",
     "location": "Placering",
-    "orgname": "Organisationsnavn",
+    "orgname": "Organisationens navn",
     "netname": "Netværksnavn",
     "network": "Netværk",
     "descr": "Beskrivelse",
     "whois": "Whois",
-    "filtering_rules_learn_more": "<0>Læs mere</0> om at oprette dine egne værtslister.",
+    "filtering_rules_learn_more": "<0>Lær mere</0> om at oprette dine egne værtslister.",
-    "blocked_by_response": "Blokeret af CNAME eller IP i svar",
+    "blocked_by_response": "Blokeret af CNAME eller IP som svar",
     "blocked_by_cname_or_ip": "Blokeret af CNAME eller IP",
     "try_again": "Prøv igen",
-    "domain_desc": "Angiv domænenavnet eller jokertegnene, du ønsker omskrevet.",
+    "domain_desc": "Indtast det domænenavn eller wildcard, du ønsker skal omskrives.",
     "example_rewrite_domain": "omskriv kun svar for dette domænenavn.",
-    "example_rewrite_wildcard": "omskriv svar for alle <0>example.org</0> underdomæner.",
+    "example_rewrite_wildcard": "omskriv svar for alle <0>example.org</0> subdomæner.",
-    "rewrite_ip_address": "IP-adresse: Brug denne IP i et A- eller AAAA-svar",
+    "rewrite_ip_address": "IP-adresse: brug denne IP i et A- eller AAAA-svar",
-    "rewrite_domain_name": "Domænenavn: Tilføj en CNAME-post",
+    "rewrite_domain_name": "Domænenavn: tilføj en CNAME-post",
-    "rewrite_A": "<0>A</0>: Særlig værdi, hold <0>A</0> poster fra upstream",
+    "rewrite_A": "<0>A</0>: særlig værdi, hold <0>A</0> poster fra upstream",
-    "rewrite_AAAA": "<0>AAAA</0>: Særlig værdi, hold <0>AAAA</0> poster fra upstream",
+    "rewrite_AAAA": "<0>AAAA</0>: særlig værdi, hold <0>AAAA</0> poster fra upstream",
-    "disable_ipv6": "Deaktivér IPv6",
+    "disable_ipv6": "Deaktiver IPv6",
-    "disable_ipv6_desc": "Er denne funktion aktiveret, slettes alle DNS-forespørgsler til IPv6-adresser (type AAAA).",
+    "disable_ipv6_desc": "Hvis denne funktion er aktiveret, slettes alle DNS-forespørgsler til IPv6-adresser (type AAAA).",
     "fastest_addr": "Hurtigste IP-adresse",
-    "fastest_addr_desc": "Forespørger alle DNS-servere og returner den hurtigste IP-adresse blandt alle svar. Dette vil gøre DNS-forespørgslerne langsommere grundet afventning af svar fra alle DNS-servere, men forbedrer samlet set forbindelsen.",
+    "fastest_addr_desc": "Forespørg alle DNS-servere, og returner den hurtigste IP-adresse blandt alle svar. Dette vil gøre DNS-forespørgslerne langsommere, da vi er nødt til at vente på svar fra alle DNS-servere, men forbedrer samlet set forbindelsen.",
-    "autofix_warning_text": "Klikker du på \"Reparér\", opsætter AdGuard Home dit system til brug med AdGuard Home DNS-server.",
+    "autofix_warning_text": "Hvis du klikker på \"Reparer\", vil AdGuardHome konfigurere dit system til at bruge AdGuardHome DNS-server.",
-    "autofix_warning_list": "Den vil udføre disse opgaver: <0>Deaktivere system DNSStubListener</0> <0>Opsætte DNS-serveradressen til 127.0.0.1</0> <0>Erstatte symbolsk linkmål for /etc/resolv.conf med /run/systemd/resolve/resolv.conf</0> <0>Stoppe DNSStubListener (genindlæs systemd-opløst tjeneste)</0>",
+    "autofix_warning_list": "Den vil udføre disse opgaver: <0>Deaktivering af DNSStubListener systemet</0> <0>Indstille DNS-serveradressen til 127.0.0.1</0> <0>Erstatte det symbolske linkmål for /etc/resolv.conf til /run/systemd/resolve/resolv.conf</0> <0>Stop DNSStubListener (genindlæs systemd-løst tjeneste)</0>",
-    "autofix_warning_result": "Det betyder, at alle DNS-forespørgsler fra dit system som standard behandles af AdGuard Home.",
+    "autofix_warning_result": "Som et resultat behandles alle DNS-anmodninger fra dit system som standard af AdGuard Home.",
     "tags_title": "Tags",
-    "tags_desc": "Du kan vælge de tags, som svarer til klienten. Tags kan inkluderes i filtreringsreglerne, hvilket lader anvende dem mere præcist. <0>Læs mere</0>",
+    "tags_desc": "Du kan vælge de tags, der svarer til klienten. Tags kan inkluderes i filtreringsreglerne og giver dig mulighed for at anvende dem mere nøjagtigt. <0>Læs mere</0>",
     "form_select_tags": "Vælg klient tags",
-    "check_title": "Tjek filtreringen",
+    "check_title": "Kontroller filtreringen",
-    "check_desc": "Tjek, om værtsnavnet er filtreret",
+    "check_desc": "Kontroller, om værtsnavnet er filtreret",
-    "check": "Tjek",
+    "check": "Kontroller",
-    "form_enter_host": "Angiv et værtsnavn",
+    "form_enter_host": "Indtast et værtsnavn",
-    "filtered_custom_rules": "Filtreret af tilpassede filtreringsregler",
+    "filtered_custom_rules": "Filtreret af brugerdefinerede filtreringsregler",
     "choose_from_list": "Vælg fra listen",
     "add_custom_list": "Tilføj en tilpasset liste",
     "host_whitelisted": "Værten er hvidlistet",
     "check_ip": "IP-adresser: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Årsag: {{reason}}",
-    "check_service": "Tjenestenavn: {{service}}",
+    "check_rule": "Regel: {{rule}}",
-    "service_name": "Tjenestenavn",
+    "check_service": "Servicenavn: {{service}}",
+    "service_name": "Navn på tjeneste",
     "check_not_found": "Ikke fundet i dine filterlister",
-    "client_confirm_block": "Sikker på, at du vil blokere klienten \"{{ip}}\"?",
+    "client_confirm_block": "Er du sikker på, at du vil blokere klienten \"{{ip}}\"?",
-    "client_confirm_unblock": "Sikker på, at du vil afblokere klienten \"{{ip}}\"?",
+    "client_confirm_unblock": "Er du sikker på, at du vil fjerne blokeringen af klienten \"{{ip}}\"?",
     "client_blocked": "Klient \"{{ip}}\" blev blokeret",
-    "client_unblocked": "Klient \"{{ip}}\" blev afblokeret",
+    "client_unblocked": "Blokering af klient \"{{ip}}\" fjernet",
     "static_ip": "Statisk IP-adresse",
-    "static_ip_desc": "AdGuard Home er en server, så den behøver en statisk IP-adresse for at fungere korrekt, da din router ellers på et tidspunkt vil kunne tildele en anden IP-adresse til denne enhed.",
+    "static_ip_desc": "AdGuard Home er en server, så den har brug for en statisk IP-adresse for at fungere korrekt. Ellers på et tidspunkt vil din router muligvis tildele en anden IP-adresse til denne enhed.",
-    "set_static_ip": "Opsæt en statisk IP-adresse",
+    "set_static_ip": "Indstil en statisk IP-adresse",
-    "install_static_ok": "Gode nyheder! Den statiske IP-adresse er allerede opsat",
+    "install_static_ok": "Gode nyheder! Den statiske IP-adresse er allerede konfigureret",
-    "install_static_error": "AdGuard Home kan ikke opsætte den automatisk for denne netværksgrænseflade. Søg information om, hvordan dette gøres manuelt.",
+    "install_static_error": "AdGuard Home kan ikke konfigurere det automatisk for denne netværksgrænseflade. Søg efter en instruktion om, hvordan man gør dette manuelt.",
-    "install_static_configure": "AsGuard Home har registreret, at den dynamisk IP-adresse <0>{{ip}}</0> bruges. Opsæt denne som din statiske adresse?",
+    "install_static_configure": "Vi har registreret, at der bruges en dynamisk IP-adresse — <0>{{ip}}</0>. Vil du bruge den som din statiske adresse?",
-    "confirm_static_ip": "AdGuard Home vil opsætte {{ip}} som din statiske IP-adresse. Fortsæt?",
+    "confirm_static_ip": "AdGuard Home vil konfigurere {{ip}} til at være din statiske IP-adresse. Vil du fortsætte?",
     "list_updated": "{{count}} liste opdateret",
     "list_updated_plural": "{{count}} lister opdateret",
     "dnssec_enable": "Aktivér DNSSEC",
-    "dnssec_enable_desc": "Sæt DNSSEC-flag i de udgående DNS-forespørgsler, og tjek resultatet (DNSSEC-aktiveret resolver er krævet)",
+    "dnssec_enable_desc": "Sæt DNSSEC-flag i de udgående DNS-forespørgsler, og kontroller resultatet (DNSSEC-aktiveret resolver er krævet)",
     "validated_with_dnssec": "Valideret med DNSSEC",
     "all_queries": "Alle forespørgsler",
     "show_blocked_responses": "Blokeret",
     "show_whitelisted_responses": "Hvidlistet",
     "show_processed_responses": "Behandlet",
     "blocked_safebrowsing": "Blokeret af Safebrowsing",
-    "blocked_adult_websites": "Blokerede Voksen Websteder",
+    "blocked_adult_websites": "Blokerede Websteder for Voksne",
     "blocked_threats": "Blokerede Trusler",
     "allowed": "Tilladt",
     "filtered": "Filtreret",
     "rewritten": "Omskrevet",
     "safe_search": "Sikker søgning",
-    "blocklist": "Sortliste",
+    "blocklist": "Blokeringsliste",
     "milliseconds_abbreviation": "ms",
     "cache_size": "Cache-størrelse",
-    "cache_size_desc": "DNS-cache størrelse (i bytes)",
+    "cache_size_desc": "Størrelse på DNS-cache (i bytes)",
-    "cache_ttl_min_override": "Tilsidesæt minimum TTL",
+    "cache_ttl_min_override": "Overskriv minimum TTL",
-    "cache_ttl_max_override": "Tilsidesæt maksimal TTL",
+    "cache_ttl_max_override": "Overskriv maksimal TTL",
-    "enter_cache_size": "Angiv cache-størrelse (bytes)",
+    "enter_cache_size": "Indtast cache-størrelse (bytes)",
-    "enter_cache_ttl_min_override": "Angiv minimum TTL (sekunder)",
+    "enter_cache_ttl_min_override": "Indtast minimum TTL (sekunder)",
-    "enter_cache_ttl_max_override": "Angiv maksimum TTL (sekunder)",
+    "enter_cache_ttl_max_override": "Indtast maksimum TTL (sekunder)",
-    "cache_ttl_min_override_desc": "Forlæng korte time-to-live værdier (sekunder) modtaget fra upstream-serveren, når DNS-svar cachelagres",
+    "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",
     "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",
     "filter_category_regional": "Regional",
     "filter_category_other": "Andre",
-    "filter_category_general_desc": "Lister, som blokerer sporing og reklamer på de fleste enheder",
+    "filter_category_general_desc": "Lister der blokerer for sporing og reklamer på de fleste enheder",
-    "filter_category_security_desc": "Lister specialdesignet til at blokere malware-, phishing- eller svindel-domæner",
+    "filter_category_security_desc": "Lister, der er specialiserede i at blokere malware, phishing eller scam-domæner",
-    "filter_category_regional_desc": "Lister målrettet regionale annoncer og sporingsservere",
+    "filter_category_regional_desc": "Lister, der fokuserer på regionale annoncer og tracking-servere",
     "filter_category_other_desc": "Andre blokeringslister",
-    "setup_config_to_enable_dhcp_server": "Opsæt indstillinger for at aktivere DHCP-server",
+    "setup_config_to_enable_dhcp_server": "Opsætningskonfiguration for at aktivere DHCP-server",
     "original_response": "Oprindeligt svar",
     "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

@@ -8,11 +8,6 @@
     "load_balancing_desc": "Einen Server nach dem anderen abfragen. AdGuard Home verwendet den gewichteten Zufallsalgorithmus, um den Server so auszuwählen, dass der schnellste Server häufiger verwendet wird.",
     "bootstrap_dns": "Bootstrap DNS-Server starten",
     "bootstrap_dns_desc": "Bootstrap-DNS-Server werden verwendet, um IP-Adressen der DoH/DoT-Resolver aufzulösen, die Sie als Upstreams angeben.",
-    "local_ptr_title": "Eigene DNS-Server",
-    "local_ptr_desc": "Die DNS-Server, die AdGuard Home für lokale PTR-Abfragen verwendet. Diese Server werden verwendet, um die Hostnamen von Clients mit privaten IP-Adressen, z. B. „192.168.12.34“, mithilfe von rDNS aufzulösen. Wenn nicht festgelegt, verwendet AdGuard Home die Standard-DNS-Resolver Ihres Betriebssystems.",
-    "local_ptr_placeholder": "Eine Serveradresse pro Zeile eingeben",
-    "resolve_clients_title": "Hostnamenauflösung der Clients aktivieren",
-    "resolve_clients_desc": "Wenn aktiviert, versucht AdGuard Home, die Hostnamen der Clients automatisch aus deren IP-Adressen aufzulösen, indem er eine PTR-Abfrage an einen entsprechenden Auflösungsdienst (privater DNS-Server für lokale Clients, Upstream-Server für Clients mit öffentlicher IP) sendet.",
     "check_dhcp_servers": "Auf DHCP-Server prüfen",
     "save_config": "Konfiguration speichern",
     "enabled_dhcp": "DHCP-Server aktiviert",
@@ -28,7 +23,7 @@
     "dhcp_leases": "DHCP-Leasingverträge",
     "dhcp_static_leases": "DHCP statische Leases",
     "dhcp_leases_not_found": "Keine DHCP-Leasingverträge gefunden\n",
-    "dhcp_config_saved": "DHCP-Konfiguration erfolgreich gespeichert",
+    "dhcp_config_saved": "Gespeicherte DHCP-Server-Konfiguration",
     "dhcp_ipv4_settings": "DHCP-IPv4-Einstellungen",
     "dhcp_ipv6_settings": "DHCP-IPv6-Einstellungen",
     "form_error_required": "Pflichtfeld",
@@ -37,8 +32,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_subnet": "Subnetz „{{cidr}}” enthält nicht die IP-Adresse „{{ip}}”",
     "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",
@@ -58,7 +51,7 @@
     "dhcp_warning": "Wenn Sie den DHCP-Server trotzdem aktivieren möchten, stellen Sie sicher, dass sich in Ihrem Netzwerk kein anderer aktiver DHCP-Server befindet. Andernfalls kann es bei angeschlossenen Geräten zu einem Ausfall des Internets kommen!",
     "dhcp_error": "Es konnte nicht ermittelt werden, ob es einen anderen DHCP-Server im Netzwerk gibt.",
     "dhcp_static_ip_error": "Um den DHCP-Server nutzen zu können, muss eine statische IP-Adresse festgelegt werden. Es konnte nicht ermittelt werden, ob diese Netzwerkschnittstelle mit statischer IP-Adresse konfiguriert ist. Bitte legen Sie eine statische IP-Adresse manuell fest.",
-    "dhcp_dynamic_ip_found": "Ihr System verwendet die dynamische Konfiguration der IP-Adresse für die Schnittstelle <0>{{interfaceName}}</0>. Um den DHCP-Server nutzen zu können, muss eine statische IP-Adresse festgelegt werden. Ihre aktuelle IP-Adresse ist <0>{{ipAddress}}</0>. Diese IP-Adresse wird automatisch als statisch festgelegt, sobald Sie auf die Schaltfläche „DHCP-Server aktivieren” klicken.",
+    "dhcp_dynamic_ip_found": "Ihr System verwendet die dynamische Konfiguration der IP-Adresse für die Schnittstelle <0>{{interfaceName}}</0>. Um den DHCP-Server nutzen zu können, muss eine statische IP-Adresse festgelegt werden. Ihre aktuelle IP-Adresse ist <0>{{ipAddress}}</0>. Diese IP-Adresse wird automatisch als statisch festgelegt, sobald Sie auf die Schaltfläche „DHCP aktivieren” klicken.",
     "dhcp_lease_added": "Statischer Lease „{{key}}” erfolgreich hinzugefügt",
     "dhcp_lease_deleted": "Statischer Lease „{{key}}” erfolgreich entfernt",
     "dhcp_new_static_lease": "Neuer statischer Lease",
@@ -98,25 +91,25 @@
     "disabled_protection": "Schutz deaktiviert",
     "refresh_statics": "Statistiken aktualisieren",
     "dns_query": "DNS-Anfragen",
-    "blocked_by": "<0>Durch Filter gesperrt</0>",
+    "blocked_by": "<0>Blockiert durch die Filter</0>",
-    "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Webseiten",
+    "stats_malware_phishing": "Blockierte Malware/Phishing",
-    "stats_adult": "Gesperrte jugendgefährdende Webseiten",
+    "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",
     "number_of_dns_query_days": "Anzahl der in den letzten {{count}} Tagen verarbeiteten DNS-Anfragen",
     "number_of_dns_query_days_plural": "Anzahl der DNS-Abfragen, die in den letzten {{count}} Tagen verarbeitet wurden",
     "number_of_dns_query_24_hours": "Anzahl der in den letzten 24 Stunden durchgeführten DNS-Anfragen",
-    "number_of_dns_query_blocked_24_hours": "Anzahl der durch Werbefilter und Host-Sperrlisten abgelehnte 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",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "AdGuard Webservice für Kindersicherung verwenden",
     "use_adguard_parental_hint": "AdGuard Home wird prüfen, ob die Domain jugendgefährdende Inhalte enthält. Zum Schutz Ihrer Privatsphäre wird die selbe API wie für den Webservice für Internetsicherheit verwendet.",
     "enforce_safe_search": "SafeSearch erzwingen",
-    "enforce_save_search_hint": "AdGuard kann SafeSearch für folgende Suchmaschinen erzwingen: Google, YouTube, Bing und Yandex.",
+    "enforce_save_search_hint": "AdGuard kann SafeSearch für folgende Suchmaschinen erzwingen: Google, Youtube, Bing und Yandex.",
     "no_servers_specified": "Keine Server festgelegt",
     "general_settings": "Allgemeine Einstellungen",
     "dns_settings": "DNS-Einstellungen",
@@ -178,8 +171,8 @@
     "edit_allowlist": "Freigabeliste bearbeiten",
     "choose_blocklist": "Sperrliste wählen",
     "choose_allowlist": "Freigabeliste wählen",
-    "enter_valid_blocklist": "Gültige Webadresse zur Sperrliste eingeben.",
+    "enter_valid_blocklist": "Gültige Webadresse der Sperrliste eingeben.",
-    "enter_valid_allowlist": "Gültige Webadresse zur Freigabeliste eingeben.",
+    "enter_valid_allowlist": "Gültige Webadresse der Positivliste eingeben.",
     "form_error_url_format": "Ungültiges URL-Format",
     "form_error_url_or_path_format": "Ungültige URL oder absoluter Pfad der Liste",
     "custom_filter_rules": "Benutzerdefinierte Filterregeln",
@@ -201,7 +194,7 @@
     "all_lists_up_to_date_toast": "Alle Listen sind bereits auf dem neuesten Stand",
     "updated_upstream_dns_toast": "Upstream-DNS-Server wurden aktualisiert",
     "dns_test_ok_toast": "Angegebene DNS-Server arbeiten ordnungsgemäß",
-    "dns_test_not_ok_toast": "Server „{{key}}“: konnte nicht verwendet werden, bitte überprüfen Sie die korrekte Schreibweise",
+    "dns_test_not_ok_toast": "Server \"{{key}}\": konnte nicht verwendet werden, bitte überprüfen Sie die korrekte Schreibweise",
     "unblock": "Entsperren",
     "block": "Sperren",
     "disallow_this_client": "Diesen Client sperren",
@@ -254,22 +247,16 @@
     "custom_ip": "Benutzerdefinierte IP",
     "blocking_ipv4": "IPv4-Sperren",
     "blocking_ipv6": "IPv6-Sperren",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "EDNS Client Subnetz aktivieren",
     "edns_cs_desc": "Wenn aktiviert, sendet AdGuard Home die Subnetze der Clients an die DNS-Server.",
-    "rate_limit_desc": "Die Anzahl der Anfragen pro Sekunde, die ein einzelner Client stellen darf. Das Setzen auf 0 bedeutet keine Begrenzung.",
+    "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",
@@ -282,7 +269,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",
@@ -311,10 +298,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Diese Einrichtung deckt automatisch alle an Ihren Heimrouter angeschlossenen Geräte ab, und Sie müssen nicht jedes einzelne davon manuell konfigurieren.",
     "install_devices_address": "Der AdGuard Home DNS-Server belauscht die folgenden Adressen",
-    "install_devices_router_list_1": "Öffnen Sie die Einstellungen für Ihren Router. In der Regel können Sie über eine URL (z. B. http://192.168.0.1/ oder http://192.168.1.1) von Ihrem Browser aus darauf zugreifen. Möglicherweise werden Sie aufgefordert, ein Passwort einzugeben. Wenn Sie sich nicht mehr daran erinnern, können Sie das Passwort oft durch Drücken einer Taste am Router selbst zurücksetzen, aber seien Sie sich bewusst, dass Sie bei dieser Vorgehensweise wahrscheinlich die gesamte Routerkonfiguration verlieren. Wenn für die Einrichtung Ihres Routers eine App erforderlich ist, installieren Sie bitte die App auf Ihrem mobilen Endgerät oder PC und verwenden Sie sie für den Zugriff auf die Einstellungen des Routers.",
+    "install_devices_router_list_1": "Öffnen Sie die Einstellungen für Ihren Router. In der Regel können Sie von Ihrem Browser aus über eine URL (wie http://192.168.0.1/ oder http://192.168.1.1/) darauf zugreifen. Möglicherweise werden Sie aufgefordert, das Passwort einzugeben. Wenn Sie sich nicht mehr daran erinnern, können Sie das Passwort oft durch Drücken einer Taste auf dem Router selbst zurücksetzen. Einige Router benötigen eine bestimmte Anwendung, die in diesem Fall bereits auf Ihrem Computer/Telefon installiert sein sollte.",
-    "install_devices_router_list_2": "Wechseln Sie zu den DHCP/DNS-Einstellungen. Suchen sie dort nach einem Eintrag „DNS“ und einem Bereich, welches zwei oder drei Zahlengruppen zulässt, die jeweils in vier Blöcke von ein bis drei Ziffern unterteilt sind.",
+    "install_devices_router_list_2": "DHCP/DNS-Einstellungen suchen. Suchen Sie nach den DNS-Buchstaben neben einem Feld, das zwei oder drei Zahlensätze erlaubt, die jeweils in vier Gruppen von ein bis drei Ziffern unterteilt sind.",
     "install_devices_router_list_3": "Geben Sie dort Ihre AdGuard Home Server-Adressen ein.",
-    "install_devices_router_list_4": "Bei einigen Routertypen kann kein eigener DNS-Server eingerichtet werden. In diesem Fall kann es helfen, AdGuard Home als <0>DHCP-Server</0> einzurichten. Andernfalls sollten Sie im Handbuch des Routers nachsehen, wie Sie DNS-Server auf Ihrem konkreten Router-Modell anpassen können.",
+    "install_devices_router_list_4": "Sie können auf einigen Routern keine beliebigen DNS-Server festlegen. In diesem Fall kann es hilfreich sein, dass Sie AdGuard Home als <0>DHCP-Server</0> festlegen. Andernfalls sollten Sie nach einer Bedienungsanleitung zum Anpassen des DNS-Server für Ihr Router-Modell suchen.",
     "install_devices_windows_list_1": "Öffnen Sie die Systemsteuerung über das Startmenü oder die Windows-Suche.",
     "install_devices_windows_list_2": "Öffnen Sie die Kategorie „Netzwerk und Internet” und dann „Netzwerk- und Freigabecenter”.",
     "install_devices_windows_list_3": "Suchen Sie auf der linken Seite des Bildschirms nach „Adaptereinstellungen ändern” und klicken Sie darauf.",
@@ -340,7 +327,7 @@
     "install_saved": "Erfolgreich gespeichert",
     "encryption_title": "Verschlüsselung",
     "encryption_desc": "Verschlüsselungsunterstützung (HTTPS/TLS) für DNS- und Admin-Weboberfläche",
-    "encryption_config_saved": "Verschlüsselungskonfiguration gespeichert",
+    "encryption_config_saved": "Verschlüsselungseinstellungen wurden gespeichert",
     "encryption_server": "Servername",
     "encryption_server_enter": "Domain-Namen eingeben",
     "encryption_server_desc": "Um HTTPS verwenden zu können, müssen Sie den Servernamen eingeben, der zu Ihrem SSL-Zertifikat passt.",
@@ -401,7 +388,6 @@
     "ip_address": "IP-Adresse",
     "client_identifier_desc": "Clients können durch die IP-Adresse oder MAC-Adresse identifiziert werden. Bitte beachten Sie, dass die Verwendung der MAC-Adresse als Identifikator nur möglich ist, wenn AdGuard Home gleichzeitig als <0>DHCP-Server</0> eingerichtet ist.",
     "form_enter_ip": "IP-Adresse eingeben",
-    "form_enter_subnet_ip": "IP-Adresse zum Subnetz „{{cidr}}” hinzufügen",
     "form_enter_mac": "MAC-Adresse eingeben",
     "form_enter_id": "Kennung eingeben",
     "form_add_id": "Kennung hinzufügen",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Nicht zugelassene Clients",
     "access_disallowed_desc": "Eine Liste von CIDR- oder IP-Adressen. Wenn konfiguriert, löscht AdGuard Home Anfragen von diesen IP-Adressen.",
     "access_blocked_title": "Nicht zugelassene Domains",
-    "access_blocked_desc": "Verwechseln Sie dies nicht mit Filtern. AdGuard Home löscht DNS-Abfragen mit diesen Domänen während der Abfrage. Hier können Sie die genauen Domain-Namen, Wildcards und URL-Filter-Regeln angeben, z.B. 'beispiel.org', '*.beispiel.org' oder '||beispiel.org^'.",
+    "access_blocked_desc": "Verwechseln Sie dies nicht mit Filtern. AdGuard Home löscht DNS-Abfragen mit diesen Domänen während der Abfrage. Hier können Sie die genauen Domain-Namen, Wildcards und URL-Filter-Regeln angeben, z.B. 'beispiel.org', '*.beispiel.org' oder '|||beispiel.org^'.",
     "access_settings_saved": "Zugriffseinstellungen erfolgreich gespeichert",
     "updates_checked": "Erfolgreich auf Aktualisierungen geprüft",
     "updates_version_equal": "AdGuard Home ist aktuell",
@@ -444,7 +430,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",
@@ -513,7 +498,7 @@
     "descr": "Beschreibung",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Erfahren Sie mehr</0> über die Erstellung eigener Hosts-Listen.",
-    "blocked_by_response": "Gesperrt nach Antwort von CNAME oder IP",
+    "blocked_by_response": "Nach CNAME oder IP-Antwort blockiert",
     "blocked_by_cname_or_ip": "Gesperrt durch CNAME oder IP",
     "try_again": "Erneut versuchen",
     "domain_desc": "Geben Sie den Domain-Namen oder den Platzhalter ein, der umgeschrieben werden soll.",
@@ -526,7 +511,7 @@
     "disable_ipv6": "IPv6 deaktivieren",
     "disable_ipv6_desc": "Wenn diese Funktion aktiviert ist, werden alle DNS-Abfragen für IPv6-Adressen (Typ AAAA) verworfen.",
     "fastest_addr": "Schnellste IP-Adresse",
-    "fastest_addr_desc": "Fragen Sie alle DNS-Server ab und geben Sie die schnellste IP-Adresse unter allen Antworten zurück. Dies verlangsamt DNS-Abfragen, da AdGuard Home auf Antworten von allen DNS-Servern warten muss, verbessert jedoch die Gesamtkonnektivität.",
+    "fastest_addr_desc": "Abfrage aller DNS-Server und Rückgabe der schnellsten IP-Adresse unter allen Antworten",
     "autofix_warning_text": "Wenn Sie auf „Beheben” klicken, konfiguriert AdGuardHome Ihr System für die Verwendung des AdGuardHome-DNS-Servers.",
     "autofix_warning_list": "Es werden folgende Aufgaben ausgeführt: <0>Deaktivieren des DNSStubListener-Systems</0> <0>Festlegen der DNS-Server-Adresse auf 127.0.0.1</0> <0>Ersetzen des symbolischen Linkziels von /etc/resolv.conf auf /run/systemd/resolve/resolv.conf</0> <0>Anhalten des DNSStubListener (systemseitig aufgelöster Dienst wird nachladen)</0>",
     "autofix_warning_result": "Als Folge daraus werden alle DNS-Anforderungen von Ihrem System standardmäßig von AdGuardHome verarbeitet.",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "set_static_ip": "Feste IP-Adresse festlegen",
     "install_static_ok": "Gute Nachrichten! Die feste IP-Adresse ist bereits konfiguriert",
     "install_static_error": "AdGuard Home kann nicht automatisch für diese Netzwerkschnittstelle konfiguriert werden. Bitte suchen Sie nach einer Anleitung, wie Sie dies manuell durchführen können.",
-    "install_static_configure": "AdGuard Home hat festgestellt, dass die dynamische IP-Adresse <0>{{ip}}</0> verwendet wird. Möchten Sie, dass es als statische Adresse festgelegt wird?",
+    "install_static_configure": "Wir haben festgestellt, dass eine dynamische IP-Adresse verwendet wird — <0>{{ip}}</0>. Möchten Sie diese als feste Adresse verwenden?",
     "confirm_static_ip": "AdGuard Home konfiguriert {{ip}} als Ihre feste IP-Adresse. Möchten Sie fortfahren?",
     "list_updated": "{{count}} Liste aktualisiert",
     "list_updated_plural": "{{count}} Listen aktualisiert",
@@ -599,6 +585,6 @@
     "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": "Dieser Client ist nicht zugelassen, da dieser nicht in der Liste „Erlaubte Clients” aufgeführt ist.",
+    "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

@@ -1,20 +1,15 @@
 {
     "client_settings": "Client settings",
-    "example_upstream_reserved": "You can specify a DNS upstream <0>for the specific domain(s)</0>",
+    "example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)</0>",
-    "example_upstream_comment": "You can specify a comment",
+    "example_upstream_comment": "You can specify the comment",
-    "upstream_parallel": "Use parallel queries to speed up resolving by querying all upstream servers simultaneously.",
+    "upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers",
     "parallel_requests": "Parallel requests",
     "load_balancing": "Load-balancing",
-    "load_balancing_desc": "Query one upstream server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server is used more often.",
+    "load_balancing_desc": "Query one server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server will be used more often.",
     "bootstrap_dns": "Bootstrap DNS servers",
     "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.",
-    "local_ptr_title": "Private DNS servers",
-    "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS resolvers of your OS.",
-    "local_ptr_placeholder": "Enter one server address per line",
-    "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
-    "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream server for clients with public IP addresses).",
     "check_dhcp_servers": "Check for DHCP servers",
-    "save_config": "Save configuration",
+    "save_config": "Save config",
     "enabled_dhcp": "DHCP server enabled",
     "disabled_dhcp": "DHCP server disabled",
     "unavailable_dhcp": "DHCP is unavailable",
@@ -23,12 +18,12 @@
     "dhcp_description": "If your router does not provide DHCP settings, you can use AdGuard's own built-in DHCP server.",
     "dhcp_enable": "Enable DHCP server",
     "dhcp_disable": "Disable DHCP server",
-    "dhcp_not_found": "It is safe to enable the built-in DHCP server because AdGuard Home didn't find any active DHCP servers on the network. However, you should re-check that manually as the automatic probing doesn't currently provide a 100% guarantee.",
+    "dhcp_not_found": "It is safe to enable the built-in DHCP server - we didn't find any active DHCP servers on the network. However, we encourage you to re-check it manually as our automatic test currently doesn't give 100% guarantee.",
     "dhcp_found": "An active DHCP server is found on the network. It is not safe to enable the built-in DHCP server.",
     "dhcp_leases": "DHCP leases",
     "dhcp_static_leases": "DHCP static leases",
     "dhcp_leases_not_found": "No DHCP leases found",
-    "dhcp_config_saved": "DHCP configuration successfully saved",
+    "dhcp_config_saved": "DHCP config successfully saved",
     "dhcp_ipv4_settings": "DHCP IPv4 Settings",
     "dhcp_ipv6_settings": "DHCP IPv6 Settings",
     "form_error_required": "Required field",
@@ -37,8 +32,7 @@
     "form_error_ip_format": "Invalid IP format",
     "form_error_mac_format": "Invalid MAC format",
     "form_error_client_id_format": "Invalid client ID format",
-    "form_error_server_name": "Invalid server name",
+    "form_error_server_name": "Invalid server name or wildcard certificate",
-    "form_error_subnet": "Subnet \"{{cidr}}\" does not contain the IP address \"{{ip}}\"",
     "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",
@@ -55,16 +49,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "Hostname",
     "dhcp_table_expires": "Expires",
-    "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network, as this may break the Internet connectivity for devices on the network!",
+    "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network. Otherwise, it can break the Internet for connected devices!",
-    "dhcp_error": "AdGuard Home could not determine if there is another active DHCP server on the network.",
+    "dhcp_error": "We could not determine whether there is another DHCP server in the network.",
-    "dhcp_static_ip_error": "In order to use DHCP server a static IP address must be set. AdGuard Home failed to determine if this network interface is configured using a static IP address. Please set a static IP address manually.",
+    "dhcp_static_ip_error": "In order to use DHCP server a static IP address must be set. We failed to determine if this network interface is configured using static IP address. Please set a static IP address manually.",
-    "dhcp_dynamic_ip_found": "Your system uses dynamic IP address configuration for interface <0>{{interfaceName}}</0>. In order to use DHCP server, a static IP address must be set. Your current IP address is <0>{{ipAddress}}</0>. AdGuard Home will automatically set this IP address as static if you press the \"Enable DHCP server\" button.",
+    "dhcp_dynamic_ip_found": "Your system uses dynamic IP address configuration for interface <0>{{interfaceName}}</0>. In order to use DHCP server a static IP address must be set. Your current IP address is <0>{{ipAddress}}</0>. We will automatically set this IP address as static if you press Enable DHCP button.",
     "dhcp_lease_added": "Static lease \"{{key}}\" successfully added",
     "dhcp_lease_deleted": "Static lease \"{{key}}\" successfully deleted",
     "dhcp_new_static_lease": "New static lease",
     "dhcp_static_leases_not_found": "No DHCP static leases found",
     "dhcp_add_static_lease": "Add static lease",
-    "dhcp_reset": "Are you sure you want to reset the DHCP configuration?",
+    "dhcp_reset": "Are you sure you want to reset DHCP config?",
     "country": "Country",
     "city": "City",
     "delete_confirm": "Are you sure you want to delete \"{{key}}\"?",
@@ -111,14 +105,14 @@
     "top_clients": "Top clients",
     "no_clients_found": "No clients found",
     "general_statistics": "General statistics",
-    "number_of_dns_query_days": "The number of DNS queries processed for the last {{count}} day",
+    "number_of_dns_query_days": "A number of DNS queries processed for the last {{count}} day",
-    "number_of_dns_query_days_plural": "The number of DNS queries processed for the last {{count}} days",
+    "number_of_dns_query_days_plural": "A number of DNS queries processed for the last {{count}} days",
-    "number_of_dns_query_24_hours": "The number of DNS queries processed for the last 24 hours",
+    "number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours",
-    "number_of_dns_query_blocked_24_hours": "The number of DNS requests blocked by adblock filters and hosts blocklists",
+    "number_of_dns_query_blocked_24_hours": "A number of DNS requests blocked by adblock filters and hosts blocklists",
-    "number_of_dns_query_blocked_24_hours_by_sec": "The number of DNS requests blocked by the AdGuard browsing security module",
+    "number_of_dns_query_blocked_24_hours_by_sec": "A number of DNS requests blocked by the AdGuard browsing security module",
-    "number_of_dns_query_blocked_24_hours_adult": "The number of adult websites blocked",
+    "number_of_dns_query_blocked_24_hours_adult": "A number of adult websites blocked",
     "enforced_save_search": "Enforced safe search",
-    "number_of_dns_query_to_safe_search": "The number of DNS requests to search engines for which Safe Search was enforced",
+    "number_of_dns_query_to_safe_search": "A number of DNS requests to search engines for which Safe Search was enforced",
     "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",
@@ -128,7 +122,7 @@
     "use_adguard_parental": "Use AdGuard parental control web service",
     "use_adguard_parental_hint": "AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.",
     "enforce_safe_search": "Enforce safe search",
-    "enforce_save_search_hint": "AdGuard Home can enforce safe search in the following search engines: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home can enforce safe search in the following search engines: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "No servers specified",
     "general_settings": "General settings",
     "dns_settings": "DNS settings",
@@ -140,7 +134,7 @@
     "encryption_settings": "Encryption settings",
     "dhcp_settings": "DHCP settings",
     "upstream_dns": "Upstream DNS servers",
-    "upstream_dns_help": "Enter one server address per line. <a>Learn more</a> about configuring upstream DNS servers.",
+    "upstream_dns_help": "Enter servers addresses one per line. <a>Learn more</a> about configuring upstream DNS servers.",
     "upstream_dns_configured_in_file": "Configured in {{path}}",
     "test_upstream_btn": "Test upstreams",
     "upstreams": "Upstreams",
@@ -254,22 +248,17 @@
     "custom_ip": "Custom IP",
     "blocking_ipv4": "Blocking IPv4",
     "blocking_ipv6": "Blocking IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Enable EDNS Client Subnet",
     "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.",
-    "rate_limit_desc": "The number of requests per second allowed per client. Setting it to 0 means no limit.",
+    "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)",
     "blocking_ipv4_desc": "IP address to be returned for a blocked A request",
     "blocking_ipv6_desc": "IP address to be returned for a blocked AAAA request",
     "blocking_mode_default": "Default: Respond with zero IP address (0.0.0.0 for A; :: for AAAA) when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule",
@@ -282,7 +271,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",
@@ -292,7 +281,7 @@
     "install_settings_listen": "Listen interface",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Your AdGuard Home admin web interface will be available on the following addresses:",
-    "form_error_port": "Enter valid port number",
+    "form_error_port": "Enter valid port value",
     "install_settings_dns": "DNS server",
     "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server on the following addresses:",
     "install_settings_all_interfaces": "All interfaces",
@@ -311,10 +300,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "This setup will automatically cover all the devices connected to your home router and you will not need to configure each of them manually.",
     "install_devices_address": "AdGuard Home DNS server is listening on the following addresses",
-    "install_devices_router_list_1": "Open the preferences for your router. Usually, you can access it from your browser via a URL, such as http://192.168.0.1/ or http://192.168.1.1/. You may be prompted to enter a password. If you don't remember it, you can often reset the password by pressing a button on the router itself, but be aware that if this procedure is chosen, you will probably lose the entire router configuration. If your router requires an app to set it up, please install the app on your phone or PC and use it to access the router’s settings.",
+    "install_devices_router_list_1": "Open the preferences for your router. Usually, you can access it from your browser via a URL (like http://192.168.0.1/ or http://192.168.1.1/). You may be asked to enter the password. If you don't remember it, you can often reset the password by pressing a button on the router itself. Some routers require a specific application, which in that case should be already installed on your computer/phone.",
     "install_devices_router_list_2": "Find the DHCP/DNS settings. Look for the DNS letters next to a field which allows two or three sets of numbers, each broken into four groups of one to three digits.",
     "install_devices_router_list_3": "Enter your AdGuard Home server addresses there.",
-    "install_devices_router_list_4": "On some router types, a custom DNS server cannot be set up. In that case, setting up AdGuard Home as a <0>DHCP server</0> may help. Otherwise, you should check the router manual on how to customize DNS servers on your specific router model.",
+    "install_devices_router_list_4": "You can't set a custom DNS server on some types of routers. In this case it may help if you set up AdGuard Home as a <0>DHCP server</0>. Otherwise, you should search for the manual on how to customize DNS servers for your particular router model.",
     "install_devices_windows_list_1": "Open Control Panel through Start menu or Windows search.",
     "install_devices_windows_list_2": "Go to Network and Internet category and then to Network and Sharing Center.",
     "install_devices_windows_list_3": "On the left side of the screen find Change adapter settings and click on it.",
@@ -340,7 +329,7 @@
     "install_saved": "Saved successfully",
     "encryption_title": "Encryption",
     "encryption_desc": "Encryption (HTTPS/TLS) support for both DNS and admin web interface",
-    "encryption_config_saved": "Encryption configuration saved",
+    "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.",
@@ -371,13 +360,13 @@
     "encryption_reset": "Are you sure you want to reset encryption settings?",
     "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.",
     "topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings</0>.",
-    "form_error_port_range": "Enter port number in the range of 80-65535",
+    "form_error_port_range": "Enter port value in the range of 80-65535",
     "form_error_port_unsafe": "This is an unsafe port",
-    "form_error_equal": "Must not be equal",
+    "form_error_equal": "Shouldn't be equal",
     "form_error_password": "Password mismatched",
     "reset_settings": "Reset settings",
     "update_announcement": "AdGuard Home {{version}} is now available! <0>Click here</0> for more info.",
-    "setup_guide": "Setup Guide",
+    "setup_guide": "Setup guide",
     "dns_addresses": "DNS addresses",
     "dns_start": "DNS server is starting up",
     "dns_status_error": "Error checking the DNS server status",
@@ -399,9 +388,8 @@
     "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 or domain. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
     "form_enter_ip": "Enter IP",
-    "form_enter_subnet_ip": "Enter an IP address in the subnet \"{{cidr}}\"",
     "form_enter_mac": "Enter MAC",
     "form_enter_id": "Enter identifier",
     "form_add_id": "Add identifier",
@@ -423,7 +411,7 @@
     "access_disallowed_title": "Disallowed clients",
     "access_disallowed_desc": "A list of CIDR or IP addresses. If configured, AdGuard Home will drop requests from these IP addresses.",
     "access_blocked_title": "Disallowed domains",
-    "access_blocked_desc": "Don't confuse this with filters. AdGuard Home will drop DNS queries with these domains in queries' questions. Here you can specify the exact domain names, wildcards and URL filter rules, e.g. \"example.org\", \"*.example.org\" or \"||example.org^\".",
+    "access_blocked_desc": "Don't confuse this with filters. AdGuard Home will drop DNS queries with these domains in query's question. Here you can specify the exact domain names, wildcards and urlfilter-rules, e.g. 'example.org', '*.example.org' or '||example.org^'.",
     "access_settings_saved": "Access settings successfully saved",
     "updates_checked": "Updates successfully checked",
     "updates_version_equal": "AdGuard Home is up-to-date",
@@ -444,7 +432,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",
@@ -526,7 +513,7 @@
     "disable_ipv6": "Disable IPv6",
     "disable_ipv6_desc": "If this feature is enabled, all DNS queries for IPv6 addresses (type AAAA) will be dropped.",
     "fastest_addr": "Fastest IP address",
-    "fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This slows down DNS queries as AdGuard Home has to wait for responses from all DNS servers, but improves the overall connectivity.",
+    "fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This will slow down the DNS queries as we have to wait for responses from all DNS servers, but improve the overall connectivity.",
     "autofix_warning_text": "If you click \"Fix\", AdGuard Home will configure your system to use AdGuard Home DNS server.",
     "autofix_warning_list": "It will perform these tasks: <0>Deactivate system DNSStubListener</0> <0>Set DNS server address to 127.0.0.1</0> <0>Replace symbolic link target of /etc/resolv.conf with /run/systemd/resolve/resolv.conf</0> <0>Stop DNSStubListener (reload systemd-resolved service)</0>",
     "autofix_warning_result": "As a result all DNS requests from your system will be processed by AdGuard Home by default.",
@@ -544,6 +531,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",
@@ -556,7 +544,7 @@
     "set_static_ip": "Set a static IP address",
     "install_static_ok": "Good news! The static IP address is already configured",
     "install_static_error": "AdGuard Home cannot configure it automatically for this network interface. Please look for an instruction on how to do this manually.",
-    "install_static_configure": "AdGuard Home has detected that the dynamic IP address <0>{{ip}}</0> is used. Do you want it to be set as your static address?",
+    "install_static_configure": "We have detected that a dynamic IP address is used — <0>{{ip}}</0>. Do you want to use it as your static address?",
     "confirm_static_ip": "AdGuard Home will configure {{ip}} to be your static IP address. Do you want to proceed?",
     "list_updated": "{{count}} list updated",
     "list_updated_plural": "{{count}} lists updated",
@@ -594,7 +582,7 @@
     "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains",
     "filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
     "filter_category_other_desc": "Other blocklists",
-    "setup_config_to_enable_dhcp_server": "Setup configuration to enable DHCP server",
+    "setup_config_to_enable_dhcp_server": "Setup config to enable DHCP server",
     "original_response": "Original response",
     "click_to_view_queries": "Click to view queries",
     "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this.",

client/src/__locales/es.json

@@ -2,17 +2,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 consultas paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores DNS de subida.",
+    "upstream_parallel": "Usar peticiones paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores de subida",
-    "parallel_requests": "Consultas paralelas",
+    "parallel_requests": "Peticiones paralelas",
     "load_balancing": "Balanceo de carga",
-    "load_balancing_desc": "Consulta un servidor DNS de subida 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.",
+    "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.",
-    "local_ptr_title": "Servidores DNS privados",
-    "local_ptr_desc": "Los servidores DNS que AdGuard Home utiliza para las consultas PTR locales. Estos servidores se utilizan para resolver los nombres de hosts de los clientes a direcciones IP privadas, por ejemplo \"192.168.12.34\", utilizando rDNS. Si no está establecido, AdGuard Home utilizará los resolutores DNS predeterminados de tu sistema operativo.",
-    "local_ptr_placeholder": "Ingresa una dirección de servidor por línea",
-    "resolve_clients_title": "Habilitar la resolución inversa de las direcciones IP de clientes",
-    "resolve_clients_desc": "Si está habilitado, AdGuard Home intentará resolver de manera inversa las direcciones IP de los clientes a sus nombres de hosts enviando consultas PTR a los resolutores correspondientes (servidores DNS privados para clientes locales, servidor DNS de subida para clientes con direcciones IP públicas).",
     "check_dhcp_servers": "Comprobar si hay servidores DHCP",
     "save_config": "Guardar configuración",
     "enabled_dhcp": "Servidor DHCP habilitado",
@@ -23,7 +18,7 @@
     "dhcp_description": "Si tu router no proporciona la configuración DHCP, puedes utilizar el propio servidor DHCP incorporado de AdGuard.",
     "dhcp_enable": "Habilitar servidor DHCP",
     "dhcp_disable": "Deshabilitar servidor DHCP",
-    "dhcp_not_found": "Es seguro habilitar el servidor DHCP incorporado porque AdGuard Home no encontró ningún servidor DHCP activo en la red. Sin embargo, deberías volver a comprobarlo manualmente, ya que nuestra prueba automática no ofrece actualmente una garantía del 100 %.",
+    "dhcp_not_found": "Es seguro habilitar el servidor DHCP incorporado. No se ha encontrado ningún servidor DHCP activo en la red, sin embargo le recomendamos que lo vuelva a comprobar manualmente, ya que nuestra prueba automática no ofrece actualmente una garantía del 100 %.",
     "dhcp_found": "Un servidor DHCP activo se encuentra en la red. No es seguro habilitar el servidor DHCP incorporado.",
     "dhcp_leases": "Asignaciones DHCP",
     "dhcp_static_leases": "Asignaciones DHCP estáticas",
@@ -37,8 +32,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_subnet": "La subred \"{{cidr}}\" no contiene la dirección IP \"{{ip}}\"",
     "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",
@@ -55,19 +48,19 @@
     "ip": "IP",
     "dhcp_table_hostname": "Nombre del host",
     "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 conexión a Internet a los dispositivos conectados!",
+    "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": "AdGuard Home no pudo determinar si hay otro servidor DHCP activo en la red.",
+    "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. AdGuard Home no pudo 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>. AdGuard Home establecerá automáticamente esta dirección IP como estática si presionas el botón \"Habilitar servidor DHCP\".",
+    "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",
     "dhcp_new_static_lease": "Nueva asignación estática",
     "dhcp_static_leases_not_found": "No se han encontrado asignaciones DHCP estáticas",
     "dhcp_add_static_lease": "Añadir asignación estática",
-    "dhcp_reset": "¿Estás seguro de que deseas restablecer la configuración DHCP?",
+    "dhcp_reset": "¿Está seguro de que desea restablecer la configuración DHCP?",
     "country": "País",
     "city": "Ciudad",
-    "delete_confirm": "¿Estás seguro de que deseas eliminar \"{{key}}\"?",
+    "delete_confirm": "¿Está seguro de que desea eliminar \"{{key}}\"?",
     "form_enter_hostname": "Ingresa el nombre del host",
     "error_details": "Detalles del error",
     "response_details": "Detalles de la respuesta",
@@ -140,7 +133,7 @@
     "encryption_settings": "Configuración de cifrado",
     "dhcp_settings": "Configuración DHCP",
     "upstream_dns": "Servidores DNS de subida",
-    "upstream_dns_help": "Ingresa una dirección de servidor por línea. <a>Más información</a> sobre la configuración de los servidores DNS de subida.",
+    "upstream_dns_help": "Ingresa las direcciones de los servidores una por línea. <a>Más información</a> sobre la configuración de los servidores DNS de subida.",
     "upstream_dns_configured_in_file": "Configurado en {{path}}",
     "test_upstream_btn": "Probar DNS de subida",
     "upstreams": "DNS de subida",
@@ -231,7 +224,7 @@
     "rule_added_to_custom_filtering_toast": "Regla añadida a las reglas de filtrado personalizado: {{rule}}",
     "query_log_response_status": "Estado: {{value}}",
     "query_log_filtered": "Filtrado por {{filter}}",
-    "query_log_confirm_clear": "¿Estás seguro de que deseas borrar todo el registro de consultas?",
+    "query_log_confirm_clear": "¿Está seguro de que desea borrar todo el registro de consultas?",
     "query_log_cleared": "El registro de consultas se ha borrado correctamente",
     "query_log_updated": "El registro de consultas se ha actualizado correctamente",
     "query_log_clear": "Borrar registros de consultas",
@@ -240,7 +233,7 @@
     "query_log_configuration": "Configuración de registros",
     "query_log_disabled": "El registro de consultas está deshabilitado y se puede configurar en la <0>configuración</0>",
     "query_log_strict_search": "Usar comillas dobles para una búsqueda estricta",
-    "query_log_retention_confirm": "¿Estás seguro de que deseas cambiar la retención del registro de consultas? Si disminuye el valor del intervalo, se perderán algunos datos",
+    "query_log_retention_confirm": "¿Está seguro de que desea cambiar la retención del registro de consultas? Si disminuye el valor del intervalo, se perderán algunos datos",
     "anonymize_client_ip": "Anonimizar IP del cliente",
     "anonymize_client_ip_desc": "No guarda la dirección IP completa del cliente en registros y estadísticas",
     "dns_config": "Configuración del servidor DNS",
@@ -254,22 +247,16 @@
     "custom_ip": "IP personalizada",
     "blocking_ipv4": "Bloqueo de IPv4",
     "blocking_ipv6": "Bloqueo de IPv6",
-    "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS mediante HTTPS",
     "dns_over_tls": "DNS mediante TLS",
-    "dns_over_quic": "DNS mediante QUIC",
-    "client_id": "ID de cliente",
-    "client_id_placeholder": "Ingresa el ID del cliente",
-    "client_id_desc": "Diferentes clientes pueden ser identificados por un ID de cliente especial. <a>Aquí</a> puedes obtener más información 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 archivo de configuración",
     "plain_dns": "DNS simple",
     "form_enter_rate_limit": "Ingresa el límite de cantidad",
     "rate_limit": "Límite de cantidad",
     "edns_enable": "Habilitar subred de cliente EDNS",
     "edns_cs_desc": "Si está habilitado, AdGuard Home enviará las subredes de los clientes a los servidores DNS.",
-    "rate_limit_desc": "Número de peticiones por segundo permitidas por cliente. Establecerlo en 0 significa que no hay límite.",
+    "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",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Interfaz de escucha",
     "install_settings_port": "Puerto",
     "install_settings_interface_link": "La interfaz web de administración de AdGuard Home estará disponible en las siguientes direcciones:",
-    "form_error_port": "Ingresa un número de puerto válido",
+    "form_error_port": "Ingresa un valor de puerto válido",
     "install_settings_dns": "Servidor DNS",
     "install_settings_dns_desc": "Deberás configurar tus dispositivos o router para usar el servidor DNS en las siguientes direcciones:",
     "install_settings_all_interfaces": "Todas las interfaces",
@@ -307,14 +294,14 @@
     "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",
-    "install_devices_router_list_1": "Abre las preferencias de tu router. Por lo general, puedes acceder a él desde tu navegador a través de una URL como http://192.168.0.1/ o http://192.168.1.1/. Es posible que se te pida que ingreses la contraseña. Si no lo recuerdas, a menudo puedes restablecer la contraseña presionando un botón en el router, pero ten en cuenta que si eliges este procedimiento, probablemente se perderá toda la configuración del router. Si tu router requiere una aplicación para configurarlo, instala la aplicación en tu teléfono o PC y utilízala para acceder a la configuración del router.",
+    "install_devices_router_list_1": "Abre las preferencias de tu router. Por lo general, puedes acceder a él desde tu navegador a través de una URL (como http://192.168.0.1/ o http://192.168.1.1/). Es posible que se te pida que ingreses la contraseña. Si no lo recuerdas, a menudo puedes restablecer la contraseña presionando un botón en el router. Algunos routers requieren una aplicación específica, que en ese caso ya debería estar instalada en tu computadora/teléfono.",
     "install_devices_router_list_2": "Busca la configuración de DHCP/DNS. Busca las letras DNS junto a un campo que permita ingresar dos o tres grupos de números, cada uno dividido en cuatro grupos de uno a tres dígitos.",
     "install_devices_router_list_3": "Ingresa las direcciones de tu servidor AdGuard Home allí.",
-    "install_devices_router_list_4": "En algunos tipos de router, no se puede configurar un servidor DNS personalizado. En ese caso, configurar AdGuard Home como <0>servidor DHCP</0> puede ayudar. De lo contrario, debes consultar el manual del router para saber cómo personalizar los servidores DNS en tu modelo de router específico.",
+    "install_devices_router_list_4": "No se puede configurar un servidor DNS personalizado en algunos tipos de routers. En este caso puede ayudar si configuras AdGuard Home como un <0>servidor DHCP</0>. De lo contrario, deberías buscar el manual sobre cómo personalizar los servidores DNS para tu modelo de router en particular.",
     "install_devices_windows_list_1": "Abre el Panel de control a través del menú Inicio o en el buscador de Windows.",
     "install_devices_windows_list_2": "Ve a la categoría Redes e Internet, luego a Centro de redes y recursos compartidos.",
     "install_devices_windows_list_3": "En el lado izquierdo de la pantalla, busca Cambiar configuración del adaptador y luego haz clic en él.",
@@ -343,7 +330,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 comodín. 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",
@@ -368,12 +355,12 @@
     "encryption_subject": "Asunto",
     "encryption_issuer": "Emisor",
     "encryption_hostnames": "Nombres de hosts",
-    "encryption_reset": "¿Estás seguro de que deseas restablecer la configuración de cifrado?",
+    "encryption_reset": "¿Está seguro de que desea restablecer la configuración de cifrado?",
     "topline_expiring_certificate": "Tu certificado SSL está a punto de expirar. Actualiza la <0>configuración de cifrado</0>.",
     "topline_expired_certificate": "Tu certificado SSL ha expirado. Actualiza la <0>configuración de cifrado</0>.",
-    "form_error_port_range": "Ingresa el número del puerto en el rango de 80 a 65535",
+    "form_error_port_range": "Ingresa el valor del puerto en el rango de 80 a 65535",
     "form_error_port_unsafe": "Este es un puerto inseguro",
-    "form_error_equal": "No debe ser igual",
+    "form_error_equal": "No debería ser igual",
     "form_error_password": "La contraseña no coincide",
     "reset_settings": "Restablecer configuración",
     "update_announcement": "¡AdGuard Home {{version}} ya está disponible! <0>Haz clic aquí</0> para más información.",
@@ -399,9 +386,8 @@
     "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 ID de cliente especial (puede ser utilizado para DoT/DoH/DoQ). <0>Aquí</0> puedes 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. Ten 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_subnet_ip": "Ingresa una dirección IP en la subred \"{{cidr}}\"",
     "form_enter_mac": "Ingresa la MAC",
     "form_enter_id": "Ingresa el identificador",
     "form_add_id": "Añadir identificador",
@@ -412,8 +398,8 @@
     "client_added": "Cliente \"{{key}}\" añadido correctamente",
     "client_updated": "Cliente \"{{key}}\" actualizado correctamente",
     "clients_not_found": "No se han encontrado clientes",
-    "client_confirm_delete": "¿Estás seguro de que deseas eliminar el cliente \"{{key}}\"?",
+    "client_confirm_delete": "¿Está seguro de que desea eliminar el cliente \"{{key}}\"?",
-    "list_confirm_delete": "¿Estás seguro de que deseas eliminar esta lista?",
+    "list_confirm_delete": "¿Está seguro de que deseas eliminar esta lista?",
     "auto_clients_title": "Clientes (activos)",
     "auto_clients_desc": "Datos de los clientes que utilizan AdGuard Home, pero no se almacenan en la configuración",
     "access_title": "Configuración de acceso",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Clientes no permitidos",
     "access_disallowed_desc": "Lista de CIDR o direcciones IP. Si está configurado, AdGuard Home eliminará las peticiones de estas direcciones IP.",
     "access_blocked_title": "Dominios no permitidos",
-    "access_blocked_desc": "No confundas esto con filtros. AdGuard Home eliminará las consultas DNS con estos dominios en las preguntas de las consultas. Aquí puedes especificar los nombres de dominio exactos, comodines y reglas de filtrado de URL, por ejemplo: \"ejemplo.org\", \"*.ejemplo.org\" o \"||ejemplo.org^\".",
+    "access_blocked_desc": "No confundas esto con filtros. AdGuard Home eliminará las consultas DNS con estos dominios en la pregunta de la consulta. Aquí puedes especificar los nombres de dominio exactos, comodines y reglas de filtrado de URL, por ejemplo: 'ejemplo.org', '*.ejemplo.org' o '||ejemplo.org^'.",
     "access_settings_saved": "Configuración de acceso guardado correctamente",
     "updates_checked": "Actualizaciones comprobadas correctamente",
     "updates_version_equal": "AdGuard Home está actualizado",
@@ -444,13 +430,12 @@
     "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": "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",
     "rewrite_add": "Añadir reescritura DNS",
     "rewrite_not_found": "No se han encontrado reescrituras DNS",
-    "rewrite_confirm_delete": "¿Estás seguro de que deseas eliminar la reescritura DNS para \"{{key}}\"?",
+    "rewrite_confirm_delete": "¿Está seguro de que desea eliminar la reescritura DNS para \"{{key}}\"?",
     "rewrite_desc": "Permite configurar fácilmente la respuesta DNS personalizada para un nombre de dominio específico.",
     "rewrite_applied": "Regla de reescritura aplicada",
     "rewrite_hosts_applied": "Reescrito por la regla del archivo hosts",
@@ -489,8 +474,8 @@
     "statistics_retention": "Retención de estadísticas",
     "statistics_retention_desc": "Si disminuye el valor del intervalo, se perderán algunos datos",
     "statistics_clear": "Borrar estadísticas",
-    "statistics_clear_confirm": "¿Estás seguro de que deseas borrar las estadísticas?",
+    "statistics_clear_confirm": "¿Está seguro de que desea borrar las estadísticas?",
-    "statistics_retention_confirm": "¿Estás seguro de que deseas cambiar la retención de estadísticas? Si disminuye el valor del intervalo, se perderán algunos datos",
+    "statistics_retention_confirm": "¿Está seguro de que desea cambiar la retención de estadísticas? Si disminuye el valor del intervalo, se perderán algunos datos",
     "statistics_cleared": "Estadísticas borradas correctamente",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Deshabilitar IPv6",
     "disable_ipv6_desc": "Si esta función está habilitada, se descartarán todas las consultas DNS para direcciones IPv6 (tipo AAAA).",
     "fastest_addr": "Dirección IP más rápida",
-    "fastest_addr_desc": "Consulta todos los servidores DNS y devuelve la dirección IP más rápida de todas las respuestas. Esto ralentiza las consultas DNS ya que AdGuard Home tiene que esperar las respuestas de todos los servidores DNS, pero mejora la conectividad general.",
+    "fastest_addr_desc": "Consulta todos los servidores DNS y devuelve la dirección IP más rápida de todas las respuestas. Esto ralentizará las consultas DNS, y se debe esperar las respuestas de todos los servidores DNS, pero mejora la conectividad general.",
     "autofix_warning_text": "Si haces clic en \"Corregir\", AdGuard Home configurará tu sistema para utilizar el servidor DNS de AdGuard Home.",
     "autofix_warning_list": "Realizará estas tareas: <0>Deshabilitar el sistema DNSStubListener</0> <0>Establecer la dirección del servidor DNS en 127.0.0.1</0> <0>Reemplazar el destino del enlace simbólico de /etc/resolv.conf por /run/systemd/resolve/resolv.conf</0> <0>Detener DNSStubListener (recargar el servicio systemd-resolved)</0>",
     "autofix_warning_result": "Como resultado, todas las peticiones DNS de tu sistema serán procesadas por AdGuard Home de manera predeterminada.",
@@ -544,11 +529,12 @@
     "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ás seguro de que deseas bloquear al cliente \"{{ip}}\"?",
+    "client_confirm_block": "¿Está seguro de que desea bloquear al cliente \"{{ip}}\"?",
-    "client_confirm_unblock": "¿Estás seguro de que deseas desbloquear al cliente \"{{ip}}\"?",
+    "client_confirm_unblock": "¿Está seguro de que desea desbloquear al cliente \"{{ip}}\"?",
     "client_blocked": "Cliente \"{{ip}}\" bloqueado correctamente",
     "client_unblocked": "Cliente \"{{ip}}\" desbloqueado correctamente",
     "static_ip": "Dirección IP estática",
@@ -556,8 +542,8 @@
     "set_static_ip": "Establecer una dirección IP estática",
     "install_static_ok": "¡Buenas noticias! La dirección IP estática ya está configurada",
     "install_static_error": "AdGuard Home no puede configurarlo automáticamente para esta interfaz de red. Busca instrucciones sobre cómo hacer esto manualmente.",
-    "install_static_configure": "AdGuard Home ha detectado que se utiliza la dirección IP dinámica <0>{{ip}}</0>. ¿Deseas que se establezca como tu dirección estática?",
+    "install_static_configure": "Hemos detectado que utilizas una dirección IP dinámica: <0>{{ip}}</0>. ¿Deseas usarla como tu dirección estática?",
-    "confirm_static_ip": "AdGuard Home configurará {{ip}} para ser tu dirección IP estática. ¿Deseas continuar?",
+    "confirm_static_ip": "AdGuard Home configurará {{ip}} para ser tu dirección IP estática. ¿Desea continuar?",
     "list_updated": "{{count}} lista actualizada",
     "list_updated_plural": "{{count}} listas actualizadas",
     "dnssec_enable": "Habilitar DNSSEC",
@@ -601,4 +587,4 @@
     "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

@@ -1,19 +1,24 @@
 {
     "client_settings": "تنظیمات کلاینت",
+    "example_upstream_reserved": "میتوانید جریان ارسالی DNS <0> را برای یک دامنه مشخص تعیین کنید </0>",
+    "upstream_parallel": "استفاده از جستار موازی برای سرعت دادن به تفکیک با جستار همزمان همه جریان های ارسالی",
     "parallel_requests": "درخواست های موازی",
     "bootstrap_dns": "خودراه انداز سرورهای DNS",
     "bootstrap_dns_desc": "خودراه انداز سرورهای DNS برای تفکیک آدرس آی پی  تفکیک کننده های DoH/DoT که شما بعنوان جریان ارسالی تعیین کردید استفاده میشود.",
     "check_dhcp_servers": "بررسی برای سرورهای DHCP",
+    "save_config": "ذخیره پیکربندی",
     "enabled_dhcp": "سرور DHCP  فعال شده است",
     "disabled_dhcp": "سرور DHCP  غیرفعال شده است",
     "dhcp_title": "سرور DHCP",
     "dhcp_description": "اگر روتر شما تنظیمات DHCP ارائه نمی کند،میتوانید از سرور DHCP تو-کار خود AdGuard استفاده کنید.",
     "dhcp_enable": "فعالسازی سرور DHCP",
     "dhcp_disable": "غیرفعالسازی سرور DHCP",
+    "dhcp_not_found": "سرورهای فعال DHCP در شبکه یافت نشد.فعالسازی سرور DHCP تو-کار اَمن است.",
     "dhcp_found": "تعدادی سرور DHCP فعال در شبکه یافت شد.فعالسازی سرور DHCP توکار اَمن نیست.",
     "dhcp_leases": "اجاره DHCP",
     "dhcp_static_leases": "اجاره DHCP ایستا",
     "dhcp_leases_not_found": "اجاره DHCP یافت نشد",
+    "dhcp_config_saved": "پیکربندی سرور DHCP ذخیره شده است",
     "form_error_required": "فیلد مورد نیاز",
     "form_error_ip4_format": "فرمت نامعتبر IPv4",
     "form_error_ip6_format": "فرمت نامعتبر IPv6",
@@ -35,11 +40,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "نام میزبان",
     "dhcp_table_expires": "انقضاء",
+    "dhcp_warning": "اگر میخواهید DHCP سرور توکار را فعال کنید،مطمئن شوید DHCP سرور دیگری فعال نباشد.در غیر اینصورت،آن دسترسی به اینترنت را برای دستگاه های وصل شده قطع می کند!",
+    "dhcp_error": "ما نمیتوانیم تشخیص دهیم آیا یک سرور DHCP دیگر در شبکه موجود است یا نه.",
+    "dhcp_static_ip_error": "به منظور استفاده از سرور DHCP یک آدرس آی پی ثابت باید تنظیم شود.ما موفق به تشخیص اینکه  آیا رابط این شبکه برای استفاده از آی پی ثابت تنظیم شده است یا نه موفق نشدیم.لطفا آدرس آی پی ثابت را دستی تنظیم کنید.",
+    "dhcp_dynamic_ip_found": "سیستم شما آدرس آی پی متغییر برای این رابط استفاده می کند <0>{{interfaceName}}</0>. به منظور استفاده از سرور DHCP آدرس ثابت باید تعیین شود. آدرس آی پی فعلی شما هست <0>{{ipAddress}}</0>. اگر شما دکمه DHCP را فشار دهید ما این آدرس آی پی را بعنوان ثابت تنظیم می کنیم.",
     "dhcp_lease_added": "اجاره ایستا \"{{key}}\" با موفقیت اضافه شد",
     "dhcp_lease_deleted": "اجاره ایستا \"{{key}}\" با موفقیت حذف شد",
     "dhcp_new_static_lease": "اجاره ایستا جدید",
     "dhcp_static_leases_not_found": "هیچ اجاره DHCP ایستا یافت نشد",
     "dhcp_add_static_lease": "افزودن اجاره ایستا",
+    "dhcp_reset": "آیا میخواهید پیکربندی DHCP را ریست کنید؟",
     "country": "کشور",
     "city": "شهر",
     "delete_confirm": "آیا میخواهید \"{{key}}\" را حذف کنید؟",
@@ -85,7 +95,14 @@
     "top_clients": "بالاترین کلاینت ها",
     "no_clients_found": "کلاینتی یافت نشد",
     "general_statistics": "آمار عمومی",
+    "number_of_dns_query_days": "تعداد جستار DNS پردازش شده در {{count}} روز آخر",
+    "number_of_dns_query_days_plural": "تعداد جستار DNS پردازش شده در {{count}} روز گذشته",
+    "number_of_dns_query_24_hours": "تعداد جستار DNS پردازش شده در 24 ساعت گذشته",
+    "number_of_dns_query_blocked_24_hours": "تعداد درخواست DNS مسدود شده با فیلترهای مسدودساز تبلیغ و لیست سیاه میزبان",
+    "number_of_dns_query_blocked_24_hours_by_sec": "تعداد درخواست DNS مسدود شده با مدل امنیت وب گردی AdGuard",
+    "number_of_dns_query_blocked_24_hours_adult": "تعداد وبسایت های غیر اخلاقی مسدود شده",
     "enforced_save_search": "جستجوی اَمن اجبار شده",
+    "number_of_dns_query_to_safe_search": "تعداد درخواست های DNS برای موتور جستجو که جستجوی اَمن اجبار شده",
     "average_processing_time": "میانگین زمان پردازش",
     "average_processing_time_hint": "زمان میانگین بر هزارم ثانیه در پردازش درخواست DNS",
     "block_domain_use_filters_and_hosts": "مسدودسازی دامنه ها توسط فیلترها و فایل های میزبان",
@@ -95,6 +112,7 @@
     "use_adguard_parental": "از سرویس وب نظارت والدین AdGuard استفاده کن",
     "use_adguard_parental_hint": "AdGuard Home بررسی می کند اگر دامنه حاوی موارد غیر اخلاقی است.آن از همان اِی پی آی دارای حریم خصوصی سرویس وب امنیت وب گردی استفاده می کند.",
     "enforce_safe_search": "اجبار جستجوی اَمن",
+    "enforce_save_search_hint": "AdGuard Home میتواند جستجوی اَمن را در موتور جستجوهای زیر اعمال کند:گوگل،یوتوب،بینگ و یاندکس",
     "no_servers_specified": "سروری تعیین نشده است",
     "general_settings": "تنظیمات عمومی",
     "dns_settings": "تنظیمات DNS",
@@ -221,6 +239,7 @@
     "source_label": "منبع",
     "found_in_known_domain_db": "در پایگاه داده دامنه های شناخته شده پیدا شد",
     "category_label": "دسته بندی",
+    "rule_label": "دستور",
     "list_label": "لیست",
     "unknown_filter": "فیلتر ناشناخته {{filterId}}",
     "known_tracker": "ردیاب های شناخته شده",
@@ -230,6 +249,7 @@
     "install_settings_listen": "رابط گوش دادن",
     "install_settings_port": "پورت",
     "install_settings_interface_link": "رابط صفحه وب آدمین AdGuard Home شما در این آدرس قابل دسترسی خواهد بود:",
+    "form_error_port": "مقدار پورت معتبر وارد کنید",
     "install_settings_dns": "سرور DNS",
     "install_settings_dns_desc": "نیاز است شما دستگاه یا روتر خود را برای استفاده از سرور DNS روی آدرس های زیر پیکربندی کنید:",
     "install_settings_all_interfaces": "همه رابط ها",
@@ -248,8 +268,10 @@
     "install_devices_router": "روتر",
     "install_devices_router_desc": "این راه انداز خودکار همه دستگاه های متصل شده به روتر خانه را پوشش میدهد و نیازی نیست شما هر یک از آنها را دستی پیکربندی کنید.",
     "install_devices_address": "DNS سرور AdGuard Home به آدرس های زیر گوش میدهد",
+    "install_devices_router_list_1": "اولویت ها را برای روتر خود باز کنید.معمولا میتوانید آن را ز طریق مرورگر از طریق آدرسی مانند ( http://192.168.0.1/ یا http://192.168.1.1/) دسترسی داشته باشید.ممکن است رمزعبور پرسیده شود،اگر آن را بخاطر ندارید،غالبا میتوان رمزعبور را با فشردن دکمه پشت روتر ریست کرد.برخی روترها برنامه خاصی نیاز دارد که باید در رایانه/گوشی نصب شده باشد.",
     "install_devices_router_list_2": "تنظیمات DHCP/DNS را بیابید.دنبال حروف DNS بگردید در فیلدی که اجازه دو یا سه گروه عدد را میدهد و هر کدام در چهار گروه سه عددی شکسته شده است",
     "install_devices_router_list_3": "آدرس سرور AdGuard Home  خود را آنجا وارد کنید",
+    "install_devices_router_list_4": "شما نمیتوانید DNS سرور سفارشی در برخی از روترها تنظیم کنید. در این مورد اگر شما AdGuard Home را بعنوان DHCP سرور راه اندازی کنید میتواند کمک کند. در غیر اینصورت باید راهنمای سفارشی سازی DNS سرورها برای مدل خاص روتر خود را انتخاب کنید.",
     "install_devices_windows_list_1": "کنترل پنل را از طریق استارت منو یا جستجوی ویندوز باز کنید.",
     "install_devices_windows_list_2": "بروید به شبکه و دسته اینترنت و سپس به شبکه و مرکز اشتراک گذاری",
     "install_devices_windows_list_3": "در سمت چپ صفحه تنظیمات آداپتور را تغییر داده و روی آن کلیک کنید",
@@ -275,8 +297,10 @@
     "install_saved": "با موفقیت ذخیره نشد",
     "encryption_title": "رمزگُذاری",
     "encryption_desc": "پشتیبانی رمزگُذاری (HTTPS/TLS) برای DNS و رابط آدمین وب",
+    "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",
@@ -302,10 +326,13 @@
     "encryption_reset": "آیا میخواهید تنظیمات رمزگُذاری به پیش فرض بازگردد؟",
     "topline_expiring_certificate": "گواهینامه اِس اِس اِل شما در صدد انقضاء است.  <0>تنظیمات رمزگُذاری</0> را بروز رسانی کنید.",
     "topline_expired_certificate": "گواهینامه اِس اِس اِل شما منقضی شده است. <0>تنظیمات رمزگُذاری</0> را بروز رسانی کنید.",
+    "form_error_port_range": "مقدار پورت را در محدوده 80-65535 وارد کنید",
     "form_error_port_unsafe": "این پورت غیر ایمن است",
+    "form_error_equal": "نباید برابر باشد",
     "form_error_password": "رمزعبور تطبیق ندارد",
     "reset_settings": "ریست تنظیمات",
     "update_announcement": "AdGuard Home {{version}} در دسترس است! <0>اینجا کلیک</0> کنید برای اطلاعات بیشتر.",
+    "setup_guide": "راهنمای راه اندازی",
     "dns_addresses": "آدرس های DNS",
     "dns_start": "سرور DNS در حال شروع است",
     "dns_status_error": "خطا در دریافت وضعیت DNS",
@@ -327,6 +354,7 @@
     "client_edit": "ویرایش کلاینت",
     "client_identifier": "احراز با",
     "ip_address": "آدرس آی پی",
+    "client_identifier_desc": "کلاینت میتواند با آدرس آی پی یا آدرس مَک احراز شود. لطفا توجه کنید،که استفاده از مَک بعنوان عامل احراز زمانی امکان دارد که  AdGuard Home نیز <0>سرور DHCP </0> باشد",
     "form_enter_ip": "آی پی را وارد کنید",
     "form_enter_mac": "مَک را وارد کنید",
     "form_enter_id": "خطای احرازکننده",
@@ -349,6 +377,7 @@
     "access_disallowed_title": "کلاینت های غیرمجاز",
     "access_disallowed_desc": "یک لیست از CIDR یا آدرس های IP.اگر پیکربندی شود،AdGuard Home درخواست ها را از این آدرس های IP نمی پذیرد.",
     "access_blocked_title": "دامنه های مسدود شده",
+    "access_blocked_desc": "این را با فیلتر ها به اشتباه نگیرید.AdGuard Home  جستار DNS را با این دامنه ها در جستار سوال ها نمی پذیرد.",
     "access_settings_saved": "تنظیمات دسترسی با موفقیت ذخیره شد",
     "updates_checked": "بروز رسانی با موفقیت بررسی شد",
     "updates_version_equal": "AdGuard Home بروز است",
@@ -442,6 +471,7 @@
     "disable_ipv6": "غیرفعالسازی IPv6",
     "disable_ipv6_desc": "اگر این ویژگی فعال شده، همه جستارهای DNS برای آدرس های IPv6 (نوع AAAA) رها میشود.",
     "fastest_addr": "سریعترین آدرس آی پی",
+    "fastest_addr_desc": "جستار همه سرورهای DNS و بازگرداندن سریعترین آدرس IP از میان همه پاسخ ها",
     "autofix_warning_text": "اگر روی \"تعمیر\" کلیک کنید، AdGuardHome سیستم شما را برای استفاده از DNS سرور AdGuardHome پیکربندی می کند.",
     "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 از سیستم شما بطور پیش فرض با AdGuardHome پردازش خواهد شد.",
@@ -457,6 +487,7 @@
     "check_ip": "آدرس آی پی: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "علت: {{reason}}",
+    "check_rule": "دستور: {{rule}}",
     "check_service": "نام سرویس: {{service}}",
     "check_not_found": "در لیست فیلترهای شما یافت نشد",
     "client_confirm_block": "آیا واقعا میخواهید کلاینت \"{{ip}}\" را مسدود کنید؟",
@@ -468,6 +499,7 @@
     "set_static_ip": "تنظیم یک آدرس آی پی ثابت",
     "install_static_ok": "خبر خوب! آدرس آی پی ثابت از قبل پیکربندی شده است",
     "install_static_error": "AdGuard Home نمیتواند رابط این شبکه را خودکار پیکربندی کند. لطفا دستورالعمل چگونگی انجام دستی آن را مطالعه کنید.",
+    "install_static_configure": "ما تشخیص دادیم از آدرس آی پی پویا استفاده شده است — <0>{{ip}}</0>. آیا میخواهید از آن بعنوان آدرس ثابت استفاده کنید؟",
     "confirm_static_ip": "AdGuard Home {{ip}} بعنوان آدرس آی پی ثابت شما پیکربندی می کند. ادامه میدهید؟",
     "list_updated": "{{count}} لیست بروز رسانی شد",
     "list_updated_plural": "{{count}} لیست بروز رسانی شد",
@@ -486,4 +518,4 @@
     "safe_search": "جستجوی اَمن",
     "blocklist": "لیست سیاه",
     "milliseconds_abbreviation": "هـ ثـ"
-}
+}

client/src/__locales/fr.json

@@ -2,17 +2,12 @@
     "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": "Utilisez des requêtes parallèles pour accélérer la résolution en requêtant simultanément tous les serveurs en amont.",
+    "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",
-    "load_balancing_desc": "Interroger un serveur en amont à la fois. AdGuard Home utilisera l’algorithme aléatoire pondéré pour choisir le serveur afin que celui le plus rapide soit utilisé plus souvent.",
+    "load_balancing_desc": "Interroger un serveur à la fois. AdGuard Home utilisera l’algorithme aléatoire pondéré pour choisir le serveur afin que celui le plus rapide soit utilisé plus souvent.",
     "bootstrap_dns": "Serveurs DNS d'amorçage",
     "bootstrap_dns_desc": "Les serveurs DNS d'amorçage sont utilisés pour résoudre les adresses IP des résolveurs DoH/DoT que vous spécifiez comme upstream.",
-    "local_ptr_title": "Serveurs DNS privés",
-    "local_ptr_desc": "Les serveurs DNS utilisés par AdGuard Home pour les requêtes PTR servies localement. Ces serveurs sont utilisés pour résoudre les noms d'hôtes des clients pour les clients avec des adresses IP privées, par exemple \"192.168.12.34\", en utilisant rDNS. S'il n'est pas défini, AdGuard Home utilisera le résolveur DNS de votre OS par défaut automatiquement.",
-    "local_ptr_placeholder": "Saisissez une adresse de serveur par ligne",
-    "resolve_clients_title": "Activer la résolution inverse des adresses IP des clients",
-    "resolve_clients_desc": "Lorsque activé, AdGuard Home tentera de résoudre de manière inverse les adresses IP des clients en leurs noms d'hôtes en envoyant des requêtes PTR aux résolveurs correspondants (serveurs DNS privés pour les clients locaux, serveur en amont pour les clients ayant des adresses IP publiques).",
     "check_dhcp_servers": "Rechercher les serveurs DHCP",
     "save_config": "Sauvegarder la configuration",
     "enabled_dhcp": "Serveur DHCP activé",
@@ -23,12 +18,12 @@
     "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",
     "dhcp_disable": "Désactiver le serveur DHCP",
-    "dhcp_not_found": "C'est sécuritaire d'activer le serveur DHCP intégré car AdGuard Home n'a pas trouvé de serveur DHCP actif sur le réseau. Toutefois, il vaut mieux revérifier ça manuellement, comme le test automatique ne donne pas 100% de garantie.",
+    "dhcp_not_found": "Aucun serveur DHCP actif trouvé sur le réseau. Vous pouvez activer le serveur DHCP intégré.",
     "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": "Configuration du serveur DHCP sauvegardé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",
@@ -37,8 +32,6 @@
     "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_subnet": "Le sous-réseau « {{cidr}} » ne contient pas l'adresse IP « {{ip}} »",
     "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",
@@ -55,19 +48,19 @@
     "ip": "IP",
     "dhcp_table_hostname": "Nom de machine",
     "dhcp_table_expires": "Expire le",
-    "dhcp_warning": "Si vous souhaitez tout de même activer le serveur DHCP, assurez-vous qu'il n'y a pas d'autre serveur DHCP actif sur votre réseau. Sinon, cela peut perturber la connexion Internet sur tous les appareils connectés au réseau !",
+    "dhcp_warning": "Si vous souhaitez tout de même activer le serveur DHCP, assurez-vous qu'il n'y a d'autre serveur DHCP actif sur votre réseau. Sinon, cela peut faire dysfonctionner Internet sur tous les appareils connectés au réseau !",
-    "dhcp_error": "AdGuard Home ne peut pas déterminer s'il y a un autre serveur DHCP actif sur le réseau.",
+    "dhcp_error": "Nous ne pouvons pas déterminer s'il y a un autre serveur DHCP sur le réseau.",
-    "dhcp_static_ip_error": "Pour utiliser un serveur DHCP, une adresse IP statique est requise. AdGuard Home n'a pas réussi à déterminer si cette interface réseau est configurée via une adresse IP statique. Veuillez définir une adresse IP statique manuellement.",
+    "dhcp_static_ip_error": "Pour utiliser un serveur DHCP, une adresse IP statique est requise. Nous ne sommes pas parvenus à déterminer si cette interface réseau est configurée via une adresse IP statique. Veuillez définir une adresse IP manuellement.",
-    "dhcp_dynamic_ip_found": "Votre système utilise une configuration d'adresses IP dynamiques pour l'interface <0>{{interfaceName}}</0>. Pour utiliser un serveur DHCP, une adresse IP statique est requise. Votre adresse IP actuelle est <0>{{ipAddress}}</0>. AdGuard Home va automatiquement définir cette adresse IP comme statique si vous appuyez sur le bouton « Activer le serveur DHCP ».",
+    "dhcp_dynamic_ip_found": "Votre système utilise une configuration d'adresses IP dynamiques pour l'interface <0>{{interfaceName}}</0>. Pour utiliser un serveur DHCP, une adresse IP statique est requise. Votre adresse IP actuelle est <0>{{ipAddress}}</0>. Nous allons automatiquement définir une adresse IP comme statique si vous appuyez sur le bouton Activer DHCP.",
-    "dhcp_lease_added": "« {{key}} » de bail statique ajoutée avec succès",
+    "dhcp_lease_added": "\"{{key}}\" de bail statique ajoutée avec succès",
-    "dhcp_lease_deleted": "« {{key}} » de bail statique supprimée avec succès",
+    "dhcp_lease_deleted": "\"{{key}}\" de bail statique supprimée avec succès",
     "dhcp_new_static_lease": "Nouveau bail statique",
     "dhcp_static_leases_not_found": "Aucun bail statique DHCP trouvé",
     "dhcp_add_static_lease": "Ajoutez un bail statique",
     "dhcp_reset": "Voulez-vous vraiment réinitialiser votre configuration DHCP ?",
     "country": "Pays",
     "city": "Ville",
-    "delete_confirm": "Voulez-vous vraiment supprimer « {{key}} »?",
+    "delete_confirm": "Voulez-vous vraiment supprimer \"{{key}}\" ?",
     "form_enter_hostname": "Saisissez un nom d'hôte",
     "error_details": "Détails des erreurs",
     "response_details": "Détails de la réponse",
@@ -99,7 +92,7 @@
     "refresh_statics": "Renouveler les statistiques",
     "dns_query": "Requêtes DNS",
     "blocked_by": "<0>Bloqué par Filtres</0>",
-    "stats_malware_phishing": "Tentative de malware/hameçonnage bloquée",
+    "stats_malware_phishing": "Tentative de malware/hammeçonnage bloquée",
     "stats_adult": "Sites à contenu adulte bloqués",
     "stats_query_domain": "Domaines les plus recherchés",
     "for_last_24_hours": "pendant les dernières 24 heures",
@@ -113,12 +106,12 @@
     "general_statistics": "Statistiques générales",
     "number_of_dns_query_days": "Le nombre de requêtes DNS traitées pour les {{count}} derniers jours",
     "number_of_dns_query_days_plural": "Le nombre de requêtes DNS traitées ces {{count}} derniers jours",
-    "number_of_dns_query_24_hours": "Le nombre de requêtes DNS traitées au cours des 24 dernières heures",
+    "number_of_dns_query_24_hours": "Un nombre de requêtes DNS quieries traitées pendant les 24 heures dernières",
-    "number_of_dns_query_blocked_24_hours": "Le nombre de requêtes DNS bloquées par les filtres adblock et les listes de blocage des hôtes",
+    "number_of_dns_query_blocked_24_hours": "Un nombre de requêtes DNS bloquées par les filtres  adblock et les listes de blocage des hosts",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Le nombre de requêtes DNS bloquées par le module Sécurité de navigation d'AdGuard",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Un nombre de requêtes DNS bloquées par le module Sécurité de navigation d'AdGuard",
-    "number_of_dns_query_blocked_24_hours_adult": "Le nombre de sites à contenu adulte bloqués",
+    "number_of_dns_query_blocked_24_hours_adult": "Un nombre de sites à contenu adulte bloqués",
     "enforced_save_search": "Recherche sécurisée forcée",
-    "number_of_dns_query_to_safe_search": "Le nombre de requêtes DNS faites avec la Recherche securisée",
+    "number_of_dns_query_to_safe_search": "Un nombre de requêtes DNS faites avec la Recherche securisée",
     "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",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Utiliser le contrôle parental d'AdGuard",
     "use_adguard_parental_hint": "AdGuard Home va vérifier s'il y a du contenu pour adultes sur le domaine. Ce sera fait par aide du même API discret que celui utilisé par le service de Sécurité de navigation.",
     "enforce_safe_search": "Renforcer la recherche sécurisée",
-    "enforce_save_search_hint": "AdGuard Home peut forcer la recherche sécurisée pour les moteurs de recherche suivants : Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home peut renforcer la Recherche sécurisée dans les moteurs de recherche suivants : Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Pas de serveurs spécifiés",
     "general_settings": "Paramètres généraux",
     "dns_settings": "Paramètres DNS",
@@ -185,13 +178,13 @@
     "custom_filter_rules": "Règles de filtrage d'utilisateur",
     "custom_filter_rules_hint": "Saisissez la règle en une ligne. C'est possible d'utiliser les règles de blocage ou la syntaxe des fichiers hosts.",
     "examples_title": "Exemples",
-    "example_meaning_filter_block": "bloque l’accès au domaine example.org et à tous ses sous-domaines",
+    "example_meaning_filter_block": "bloquer l'accés au domaine exemple.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_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é",
@@ -201,7 +194,7 @@
     "all_lists_up_to_date_toast": "Toutes les listes sont déjà à jour",
     "updated_upstream_dns_toast": "Les serveurs DNS upstream sont mis à jour",
     "dns_test_ok_toast": "Les serveurs DNS spécifiés fonctionnent correctement",
-    "dns_test_not_ok_toast": "Impossible d'utiliser le serveur « {{key}} »: veuillez vérifier si le nom saisi est bien correct",
+    "dns_test_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",
@@ -227,8 +220,8 @@
     "page_table_footer_text": "Page",
     "rows_table_footer_text": "lignes",
     "updated_custom_filtering_toast": "Règles de filtrage d'utilisateur mises à jour",
-    "rule_removed_from_custom_filtering_toast": "Règle retirée des règles d'utilisateur : {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Règle retirée des règles d'utilisateur: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Règle ajoutée aux règles d'utilisateur : {{rule}}",
+    "rule_added_to_custom_filtering_toast": "Règle ajoutée aux règles d'utilisateur: {{rule}}",
     "query_log_response_status": "Statut : {{value}}",
     "query_log_filtered": "Filtré par {{filter}}",
     "query_log_confirm_clear": "Êtes-vous sûr de vouloir effacer tout le journal des requêtes ?",
@@ -254,35 +247,29 @@
     "custom_ip": "IP personnalisée",
     "blocking_ipv4": "Blocage IPv4",
     "blocking_ipv6": "Blocage IPv6",
-    "dnscrypt": "DNSCrypt",
     "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é.",
+    "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 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_refused": "REFUSED : Répondre avec le code REFUSED",
+    "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)",
+    "blocking_mode_null_ip": "IP nulle : Répondre avec une adresse IP nulle (0.0.0.0 pour A; :: pour AAAA)",
     "blocking_mode_custom_ip": "IP personnalisée : Répondre avec une adresse IP définie manuellement",
     "upstream_dns_client_desc": "Si vous laissez ce champ vide, AdGuard Home utilisera les serveurs configurés dans les <0>paramètres DNS</0>.",
     "tracker_source": "Source du traceur",
     "source_label": "Source",
     "found_in_known_domain_db": "Trouvé dans la base de données des domaines connus",
     "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",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Interface d'écoute",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Votre interface web administrateur AdGuard Home sera disponible sur les adresses suivantes :",
-    "form_error_port": "Entrez un numéro de port valide",
+    "form_error_port": "Saisissez un port valide",
     "install_settings_dns": "Serveur DNS",
     "install_settings_dns_desc": "Vous devrez configurer vos appareils et votre routeur pour utiliser le serveur DNS sur les adresses suivantes :",
     "install_settings_all_interfaces": "Toutes les interfaces",
@@ -311,10 +298,10 @@
     "install_devices_router": "Routeur",
     "install_devices_router_desc": "Cette installation impactera automatiquement tous les appareils connectés au routeur de votre maison et vous n'aurez pas besoin de configurer manuellement chaque appareil.",
     "install_devices_address": "Le serveur DNS AdGuard Home écoute sur les adresses suivantes",
-    "install_devices_router_list_1": "Ouvrez les préférences de votre routeur. Normalement vous pouvez y accéder depuis votre navigateur web via une URL du type http://192.168.0.1/ ou http://192.168.1.1/. Vous devrez peut-être renseigner le mot de passe. Si vous ne vous en rappelez pas, vous pouvez normalement le réinitialiser en appuyant sur le bouton du routeur, mais attention : si vous choisissez cette procédure, toute la configuration de votre routeur sera probablement perdue. Si votre routeur requière une application spécifique, installez-la sur votre ordinateur/téléphone et utilisez-la pour accéder aux paramètres du routeur.",
+    "install_devices_router_list_1": "Ouvrez les préférences de votre routeur. Normalement, vous pouvez y accéder depuis votre navigateur Web via une URL (exemple http://192.168.0.1/ ou http://192.168.1.1/). Vous devrez peut-être saisir le mot de passe. Si vous ne vous en rappelez plus, vous pouvez le réinitialiser en appuyant sur le bouton du routeur. Certains routeurs fonctionnent sous une application spécifique, qui devrait être déjà installée sur votre ordinateur/téléphone.",
     "install_devices_router_list_2": "Trouvez les paramètres DHCP/DNS. Recherchez les lettres DNS près d'une zone qui permet la saisie de 2 ou 3 blocs de chiffres, chacun composé de 4 parties de 1 à 3 chiffres.",
     "install_devices_router_list_3": "Saisissez vos adresses de serveur AdGuard Home ici.",
-    "install_devices_router_list_4": "Vous ne pouvez pas définir un serveur DNS personnalisé sur certains types de routeurs. Dans ce cas, la configuration de AdGuard Home en tant que <0>serveur DHCP</0> peut aider. Sinon, vous devez rechercher le manuel sur la façon de personnaliser les serveurs DNS pour votre modèle de routeur particulier.",
+    "install_devices_router_list_4": "Vous ne pouvez pas définir un serveur DNS personnalisé sur certains types de routeurs. Dans ce cas, cela peut être utile si vous configurez AdGuard Home en tant que <0>serveur DHCP</0>. Sinon, vous devez rechercher le manuel sur la façon de personnaliser les serveurs DNS pour votre modèle de routeur particulier.",
     "install_devices_windows_list_1": "Ouvrez votre Panneau de configuration depuis le menu Démarrer ou la recherche Windows.",
     "install_devices_windows_list_2": "Allez dans la catégorie Réseau et Internet et ensuite dans le Centre Réseau et Partage.",
     "install_devices_windows_list_3": "Sur la partie gauche de l'écran, recherchez Modifier les paramètres de la carte et cliquez dessus.",
@@ -343,7 +330,7 @@
     "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",
@@ -373,7 +360,7 @@
     "topline_expired_certificate": "Votre certificat SSL a expiré. Mettez à jour vos <0>Paramètres de chiffrement</0>.",
     "form_error_port_range": "Saisissez une valeur de port entre 80 et 65535",
     "form_error_port_unsafe": "C'est un port non fiable",
-    "form_error_equal": "Ne doit pas être égal",
+    "form_error_equal": "Ne devrait pas être égal",
     "form_error_password": "Mots de passe différents",
     "reset_settings": "Réinitialiser les paramètres",
     "update_announcement": "AdGuard Home {{version}} est disponible ! <0>Cliquez ici</0> pour plus d'informations.",
@@ -399,20 +386,19 @@
     "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_subnet_ip": "Saisissez une adresse IP dans le sous-réseau « {{cidr}} »",
     "form_enter_mac": "Saisissez MAC",
     "form_enter_id": "Entrer identifiant",
     "form_add_id": "Ajouter identifiant",
     "form_client_name": "Saisissez le nom du client",
     "name": "Nom",
     "client_global_settings": "Utiliser les paramètres généraux",
-    "client_deleted": "Le client « {{key}} » a été supprimé avec succès",
+    "client_deleted": "Le client \"{{key}}\" a été supprimé avec succès",
-    "client_added": "Le client « {{key}} » a été ajouté",
+    "client_added": "Le client \"{{key}}\" a été ajouté",
-    "client_updated": "Le client « {{key}} » a été mis à jour",
+    "client_updated": "Le client \"{{key}}\" a été mis à jour",
     "clients_not_found": "Aucun client trouvé",
-    "client_confirm_delete": "Voulez-vous vraiment supprimer le client « {{key}} »?",
+    "client_confirm_delete": "Voulez-vous vraiment supprimer le client \"{{key}}\" ?",
     "list_confirm_delete": "Voulez-vous vraiment supprimer cette liste ?",
     "auto_clients_title": "Clients (exécution)",
     "auto_clients_desc": "Les données des clients qu'utilisent AdGuard Home, mais non stockées dans la configuration",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Clients non autorisés",
     "access_disallowed_desc": "Une liste d'adresses IP ou CIDR. Si configuré, AdGuard Home bloquera les requêtes provenant de ces adresses IP.",
     "access_blocked_title": "Domaines interdits",
-    "access_blocked_desc": "Ne confondez pas ceci avec les filtres. AdGuard Home ignorera les requêtes DNS portant sur les domaines ci-dessous. Ici vous pouvez spécifier les noms exacts des domaines, les caractères génériques et les règles de filtrage des URL, par exemple \"exemple.org\", \"*.exemple.org\" ou \"||example.org^\".",
+    "access_blocked_desc": "Ne confondez pas ceci avec les filtres. AdGuard Home ignorera les requêtes DNS portant sur les domaines ci-dessous.",
     "access_settings_saved": "Paramètres d'accès enregistrés avec succès",
     "updates_checked": "Mises à jour vérifiées",
     "updates_version_equal": "AdGuard Home est à jour",
@@ -444,13 +430,12 @@
     "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 Cryptage</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 Chiffrement</0> dans les paramètres de AdGuard Home.",
+    "rewrite_added": "Réécriture DNS pour \"{{key}}\" ajoutée",
-    "rewrite_added": "Réécriture DNS pour « {{key}} » ajoutée",
+    "rewrite_deleted": "Réécriture DNS pour \"{{key}}\" supprimée",
-    "rewrite_deleted": "Réécriture DNS pour « {{key}} » supprimée",
     "rewrite_add": "Ajouter une réécriture DNS",
     "rewrite_not_found": "Aucune réécriture DNS trouvée",
-    "rewrite_confirm_delete": "Voulez-vous vraiment supprimer la réécriture DNS pour « {{key}} »?",
+    "rewrite_confirm_delete": "Voulez-vous vraiment supprimer la réécriture DNS pour \"{{key}}\" ?",
     "rewrite_desc": "Permet de configurer facilement la réponse DNS personnalisée pour un nom de domaine spécifique.",
     "rewrite_applied": "Règle de réécriture appliquée",
     "rewrite_hosts_applied": "Réécrit par la règle du fichier d’hôtes",
@@ -526,8 +511,8 @@
     "disable_ipv6": "Désactiver IPv6",
     "disable_ipv6_desc": "Si cette fonctionnalité est activée, toutes les requêtes DNS visant des adresses IPv6 (type AAAA) seront annulées.",
     "fastest_addr": "Adresse IP la plus rapide",
-    "fastest_addr_desc": "Rechercher tous les serveurs DNS et renvoyer l’adresse IP la plus rapide parmi toutes les réponses. Cela ralentit les requêtes DNS car AdGuard Home doit attendre les réponses de tous les serveurs DNS, mais la connectivité globale s'améliore.",
+    "fastest_addr_desc": "Rechercher tous les serveurs DNS et renvoyer l’adresse IP la plus rapide parmi toutes les réponses",
-    "autofix_warning_text": "Si vous cliquez sur « Réparer », AdGuardHome configurera votre système pour utiliser le serveur DNS AdGuardHome.",
+    "autofix_warning_text": "Si vous cliquez sur \"Réparer\", AdGuardHome configurera votre système pour utiliser le serveur DNS AdGuardHome.",
     "autofix_warning_list": "Ceci effectuera les tâches suivantes : <0>Désactiver le système DNSStubListener</0> <0>Définir l’adresse du serveur DNS à 127.0.0.1 </0> <0>Remplacer la cible du lien symbolique de /etc/resolv.conf par /run/systemd/resolve/resolv.conf</0> <0>Arrêter DNSStubListener (recharger le service résolu par systemd)</0>",
     "autofix_warning_result": "Par conséquent, toutes les demandes DNS de votre système seront traitées par AdGuardHome par défaut.",
     "tags_title": "Mots clés",
@@ -544,6 +529,7 @@
     "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",
@@ -554,10 +540,10 @@
     "static_ip": "Adresse IP statique",
     "static_ip_desc": "AdGuard Home est un serveur, il a donc besoin d’une adresse IP statique pour fonctionner correctement. Autrement, à un moment donné, votre routeur pourrait attribuer une adresse IP différente à cet appareil.",
     "set_static_ip": "Définir une adresse IP statique",
-    "install_static_ok": "Bonne nouvelle ! L’adresse IP statique est déjà configurée",
+    "install_static_ok": "Bonne nouvelle! L’adresse IP statique est déjà configurée",
     "install_static_error": "AdGuard Home ne peut pas le configurer automatiquement pour cette interface réseau. Veuillez rechercher une instruction sur la façon de procéder manuellement.",
-    "install_static_configure": "AdGuard Home a détecté qu’une adresse IP dynamique est utilisée — <0>{{ip}}</0>. Souhaitez-vous l’utiliser comme votre adresse statique ?",
+    "install_static_configure": "Nous avons détecté qu’une adresse IP dynamique est utilisée — <0>{{ip}}</0>. Voulez-vous l’utiliser comme votre adresse statique?",
-    "confirm_static_ip": "AdGuard Home configurera {{ip}} pour être votre adresse IP statique. Voulez-vous poursuivre ?",
+    "confirm_static_ip": "AdGuard Home configurera {{ip}} pour être votre adresse IP statique. Voulez-vous poursuivre?",
     "list_updated": "{{count}} liste mise à jour",
     "list_updated_plural": "{{count}} listes mises à jour",
     "dnssec_enable": "Activer DNSSEC",
@@ -601,4 +587,4 @@
     "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"
-}
+}

client/src/__locales/hr.json

@@ -2,7 +2,7 @@
     "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.",
+    "upstream_parallel": "Koristi paralelne upite kako bi ubrzali rješavanje istovremenim ispitavanjem svih upstream poslužitelja",
     "parallel_requests": "Paralelni zahtjevi",
     "load_balancing": "Load-balancing",
     "load_balancing_desc": "Šaljite upite po jednom poslužitelju u isto vrijeme. AdGuard Home će koristiti ponderirani slučajni algoritam za odabir poslužitelja, tako da će se najbrži poslužitelj češće koristiti.",
@@ -18,7 +18,7 @@
     "dhcp_description": "Ukoliko vaš router ne pruža DHCP postavke, možete koristiti AdGuardov ugrađeni DHCP poslužitelj.",
     "dhcp_enable": "Omogući DHCP poslužitelj",
     "dhcp_disable": "Onemogući DHCP poslužitelj",
-    "dhcp_not_found": "Sigurno je omogućiti ugrađeni DHCP poslužitelj jer AdGuard Home nije pronašao nijedan aktivni DHCP poslužitelj na mreži. Međutim, preporučujemo vam da ponovo provjerite ručno, jer naš automatski test trenutno ne daje 100% jamstvo.",
+    "dhcp_not_found": "Sigurno je omogućiti ugrađeni DHCP poslužitelj - nismo pronašli aktivne DHCP poslužitelje na mreži. Međutim, preporučujemo vam da ponovo provjerite ručno, jer naš automatski test trenutno ne daje 100% jamstvo.",
     "dhcp_found": "Aktivni DHCP poslužitelj je pronađen na mreži. Nije sigurno omogućiti ugrađeni DHCP poslužitelj.",
     "dhcp_leases": "DHCP leases",
     "dhcp_static_leases": "DHCP static leases",
@@ -32,7 +32,6 @@
     "form_error_ip_format": "Nevažeći format IP adrese",
     "form_error_mac_format": "Nevažeći MAC format",
     "form_error_client_id_format": "Nevažeći format ID-a klijenta",
-    "form_error_server_name": "Nevažeće ime poslužitelja",
     "form_error_positive": "Mora biti veće od 0",
     "form_error_negative": "Mora biti jednako ili veće od 0",
     "range_end_error": "Mora biti veće od početne vrijednosti raspona",
@@ -50,9 +49,9 @@
     "dhcp_table_hostname": "Naziv računala",
     "dhcp_table_expires": "Istječe",
     "dhcp_warning": "Ako svejedno želite omogućiti DHCP poslužitelj, provjerite da nema drugog aktivnog DHCP poslužitelja na vašoj mreži. Inače može pokvariti Internet za ostale povezane uređaje!",
-    "dhcp_error": "AdGuard Home nije mogao utvrditi postoji li drugi aktivni DHCP poslužitelj na mreži.",
+    "dhcp_error": "Nismo mogli utvrditi postoji li drugi DHCP poslužitelj na mreži.",
-    "dhcp_static_ip_error": "Da bi se koristio DHCP poslužitelj mora se postaviti statička IP adresa. AdGuard Home nije uspio utvrditi je li ovo mrežno sučelje konfigurirano pomoću statičke IP adrese. Ručno postavite statičku IP adresu.",
+    "dhcp_static_ip_error": "Za korištenje DHCP poslužitelja mora se postaviti statička IP adresa. Nismo uspjeli utvrditi je li to mrežno sučelje postavljeno pomoću statičke IP adrese. Ručno postavite statičku IP adresu.",
-    "dhcp_dynamic_ip_found": "Vaš sustav koristi postavke dinamičke IP adrese za sučelje <0>{{interfaceName}}</0>. Za korištenje DHCP poslužitelja mora se postaviti statička IP adresa. Vaša trenutna IP adresa je <0>{{ipAddress}}</0>. AdGuard Home automatski će postaviti ovu IP adresu kao statičnu ako pritisnete gumb \"Omogući DHCP\".",
+    "dhcp_dynamic_ip_found": "Vaš sustav koristi postavke dinamičke IP adrese za sučelje <0>{{interfaceName}}</0>. Za korištenje DHCP poslužitelja mora se postaviti statička IP adresa. Vaša trenutna IP adresa je <0>{{ipAddress}}</0>. Ovu IP adresu ćemo automatski postaviti kao statičku ukoliko pritisnete Omogući DHCP dugme.",
     "dhcp_lease_added": "Statični lease \"{{key}}\" je uspješno dodan",
     "dhcp_lease_deleted": "Statični lease \"{{key}}\" je uspješno uklonjen",
     "dhcp_new_static_lease": "Novi static lease",
@@ -105,10 +104,10 @@
     "top_clients": "Top klijenti",
     "no_clients_found": "Nema pronađenih klijenata",
     "general_statistics": "Opća statistika",
-    "number_of_dns_query_days": "Broj DNS upita obrađenih u posljednja {{count}} dan",
+    "number_of_dns_query_days": "Broj DNS upita obrađenih u posljednja {{count}} dana",
     "number_of_dns_query_days_plural": "Broj DNS upita obrađenih u posljednja {{count}} dana",
     "number_of_dns_query_24_hours": "Broj DNS upita obrađenih u posljednja 24 sata",
-    "number_of_dns_query_blocked_24_hours": "Broj DNS zahtjeva koji blokiraju filtri za blokiranje oglasa i popisi blokova hostova",
+    "number_of_dns_query_blocked_24_hours": "Broj DNS zahtjeva koji su blokirani od strane filtara za blokiranje oglasa i lista nedopuštenih poslužitelja",
     "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahtjeva koje je blokirao modul AdGuard zaštita pregledavanja",
     "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih stranica s sadržajem za odrasle",
     "enforced_save_search": "Omogućeno sigurno pretraživanje",
@@ -122,7 +121,7 @@
     "use_adguard_parental": "Koristi web uslugu AdGuard roditeljske zaštite",
     "use_adguard_parental_hint": "AdGuard Home provjeriti će sadrži li domena sadržaj za odrasle. Koristi isti API za zaštitu privatnosti kao i naša usluga zaštite pregledavanja.",
     "enforce_safe_search": "Omogući sigurno pretraživanje",
-    "enforce_save_search_hint": "AdGuard Home može nametnuti sigurno pretraživanje na sljedećim tražilicama: Google, Youtube, Bing, DuckDuckGo, Yandex i Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home može nametnuti sigurno pretraživanje na sljedećim tražilicama: Google, Youtube, Bing, DuckDuckGo i Yandex.",
     "no_servers_specified": "Nije odabran nijedan poslužitelj",
     "general_settings": "Opće postavke",
     "dns_settings": "DNS postavke",
@@ -248,22 +247,16 @@
     "custom_ip": "Prilagođen IP",
     "blocking_ipv4": "Blokiranje IPv4",
     "blocking_ipv6": "Blokiranje IPv6",
-    "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID klijenta",
-    "client_id_placeholder": "Unesite ID klijenta",
-    "client_id_desc": "Različiti klijenti mogu se prepoznati pomoću posebnog ID-a klijenta. <a>Ovdje</a> možete saznati više o tome kako prepoznati klijente.",
     "download_mobileconfig_doh": "Preuzmi .mobileconfig za DNS-over-HTTPS",
     "download_mobileconfig_dot": "Preuzmi .mobileconfig za DNS-over-TLS",
-    "download_mobileconfig": "Preuzmite konfiguracijsku datoteku",
     "plain_dns": "Obični DNS",
     "form_enter_rate_limit": "Unesite ograničenje",
     "rate_limit": "Ograničenje",
     "edns_enable": "Omogući EDNS Client Subnet",
     "edns_cs_desc": "Ako je omogućeno, AdGuard Home će slati podmreže klijenata na DNS poslužitelje.",
-    "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu. Postavljanje na 0 znači neograničeno.",
+    "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",
@@ -276,7 +269,7 @@
     "source_label": "Izvor",
     "found_in_known_domain_db": "Pronađeno u bazi poznatih domena.",
     "category_label": "Kategorija",
-    "rule_label": "Pravilo/a",
+    "rule_label": "Pravilo",
     "list_label": "Popis",
     "unknown_filter": "Nepoznati filtar {{filterId}}",
     "known_tracker": "Poznati pratitelj",
@@ -286,7 +279,7 @@
     "install_settings_listen": "Osluškuj sučelje",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Web administratorsko sučelje AdGuard Home-a će biti dostupno na sljedećim adresama:",
-    "form_error_port": "Unesite važeći broj porta",
+    "form_error_port": "Unesite važeću vrijednost za port",
     "install_settings_dns": "DNS poslužitelj",
     "install_settings_dns_desc": "Potrebno je postaviti uređaj ili router da koristi DNS poslužitelj na sljedećim adresama:",
     "install_settings_all_interfaces": "Sva sučelja",
@@ -305,10 +298,10 @@
     "install_devices_router": "Usmjerivač (Router)",
     "install_devices_router_desc": "Ovo postavljanje će automatski pokriti sve uređaje povezane na vaš kućni router i nećete trebati ručno postavljati svaki od njih.",
     "install_devices_address": "AdGuard Home DNS poslužitelj osluškuje sljedeće adrese",
-    "install_devices_router_list_1": "Otvorite postavke za router. Obično mu možete pristupiti iz preglednika putem URL-a, kao što je http://192.168.0.1/ ili http://192.168.1.1/. Od vas će se možda tražiti da unesete lozinku. Ako je se ne sjećate, lozinku možete često poništiti pritiskom na dumge na samom routeru. Neki routeri trebaju određenu aplikaciju, koja bi u tom slučaju trebala biti već instalirana na vašem računalu/telefonu.",
+    "install_devices_router_list_1": "Otvorite postavke za router. Obično mu možete pristupiti iz preglednika putem URL-a (kao što je http://192.168.0.1/ ili http://192.168.1.1/). Od vas će se možda tražiti da unesete lozinku. Ako je se ne sjećate, lozinku možete često poništiti pritiskom na dumge na samom routeru. Neki routeri trebaju određenu aplikaciju, koja bi u tom slučaju trebala biti već instalirana na vašem računalu/telefonu.",
     "install_devices_router_list_2": "Pronađite DHCP/DNS postavke. Potražite DNS slova pored polja koje dopušta dva ili tri skupa brojeva, svaki razdvojen u četiri skupine od jedne do tri znamenke.",
     "install_devices_router_list_3": "Unesite adresu AdGuard Home poslužitelja ovdje.",
-    "install_devices_router_list_4": "Na nekim se vrstama usmjerivača ne može postaviti prilagođeni DNS poslužitelj. U ovom slučaju, može vam pomoći ako postavite AdGuard Home kao <0>DHCP poslužitelj</0>. U suprotnom, trebali biste potražiti priručnik o tome kako prilagoditi DNS poslužitelje za vaš određeni model routera.",
+    "install_devices_router_list_4": "Ne možete postaviti prilagođeni DNS poslužitelj na nekim vrstama routera. U ovom slučaju, može vam pomoći ako postavite AdGuard Home kao <0>DHCP poslužitelj</0>. U suprotnom, trebali biste potražiti priručnik o tome kako prilagoditi DNS poslužitelje za vaš određeni model routera.",
     "install_devices_windows_list_1": "Otvorite Upravljačku ploču putem Start izbornika ili Windows pretrage.",
     "install_devices_windows_list_2": "Idite na kategoriju Mreža i Internet i odaberite Centar za mreže i zajedničko korištenje.",
     "install_devices_windows_list_3": "Na lijevoj strani zaslona pronađite Promjeni postavke adaptera i pritisnite na to.",
@@ -334,10 +327,10 @@
     "install_saved": "Uspješno spremljeno",
     "encryption_title": "Šifriranje",
     "encryption_desc": "Podrška šifriranja (HTTPS/TLS) za DNS i administratorsko web sučelje",
-    "encryption_config_saved": "Konfiguracija šifriranja spremljena",
+    "encryption_config_saved": "Spremljene postavke šifriranja",
     "encryption_server": "Naziv poslužitelja",
     "encryption_server_enter": "Unesite naziv domene",
-    "encryption_server_desc": "Da biste koristili HTTPS, morate unijeti ime poslužitelja koje odgovara vašem SSL certifikatu ili wildcard certifikatu. Ako polje nije postavljeno, prihvatit će TLS veze za bilo koju domenu.",
+    "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",
@@ -365,7 +358,7 @@
     "encryption_reset": "Jeste li sigurni da želite poništiti postavke šifriranja?",
     "topline_expiring_certificate": "Vaš SSL certifikat uskoro ističe. Ažurirajte <0>Postavke šifriranja</0>.",
     "topline_expired_certificate": "Vaš SSL certifikat je istekao. Ažurirajte <0>Postavke šifriranja</0>.",
-    "form_error_port_range": "Unesite broj porta od 80 do 65536",
+    "form_error_port_range": "Unesite vrijednost porta od 80 do 65536",
     "form_error_port_unsafe": "Ovo je nesigurna port",
     "form_error_equal": "Ne bi trebalo biti jednako",
     "form_error_password": "Lozinka se ne podudara",
@@ -393,7 +386,7 @@
     "client_edit": "Uredi klijenta",
     "client_identifier": "Identifikator",
     "ip_address": "IP adresa",
-    "client_identifier_desc": "Klijenti se mogu identificirati prema IP adresi, CIDR-u, MAC adresi ili posebnom ID-u klijenta (može se koristiti za DoT/DoH/DoQ). <0>Ovdje</0> možete saznati više o tome kako prepoznati klijente.",
+    "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",
@@ -437,7 +430,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> podržava <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> podržava <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Možete pronaći više implementacija <0>ovdje</0> i <1>ovdje</1>.",
-    "setup_dns_privacy_ioc_mac": "iOS i macOS konfiguracija",
     "setup_dns_notice": "Da biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, morate <0>postaviti šifriranje</0> u AdGuard Home postavkama.",
     "rewrite_added": "DNS prijepis za \"{{key}}\" je uspješno dodan",
     "rewrite_deleted": "DNS prijepis za \"{{key}}\" je uspješno uklonjen",
@@ -519,7 +511,7 @@
     "disable_ipv6": "Onemogući IPv6",
     "disable_ipv6_desc": "Ukoliko je ova značajka omogućena, svi DNS upiti za IPv6 adrese (AAAA tip) će biti odbačeni.",
     "fastest_addr": "Najbrža IP adresa",
-    "fastest_addr_desc": "Ispitajte sve DNS poslužitelje i vratite najbržu IP adresu među svim odgovorima. To usporava DNS upite jer AdGuard Home mora čekati odgovore svih DNS poslužitelja, ali poboljšava ukupnu povezanost.",
+    "fastest_addr_desc": "Ispitajte sve DNS poslužitelje i vratite najbržu IP adresu među svim odgovorima. Ovo će usporiti DNS upite jer moramo čekati odgovore sa svih DNS poslužitelja, ali će poboljšati cjelokupnu povezanost.",
     "autofix_warning_text": "Ako pritisnete \"Popravi\", AdGuard Home će postaviti vaš sustav da koristi AdGuardHome DNS poslužitelj.",
     "autofix_warning_list": "Izvodi sljedeće radnje: <0>Deaktiviraj DNSStubListener sustav</0> <0>Postavi adresu DNS poslužitelja na 127.0.0.1</0> <0>Zamijeni simbolički cilj veze iz /etc/resolv.conf u /run/systemd/resolve/resolv.conf</0> <0>Zaustavi DNSStubListener (ponovno pokreni systemd-resolved uslugu)</0>",
     "autofix_warning_result": "Kao rezultat toga, sve DNS zahtjeve iz vašeg sustava će AdGuard Home obraditi prema zadanim postavkama.",
@@ -537,6 +529,7 @@
     "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",
@@ -549,7 +542,7 @@
     "set_static_ip": "Postavite statičku IP adresu",
     "install_static_ok": "Dobre vijesti! Statička IP adresa već je postavljena",
     "install_static_error": "AdGuard Home ne može je automatski postaviti za ovo mrežno sučelje. Molimo potražite upute kako to učiniti ručno.",
-    "install_static_configure": "AdGuard Home otkrio je da se koristi dinamička IP adresa <0>{{ip}}</0>. Želite li da bude postavljena kao vaša statička adresa?",
+    "install_static_configure": "Otkrili smo da se koristi dinamička IP adresa - <0>{{ip}}</0>. Želite li je koristiti kao svoju statičku adresu?",
     "confirm_static_ip": "AdGuard Home će postaviti {{ip}} kao vašu statičku IP adresu. Želiš li nastaviti?",
     "list_updated": "{{count}} popis ažuriran",
     "list_updated_plural": "{{count}} popisa ažurirana",
@@ -587,11 +580,11 @@
     "filter_category_security_desc": "Popisi koju su specijalizirani za blokiranje zlonamjernih programa, krađe identiteta ili domena za obmanu",
     "filter_category_regional_desc": "Popisi koji se fokusiraju na regionalne oglase i poslužitelje za praćenje",
     "filter_category_other_desc": "Ostali popisi nedopuštenih",
-    "setup_config_to_enable_dhcp_server": "Postavite konfiguraciju za omogućavanje DHCP poslužitelja",
+    "setup_config_to_enable_dhcp_server": "Postavite postavke za omogućavanje DHCP poslužitelja",
     "original_response": "Originalni odgovor",
     "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

@@ -2,17 +2,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.",
+    "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.",
-    "local_ptr_title": "Privát DNS szerverek",
-    "local_ptr_desc": "Azok a DNS szerverek, amiket az AdGuard Home a helyi PTR kérésekhez használ. Ezeket a szervereket arra használjuk, hogy az rDNS segítségével fel lehessen oldani a kliensek hosztneveit. Ha nincs beállítva ilyen, akkor az AdGuard Home alapértelmezés szerint az OS nevét fogja feloldani.",
-    "local_ptr_placeholder": "Adjon meg soronként egy kiszolgáló címet",
-    "resolve_clients_title": "Kliensek IP címeinek fordított feloldása",
-    "resolve_clients_desc": "Ha engedélyezve van, az AdGuard Home megpróbálja átfordítani a kliensek IP címeit hosztnevekre, PTR lekérdezéseket küldve a megfelelő feloldóknak (privát DNS szerverek a helyi kliensek számára, upstream szerverek a nyilvános IP címmel rendelkező ügyfelek számára).",
     "check_dhcp_servers": "DHCP szerverek keresése",
     "save_config": "Konfiguráció mentése",
     "enabled_dhcp": "DHCP szerver engedélyezve",
@@ -23,12 +18,12 @@
     "dhcp_description": "Ha a router nem nyújt DHCP beállításokat, akkor használhatja helyette az AdGuard saját, beépített DHCP szerverét.",
     "dhcp_enable": "DHCP szerver engedélyezése",
     "dhcp_disable": "DHCP szerver letiltása",
-    "dhcp_not_found": "Biztonságos a beépített DHCP-kiszolgáló engedélyezése, mert az AdGuard Home nem talált aktív DHCP-kiszolgálót a hálózaton. Javasoljuk azonban, hogy ellenőrizze kézileg is, mivel az automatikus tesztünk jelenleg nem ad 100%-os garanciát.",
+    "dhcp_not_found": "Biztonságos a beépített DHCP szerver engedélyezése - ugyanis nem találtunk aktív DHCP szervert a hálózaton. Javasoljuk azonban, hogy ellenőrizze kézileg is, mivel az automatikus tesztünk jelenleg nem ad 100%-os garanciát.",
     "dhcp_found": "Egy aktív DHCP szerver található a hálózaton. Nem biztonságos a beépített DHCP szerver engedélyezése.",
     "dhcp_leases": "DHCP bérletek",
     "dhcp_static_leases": "Statikus DHCP bérletek",
     "dhcp_leases_not_found": "Nem találhatóak DHCP bérletek",
-    "dhcp_config_saved": "DHCP beállítások sikeresen el lettek mentve",
+    "dhcp_config_saved": "DHCP beállítások elmentve",
     "dhcp_ipv4_settings": "DHCP IPv4 Beállítások",
     "dhcp_ipv6_settings": "DHCP IPv6 Beállítások",
     "form_error_required": "Kötelező mező",
@@ -37,8 +32,6 @@
     "form_error_ip_format": "Érvénytelen IP formátum",
     "form_error_mac_format": "Érvénytelen MAC formátum",
     "form_error_client_id_format": "Érvénytelen kliens ID formátum",
-    "form_error_server_name": "Érvénytelen szervernév",
-    "form_error_subnet": "A(z) \"{{cidr}}\" alhálózat nem tartalmazza a(z) \"{{ip}}\" IP címet",
     "form_error_positive": "0-nál nagyobbnak kell lennie",
     "form_error_negative": "Legalább 0-nak kell lennie",
     "range_end_error": "Nagyobbnak kell lennie, mint a tartomány kezdete",
@@ -55,8 +48,8 @@
     "ip": "IP",
     "dhcp_table_hostname": "Hosztnév",
     "dhcp_table_expires": "Lejár",
-    "dhcp_warning": "Ha engedélyezni szeretné a DHCP-kiszolgálót, ellenőrizze, hogy nincs-e más aktív DHCP-kiszolgáló a hálózaton, mert ez megszakíthatja a hálózati eszközök internetkapcsolatát.",
+    "dhcp_warning": "Ha mindenképpen engedélyezni szeretné a DHCP szervert, akkor győződjön meg arról, hogy nincs-e más aktív DHCP szerver a hálózaton. Ellenkező esetben tönkreteheti az eszközei internetkapcsolatát!",
-    "dhcp_error": "Az AdGuard Home nem tudta megállapítani, hogy van-e másik aktív DHCP-szerver a hálózaton.",
+    "dhcp_error": "Nem tudtuk meghatározni, hogy van-e másik DHCP szerver a hálózaton.",
     "dhcp_static_ip_error": "A DHCP szerver használatához statikus IP-címet kell beállítani. Nem sikerült meghatározni, hogy ez a hálózati interfész statikus IP-cím használatával van-e beállítva. Állítson be kézzel egy statikus IP-címet.",
     "dhcp_dynamic_ip_found": "A rendszer dinamikus IP-cím konfigurációt használ az <0>{{interfaceName}}</0> interfészhez. A DHCP szerver használatához statikus IP-címet kell beállítani. Jelenlegi IP-címe: <0>{{ipAddress}}</0>. Automatikusan beállítjuk ezt az IP címet statikusnak, ha rányom a DHCP engedélyezése gombra.",
     "dhcp_lease_added": "Statikus bérlet \"{{key}}\" sikeresen hozzáadva",
@@ -95,7 +88,7 @@
     "enable_protection": "Védelem engedélyezése",
     "enabled_protection": "Védelem engedélyezve",
     "disable_protection": "Védelem letiltása",
-    "disabled_protection": "Védelem letiltva",
+    "disabled_protection": "Letiltott védelem",
     "refresh_statics": "Statisztikák frissítése",
     "dns_query": "DNS lekérdezés",
     "blocked_by": "<0>Szűrők által blokkolt</0>",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Használja az AdGuard szülői felügyelet webszolgáltatását",
     "use_adguard_parental_hint": "Az AdGuard Home ellenőrzi, hogy a domain tartalmaz-e felnőtteknek szóló anyagokat. Ugyanazokat az adatvédelmi API-kat használja, mint a böngésző biztonsági webszolgáltatás.",
     "enforce_safe_search": "Biztonságos keresés kényszerítése",
-    "enforce_save_search_hint": "Az AdGuard Home a következő keresőmotorokban biztosíthatja a biztonságos keresést: Google, Youtube, Bing, DuckDuckGo, Yandex és Pixabay.",
+    "enforce_save_search_hint": "Az AdGuard Home a következő keresőmotorokban biztosíthatja a biztonságos keresést: Google, Youtube, Bing, DuckDuckGo és Yandex.",
     "no_servers_specified": "Nincsenek megadott kiszolgálók",
     "general_settings": "Általános beállítások",
     "dns_settings": "DNS beállítások",
@@ -254,22 +247,16 @@
     "custom_ip": "Egyedi IP",
     "blocking_ipv4": "IPv4 blokkolása",
     "blocking_ipv6": "IPv6 blokkolása",
-    "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "Kliens azonosító",
-    "client_id_placeholder": "Kliens azonosító megadása",
-    "client_id_desc": "A különböző klienseket egy speciális kliens azonosító segítségével lehet azonosítani. <a>Itt</a> többet is megtudhat arról, hogyan lehet a klienseket azonosítani.",
     "download_mobileconfig_doh": ".mobileconfig letöltése DNS-over-HTTPS-hez",
     "download_mobileconfig_dot": ".mobileconfig letöltése DNS-over-TLS-hez",
-    "download_mobileconfig": "Konfigurációs fájl letöltése",
     "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én. Ha 0-ra állítja, akkor nincs korlátozás.",
+    "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",
@@ -282,7 +269,7 @@
     "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(ok)",
+    "rule_label": "Szabály",
     "list_label": "Lista",
     "unknown_filter": "Ismeretlen szűrő: {{filterId}}",
     "known_tracker": "Ismert követő",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Figyelő felület",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Az AdGuard Home webes admin felülete elérhető a következő címe(ke)n:",
-    "form_error_port": "Írja be az érvényes portszámot",
+    "form_error_port": "Adjon meg egy érvényes portot",
     "install_settings_dns": "DNS szerver",
     "install_settings_dns_desc": "Be kell állítania az eszközeit vagy a routerét, hogy használni tudja a DNS szervert a következő címeken:",
     "install_settings_all_interfaces": "Minden felület",
@@ -311,7 +298,7 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Ez a beállítás lefed minden eszközt, amik az Ön routeréhez csatlakoznak, így azokat nem kell külön, kézzel beállítania.",
     "install_devices_address": "Az AdGuard DNS szerver a következő címeket figyeli",
-    "install_devices_router_list_1": "Nyissa meg a router beállításait. Ez általában a böngészőn keresztül történik egy URL megadásával (pl. http://192.168.0.1/ vagy http://192.168.1.1/). Ez az oldal valószínűleg felhasználónevet és jelszót fog kérni. Ha nem tudja a belépési adatokat, ellenőrizze a router dobozát, a router alján levő fehér címkét vagy a technikai dokumentációt az interneten. Végső esetben visszaállíthatja a routert, azonban ne feledje, hogyha ezt az eljárást választja, akkor valószínűleg elveszíti annak összes beállítását. Ha a router beállításához alkalmazásra van szükség, telepítse az alkalmazást a telefonjára vagy a számítógépére, és használja azt az útválasztó beállításainak eléréséhez.",
+    "install_devices_router_list_1": "Nyissa meg a router beállításait. Ez általában a böngészőn keresztül történik egy URL megadásával (pl. http://192.168.0.1/ vagy http://192.168.1.1/). Ez az oldal valószínűleg felhasználónevet és jelszót fog kérni. Ha nem tudja a belépési adatokat, nézze meg a router dobozát, a router alján levő fehér címkét vagy a technikai dokumentációt az interneten, végső esetben pedig visszaállíthatja a routert. Néhány router speciális alkalmazást igényel, amik lehetséges, hogy már telepítve vannak a számítógépére vagy a mobil eszközére.",
     "install_devices_router_list_2": "Keresse meg a DHCP/DNS beállításokat. Keresse a DNS szót egy olyan mező mellett, amely egy 4 csoportból álló, 1-3 számjegyű számsort vár.",
     "install_devices_router_list_3": "Adja meg az AdGuard Home szerver címét itt.",
     "install_devices_router_list_4": "Bizonyos típusú routereknél nem állíthat be egyéni DNS-kiszolgálót. Ebben az esetben segíthet, ha az AdGuard Home-t DHCP-szerverként állítja be. Ellenkező esetben keresse meg az adott router kézikönyvében a DNS-kiszolgálók testreszabását.",
@@ -343,7 +330,7 @@
     "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 meg kell adnia a szerver nevét, amely megegyezik az SSL tanúsítvánnyal vagy a helyettesítő tanúsítvánnyal. Ha a mező nincs beállítva, akkor bármely tartományhoz elfogadja a TLS kapcsolatokat.",
+    "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",
@@ -399,9 +386,8 @@
     "client_edit": "Kliens módosítása",
     "client_identifier": "Azonosító",
     "ip_address": "IP cím",
-    "client_identifier_desc": "A klienseket az IP-cím, a CIDR, a MAC-cím vagy egy speciális kliens azonosító alapján lehet azonosítani (ez használható DoT/DoH /DoQ esetén). <0>Itt</0> többet is megtudhat a kliensek azonosításáról.",
+    "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_subnet_ip": "Adjon meg egy IP címet az alhálózatban \"{{cidr}}\"",
     "form_enter_mac": "MAC-cím megadása",
     "form_enter_id": "Azonosító megadása",
     "form_add_id": "Azonosító hozzáadása",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Nem engedélyezett kliensek",
     "access_disallowed_desc": "A CIDR vagy IP címek listája. Ha konfigurálva van, az AdGuard Home eldobja a lekérdezéseket ezekről az IP-címekről.",
     "access_blocked_title": "Nem engedélyezett domainek",
-    "access_blocked_desc": "Ne keverje össze ezt a szűrőkkel. Az AdGuard Home az összes DNS kérést el fogja dobni, ami ezekkel a domainekkel kapcsolatos. Itt megadhatja a pontos domainneveket, a helyettesítő karaktereket és az urlfilter-szabályokat, pl. 'example.org', '*.example.org' vagy '||example.org^'.",
+    "access_blocked_desc": "Ne keverje össze ezt a szűrőkkel. Az AdGuard Home az összes DNS kérést el fogja dobni, ami ezekkel a domainekkel kapcsolatos. Itt megadhatja a pontos domainneveket, a helyettesítő karaktereket és az urlfilter-szabályokat, pl. 'example.org', '*.example.org' or '||example.org^'.",
     "access_settings_saved": "A hozzáférési beállítások sikeresen mentésre kerültek",
     "updates_checked": "A frissítések sikeresen ellenőrizve lettek",
     "updates_version_equal": "Az AdGuard Home naprakész",
@@ -444,7 +430,6 @@
     "setup_dns_privacy_other_3": "A <0>dnscrypt-proxy</0> támogatja a <1>DNS-over-HTTPS</1>-t.",
     "setup_dns_privacy_other_4": "A <0>Mozilla Firefox</0> támogatja a <1>DNS-over-HTTPS</1>-t.",
     "setup_dns_privacy_other_5": "További megvalósításokat találhat <0>ide</0> és <1>ide</1> kattintva.",
-    "setup_dns_privacy_ioc_mac": "iOS és macOS konfiguráció",
     "setup_dns_notice": "Ahhoz, hogy a <1>DNS-over-HTTPS</1> vagy a <1>DNS-over-TLS</1> valamelyikét használja, muszáj <0>beállítania a titkosítást</0> az AdGuard Home beállításaiban.",
     "rewrite_added": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen hozzáadva",
     "rewrite_deleted": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen törölve",
@@ -544,6 +529,7 @@
     "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",
@@ -601,4 +587,4 @@
     "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"
-}
+}

client/src/__locales/id.json

@@ -8,11 +8,6 @@
     "load_balancing_desc": "Permintaan satu server pada satu waktu. AdGuard Home akan menggunakan algoritma acak tertimbang untuk memilih server sehingga server tercepat akan lebih sering digunakan.",
     "bootstrap_dns": "Server DNS bootstrap",
     "bootstrap_dns_desc": "Server Bootstrap DNS dapat digunakan untuk meresolve alamat IP pada DoH/DoT resolvers yang Anda tentukan sebagai upstreams.",
-    "local_ptr_title": "Server DNS pribadi",
-    "local_ptr_desc": "Server DNS yang digunakan AdGuard Home untuk kueri PTR lokal. Server ini digunakan untuk menetapkan nama host klien bersama alamat IP pribadi, sebagai contoh \"192.168.12.34\", menggunakan rDNS. Jika tidka diatur, AdGuard Home akan menggunakan resolver DNS bawaan/default OS Anda.",
-    "local_ptr_placeholder": "Masukkan satu alamat server per baris",
-    "resolve_clients_title": "Aktifkan resolusi hostname klien",
-    "resolve_clients_desc": "Jika diaktifkan, AdGuard Home akan mencoba menyelesaikan hostname klien secara otomatis dari alamat IP mereka dengan mengirimkan kueri PTR ke penyelesai yang sesuai (server DNS pribadi untuk klien lokal, server upstream untuk klien dengan IP publik).",
     "check_dhcp_servers": "Cek untuk server DHCP",
     "save_config": "Simpan pengaturan",
     "enabled_dhcp": "Server DHCP diaktifkan",
@@ -23,7 +18,7 @@
     "dhcp_description": "Jika router Anda tidak mendukung pengaturan DHCP, Anda dapat menggunakan server DHCP bawaan AdGuard.",
     "dhcp_enable": "Aktifkan server DHCP",
     "dhcp_disable": "Nonaktifkan server DHCP",
-    "dhcp_not_found": "Aman untuk mengaktifkan server DHCP yang dibangun karena rumah AdGuard tidak menemukan server DHCP yang aktif pada jaringan. Namun, Anda harus memeriksa ulang secara manual sebagai penyelidikan otomatis tidak memberikan jaminan 100%.",
+    "dhcp_not_found": "Tidak ditemukan server DHCP aktif dalam jaringan. Aman untuk mengaktifkan server DHCP bawaan.",
     "dhcp_found": "Ditemukan beberapa server DHCP aktif di dalam jaringan. Tidak aman untuk menyalakan server DHCP bawaan.",
     "dhcp_leases": "DHCP leases",
     "dhcp_static_leases": "DHCP static leases",
@@ -37,8 +32,6 @@
     "form_error_ip_format": "Format IPv4 tidak valid",
     "form_error_mac_format": "Format MAC tidak valid",
     "form_error_client_id_format": "Format client ID tidak valid",
-    "form_error_server_name": "Nama server tidak valid",
-    "form_error_subnet": "Subnet \"{{cidr}}\" tidak berisi alamat IP \"{{ip}}\"",
     "form_error_positive": "Harus lebih dari 0",
     "form_error_negative": "Harus berjumlah 0 atau lebih besar dari 0",
     "range_end_error": "Harus lebih besar dari rentang awal",
@@ -56,9 +49,9 @@
     "dhcp_table_hostname": "Nama host",
     "dhcp_table_expires": "Kadaluwarsa",
     "dhcp_warning": "Jika anda ingin mengaktifkan server DHCP bawaan, pastikan tidak ada server DHCP lain yang aktif. Jika tidak, akan memutus koneksi internet pada perangkat yang telah terhubung!",
-    "dhcp_error": "AdGuard Home tidak dapat menentukan apakah ada server DHCP aktif lain pada jaringan.",
+    "dhcp_error": "Kami tidak dapat menentukan apakah tersedia server DHCP lainnya pada jaringan.",
-    "dhcp_static_ip_error": "Jika ingin menggunakan server DHCP, alamat IP statis harus diatur. AdGuard Home gagal menentukan jika antarmuka jaringan ini dikonfigurasi menggunakan alamat IP statis. Silakan atur alamat IP statis secara manual.",
+    "dhcp_static_ip_error": "Jika ingin menggunakan server DHCP, alamat IP statis harus diatur. Kami gagal menentukan jika antarmuka jaringan ini dikonfigurasi menggunakan alamat IP statis. Silakan atur alamat IP statis secara manual.",
-    "dhcp_dynamic_ip_found": "Sistem Anda menggunakan konfigurasi alamat IP dinamis untuk antarmuka <0>{{interfaceName}}</0>. Untuk menggunakan server DHCP, alamat IP statis harus ditetapkan. Alamat IP Anda saat ini adalah <0>{{ipAddress}}</0>. AdGuard Home akan secara otomatis menetapkan alamat IP ini sebagai statis jika Anda menekan tombol Aktifkan DHCP.",
+    "dhcp_dynamic_ip_found": "Sistem Anda menggunakan konfigurasi alamat IP dinamis untuk antarmuka <0>{{interfaceName}}</0>. Untuk menggunakan server DHCP, alamat IP statis harus ditetapkan. Alamat IP Anda saat ini adalah <0>{{ipAddress}}</0>. Kami akan secara otomatis menetapkan alamat IP ini sebagai statis jika Anda menekan tombol Aktifkan DHCP.",
     "dhcp_lease_added": "Static lease \"{{key}}\" berhasil ditambahkan",
     "dhcp_lease_deleted": "Static lease \"{{key}}\" berhasil dihapus",
     "dhcp_new_static_lease": "Static lease baru",
@@ -111,7 +104,7 @@
     "top_clients": "Klien teratas",
     "no_clients_found": "Tidak ditemukan klien",
     "general_statistics": "Statistik umum",
-    "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{value}} hari terakhir",
+    "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{count}} hari terakhir",
     "number_of_dns_query_days_plural": "Jumlah kueri DNS yang diproses selama {{count}} hari terakhir",
     "number_of_dns_query_24_hours": "Jumlah kueri DNS diproses selama 24 jam terakhir",
     "number_of_dns_query_blocked_24_hours": "Julah DNS diblokir oleh penyaring adblock dan daftar blokir hosts",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
     "use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
     "enforce_safe_search": "Paksa penelusuran aman",
-    "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, DuckDuckGo, Yandex, dan Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, dan Yandex.",
     "no_servers_specified": "Sever tidak disebutkan",
     "general_settings": "Pengaturan umum",
     "dns_settings": "Pengaturan DNS",
@@ -254,22 +247,16 @@
     "custom_ip": "Custom IP",
     "blocking_ipv4": "Blokiran IPv4",
     "blocking_ipv6": "Blokiran IPv6",
-    "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "ID Klien",
-    "client_id_placeholder": "Masukkan ID klien",
-    "client_id_desc": "Klien yang berbeda dapat diidentifikasi dengan ID klien khusus. <a>Di sini</a> Anda dapat mempelajari lebih lanjut tentang cara mengidentifikasi klien.",
     "download_mobileconfig_doh": "Unduh .mobileconfig untuk DNS-over-HTTPS",
     "download_mobileconfig_dot": "Unduh .mobileconfig untuk DNS-over-TLS",
-    "download_mobileconfig": "Unduh berkas konfigurasi",
     "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.",
+    "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/",
@@ -282,7 +269,7 @@
     "source_label": "Sumber",
     "found_in_known_domain_db": "Ditemukan di database domain dikenal",
     "category_label": "Kategori",
-    "rule_label": "Atura(n)",
+    "rule_label": "Aturan",
     "list_label": "Daftar",
     "unknown_filter": "Penyaringan {{filterId}} tidak dikenal",
     "known_tracker": "Pelacak yang dikenal",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Antarmuka pengoperasian",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Laman administrasi AdGuard Home akan tersedia di alamat berikut ini",
-    "form_error_port": "Masukkan nomor port yang valid",
+    "form_error_port": "Masukkan nilai port yang valid",
     "install_settings_dns": "Server DNS",
     "install_settings_dns_desc": "Anda perlu mengkonfigurasi perangkat atau router anda untuk menggunakan server DNS berikut ini",
     "install_settings_all_interfaces": "Semua antarmuka",
@@ -311,7 +298,7 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Pengaturan ini akan secara otomatis mencakup semua perangkat yang terhubung ke router rumah anda dan anda tak perlu mengkonfigurasikan secara manual.",
     "install_devices_address": "Server DNS AdGuard Home akan menggunakan alamat berikut",
-    "install_devices_router_list_1": "Buka preferensi untuk router Anda. Biasanya, Anda dapat mengaksesnya dari browser Anda melalui URL, seperti http://192.168.0.1/ atau http://192.168.1.1/. Anda mungkin diminta untuk memasukkan kata sandi. Jika Anda tidak mengingatnya, Anda sering kali dapat mengatur ulang kata sandi dengan menekan tombol pada perute itu sendiri, tetapi perlu diketahui bahwa jika prosedur ini dipilih, Anda mungkin akan kehilangan seluruh konfigurasi perute. Jika router Anda memerlukan aplikasi untuk menyiapkannya, instal aplikasi tersebut di ponsel atau PC Anda dan gunakan untuk mengakses pengaturan router.",
+    "install_devices_router_list_1": "Buka preferensi untuk router Anda. Biasanya, Anda dapat mengaksesnya dari browser Anda melalui URL (seperti http://192.168.0.1/ atau http://192.168.1.1/). Anda mungkin diminta memasukkan kata sandi. Jika Anda tidak mengingatnya, Anda dapat mengatur ulang kata sandi dengan menekan tombol atur ulang (reset) pada router. Beberapa router ada yang memerlukan aplikasi tertentu, dalam hal ini harus sudah diinstal pada komputer / telepon Anda.",
     "install_devices_router_list_2": "Temukan pengaturan DHCP / DNS. Cari huruf DNS di sebelah bidang yang memungkinkan dua atau tiga set angka, masing-masing dipecah menjadi empat grup dengan satu hingga tiga digit.",
     "install_devices_router_list_3": "Masukkan alamat server AdGuard Home disana",
     "install_devices_router_list_4": "Anda tidak dapat menyetel server DNS kustom pada beberapa tipe router. Dalam hal ini mungkin membantu jika Anda mengatur AdGuard Home sebagai <0>server DHCP</0>. Jika tidak, Anda harus mencari petunjuk tentang cara mengkustomisasi server DNS untuk model router khusus Anda.",
@@ -343,7 +330,7 @@
     "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. Bila ruas tak ditata, akan menerima koneksi TLS bagi domain manapun.",
+    "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",
@@ -371,7 +358,7 @@
     "encryption_reset": "Anda yakin ingin mengatur ulang pengaturan enkripsi?",
     "topline_expiring_certificate": "Sertifikat SSL Anda hampir kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
     "topline_expired_certificate": "Sertifikat SSL Anda kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
-    "form_error_port_range": "Masukkan nomor port di kisaran 80-65535",
+    "form_error_port_range": "Masukkan nilai port di kisaran 80-65535",
     "form_error_port_unsafe": "Ini adalah port yang tidak aman",
     "form_error_equal": "Seharusnya tidak sama",
     "form_error_password": "Kata sandi tidak cocok",
@@ -399,9 +386,8 @@
     "client_edit": "Ubah Klien",
     "client_identifier": "Identifikasi",
     "ip_address": "Alamat IP",
-    "client_identifier_desc": "Klien dapat diidentifikasi oleh alamat IP, CIDR, alamat MAC atau ID klien khusus (dapat digunakan untuk DoT/DoH/DoQ). <0>Di sini</0> Anda dapat mempelajari lebih lanjut tentang bagaimana mengidentifikasi klien.",
+    "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_subnet_ip": "Masukkan alamat IP di subnet \"{{cidr}}\"",
     "form_enter_mac": "Masukkan MAC",
     "form_enter_id": "Masukkan pengenal",
     "form_add_id": "Tambah pengenal",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Klien yang tidak diizinkan",
     "access_disallowed_desc": "Daftar CIDR atau alamat IP. Jika dikonfigurasi, AdGuard Home akan membatalkan permintaan dari alamat IP ini.",
     "access_blocked_title": "Domain yang diblokir",
-    "access_blocked_desc": "Jangan bingung antara ini dengan filter. AdGuard Home akan membatalkan kueri DNS dengan domain ini dalam pertanyaan kueri. Di sini Anda dapat menentukan nama domain yang tepat, karakter pengganti, dan aturan filter URL, mis. \"example.org\", \"*.example.org\" atau \"||example.org^\".",
+    "access_blocked_desc": "Jangan bingung antara ini dengan filter. AdGuard Home akan membatalkan kueri DNS dengan domain ini dalam pertanyaan kueri.",
     "access_settings_saved": "Pengaturan akses berhasil disimpan",
     "updates_checked": "Pembaruan berhasil dicek",
     "updates_version_equal": "AdGuard Home sudah tebaru",
@@ -444,7 +430,6 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> mendukung <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> mendukung <1>DNS-over-HTTPS</1>.",
     "setup_dns_privacy_other_5": "Anda akan menemukan lebih banyak implementasi <0>di sini</0> dan <1>di sini</1>.",
-    "setup_dns_privacy_ioc_mac": "Konfigurasi iOS dan macOS",
     "setup_dns_notice": "Jikalau ingin menggunakan <1>DNS-over-HTTPS</1> atau <1>DNS-over-TLS</1>, Anda perlu <0>mengatur Enkripsi</0> pada pengaturan AdGuard Home.",
     "rewrite_added": "DNS rewrite untuk \"{{key}}\" berhasil ditambahkan",
     "rewrite_deleted": "DNS rewrite untuk \"{{key}}\" berhasil dihapus",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Matikan IPv6",
     "disable_ipv6_desc": "Apabila fitur ini dinyalakan, semua permintaan DNS untuk alamat-alamat IPv6 (tipe AAAA) akan diputus.",
     "fastest_addr": "Alamat IP tercepat",
-    "fastest_addr_desc": "Kuiri semua server DNS dan kembalikan alamat IP tercepat diantara semua tanggapan. Ini memperlambat pencarian DNS Sebagai Rumah AdGuard harus menunggu tanggapan dari semua server DNS, tapi meningkatkan konektivitas keseluruhan.",
+    "fastest_addr_desc": "Permintaan semua server DNS dan kembalinya alamat IP tercepat di antara semua respons",
     "autofix_warning_text": "Apabila anda menekan \"Perbaiki\", AdGuardHome akan mengatur sistem anda untuk menggunakan server DNS AdGuardHome.",
     "autofix_warning_list": "Ini akan melakukan tugas berikut: <0>Nonaktifkan sistem DNSStubListener</0> <0> Atur alamat server DNS ke 127.0.0.1</0> <0>Ganti target tautan simbolis /etc/resolv.conf pakai /run/systemd/resolve/resolv.conf</0> <0>Hentikan DNSStubListener (muat ulang layanan sistemd-resolve service)</0>",
     "autofix_warning_result": "Hasilnya, semua permintaan DNS dari sistem anda akan diproses oleh AdGuardHome secara standar.",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "set_static_ip": "Atur alamat IP statik",
     "install_static_ok": "Kabar baik! Alamat IP statis sudah dikonfigurasi",
     "install_static_error": "AdGuard Home tidak dapat mengonfigurasinya secara otomatis untuk antarmuka jaringan ini. Silakan cari instruksi tentang cara melakukan ini secara manual.",
-    "install_static_configure": "AdGuard Home mendeteksi alamat IP dinamis  <0>{{ip}}</0> digunakan. Anda ingin menggunakannya sebagai alamat statis Anda?",
+    "install_static_configure": "Kami mendeteksi alamat IP dinamis digunakan - <0>{{ip}}</0>. Anda ingin menggunakannya sebagai alamat statis Anda?",
     "confirm_static_ip": "AdGuard Home akan mengonfigurasi {{ip}} menjadi alamat IP statis Anda. Anda ingin melanjutkan?",
     "list_updated": "{{count}} daftar terbarui",
     "list_updated_plural": "{{count}} daftar terbarui",
@@ -601,4 +587,4 @@
     "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"
-}
+}

client/src/__locales/it.json

@@ -1,18 +1,13 @@
 {
     "client_settings": "Impostazioni client",
-    "example_upstream_reserved": "Puoi specificare un upstream DNS<0>per lo specifico dominio(i)</0>",
+    "example_upstream_reserved": "Puoi specificare un server DNS<0>per uno specifico dominio(i)</0>",
-    "example_upstream_comment": "Puoi specificare un commento",
+    "example_upstream_comment": "Puoi specificare il commento",
-    "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server upstream.",
+    "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 upstream per volta. AdGuard Home utilizzerà un algoritmo casuale ponderato per la selezione del server, optando più spesso per il più veloce.",
+    "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": "I server DNS di bootstrap sono utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
+    "bootstrap_dns_desc": "Server DNS bootstrap sono utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
-    "local_ptr_title": "Server DNS privati",
-    "local_ptr_desc": "I server DNS che AdGuard Home utilizzerà per richiedere le risorse PTR disponibili localmente. Ad esempio, questo server verrà utilizzato per risolvere i nomi host dei client con indirizzi IP privati, comò \"192.168.12.34\", utilizzando rDNS. Se non impostato, AdGuard Home utilizzerà automaticamente il risolutore DNS predefinito del tuo sistema operativo.",
-    "local_ptr_placeholder": "Inserisci un indirizzo server per riga",
-    "resolve_clients_title": "Attiva la risoluzione inversa degli indirizzi IP dei client",
-    "resolve_clients_desc": "Se attivo, AdGuard Home tenterà di risolvere inversamente gli indirizzi IP dei client nei relativi nomi host inviando una richiesta PTR a un risolutore corrispondente (server DNS privato per client locali, server upstream per client con IP pubblico).",
     "check_dhcp_servers": "Controlla la presenza di server DHCP",
     "save_config": "Salva configurazione",
     "enabled_dhcp": "Server DHCP attivo",
@@ -23,12 +18,12 @@
     "dhcp_description": "Se il tuo router non supporta la configurazione delle impostazioni del DHCP puoi utilizzare il server DHCP incluso in AdGuard.",
     "dhcp_enable": "Attiva server DHCP",
     "dhcp_disable": "Disattiva server DHCP",
-    "dhcp_not_found": "È sicuro attivare il server DHCP integrato poiché AdGuard Home non ha rilevato alcun server DHCP attivo sulla rete. Tuttavia, dovresti effettuare un ricontrollo manuale poiché la ricerca automatica attualmente non garantisce un\\'affidabilità del 100%.",
+    "dhcp_not_found": "Nessun server DHCP attivo trovato nella rete. Puoi attivare il server DHCP built-in senza problemi.",
     "dhcp_found": "Trovati server DHCP attivi nella rete. Non è consigliato attivare il server DHCP built-in",
     "dhcp_leases": "Leases DHCP",
     "dhcp_static_leases": "Leases DHCP statici",
     "dhcp_leases_not_found": "Nessun lease DHCP trovato",
-    "dhcp_config_saved": "Salvataggio configurazione server DHCP riuscito",
+    "dhcp_config_saved": "Configurazione server DHCP salvata",
     "dhcp_ipv4_settings": "Impostazioni DHCP IPv4",
     "dhcp_ipv6_settings": "Impostazioni DHCP IPv6",
     "form_error_required": "Campo richiesto",
@@ -37,13 +32,11 @@
     "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_subnet": "La subnet \"{{cidr}}\" non contiene l\\'indirizzo IP \"{{ip}}\"",
     "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",
     "dhcp_form_gateway_input": "IP Gateway",
-    "dhcp_form_subnet_input": "Maschera di sottorete",
+    "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Range indirizzi IP",
     "dhcp_form_range_start": "Inizio range",
     "dhcp_form_range_end": "Fine range",
@@ -55,10 +48,10 @@
     "ip": "IP",
     "dhcp_table_hostname": "Nome host",
     "dhcp_table_expires": "Scaduto",
-    "dhcp_warning": "Se desideri attivare il server DHCP integrato, assicurati che non vi siano altri server DHCP attivi, ciò potrebbe causare problemi di connessione alla rete per i dispositivi collegati!",
+    "dhcp_warning": "Se si desidera attivare il server DHCP integrato, assicurarsi che non vi siano altri server DHCP attivi. Altrimenti, possono sussistere problemi di rete per i dispositivi collegati!",
-    "dhcp_error": "AdGuard Home non può determinare se è presente un altro server DHCP attivo nella rete.",
+    "dhcp_error": "Impossibile determinare se è presente un altro server DHCP nella rete.",
-    "dhcp_static_ip_error": "Per utilizzare il server DHCP è necessario impostare un indirizzo IP statico. AdGuard Home non è riuscito a determinare se questa interfaccia di rete è configurata utilizzando un indirizzo IP statico. Ti preghiamo di impostare manualmente un indirizzo IP statico.",
+    "dhcp_static_ip_error": "Pe rutilizzare un server DHCP, bisogna impostare un indirizzo IP statico. Non siamo riusciti a determinare se questa interfaccia di rete sia configurata per utilizzare un indirizzo IP statico. Per favore impostare un indirizzo IP statico manualmente.",
-    "dhcp_dynamic_ip_found": "Il tuo sistema utilizza una configurazione di indirizzi IP dinamici per l\\'interfaccia <0>{{interfaceName}}</0>. Per poter utilizzare un server DHCP, è necessario impostare un indirizzo IP statico. Il tuo indirizzo IP attuale è <0>{{ipAddress}}</0>. AdGuard Home imposterà automaticamente questo indirizzo come statico quando cliccherai il pulsante \"Attiva server DHCP\".",
+    "dhcp_dynamic_ip_found": "Il tuo sistema utilizza indirizzi IP dinamici per questa interfaccia <0>{{interfaceName}}</0>. Per utilizzare un server DHCP bisogna impostare un indirizzo IP statico. Il tuo indirizzo attuale è <0>{{ipAddress}}</0>. Imposteremo automaticamente questo indirizzo come statico premendo il pulsante Attiva DHCP.",
     "dhcp_lease_added": "Lease statici \"{{key}}\" aggiunti correttamente",
     "dhcp_lease_deleted": "Lease statico \"{{key}}\" eliminato correttamente",
     "dhcp_new_static_lease": "Nuovo lease statico",
@@ -89,7 +82,7 @@
     "on": "ATTIVO",
     "off": "DISATTIVATO",
     "copyright": "Copyright",
-    "homepage": "Pagina principale",
+    "homepage": "Pagina iniziale",
     "report_an_issue": "Segnala un problema",
     "privacy_policy": "Politica sulla riservatezza",
     "enable_protection": "Attiva protezione",
@@ -114,28 +107,28 @@
     "number_of_dns_query_days": "Numero di richieste DNS elaborate negli ultimi {{count}} giorni",
     "number_of_dns_query_days_plural": "Numero di richieste DNS elaborate negli ultimi {{count}} giorni",
     "number_of_dns_query_24_hours": "Numero di richieste DNS elaborate nelle ultime 24 ore",
-    "number_of_dns_query_blocked_24_hours": "Numero di richieste DNS bloccate dai filtri per annunci e dalle liste di blocco host",
+    "number_of_dns_query_blocked_24_hours": "Numero di richieste DNS bloccate dai filtri per annunci e dalle liste di host bloccati",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Numero di richieste DNS bloccate dal modulo sicurezza di navigazione di AdGuard",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Numero di richieste DNS bloccate dal modulo AdGuard \"sicurezza di navigazione\"",
-    "number_of_dns_query_blocked_24_hours_adult": "Numero di siti web per adulti bloccati",
+    "number_of_dns_query_blocked_24_hours_adult": "Numero di siti per adulti bloccati",
     "enforced_save_search": "Ricerca sicura forzata",
     "number_of_dns_query_to_safe_search": "Numero di richieste DNS dai motori di ricerca per i quali la Ricerca Sicura è stata forzata",
     "average_processing_time": "Tempo di elaborazione medio",
     "average_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>.",
-    "use_adguard_browsing_sec": "Utilizza il servizio web AdGuard 'sicurezza di navigazione'",
+    "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_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",
-    "use_adguard_parental_hint": "AdGuard Home verificherà se il dominio contiene materiale per adulti. Utilizza le stesse API privacy-friendly del servizio web 'sicurezza di navigazione'.",
+    "use_adguard_parental_hint": "AdGuard Home verificherà se il dominio contiene materiale per adulti. Utilizza le stesse API privacy-friendly del servizio web \"sicurezza di navigazione\".",
     "enforce_safe_search": "Forza ricerca sicura",
-    "enforce_save_search_hint": "AdGuard Home può forzare la ricerca sicura sui seguenti motori di ricerca: Google, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home può forzare la ricerca sicura sui seguenti motori di ricerca: Google, YouTube, Bing e Yandex",
     "no_servers_specified": "Nessun server specificato",
     "general_settings": "Impostazioni generali",
     "dns_settings": "Impostazioni DNS",
-    "dns_blocklists": "Lista nera DNS",
+    "dns_blocklists": "Lista Nera DNS",
-    "dns_allowlists": "Liste bianche DNS",
+    "dns_allowlists": "Lista Bianca DNS",
     "dns_blocklists_desc": "AdGuard Home bloccherà i domini che corrispondenti alla lista nera.",
-    "dns_allowlists_desc": "I domini DNS nelle liste bianche saranno consentiti anche fossero presenti in una delle liste nere.",
+    "dns_allowlists_desc": "I domini DNS consentiti saranno consentiti anche se sono nella lista di blocco.",
     "custom_filtering_rules": "Regole filtri personalizzati",
     "encryption_settings": "Impostazioni di crittografia",
     "dhcp_settings": "Impostazioni DHCP",
@@ -151,8 +144,8 @@
     "enabled_safe_browsing_toast": "Attiva navigazione sicura",
     "disabled_parental_toast": "Disattiva il Controllo Parentale",
     "enabled_parental_toast": "Attiva Controllo Parentale",
-    "disabled_safe_search_toast": "Ricerca sicura disattivata",
+    "disabled_safe_search_toast": "Disattiva Ricerca Sicura",
-    "enabled_save_search_toast": "Attiva ricerca sicura",
+    "enabled_save_search_toast": "Attiva Ricerca Sicura",
     "enabled_table_header": "Attivo",
     "name_table_header": "Nome",
     "list_url_table_header": "Elenco URL",
@@ -163,40 +156,40 @@
     "edit_table_action": "Modifica",
     "delete_table_action": "Elimina",
     "elapsed": "Trascorso",
-    "filters_and_hosts_hint": "AdGuard Home è in grado di comprendere la sintassi delle regole blocca-annunci o quelle dei file hosts.",
+    "filters_and_hosts_hint": "AdGuard Home è in grado di comprendere la sintassi delle regole di blocco per annunci o quelle dei file hosts.",
     "no_blocklist_added": "Non è stata aggiunta alcuna lista di blocco",
     "no_whitelist_added": "Non è stata aggiunta alcuna lista bianca",
     "add_blocklist": "Aggiungi lista di blocco",
-    "add_allowlist": "Aggiungi lista bianca",
+    "add_allowlist": "Aggiungi lista dei consentiti",
     "cancel_btn": "Annulla",
     "enter_name_hint": "Inserisci nome",
     "enter_url_or_path_hint": "Inmetti un URL o il percorso assoluto della lista",
-    "check_updates_btn": "Ricerca aggiornamenti",
+    "check_updates_btn": "Controlla aggiornamenti",
     "new_blocklist": "Nuova lista di blocco",
-    "new_allowlist": "Nuova lista bianca",
+    "new_allowlist": "Nuova lista dei consentiti",
     "edit_blocklist": "Modifica lista di blocco",
-    "edit_allowlist": "Modifica lista bianca",
+    "edit_allowlist": "Modifica lista dei consentiti",
     "choose_blocklist": "Scegli liste di blocco",
-    "choose_allowlist": "Scegli liste bianche",
+    "choose_allowlist": "Scegli liste di autorizzazione",
     "enter_valid_blocklist": "Inserisci un URL valido nella lista di blocco.",
-    "enter_valid_allowlist": "Inserisci un URL valido nella lista bianca.",
+    "enter_valid_allowlist": "Inserisci un URL valido nella lista dei consentiti.",
     "form_error_url_format": "Formato url non valido",
     "form_error_url_or_path_format": "URL o percorso assoluto della lista non valido",
     "custom_filter_rules": "Regole filtri personalizzate",
-    "custom_filter_rules_hint": "Inserisci una regola per riga. Puoi utilizzare la sintassi delle regole blocca-annunci o quelle dei file hosts.",
+    "custom_filter_rules_hint": "Inserisci una regola per riga. Puoi utilizzare la sintassi delle regole di blocco per annunci o quelle dei file hosts.",
     "examples_title": "Esempi",
     "example_meaning_filter_block": "blocca accesso al dominio example.org e a tutti i suoi sottodomini",
-    "example_meaning_filter_whitelist": "consente l\\'accesso al dominio esempio.org e a tutti i relativi sottodomini",
+    "example_meaning_filter_whitelist": "permette l'accesso al dominio example.org e a tutti i suoi sottodimini",
     "example_meaning_host_block": "AdGuard Home restituirà 127.0.0.1 come indirizzo per il dominio example.org (ma non per i suoi sottodomini)",
     "example_comment": "! Qui va un commento",
     "example_comment_meaning": "un commento",
     "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_dot": "<0>DNS_over_TLS</0> crittografato",
-    "example_upstream_doh": "<0>DNS su HTTPS</0> crittografato",
+    "example_upstream_doh": "<0>DNS-over-HTTPS</0> crittografato",
-    "example_upstream_doq": "<0>DNS su QUIC</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 risolutori <2>DNS-over-HTTPS</2>",
+    "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",
@@ -233,7 +226,7 @@
     "query_log_filtered": "Filtrato da {{filter}}",
     "query_log_confirm_clear": "Sei sicuro di voler eliminare il registro richieste?",
     "query_log_cleared": "Il registro richieste è stato correttamente cancellato",
-    "query_log_updated": "Il registro richieste è stato correttamente aggiornato",
+    "query_log_updated": "Il registro richieste è stato aggiornato con successo",
     "query_log_clear": "Cancella registri richieste",
     "query_log_retention": "Conservazione dei registri richieste",
     "query_log_enable": "Attiva registro",
@@ -254,25 +247,19 @@
     "custom_ip": "IP personalizzato",
     "blocking_ipv4": "Blocca IPv4",
     "blocking_ipv6": "Blocca IPv6",
-    "dnscrypt": "DNSCrypt",
+    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_https": "DNS su HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
-    "dns_over_tls": "DNS su TLS",
+    "download_mobileconfig_doh": "Scarica .mobileconfig per DNS-over-HTTPS",
-    "dns_over_quic": "DNS su Quic",
+    "download_mobileconfig_dot": "Scarica .mobileconfig per DNS-over-TLS",
-    "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",
     "plain_dns": "DNS semplice",
     "form_enter_rate_limit": "Imposta limite delle richieste",
     "rate_limit": "Limite delle richieste",
-    "edns_enable": "Attiva Client di Sottorete EDNS",
+    "edns_enable": "Attiva client di sottorete EDNS",
     "edns_cs_desc": "Se attivato, AdGuard Home invierà le sottoreti dei client ai server DNS.",
-    "rate_limit_desc": "Il numero di richieste al secondo consentite da un singolo client. Impostare questo valore a 0 rimuove le limitazioni.",
+    "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": "Risponde con un indirizzo IP pari a zero (0.0.0.0 per A; :: per AAAA) quando bloccato da una regola in stile Blocca-annunci; risponde con l\\'indirizzo IP specificato nella regola quando bloccato da una regola in stile /etc/hosts",
+    "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_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)",
@@ -282,7 +269,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",
@@ -311,10 +298,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Questa configurazione coprirà automaticamente tutti i dispositivi collegati al router di casa e non sarà necessario configurarli manualmente.",
     "install_devices_address": "Il server DNS di AdGuard Home sta ascoltando sui seguenti indirizzi",
-    "install_devices_router_list_1": "Accedi alle preferenze del tuo router. Di solito, puoi farlo dal tuo browser tramite un URL, come http://192.168.0.1/ o http://192.168.1.1/. Potrebbe esserti chiesto di inserire una password. Se non dovessi ricordarla, puoi reimpostare la password premendo un pulsante presente sullo stesso router, ma tieni presente che scegliendo questa procedura, probabilmente perderai l\\'intera configurazione del router. Se il tuo router necessitasse di un\\'app per configurarlo, installala sul tuo telefono o PC e utilizzala per accedere alle impostazioni del router.",
+    "install_devices_router_list_1": "Apri le preferenze per il tuo router. Di solito, puoi accedervi dal tuo browser tramite un URL (come http://192.168.0.1/ o http://192.168.1.1/). Potrebbe essere richiesto di inserire la password. Se non lo ricordi, puoi spesso reimpostare la password premendo un pulsante sul router stesso. Alcuni router richiedono un'applicazione specifica, che in quel caso dovrebbe essere già installata sul tuo computer / telefono.",
     "install_devices_router_list_2": "Trova le impostazioni DHCP / DNS. Cerca le lettere DNS accanto a un campo che consente due o tre serie di numeri, ciascuno suddiviso in quattro gruppi di 1-3 cifre.",
     "install_devices_router_list_3": "Inserisci qui gli indirizzi del tuo server AdGuard Home.",
-    "install_devices_router_list_4": "Su alcuni tipi di router, non è possibile configurare un server DNS personalizzato. In tal caso, configurare AdGuard Home come un <0>server DHCP</0> potrebbe aiutare. In alternativa, dovresti leggere il manuale di istruzioni per capire come personalizzare i server DNS sul tuo specifico modello di router.",
+    "install_devices_router_list_4": "Non puoi impostare un server DNS personalizzato o alcun tipo di router. In questi casi potrebbe essere di aiuto impostare la pagina principale di AdGuard come <0>server DHCP</0>. In alternativa, dovresti cercare sul manuale il modo per personalizzare i server DNS per il tuo particolare modello di router.",
     "install_devices_windows_list_1": "Apri il Pannello di controllo tramite il menu Start o la ricerca di Windows.",
     "install_devices_windows_list_2": "Vai a Rete e categoria Internet e poi a Centro connessioni di rete e condivisione.",
     "install_devices_windows_list_3": "Sul lato sinistro dello schermo, trova le impostazioni della scheda Cambia e fai clic su di esso.",
@@ -337,20 +324,20 @@
     "get_started": "Inizia",
     "next": "Prossimo",
     "open_dashboard": "Apri pannello di controllo",
-    "install_saved": "Salvataggio riuscito",
+    "install_saved": "Salvataggio riuscito con successo",
     "encryption_title": "crittografia",
     "encryption_desc": "Supporto di crittografia (HTTPS / TLS) per interfaccia web sia di DNS che di amministrazione",
-    "encryption_config_saved": "Configurazione crittografia salvata",
+    "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_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": "DNS-su porta-TLS",
-    "encryption_dot_desc": "Se questa porta è configurata, AdGuard Home eseguirà un server DNS su TLS su questa porta.",
+    "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": "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.",
@@ -359,8 +346,8 @@
     "encryption_expire": "Scaduto",
     "encryption_key": "Chiave privata",
     "encryption_key_input": "Copia/Incolla qui la tua chiave privata codificata PEM per il tuo certificato.",
-    "encryption_enable": "Attiva crittografia (HTTPS, DNS su HTTPS e DNS su TLS)",
+    "encryption_enable": "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_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",
@@ -371,7 +358,7 @@
     "encryption_reset": "Sei sicuro di voler ripristinare le impostazioni di crittografia?",
     "topline_expiring_certificate": "Il tuo certificato SSL sta per scadere. Aggiorna le<0> Impostazioni di crittografia </ 0>.",
     "topline_expired_certificate": "Il tuo certificato SSL è scaduto. Aggiorna le <0> Impostazioni di crittografia </ 0>.",
-    "form_error_port_range": "Immettere il valore della porta nell\\'intervallo 80-65535",
+    "form_error_port_range": "Immettere il valore della porta nell'intervallo 80-65535",
     "form_error_port_unsafe": "Questa è una porta non sicura",
     "form_error_equal": "Non dovrebbe essere uguale",
     "form_error_password": "Password non corrispondente",
@@ -383,9 +370,9 @@
     "dns_status_error": "Errore nel recupero dello stato del server DNS",
     "down": "Spenta",
     "fix": "Risolvi",
-    "dns_providers": "Qui c\\'è una <0>lista di provider DNS</0> da cui scegliere.",
+    "dns_providers": "Qui c'è una <0>list di provider DNS</0> da cui scegliere",
     "update_now": "Aggiorna ora",
-    "update_failed": "Aggiornamento automatico non riuscito. Si prega di <a>seguire questi passaggi</a>per aggiornare manualmente.",
+    "update_failed": "Aggiornamento automatico non riuscito. Si prega di <a>seguire questi passi</a>per aggiornare manualmente.",
     "processing_update": "Perfavore aspetta, AdGuard Home si sta aggiornando",
     "clients_title": "Client",
     "clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "Inserisci un indirizzo IP nella subnet \"{{cidr}}\"",
     "form_enter_mac": "Inserisci MAC",
     "form_enter_id": "Inserisci identificatore",
     "form_add_id": "Aggiungi identificatore",
@@ -423,29 +409,28 @@
     "access_disallowed_title": "Client non permessi",
     "access_disallowed_desc": "Una lista in CIDR o indirizzi IP. Se configurata AdGuard Home non accetterà richieste da questi indirizzi ip.",
     "access_blocked_title": "Domini bloccati",
-    "access_blocked_desc": "Non confondere questi elementi con i filtri. AdGuard Home eliminerà le richieste DNS con questi domini in fase di elaborazione della richiesta. Qui puoi specificare gli esatti nomi di dominio, i caratteri jolly e le regole di filtro URL, ad esempio \"example.org\", \"*.example.org\" o \"|| example.org ^\".",
+    "access_blocked_desc": "Non confondere questi elementi con i filtri. AdGuard Home eliminerà le richieste DNS con questi domini in fase di elaborazione della richiesta.",
     "access_settings_saved": "Impostazioni di accesso salvate correttamente",
-    "updates_checked": "Verifica aggiornamenti riuscita",
+    "updates_checked": "Aggiornamenti controllati con successo",
     "updates_version_equal": "AdGuard Home è aggiornato",
-    "check_updates_now": "Ricerca aggiornamenti ora",
+    "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_1": "<0>DNS-over-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_2": "<0>DNS-over-HTTPS:</0> Utilizza la stringa <1>{{address}}</1>.",
     "setup_dns_privacy_3": "<0>Ecco un elenco di software che è possibile utilizzare.</0>",
-    "setup_dns_privacy_4": "Si usa un dispositivo iOS 14 o macOS Big Sur puoi scaricare uno file speciale.mobileconfig' che aggiunge i server <highlight>DNS su HTTPS</highlight> or <highlight>DNS su TLS</highlight> alle configurazioni DNS.",
+    "setup_dns_privacy_4": "Si usa un dispositivo iOS 14 o macOS Big Sur puoi scaricare uno file speciale.mobileconfig' che aggiunge i server <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> alle configurazioni DNS.",
-    "setup_dns_privacy_android_1": "Android 9 supporta DNS 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_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 su HTTPS</1> e <1>DNS su TLS</1>.",
+    "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 su HTTPS</1> il supporto ad Android.",
+    "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 su HTTPS</1>, ma per configurarlo per l'utilizzo del proprio server, è necessario generare un <2> DNS Stamp</2> apposito.",
+    "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 su HTTPS</1> e <1>DNS su TLS</1>.",
+    "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_3": "<0>dnscrypt-proxy</0> supporta <1>DNS-over-HTTPS</1>.",
-    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supporta <1>DNS su 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-over-HTTPS</1> o <1>DNS-over-TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
-    "setup_dns_notice": "Per utilizzare <1>DNS su HTTPS</1> o <1>DNS su TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
     "rewrite_added": "Riscrittura DNS per \"{{key}}\" aggiunta correttamente",
     "rewrite_deleted": "La riscrittura DNS per \"{{key}}\" è stata eliminata correttamente",
     "rewrite_add": "Aggiungi la riscrittura DNS",
@@ -505,7 +490,7 @@
     "sign_in": "Accedi",
     "sign_out": "Esci",
     "forgot_password": "Hai perso la password?",
-    "forgot_password_desc": "Per favore segui <0>questi passaggi</0> per creare una nuova password per il tuo profilo.",
+    "forgot_password_desc": "Per favore segui <0>questi punti</0> per creare una nuova password per il tuo account.",
     "location": "Locazione",
     "orgname": "Nome dell'organizzazione",
     "netname": "Nome Network",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Disattiva IPv6",
     "disable_ipv6_desc": "Se questa funzionalità attiva, tutte le richieste DNS per gli indirizzi IPv6 (tipo AAAA) verranno eliminate.",
     "fastest_addr": "Indirizzo IP più veloce",
-    "fastest_addr_desc": "Interroga tutti i server DNS e restituisci l\\'indirizzo IP più veloce tra tutte le risposte. Ciò rallenterà le richieste DNS poiché AdGuard Home dovrà attendere le risposte da tutti i server DNS, ma ciò migliorerà complessivamente la connettività.",
+    "fastest_addr_desc": "Interroga tutti i server DNS ed ottieni l'indirizzo IP più veloce tra tutte le risposte",
     "autofix_warning_text": "Se fai clic su \"Correggi\", AdGuardHome configurerà il tuo sistema per utilizzare il server DNS AdGuardHome.",
     "autofix_warning_list": "Eseguirà queste attività: <0> Disattiva DNSStubListener di sistema </0> <0> Imposta l'indirizzo del server DNS su 127.0.0.1 </0> <0> Sostituisci la destinazione del collegamento simbolico di /etc/resolv.conf su / run / systemd /resolve/resolv.conf </0> <0> Arresta DNSStubListener (ricarica il servizio systemd-resolved) </0>",
     "autofix_warning_result": "Di conseguenza, tutte le richieste DNS dal sistema verranno elaborate da AdGuardHome per impostazione predefinita.",
@@ -540,10 +525,11 @@
     "filtered_custom_rules": "Filtrato dalle regole filtro personalizzate",
     "choose_from_list": "Scegli dalla lista",
     "add_custom_list": "Aggiungi lista personalizzata",
-    "host_whitelisted": "L\\'host è stato aggiunto alla lista bianca",
+    "host_whitelisted": "L'host è stato aggiunto alla lista bianca",
     "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",
@@ -552,20 +538,20 @@
     "client_blocked": "Client \"{{ip}}\" bloccato correttamente",
     "client_unblocked": "Client \"{{ip}}\" sbloccato correttamente",
     "static_ip": "Indirizzo IP statico",
-    "static_ip_desc": "AdGuard Home è un server quindi ha bisogno di un indirizzo IP statico per funzionare correttamente. In caso contrario, ad un certo punto, il router potrebbe assegnare un indirizzo IP differente a questo dispositivo.",
+    "static_ip_desc": "AdGuard Home è un server quindi ha bisogno di un indirizzo IP statico per funzionare correttamente. Altrimenti, a un certo punto, il router potrebbe assegnare un indirizzo IP diverso a questo dispositivo.",
     "set_static_ip": "Imposta un indirizzo IP statico",
     "install_static_ok": "Buone notizie! L'indirizzo IP statico è già configurato",
     "install_static_error": "AdGuard Home non può configurarlo automaticamente per questa interfaccia di rete. Si prega di cercare un'istruzione su come farlo manualmente.",
-    "install_static_configure": "AdGuard Home ha rilevato l\\'utilizzo dell\\'indirizzo IP dinamico <0> {{ip}} </0>. Desideri impostarlo come indirizzo statico?",
+    "install_static_configure": "Abbiamo rilevato l'utilizzo di un indirizzo IP dinamico - <0> {{ip}} </0>. Desideri impostarlo come indirizzo statico?",
     "confirm_static_ip": "AdGuard Home configurerà {{ip}} come indirizzo IP statico. Desideri procedere?",
     "list_updated": "{{count}} lista aggiornata",
     "list_updated_plural": "{{count}} liste aggiornate",
     "dnssec_enable": "Attiva DNSSEC",
-    "dnssec_enable_desc": "Spunta l\\'opzione DNSSEC nelle interrogazioni DNS in uscita e verifica il risultato (è richiesta l'attivazione del risolutore DNSSEC)",
+    "dnssec_enable_desc": "Spunta l'opzione DNSSEC nelle interrogazioni DNS in uscita e verifica il risultato (è richiesta l'attivazione del risolutore DNSSEC)",
     "validated_with_dnssec": "Verificato con DNSSEC",
     "all_queries": "Tutte le richieste",
     "show_blocked_responses": "Bloccato",
-    "show_whitelisted_responses": "Aggiunto alla Lista bianca",
+    "show_whitelisted_responses": "Nella Lista Bianca",
     "show_processed_responses": "Processato",
     "blocked_safebrowsing": "Blocco Navigazione sicura",
     "blocked_adult_websites": "Siti per adulti bloccati",
@@ -590,15 +576,15 @@
     "filter_category_security": "Sicurezza",
     "filter_category_regional": "Regionale",
     "filter_category_other": "Altro",
-    "filter_category_general_desc": "Liste per il blocco dei traccianti e degli annunci sulla maggioranza dei dispositivi",
+    "filter_category_general_desc": "Liste per blocco tracciamenti e annunci sulla maggioranza dei dispositivi",
     "filter_category_security_desc": "Liste specializzate sul blocco di malware, phishing o domini scam",
     "filter_category_regional_desc": "Liste focalizzate su annunci regionali e server traccianti",
     "filter_category_other_desc": "Altre liste di blocco",
-    "setup_config_to_enable_dhcp_server": "Configurazione dell\\'installazione per l\\'attivazione del server DHCP",
+    "setup_config_to_enable_dhcp_server": "Configurazione dell'installazione per abilitare il server DHCP",
     "original_response": "Responso originale",
     "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,20 +1,14 @@
 {
     "client_settings": "クライアント設定",
-    "example_upstream_reserved": "<0>特定のドメイン</0>に対してDNSアップストリームを指定できます。",
+    "example_upstream_reserved": "<0>特定のドメイン</0>に対してDNSアップストリームを指定できます",
-    "example_upstream_comment": "コメントを指定できます。",
+    "upstream_parallel": "並列リクエストを使用する（すべてのアップストリームサーバーを同時に照会することで解決スピードが向上します）",
-    "upstream_parallel": "並列リクエストを使用する（同時にすべてのアップストリームサーバーに処理要求することで解決スピードが向上）",
     "parallel_requests": "並列リクエスト",
     "load_balancing": "ロードバランシング",
-    "load_balancing_desc": "一度に1つのサーバに処理要求します。 AdGuard Homeは、重み付きランダムアルゴリズム（weighted random algorithm）を使用してサーバを選択するため、最速のサーバがより頻繁に使用されます。",
+    "load_balancing_desc": "一度に1つのサーバを照会します。 AdGuard Homeは、重み付きランダムアルゴリズムを使用してサーバを選択するため、最速のサーバがより頻繁に使用されます。",
     "bootstrap_dns": "ブートストラップDNSサーバ",
     "bootstrap_dns_desc": "ブートストラップDNSサーバは、上流として指定したDoH／DoTリゾルバのIPアドレスを解決するために使用されます。",
-    "local_ptr_title": "プライベートDNSサーバー",
-    "local_ptr_desc": "AdGuard HomeがローカルPTRクエリに使用するDNSサーバーです。これらのサーバーは、rDNSを使ってプライベートIPアドレス（例えば\"192.168.12.34\"）を持つクライアントのホスト名を解決するために使用されます。設定されていない場合、AdGuard HomeはOSのデフォルトDNSリゾルバーを自動的に使用します。",
-    "local_ptr_placeholder": "1行に1つのサーバを入力してください。",
-    "resolve_clients_title": "クライアントのIPアドレスの逆解決を有効にする",
-    "resolve_clients_desc": "有効にすると、AdGuard Homeは、対応するリゾルバー（ローカルクライアントの場合はプライベートDNSサーバ、パブリックIPを持つクライアントの場合は上流サーバ）にPTRクエリを送信することにより、クライアントのIPアドレスをホスト名に逆解決しようとします。",
     "check_dhcp_servers": "DHCPサーバをチェックする",
-    "save_config": "構成を保存する",
+    "save_config": "設定を保存する",
     "enabled_dhcp": "DHCPサーバを有効にしました",
     "disabled_dhcp": "DHCPサーバを無効にしました",
     "unavailable_dhcp": "DHCPは利用できません",
@@ -23,12 +17,12 @@
     "dhcp_description": "あなたのルータがDHCPの設定を提供していないのなら、AdGuardに内蔵されているDHCPサーバを利用できます。",
     "dhcp_enable": "DHCPサーバを有効にする",
     "dhcp_disable": "DHCPサーバを無効にする",
-    "dhcp_not_found": "AdGuard Homeはネットワーク上でアクティブなDHCPサーバーがないことを確認したため、内蔵DHCPサーバーを有効にしても安全です。ただし、現在の自動プロービング結果は100％保証ではないため、手動で再確認しておくことをお勧めします。",
+    "dhcp_not_found": "ネットワーク内に動作しているDHCPサーバはありません。内蔵されているDHCPサーバを有効にしても安全です。",
     "dhcp_found": "ネットワーク内に動作しているDHCPサーバが見つかりました。内臓されているDHCPサーバを有効にするのは安全ではありません。",
     "dhcp_leases": "DHCP割り当て",
     "dhcp_static_leases": "DHCP静的割り当て",
     "dhcp_leases_not_found": "DHCP割当はありません",
-    "dhcp_config_saved": "DHCP構成が無事に保存されました。",
+    "dhcp_config_saved": "DHCP設定の保存に成功しました",
     "dhcp_ipv4_settings": "DHCP IPv4 設定",
     "dhcp_ipv6_settings": "DHCP IPv6 設定",
     "form_error_required": "必須項目",
@@ -37,8 +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_subnet": "IPアドレス「{{ip}}」はサブネット「{{cidr}}」に含まれていません",
     "form_error_positive": "0より大きい必要があります",
     "form_error_negative": "0以上である必要があります",
     "range_end_error": "範囲開始よりも大きくなければなりません",
@@ -55,16 +47,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "ホスト名",
     "dhcp_table_expires": "有効期限",
-    "dhcp_warning": "ともかくDHCPサーバを有効にしたい場合は、ネットワーク内で他に稼働中のDHCPサーバがないことを確認してください。そうでなければ、ネットワーク上デバイスでインターネット接続を壊してしまう可能性があります！",
+    "dhcp_warning": "内蔵しているDHCPサーバを有効にしたい場合は、稼働中のDHCPサーバがないことを確認してください。そうでなければ、接続されたデバイスのためにインターネットを壊すかもしれません！",
-    "dhcp_error": "ネットワーク上に別の稼働中DHCPサーバがあるかどうか、AdGuard Homeは判断できませんでした。",
+    "dhcp_error": "ネットワーク内に別のDHCPサーバがあるかどうかを判断できませんでした。",
-    "dhcp_static_ip_error": "DHCPサーバーを使用するには、静的IPアドレスを設定する必要があります。このネットワークインターフェースが静的IPアドレスを使用するように設定されているかどうかを、AdGuard Homeは判断できませんでした。手動で静的IPアドレスを設定してください。",
+    "dhcp_static_ip_error": "DHCPサーバを使用するには、静的IPアドレスを設定する必要があります。このネットワークインターフェイスが静的IPアドレスを使用するように設定されているかどうかを判断できませんでした。手動で静的IPアドレスを設定してください。",
-    "dhcp_dynamic_ip_found": "お使いのシステムは、インターフェース<0>{{interfaceName}}</0>用に動的IPアドレス構成を使用しています。DHCPサーバを使用するには、静的IPアドレスで設定する必要があります。あなたの現在のIPアドレスは<0>{{ipAddress}}</0>です。「DHCPサーバを有効にする」ボタンを押すと、AdGuard Homeは自動的にこのIPアドレスを静的IPアドレスとして設定します。",
+    "dhcp_dynamic_ip_found": "ご使用のシステムは、インターフェース<0>{{interfaceName}}</0>に動的IPアドレス構成が使用されています。DHCPサーバを使用するには、静的IPアドレスで設定する必要があります。あなたの現在のIPアドレスは<0>{{ipAddress}}</0>です。「DHCPサーバを有効にする」ボタンを押すと、このIPアドレスを静的IPアドレスに自動設定されます。",
     "dhcp_lease_added": "静的割り当て \"{{key}}\" の追加に成功しました",
     "dhcp_lease_deleted": "静的割り当て \"{{key}}\" の削除に成功しました",
     "dhcp_new_static_lease": "新規静的割り当て",
     "dhcp_static_leases_not_found": "DHCP静的割り当てはありません",
     "dhcp_add_static_lease": "静的割り当てを追加する",
-    "dhcp_reset": "DHCP構成をリセットしてよろしいですか？",
+    "dhcp_reset": "DHCP設定をリセットして良いですか？",
     "country": "国",
     "city": "街",
     "delete_confirm": "\"{{key}}\" を削除してもよろしいですか？",
@@ -118,7 +110,7 @@
     "number_of_dns_query_blocked_24_hours_by_sec": "AdGuardブラウジングセキュリティモジュールによってブロックされたDNSリクエストの数",
     "number_of_dns_query_blocked_24_hours_adult": "ブロックされたアダルトウェブサイトの数",
     "enforced_save_search": "強制されたセーフサーチ",
-    "number_of_dns_query_to_safe_search": "セーフサーチが強制適用された検索エンジンへのDNSリクエストの数",
+    "number_of_dns_query_to_safe_search": "セーフサーチが強制された検索エンジンに対するDNSリクエストの数",
     "average_processing_time": "平均処理時間",
     "average_processing_time_hint": "DNSリクエストの処理にかかる平均時間（ミリ秒単位）",
     "block_domain_use_filters_and_hosts": "フィルタとhostsファイルを使用してドメインをブロックする",
@@ -128,7 +120,7 @@
     "use_adguard_parental": "AdGuardペアレンタルコントロール・ウェブサービスを使用する",
     "use_adguard_parental_hint": "AdGuard Homeは、ドメインにアダルトコンテンツが含まれているかどうかを確認します。 ブラウジングセキュリティ・ウェブサービスと同じプライバシーに優しいAPIを使用します。",
     "enforce_safe_search": "セーフサーチを強制する",
-    "enforce_save_search_hint": "AdGuard Homeは、 Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay という検索エンジンでセーフサーチを強制適用できます。",
+    "enforce_save_search_hint": "AdGuard Homeは、Google、Youtube、Bing、DuckDuckGo、Yandexの検索エンジンでセーフサーチを強制できます。",
     "no_servers_specified": "サーバが指定されていません",
     "general_settings": "一般設定",
     "dns_settings": "DNS設定",
@@ -140,7 +132,7 @@
     "encryption_settings": "暗号化設定",
     "dhcp_settings": "DHCP設定",
     "upstream_dns": "上流DNSサーバ",
-    "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。上流DNSサーバの構成設定について詳しくは<a>こちら</a>でご確認いただけます。",
+    "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。上流DNSサーバの構成についての詳細は<a>こちら</a>をご確認ください。",
     "upstream_dns_configured_in_file": "{{path}} にて設定されています",
     "test_upstream_btn": "上流サーバをテストする",
     "upstreams": "上流",
@@ -254,22 +246,14 @@
     "custom_ip": "カスタムIP",
     "blocking_ipv4": "ブロック中のIPv4",
     "blocking_ipv6": "ブロック中のIPv6",
-    "dnscrypt": "DNSCrypt",
     "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": "頻度制限",
     "edns_enable": "EDNSクライアント・サブネットを有効にする",
     "edns_cs_desc": "有効にすると、AdGuard HomeはクライアントのサブネットをDNSサーバへ送信します。",
-    "rate_limit_desc": "一つのクライアントに対して許可される1秒あたりのリクエスト数（「0」に設定すると、制限なしになります）",
+    "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アドレスで応答します。",
@@ -311,10 +295,10 @@
     "install_devices_router": "ルータ",
     "install_devices_router_desc": "この設定では、ルータに接続されているすべてのデバイスを自動的にカバーしますので、各デバイスを手動で設定する必要はありません。",
     "install_devices_address": "AdGuard HomeのDNSサーバは次のアドレスで待ち受けています",
-    "install_devices_router_list_1": "ルーターの設定を開きます（通常、URLの http://192.168.0.1/ または http://192.168.1.1/ などを入力してブラウザからアクセスできます）。\nパスワードの入力を求められることがあります。パスワードを覚えていない場合は、ルータにあるボタンを押してパスワードをリセットできます（※この場合、ルーターで設定されている構成が初期化される可能性が高いのでご注意ください）。\n一部のルーターは設定用アプリを必要とします。その場合、設定用アプリをお使いのコンピュータ/スマホにインストールして、そのアプリからルーターの設定にアクセスしてください。",
+    "install_devices_router_list_1": "ルータの設定を開きます。通常は、URL（http://192.168.0.1/ または http://192.168.1.1/ など）を介してブラウザからアクセスできます。パスワードの入力を求められることがあります。パスワードを覚えていない場合は、ルータにあるボタンを押してパスワードをリセットできます。一部のルータは特定のアプリケーションを必要とします。その場合、アプリケーションはあなたのコンピュータ／電話に既にインストールされているはずです。",
     "install_devices_router_list_2": "DHCP／DNSの設定を見つけます。DNSの文字のある入力欄を探します。それは、1〜3桁の数字で4つのグループに分けられた入力欄で、２〜３セットを許可されている欄です。",
     "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を<0>DHCPサーバ</0>として設定するとお役に立ちます。それ以外の場合は、特定のルータモデルに合わせてDNSサーバをカスタマイズする方法に関するマニュアルを検索する必要があります。",
     "install_devices_windows_list_1": "「スタート」メニューまたはWindowsの検索から「設定」を開きます。",
     "install_devices_windows_list_2": "「ネットワークとインターネット」カテゴリに移動し、さらに「ネットワークと共有センター」へ移動します。",
     "install_devices_windows_list_3": "画面の左側にある「アダプターの設定の変更」を見つけてクリックします。",
@@ -340,10 +324,10 @@
     "install_saved": "保存に成功しました",
     "encryption_title": "暗号化",
     "encryption_desc": "DNSと管理ウェブインターフェースの両方に対する暗号化（HTTPS／TLS）をサポートします",
-    "encryption_config_saved": "暗号化構成が保存されました。",
+    "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 ポート",
@@ -371,9 +355,9 @@
     "encryption_reset": "暗号化設定をリセットして良いですか？",
     "topline_expiring_certificate": "SSL証明書は期限切れになります。<0>暗号化設定</0>を更新します。",
     "topline_expired_certificate": "SSL証明書は期限切れです。<0>暗号化設定</0>を更新します。",
-    "form_error_port_range": "80〜65535 の範囲でポート番号を入力してください",
+    "form_error_port_range": "80〜65535の範囲でポート番号を入力してください",
     "form_error_port_unsafe": "これは危険なポートです",
-    "form_error_equal": "同じ値であってはなりません",
+    "form_error_equal": "等しくないはずです",
     "form_error_password": "パスワードが不一致です",
     "reset_settings": "設定をリセットする",
     "update_announcement": "AdGuard Home {{version}}がリリースされました。詳しくは<0>こちらをクリック</0>してください。",
@@ -399,9 +383,8 @@
     "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_subnet_ip": "サブネット「{{cidr}}」内のIPアドレスを入力してください",
     "form_enter_mac": "MACアドレスを入力してください",
     "form_enter_id": "識別子を入力してください",
     "form_add_id": "識別子を追加する",
@@ -423,7 +406,7 @@
     "access_disallowed_title": "拒否するクライアント",
     "access_disallowed_desc": "CIDRまたはIPアドレスのリスト。設定されると、AdGuard HomeはこれらのIPアドレスからのリクエストを破棄します。",
     "access_blocked_title": "拒否するドメイン",
-    "access_blocked_desc": "これをフィルタと混同しないでください。AdGuard Homeは、これらのドメインを含むDNSクエリを破棄します。ここでは、「example.org」、「*.example.org」、「 ||example.org^ 」など、特定のドメイン名、ワイルドカード、URLフィルタルールを指定できます。",
+    "access_blocked_desc": "これをフィルタと混同しないでください。AdGuard Homeは、これらのドメインを含むDNSクエリを破棄します。",
     "access_settings_saved": "アクセス設定の保存に成功しました",
     "updates_checked": "アップデートの確認に成功しました",
     "updates_version_equal": "AdGuard Homeは既に最新です",
@@ -431,7 +414,6 @@
     "dns_privacy": "DNSプライバシー",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1>という文字列を使用してください。",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1>という文字列を使用してください。",
-    "setup_dns_privacy_3": "<0>使用できるソフトウェアのリストは次の通りです。</0>",
     "setup_dns_privacy_4": "iOS 14 または macOS Big Sur デバイスにて、<highlight>DNS-over-HTTPS</highlight>または<highlight>DNS-over-TLS</highlight>サーバをDNS設定へ追加する特別な「.mobileconfig」ファイルをダウンロードできます。",
     "setup_dns_privacy_android_1": "Android 9はDNS-over-TLSをネイティブにサポートします。設定するには、設定 → ネットワークとインターネット → 詳細設定 → プライベートDNS へ遷移し、そこにドメイン名を入力してください。",
     "setup_dns_privacy_android_2": "<0>AdGuard for Android</0>は、<1>DNS-over-HTTPS</1>と<1>DNS-over-TLS</1>をサポートしています。",
@@ -444,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書き換え情報を削除完了しました",
@@ -526,7 +507,7 @@
     "disable_ipv6": "IPv6を無効にする",
     "disable_ipv6_desc": "チェックすると、IPv6アドレス（タイプAAAA）のすべてのDNSクエリは破棄されます。",
     "fastest_addr": "最速のIPアドレス",
-    "fastest_addr_desc": "すべてのDNSサーバーに処理要求し、全応答の中で最速のIPアドレスを返します。これにより、AdGuard HomeがすべてのDNSサーバーからの応答を待つ必要があるため、DNSクエリが遅くなりますが、全体的な接続性は向上します。",
+    "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によって処理されます。",
@@ -544,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}}\"のブロックを解除してもよろしいですか？",
@@ -556,7 +537,7 @@
     "set_static_ip": "静的IPアドレスを設定する",
     "install_static_ok": "良いニュースです！ 既に静的IPアドレスで構成されています",
     "install_static_error": "AdGuard Homeは、このネットワークインターフェースを自動構成することはできません。手動で行う方法に関する取扱説明書を探してください。",
-    "install_static_configure": "動的IPアドレス <0>{{ip}}</0> が使用されていることをAdGuard Homeが検出しました。このアドレスをあなたの静的アドレスとして設定しますか？",
+    "install_static_configure": "動的IPアドレスが使用されていることを検出しました— <0>{{ip}}</0>。静的アドレスとして使用しますか？",
     "confirm_static_ip": "AdGuard Homeは、{{ip}}を静的IPアドレスとして設定します。よろしいですか？",
     "list_updated": "{{count}}個のリストが更新されました",
     "list_updated_plural": "{{count}}個のリストが更新されました",
@@ -580,11 +561,6 @@
     "cache_size_desc": "DNSキャッシュサイズ（バイト単位）",
     "cache_ttl_min_override": "最小TTLの上書き（秒単位）",
     "cache_ttl_max_override": "最大TTLの上書き（秒単位）",
-    "enter_cache_size": "キャッシュサイズ（バイト単位）を入力してください",
-    "enter_cache_ttl_min_override": "最小TTL（秒単位）を入力してください",
-    "enter_cache_ttl_max_override": "最大TTL（秒単位）を入力してください",
-    "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、上流サーバから受信した短いTTL（秒単位）を延長します",
-    "cache_ttl_max_override_desc": "DNSキャッシュ内のエントリの最大TTL（秒単位）を設定します",
     "ttl_cache_validation": "最小キャッシュTTL値は最大値以下にする必要があります",
     "filter_category_general": "一般",
     "filter_category_security": "セキュリティ",
@@ -594,11 +570,9 @@
     "filter_category_security_desc": "マルウェア、フィッシング、詐欺ドメインのブロック専用リストです。",
     "filter_category_regional_desc": "それぞれの地域の広告と追跡サーバをターゲットするリストです。",
     "filter_category_other_desc": "その他のブロックリストです。",
-    "setup_config_to_enable_dhcp_server": "DHCPサーバーを有効にするには構成を設定してください",
     "original_response": "当初の応答",
     "click_to_view_queries": "クエリを表示するにはクリックしてください",
     "port_53_faq_link": "多くの場合、ポート53は \"DNSStubListener\" または \"systemd-resolved\" サービスによって利用されています。これを解決する方法については、<0>この手順</0>をお読みください。",
     "adg_will_drop_dns_queries": "AdGuard Homeは、このクライアントからすべてのDNSクエリを落とします。",
-    "client_not_in_allowed_clients": "「許可されたクライアント」リストにないため、このクライアントは許可されていません。",
     "experimental": "実験用"
-}
+}

client/src/__locales/ko.json

@@ -8,11 +8,6 @@
     "load_balancing_desc": "한 번에 하나의 서버씩 질의합니다. AdGuard Home은 가중 랜덤 알고리즘를 사용해서 가장 빠른 서버가 자주 사용되도록 서버를 선택합니다.",
     "bootstrap_dns": "부트스트랩 DNS 서버",
     "bootstrap_dns_desc": "부트스트랩 DNS 서버는 업스트림으로 지정한 DoH/DoT 서버의 IP 주소를 확인하는 데 사용합니다.",
-    "local_ptr_title": "프라이빗 DNS 서버",
-    "local_ptr_desc": "AdGuard Home이 로컬 PTR 쿼리에 사용하는 DNS 서버입니다. 이러한 서버는 rDNS를 사용하여 개인 IP 주소(예: '192.168.12.34')가 있는 클라이언트의 호스트 이름을 확인하는 데 사용됩니다. 설정되지 않은 경우, AdGuard Home은 OS의 기본 DNS 리졸버를 사용합니다.",
-    "local_ptr_placeholder": "한 줄에 하나씩 서버 주소 입력",
-    "resolve_clients_title": "클라이언트 IP 주소에 대한 호스트명 확인 활성화",
-    "resolve_clients_desc": "활성화된 경우 AdGuard Home은 PTR 쿼리를 해당 서버(로컬 클라이언트의 경우 프라이빗 DNS 서버, 공용 IP 주소가 있는 클라이언트의 경우 업스트림 서버)로 전송하여 IP 주소로부터 클라이언트의 호스트명을 역으로 확인하려고 시도합니다.",
     "check_dhcp_servers": "DHCP 서버 체크",
     "save_config": "구성 저장",
     "enabled_dhcp": "DHCP 서버 활성화됨",
@@ -23,12 +18,12 @@
     "dhcp_description": "라우터가 DHCP 설정을 제공하지 않으면 AdGuard의 자체 기본 제공 DHCP 서버를 사용할 수 있습니다.",
     "dhcp_enable": "DHCP 서버 활성화",
     "dhcp_disable": "DHCP 서버 비활성화",
-    "dhcp_not_found": "AdGuard Home이 네트워크에서 활성화된 DHCP 서버를 찾지 못했기 때문에 DHCP 서버를 활성화하는 것이 안전합니다. 하지만 자동 검색이 완전히 안전하지 않기 때문에 수동으로 다시 확인하는 걸 권장합니다.",
+    "dhcp_not_found": "네트워크에 활성 DHCP 서버가 없습니다. 기본 제공 DHCP 서버를 안전하게 사용할 수 있습니다. 하지만 자동 테스트에서 100% 보증이 되지 않으므로 네트워크에 활성 DHCP 서버가 있는지없는지 수동으로 다시 확인해 보세요.",
     "dhcp_found": "네트워크에 활성 DHCP 서버가 있습니다. 기본 제공 DHCP 서버를 활성화하는 것은 안전하지 않습니다.",
     "dhcp_leases": "DHCP 임대",
     "dhcp_static_leases": "DHCP 고정 임대",
     "dhcp_leases_not_found": "DHCP 임대를 찾을 수 없음",
-    "dhcp_config_saved": "DHCP 구성이 성공적으로 저장되었습니다",
+    "dhcp_config_saved": "DHCP 서버 설정 저장됨",
     "dhcp_ipv4_settings": "DHCP IPv4 설정",
     "dhcp_ipv6_settings": "DHCP IPv6 설정",
     "form_error_required": "필수 필드",
@@ -37,8 +32,6 @@
     "form_error_ip_format": "잘못된 IP 형식",
     "form_error_mac_format": "잘못된 MAC 형식",
     "form_error_client_id_format": "잘못된 클라이언트 ID 형식",
-    "form_error_server_name": "유효하지 않은 서버 이름입니다",
-    "form_error_subnet": "서브넷 \"{{cidr}}\"에 \"{{ip}}\" IP 주소가 없습니다",
     "form_error_positive": "0보다 커야 합니다",
     "form_error_negative": "반드시 0 이상이여야 합니다",
     "range_end_error": "입력 값은 범위의 시작 지점보다 큰 값 이여야 합니다.",
@@ -55,10 +48,10 @@
     "ip": "IP",
     "dhcp_table_hostname": "호스트 이름",
     "dhcp_table_expires": "만료",
-    "dhcp_warning": "DHCP 서버를 사용하려면 네트워크에 다른 활성화된 DHCP 서버가 없는지 확인해 주세요. 다른 활성 DHCP 서버가 있다면, 연결된 장치의 인터넷이 끊길 수 있습니다.",
+    "dhcp_warning": "DHCP 서버를 사용하려면 네트워크에 다른 활성 DHCP 서버가 없는지 확인해주세요. 다른 활성 DHCP 서버가 있다면, 연결된 장치의 인터넷을 끊을 수 있습니다.",
-    "dhcp_error": "AdGuard Home이 네트워크에 다른 활성 DHCP 서버가 있는지 확인할 수 없습니다.",
+    "dhcp_error": "네트워크에 다른 DHCP 서버가 있는지 확인할 수 없습니다.",
-    "dhcp_static_ip_error": "DHCP 서버를 사용하려면 고정 IP 주소를 설정해야 합니다. AdGuard Home이 이 네트워크 인터페이스가 고정 IP 주소를 사용하는지 확인할 수 없습니다. 고정 IP 주소를 수동으로 설정하십시오.",
+    "dhcp_static_ip_error": "DHCP 서버를 사용하려면 고정 IP 주소를 설정해야 합니다. 이 네트워크 인터페이스가 고정 IP 주소를 사용하고 있는지 확인할 수 없습니다. 고정 IP 주소를 수동으로 설정해주세요.",
-    "dhcp_dynamic_ip_found": "시스템은 <0>{{interfaceName}}</0> 인터페이스에 동적 IP 주소를 사용합니다. DHCP 서버를 사용하려면 고정 IP 주소를 설정해야 합니다. 현재 IP 주소는 <0>{{ipAddress}}</0>입니다. 'DHCP 서버 활성화' 버튼을 누르면 AdGuard Home이 이 IP 주소를 고정 IP 주소로 자동 설정합니다.",
+    "dhcp_dynamic_ip_found": "시스템은 <0>{{interfaceName}}</0> 인터페이스에 동적 IP 주소 구성을 사용합니다. DHCP 서버를 사용하기 위해서 고정 IP 주소를 설정해야합니다. <0>{{ipAddress}}</0> 현재 IP 주소입니다. DHCP 활성화 버튼을 누르면 이 IP 주소가 자동으로 고정 IP 주소로 설정됩니다.",
     "dhcp_lease_added": "\"{{key}}\" 고정 임대 정상적으로 추가되었습니다",
     "dhcp_lease_deleted": "\"{{key}}\" 고정 임대 정상적으로 삭제되었습니다",
     "dhcp_new_static_lease": "새 고정 임대",
@@ -111,14 +104,14 @@
     "top_clients": "클라이언트",
     "no_clients_found": "클라이언트가 없습니다",
     "general_statistics": "일반 통계",
-    "number_of_dns_query_days": "최근 {{count}}일 동안 처리된 DNS 쿼리의 수",
+    "number_of_dns_query_days": "최근 {{count}} 일 동안 처리된 DNS 쿼리의 수",
-    "number_of_dns_query_days_plural": "최근 {{count}}일 동안 처리된 DNS 쿼리의 수",
+    "number_of_dns_query_days_plural": "최근 {{count}} 일 동안 처리된 DNS 쿼리 수",
     "number_of_dns_query_24_hours": "최근 24시간 동안 처리된 DNS 쿼리의 수",
-    "number_of_dns_query_blocked_24_hours": "광고 차단 필터 및 호스트 차단 목록에 의해 차단된 DNS 요청 수",
+    "number_of_dns_query_blocked_24_hours": "애드블록 필터 및 호스트 차단 목록에 의해 차단된 DNS 요청수",
-    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard 브라우징 보안 모듈에 의해 차단된 DNS 요청 수",
+    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard 브라우징 보안 모듈에 의해 차단된 DNS 요청수",
-    "number_of_dns_query_blocked_24_hours_adult": "차단된 성인 웹 사이트의 수",
+    "number_of_dns_query_blocked_24_hours_adult": "여러 성인 웹 사이트가 차단됨",
     "enforced_save_search": "세이프 서치 강제",
-    "number_of_dns_query_to_safe_search": "세이프서치가 적용된 검색 엔진에 대해 DNS 요청 수",
+    "number_of_dns_query_to_safe_search": "Safe Search가 적용된 검색 엔진에 대해 DNS 요청",
     "average_processing_time": "평균처리 시간",
     "average_processing_time_hint": "DNS 요청 처리시 평균 시간(밀리초)",
     "block_domain_use_filters_and_hosts": "필터 및 호스트 파일을 사용하여 도메인 차단",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "AdGuard 자녀 보호 웹 서비스 사용",
     "use_adguard_parental_hint": "AdGuard Home은 도메인에 성인 자료가 포함되어 있는지 확인합니다. 브라우징 보안 웹 서비스와 동일한 개인정보 보호 API를 사용함.",
     "enforce_safe_search": "세이프서치 강제",
-    "enforce_save_search_hint": "AdGuard Home이 Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay와 같은 검색 엔진에서 안전 검색을 시행할 수 있습니다.",
+    "enforce_save_search_hint": "AdGuard Home은 다음과 같은 검색엔진(구글, 유투브, 빙, 덕덕고, 얀덱스)에서 안전검색이 가능합니다.",
     "no_servers_specified": "지정된 서버 없음",
     "general_settings": "일반 설정",
     "dns_settings": "DNS 설정",
@@ -254,16 +247,10 @@
     "custom_ip": "사용자 지정 IP",
     "blocking_ipv4": "IPv4 차단",
     "blocking_ipv6": "IPv6 차단",
-    "dnscrypt": "DNSCrypt",
     "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": "한도 제한",
@@ -292,7 +279,7 @@
     "install_settings_listen": "네트워크 인터페이스",
     "install_settings_port": "포트",
     "install_settings_interface_link": "AdGuard Home 관리자 웹 인터페이스는 다음 주소로 제공됨:",
-    "form_error_port": "유효한 포트 번호를 입력하십시오",
+    "form_error_port": "올바른 포트 값 입력",
     "install_settings_dns": "DNS 서버",
     "install_settings_dns_desc": "다음 주소의 DNS 서버를 사용하도록 장치 또는 라우터를 구성해야 합니다.",
     "install_settings_all_interfaces": "모든 인터페이스",
@@ -311,10 +298,10 @@
     "install_devices_router": "라우터",
     "install_devices_router_desc": "이 설정은 이제 자동으로 당신의 집의 라우터에 연결된 모든 기기에 적용될 것이기에 수동으로 각각의 기기를 설정해줄 필요가 없습니다.",
     "install_devices_address": "AdGuard Home DNS 서버는 다음의 주소를 받고 있습니다.",
-    "install_devices_router_list_1": "라우터의 환경 설정을 여세요. 환경 설정은 다음의 주소(http://192.168.0.1/ 혹은 http://192.168.1.1/)를 통해 브라우저로 접근 가능합니다. 비밀번호를 입력해야 할 수 있습니다. 비밀번호를 잊었다면 라우터 기기에 있는 버튼을 눌러 비밀번호를 초기화할 수 있지만 라우터 설정이 손실될 수 있습니다. 라우터 설정에 앱이 필요한 경우, 휴대폰이나 컴퓨터에 앱을 설치하고 이를 사용하여 라우터 설정에 액세스하세요.",
+    "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": "화면 왼쪽에서 어댑터 설정 변경을 찾아 클릭하세요.",
@@ -340,7 +327,7 @@
     "install_saved": "성공적으로 저장되었습니다",
     "encryption_title": "암호화",
     "encryption_desc": "DNS 및 관리자 웹 인터페이스에 대한 암호화 (HTTPS/TLS) 지원입니다.",
-    "encryption_config_saved": "암호화 구성이 저장되었습니다",
+    "encryption_config_saved": "암호화 구성이 저장되었습니다.",
     "encryption_server": "서버 이름",
     "encryption_server_enter": "도메인 이름을 입력하세요.",
     "encryption_server_desc": "HTTPS를 사용하려면 SSL 인증서와 일치하는 서버 이름을 입력해야 합니다.",
@@ -371,7 +358,7 @@
     "encryption_reset": "암호화 설정을 재설정하시겠습니까?",
     "topline_expiring_certificate": "SSL 인증서가 곧 만료됩니다. 업데이트<0> 암호화 설정</0>.",
     "topline_expired_certificate": "SSL 인증서가 만료되었습니다. 업데이트<0> 암호화 설정</0>.",
-    "form_error_port_range": "80-65535 범위의 포트 번호를 입력하십시오",
+    "form_error_port_range": "80-65535 범위에서 포트 값을 입력해주세요.",
     "form_error_port_unsafe": "안전하지 않은 포트입니다",
     "form_error_equal": "동일하지 않아야 함",
     "form_error_password": "비밀번호 불일치",
@@ -383,7 +370,7 @@
     "dns_status_error": "DNS 서버 상태를 가져오는 도중 오류가 발생했습니다",
     "down": "다운로드",
     "fix": "수정",
-    "dns_providers": "다음은 선택할 수 있는 <0>알려진 DNS 공급자 목록</0>입니다.",
+    "dns_providers": "여기에 선택가능한 DNS 목록 </0>이 있습니다.",
     "update_now": "지금 업데이트",
     "update_failed": "자동 업데이트 실패 되었습니다. <a> 단계를 따라 수동으로 업데이트하세요</a>",
     "processing_update": "잠시만 기다려주세요, AdGuard Home가 업데이트 중입니다.",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "서브넷 \"{{cidr}}\" 내의 IP 주소 입력",
     "form_enter_mac": "MAC 입력",
     "form_enter_id": "식별자 입력",
     "form_add_id": "식별자 추가",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "차단된 클라이언트",
     "access_disallowed_desc": "CIDR 또는 IP 주소 목록입니다. 구성된 경우 AdGuard Home은 이러한 IP 주소의 요청을 삭제합니다.",
     "access_blocked_title": "차단된 도메인",
-    "access_blocked_desc": "이 기능을 필터와 혼동하지 마세요. AdGuard Home은 이러한 도메인에 대한 DNS 요청을 무시합니다. 여기서 특정 도메인을 지정하거나, 와일드 카드 또는 URL 필터 규칙을 설정해 보세요. 예) 'example.org', '*.example.org' 또는 '||example.org^'.",
+    "access_blocked_desc": "이 기능을 필터와 혼동하지 마세요. AdGuard Home은 지정된 도메인의 쿼리 요청에서 DNS 쿼리를 삭제합니다. 여기서 특정 도메인을 지정하거나, 와일드 카드 또는 URL 필터규칙을 설정해보세요. 예) 'example.org', '*.example.org' or '||example.org^'.",
     "access_settings_saved": "액세스 설정이 성공적으로 저장되었습니다.",
     "updates_checked": "업데이트가 성공적으로 확인되었습니다",
     "updates_version_equal": "AdGuard Home 최신 상태입니다.",
@@ -444,7 +430,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 수정 정보를 성공적으로 삭제 됩니다.",
@@ -526,7 +511,7 @@
     "disable_ipv6": "IPv6 비활성화",
     "disable_ipv6_desc": "이 기능이 활성화되면 IPv6 (타입 AAAA) 의 모든 DNS 쿼리가 드랍됩니다.",
     "fastest_addr": "가장 빠른 IP 주소",
-    "fastest_addr_desc": "모든 DNS 서버에 쿼리를 수행한 다음 반응이 가장 빠른 IP주소를 반송합니다. AdGuard Home이 모든 DNS 서버의 응답을 기다려야 하기 때문에 DNS 쿼리 속도가 느려지지만 전반적인 연결이 향상됩니다.",
+    "fastest_addr_desc": "반응이 가장 빠른 IP주소를 가진 DNS서버에 쿼리를 수행합니다.",
     "autofix_warning_text": "\"Fix\"를 클릭한다면 AdGuard Home은 시스템이 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에 의해 처리됩니다.",
@@ -544,6 +529,7 @@
     "check_ip": "IP 주소: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "이유: {{reason}}",
+    "check_rule": "규칙: {{rule}}",
     "check_service": "서비스 이름: {{service}}",
     "service_name": "서비스 이름",
     "check_not_found": "필터 목록에서 찾을 수 없음",
@@ -556,7 +542,7 @@
     "set_static_ip": "고정 IP 주소 설정",
     "install_static_ok": "좋은 소식입니다! 고정 IP 주소가 이미 설정되어있네요",
     "install_static_error": "AdGuard Home는 이 네트워크 인터페이스에서 자동 설정할 수 없습니다. 여기에서 어떻게 이걸 수동으로 할 수 있는지 확인해주세요.",
-    "install_static_configure": "AdGuard Home이 동적 IP 주소를 사용하는 것을 감지했습니다 - <0>{{ip}}</0>. 정말로 이걸 고정 IP로 사용하시겠습니까?",
+    "install_static_configure": "동적 IP 주소를 사용하는 것을 감지했습니다 — <0>{{ip}}</0>. 정말로 이걸 고정 IP로 사용하시겠습니까?",
     "confirm_static_ip": "AdGuard Home이 {{ip}}를 고정 IP 주소로 설정하려고 합니다. 계속하시겠습니까?",
     "list_updated": "{{count}} 리스트 업데이트됨",
     "list_updated_plural": "{{count}} 리스트 업데이트됨",
@@ -594,11 +580,11 @@
     "filter_category_security_desc": "멀웨어, 피싱 또는 사기 도메인을 차단하는 목록",
     "filter_category_regional_desc": "지역 광고 및 추적 서버에 중점을 둔 목록",
     "filter_category_other_desc": "기타 차단 목록",
-    "setup_config_to_enable_dhcp_server": "DHCP 서버를 활성화하기 위한 설정 구성",
+    "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/nl.json

@@ -1,18 +1,13 @@
 {
     "client_settings": "Cliënt Instellingen",
-    "example_upstream_reserved": "Je kan een DNS upstream specifiëren <0>voor specifieke domein(en)</0>",
+    "example_upstream_reserved": "Je kan DNS upstream <0>specifiëren voor specifieke domein(en)</0>",
-    "example_upstream_comment": "Je kan je commentaar specifiëren",
+    "example_upstream_comment": "Het commentaar kan gespecificeerd worden",
-    "upstream_parallel": "Parallelle verzoeken gebruiken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers.",
+    "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.",
-    "local_ptr_title": "Private DNS-servers",
-    "local_ptr_desc": "De DNS-servers die AdGuard Home zal gebruiken voor zoekopdrachten naar lokaal aangeboden bronnen. Deze server zal bijvoorbeeld worden gebruikt om de hostnamen van de clients op te lossen voor de clients met private IP-adressen. Indien niet ingesteld, gebruikt AdGuard Home automatisch je standaard DNS-resolver.",
-    "local_ptr_placeholder": "Voer één serveradres per regel in",
-    "resolve_clients_title": "Omzetten van hostnamen van clients inschakelen",
-    "resolve_clients_desc": "Indien ingeschakeld, zal AdGuard Home proberen om IP-adressen van apparaten te converteren in hun hostnamen door PTR-verzoeken te sturen naar overeenkomstige resolvers (privé-DNS-servers voor lokale apparaten, upstream-server voor apparaten met een openbaar IP-adres).",
     "check_dhcp_servers": "Zoek achter DHCP servers",
     "save_config": "Configuratie opslaan",
     "enabled_dhcp": "DHCP server inschakelen",
@@ -23,12 +18,12 @@
     "dhcp_description": "Indien je router geen DHCP instellingen heeft,kan je AdGuard's eigen ingebouwde DHCP server gebruiken.",
     "dhcp_enable": "DHCP server inschakelen",
     "dhcp_disable": "DHCP server uitschakelen",
-    "dhcp_not_found": "Het is veilig om de ingebouwde DHCP server in te schakelen omdat AdGuard Home geen actieve DHCP servers vond op het netwerk. We raden je echter aan om het handmatig opnieuw te controleren, omdat onze automatische test momenteel geen 100% garantie geeft.",
+    "dhcp_not_found": "Geen actieve DHCP servers gevonden op het netwerk. Het is VEILIG om de ingebouwde DHCP server in te schakelen",
     "dhcp_found": "Actieve DHCP server(s) gevonden op het netwerk. het is NIET veilig om de ingebouwde DHCP server in te schakelen.",
     "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",
@@ -37,8 +32,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_subnet": "Subnet “{{cidr}}” bevat niet het IP-adres “{{ip}}”",
     "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",
@@ -55,10 +48,10 @@
     "ip": "IP",
     "dhcp_table_hostname": "Host naam",
     "dhcp_table_expires": "Verloopt op",
-    "dhcp_warning": "Indien je de ingebouwde DHCP server wilt inschakelen, let dan op dat er geen andere actieve DHCP server aanwezig is in je netwerk. Dit kan de internetverbinding instabiel maken voor sommige apparaten in je netwerk!",
+    "dhcp_warning": "Indien je de ingebouwde DHCP server wilt inschakelen, let dan op dat er geen andere actieve DHCP server aanwezig is. Dit kan de internet verbinding instabiel maken!.",
-    "dhcp_error": "AdGuard Home kon niet bepalen of er een andere actieve DHCP server in je netwerk aanwezig is.",
+    "dhcp_error": "We kunnen niet bepalen of er een andere DHCP server in het netwerk is.",
-    "dhcp_static_ip_error": "Om de DHCP server te gebruiken, moet een statisch IP-adres worden ingesteld. AdGuard Home heeft niet kunnen vaststellen of de netwerkinterface is geconfigureerd met een statisch IP-adres. Stel handmatig een statisch IP-adres in.",
+    "dhcp_static_ip_error": "Om de DHCP server te gebruiken, moet een statisch IP-adres worden ingesteld. We hebben niet kunnen vaststellen of de netwerkinterface is geconfigureerd met een statisch IP-adres. Stel handmatig een statisch IP-adres in.",
-    "dhcp_dynamic_ip_found": "Je systeem gebruikt dynamische IP-adres configuratie voor interface <0>{{interfaceName}}</0>. Om de DHCP server te gebruiken moet er een statisch IP-adres worden ingesteld. Je huidige IP-adres is <0>{{ipAddress}}</0>. AdGuard Home zal automatisch dit IP-adres als statisch IP-adres instellen wanneer je op de knop \"DHCP inschakelen\" drukt.",
+    "dhcp_dynamic_ip_found": "Om de DHCP server te gebruiken voor interface <0>{{interfaceName}}</0>, moet er een statisch IP-adres worden ingesteld. Uw huidige IP-adres is <0>{{ipAddress}}</0>. We stellen automatische dit IP-adres in, als statisch IP-adres, wanneer u op de knop DHCP inschakelen drukt.",
     "dhcp_lease_added": "Statische uitgifte \"{{key}}\" met succes toegevoegd",
     "dhcp_lease_deleted": "Statische uitgifte \"{{key}}\" met succes verwijderd",
     "dhcp_new_static_lease": "Voeg static lease toe",
@@ -111,12 +104,12 @@
     "top_clients": "Top gebruikers",
     "no_clients_found": "Geen gebruikers gevonden",
     "general_statistics": "Generieke statistieken",
-    "number_of_dns_query_days": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dag",
+    "number_of_dns_query_days": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dagen",
     "number_of_dns_query_days_plural": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dagen",
-    "number_of_dns_query_24_hours": "Aantal verwerkte DNS aanvragen van de laatste 24 uur",
+    "number_of_dns_query_24_hours": "Aantal verwerkte aanvragen van de laatste 24 uur",
     "number_of_dns_query_blocked_24_hours": "Aantal geblokkeerde DNS aanvragen door advertentie blokkering en hosts blokkeerlijsten",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Aantal geblokkeerde DNS aanvragen door AdGuard browsing beveiligingsmodule",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Aantal geblokkeerde DNS aanvragen door AdGuard browsing security module",
-    "number_of_dns_query_blocked_24_hours_adult": "Aantal geblokkeerde 18+ websites",
+    "number_of_dns_query_blocked_24_hours_adult": "Opgevraagde 18+ websites",
     "enforced_save_search": "Geforceerd veilig zoeken",
     "number_of_dns_query_to_safe_search": "Aantal DNS aanvragen in zoekmachines dmv geforceerd veilig zoeken",
     "average_processing_time": "Gemiddelde procestijd",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Gebruik AdGuard Ouderlijk toezicht web service",
     "use_adguard_parental_hint": "AdGuard Home controleert of het domein 18+ content bevat. Dit gebeurt dmv dezelfde privacy vriendelijke API als de Browsing Security web service.",
     "enforce_safe_search": "Forceer Veilig Zoeken",
-    "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en Yandex.",
     "no_servers_specified": "Geen servers gespecificeerd",
     "general_settings": "Generieke instellingen",
     "dns_settings": "DNS Instellingen",
@@ -139,8 +132,8 @@
     "custom_filtering_rules": "Aangepaste filter regels",
     "encryption_settings": "Encryptie Instellingen",
     "dhcp_settings": "DHCP Instellingen",
-    "upstream_dns": "Upstream DNS-servers",
+    "upstream_dns": "Upstream DNS servers",
-    "upstream_dns_help": "Een server-adres per regel invoeren. <a>Meer weten</a> over het configureren van 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",
@@ -193,15 +186,15 @@
     "example_comment_hash": "# Nog een opmerking",
     "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
     "example_upstream_regular": "standaard DNS (over UDP)",
-    "example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>",
+    "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
-    "example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</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",
@@ -219,7 +212,7 @@
     "empty_response_status": "Leeg",
     "show_all_filter_type": "Toon alles",
     "show_filtered_type": "Toon gefilterde",
-    "no_logs_found": "Geen logboeken gevonden",
+    "no_logs_found": "Geen log bestanden gevonden",
     "refresh_btn": "Verversen",
     "previous_btn": "Vorige",
     "next_btn": "Volgende",
@@ -242,8 +235,8 @@
     "query_log_strict_search": "Gebruik dubbele aanhalingstekens voor strikt zoeken",
     "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
     "anonymize_client_ip": "Cliënt IP anonimiseren",
-    "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in logboeken en statistiekbestanden",
+    "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in log- en statistiekbestanden",
-    "dns_config": "DNS-server configuratie",
+    "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",
@@ -254,22 +247,16 @@
     "custom_ip": "Aangepast IP",
     "blocking_ipv4": "Blokkeren IP4",
     "blocking_ipv6": "Blokkeren IP6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Zet EDNS client subnet aan",
     "edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
-    "rate_limit_desc": "Het aantal verzoeken per seconde toegelaten per toestel. 0 betekent onbeperkt.",
+    "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",
@@ -282,19 +269,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": "Geldige poortwaarde invoeren",
+    "form_error_port": "Voer geldige poortwaarde in",
-    "install_settings_dns": "DNS-server",
+    "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_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.",
@@ -311,45 +298,45 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Deze setup zal automatisch alle apparaten die op uw thuisrouter zijn aangesloten dekken en u hoeft ze niet allemaal handmatig te configureren.",
     "install_devices_address": "AdGuard Home DNS-server luistert naar de volgende adressen",
-    "install_devices_router_list_1": "Open de instellingen van jouw router. Meestal kan je deze vanuit jouw browser openen via een URL, zoals http://192.168.0.1/ of http://192.168.1.1/. Mogelijk wordt er gevraagd om een wachtwoord in te voeren. Als je het niet meer weet, kan je het wachtwoord vaak opnieuw instellen door op een knop op de router zelf te drukken, maar weet wel dat je dan de volledige routerconfiguratie kwijt bent (terug naar fabrieksinstellingen). Voor sommige routers is een specifieke toepassing/app vereist, die in dat geval op jouw computer/smartphone/tablet moet geïnstalleerd zijn.",
+    "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 een DNS-server niet instellen 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",
     "install_saved": "Succesvol opgeslagen",
     "encryption_title": "Encryptie",
     "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
-    "encryption_config_saved": "Versleuteling configuratie opgeslagen",
+    "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_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-via-TLS poort",
+    "encryption_dot": "DNS-over-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_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",
@@ -359,8 +346,8 @@
     "encryption_expire": "Verloopt",
     "encryption_key": "Prive sleutel",
     "encryption_key_input": "Kopieër en plak je PEM-gecodeerde prive sleutel voor je certificaat hier.",
-    "encryption_enable": "Activeer encryptie (HTTPS, DNS-via-HTTPS, en DNS-via-TLS)",
+    "encryption_enable": "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-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-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",
@@ -371,16 +358,16 @@
     "encryption_reset": "Ben je zeker dat je de encryptie instellingen wil resetten?",
     "topline_expiring_certificate": "Jouw SSL certificaat vervalt binnenkort. Update <0>Encryptie instellingen</0>.",
     "topline_expired_certificate": "Jouw SSL certificaat is vervallen. Update <0>Encryptie instellingen</0>.",
-    "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
+    "form_error_port_range": "Vul poort in tussen 80 en 65535",
     "form_error_port_unsafe": "Dit is een onveilige poort",
-    "form_error_equal": "Mag niet gelijk zijn",
+    "form_error_equal": "Zou niet gelijk mogen zijn",
     "form_error_password": "Wachtwoord komt niet overeen",
     "reset_settings": "Reset Instellingen",
     "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_start": "DNS server aan het opstarten",
-    "dns_status_error": "Fout bij het oproepen van de DNS-server status",
+    "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.",
@@ -393,15 +380,14 @@
     "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_subnet_ip": "Voer een IP-adres in voor het subnet “{{cidr}}”",
     "form_enter_mac": "Vul MAC in",
     "form_enter_id": "ID invoeren",
     "form_add_id": "ID toevoegen",
@@ -417,35 +403,34 @@
     "auto_clients_title": "Gebruikers (runtime)",
     "auto_clients_desc": "Data over gebruikers die AdGuard Home gebruiken, maar niet geconfigureerd zijn",
     "access_title": "Toegangs instellingen",
-    "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen.",
+    "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS server instellen.",
     "access_allowed_title": "Toegestane gebruikers",
     "access_allowed_desc": "Een lijst van CIDR of IP adressen. Indien ingesteld, zal AdGuard Home alleen van deze IP adressen aanvragen accepteren.",
     "access_disallowed_title": "Verworpen gebruikers",
     "access_disallowed_desc": "Een lijst van CIDR of IP adressen. Indien ingesteld, zal AdGuard Home aanvragen van deze IP adressen verwerpen.",
     "access_blocked_title": "Niet toegelaten domeinen",
-    "access_blocked_desc": "Verwar dit niet met filters. AdGuard Home zal deze DNS-zoekopdrachten niet uitvoeren die deze domeinen in de zoekopdracht bevatten. Hier kan je de exacte domeinnamen, wildcards en url-filter-regels specifiëren, bijv. \"example.org\", \"*.example.org\" of \"||example.org^\".",
+    "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_1": "<0>DNS-over-TLS:</0> Gebruik <1>{{address}}</1> string.",
-    "setup_dns_privacy_2": "<0>DNS-via-HTTPS:</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_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-via-HTTPS </1>en<1>DNS-via-TLS</1>.",
+    "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-via-HTTPS</1> ondersteuning toe aan Android.",
+    "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-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_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-via-HTTPS </1> en <1> DNS-via-TLS </1>.",
+    "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_3": "<0> dnscrypt-proxy </0> ondersteunt <1> DNS-over-HTTPS </1>.",
-    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> ondersteunt <1>DNS-via-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-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
-    "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.",
     "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
     "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
     "rewrite_add": "DNS-herschrijving toevoegen",
@@ -526,8 +511,8 @@
     "disable_ipv6": "Zet IPv6 uit",
     "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
     "fastest_addr": "Snelste IP adres",
-    "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat AdGuard Home moet wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
+    "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.",
+    "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",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "set_static_ip": "Stel een statisch IP-adres in",
     "install_static_ok": "Goed nieuws! Het statische IP-adres was al geconfigureerd",
     "install_static_error": "AdGuard Home kan dit niet automatisch configureren op deze netwerkinterface. Zoek een instructie om dit handmatig te doen.",
-    "install_static_configure": "AdGuard Home heeft vastgesteld dat er een dynamisch IP-adres <0>{{ip}}</0> wordt gebruikt. Wil je dit als je statische adres gebruiken?",
+    "install_static_configure": "We hebben vastgesteld dat er een dynamisch IP-adres wordt gebruikt - <0> {{ip}} </0>. Wil je dit als je statische adres gebruiken?",
     "confirm_static_ip": "AdGuard Home configureert {{ip}} als jouw statische IP-adres. Wil je doorgaan?",
     "list_updated": "{{count}} lijst geüpdatet",
     "list_updated_plural": "{{count}} lijsten geüpdatet",
@@ -594,11 +580,11 @@
     "filter_category_security_desc": "Lijsten gespecialiseerd in het blokkeren van malware, phising of scam domeinen",
     "filter_category_regional_desc": "Lijsten die focussen op regionale ads en tracking servers",
     "filter_category_other_desc": "Overige blokkeerlijsten",
-    "setup_config_to_enable_dhcp_server": "Configuratie instellen om DHCP-server in te schakelen",
+    "setup_config_to_enable_dhcp_server": "Configuratie instelling om DHCP-server in te schakelen",
     "original_response": "Oorspronkelijke reactie",
     "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,11 +1,15 @@
 {
     "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",
+    "load_balancing_desc": "Forespør én tjener om gangen. AdGuard Home vil bruke en 'vektlagt tilfeldig valg'-algoritme for å velge tjener, slik at den raskeste tjeneren blir brukt oftere.",
     "bootstrap_dns": "Bootstrap-DNS-tjenere",
     "bootstrap_dns_desc": "Bootstrap-DNS-tjenere brukes til å oppklare IP-adressene til DoH/DoT-oppklarerene som du har valgt som oppstrømstjenere.",
-    "local_ptr_title": "Private DNS-tjenere",
     "check_dhcp_servers": "Se etter DHCP-tjenere",
+    "save_config": "Lagre oppsettet",
     "enabled_dhcp": "DHCP-tjeneren ble skrudd på",
     "disabled_dhcp": "DHCP-tjeneren ble skrudd av",
     "unavailable_dhcp": "DHCP er utilgjengelig",
@@ -14,10 +18,12 @@
     "dhcp_description": "Dersom ruteren din ikke har DHCP-innstillinger, kan du bruke AdGuard Home sin egen innebygde DHCP-tjener.",
     "dhcp_enable": "Skru på DHCP-tjeneren",
     "dhcp_disable": "Skru av DHCP-tjeneren",
+    "dhcp_not_found": "Det er trygt å skru på den innebygde DHCP-tjeneren - vi kunne ikke finne noen aktive DHCP-tjenere i nettverket. Men vi oppfordrer deg til å dobbeltsjekke manuelt, siden vår automatiske test ikke gir 100% sikre svar ennå.",
     "dhcp_found": "En aktiv DHCP-tjener ble oppdaget i nettverket. Det er ikke trygt å bruke den innebygde DHCP-tjeneren.",
     "dhcp_leases": "DHCP-leieavtaler",
     "dhcp_static_leases": "Statiske DHCP-leieavtaler",
     "dhcp_leases_not_found": "Ingen DHCP-leieavtaler ble funnet",
+    "dhcp_config_saved": "Lagret DHCP-tjeneroppsettet",
     "dhcp_ipv4_settings": "DHCP IPv4-innstillinger",
     "dhcp_ipv6_settings": "DHCP IPv6-innstillinger",
     "form_error_required": "Påkrevd felt",
@@ -26,7 +32,6 @@
     "form_error_ip_format": "Ugyldig IPv4-format",
     "form_error_mac_format": "Ugyldig MAC-format",
     "form_error_client_id_format": "Ugyldig ID-klientformat",
-    "form_error_server_name": "Ugyldig tjenernavn",
     "form_error_positive": "Må være høyere enn 0",
     "form_error_negative": "Må være ≥0",
     "range_end_error": "Må være høyere enn rekkeviddens start",
@@ -43,11 +48,16 @@
     "ip": "IP-adresse",
     "dhcp_table_hostname": "Vertsnavn",
     "dhcp_table_expires": "Utløper",
+    "dhcp_warning": "Hvis du vil aktivere DHCP-tjeneren likevel, så sørg for at det ikke er noen andre aktive DHCP-tjenere i nettverket ditt. Ellers kan det knekke internettilgangen til tilkoblede enheter!",
+    "dhcp_error": "Vi klarte ikke å fastslå om det er en annen DHCP-tjener i nettverket ditt eller ikke.",
+    "dhcp_static_ip_error": "For å kunne bruke DHCP-tjeneren, må det være satt en statisk IP-adresse. Vi klarte ikke å finne ut om dette nettverksgrensesnittet har blitt satt opp med en statisk IP-adresse. Vennligst sett opp en statisk IP-adresse manuelt.",
+    "dhcp_dynamic_ip_found": "Systemet ditt bruker et oppsett med dynamisk IP-adresse for grensesnittet <0>{{interfaceName}}</0>. For å kunne bruke DHCP-tjeneren, må en statisk IP-adresse ha blitt satt opp. Din nåværende IP-adresse er <0>{{ipAddress}}</0>. Vi vil automatisk gjøre denne IP-adressen statisk hvis du trykker på «Skru på DHCP»-knappen.",
     "dhcp_lease_added": "Den statiske leieavtalen «{{key}}» ble vellykket lagt til",
     "dhcp_lease_deleted": "Den statiske leieavtalen «{{key}}» ble vellykket lagt slettet",
     "dhcp_new_static_lease": "Ny statisk leieavtale",
     "dhcp_static_leases_not_found": "Ingen statiske DHCP-leieavtaler ble funnet",
     "dhcp_add_static_lease": "Legg til statisk leieavtale",
+    "dhcp_reset": "Er du sikker på at du vil tilbakestille DHCP-oppsettet?",
     "country": "Land",
     "city": "By",
     "delete_confirm": "Er du sikker på at du vil slette «{{key}}»?",
@@ -94,7 +104,14 @@
     "top_clients": "Vanligste klienter",
     "no_clients_found": "Ingen klienter ble funnet",
     "general_statistics": "Generelle statistikker",
+    "number_of_dns_query_days": "Antall DNS-forespørsler som ble behandlet det siste døgnet",
+    "number_of_dns_query_days_plural": "Antall DNS-forespørsler som ble behandlet de siste {{count}} dagene",
+    "number_of_dns_query_24_hours": "Antall DNS-forespørsler som ble behandlet de siste 24 timene",
+    "number_of_dns_query_blocked_24_hours": "Antall DNS-forespørsler som ble blokkert av adblock-filtre, hosts-lister, og domene-lister",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Antall DNS-forespørsler som ble blokkert av AdGuard sin nettlesersikkerhetsmodul",
+    "number_of_dns_query_blocked_24_hours_adult": "Antall voksennettsteder som ble blokkert",
     "enforced_save_search": "Påtvungede barnevennlige søk",
+    "number_of_dns_query_to_safe_search": "Antall DNS-forespørsler til søkemotorer der \"Safe Search\" ble fremtvunget",
     "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",
@@ -104,6 +121,7 @@
     "use_adguard_parental": "Benytt AdGuard sin foreldrekontroll-nettjeneste",
     "use_adguard_parental_hint": "AdGuard Home vil sjekke om domenet inneholder erotisk materiale. Den benytter den samme privatlivsvennlige API-en som nettlesersikkerhetstjenesten.",
     "enforce_safe_search": "Påtving barnevennlige søk",
+    "enforce_save_search_hint": "AdGuard Home kan fremtvinge \"Safe Search\" i de følgende søkemotorene: Google, YouTube, Bing, DuckDuckGo, og Yandex.",
     "no_servers_specified": "Ingen tjenere er spesifisert",
     "general_settings": "Generelle innstillinger",
     "dns_settings": "DNS-innstillinger",
@@ -115,6 +133,7 @@
     "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",
@@ -228,11 +247,8 @@
     "custom_ip": "Tilpasset IP",
     "blocking_ipv4": "IPv4-blokkering",
     "blocking_ipv6": "IPv6-blokkering",
-    "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
-    "dns_over_quic": "DNS-over-QUIC",
-    "client_id": "Klient-ID",
     "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",
@@ -240,9 +256,9 @@
     "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_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)",
@@ -252,6 +268,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",
@@ -261,6 +278,7 @@
     "install_settings_listen": "Lytt til grensesnitt",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Ditt AdGuard Home-admin-nettgrensesnitt vil være tilgjengelig på de følgende adressene:",
+    "form_error_port": "Skriv inn en gyldig portverdi",
     "install_settings_dns": "DNS-tjener",
     "install_settings_dns_desc": "Du vil måtte sette opp enhetene eller ruteren din(e) til å bruke DNS-tjeneren på disse adressene:",
     "install_settings_all_interfaces": "Alle grensesnitt",
@@ -279,8 +297,10 @@
     "install_devices_router": "Ruter",
     "install_devices_router_desc": "Dette oppsettet vil automatisk dekke alle enhetene som er koblet til hjemmeruteren din, og du vil ikke måtte sette opp hver av dem manuelt.",
     "install_devices_address": "AdGuard Home-DNS-tjeneren lytter til de følgende adressene",
+    "install_devices_router_list_1": "Åpne innstillingene til ruteren din. Vanligvis kan du få tilgang til den på nettleseren din gjennom en URL (f.eks. http://192.168.0.1/ eller http://192.168.1.1/). Du kan bli spurt om å skrive inn passordet ditt. Hvis du ikke husker det, kan du som oftest tilbakestille passordet ditt ved å trykke på knapp på selve ruteren. Noen rutere krever et spesifikt program, som i så fall er ment å allerede ha blitt installert på din PC/mobil.",
     "install_devices_router_list_2": "Finn DHCP-/DNS-innstillingene. Se etter DNS-bokstavene ved siden av et felt som tillater to eller tre sett med sifre, som hver er delt opp i fire grupper på 1-3 sifre.",
     "install_devices_router_list_3": "Skriv inn din AdGuard Home-tjeners adresser her.",
+    "install_devices_router_list_4": "På noen rutertyper, f.eks. Altibox sine hjemmesentraler, kan man ikke velge en selvvalgt DNS-tjener. I så fall kan det hjelpe på saken om du setter opp AdGuard Home som en <0>DHCP-tjener</0>. Alternativt, burde du se i bruksanvisningen til din spesifikke rutermodell om hvordan man tilpasser DNS-tjenerne.",
     "install_devices_windows_list_1": "Åpne «Kontrollpanel» gjennom Start-menyen eller et Windows-søk.",
     "install_devices_windows_list_2": "Gå til «Nettverk og internett»-kategorien, og så til «Nettverks- og delingssenter».",
     "install_devices_windows_list_3": "På den venstre siden av skjermen, finn «Endre innstillinger for nettverkskort» og klikk på den.",
@@ -306,8 +326,10 @@
     "install_saved": "Lagringen var vellykket",
     "encryption_title": "Kryptering",
     "encryption_desc": "Krypteringsstøtte (HTTPS/TLS) for både DNS og admin-nettgrensesnittet",
+    "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",
@@ -335,10 +357,13 @@
     "encryption_reset": "Er du sikker på at du vil tilbakestille krypteringsinnstillingene?",
     "topline_expiring_certificate": "Ditt SSL-sertifikat er i ferd med å utløpe. Oppdater <0>Krypteringsinnstillinger</0>.",
     "topline_expired_certificate": "SSL-sertifikatet har utløpt. Oppdater <0>Krypteringsinnstillinger</0>.",
+    "form_error_port_range": "Skriv inn et portnummer i området 80-65535",
     "form_error_port_unsafe": "Denne porten er ikke trygg",
+    "form_error_equal": "Burde ikke være de samme",
     "form_error_password": "Passordet samsvarer ikke",
     "reset_settings": "Tilbakestill innstillinger",
     "update_announcement": "AdGuard Home {{version}} er nå tilgjengelig! <0>Klikk her</0> for mere informasjon.",
+    "setup_guide": "Oppsettsveiledning",
     "dns_addresses": "DNS-adresser",
     "dns_start": "DNS-tjeneren starter opp",
     "dns_status_error": "Feil ved sjekk av DNS-tjenerstatusen",
@@ -360,6 +385,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",
@@ -382,6 +408,7 @@
     "access_disallowed_title": "Klienter som skal avvises",
     "access_disallowed_desc": "En liste over CIDR- eller IP-adresser. Dersom dette er satt opp, vil AdGuard Home avslå forespørsler fra disse IP-adressene.",
     "access_blocked_title": "Blokkerte domener",
+    "access_blocked_desc": "Ikke forveksle dette med filtre. AdGuard Home vil nekte å behandle DNS-forespørsler som har disse domenene i forespørselene.",
     "access_settings_saved": "Tilgangsinnstillingene ble vellykket lagret",
     "updates_checked": "Oppdateringene ble vellykket sett etter",
     "updates_version_equal": "AdGuard Home er fullt oppdatert",
@@ -389,7 +416,6 @@
     "dns_privacy": "DNS-privatliv",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Benytt <1>{{address}}</1>-strengen.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Benytt <1>{{address}}</1>-strengen.",
-    "setup_dns_privacy_3": "<0>Her er en liste over programvarer du kan bruke.</0>",
     "setup_dns_privacy_android_1": "Android 9 har innebygd støtte for DNS-over-TLS. For å sette det opp, gå til Innstillinger → Nettverk og internett → Avansert → Privat DNS, og skriv inn domenenavnet ditt der.",
     "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> støtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> legger til <1>DNS-over-HTTPS</1>-støtte i Android.",
@@ -482,6 +508,7 @@
     "disable_ipv6": "Skru av IPv6",
     "disable_ipv6_desc": "Hvis dette er skrudd på, vil alle DNS-forespørslene til IPv6-adresser (AAAA-type) bli droppet.",
     "fastest_addr": "Raskeste IP-adresse",
+    "fastest_addr_desc": "Forespør alle DNS-tjenerne og hent den raskeste IP-adressen blant alle svarene. Dette vil gjøre DNS-forespørslene tregere, siden vi må vente på svar fra alle DNS-tjenerne, men det vil forbedre tilkoblingen generelt.",
     "autofix_warning_text": "Hvis du klikker på «Fiks», vil AdGuard Home sette opp systemet ditt til å bruke 'AdGuard Home'-DNS-tjeneren.",
     "autofix_warning_list": "Den vil utføre disse handlingene: <0>Skru av systemets DNSStubListener</0> <0>Sette DNS-tjeneradressen til 127.0.0.1</0> <0>Bytte ut det symbolske lenkemålet til /etc/resolv.conf med /run/systemd/resolve/resolv.conf</0> <0>Stoppe DNSStubListener (gjeninnlast 'systemd-resolved'-tjenesten)</0>",
     "autofix_warning_result": "Som følge av det vil alle DNS-forespørsler fra systemet ditt bli behandlet av AdGuard Home som standard.",
@@ -499,6 +526,7 @@
     "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",
@@ -511,6 +539,7 @@
     "set_static_ip": "Velg en statisk IP-adresse",
     "install_static_ok": "Gode nyheter! Den statiske IP-adressen er allerede satt opp",
     "install_static_error": "AdGuard Home kan ikke sette opp automatisk i dette nettverksgrensesnitt. Vennligst let opp anvisningen for hvordan man gjør det manuellt.",
+    "install_static_configure": "Vi har oppdaget at det brukes en dynamisk IP-adresse — <0>{{ip}}</0>. Vil du bruke det som din statiske adresse?",
     "confirm_static_ip": "AdGuard Home vil sette opp {{ip}} til å bli din statiske IP-adresse. Vil du fortsette?",
     "list_updated": "{{count}} liste oppdatert",
     "list_updated_plural": "{{count}} lister oppdatert",
@@ -548,10 +577,11 @@
     "filter_category_security_desc": "Lister som spesialiserer seg på å blokkere skadevare-, phishing- eller svindeldomener",
     "filter_category_regional_desc": "Lister som fokuserer på regionale reklamer og sporingstjenere",
     "filter_category_other_desc": "Andre blokkeringslister",
+    "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,18 +1,13 @@
 {
     "client_settings": "Ustawienia klienta",
-    "example_upstream_reserved": "Możesz określić nadrzędny serwer DNS <0>dla określonych domen</0>",
+    "example_upstream_reserved": "możesz określić serwer DNS <0>dla konkretnych domen</0>",
-    "example_upstream_comment": "Możesz podać komentarz",
+    "example_upstream_comment": "Możesz wpisać komentarz",
-    "upstream_parallel": "Użyj zapytań równoległych, aby przyspieszyć rozwiązywanie przez jednoczesne wysyłanie zapytań do wszystkich serwerów nadrzędnych.",
+    "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",
-    "load_balancing_desc": "Wysyłaj zapytania do jednego serwera nadrzędnego naraz. AdGuard Home użyje ważonego algorytmu losowego do wybrania serwera, tak aby najszybszy serwer był używany częściej.",
+    "load_balancing_desc": "Zapytaj jeden serwer na raz. AdGuard Home wykorzysta losowy algorytm, aby użyć najczęściej najszybszego serwera.",
     "bootstrap_dns": "Serwery DNS Bootstrap",
     "bootstrap_dns_desc": "Serwery DNS Bootstrap są używane do ustalenia adresu IP serwerów DoH/DoT, które oznaczysz jako główne serwery DNS.",
-    "local_ptr_title": "Prywatne serwery DNS",
-    "local_ptr_desc": "Serwery DNS, których AdGuard Home używa do lokalnych zapytań PTR. Serwery te są używane do rozwiązywania nazw hostów klientów z prywatnymi adresami IP, na przykład \"192.168.12.34\", przy użyciu rDNS. Jeśli nie jest ustawiony, AdGuard Home używa domyślnych resolwerów DNS systemu operacyjnego.",
-    "local_ptr_placeholder": "Wprowadź po jednym adresie serwera w każdym wierszu",
-    "resolve_clients_title": "Włącz odwrotne rozpoznawanie adresów IP klientów",
-    "resolve_clients_desc": "Jeśli jest włączona, AdGuard Home spróbuje odwrócić adresy IP klientów do ich nazw hostów, wysyłając zapytania PTR do odpowiednich resolverów (prywatne serwery DNS dla klientów lokalnych, serwer nadrzędny dla klientów z publicznymi adresami IP).",
     "check_dhcp_servers": "Sprawdź serwery DHCP",
     "save_config": "Zapisz konfigurację",
     "enabled_dhcp": "Serwer DHCP włączony",
@@ -23,12 +18,12 @@
     "dhcp_description": "Jeśli router nie zapewnia ustawień DHCP, możesz użyć wbudowanego serwera DHCP AdGuard.",
     "dhcp_enable": "Włącz serwer DHCP",
     "dhcp_disable": "Wyłącz serwer DHCP",
-    "dhcp_not_found": "Włączenie wbudowanego serwera DHCP jest bezpieczne, ponieważ AdGuard Home nie znalazł żadnych aktywnych serwerów DHCP w sieci. Powinieneś jednak ponownie sprawdzić to ręcznie, ponieważ automatyczne sondowanie nie daje obecnie 100% gwarancji.",
+    "dhcp_not_found": "Włączenie wbudowanego serwera DHCP jest bezpieczne - nie znaleźliśmy żadnych aktywnych serwerów DHCP w sieci. Sprawdź to jednak ręcznie, ponieważ nasz automatyczny test nie daje obecnie 100% gwarancji.",
     "dhcp_found": "W sieci został znaleziony aktywny serwer DHCP. Włączenie wbudowanego serwera DHCP nie jest bezpieczne.",
     "dhcp_leases": "Dzierżawa DHCP",
     "dhcp_static_leases": "Dzierżawy statyczne DHCP",
     "dhcp_leases_not_found": "Nie znaleziono dzierżaw DHCP",
-    "dhcp_config_saved": "Konfiguracja DHCP została pomyślnie zapisana",
+    "dhcp_config_saved": "Konfiguracja DHCP pomyślnie zapisana",
     "dhcp_ipv4_settings": "Ustawienia serwera DHCP IPv4",
     "dhcp_ipv6_settings": "Ustawienia serwera DHCP IPv6",
     "form_error_required": "Pole jest wymagane",
@@ -37,8 +32,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_subnet": "Podsieć \"{{cidr}}\" nie zawiera adresu IP \"{{ip}}\"",
     "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",
@@ -55,10 +48,10 @@
     "ip": "Adres IP",
     "dhcp_table_hostname": "Nazwa hosta",
     "dhcp_table_expires": "Wygasa",
-    "dhcp_warning": "Jeśli mimo wszystko chcesz włączyć serwer DHCP, upewnij się, że w Twojej sieci nie ma innego aktywnego serwera DHCP, ponieważ może to spowodować przerwanie łączności z Internetem dla urządzeń w sieci!",
+    "dhcp_warning": "Aby włączyć wbudowany serwer DHCP, upewnij się, że nie ma innego aktywnego serwera DHCP. W przeciwnym razie może przerwać połączenie internetowe dla podłączonych urządzeń!",
-    "dhcp_error": "AdGuard Home nie mógł określić, czy w sieci jest inny aktywny serwer DHCP.",
+    "dhcp_error": "Nie udało się ustalić, czy w sieci jest inny serwer DHCP.",
-    "dhcp_static_ip_error": "Aby korzystać z serwera DHCP musi być ustawiony statyczny adres IP. AdGuard Home nie udało się ustalić, czy ten interfejs sieciowy jest skonfigurowany przy użyciu statycznego adresu IP. Proszę ustawić statyczny adres IP ręcznie.",
+    "dhcp_static_ip_error": "Aby korzystać z serwera DHCP, należy ustawić statyczny adres IP. Nie udało się ustalić, czy ten interfejs sieciowy jest skonfigurowany przy użyciu statycznego adresu IP. Ustaw statyczny adres IP ręcznie.",
-    "dhcp_dynamic_ip_found": "Twój system używa dynamicznej konfiguracji adresu IP dla interfejsu <0>{{interfaceName}}</0>. Aby można było korzystać z serwera DHCP, należy ustawić statyczny adres IP. Twój obecny adres IP to <0>{{ipAddress}}</0>. AdGuard Home automatycznie ustawi ten adres IP jako statyczny, jeśli naciśniesz przycisk \"Włącz serwer DHCP\".",
+    "dhcp_dynamic_ip_found": "Twój system używa dynamicznej konfiguracji adresu IP dla interfejsu <0>{{interfaceName}}</0>. Aby korzystać z serwera DHCP, należy ustawić statyczny adres IP. Twój aktualny adres IP to <0>{{ipAddress}}</0>. Automatycznie ustawimy ten adres IP jako statyczny, jeśli naciśniesz przycisk Włącz DHCP.",
     "dhcp_lease_added": "Dzierżawa statyczna \"{{key}}\" pomyślnie dodana",
     "dhcp_lease_deleted": "Dzierżawa statyczna \"{{key}}\" pomyślnie usunięta",
     "dhcp_new_static_lease": "Nowa dzierżawa statyczna",
@@ -115,10 +108,10 @@
     "number_of_dns_query_days_plural": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} dni",
     "number_of_dns_query_24_hours": "Liczba zapytań DNS przetworzonych w ciągu ostatnich 24 godzin",
     "number_of_dns_query_blocked_24_hours": "Liczba żądań DNS zablokowanych przez filtry blokowania reklam i listy zablokowanych hostów",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Liczba żądań DNS zablokowanych przez moduł Bezpiecznego przeglądania AdGuard",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Liczba żądań DNS zablokowanych przez moduł AdGuard Bezpieczne Przeglądanie",
     "number_of_dns_query_blocked_24_hours_adult": "Liczba zablokowanych witryn dla dorosłych",
     "enforced_save_search": "Wymuszone bezpieczne wyszukiwanie",
-    "number_of_dns_query_to_safe_search": "Liczba żądań DNS kierowanych do wyszukiwarek, dla których wymuszono Bezpieczne wyszukiwanie",
+    "number_of_dns_query_to_safe_search": "Liczba żądań DNS do wyszukiwarek, dla których zastosowano wymuszenie bezpiecznego wyszukiwania",
     "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",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Użyj usługi Kontrola Rodzicielska AdGuard",
     "use_adguard_parental_hint": "AdGuard Home sprawdzi, czy domena zawiera materiały dla dorosłych. Używa tego samego interfejsu API przyjaznego prywatności, co usługa sieciowa Bezpieczne Przeglądanie. ",
     "enforce_safe_search": "Wymuszaj bezpieczne wyszukiwanie",
-    "enforce_save_search_hint": "AdGuard Home może wymusić bezpieczne wyszukiwanie w następujących wyszukiwarkach: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home może wymusić bezpieczne wyszukiwanie w następujących wyszukiwarkach: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Nie określono serwerów",
     "general_settings": "Ustawienia główne",
     "dns_settings": "Ustawienia DNS",
@@ -140,7 +133,7 @@
     "encryption_settings": "Ustawienia szyfrowania",
     "dhcp_settings": "Ustawienia DHCP",
     "upstream_dns": "Główne serwery DNS",
-    "upstream_dns_help": "Wprowadź po jednym adresie serwera w każdym wierszu. <a>Dowiedz się więcej</a> o konfigurowaniu nadrzędnych serwerów DNS.",
+    "upstream_dns_help": "Wpisz adresy serwerów po jednym w każdym wierszu. <a>Dowiedz się więcej </a> o konfigurowaniu głównych serwerów DNS.",
     "upstream_dns_configured_in_file": "Skonfigurowano w {{path}}",
     "test_upstream_btn": "Test głównych serwerów DNS",
     "upstreams": "Główne serwery DNS",
@@ -254,22 +247,16 @@
     "custom_ip": "Niestandardowy adres IP",
     "blocking_ipv4": "Blokowanie IPv4",
     "blocking_ipv6": "Blokowanie IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Włącz podsieć klienta EDNS",
     "edns_cs_desc": "Po włączeniu AdGuard Home będzie wysyłał podsieci klientów na serwery DNS.",
-    "rate_limit_desc": "Liczba żądań na sekundę dozwolona na klienta. Ustawienie wartości 0 oznacza brak ograniczeń.",
+    "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",
@@ -282,7 +269,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",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Interfejs sieciowy",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Twój interfejs www AdGuard Home Admin będzie dostępny pod następującymi adresami:",
-    "form_error_port": "Wprowadź prawidłowy numer portu",
+    "form_error_port": "Wpisz poprawną wartość portu",
     "install_settings_dns": "Serwer DNS",
     "install_settings_dns_desc": "Konieczne będzie skonfigurowanie urządzenia lub routera do korzystania z serwera DNS pod następującymi adresami:",
     "install_settings_all_interfaces": "Wszystkie interfejsy",
@@ -311,10 +298,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "To ustawienie automatycznie obejmuje wszystkie urządzenia podłączone do routera domowego i nie trzeba ich konfigurować ręcznie.",
     "install_devices_address": "Serwer DNS AdGuard Home używa następujących adresów",
-    "install_devices_router_list_1": "Otwórz preferencje routera. Zazwyczaj można uzyskać do nich dostęp z przeglądarki za pośrednictwem adresu URL, takiego jak http://192.168.0.1/ lub http://192.168.1.1/. Możesz zostać poproszony o podanie hasła. Jeśli go nie pamiętasz, często można zresetować hasło przez naciśnięcie przycisku na samym routerze, ale należy pamiętać, że jeśli ta procedura jest wybrana, prawdopodobnie stracisz całą konfigurację routera. Jeśli Twój router wymaga aplikacji do jego konfiguracji, zainstaluj ją na swoim telefonie lub komputerze i użyj jej, aby uzyskać dostęp do ustawień routera.",
+    "install_devices_router_list_1": "Otwórz ustawienia routera. Zazwyczaj możesz uzyskać do niego dostęp przez przeglądarkę za pośrednictwem adresu URL (na przykład http://192.168.0.1/ lub http://192.168.1.1/). Możesz zostać poproszony o wpisanie hasła. Jeśli nie pamiętasz hasła, możesz je odzyskać, naciskając przycisk na samym routerze. Niektóre routery wymagają określonej aplikacji, która powinna być już zainstalowana na komputerze lub telefonie.",
     "install_devices_router_list_2": "Znajdź ustawienia DHCP/DNS. Poszukaj skrótu DNS obok pola, które pozwala wstawić dwa lub trzy zestawy liczb, z których każdy jest podzielony na cztery grupy z jedną do trzech cyfr.",
     "install_devices_router_list_3": "Wpisz adresy swojego serwera AdGuard Home.",
-    "install_devices_router_list_4": "Na niektórych typach routerów nie można skonfigurować własnego serwera DNS. W takim przypadku pomocne może być skonfigurowanie AdGuard Home jako <0>serwera DHCP</0>. W przeciwnym razie należy sprawdzić w instrukcji obsługi routera, jak dostosować serwery DNS do konkretnego modelu routera.",
+    "install_devices_router_list_4": "Nie możesz ustawić niestandardowego serwera DNS na niektórych routerach. W takim przypadku może pomóc Ci skonfigurowanie AdGuard Home jako <0>serwera DHCP</0>. W przeciwnym razie musisz poszukać instrukcji ustawienia serwerów DNS dla konkretnego modelu routera.",
     "install_devices_windows_list_1": "Otwórz panel Ustawienia w menu Start lub w Windows.",
     "install_devices_windows_list_2": "Przejdź do kategorii Sieć i Internet, a następnie do Centrum sieci i udostępniania.",
     "install_devices_windows_list_3": "Po lewej stronie ekranu znajdź Zmień ustawienia adaptera i kliknij na niego.",
@@ -340,10 +327,10 @@
     "install_saved": "Pomyślnie zapisany",
     "encryption_title": "Szyfrowanie",
     "encryption_desc": "Obsługa szyfrowania (HTTPS/TLS) dla interfejsu sieciowego DNS i administratora",
-    "encryption_config_saved": "Konfiguracja szyfrowania została zapisana",
+    "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",
@@ -371,9 +358,9 @@
     "encryption_reset": "Czy na pewno chcesz zresetować ustawienia szyfrowania?",
     "topline_expiring_certificate": "Twój certyfikat SSL wkrótce wygaśnie. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "topline_expired_certificate": "Twój certyfikat SSL wygasł. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
-    "form_error_port_range": "Wpisz numer portu z zakresu 80-65535",
+    "form_error_port_range": "Wpisz wartość portu z zakresu 80-65535",
     "form_error_port_unsafe": "To jest niebezpieczny port",
-    "form_error_equal": "Nie mogą być równe",
+    "form_error_equal": "Nie powinien być równy",
     "form_error_password": "Hasło nie pasuje",
     "reset_settings": "Resetowanie ustawień",
     "update_announcement": "AdGuard Home {{version}} jest już dostępny! <0>Kliknij tutaj</0> aby uzyskać więcej informacji.",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "Wprowadź adres IP w podsieci \"{{cidr}}\"",
     "form_enter_mac": "Wpisz adres MAC",
     "form_enter_id": "Wpisz identyfikator",
     "form_add_id": "Dodaj identyfikator",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Niedozwoleni klienci",
     "access_disallowed_desc": "Lista adresów CIDR lub IP. Po skonfigurowaniu AdGuard Home usunie żądania z tych adresów IP.",
     "access_blocked_title": "Niedozwolone domeny",
-    "access_blocked_desc": "Nie myl tego z filtrami. AdGuard Home będzie odrzucał zapytania DNS z tymi domenami w zapytaniach. Tutaj możesz określić dokładne nazwy domen, symbole wieloznaczne i reguły filtrowania adresów URL, np. \"example.org\", \"*.example.org\" lub \"||example.org^\".",
+    "access_blocked_desc": "Nie myl go z filtrami. AdGuard Home zignoruje zapytanie DNS dotyczące tych domen w ramach przetwarzania zapytań. Tutaj możesz określić dokładne nazwy domen, subdomen i reguły adresów URL np. 'example.org', '*.example.org' lub '||example.org^'.",
     "access_settings_saved": "Ustawienia dostępu zostały pomyślnie zapisane",
     "updates_checked": "Aktualizacje pomyślnie sprawdzone",
     "updates_version_equal": "AdGuard Home jest aktualny",
@@ -444,7 +430,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",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Wyłącz IPv6",
     "disable_ipv6_desc": "Jeśli ta funkcja jest włączona, wszystkie zapytania DNS dotyczące adresów IPv6 (typ AAAA) zostaną usunięte.",
     "fastest_addr": "Najszybszy adres IP",
-    "fastest_addr_desc": "Zapytaj wszystkie serwery DNS i zwróć najszybszy adres IP spośród wszystkich odpowiedzi. Spowalnia to zapytania DNS, ponieważ AdGuard Home musi czekać na odpowiedzi ze wszystkich serwerów DNS, ale poprawia ogólną łączność.",
+    "fastest_addr_desc": "Zapytaj wszystkie serwery DNS i zwróć najszybszy adres IP spośród wszystkich odpowiedzi. Ta czynność spowolni zapytania DNS, ponieważ odpowiedź musi nadejść ze wszystkich serwerów DNS, ale poprawi ogólną stabilność połączenia.",
     "autofix_warning_text": "Jeśli klikniesz „Napraw”, AdGuardHome skonfiguruje system do korzystania z serwera DNS AdGuardHome.",
     "autofix_warning_list": "Wykona następujące zadania: <0>Dezaktywuj system DNSStubListener</0> <0>Ustaw adres serwera DNS na 127.0.0.1</0> <0>Zamień symboliczny cel łącza z /etc/resolv.conf na /run/systemd/resolve/resolv.conf</0> <0>Zatrzymaj DNSStubListener (przeładuj usługę systemową)</0>",
     "autofix_warning_result": "W rezultacie wszystkie żądania DNS z Twojego systemu będą domyślnie przetwarzane przez AdGuardHome.",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "set_static_ip": "Ustaw statyczny adres IP",
     "install_static_ok": "Dobre wieści! Statyczny adres IP jest już skonfigurowany",
     "install_static_error": "AdGuard Home nie może skonfigurować go automatycznie dla tego interfejsu sieciowego. Poszukaj instrukcji, jak to zrobić ręcznie.",
-    "install_static_configure": "AdGuard Home wykrył, że używany jest dynamiczny adres IP <0>{{ip}}</0>. Czy chcesz, aby został on ustawiony jako adres statyczny?",
+    "install_static_configure": "Wykryliśmy, że używany jest dynamiczny adres IP — <0>{{ip}}</0>. Czy chcesz użyć go jako adresu statycznego?",
     "confirm_static_ip": "AdGuard Home skonfiguruje {{ip}} aby był Twoim statycznym adresem IP. Czy chcesz kontynuować?",
     "list_updated": "{{count}} lista zaktualizowana",
     "list_updated_plural": "{{count}} list zaktualizowanych",
@@ -594,11 +580,11 @@
     "filter_category_security_desc": "Listy, które specjalizują się w blokowaniu domen ze złośliwym oprogramowaniem, phishingiem lub oszustwami",
     "filter_category_regional_desc": "Listy, które koncentrują się na reklamach regionalnych i serwerach ze skryptami śledzącymi",
     "filter_category_other_desc": "Inne listy zablokowanych",
-    "setup_config_to_enable_dhcp_server": "Konfiguracja ustawień w celu włączenia serwera DHCP",
+    "setup_config_to_enable_dhcp_server": "Ustaw konfigurację serwera DHCP, aby go włączyć",
     "original_response": "Oryginalna odpowiedź",
     "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,18 +1,13 @@
 {
     "client_settings": "Configurações do cliente",
-    "example_upstream_reserved": "Você pode especificar o DNS primário <0>para o domínio(s) especifico</0>",
+    "example_upstream_reserved": "Você pode especificar o DNS upstream <0>para o domínio(s) especifico</0>",
     "example_upstream_comment": "Você pode especificar o comentário",
-    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos oss servidores DNS primário",
+    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores upstream",
     "parallel_requests": "Solicitações paralelas",
     "load_balancing": "Balanceamento de carga",
-    "load_balancing_desc": "Consulte um servidor DNS primário por 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.",
+    "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 inicialização",
     "bootstrap_dns_desc": "Servidores DNS de inicialização são usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams.",
-    "local_ptr_title": "Servidores DNS privados",
-    "local_ptr_desc": "Os servidores DNS que o AdGuard Home usa para consultas PTR locais. Esses servidores são usados para resolver os nomes de host de clientes com endereços IP privados, por exemplo \"192.168.12.34\", usando rDNS. Se não for definido, o AdGuard Home usa os resolvedores DNS padrão do seu sistema operacional.",
-    "local_ptr_placeholder": "Insira um endereço de servidor por linha",
-    "resolve_clients_title": "Ativar resolução reversa de endereços IP de clientes",
-    "resolve_clients_desc": "Se ativado, o AdGuard Home tentará resolver de forma reversa os endereços IP dos clientes em seus nomes de host, enviando consultas PTR aos resolvedores correspondentes (servidores DNS privados para clientes locais, servidor DNS primário para clientes com endereços IP públicos).",
     "check_dhcp_servers": "Verificar por servidores DHCP",
     "save_config": "Salvar configuração",
     "enabled_dhcp": "Servidor DHCP ativado",
@@ -23,7 +18,7 @@
     "dhcp_description": "Se o seu roteador não fornecer configurações de DHCP, você poderá usar o servidor DHCP integrado do AdGuard.",
     "dhcp_enable": "Ativar servidor DHCP",
     "dhcp_disable": "Desativar servidor DHCP",
-    "dhcp_not_found": "É seguro ativar o servidor DHCP integrado porque o AdGuard Home não encontrou nenhum servidor DHCP ativo na rede. No entanto, você deve verificar isso manualmente, pois a verificação automática atualmente não oferece 100% de garantia.",
+    "dhcp_not_found": "É seguro ativar o servidor DHCP integrado - não encontramos nenhum servidor DHCP ativo na rede. No entanto, recomendamos que você faça manualmente uma nova verificação, pois nosso teste automático não oferece 100% de garantia.",
     "dhcp_found": "Um servidor DHCP ativo foi encontrado na rede. Não é seguro ativar o servidor DHCP incorporado.",
     "dhcp_leases": "Concessões DHCP",
     "dhcp_static_leases": "Concessões de DHCP estático",
@@ -37,8 +32,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_subnet": "A sub-rede \"{{cidr}}\" não contém o endereço IP \"{{ip}}\"",
     "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",
@@ -55,10 +48,10 @@
     "ip": "IP",
     "dhcp_table_hostname": "Nome do servidor",
     "dhcp_table_expires": "Expira",
-    "dhcp_warning": "Se você quiser ativar o servidor DHCP de qualquer maneira, certifique-se de que não haja outro servidor DHCP ativo em sua rede, pois isso pode quebrar a conectividade com a Internet para dispositivos na rede!",
+    "dhcp_warning": "Se você quiser ativar o servidor DHCP, verifique se não há outro servidor DHCP ativo na sua rede. Caso contrário, a internet pode parar de funcionar para outros dispositivos conectados!",
-    "dhcp_error": "O AdGuard Home não conseguiu determinar se há outro servidor DHCP ativo na rede.",
+    "dhcp_error": "Não foi possível determinar se existe outro servidor DHCP na rede.",
-    "dhcp_static_ip_error": "Para usar o servidor DHCP, você deve definir um endereço IP estático. AdGuard Home não conseguiu determinar se essa interface de rede está configurada usando o endereço de IP estático. Por favor, defina um endereço IP estático manualmente.",
+    "dhcp_static_ip_error": "Para usar o servidor DHCP, você deve definir um endereço IP estático. Não conseguimos determinar se essa interface de rede está configurada usando o endereço de IP estático. Por favor, defina um endereço IP estático manualmente.",
-    "dhcp_dynamic_ip_found": "Seu sistema usa a configuração de endereço IP dinâmico para a interface <0>{{interfaceName}}</0>. Para usar o servidor DHCP, você deve definir um endereço de IP estático. Seu endereço IP atual é <0> {{ipAddress}} </ 0>. AdGuard Home irá definir automaticamente este endereço IP como estático se você pressionar o botão \"Ativar servidor DHCP\".",
+    "dhcp_dynamic_ip_found": "Seu sistema usa a configuração de endereço IP dinâmico para a interface <0>{{interfaceName}}</0>. Para usar o servidor DHCP, você deve definir um endereço de IP estático. Seu endereço IP atual é <0> {{ipAddress}} </ 0>. Vamos definir automaticamente este endereço IP como estático se você pressionar o botão Ativar DHCP.",
     "dhcp_lease_added": "Concessão estática \"{{key}}\" adicionada com sucesso",
     "dhcp_lease_deleted": "Concessão estática \"{{key}}\" excluída com sucesso",
     "dhcp_new_static_lease": "Nova concessão estática",
@@ -116,9 +109,9 @@
     "number_of_dns_query_24_hours": "O número de consultas DNS processadas nas últimas 24 horas",
     "number_of_dns_query_blocked_24_hours": "Várias solicitações DNS bloqueadas por filtros de bloqueio de anúncios e listas de bloqueio de hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Várias solicitações de DNS bloqueadas pelo módulo de segurança da navegação do AdGuard",
-    "number_of_dns_query_blocked_24_hours_adult": "O número de sites adultos bloqueados",
+    "number_of_dns_query_blocked_24_hours_adult": "Vários sites adultos bloqueados",
     "enforced_save_search": "Forçar pesquisa segura",
-    "number_of_dns_query_to_safe_search": "O número de solicitações de DNS para mecanismos de pesquisa para os quais a pesquisa segura foi aplicada",
+    "number_of_dns_query_to_safe_search": "Várias solicitações de DNS para motores de busca para os quais a pesquisa segura foi aplicada",
     "average_processing_time": "Tempo médio de processamento",
     "average_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",
@@ -132,18 +125,18 @@
     "no_servers_specified": "Nenhum servidor especificado",
     "general_settings": "Configurações gerais",
     "dns_settings": "Configurações de DNS",
-    "dns_blocklists": "Listas de bloqueio de DNS",
+    "dns_blocklists": "Listas negra de DNS",
-    "dns_allowlists": "Listas de permissões de DNS",
+    "dns_allowlists": "Listas branca de DNS",
-    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas de bloqueio.",
+    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas negras.",
-    "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_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 um endereço de servidor. um por linha. <a>Saber mais</a> sobre a configuração de servidores DNS primários.",
+    "upstream_dns_help": "Insira 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",
+    "test_upstream_btn": "Testar upstreams",
-    "upstreams": "DNS primário",
+    "upstreams": "Upstreams",
     "apply_btn": "Aplicar",
     "disabled_filtering_toast": "Filtragem desativada",
     "enabled_filtering_toast": "Filtragem ativada",
@@ -164,22 +157,22 @@
     "delete_table_action": "Excluir",
     "elapsed": "Tempo decorrido",
     "filters_and_hosts_hint": "O AdGuard Home entende regras básicas de bloqueio de anúncios e a sintaxe de arquivos de hosts.",
-    "no_blocklist_added": "Nenhuma lista de bloqueio adicionada",
+    "no_blocklist_added": "Nenhuma lista negra foi adicionada",
-    "no_whitelist_added": "Nenhuma lista de permissões foi adicionada",
+    "no_whitelist_added": "Nenhuma lista branca foi adicionada",
-    "add_blocklist": "Adicionar lista de bloqueio",
+    "add_blocklist": "Adicionar lista negra",
-    "add_allowlist": "Adicionar lista de permissões",
+    "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_blocklist": "Nova lista negra",
-    "new_allowlist": "Nova lista de permissão",
+    "new_allowlist": "Nova lista branca",
-    "edit_blocklist": "Editar lista de bloqueio",
+    "edit_blocklist": "Editar lista negra",
-    "edit_allowlist": "Editar lista de permissões",
+    "edit_allowlist": "Editar lista branca",
-    "choose_blocklist": "Escolher as listasde bloqueio",
+    "choose_blocklist": "Escolher as listas negras",
-    "choose_allowlist": "Escolher as listas de permissões",
+    "choose_allowlist": "Escolher as listas brancas",
-    "enter_valid_blocklist": "Digite um URL válido para a lista de bloqueio.",
+    "enter_valid_blocklist": "Digite uma URL válida para a lista negra.",
-    "enter_valid_allowlist": "Digite uma URL válida para a lista de permissões.",
+    "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",
@@ -196,7 +189,7 @@
     "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": "você pode usar <0>DNS Stamps</0> para o <1>DNSCrypt</1> ou usar os resolvedores <2>DNS-sobre-HTTPS</2>",
+    "example_upstream_sdns": "Você 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": "Atualizado os servidores DNS upstream",
@@ -254,22 +247,16 @@
     "custom_ip": "IP personalizado",
     "blocking_ipv4": "Bloqueando IPv4",
     "blocking_ipv6": "Bloqueando IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Ativar a sub-rede do cliente EDNS",
     "edns_cs_desc": "Se ativado, o AdGuard Home estará enviando as sub-redes dos clientes para os servidores DNS.",
-    "rate_limit_desc": "O número de solicitações por segundo permitidas por cliente. Definir como 0 significa que não há limite.",
+    "rate_limit_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",
@@ -282,7 +269,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",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Interface de escuta",
     "install_settings_port": "Porta",
     "install_settings_interface_link": "A interface web de administrador do AdGuard estará disponível nos seguintes endereços:",
-    "form_error_port": "Digite um numero de porta válida",
+    "form_error_port": "Digite uma porta válida",
     "install_settings_dns": "Servidor DNS",
     "install_settings_dns_desc": "Você precisa configurar seu dispositivo ou roteador para usar o servidor DNS nos seguintes endereços:",
     "install_settings_all_interfaces": "Todas interfaces",
@@ -311,10 +298,10 @@
     "install_devices_router": "Roteador",
     "install_devices_router_desc": "Esta configuração cobrirá automaticamente todos os dispositivos conectados ao seu roteador doméstico e você não irá precisar configurar cada um deles manualmente.",
     "install_devices_address": "O servidor de DNS do AdGuard Home está capturando os seguintes endereços",
-    "install_devices_router_list_1": "Abra as preferências do seu roteador. Normalmente, você pode acessá-lo de seu navegador por meio de um URL, como http://192.168.0.1/ ou http://192.168.1.1/. Você pode ser solicitado a inserir uma senha. Se você não se lembrar, muitas vezes você pode redefinir a senha pressionando um botão no próprio roteador, mas esteja ciente de que se esse procedimento for escolhido, você provavelmente perderá toda a configuração do roteador. Se o seu roteador requer um aplicativo para configurá-lo, instale o aplicativo no seu telefone ou PC e use-o para acessar as configurações do roteador.",
+    "install_devices_router_list_1": "Abra as configurações do seu roteador\nNo navegador digite o IP do roteador, o padrão é (http://192.168.0.1/ ou http://192.168.1.1/), e o login e senha é admin/admin; Se você não se lembra da senha, você pode redefinir a senha rapidamente pressionando um botão no próprio roteador. Alguns roteadores têm um aplicativo específico que já deve estar instalado em 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": "Digite aqui seu servidor do AdGuard Home.",
-    "install_devices_router_list_4": "Em alguns tipos de roteador, um servidor DNS personalizado não pode ser configurado. Nesse caso, configurar o AdGuard Home como um <0>Servidor DHCP</0> pode ajudar. Caso contrário, você deve verificar o manual do roteador sobre como personalizar os servidores DNS em seu modelo de roteador específico.",
+    "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 Controle pelo 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 Compartilhamento.",
     "install_devices_windows_list_3": "No lado esquerdo da janela clique em Alterar as configurações do adaptador.",
@@ -343,7 +330,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",
@@ -371,7 +358,7 @@
     "encryption_reset": "Você tem certeza de que deseja redefinir a configuração de criptografia?",
     "topline_expiring_certificate": "Seu certificado SSL está prestes a expirar. Atualize suas <0>configurações de criptografia</]0>",
     "topline_expired_certificate": "Seu certificado SSL está expirado. Atualize suas <0>configurações de criptografia</0>",
-    "form_error_port_range": "Digite um número de porta entre 80 e 65535",
+    "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": "Senhas não coincidem",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "Digite um endereço IP na sub-rede \"{{cidr}}\"",
     "form_enter_mac": "Digite o endereço MAC",
     "form_enter_id": "Inserir identificador",
     "form_add_id": "Adicionar identificador",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Clientes não permitidos",
     "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 filtros. O AdGuard Home deixará de fazer consultas DNS com esses domínios nas questões das consultas. Aqui você pode especificar os nomes de domínio exatos, caracteres curinga e regras de filtro de URL, por exemplo. \"example.org\", \"*.example.org\" ou \"||example.org^\".",
+    "access_blocked_desc": "Não confunda isso com filtros. O AdGuard Home deixará de fazer consultas de DNS com esses domínios na questão das consultas. Aqui você pode especificar os nomes exatos de domínio, wildcards e regras do filtro por url, por exemplo: 'exemplo.org', '*.exemplo.org' ou '||example.org^'.",
     "access_settings_saved": "Configurações de acesso foram salvas com sucesso",
     "updates_checked": "Atualizações verificadas com sucesso",
     "updates_version_equal": "O AdGuard Home está atualizado.",
@@ -444,7 +430,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",
@@ -526,7 +511,7 @@
     "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 torna as consultas DNS mais lentas, pois o AdGuard Home tem que esperar pelas respostas de todos os servidores DNS, mas melhora a conectividade geral.",
+    "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.",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "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": "O AdGuard Home detectou que o endereço IP dinâmico <0>{{ip}}</0> está sendo usado. Você deseja que seja definido como seu endereço estático?",
+    "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 atualizada",
     "list_updated_plural": "{{count}} listas atualizadas",
@@ -574,7 +560,7 @@
     "filtered": "Filtrado",
     "rewritten": "Reescrito",
     "safe_search": "Pesquisa segura",
-    "blocklist": "Lista de bloqueio",
+    "blocklist": "Lista negra",
     "milliseconds_abbreviation": "ms",
     "cache_size": "Tamanho do cache",
     "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
@@ -593,12 +579,12 @@
     "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 ativar o servidor DHCP",
+    "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,18 +1,13 @@
 {
     "client_settings": "Definições do cliente",
-    "example_upstream_reserved": "Podes especificar o DNS primário <0>para domínio(s) especifico(s)</0>",
+    "example_upstream_reserved": "pode especificar um DNS upstream <0>para domínio(s) especifico(s)</0>",
     "example_upstream_comment": "Tu podes especificar o comentário",
-    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS",
+    "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": "Consulte um servidor DNS primário por 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.",
+    "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.",
-    "local_ptr_title": "Servidores DNS privados",
-    "local_ptr_desc": "Os servidores DNS que o AdGuard Home usa para consultas PTR locais. Esses servidores são usados para resolver os nomes de host de clientes com endereços IP privados, por exemplo \"192.168.12.34\", usando rDNS. Se não for definido, o AdGuard Home usa os resolvedores DNS padrão do seu sistema operacional.",
-    "local_ptr_placeholder": "Insira um endereço de servidor por linha",
-    "resolve_clients_title": "Ativar resolução reversa de endereços IP de clientes",
-    "resolve_clients_desc": "Se activado, o AdGuard Home tentará resolver de forma reversa os endereços IP dos clientes em seus nomes de host, enviando consultas PTR aos resolvedores correspondentes (servidores DNS privados para clientes locais, servidor DNS primário para clientes com endereços IP públicos).",
     "check_dhcp_servers": "Verificar por servidores DHCP",
     "save_config": "Guardar definição",
     "enabled_dhcp": "Servidor DHCP activado",
@@ -21,14 +16,14 @@
     "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": "Ativar servidor DHCP",
+    "dhcp_enable": "Activar servidor DHCP",
-    "dhcp_disable": "Desativar servidor DHCP",
+    "dhcp_disable": "Desactivar servidor DHCP",
-    "dhcp_not_found": "É seguro ativar o servidor DHCP integrado porque o AdGuard Home não encontrou nenhum servidor DHCP ativo na rede. No entanto, você deve verificar isso manualmente, pois a verificação automática atualmente não oferece 100% de garantia.",
+    "dhcp_not_found": "É seguro activar o servidor DHCP integrado - não encontrámos nenhum servidor DHCP activo na rede. No entanto, recomendamos que faça manualmente uma nova verificação, pois o nosso teste automático não oferece 100% de garantia.",
-    "dhcp_found": "Um servidor DHCP ativo foi encontrado na rede. Não é seguro ativar o servidor DHCP incorporado.",
+    "dhcp_found": "Um servidor DHCP activo foi encontrado na rede. Não é seguro activar o servidor DHCP incorporado.",
     "dhcp_leases": "Concessões DHCP",
     "dhcp_static_leases": "Concessões de DHCP estático",
     "dhcp_leases_not_found": "Nenhuma concessão DHCP encontrada",
-    "dhcp_config_saved": "Definições DHCP guardadas com sucesso",
+    "dhcp_config_saved": "Configurações DHCP guardadas com sucesso",
     "dhcp_ipv4_settings": "Definições DHCP IPv4",
     "dhcp_ipv6_settings": "Definições DHCP IPv6",
     "form_error_required": "Campo obrigatório",
@@ -37,8 +32,6 @@
     "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_subnet": "A sub-rede \"{{cidr}}\" não contém o endereço IP \"{{ip}}\"",
     "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",
@@ -55,10 +48,10 @@
     "ip": "IP",
     "dhcp_table_hostname": "Nome do servidor",
     "dhcp_table_expires": "Expira",
-    "dhcp_warning": "Se tu quiser ativar o servidor DHCP de qualquer maneira, certifique-se de que não haja outro servidor DHCP ativo em tua rede, pois isso pode quebrar a conectividade com a Internet para dispositivos na rede!",
+    "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!",
-    "dhcp_error": "O AdGuard Home não conseguiu determinar se há noutro servidor DHCP ativo na rede.",
+    "dhcp_error": "Não foi possível determinar se existe outro servidor DHCP na rede.",
-    "dhcp_static_ip_error": "Para usar o servidor DHCP, deve definir um endereço IP estático. AdGuard Home não conseguiu determinar se essa interface de rede está configurada usando o endereço de IP estático. Por favor, defina um endereço IP estático manualmente.",
+    "dhcp_static_ip_error": "Para usar o servidor DHCP, deve definir um endereço IP estático. Não conseguimos determinar se essa interface de rede está configurada usando o endereço de IP estático. Por favor, defina um endereço IP estático manualmente.",
-    "dhcp_dynamic_ip_found": "O seu sistema usa a configuração de endereço IP dinâmico para a interface <0>{{interfaceName}}</0>. Para usar o servidor DHCP, deve definir um endereço de IP estático. O seu endereço IP actual é <0> {{ipAddress}} </ 0>. AdGuard Home irá definir automaticamente este endereço IP como estático se pressionar o botão \"Ativar servidor DHCP\".",
+    "dhcp_dynamic_ip_found": "O seu sistema usa a configuração de endereço IP dinâmico para a interface <0>{{interfaceName}}</0>. Para usar o servidor DHCP, deve definir um endereço de IP estático. O seu endereço IP actual é <0> {{ipAddress}} </ 0>. Vamos definir automaticamente este endereço IP como estático se pressionar o botão Activar DHCP.",
     "dhcp_lease_added": "Concessão estática \"{{key}}\" adicionada com sucesso",
     "dhcp_lease_deleted": "Concessão estática \"{{key}}\" excluída com sucesso",
     "dhcp_new_static_lease": "Nova concessão estática",
@@ -82,7 +75,7 @@
     "query_log": "Registo de consultas",
     "compact": "Compacto",
     "nothing_found": "Nada encontrado",
-    "faq": "FAQ",
+    "faq": "Perguntas frequentes",
     "version": "Versão",
     "address": "Endereço",
     "protocol": "Protocolo",
@@ -92,13 +85,13 @@
     "homepage": "Página inicial",
     "report_an_issue": "Comunicar um problema",
     "privacy_policy": "Política de Privacidade",
-    "enable_protection": "Ativar protecção",
+    "enable_protection": "Activar protecção",
-    "enabled_protection": "Ativar protecção",
+    "enabled_protection": "Activar protecção",
-    "disable_protection": "Desativar protecção",
+    "disable_protection": "Desactivar protecção",
-    "disabled_protection": "Desativar protecção",
+    "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,12 +109,12 @@
     "number_of_dns_query_24_hours": "O número de consultas DNS processadas nas últimas 24 horas",
     "number_of_dns_query_blocked_24_hours": "Várias solicitações DNS bloqueadas por filtros de bloqueio de anúncios e listas de bloqueio de hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Várias solicitações de DNS bloqueadas pelo módulo de segurança da navegação do AdGuard",
-    "number_of_dns_query_blocked_24_hours_adult": "O número de sítios adultos bloqueados",
+    "number_of_dns_query_blocked_24_hours_adult": "Vários sites adultos bloqueados",
     "enforced_save_search": "Forçar pesquisa segura",
-    "number_of_dns_query_to_safe_search": "O número de solicitações de DNS para motores de busca para os quais a pesquisa segura foi aplicada",
+    "number_of_dns_query_to_safe_search": "Várias solicitações de DNS para motores de busca para os quais a pesquisa segura foi aplicada",
     "average_processing_time": "Tempo médio de processamento",
     "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
-    "block_domain_use_filters_and_hosts": "Bloquear domínios usando ficheiros de filtros e hosts",
+    "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>.",
     "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.",
@@ -132,18 +125,18 @@
     "no_servers_specified": "Nenhum servidor especificado",
     "general_settings": "Definições gerais",
     "dns_settings": "Definições de DNS",
-    "dns_blocklists": "Lista de bloqueio de DNS",
+    "dns_blocklists": "Listas negra de DNS",
-    "dns_allowlists": "Listas de permissões de DNS",
+    "dns_allowlists": "Listas branca de DNS",
-    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas de bloqueio.",
+    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas negras.",
-    "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_allowlists_desc": "Os domínios das listas branca de DNS serão permitidos mesmo que estejam em qualquer uma das listas negra.",
     "custom_filtering_rules": "Regras de filtragem personalizadas",
-    "encryption_settings": "Definições de criptografia",
+    "encryption_settings": "Configurações de criptografia",
-    "dhcp_settings": "Definições de DHCP",
+    "dhcp_settings": "Configurações de DHCP",
-    "upstream_dns": "Servidores DNS primário",
+    "upstream_dns": "Servidores DNS upstream",
-    "upstream_dns_help": "Insira um endereço de servidor, um por linha. <a>Saber mais</a> sobre a definição de servidores DNS primários.",
+    "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",
+    "test_upstream_btn": "Testar upstreams",
-    "upstreams": "DNS primário",
+    "upstreams": "Upstreams",
     "apply_btn": "Aplicar",
     "disabled_filtering_toast": "Filtragem desactivada",
     "enabled_filtering_toast": "Filtragem activada",
@@ -163,27 +156,27 @@
     "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 ficheiros de hosts.",
+    "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_blocklist_added": "Nenhuma lista negra foi adicionada",
-    "no_whitelist_added": "Nenhuma lista de permissões foi adicionada",
+    "no_whitelist_added": "Nenhuma lista branca foi adicionada",
-    "add_blocklist": "Adicionar lista de bloqueio",
+    "add_blocklist": "Adicionar lista negra",
-    "add_allowlist": "Adicionar lista de permissões",
+    "add_allowlist": "Adicionar lista branca",
     "cancel_btn": "Cancelar",
     "enter_name_hint": "Insira o nome",
     "enter_url_or_path_hint": "Digite a URL ou o local da lista",
     "check_updates_btn": "Verificar actualizações",
-    "new_blocklist": "Nova lista de bloqueio",
+    "new_blocklist": "Nova lista negra",
-    "new_allowlist": "Nova lista de permissões",
+    "new_allowlist": "Nova lista branca",
-    "edit_blocklist": "Editar lista de bloqueio",
+    "edit_blocklist": "Editar lista negra",
-    "edit_allowlist": "Editar lista de permissões",
+    "edit_allowlist": "Editar lista branca",
-    "choose_blocklist": "Escolher as listas de bloqueio",
+    "choose_blocklist": "Escolher as listas negras",
-    "choose_allowlist": "Escolher as listas de permissões",
+    "choose_allowlist": "Escolher as listas brancas",
-    "enter_valid_blocklist": "Digite uma URL válida para a lista de bloqueio.",
+    "enter_valid_blocklist": "Digite uma URL válida para a lista negra.",
-    "enter_valid_allowlist": "Digite uma URL válida para a lista de permissões.",
+    "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",
-    "custom_filter_rules_hint": "Insira uma regra por linha. Pode usar regras de bloqueio de anúncios ou a sintaxe de ficheiros de hosts.",
+    "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",
     "example_meaning_filter_block": "bloqueia o acesso ao domínio exemplo.org e a todos os seus subdomínios",
     "example_meaning_filter_whitelist": "desbloqueia o acesso ao domínio exemplo.org e a todos os seus subdomínios",
@@ -192,11 +185,11 @@
     "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_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",
@@ -236,43 +229,37 @@
     "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": "Ativar registo",
+    "query_log_enable": "Activar registo",
     "query_log_configuration": "Definições do registo",
     "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": "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",
     "blocking_mode": "Modo de bloqueio",
-    "default": "Predefinido",
+    "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",
-    "dnscrypt": "DNSCrypt",
     "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 ficheiro de configuração",
     "plain_dns": "DNS simples",
     "form_enter_rate_limit": "Insira o limite de taxa",
     "rate_limit": "Limite de taxa",
-    "edns_enable": "Ativar sub-rede do cliente EDNS",
+    "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 permitido por cliente. Configurando para 0 significa sem limite.",
+    "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": "Predefinido: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
+    "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)",
@@ -282,7 +269,7 @@
     "source_label": "Fonte",
     "found_in_known_domain_db": "Encontrado no banco de dados de domínios conhecido.",
     "category_label": "Categoria",
-    "rule_label": "Regra(s)",
+    "rule_label": "Regra",
     "list_label": "Lista",
     "unknown_filter": "Filtro desconhecido {{filterId}}",
     "known_tracker": "Rastreador conhecido",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Interface de escuta",
     "install_settings_port": "Porta",
     "install_settings_interface_link": "A interface web de administrador do AdGuard estará disponível nos seguintes endereços:",
-    "form_error_port": "Insira um número de porta válida",
+    "form_error_port": "Insira uma porta válida",
     "install_settings_dns": "Servidor DNS",
     "install_settings_dns_desc": "Precisa de configurar o seu dispositivo ou router para usar o servidor DNS nos seguintes endereços:",
     "install_settings_all_interfaces": "Todas as interfaces",
@@ -311,10 +298,10 @@
     "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_address": "O servidor de DNS do AdGuard Home está a capturar os seguintes endereços",
-    "install_devices_router_list_1": "Abra as preferências do seu roteador. Normalmente, tu podes acessá-lo de teu navegador por meio de um URL, como http://192.168.0.1/ ou http://192.168.1.1/. Tu podes ser solicitado a inserir uma palavra-passe. Se tu não se lembrar, muitas vezes tu podes repor a palavra-passe pressionando um botão no próprio roteador, mas esteja ciente de que se esse procedimento for escolhido, tu provavelmente perderás toda a definição do roteador. Se o teu roteador requer uma aplicação para configurá-lo, instale a aplicação no seu telefone ou PC e use-o para acessar as definições do roteador.",
+    "install_devices_router_list_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_2": "Encontre as configurações de DNS. Procure as letras DNS ao lado de um campo que permite dois ou três conjuntos de números, cada um dividido em quatro grupos de um a três números.",
     "install_devices_router_list_3": "Insira aqui seu servidor do AdGuard Home.",
-    "install_devices_router_list_4": "Em alguns tipos de roteador, um servidor DNS personalizado não pode ser configurado. Nesse caso, configurar o AdGuard Home como um <0>Servidor DHCP</0> pode ajudar. Caso contrário, tu deve verificar o manual do router sobre como personalizar os servidores DNS em seu modelo de router específico.",
+    "install_devices_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.",
@@ -343,7 +330,7 @@
     "encryption_config_saved": "Definiçã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",
@@ -351,7 +338,7 @@
     "encryption_dot": "Porta DNS-sobre-TLS",
     "encryption_dot_desc": "Se essa porta estiver configurada, o AdGuard Home irá executar o servidor DNS-sobre- TSL nesta porta.",
     "encryption_doq": "Porta DNS-sobre-QUIC",
-    "encryption_doq_desc": "Se esta porta estiver configurada, o AdGuard Home executará um servidor DNS-sobre-QUIC nesta porta. É experimental e pode não ser confiável. Além disso, não há demasiados clientes que ofereçam suporte no momento.",
+    "encryption_doq_desc": "Se esta porta estiver configurada, o AdGuard Home executará um servidor DNS-sobre-QUIC nesta porta. É experimental e pode não ser confiável. Além disso, não há muitos clientes que ofereçam suporte no momento.",
     "encryption_certificates": "Certificados",
     "encryption_certificates_desc": "Para usar criptografia, precisa de fornecer uma cadeia de certificados SSL válida para o seu domínio. Pode obter um certificado gratuito em <0> {{link}}</0> ou pode comprá-lo numa das autoridades de certificação confiáveis.",
     "encryption_certificates_input": "Copie/cole aqui o seu certificado codificado em PEM.",
@@ -359,7 +346,7 @@
     "encryption_expire": "Expira",
     "encryption_key": "Chave privada",
     "encryption_key_input": "Copie/cole aqui a chave privada codificada em PEM para o seu certificado.",
-    "encryption_enable": "Ativar criptografia (HTTPS, DNS-sobre-HTTPS e DNS-sobre-TLS)",
+    "encryption_enable": "Activar criptografia (HTTPS, DNS-sobre-HTTPS e DNS-sobre-TLS)",
     "encryption_enable_desc": "Se a criptografia estiver activada, a interface administrativa do AdGuard Home funcionará em HTTPS, o servidor DNS irá capturar as solicitações por meio do DNS-sobre-HTTPS e DNS-sobre-TLS.",
     "encryption_chain_valid": "Cadeia de certificado válida",
     "encryption_chain_invalid": "A cadeia de certificado é inválida",
@@ -371,11 +358,11 @@
     "encryption_reset": "Tem a certeza de que deseja repor a definiçã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 numero de porta entre 80 e 65535",
+    "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": "Repor configurações",
     "update_announcement": "AdGuard Home {{version}} está disponível!<0>Clique aqui</0> para mais informações.",
     "setup_guide": "Guia de instalação",
     "dns_addresses": "Endereços DNS",
@@ -399,15 +386,14 @@
     "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_subnet_ip": "Digite um endereço IP na sub-rede \"{{cidr}}\"",
     "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",
@@ -416,15 +402,15 @@
     "list_confirm_delete": "Você tem certeza de que deseja excluir essa lista?",
     "auto_clients_title": "Clientes (tempo de execução)",
     "auto_clients_desc": "Dados dos clientes que usam o AdGuard Home, que não são armazenados na definição",
-    "access_title": "Definições de acesso",
+    "access_title": "Configurações de acesso",
     "access_desc": "Aqui pode configurar as regras de acesso para o servidores de DNS do AdGuard Home.",
     "access_allowed_title": "Clientes permitidos",
     "access_allowed_desc": "Uma lista de endereços IP ou CIDR. Ao configurar, o AdGuard Home irá permitir solicitações apenas desses endereços de IP.",
     "access_disallowed_title": "Clientes não permitidos",
     "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 filtros. O AdGuard Home irá descartar as consultas DNS com esses domínios nas questões das consultas. Aqui tu podes especificar os nomes de domínio exatos, caracteres curinga e regras de filtro de URL, por exemplo. \"example.org\", \"*.example.org\" ou \"||example.org^\".",
+    "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",
@@ -444,7 +430,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": "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",
@@ -453,7 +438,7 @@
     "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 ficheiro de hosts",
+    "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",
@@ -471,9 +456,9 @@
     "unblock_all": "Desbloquear todos",
     "encryption_certificate_path": "Caminho do certificado",
     "encryption_private_key_path": "Caminho da chave privada",
-    "encryption_certificates_source_path": "Definir um caminho do ficheiro de certificados",
+    "encryption_certificates_source_path": "Definir um caminho do arquivo de certificados",
     "encryption_certificates_source_content": "Colar o conteúdo dos certificados",
-    "encryption_key_source_path": "Definir um ficheiro de chave privada",
+    "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",
@@ -495,21 +480,21 @@
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
     "filters_configuration": "Definição dos filtros",
-    "filters_enable": "Ativar filtros",
+    "filters_enable": "Activar filtros",
     "filters_interval": "Intervalo de actualização de filtros",
     "disabled": "Desactivado",
     "username_label": "Nome do utilizador",
     "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.",
     "location": "Localização",
     "orgname": "Nome da organização",
     "netname": "Nome da rede",
-    "network": "Rede",
+    "network": "Network",
     "descr": "Descrição",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Saiba mais</0>sobre como criar as suas próprias listas negras de servidores.",
@@ -523,15 +508,15 @@
     "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": "Desativar IPv6",
+    "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 torna as consultas DNS mais lentas, pois o AdGuard Home tem que esperar pelas respostas de todos os servidores DNS, mas melhora a conectividade geral.",
+    "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": "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_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 predefinição.",
+    "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": "Tu podes seleccionar as etiquetas que correspondem ao cliente. As etiquetas podem ser incluídas nas regras de filtragem e permitir que tu as aplique com mais precisão. <0>Saiba mais</0>",
+    "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",
@@ -544,6 +529,7 @@
     "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 nas tuas listas de filtros",
@@ -556,16 +542,16 @@
     "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": "O AdGuard Home detectou que o endereço IP dinâmico <0>{{ip}}</0> está sendo usado. Tu desejas que seja definido como teu endereço estático?",
+    "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": "Ativar DNSSEC",
+    "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_whitelisted_responses": "Lista Branca",
     "show_processed_responses": "Processado",
     "blocked_safebrowsing": "Bloqueado pela navegação segura",
     "blocked_adult_websites": "Sítios adultos bloqueados",
@@ -574,7 +560,7 @@
     "filtered": "Filtrado",
     "rewritten": "Reescrito",
     "safe_search": "Pesquisa segura",
-    "blocklist": "Lista de bloqueio",
+    "blocklist": "Lista negra",
     "milliseconds_abbreviation": "ms",
     "cache_size": "Tamanho do cache",
     "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
@@ -589,16 +575,16 @@
     "filter_category_general": "Geral",
     "filter_category_security": "Segurança",
     "filter_category_regional": "Regional",
-    "filter_category_other": "Noutro",
+    "filter_category_other": "Outro",
     "filter_category_general_desc": "Listas que bloqueiam o monitorização e a publicidade na maioria dos dispositivos",
     "filter_category_security_desc": "Listas especializadas em bloquear domínios de malware, phishing ou fraude",
     "filter_category_regional_desc": "Listas focadas em anúncios regionais e servidores de monitorização",
-    "filter_category_other_desc": "Outras listas de bloqueio",
+    "filter_category_other_desc": "Outras listas negras",
-    "setup_config_to_enable_dhcp_server": "Defina a configuração para ativar o servidor DHCP",
+    "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"
-}
+}

client/src/__locales/ro.json

@@ -1,10 +1,15 @@
 {
     "client_settings": "Setări client",
+    "example_upstream_reserved": "Puteți preciza un DNS upstream <0>de domeniu(ii) specific(e)</0>",
+    "example_upstream_comment": "Puteți specifica comentariul",
+    "upstream_parallel": "Folosiți interogări paralele pentru rezolvări rapide interogând simultan toate serverele în amonte",
     "parallel_requests": "Solicitări paralele",
     "load_balancing": "Echilibrare-sarcini",
+    "load_balancing_desc": "Fiecare server este interogat aparte. AdGuard Home alege serverul folosind algoritmul ponderat aleatoriu, astfel încât cel mai rapid server să fie utilizat mai des.",
     "bootstrap_dns": "Serverele DNS Bootstrap",
     "bootstrap_dns_desc": "Serverele DNS Bootstrap sunt folosite pentru a rezolva adresele IP ale resolverelor DoH/DoT indicate ca upstreams.",
     "check_dhcp_servers": "Căutați servere DHCP",
+    "save_config": "Salvare configurare",
     "enabled_dhcp": "Server DHCP activat",
     "disabled_dhcp": "Server DHCP dezactivat",
     "unavailable_dhcp": "DHCP este indisponibil",
@@ -13,10 +18,12 @@
     "dhcp_description": "Dacă routerul dvs. nu furnizează setări DHCP, puteți utiliza serverul DHCP încorporat AdGuard.",
     "dhcp_enable": "Activați serverul DHCP",
     "dhcp_disable": "Dezactivați serverul DHCP",
+    "dhcp_not_found": "Este sigur să activați serverul DHCP încorporat - nu am găsit servere DHCP active în rețea. Cu toate acestea, vă recomandăm să-l verificați manual, deoarece testul nostru automat nu oferă în prezent 100% garanție.",
     "dhcp_found": "În rețea se găsește un server DHCP activ. Nu este sigur să activați serverul DHCP încorporat.",
     "dhcp_leases": "DHCP închiriate",
     "dhcp_static_leases": "DHCP statice închiriate",
     "dhcp_leases_not_found": "Nu s-au găsit DHCP închiriate",
+    "dhcp_config_saved": "Configurare DHCP salvată cu succes",
     "dhcp_ipv4_settings": "Setări DHCP IPv4",
     "dhcp_ipv6_settings": "Setări DHCP IPv6",
     "form_error_required": "Câmp necesar",
@@ -25,7 +32,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",
@@ -42,11 +48,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "Hostname",
     "dhcp_table_expires": "Expiră",
+    "dhcp_warning": "Dacă doriți oricum să activați serverul DHCP, verificați că nu există un alt server DHCP activ în rețeaua dvs. Altfel, poate întrerupe Internetul pe toate aparatele conectate!",
+    "dhcp_error": "Nu am putut determina dacă există un alt server DHCP în rețea.",
+    "dhcp_static_ip_error": "Pentru a utiliza serverul DHCP trebuie setată o adresă IP statică. Nu am reușit să stabilim dacă această interfață de rețea este configurată folosind adresa IP statică. Vă rugăm să setați manual o adresă IP statică.",
+    "dhcp_dynamic_ip_found": "Sistemul dvs. folosește configurația dinamică a adreselor IP pentru interfața <0>{{interfaceName}}</0>. Pentru a utiliza serverul DHCP trebuie setată o adresă IP statică. Adresa IP curentă este <0>{{ipAddress}}</0>. Vom seta automat această adresă IP ca statică dacă apăsați butonul Activați DHCP.",
     "dhcp_lease_added": "\"{{key}}\" statică închiriată adăugată cu succes",
     "dhcp_lease_deleted": "\"{{key}}\" statică închiriată eliminată cu succes",
     "dhcp_new_static_lease": "Închiriere statică nouă",
     "dhcp_static_leases_not_found": "Nu s-au găsit închirieri statice DHCP",
     "dhcp_add_static_lease": "Adăugați închiriere statică",
+    "dhcp_reset": "Sunteți sigur că doriți să resetați configurația DHCP?",
     "country": "Țara",
     "city": "Oraș",
     "delete_confirm": "Sunteți sigur că doriți să ștergeți \"{{key}}\"?",
@@ -93,28 +104,36 @@
     "top_clients": "Clienți de top",
     "no_clients_found": "Nu au fost găsiți clienți",
     "general_statistics": "Statistici generale",
+    "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 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ă",
+    "number_of_dns_query_to_safe_search": "O serie de solicitări DNS făcute pe motoare de căutare cu Căutarea protejată activată",
     "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>.",
     "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ă",
-    "enforce_save_search_hint": "AdGuard Home poate impune căutarea protejată în următoarele motoare de căutare: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home poate impune căutarea protejată în următoarele motoare de căutare: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "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_blocklists": "DNS liste blocări",
-    "dns_allowlists": "Listă de DNS-uri autorizate",
+    "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",
     "upstreams": "Upstreams",
@@ -151,7 +170,7 @@
     "edit_blocklist": "Editare blocare",
     "edit_allowlist": "Editare autorizare",
     "choose_blocklist": "Alegeți liste de blocări",
-    "choose_allowlist": "Alegeți liste de autorizări",
+    "choose_allowlist": "Alegeți liste de permisiuni",
     "enter_valid_blocklist": "Introduceți un URL valid pentru blocare.",
     "enter_valid_allowlist": "Introduceți un URL valid pentru autorizare.",
     "form_error_url_format": "Format URL invalid",
@@ -173,7 +192,7 @@
     "example_upstream_sdns": "puteți utiliza <0>DNS Stamps</0> pentru rezolvere <1>DNSCrypt</1> sau <2>DNS-over-HTTPS</2>",
     "example_upstream_tcp": "DNS clasic (over TCP)",
     "all_lists_up_to_date_toast": "Toate listele sunt deja la zi",
-    "updated_upstream_dns_toast": "Serverele DNS în amonte aduse la zi",
+    "updated_upstream_dns_toast": "Serverele DNS upstream aduse la zi",
     "dns_test_ok_toast": "Serverele DNS specificate funcționează corect",
     "dns_test_not_ok_toast": "Serverul \"{{key}}\": nu a putut fi utilizat, verificați dacă l-ați scris corect",
     "unblock": "Deblocați",
@@ -193,7 +212,7 @@
     "empty_response_status": "Gol",
     "show_all_filter_type": "Arată tot",
     "show_filtered_type": "Arată cele filtrate",
-    "no_logs_found": "Niciun jurnal găsit",
+    "no_logs_found": "Nici un jurnal găsit",
     "refresh_btn": "Actualizare",
     "previous_btn": "Anterior",
     "next_btn": "Următor",
@@ -228,21 +247,16 @@
     "custom_ip": "IP personalizat",
     "blocking_ipv4": "Blocarea IPv4",
     "blocking_ipv6": "Blocarea IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Activați clientul subnet EDNS",
     "edns_cs_desc": "Dacă este activat, AdGuard Home va trimite subnet-ul clienților către serverele DNS.",
+    "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",
@@ -255,7 +269,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",
@@ -265,6 +279,7 @@
     "install_settings_listen": "Interfață de ascultare",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Interfața dvs. de administrare AdGuard Home va fi disponibilă pe următoarele adrese:",
+    "form_error_port": "Introduceți un port valid",
     "install_settings_dns": "Server DNS",
     "install_settings_dns_desc": "Va trebui să configurați aparatele sau routerul pentru a utiliza serverul DNS pe următoarele adrese:",
     "install_settings_all_interfaces": "Toate interfețele",
@@ -283,8 +298,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Această configurație va acoperi automat toate aparatele conectate la routerul de acasă și nu va trebui să le configurați manual pe fiecare.",
     "install_devices_address": "Serverul DNS AdGuard Home ascultă pe următoarele adrese",
+    "install_devices_router_list_1": "Deschideți preferințele pentru routerul dvs. De obicei, îl puteți accesa din browserul dvs. printr-o adresă URL (cum ar fi http://192.168.0.1/ sau http://192.168.1.1/). Vi se poate cere să introduceți parola. Dacă nu v-o amintiți, puteți reseta adesea parola apăsând un buton de pe routerul propriu-zis. Unele routere necesită o aplicație specifică, care în acest caz ar trebui să fie deja instalată pe computerul/telefonul dvs.",
     "install_devices_router_list_2": "Găsiți setările DHCP/DNS. Căutați literele DNS lângă un câmp care să permită două sau trei seturi de numere, fiecare împărțit în patru grupuri de una până la trei cifre.",
     "install_devices_router_list_3": "Introduceți adresele serverului dvs. AdGuard Home aici.",
+    "install_devices_router_list_4": "Unele routere nu permit setarea unui server DNS personalizat. În acest caz, vă poate ajuta dacă ați configura AdGuard Home ca <0>server DHCP</0>. Dacă nu, trebuie căutat manualul modelului dvs. de router ca să aflați cum se pot personaliza serverele DNS.",
     "install_devices_windows_list_1": "Deschideți panoul de control prin meniul Start sau căutare Windows.",
     "install_devices_windows_list_2": "Accesați categoria \"Rețea și Internet\", apoi la \"Centrul de Rețea și Partajare\".",
     "install_devices_windows_list_3": "În partea stângă a ecranului găsiți \"Schimbare setări adaptor\" și clicați pe el.",
@@ -310,9 +327,10 @@
     "install_saved": "Salvat cu succes",
     "encryption_title": "Criptare",
     "encryption_desc": "Suport de Criptare (HTTPS/TLS) pentru DNS și interfața web administrator",
+    "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",
@@ -340,10 +358,13 @@
     "encryption_reset": "Sunteți sigur că doriți să resetați setările de criptare?",
     "topline_expiring_certificate": "Certificatul dvs. SSL este pe cale să expire. Actualizați <0>Setările de criptare</0>.",
     "topline_expired_certificate": "Certificatul dvs. SSL a expirat. Actualizați <0>Setările de criptare</0>.",
+    "form_error_port_range": "Introduceți valoarea portului între 80-65535",
     "form_error_port_unsafe": "Acesta este un port nesigur",
+    "form_error_equal": "Nu trebuie să fie egale",
     "form_error_password": "Parolele nu corespund",
     "reset_settings": "Resetare setări",
     "update_announcement": "AdGuard Home {{version}} este disponibil! <0>Clicați aici</0> pentru mai multe informații.",
+    "setup_guide": "Ghid de instalare",
     "dns_addresses": "Adrese DNS",
     "dns_start": "Serverul DNS demarează",
     "dns_status_error": "Eroare la verificare statut server DNS",
@@ -365,7 +386,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",
@@ -388,6 +409,7 @@
     "access_disallowed_title": "Clienți neautorizați",
     "access_disallowed_desc": "O listă de adrese CIDR sau IP. Dacă este configurat, AdGuard Home va elimina cererile de la aceste adrese IP.",
     "access_blocked_title": "Domenii blocate",
+    "access_blocked_desc": "Nu confundați acest lucru cu filtrele. AdGuard Home va bloca interogări DNS cu aceste domenii în întrebare. Aici puteți specifica exact numele de domeniu, wildcard și reguli-urlfilter, de ex. 'exemplu.org', '*.exemplu.org' sau '||exemplu.org^'.",
     "access_settings_saved": "Setările de acces au fost salvate cu succes",
     "updates_checked": "Actualizările au fost verificate cu succes",
     "updates_version_equal": "AdGuard Home este la zi",
@@ -408,7 +430,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",
@@ -490,6 +511,7 @@
     "disable_ipv6": "Dezactivați IPv6",
     "disable_ipv6_desc": "Dacă această opțiune este activată, toate interogările DNS pentru adrese IPv6 (tip AAAA) vor fi anulate.",
     "fastest_addr": "Cea mai rapidă adresă IP",
+    "fastest_addr_desc": "Interogările la toate serverele DNS întorc adresa IP cea mai rapidă din răspunsuri. Așteptarea răspunsului tuturor serverelor DNS face interogările DNS mai lente dar se ameliorează conectivitatea generală.",
     "autofix_warning_text": "Dacă clicați pe \"Fix\", AdGuardHome va configura sistemul dvs. pentru a utiliza serverul DNS AdGuardHome.",
     "autofix_warning_list": "Va efectua aceste sarcini: <0>Dezactivare sistem DNSStubListener</0> <0>Setare adresă server DNS la 127.0.0.1</0> <0>Înlocuire link simbolic țintă /etc/resolv.conf cu /run/systemd/resolve/resolv.conf</0> <0>Oprire DNSStubListener (reîncărcare servici rezolvat prin sistem)</0>",
     "autofix_warning_result": "Ca urmare, toate cererile DNS ale sistemul dvs. vor fi procesate în mod implicit de AdGuardHome.",
@@ -507,6 +529,7 @@
     "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",
@@ -519,6 +542,7 @@
     "set_static_ip": "Setați o adresă IP statică",
     "install_static_ok": "Vești bune! Adresa IP statică este deja configurată",
     "install_static_error": "AdGuard Home nu o poate configura automat pentru această interfață de rețea. Vă rugăm să căutați instrucțiuni despre cum să faceți acest lucru manual.",
+    "install_static_configure": "Am detectat că se folosește o adresă IP dinamică - <0>{{ip}}</0>. Vreți să o folosiți pe aceasta ca adresă statică?",
     "confirm_static_ip": "AdGuard Home va configura {{ip}} ca adresa dvs. IP statică. Doriți să continuați?",
     "list_updated": "{{count}} listă actualizată",
     "list_updated_plural": "{{count}} liste actualizate",
@@ -536,7 +560,7 @@
     "filtered": "Filtrate",
     "rewritten": "Rescrise",
     "safe_search": "Căutare sigură",
-    "blocklist": "Lista de blocări",
+    "blocklist": "Lista neagră",
     "milliseconds_abbreviation": "ms",
     "cache_size": "Mărime cache",
     "cache_size_desc": "Mărime cache DNS (în octeți)",
@@ -556,10 +580,11 @@
     "filter_category_security_desc": "Liste specializate în blocarea domeniilor malware, phishing sau înșelătorie",
     "filter_category_regional_desc": "Liste focalizate pe reclame regionale și servere de urmărire",
     "filter_category_other_desc": "Alte liste de blocări",
+    "setup_config_to_enable_dhcp_server": "Setați configurația pentru a activa serverul DHCP",
     "original_response": "Răspuns original",
     "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

@@ -2,28 +2,23 @@
     "client_settings": "Настройки клиентов",
     "example_upstream_reserved": "Вы можете указать DNS-сервер <0>для конкретного домена(-ов)</0>",
     "example_upstream_comment": "Вы можете указать комментарий",
-    "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса.",
+    "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса",
     "parallel_requests": "Параллельные запросы",
     "load_balancing": "Распределение нагрузки\n",
     "load_balancing_desc": "Запрашивайте по одному серверу за раз. AdGuard Home будет использовать случайный алгоритм для выбора сервера, так что самый быстрый сервер будет использоваться чаще.",
     "bootstrap_dns": "Bootstrap DNS-серверы",
     "bootstrap_dns_desc": "Bootstrap DNS-серверы используются для поиска IP-адресов DoH/DoT серверов, которые вы указали.",
-    "local_ptr_title": "Приватные DNS-серверы",
-    "local_ptr_desc": "DNS-серверы, которые AdGuard Home использует для локальных PTR-запросов. Эти серверы используются, чтобы получить доменные имена клиентов с приватными IP-адресами, например «192.168.12.34», с помощью rDNS. Если список пуст, AdGuard Home использует DNS-серверы по умолчанию вашей ОС.",
-    "local_ptr_placeholder": "Введите по одному адресу на строчку",
-    "resolve_clients_title": "Включить запрашивание доменных имён для IP-адресов клиентов",
-    "resolve_clients_desc": "AdGuard Home будет пытаться определить доменные имена клиентов через PTR-запросы к соответствующим серверам (приватные DNS-серверы для локальных клиентов, upstream-сервер для клиентов с публичным IP-адресом).",
     "check_dhcp_servers": "Проверить DHCP-серверы",
     "save_config": "Сохранить конфигурацию",
-    "enabled_dhcp": "DHCP-сервер включён",
+    "enabled_dhcp": "DHCP-сервер включен",
-    "disabled_dhcp": "DHCP-сервер отключён",
+    "disabled_dhcp": "DHCP-сервер отключен",
     "unavailable_dhcp": "DHCP недоступен",
     "unavailable_dhcp_desc": "AdGuard Home не может запустить DHCP-сервер на вашей ОС",
     "dhcp_title": "DHCP-сервер (экспериментальный!)",
     "dhcp_description": "Если ваш роутер не предоставляет настройки DHCP, вы можете использовать собственный встроенный DHCP-сервер AdGuard.",
     "dhcp_enable": "Включить DHCP-сервер",
     "dhcp_disable": "Отключить DHCP-сервер",
-    "dhcp_not_found": "Можно безопасно включить DHCP-сервер, так как другие активные DHCP-серверы в сети не найдены. Однако, рекомендуется перепроверить их отсутствие вручную, так как автоматическая проверка не даёт 100% гарантии.",
+    "dhcp_not_found": "Активные DHCP-серверы в сети не найдены. Вы можете безопасно включить встроенный сервер DHCP.",
     "dhcp_found": "Некоторые активные DHCP-серверы найдены в сети. Включение встроенного DHCP-сервера небезопасно.",
     "dhcp_leases": "Аренда DHCP",
     "dhcp_static_leases": "Статические аренды DHCP",
@@ -37,8 +32,6 @@
     "form_error_ip_format": "Неверный формат IP-адреса",
     "form_error_mac_format": "Некорректный формат MAC",
     "form_error_client_id_format": "Неверный формат ID клиента",
-    "form_error_server_name": "Неверное имя сервера",
-    "form_error_subnet": "Подсеть «{{cidr}}» не содержит IP-адрес «{{ip}}»",
     "form_error_positive": "Должно быть больше 0",
     "form_error_negative": "Должно быть не меньше 0",
     "range_end_error": "Должно превышать начало диапазона",
@@ -55,19 +48,19 @@
     "ip": "IP-адрес",
     "dhcp_table_hostname": "Имя хоста",
     "dhcp_table_expires": "Истекает",
-    "dhcp_warning": "Если вы все равно хотите включить DHCP-сервер, убедитесь, что в сети больше нет активных DHCP-серверов. Иначе это может сломать доступ в сеть для подключённых устройств!",
+    "dhcp_warning": "Если вы все равно хотите включить DHCP-сервер, убедитесь, что в сети больше нет активных DHCP-серверов. Иначе это может сломать доступ в сеть для подключенных устройств!",
-    "dhcp_error": "AdGuard Home не смог определить присутствие других DHCP-серверов в сети.",
+    "dhcp_error": "Мы не смогли определить присутствие других DHCP-серверов в сети.",
-    "dhcp_static_ip_error": "Чтобы использовать DHCP-сервер, должен быть установлен статический IP-адрес. AdGuard Home не смог определить, использует ли этот сетевой интерфейс статический IP-адрес. Пожалуйста, установите его вручную.",
+    "dhcp_static_ip_error": "Для того, чтобы использовать DHCP-сервер, должен быть установлен статический IP-адрес. Мы не смогли определить, использует ли этот сетевой интерфейс статический IP-адрес. Пожалуйста, установите его вручную.",
-    "dhcp_dynamic_ip_found": "Ваша система использует динамический IP-адрес для интерфейса <0>{{interfaceName}}</0>. Чтобы использовать DHCP-сервер, необходимо установить статический IP-адрес. Ваш текущий IP-адрес – <0>{{ipAddress}}</0>. Мы автоматически установим его как статический, если вы нажмёте кнопку «Включить DHCP-сервер».",
+    "dhcp_dynamic_ip_found": "Ваша система использует динамический IP-адрес для интерфейса <0>{{interfaceName}}</0>. Чтобы использовать DHCP-сервер необходимо установить статический IP-адрес. Ваш текущий IP-адрес – <0>{{ipAddress}}</0>. Мы автоматически установим его как статический, если вы нажмете кнопку Включить DHCP.",
-    "dhcp_lease_added": "Статическая аренда «{{key}}» успешно добавлена",
+    "dhcp_lease_added": "Статическая аренда \"{{key}}\" успешно добавлена",
-    "dhcp_lease_deleted": "Статическая аренда «{{key}}» успешно удалена",
+    "dhcp_lease_deleted": "Статическая аренда \"{{key}}\" успешно удалена",
     "dhcp_new_static_lease": "Новая статическая аренда",
     "dhcp_static_leases_not_found": "Не найдено статических аренд DHCP",
     "dhcp_add_static_lease": "Добавить статическую аренду",
     "dhcp_reset": "Вы уверены, что хотите сбросить настройки DHCP?",
     "country": "Страна",
     "city": "Город",
-    "delete_confirm": "Вы уверены, что хотите удалить «{{key}}»?",
+    "delete_confirm": "Are you sure you want to delete \"{{key}}\"?",
     "form_enter_hostname": "Введите имя хоста",
     "error_details": "Детализация ошибки",
     "response_details": "Детали ответа",
@@ -100,7 +93,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}} день",
@@ -113,29 +106,29 @@
     "general_statistics": "Общая статистика",
     "number_of_dns_query_days": "Количество DNS-запросов за последний {{count}} день",
     "number_of_dns_query_days_plural": "Количество DNS запросов, обработанных за последние {{count}} дней",
-    "number_of_dns_query_24_hours": "Количество DNS-запросов за последние 24 часа",
+    "number_of_dns_query_24_hours": "Количество DNS-запросов за 24 часа",
     "number_of_dns_query_blocked_24_hours": "Количество DNS-запросов, заблокированных фильтрами и блок-списками",
     "number_of_dns_query_blocked_24_hours_by_sec": "Количество DNS-запросов, заблокированных модулем Антифишинга AdGuard",
-    "number_of_dns_query_blocked_24_hours_adult": "Количество заблокированных «сайтов для взрослых»",
+    "number_of_dns_query_blocked_24_hours_adult": "Количество заблокированных \"сайтов для взрослых\"",
-    "enforced_save_search": "Применён безопасный поиск",
+    "enforced_save_search": "Применен безопасный поиск",
-    "number_of_dns_query_to_safe_search": "Количество запросов DNS для поисковых систем, для которых был применён Безопасный поиск",
+    "number_of_dns_query_to_safe_search": "Количество запросов DNS для поисковых систем, для которых был применен Безопасный поиск",
     "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>\"Фильтрах\"</a>.",
     "use_adguard_browsing_sec": "Включить Безопасную навигацию AdGuard",
-    "use_adguard_browsing_sec_hint": "AdGuard Home проверит, включён ли домен в веб-службу безопасности браузера. Он будет использовать API, чтобы выполнить проверку: на сервер отправляется только короткий префикс имени домена SHA256.",
+    "use_adguard_browsing_sec_hint": "AdGuard Home проверит, включен ли домен в веб-службу безопасности браузера. Он будет использовать API, чтобы выполнить проверку: на сервер отправляется только короткий префикс имени домена SHA256.",
     "use_adguard_parental": "Включить модуль Родительского контроля AdGuard ",
     "use_adguard_parental_hint": "AdGuard Home проверит, содержит ли домен материалы 18+. Он использует тот же API для обеспечения конфиденциальности, что и веб-служба безопасности браузера.",
     "enforce_safe_search": "Включить безопасный поиск",
-    "enforce_save_search_hint": "AdGuard Home может обеспечить безопасный поиск в следующих поисковых системах: Google, YouTube, Bing, DuckDuckGo, Yandex и Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home может обеспечить безопасный поиск в следующих поисковых системах: Google, Youtube, Bing, DuckDuckGo, Yandex и Pixabay.",
     "no_servers_specified": "Нет указанных серверов",
     "general_settings": "Основные настройки",
     "dns_settings": "Настройки DNS",
-    "dns_blocklists": "Чёрные списки DNS",
+    "dns_blocklists": "Черные списки DNS",
     "dns_allowlists": "Белые списки DNS",
-    "dns_blocklists_desc": "AdGuard Home будет блокировать домены из чёрных списков.",
+    "dns_blocklists_desc": "AdGuard Home будет блокировать домены из черных списков.",
-    "dns_allowlists_desc": "Домены из белых списков DNS будут разрешены, даже если они находятся в любом из чёрных списков.",
+    "dns_allowlists_desc": "Домены из белых списков DNS будут разрешены, даже если они находятся в любом из черных списков.",
     "custom_filtering_rules": "Пользовательские правила фильтрации",
     "encryption_settings": "Настройки шифрования",
     "dhcp_settings": "Настройки DHCP",
@@ -164,21 +157,21 @@
     "delete_table_action": "Удалить",
     "elapsed": "Затрачено",
     "filters_and_hosts_hint": "AdGuard Home распознает базовые правила блокировки и синтаксис файлов hosts.",
-    "no_blocklist_added": "Чёрные списки не добавлены",
+    "no_blocklist_added": "Черные списки не добавлены",
     "no_whitelist_added": "Белые списки не добавлены",
-    "add_blocklist": "Добавить чёрный список",
+    "add_blocklist": "Добавить черный список",
     "add_allowlist": "Добавить белый список",
     "cancel_btn": "Отмена",
     "enter_name_hint": "Введите имя",
     "enter_url_or_path_hint": "Введите URL-адрес или абсолютный путь к списку",
     "check_updates_btn": "Проверить обновления",
-    "new_blocklist": "Новый чёрный список",
+    "new_blocklist": "Новый черный список",
     "new_allowlist": "Новый белый список",
-    "edit_blocklist": "Редактировать чёрный список",
+    "edit_blocklist": "Редактировать черный список",
     "edit_allowlist": "Редактировать белый список",
     "choose_blocklist": "Выберите списки блокировки",
     "choose_allowlist": "Выберите списки разрешённых",
-    "enter_valid_blocklist": "Добавьте действующий URL-адрес в чёрный список.",
+    "enter_valid_blocklist": "Добавьте действующий URL-адрес в черный список.",
     "enter_valid_allowlist": "Добавьте действующий URL-адрес в белый список.",
     "form_error_url_format": "Неверный формат URL",
     "form_error_url_or_path_format": "Неверный URL или абсолютный путь к списку",
@@ -187,7 +180,7 @@
     "examples_title": "Примеры",
     "example_meaning_filter_block": "заблокировать доступ к домену example.org и всем его поддоменам",
     "example_meaning_filter_whitelist": "разблокировать доступ к домену example.org и всем его поддоменам",
-    "example_meaning_host_block": "Теперь AdGuard Home вернёт 127.0.0.1 для домена example.org (но не для его поддоменов).",
+    "example_meaning_host_block": "Теперь AdGuard Home вернет 127.0.0.1 для домена example.org (но не для его поддоменов).",
     "example_comment": "! Так можно добавлять описание",
     "example_comment_meaning": "комментарий",
     "example_comment_hash": "# И вот так тоже",
@@ -195,13 +188,13 @@
     "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": "Все списки уже обновлены",
     "updated_upstream_dns_toast": "Upstream DNS-серверы обновлены",
     "dns_test_ok_toast": "Указанные серверы DNS работают корректно",
-    "dns_test_not_ok_toast": "Сервер «{{key}}»: невозможно использовать, проверьте правильность написания",
+    "dns_test_not_ok_toast": "Сервер \"{{key}}\": невозможно использовать, проверьте правильность написания",
     "unblock": "Разблокировать",
     "block": "Заблокировать",
     "disallow_this_client": "Запретить доступ клиенту",
@@ -223,7 +216,7 @@
     "refresh_btn": "Обновить",
     "previous_btn": "Назад",
     "next_btn": "Вперёд",
-    "loading_table_status": "Загрузка…",
+    "loading_table_status": "Загрузка...",
     "page_table_footer_text": "Страница",
     "rows_table_footer_text": "строк",
     "updated_custom_filtering_toast": "Внесены изменения в пользовательские правила",
@@ -233,7 +226,7 @@
     "query_log_filtered": "Отфильтровано с помощью {{filter}}",
     "query_log_confirm_clear": "Вы уверены, что хотите очистить весь журнал запросов?",
     "query_log_cleared": "Журнал запросов успешно очищен",
-    "query_log_updated": "Журнал запросов успешно обновлён",
+    "query_log_updated": "Журнал запросов успешно обновлен",
     "query_log_clear": "Очистить журнал запросов",
     "query_log_retention": "Сохранение журнала запросов",
     "query_log_enable": "Включить журнал",
@@ -254,22 +247,16 @@
     "custom_ip": "Свой IP",
     "blocking_ipv4": "Блокировка IPv4",
     "blocking_ipv6": "Блокировка IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Включить отправку EDNS Client Subnet",
     "edns_cs_desc": "Если включить эту опцию, AdGuard Home будет отправлять подсети клиентов на DNS-сервера.",
-    "rate_limit_desc": "Ограничение на количество запросов в секунду для каждого клиента (0 — неограниченно).",
+    "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",
@@ -282,12 +269,12 @@
     "source_label": "Источник",
     "found_in_known_domain_db": "Найден в базе известных доменов.",
     "category_label": "Категория",
-    "rule_label": "Правило(-а)",
+    "rule_label": "Правило",
     "list_label": "Список",
     "unknown_filter": "Неизвестный фильтр {{filterId}}",
     "known_tracker": "Известный трекер",
     "install_welcome_title": "Добро пожаловать в AdGuard Home!",
-    "install_welcome_desc": "AdGuard Home – это DNS-сервер, блокирующий рекламу и трекинг. Его цель – дать вам возможность контролировать всю вашу сеть и все подключённые устройства. Он не требует установки клиентских программ.",
+    "install_welcome_desc": "AdGuard Home – это DNS-сервер, блокирующий рекламу и трекинг. Его цель – дать вам возможность контролировать всю вашу сеть и все подключенные устройства. Он не требует установки клиентских программ.",
     "install_settings_title": "Веб-интерфейс администрирования",
     "install_settings_listen": "Сетевой интерфейс",
     "install_settings_port": "Порт",
@@ -311,16 +298,16 @@
     "install_devices_router": "Роутер",
     "install_devices_router_desc": "Такая настройка автоматически покроет все устройства, использующие ваш домашний роутер, и вам не нужно будет настраивать каждое из них в отдельности.",
     "install_devices_address": "DNS-сервер AdGuard Home доступен по следующим адресам",
-    "install_devices_router_list_1": "Откройте настройки вашего роутера. Обычно вы можете открыть их в вашем браузере, например, http://192.168.0.1/ или http://192.168.1.1/. Вас могут попросить ввести пароль. Если вы не помните его, пароль часто можно сбросить, нажав на кнопку на самом роутере, но помните, что эта процедура может привести к потере всей конфигурации роутера. Если вашему роутеру необходимо приложение для настройки, установите его на свой телефон или ПК и воспользуйтесь им для настройки роутера.",
+    "install_devices_router_list_1": "Откройте настройки вашего роутера. Обычно вы можете открыть их в вашем браузере (например, http://192.168.0.1/ или http://192.168.1.1/). Вас могут попросить ввести пароль. Если вы не помните его, пароль часто можно сбросить, нажав на кнопку на самом роутере. Некоторые роутеры требуют специального приложения, которое в этом случае должно быть уже установлено на ваш компьютер или телефон.",
-    "install_devices_router_list_2": "Найдите настройки DHCP или DNS. Найдите буквы «DNS» рядом с текстовым полем, в которое можно ввести два или три ряда цифр, разделенных на 4 группы от одной до трёх цифр.",
+    "install_devices_router_list_2": "Найдите настройки DHCP или DNS. Найдите буквы \"DNS\" рядом с текстовым полем, в которое можно ввести два или три ряда цифр, разделенных на 4 группы от одной до трёх цифр.",
     "install_devices_router_list_3": "Введите туда адрес вашего AdGuard Home.",
     "install_devices_router_list_4": "Вы не можете установить собственный DNS-сервер на некоторых типах маршрутизаторов. В этом случае может помочь настройка AdGuard Home в качестве <0>DHCP-сервера</0>. В противном случае вам следует обратиться к руководству по настройке DNS-серверов для вашей конкретной модели маршрутизатора.",
-    "install_devices_windows_list_1": "Откройте Панель управления через меню «Пуск» или через поиск Windows.",
+    "install_devices_windows_list_1": "Откройте Панель управления через меню \"Пуск\" или через поиск Windows.",
-    "install_devices_windows_list_2": "Перейдите в «Сеть и интернет», а затем в «Центр управления сетями и общим доступом»",
+    "install_devices_windows_list_2": "Перейдите в \"Сеть и интернет\", а затем в \"Центр управления сетями и общим доступом\"",
-    "install_devices_windows_list_3": "В левой стороне экрана найдите «Изменение параметров адаптера» и кликните по нему.",
+    "install_devices_windows_list_3": "В левой стороне экрана найдите \"Изменение параметров адаптера\" и кликните по нему.",
-    "install_devices_windows_list_4": "Выделите ваше активное подключение, затем кликните по нему правой клавишей мыши и выберите «Свойства».",
+    "install_devices_windows_list_4": "Выделите ваше активное подключение, затем кликните по нему правой клавишей мыши и выберите \"Свойства\".",
-    "install_devices_windows_list_5": "Найдите в списке пункт «IP версии 4 (TCP/IP)», выделите его и затем снова нажмите «Свойства».",
+    "install_devices_windows_list_5": "Найдите в списке пункт \"IP версии 4 (TCP/IP)\", выделите его и затем снова нажмите \"Свойства\".",
-    "install_devices_windows_list_6": "Выберите «Использовать следующие адреса DNS-серверов» и введите адрес AdGuard Home.",
+    "install_devices_windows_list_6": "Выберите \"Использовать следующие адреса DNS-серверов\" и введите адрес AdGuard Home.",
     "install_devices_macos_list_1": "Кликните по иконке Apple и перейдите в «Системные настройки».",
     "install_devices_macos_list_2": "Кликните по иконке «Сеть».",
     "install_devices_macos_list_3": "Выберите первое подключение в списке и нажмите кнопку «Дополнительно».",
@@ -343,7 +330,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",
@@ -351,7 +338,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-кодировке.",
@@ -370,8 +357,8 @@
     "encryption_hostnames": "Имена хостов",
     "encryption_reset": "Вы уверены, что хотите сбросить настройки шифрования?",
     "topline_expiring_certificate": "Ваш SSL-сертификат скоро истекает. Обновите <0>Настройки шифрования</0>.",
-    "topline_expired_certificate": "Ваш SSL-сертификат истёк. Обновите <0>Настройки шифрования</0>.",
+    "topline_expired_certificate": "Ваш SSL-сертификат истек. Обновите <0>Настройки шифрования</0>.",
-    "form_error_port_range": "Введите номер порта из интервала 80-65535",
+    "form_error_port_range": "Введите значение порта из интервала 80-65535",
     "form_error_port_unsafe": "Это небезопасный порт",
     "form_error_equal": "Не должны быть равны",
     "form_error_password": "Пароли не совпадают",
@@ -399,31 +386,30 @@
     "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_subnet_ip": "Введите IP-адрес в подсети «{{cidr}}»",
     "form_enter_mac": "Введите MAC",
     "form_enter_id": "Введите идентификатор",
     "form_add_id": "Добавить идентификатор",
     "form_client_name": "Введите имя клиента",
     "name": "Имя",
     "client_global_settings": "Использовать глобальные настройки",
-    "client_deleted": "Клиент «{{key}}» успешно удалён",
+    "client_deleted": "Клиент \"{{key}}\" успешно удален",
-    "client_added": "Клиент «{{key}}» успешно добавлен",
+    "client_added": "Клиент \"{{key}}\" успешно добавлен",
-    "client_updated": "Клиент «{{key}}» успешно обновлён",
+    "client_updated": "Клиент \"{{key}}\" успешно обновлен",
     "clients_not_found": "Клиентов не найдено",
-    "client_confirm_delete": "Вы уверены, что хотите удалить клиента «{{key}}»?",
+    "client_confirm_delete": "Вы уверены, что хотите удалить клиента \"{{key}}\"?",
     "list_confirm_delete": "Вы уверены, что хотите удалить этот список?",
     "auto_clients_title": "Клиенты (runtime)",
     "auto_clients_desc": "Данные о клиентах, которые используют AdGuard Home, но не хранятся в настройках",
     "access_title": "Настройки доступа",
     "access_desc": "Здесь вы можете настроить правила доступа к DNS-серверу AdGuard Home.",
-    "access_allowed_title": "Разрешённые клиенты",
+    "access_allowed_title": "Разрешенные клиенты",
     "access_allowed_desc": "Список CIDR- или IP-адресов. Если он настроен, AdGuard Home будет принимать запросы только с этих IP-адресов.",
-    "access_disallowed_title": "Запрещённые клиенты",
+    "access_disallowed_title": "Запрещенные клиенты",
     "access_disallowed_desc": "Список CIDR- или IP-адресов. Если он настроен, AdGuard Home будет игнорировать запросы с этих IP-адресов.",
-    "access_blocked_title": "Неразрешённые домены",
+    "access_blocked_title": "Неразрешенные домены",
-    "access_blocked_desc": "Не путайте это с фильтрами. AdGuard Home будет игнорировать DNS-запросы с этими доменами. Здесь вы можете уточнить точные имена доменов, шаблоны, правила URL-фильтрации, например, «пример.org», «*.пример.org» или «||пример.org».",
+    "access_blocked_desc": "Не путайте это с фильтрами. AdGuard Home будет игнорировать DNS-запросы с этими доменами. Здесь вы можете уточнить точные имена доменов, шаблоны, правила URL-фильтрации, например, \"пример.org\", \"*.пример.org\" или \"||пример.org\".",
     "access_settings_saved": "Настройки доступа успешно сохранены",
     "updates_checked": "Проверка обновлений прошла успешно",
     "updates_version_equal": "Версия AdGuard Home актуальна",
@@ -443,14 +429,13 @@
     "setup_dns_privacy_other_2": "<0>dnsproxy</0> поддерживает все известные зашифрованные DNS-протоколы.",
     "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_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_added": "Правило перенаправления DNS для \"{{key}}\" успешно добавлено",
-    "rewrite_deleted": "Правило перенаправления DNS для «{{key}}» успешно удалено",
+    "rewrite_deleted": "Правило перенаправления DNS для \"{{key}}\" успешно удалено",
     "rewrite_add": "Добавить правило перенаправления DNS",
     "rewrite_not_found": "Не найдено правил перенаправления DNS",
-    "rewrite_confirm_delete": "Вы уверены, что хотите удалить правило перенаправления DNS для «{{key}}»?",
+    "rewrite_confirm_delete": "Вы уверены, что хотите удалить правило перенаправления DNS для \"{{key}}\"?",
     "rewrite_desc": "Позволяет легко настроить пользовательский DNS-ответ для определеннного домена.",
     "rewrite_applied": "Применено правило перенаправления",
     "rewrite_hosts_applied": "Переписано по правилу файла hosts",
@@ -483,8 +468,8 @@
     "domain": "Домен",
     "answer": "Ответ",
     "filter_added_successfully": "Список успешно добавлен",
-    "filter_removed_successfully": "Список успешно удалён",
+    "filter_removed_successfully": "Список успешно удален",
-    "filter_updated": "Список успешно обновлён",
+    "filter_updated": "Список успешно обновлен",
     "statistics_configuration": "Конфигурация статистики",
     "statistics_retention": "Сохранение статистики",
     "statistics_retention_desc": "Если вы уменьшите значение интервала, некоторые данные могут быть утеряны",
@@ -515,7 +500,7 @@
     "filtering_rules_learn_more": "<0>Узнайте больше</0> о создании собственных списков блокировки хостов.",
     "blocked_by_response": "Заблокировано по CNAME или IP в ответе",
     "blocked_by_cname_or_ip": "Заблокировано с помощью CNAME или IP",
-    "try_again": "Попробовать ещё раз",
+    "try_again": "Попробовать еще раз",
     "domain_desc": "Введите имя или маску домена, который вы хотите перенаправить.",
     "example_rewrite_domain": "перенаправляет ответы только для этого домена.",
     "example_rewrite_wildcard": "перенаправляет ответы для всех поддоменов <0>example.org</0>.",
@@ -526,8 +511,8 @@
     "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_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",
     "tags_title": "Теги",
@@ -540,17 +525,18 @@
     "filtered_custom_rules": "Отфильтрованы с помощью пользовательских правил фильтрации",
     "choose_from_list": "Выбрать из списка",
     "add_custom_list": "Добавить свой список",
-    "host_whitelisted": "Хост занесён в белый список",
+    "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_block": "Вы уверены, что хотите заблокировать клиента \"{{ip}}\"?",
-    "client_confirm_unblock": "Вы уверены, что хотите разблокировать клиента «{{ip}}»?",
+    "client_confirm_unblock": "Вы уверены, что хотите разблокировать клиента \"{{ip}}\"?",
-    "client_blocked": "Клиент «{{ip}}» успешно заблокирован",
+    "client_blocked": "Клиент \"{{ip}}\" успешно заблокирован",
-    "client_unblocked": "Клиент «{{ip}}» успешно разблокирован",
+    "client_unblocked": "Клиент \"{{ip}}\" успешно разблокирован",
     "static_ip": "Статический IP-адрес",
     "static_ip_desc": "AdGuard Home является сервером, поэтому для корректной работы ему необходим статический IP-адрес. В противном случае, в какой-то момент ваш роутер может присвоить этому устройству другой IP-адрес.",
     "set_static_ip": "Установить статический IP-адрес",
@@ -558,7 +544,7 @@
     "install_static_error": "AdGuard Home не может автоматически настроить его для этого сетевого интерфейса. Пожалуйста, посмотрите инструкцию о том, как это сделать вручную.",
     "install_static_configure": "Мы обнаружили использование динамического IP-адреса — <0>{{ip}}</0>. Хотите использовать его в качестве статического адреса?",
     "confirm_static_ip": "AdGuard Home настроит {{ip}} в качестве вашего статического IP-адреса. Хотите продолжить?",
-    "list_updated": "Обновлён {{count}} список",
+    "list_updated": "Обновлен {{count}} список",
     "list_updated_plural": "Обновлено списков: {{count}}",
     "dnssec_enable": "Включить DNSSEC",
     "dnssec_enable_desc": "Установите флаг DNSSEC в исходящих DNS-запросах и проверьте результат (требуется резолвер с поддержкой DNSSEC)",
@@ -568,13 +554,13 @@
     "show_whitelisted_responses": "В белом списке",
     "show_processed_responses": "Обработан",
     "blocked_safebrowsing": "Заблокировано согласно базе данных Safebrowsing",
-    "blocked_adult_websites": "Заблокированные «взрослые» сайты",
+    "blocked_adult_websites": "Заблокированные \"взрослые\" сайты",
     "blocked_threats": "Заблокировано угроз",
-    "allowed": "Разрешённые",
+    "allowed": "Разрешенные",
     "filtered": "Отфильтрованные",
     "rewritten": "Переписанные",
     "safe_search": "Безопасный поиск",
-    "blocklist": "Чёрный список",
+    "blocklist": "Черный список",
     "milliseconds_abbreviation": "мс",
     "cache_size": "Размер кеша",
     "cache_size_desc": "Размера кеша DNS (в байтах)",
@@ -597,8 +583,8 @@
     "setup_config_to_enable_dhcp_server": "Настроить конфигурацию для включения DHCP-сервера",
     "original_response": "Первоначальный ответ",
     "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
-    "port_53_faq_link": "Порт 53 часто занят службами «DNSStubListener» или «systemd-resolved». Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить.",
+    "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": "Клиент не разрешён, так как его нет в списке «Разрешённых клиентов».",
+    "client_not_in_allowed_clients": "Клиент не разрешён, так как его нет в списке \"Разрешённых клиентов\".",
     "experimental": "Экспериментальный"
-}
+}

client/src/__locales/si-lk.json

@@ -1,11 +1,7 @@
 {
     "client_settings": "අනුග්‍රාහක සැකසුම්",
-    "example_upstream_comment": "ඔබට අදහසක් සඳහන් කළ හැකිය",
     "parallel_requests": "සමාන්තර ඉල්ලීම්",
     "load_balancing": "ධාරිතාව තුලනය",
-    "local_ptr_title": "පෞද්ගලික ව.නා.ප. සේවාදායකයන්",
-    "local_ptr_placeholder": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් යොදන්න",
-    "resolve_clients_title": "අනුග්‍රාහකවල අ.ජා. කෙ. ලිපින ප්‍රතිවර්ත විසඳීම සබල කරන්න",
     "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
     "save_config": "වින්‍යාසය සුරකින්න",
     "enabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය සබල කර ඇත",
@@ -16,15 +12,14 @@
     "dhcp_enable": "ග.ධා.වි.කෙ. සේවාදායකය සබල කරන්න",
     "dhcp_disable": "ග.ධා.වි.කෙ. සේවාදායකය අබල කරන්න",
     "dhcp_config_saved": "ග.ධා.වි.කෙ. වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. අයිපීවී 4 සැකසුම්",
+    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. IPv4 සැකසුම්",
-    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අයිපීවී 6 සැකසුම්",
+    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. IPv6 සැකසුම්",
     "form_error_required": "අවශ්‍ය ක්ෂේත්‍රයකි",
     "form_error_ip4_format": "වලංගු නොවන IPv4 ආකෘතියකි",
     "form_error_ip6_format": "වලංගු නොවන IPv6 ආකෘතියකි",
     "form_error_ip_format": "වලංගු නොවන අ.ජා. කෙ. (IP) ආකෘතියකි",
-    "form_error_mac_format": "වලංගු නොවන මා.ප්‍ර.පා. ආකෘතියකි",
+    "form_error_mac_format": "වලංගු නොවන MAC ආකෘතියකි",
     "form_error_client_id_format": "වලංගු නොවන අනුග්‍රාහක හැඳුනුම් ආකෘතියකි",
-    "form_error_server_name": "වලංගු නොවන සේවාදායක නාමයකි",
     "form_error_positive": "0 ට වඩා වැඩි විය යුතුය",
     "form_error_negative": "0 හෝ ඊට වැඩි විය යුතුය",
     "dhcp_form_range_title": "අ.ජා. කෙ. (IP) ලිපින පරාසය",
@@ -36,10 +31,10 @@
     "ip": "අ.ජා. කෙ. (IP)",
     "dhcp_table_hostname": "ධාරක නාමය",
     "dhcp_table_expires": "කල් ඉකුත් වීම",
-    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. මෙය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
+    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. එසේ නොමැති නම්, එය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
-    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. සේවාදායකයක් තිබේද යන්න නිශ්චය කළ නොහැකි විය.",
+    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. සේවාදායකයක් තිබේද යන්න අපට තීරණය කළ නොහැකි විය.",
-    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට ඇඩ්ගාර්ඩ් හෝම් අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
+    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට අප අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
-    "dhcp_dynamic_ip_found": "ඔබගේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ \"ග.ධා.වි.කෙ. සබල කරන්න\" බොත්තම එබුවහොත් ඇඩ්ගාර්ඩ් හෝම් ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසනු ඇත.",
+    "dhcp_dynamic_ip_found": "ඔබේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ ග.ධා.වි.කෙ. සබල කරන්න බොත්තම එබුවහොත් අපි ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසන්නෙමු.",
     "dhcp_reset": "ග.ධා.වි.කෙ. වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
     "country": "රට",
     "city": "නගරය",
@@ -76,7 +71,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}} සඳහා",
@@ -85,38 +80,33 @@
     "requests_count": "ඉල්ලීම් ගණන",
     "top_blocked_domains": "ජනප්‍රිය අවහිර කළ වසම්",
     "top_clients": "ජනප්‍රිය අනුග්‍රාහකයන්",
-    "no_clients_found": "අනුග්‍රාහකයින් හමු නොවිණි",
     "general_statistics": "පොදු සංඛ්‍යාලේඛන",
-    "number_of_dns_query_days": "පසුගිය දින {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_days_plural": "පසුගිය දින {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_24_hours": "පසුගිය හෝරා 24 සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
     "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්ෂණ ඒකකය මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
+    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard browsing security ඒකකය මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි ගණන",
+    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි ගණන",
     "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන ලද",
     "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
     "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
     "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
     "block_domain_use_filters_and_hosts": "පෙරහන් සහ ධාරක ගොනු භාවිතා කරමින් වසම් අවහිර කරන්න",
     "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
-    "use_adguard_browsing_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්ෂණ වියමන සේවාව භාවිතා කරන්න",
+    "use_adguard_browsing_sec": "AdGuard browsing security වෙබ් සේවාව භාවිතා කරන්න",
-    "use_adguard_parental": "ඇඩ්ගාර්ඩ් දෙමාපිය පාලන වියමන සේවාව භාවිතා කරන්න",
+    "use_adguard_parental": "AdGuard parental control වෙබ් සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය පිරික්සුම් ආරක්ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
+    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය browsing security වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
     "enforce_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන්න",
     "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
     "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
     "general_settings": "පොදු සැකසුම්",
-    "dns_settings": "ව.නා.ප. සැකසුම්",
+    "dns_settings": "DNS සැකසුම්",
-    "dns_blocklists": "ව.නා.ප. අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
+    "dns_blocklists": "DNS අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "dns_allowlists": "ව.නා.ප. අවසර දීමේ ලැයිස්තු",
+    "dns_allowlists": "DNS අවසර දීමේ ලැයිස්තු",
     "dns_blocklists_desc": "ඇඩ්ගාර්ඩ් හෝම් විසින් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු වලට ගැලපෙන වසම් අවහිර කරනු ඇත.",
     "dns_allowlists_desc": "අවසර දීමේ ව.නා.ප. ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක අඩංගු වුවද එය නොසලකා හැර අවසර දෙනු ලැබේ.",
     "custom_filtering_rules": "අභිරුචි පෙරීමේ නීති",
     "encryption_settings": "සංකේතාංකන සැකසුම්",
-    "dhcp_settings": "ග.ධා.වි.කෙ. සැකසුම්",
+    "dhcp_settings": "DHCP සැකසුම්",
     "upstream_dns": "Upstream ව.නා.ප. සේවාදායකයන්",
     "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුළත් කරන්න. upstream ව.නා.ප. (DNS) \n සේවාදායකයන් වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
-    "upstream_dns_configured_in_file": "{{path}} හි වින්‍යාසගත කර ඇත",
     "apply_btn": "යොදන්න",
     "disabled_filtering_toast": "පෙරීම අබල කර ඇත",
     "enabled_filtering_toast": "පෙරීම සබල කර ඇත",
@@ -128,7 +118,7 @@
     "enabled_save_search_toast": "ආරක්ෂිත සෙවීම සබල කර ඇත",
     "enabled_table_header": "සබල කර ඇත",
     "name_table_header": "නම",
-    "list_url_table_header": "ඒ.ස.නි.(URL) ලැයිස්තුව",
+    "list_url_table_header": "URL ලැයිස්තුව",
     "rules_count_table_header": "නීති ගණන",
     "last_time_updated_table_header": "අවසන් වරට යාවත්කාලීන කරන ලද",
     "actions_table_header": "ක්‍රියාමාර්ග",
@@ -143,7 +133,7 @@
     "add_allowlist": "අවසර දීමේ ලැයිස්තුවක් එකතු කරන්න",
     "cancel_btn": "අහෝසි කරන්න",
     "enter_name_hint": "නම ඇතුළත් කරන්න",
-    "enter_url_or_path_hint": "ලැයිස්තුවක ඒ.ස.නි.(URL) හෝ ස්ථීර මාර්ගයක් ඇතුළත් කරන්න",
+    "enter_url_or_path_hint": "ලැයිස්තුවක URL හෝ ස්ථීර මාර්ගයක් ඇතුළත් කරන්න",
     "check_updates_btn": "යාවත්කාල පරීක්ෂා කරන්න",
     "new_blocklist": "නව අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
     "new_allowlist": "නව අවසර දීමේ ලැයිස්තුව",
@@ -151,10 +141,10 @@
     "edit_allowlist": "අවසර දීමේ ලැයිස්තුව සංස්කරණය කරන්න",
     "choose_blocklist": "අවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
     "choose_allowlist": "අනවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
-    "enter_valid_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවට වලංගු ඒ.ස.නි.(URL) ලිපිනයක් ඇතුළත් කරන්න.",
+    "enter_valid_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
-    "enter_valid_allowlist": "අවසර දීමේ ලැයිස්තුවට වලංගු ඒ.ස.නි.(URL) ලිපිනයක් ඇතුළත් කරන්න.",
+    "enter_valid_allowlist": "අවසර දීමේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
-    "form_error_url_format": "වලංගු නොවන ඒ.ස.නි.(URL) ආකෘතියකි",
+    "form_error_url_format": "වලංගු නොවන URL ආකෘතියකි",
-    "form_error_url_or_path_format": "ලැයිස්තුවක වලංගු නොවන ඒ.ස.නි.(URL) හෝ ස්ථීර මාර්ගයකි",
+    "form_error_url_or_path_format": "ලැයිස්තුවක වලංගු නොවන URL හෝ ස්ථීර මාර්ගයකි",
     "custom_filter_rules": "අභිරුචි පෙරීමේ නීති",
     "custom_filter_rules_hint": "පේළියකට එක් නීතියක් බැගින් ඇතුළත් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ ධාරක ගොනු පද ගැලපුම් භාවිතා කළ හැකිය.",
     "examples_title": "උදාහරණ",
@@ -165,11 +155,11 @@
     "example_comment_meaning": "විස්තර කිරීමක්",
     "example_comment_hash": "# එසේම අදහස් දැක්වීමක්",
     "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත පිවිසීම අවහිර කරයි",
-    "example_upstream_regular": "සාමාන්‍ය ව.නා.ප. (UDP හරහා)",
+    "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}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
@@ -189,7 +179,6 @@
     "client_table_header": "අනුග්‍රාහකය",
     "empty_response_status": "හිස්",
     "show_all_filter_type": "සියල්ල පෙන්වන්න",
-    "show_filtered_type": "පෙරූ දෑ පෙන්වන්න",
     "refresh_btn": "නැවුම් කරන්න",
     "previous_btn": "පෙර",
     "next_btn": "ඊළඟ",
@@ -202,7 +191,6 @@
     "query_log_response_status": "තත්ත්වය: {{value}}",
     "query_log_filtered": "{{filter}} මගින් පෙරහන් කරන ලදි",
     "query_log_confirm_clear": "සම්පූර්ණ විමසුම් ලොගය ඉවත් කිරීමට අවශ්‍ය යැයි ඔබට විශ්වාසද?",
-    "query_log_updated": "විමසුම් ලොගය සාර්ථකව යාවත්කාලීන කරන ලදි",
     "query_log_clear": "විමසුම් ලොග ඉවත් කරන්න",
     "query_log_retention": "විමසුම් ලොග රඳවා තබා ගැනීම",
     "query_log_enable": "ලොගය සබල කරන්න",
@@ -213,20 +201,14 @@
     "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා. කෙ. (IP) නිර්නාමික කරන්න",
     "anonymize_client_ip_desc": "ලොග සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ සම්පූර්ණ අ.ජා. කෙ. ලිපිනය සුරකීමෙන් වලකින්න",
     "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
-    "dns_cache_config": "ව.නා.ප. නිහිත වින්‍යාසය",
-    "dns_cache_config_desc": "මෙහිදී ඔබට ව.නා.ප. නිහිතය වින්‍යාසගත කළ හැකිය",
     "blocking_mode": "අවහිර කරන ආකාරය",
     "default": "සුපුරුදු",
     "nxdomain": "නොපවතින වසම",
     "refused": "REFUSED",
     "null_ip": "අභිශූන්‍යය අ.ජා. කෙ.",
     "custom_ip": "අභිරුචි අ.ජා. කෙ.",
-    "blocking_ipv4": "අයි.පී.වී.4 අවහිර කිරීම\n",
+    "dns_over_https": "DNS-over-HTTPS",
-    "blocking_ipv6": "අයි.පී.වී.6 අවහිර කිරීම",
+    "dns_over_tls": "DNS-over-TLS",
-    "client_id": "අනුග්‍රාහකයේ හැඳුනුම",
-    "client_id_placeholder": "අනුග්‍රාහකයේ හැඳුනුම යොදන්න",
-    "download_mobileconfig": "වින්‍යාසගත ගොනුව බාගන්න",
-    "plain_dns": "සරල ව.නා.ප.",
     "form_enter_rate_limit": "අනුපාත සීමාව ඇතුළත් කරන්න",
     "rate_limit": "අනුපාත සීමාව",
     "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
@@ -237,27 +219,26 @@
     "blocking_mode_nxdomain": "නොපවතින වසම (NXDOMAIN): NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
     "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා. කෙ. : ශුන්‍ය අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
     "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
+    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>DNS සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
     "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
     "source_label": "මූලාශ්‍රය",
     "found_in_known_domain_db": "දැනුවත් වසම් දත්ත ගබඩාවේ හමු විය.",
     "category_label": "ප්‍රවර්ගය",
-    "rule_label": "නීති(ය)",
+    "rule_label": "නීතිය",
     "list_label": "ලැයිස්තුව",
     "unknown_filter": "{{filterId}} නොදන්නා පෙරහනකි",
     "known_tracker": "දැනුවත් ලුහුබැඳීමක්",
     "install_welcome_title": "ඇඩ්ගාර්ඩ් හෝම් වෙත සාදරයෙන් පිළිගනිමු!",
     "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
-    "install_settings_title": "පරිපාලක වියමන අතුරු මුහුණත",
+    "install_settings_title": "පරිපාලක වෙබ් අතුරු මුහුණත",
     "install_settings_listen": "සවන් දෙන අතුරු මුහුණත",
     "install_settings_port": "කවුළුව",
-    "install_settings_interface_link": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණත පහත ලිපිනයන්ගෙන් ප්‍රවේශ විය හැකිය:",
+    "form_error_port": "වලංගු කවුළුවක අගයක් ඇතුළත් කරන්න",
-    "form_error_port": "වලංගු කවුළුවක අගයක් යොදන්න",
     "install_settings_dns": "ව.නා.ප. සේවාදායකය",
-    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ මාර්ගකාරකය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
+    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ රවුටරය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
     "install_settings_all_interfaces": "සියලුම අතුරුමුහුණත්",
     "install_auth_title": "සත්‍යාපනය",
-    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
+    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වෙබ් අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
     "install_auth_username": "පරිශීලක නාමය",
     "install_auth_password": "මුරපදය",
     "install_auth_confirm": "මුරපදය තහවුරු කරන්න",
@@ -270,10 +251,10 @@
     "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ ඇඩ්ගාර්ඩ් හෝම් භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
     "install_devices_router": "මාර්ගකාරකය",
     "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධ සියලුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒවා අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවනු ඇත.",
-    "install_devices_address": "ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය පහත ලිපිනයන්ට සවන් දෙමින් පවතී",
+    "install_devices_router_list_1": "ඔබේ මාර්ගකාරකය සඳහා වූ මනාපයන් විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ බ්‍රව්සරයෙන් URL එකක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) පිවිසිය හැකිය. මුරපදය ඇතුළත් කිරීමට ඔබෙන් ඉල්ලා සිටිය හැකිය. ඔබට එය මතක නැතිනම්, බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසිය හැක. සමහර මාර්ගකාරක සඳහා විශේෂිත යෙදුමක් අවශ්‍ය වන අතර, එය දැනටමත් ඔබේ පරිගණකයේ/දුරකථනයේ ස්ථාපනය කර තිබිය යුතුය.",
     "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. ඉලක්කම් කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අක්ෂර සොයන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
     "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
-    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ මාර්ගකාරකය වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත පරීක්ෂා කළ යුතුය.",
+    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ රවුටර වල අභිරුචි ව.නා.ප. (DNS) සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
     "install_devices_windows_list_1": "ආරම්භක මෙනුව හෝ වින්ඩෝස් සෙවුම හරහා පාලක පැනලය විවෘත කරන්න.",
     "install_devices_windows_list_2": "ජාල සහ අන්තර්ජාල ප්‍රවර්ගයට ගොස් පසුව ජාල සහ බෙදාගැනීමේ මධ්‍යස්ථානය වෙත යන්න.",
     "install_devices_windows_list_3": "උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම තිරයේ වම් පසින් සොයාගෙන එය මත ක්ලික් කරන්න.",
@@ -298,7 +279,7 @@
     "open_dashboard": "උපකරණ පුවරුව විවෘත කරන්න",
     "install_saved": "සාර්ථකව සුරකින ලදි",
     "encryption_title": "සංකේතාංකනය",
-    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වියමන අතුරු මුහුණත සහය දක්වයි",
+    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වෙබ් අතුරු මුහුණත සහය දක්වයි",
     "encryption_config_saved": "සංකේතාංකන වින්‍යාසය සුරකින ලදි",
     "encryption_server": "සේවාදායක‌‌‌‌යේ නම",
     "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුළත් කරන්න",
@@ -318,8 +299,6 @@
     "encryption_key_input": "ඔබගේ සහතිකය සඳහා PEM-කේතාංකනය කළ පුද්ගලික යතුර පිටපත් කර මෙහි අලවන්න.",
     "encryption_enable": "සංකේතාංකනය සබල කරන්න (HTTPS, DNS-over-HTTPS සහ DNS-over-TLS)",
     "encryption_enable_desc": "සංකේතාංකනය සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර ව.නා.ප. සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
-    "encryption_chain_valid": "සහතික දාමය වලංගු ය",
-    "encryption_chain_invalid": "සහතික දාමය වලංගු නොවේ",
     "encryption_key_valid": "මෙය වලංගු {{type}} පුද්ගලික යතුරකි",
     "encryption_key_invalid": "මෙය වලංගු නොවන {{type}} පුද්ගලික යතුරකි",
     "encryption_subject": "මාතෘකාව",
@@ -328,14 +307,14 @@
     "encryption_reset": "සංකේතාංකන සැකසුම් යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
     "topline_expiring_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත්වීමට ආසන්න වී ඇත. <0>සංකේතාංකන සැකසුම්</0> යාවත්කාල කරන්න.",
     "topline_expired_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත් වී ඇත. <0>සංකේතාංකන සැකසුම්</0> යාවත්කාල කරන්න.",
-    "form_error_port_range": "80-65535 පරාසය හි කවුළුවක අගයක් ඇතුළත් කරන්න",
+    "form_error_port_range": "80-65535 පරාසය‌ෙ‌හි කවුළුවක අගයක් ඇතුළත් කරන්න",
     "form_error_port_unsafe": "මෙය අනාරක්ෂිත කවුළුවකි",
     "form_error_equal": "සමාන නොවිය යුතුය",
     "form_error_password": "මුරපදය නොගැලපුුුුුුණි",
     "reset_settings": "සැකසුම් යළි පිහිටුවන්න",
     "update_announcement": "ඇඩ්ගාර්ඩ් හෝම් {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
     "setup_guide": "පිහිටුවීමේ මාර්ගෝපදේශය",
-    "dns_addresses": "ව.නා.ප. ලිපින",
+    "dns_addresses": "DNS ලිපින",
     "dns_start": "ව.නා.ප. සේවාදායකය ආරම්භ වෙමින් පවතී",
     "dns_status_error": "ව.නා.ප. සේවාදායකයේ තත්වය පරීක්ෂා කිරීමේදී දෝෂයකි",
     "down": "පහත",
@@ -356,9 +335,9 @@
     "client_edit": "අනුග්‍රාහකය සංස්කරණය කරන්න",
     "client_identifier": "හඳුන්වනය",
     "ip_address": "අ.ජා. කෙ. (IP) ලිපිනය",
+    "client_identifier_desc": "අනුග්‍රාහකයන් අ.ජා. කෙ. (IP) ලිපිනයක් හෝ මා.ප්‍ර.පා. (MAC) ලිපිනයක් මගින් හඳුනාගත හැකිය. මා.ප්‍ර.පා. හඳුන්වනයක් ලෙස  භාවිතා කළ හැක්කේ ඇඩ්ගාර්ඩ් හෝම් ද <0>DHCP සේවාදායකයක්</0> නම් පමණක් බව කරුණාවෙන් සලකන්න. ",
     "form_enter_ip": "අ.ජා. කෙ. (IP) ඇතුළත් කරන්න",
-    "form_enter_subnet_ip": "\"{{cidr}}\" අනුජාලයෙහි අ.ජා. කෙ. ලිපිනයක් යොදන්න.",
+    "form_enter_mac": "MAC ඇතුළත් කරන්න",
-    "form_enter_mac": "මා.ප්‍ර.පා. (MAC) ඇතුළත් කරන්න",
     "form_enter_id": "හඳුන්වනය ඇතුළත් කරන්න",
     "form_add_id": "හඳුන්වනයක් එක් කරන්න",
     "form_client_name": "අනුග්‍රාහකයේ නම ඇතුළත් කරන්න",
@@ -367,14 +346,13 @@
     "client_deleted": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව ඉවත් කරන ලදි",
     "client_added": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව එකතු කරන ලදි",
     "client_updated": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව යාවත්කාල කරන ලදි",
-    "clients_not_found": "අනුග්‍රාහකයින් හමු නොවිණි",
     "client_confirm_delete": "\"{{key}}\" අනුග්‍රාහකය ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
     "list_confirm_delete": "මෙම ලැයිස්තුව ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
     "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන අනුග්‍රාහකයන්‌ගේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
     "access_title": "ප්‍රවේශවීමට සැකසුම්",
     "access_desc": "මෙහිදී ඔබට ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
     "access_allowed_title": "අවසර ලත් අනුග්‍රාහකයන්",
-    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
+    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
     "access_disallowed_title": "අවසර නොලත් අනුග්‍රාහකයන්",
     "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
     "access_blocked_title": "අවහිර කළ වසම්",
@@ -382,23 +360,22 @@
     "updates_checked": "යාවත්කාලීන කිරීම් සාර්ථකව පරික්ෂා කර ඇත",
     "updates_version_equal": "ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීනයි",
     "check_updates_now": "යාවත්කාල කිරීම සඳහා දැන් පරීක්ෂා කරන්න",
-    "dns_privacy": "ව.නා.ප. රහස්‍යතා",
+    "dns_privacy": "DNS රහස්‍යතා",
-    "setup_dns_privacy_3": "<0>මෙහි ඔබට භාවිතා කළ හැකි මෘදුකාංග ලැයිස්තුවක් ඇත.</0>",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> තන්තුව භාවිතා කරයි.",
-    "setup_dns_privacy_other_title": "වෙනත් ක්‍රියාවට නැංවූ දෑ",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> තන්තුව භාවිතා කරයි.",
-    "setup_dns_privacy_other_2": "<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_privacy_other_5": "<0>මෙහි</0> සහ <1>මෙහි</1> තවත් ක්‍රියාවට නැංවූ දෑ ඔබට හමුවනු ඇත.",
-    "setup_dns_privacy_ioc_mac": "අයිඕඑස් සහ මැක්ඕඑස් වින්‍යාසය",
     "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතා කිරීම සඳහා ඇඩ්ගාර්ඩ් හෝම් සැකසුම් තුළ <0>සංකේතාංකනය වින්‍යාසගත</0> කිරීමට අවශ්‍ය වේ.",
-    "rewrite_added": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම සාර්ථකව එකතු කරන ලදි",
+    "rewrite_add": "DNS නැවත ලිවීමක් එකතු කරන්න",
-    "rewrite_add": "ව.නා.ප. නැවත ලිවීමක් එකතු කරන්න",
+    "rewrite_confirm_delete": "\"{{key}}\" සඳහා DNS නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "rewrite_not_found": "ව.නා.ප. නැවත ලිවීම් හමු නොවීය",
-    "rewrite_confirm_delete": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
     "rewrite_desc": "විශේෂිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
     "rewrite_applied": "නැවත ලිවීමේ නීතිය යොදා ඇත",
     "rewrite_hosts_applied": "ධාරක ගොනු නීතිය මගින් නැවත ලියා ඇත",
-    "dns_rewrites": "ව.නා.ප. නැවත ලිවීම්",
+    "dns_rewrites": "DNS නැවත ලිවීම්",
+    "form_domain": "වසම ඇතුළත් කරන්න",
     "form_answer": "අ.ජා. කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුළත් කරන්න ",
     "form_error_domain_format": "වලංගු නොවන වසම් ආකෘතියකි",
     "form_error_answer_format": "වලංගු නොවන පිළිතුරු ආකෘතියකි",
@@ -426,7 +403,6 @@
     "domain": "වසම",
     "answer": "පිළිතුර",
     "filter_added_successfully": "පෙරහන සාර්ථකව එකතු කරන ලදි",
-    "filter_removed_successfully": "ලැයිස්තුව සාර්ථකව ඉවත් කරන ලදි",
     "filter_updated": "ලැයිස්තුව සාර්ථකව යාවත්කාලීන කර ඇත",
     "statistics_configuration": "සංඛ්‍යාලේඛන වින්‍යාසය",
     "statistics_retention": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම",
@@ -455,25 +431,20 @@
     "network": "ජාලය",
     "descr": "විස්තරය",
     "whois": "Whois",
-    "filtering_rules_learn_more": "ඔබගේ ම ධාරක ලැයිස්තු සෑදීම පිළිබඳව <0>තව දැනගන්න</0>.",
     "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
     "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
     "try_again": "නැවත උත්සහා කරන්න",
     "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
     "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
-    "rewrite_ip_address": "අ.ජා. කෙ. ලිපිනය: මෙම අ.ජා. කෙටුම්පත A හෝ AAAA ප්‍රතිචාරයකට භාවිතා කරන්න",
     "rewrite_domain_name": "වසම් නාමය: අන්. නා. (CNAME) වාර්තාවක් එක් කරන්න",
     "disable_ipv6": "IPv6 අබල කරන්න",
     "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම ව.නා.ප. විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
     "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "fastest_addr_desc": "සියලුම ව.නා.ප. සේවාදායකයන්ගෙන් විමසා සියලු ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා. කෙ. ලිපිනය ලබා දෙයි. සියලුම ව.නා.ප. සේවාදායකයන්ගේ ප්‍රතිචාර සඳහා ඇඩ්ගාර්ඩ් හෝම් රැඳී සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
     "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" බොත්තම එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
-    "autofix_warning_result": "ප්‍රතිඵලයක් ලෙස ඔබගේ පද්ධතියෙන් ලැබෙන සියලුම ව.නා.ප. ඉල්ලීම් මූලිකවම ඇඩ්ගාර්ඩ් හෝම් විසින් සකසනු ඇත.",
     "tags_title": "හැඳුනුම් සංකේත",
     "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>වැඩිදුර ඉගෙන ගන්න</0>",
     "form_select_tags": "අනුග්‍රාහක හැඳුනුම් සංකේත",
     "check_title": "පෙරීම පරීක්ෂා කරන්න",
-    "check_desc": "ධාරක නාමය පෙරහන් කර ඇත්දැයි පරීක්ෂා කරන්න",
     "check": "පරීක්ෂා කරන්න",
     "form_enter_host": "ධාරක නාමයක් ඇතුළත් කරන්න",
     "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
@@ -483,28 +454,29 @@
     "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}} අනුග්‍රාහකය අනවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
     "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කරන ලදි",
     "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කරන ලදි",
-    "static_ip": "ස්ථිතික අ.ජා. කෙ. ලිපිනය",
+    "static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය",
     "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
     "set_static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනයක් සකසන්න",
     "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
     "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා ඇඩ්ගාර්ඩ් හෝම් හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
-    "install_static_configure": "ගතික අ.ජා. කෙ. (IP) ලිපිනයක් භාවිතා කරන බව ඇඩ්ගාර්ඩ් හෝම් හඳුනාගෙන ඇත - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
+    "install_static_configure": "ගතික අ.ජා. කෙ. (IP) ලිපිනයක් භාවිතා කරන බව අපි අනාවරණය කර ‌ග‌ෙන ඇත්තෙමු - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
     "confirm_static_ip": "ඇඩ්ගාර්ඩ් හෝම් ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
     "list_updated": "{{count}} ලැයිස්තුව යාවත්කාලීන කරන ලදි",
     "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාලීන කරන ලදි",
+    "dnssec_enable": "DNSSEC සබල කරන්න",
+    "validated_with_dnssec": "DNSSEC සමඟ තහවුරු කර ඇත",
     "all_queries": "සියලුම විමසුම්",
     "show_blocked_responses": "අවහිර කර ඇත",
     "show_whitelisted_responses": "සුදු ලැයිස්තුගත කර ඇත",
-    "show_processed_responses": "සකසා ඇත",
     "blocked_safebrowsing": "ආරක්ෂිත සෙවීම මගින් අවහිර කරන ලද",
-    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වියමන අඩවි",
+    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි",
     "blocked_threats": "අවහිර කළ තර්ජන",
     "allowed": "අවසර ලත්",
     "filtered": "පෙරහන් කරන ලද",
@@ -512,15 +484,8 @@
     "safe_search": "ආරක්ෂිත සෙවීම",
     "blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
     "milliseconds_abbreviation": "මිලි තත්.",
-    "cache_size": "නිහිතයෙහි ප්‍රමාණය",
-    "cache_size_desc": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය (බයිට වලින්)",
-    "cache_ttl_min_override": "අවම පව. කා. අභිබවන්න",
-    "cache_ttl_max_override": "උපරිම පව. කා. අභිබවන්න",
-    "enter_cache_size": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය ඇතුළත් කරන්න (බයිට)",
     "enter_cache_ttl_min_override": "අවම පව. කා. (TTL) ඇතුළත් කරන්න",
     "enter_cache_ttl_max_override": "උපරිම පව. කා. (TTL) ඇතුළත් කරන්න",
-    "cache_ttl_max_override_desc": "ව.නා.ප. නිහිතයෙහි ඇති ඇතුළත් කිරීම් සඳහා ඉතා වැඩි පවත්නා කාලයක අගයක් (තත්පර) සකසන්න",
-    "ttl_cache_validation": "නිහිතයෙහි අවම පව. කා. (TTL) අගය උපරිම අගයට වඩා අඩු හෝ සමාන විය යුතුය",
     "filter_category_general": "පොදු",
     "filter_category_security": "ආරක්ෂණ",
     "filter_category_regional": "ප්‍රාදේශ්‍රීය",
@@ -534,6 +499,5 @@
     "click_to_view_queries": "විමසුම් බැලීමට ඔබන්න",
     "port_53_faq_link": "53 කවුළුව බොහෝ විට \"DNSStubListener\" හෝ \"systemd-resolved\" සේවාවන් භාවිතයට ගනු ලැබේ. කරුණාකර මෙය විසඳන්නේ කෙසේද යන්න පිළිබඳ <0>මෙම උපදෙස්</0> කියවන්න.",
     "adg_will_drop_dns_queries": "ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම අනුග්‍රාහකයේ සියලුම ව.නා.ප. විමසුම් අතහැර දමනු ඇත.",
-    "client_not_in_allowed_clients": "\"අවසර ලත් අනුග්‍රාහකයින්\" ලැයිස්තුවේ නොමැති නිසා අනුග්‍රාහකයට අවසර නැත.",
     "experimental": "පරීක්ෂණාත්මක"
-}
+}

client/src/__locales/sk.json

@@ -2,17 +2,12 @@
     "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 upstream serverov súčasne.",
+    "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",
-    "load_balancing_desc": "Dopytovať len jeden server v danom čase. AdGuard Home použije na výber servera vážený náhodný algoritmus, aby sa najrýchlejší server používal častejšie.",
+    "load_balancing_desc": "Dopytujte jeden server súčasne. AdGuard Home použije na výber servera vážený náhodný algoritmus, aby sa najrýchlejší server používal častejšie.",
     "bootstrap_dns": "Bootstrap DNS servery",
     "bootstrap_dns_desc": "Bootstrap DNS servery sa používajú na rozlíšenie IP adries DoH/DoT rezolverov, ktoré zadáte ako upstreams.",
-    "local_ptr_title": "Súkromné DNS servery",
-    "local_ptr_desc": "DNS servery, ktoré AdGuard Home použije na dopyty na lokálne poskytované zdroje. Napríklad tento server sa použije na preklad názvov hostiteľov klientov pre klientov so súkromnými adresami IP. Ak nie je nastavené, AdGuard Home automaticky použije Váš predvolený DNS prekladač.",
-    "local_ptr_placeholder": "Na každý riadok zadajte adresu jedného servera",
-    "resolve_clients_title": "Povoliť spätný preklad IP adries klientov",
-    "resolve_clients_desc": "Ak je povolené, AdGuard Home sa pokúsi automaticky rozlíšiť hostiteľské mená klientov z ich IP adries zaslaním dopytu PTR príslušnému rezolveru (súkromný DNS server pre miestnych klientov, upstream server pre zákazníkov s verejnou IP adresou).",
     "check_dhcp_servers": "Skontrolovať DHCP servery",
     "save_config": "Uložiť konfiguráciu",
     "enabled_dhcp": "DHCP server zapnutý",
@@ -23,12 +18,12 @@
     "dhcp_description": "Ak Váš smerovač neposkytuje možnosť nastaviť DHCP, môžete použiť vlastný zabudovaný DHCP server AdGuard.",
     "dhcp_enable": "Zapnúť DHCP server",
     "dhcp_disable": "Vypnúť DHCP server",
-    "dhcp_not_found": "Je bezpečné zapnúť vstavaný DHCP server - AdGuard Home v sieti nenašiel žiadne aktívne DHCP servery. Odporúčame Vám však, aby ste ho znova manuálne skontrolovali, pretože náš automatický test momentálne neposkytuje 100% záruku.",
+    "dhcp_not_found": "Je bezpečné zapnúť vstavaný DHCP server - v sieti sme nenašli žiadne aktívne DHCP servery. Odporúčame Vám však, aby ste ho znova manuálne skontrolovali, pretože náš automatický test momentálne neposkytuje 100% záruku.",
     "dhcp_found": "V sieti bol nájdený aktívny DHCP server. Nie je bezpečné povoliť vstavaný DHCP server.",
     "dhcp_leases": "DHCP prenájom",
     "dhcp_static_leases": "DHCP statické prenájmy",
     "dhcp_leases_not_found": "Neboli nájdené žiadne DHCP prenájmy",
-    "dhcp_config_saved": "Konfigurácia DHCP servera bola úspešne uložená",
+    "dhcp_config_saved": "Konfigurácia DHCP servera uložená",
     "dhcp_ipv4_settings": "Nastavenia DHCP IPv4",
     "dhcp_ipv6_settings": "Nastavenia DHCP IPv6",
     "form_error_required": "Povinná položka",
@@ -37,8 +32,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_subnet": "Podsieť \"{{cidr}}\" neobsahuje IP adresu \"{{ip}}\"",
     "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",
@@ -55,16 +48,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "Meno hostiteľa",
     "dhcp_table_expires": "Vyprší",
-    "dhcp_warning": "Ak chcete server DHCP napriek tomu zapnúť, 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_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": "AdGuard Home nevie určiť, či je v sieti iný aktívny DHCP server.",
+    "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. AdGuard Home nedokázal 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 pre rozhranie <0>{{interfaceName}}</0> dynamickú konfiguráciu IP adresy. Aby bolo možné používať DHCP server, musí byť nastavená statická IP adresa. Vaša aktuálna IP adresa je <0>{{ipAddress}}</0>. ak Ak stlačíte tlačidlo \"Povoliť DHCP server\", AdGuard Home automaticky nastaví túto IP adresu ako statickú.",
+    "dhcp_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ý",
     "dhcp_new_static_lease": "Nový statický prenájom",
     "dhcp_static_leases_not_found": "Nebol nájdený žiadny statický DHCP prenájom",
     "dhcp_add_static_lease": "Pridať statický prenájom",
-    "dhcp_reset": "Naozaj chcete vymazať DHCP konfiguráciu?",
+    "dhcp_reset": "Naozaj chcete obnoviť konfiguráciu DHCP?",
     "country": "Krajina",
     "city": "Mesto",
     "delete_confirm": "Naozaj chcete vymazať \"{{key}}\"?",
@@ -114,7 +107,7 @@
     "number_of_dns_query_days": "Počet DNS dopytov spracovaných za posledný {{count}} deň",
     "number_of_dns_query_days_plural": "Počet DNS dopytov spracovaných za posledných {{count}} dní",
     "number_of_dns_query_24_hours": "Počet DNS dopytov spracovaných za posledných 24 hodín",
-    "number_of_dns_query_blocked_24_hours": "Počet DNS dopytov zablokovaných filtrami reklamy a zoznamami blokovaných hostov",
+    "number_of_dns_query_blocked_24_hours": "Počet DNS dopytov zablokovaných filtrami reklamy a zoznamami adries",
     "number_of_dns_query_blocked_24_hours_by_sec": "Počet DNS dopytov zablokovaných AdGuard modulom Bezpečné prehliadanie",
     "number_of_dns_query_blocked_24_hours_adult": "Počet zablokovaných stránok pre dospelých",
     "enforced_save_search": "Vynútené bezpečné vyhľadávanie",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Použiť AdGuard službu Rodičovská kontrola",
     "use_adguard_parental_hint": "AdGuard Home skontroluje, či doména obsahuje materiály pre dospelých. Používa rovnaké API priateľské k ochrane osobných údajov ako služba Bezpečného prehliadania.",
     "enforce_safe_search": "Vynútiť bezpečné vyhľadávanie",
-    "enforce_save_search_hint": "AdGuard Home môže vynútiť bezpečné vyhľadávanie v nasledujúcich vyhľadávačoch: Google, YouTube, Bing, DuckDuckGo, Yandex a Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home môže vynútiť bezpečné vyhľadávanie v nasledujúcich vyhľadávačoch: Google, Youtube, Bing, DuckDuckGo a Yandex.",
     "no_servers_specified": "Neboli špecifikované žiadne servery",
     "general_settings": "Všeobecné nastavenia",
     "dns_settings": "Nastavenia DNS",
@@ -140,7 +133,7 @@
     "encryption_settings": "Nastavenia šifrovania",
     "dhcp_settings": "Nastavenia DHCP",
     "upstream_dns": "Upstream DNS servery",
-    "upstream_dns_help": "Zadajte jednu adresu server na každý riadok. <a>Získajte viac informácií</a> o konfigurácii upstream DNS serverov.",
+    "upstream_dns_help": "Zadajte adresy serverov jednu na riadok. <a>Získajte viac informácií</a> o konfigurácii DNS serverov na strane servera.",
     "upstream_dns_configured_in_file": "Konfigurované v {{path}}",
     "test_upstream_btn": "Test upstreamov",
     "upstreams": "Upstreams",
@@ -254,22 +247,16 @@
     "custom_ip": "Vlastná IP adresa",
     "blocking_ipv4": "Blokovanie IPv4",
     "blocking_ipv6": "Blokovanie IPv6",
-    "dnscrypt": "DNSCrypt",
     "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.",
+    "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",
@@ -282,7 +269,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 (pravidlá)",
+    "rule_label": "Pravidlo",
     "list_label": "Zoznam",
     "unknown_filter": "Neznámy filter {{filterId}}",
     "known_tracker": "Známy sledovač",
@@ -311,10 +298,10 @@
     "install_devices_router": "Smerovač",
     "install_devices_router_desc": "Toto nastavenie automaticky pokryje všetky zariadenia pripojené k Vášmu domácemu smerovaču a nebudete ich musieť konfigurovať manuálne.",
     "install_devices_address": "DNS server AdGuard Home používa nasledujúce adresy",
-    "install_devices_router_list_1": "Otvorte predvoľby Vášho smerovača. Zvyčajne ho môžete získať z Vášho prehliadača prostredníctvom URL adresy, ako napr. http://192.168.0.1/ alebo http://192.168.1.1/. Možno bude potrebné zadať heslo. Ak si ho nepamätáte, môžete často resetovať heslo stlačením tlačidla na samotnom smerovači, uvedomte si však, že ak sa zvolíte tento postup, pravdepodobne stratíte celú konfiguráciu smerovača. Ak Váš smerovač vyžaduje na nastavenie vlastnú aplikáciu, nainštalujte si ju do telefónu alebo počítača a použite ju na prístup k nastaveniam smerovača.",
+    "install_devices_router_list_1": "Otvorte predvoľby Vášho smerovača. Zvyčajne ho môžete získať z prehliadača prostredníctvom adresy URL (napríklad http://192.168.0.1/ alebo http://192.168.1.1/). Možno bude potrebné zadať heslo. Ak si to nepamätáte, heslo môžete často obnoviť stlačením tlačidla na samotnom smerovači. Niektoré smerovače vyžadujú konkrétnu aplikáciu, ktorá by v takom prípade mala byť už nainštalovaná na Vašom počítači alebo telefóne.",
     "install_devices_router_list_2": "Nájdite nastavenia DHCP/DNS. Hľadajte skratku DNS vedľa poľa, ktoré umožňuje vložiť dve alebo tri sady čísel, každé rozdelené do štyroch skupín s jedným až tromi číslicami.",
     "install_devices_router_list_3": "Zadajte tam adresy Vášho AdGuard Home servera.",
-    "install_devices_router_list_4": "Na niektorých typoch smerovačov nemôžete nastaviť vlastný DNS server. V takom prípade môže pomôcť, ak nastavíte AdGuard Home ako <0>DHCP server</0>. V opačnom prípade by ste mali vyhľadať príručku, ako prispôsobiť DNS servery konkrétnemu modelu smerovača.",
+    "install_devices_router_list_4": "Na niektorých typoch smerovačov nemôžete nastaviť vlastný DNS server. V takom prípade môže pomôcť, ak nastavíte domovskú stránku AdGuard ako <0>DHCP server</0>. V opačnom prípade by ste mali vyhľadať príručku, ako prispôsobiť servery DNS konkrétnemu modelu smerovača.",
     "install_devices_windows_list_1": "Otvorte panel Nastavenia cez menu Štart alebo vyhľadávanie Windows.",
     "install_devices_windows_list_2": "Prejdite do kategórie Sieť a internet a potom do Centra sietí a zdieľania.",
     "install_devices_windows_list_3": "Vyhľadajte položku Zmeniť možnosti adaptéra a kliknite na ňu",
@@ -343,7 +330,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ť protokol HTTPS, musíte zadať názov servera, ktorý zodpovedá Vášmu certifikátu SSL alebo certifikátu so zástupnými znakmi. Ak pole nie je nastavené, bude akceptovať TLS pripojenia pre ľubovoľnú doménu.",
+    "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",
@@ -373,7 +360,7 @@
     "topline_expired_certificate": "Váš SSL certifikát vypršal. Aktualizujte <0>Nastavenia šifrovania</0>.",
     "form_error_port_range": "Zadajte číslo portu v rozsahu 80-65535",
     "form_error_port_unsafe": "Toto nie je bezpečný port",
-    "form_error_equal": "Nesmie byť rovnaká",
+    "form_error_equal": "Nemala by byť rovnaká",
     "form_error_password": "Heslo sa nezhoduje",
     "reset_settings": "Obnoviť nastavenia",
     "update_announcement": "AdGuard Home {{version}} je teraz k dispozícii! <0>Viac informácií nájdete tu</0>.",
@@ -399,9 +386,8 @@
     "client_edit": "Upraviť klienta",
     "client_identifier": "Identifikátor",
     "ip_address": "IP adresa",
-    "client_identifier_desc": "Klientov je možné identifikovať podľa IP adresy, CIDR a MAC adresy alebo špeciálneho ID klienta (možno použiť pre DoT/DoH/DoQ). <0>Tu</0> sa dozviete viac o tom, ako identifikovať klientov.",
+    "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_subnet_ip": "Zadajte IP adresu do podsiete \"{{cidr}}\"",
     "form_enter_mac": "Zadajte MAC adresu",
     "form_enter_id": "Zadajte identifikátor",
     "form_add_id": "Pridajte identifikátor",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Nepovolení klienti",
     "access_disallowed_desc": "Zoznam CIDR alebo IP adries. Ak je nakonfigurovaný, AdGuard Home bude ignorovať dopyty z týchto IP adries",
     "access_blocked_title": "Nepovolené domény",
-    "access_blocked_desc": "Nezamieňajte si to s filtrami. AdGuard Home zruší DNS dopyty obsahujúce tieto domény. Tu môžete zadať presné názvy domén, zástupné znaky a pravidlá filtrácie URL adries, napr. 'example.org', '*.example.org' alebo '|| example.org ^'.",
+    "access_blocked_desc": "Nezamieňajte si to s filtrami. Domovská stránka AdGuard zruší DNS dopyty obsahujúce tieto domény. Tu môžete zadať presné názvy domén, zástupné znaky a pravidlá URL adries, napr. 'example.org', '*.example.org' alebo '|| example.org ^'.",
     "access_settings_saved": "Nastavenia prístupu úspešne uložené",
     "updates_checked": "Aktualizácie úspešne skontrolované",
     "updates_version_equal": "AdGuard Home je aktuálny",
@@ -444,7 +430,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é",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Vypnúť IPv6",
     "disable_ipv6_desc": "Ak je táto funkcia zapnutá, všetky dotazy DNS na adresy IPv6 (typ AAAA) budú zrušené.",
     "fastest_addr": "Najrýchlejšia IP adresa",
-    "fastest_addr_desc": "Dopytovať všetky servery DNS a vrátiť najrýchlejšiu IP adresu zo všetkých odpovedí. Toto spomalí DNS dopyty, pretože AdGuard Home musí čakať na odpovede zo všetkých serverov DNS, ale zlepší sa celkové pripojenie.",
+    "fastest_addr_desc": "Dopytovať všetky servery DNS a vrátiť najrýchlejšiu IP adresu zo všetkých odpovedí. Toto spomalí dotazy DNS, pretože musíme čakať na odpovede zo všetkých serverov DNS, ale zlepší sa celkové pripojenie.",
     "autofix_warning_text": "Ak kliknete na „Opraviť“, AdGuardHome nakonfiguruje Váš systém tak, aby používal DNS server AdGuardHome.",
     "autofix_warning_list": "Bude vykonávať tieto úlohy: <0>Deaktivovať systém DNSStubListener</0> <0>Nastaviť adresu servera DNS na 127.0.0.1</0> <0>Nahradiť cieľový symbolický odkaz /etc/resolv.conf na /run/systemd/resolve/resolv.conf</0> <0>Zastaviť službu DNSStubListener (znova načítať službu systemd-resolved)</0>",
     "autofix_warning_result": "Výsledkom bude, že všetky DNS dopyty z Vášho systému budú štandardne spracované službou AdGuard Home.",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "set_static_ip": "Nastaviť statickú IP adresu",
     "install_static_ok": "Dobré správy! Statická IP adresa je už nakonfigurovaná",
     "install_static_error": "AdGuard Home ho nemôže automaticky nakonfigurovať pre toto sieťové rozhranie. Vyhľadajte návod, ako to urobiť manuálne.",
-    "install_static_configure": "AdGuard Home zistil, že sa používa dynamická IP adresa <0>{{ip}}</0>. Chcete ju použiť ako svoju statickú adresu?",
+    "install_static_configure": "Zistili sme, že sa používa dynamická IP adresa — <0>{{ip}}</0>. Chcete ju použiť ako svoju statickú adresu?",
     "confirm_static_ip": "AdGuard Home nakonfiguruje {{ip}} ako statickú IP adresu. Chcete pokračovať?",
     "list_updated": "{{count}} zoznam aktualizovaný",
     "list_updated_plural": "{{count}} zoznamov aktualizovaných",
@@ -601,4 +587,4 @@
     "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,20 +1,15 @@
 {
     "client_settings": "Nastavitve odjemalca",
-    "example_upstream_reserved": "Lahko določite gorvodni DNS <0>za določene domene</0>",
+    "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.",
+    "upstream_parallel": "Uporabite vzporedne zahteve za pospešitev reševanja s hkratnim poizvedovanjem vseh gorvodnih strežnikov",
     "parallel_requests": "Vzporedne zahteve",
     "load_balancing": "Uravnavanje obremenitve",
-    "load_balancing_desc": "Poizvedujte po enem gorvodnem strežniku. AdGuard Home bo uporabil tehtani naključni algoritem za izbiro strežnika, tako da bo najhitrejši strežnik pogosteje uporabljen.",
+    "load_balancing_desc": "Poizvedujte po en strežnik. AdGuard Home bo uporabil uteženi naključni algoritem za izbiro strežnika, tako da bo najhitrejši strežnik uporabljen pogosteje.",
     "bootstrap_dns": "Zagonski DNS strežniki",
     "bootstrap_dns_desc": "Zagonski DNS strežniki se uporabljajo za razreševanje IP naslovov DoH/DoT reševalcev, ki jih določite kot navzgornje.",
-    "local_ptr_title": "Zasebni strežniki DNS",
-    "local_ptr_desc": "Strežniki DNS, ki jih AdGuard Home uporablja za lokalne poizvedbe PTR. Ti strežniki se uporabljajo za razreševanje imen gostiteljev z zasebnimi naslovi IP, na primer \"192.168.12.34\" uporablja rDNS. Če ni nastavljen, AdGuard Home uporablja privzete rešitve DNS vašega OS.",
-    "local_ptr_placeholder": "V vrstico vnesite en naslov strežnika",
-    "resolve_clients_title": "Omogoči obratno reševanje naslovov IP gostiteljev",
-    "resolve_clients_desc": "Če je omogočeno, bo AdGuard Home poskušal samodejno razrešiti gostiteljska imena odjemalcev iz njihovih naslovov IP tako, da pošlje poizvedbo PTR ustreznemu razreševalniku (zasebni strežniki DNS za lokalne odjemalce, gorvodni strežnik za odjemalce z javnimi naslovi IP).",
     "check_dhcp_servers": "Preveri strežnike DHCP",
-    "save_config": "Shrani nastavitve",
+    "save_config": "Shrani konfiguracijo",
     "enabled_dhcp": "Strežnik DHCP je omogočen",
     "disabled_dhcp": "Strežnik DHCP je onemogočen",
     "unavailable_dhcp": "DHCP ni na voljo",
@@ -23,12 +18,12 @@
     "dhcp_description": "Če vaš usmerjevalnik ne nudi nastavitev DHCP, lahko uporabite AdGuardov vgrajen DHCP strežnik.",
     "dhcp_enable": "Omogoči strežnik DHCP",
     "dhcp_disable": "Onemogoči strežnik DHCP",
-    "dhcp_not_found": "Varno je omogočiti vgrajeni strežnik DHCP, ker AdGuard Home v omrežju ni našel nobenega aktivnega strežnika DHCP. Vendar morate to ponovno preveriti ročno, saj samodejno sondiranje trenutno ne zagotavlja 100-odstotnega jamstva.",
+    "dhcp_not_found": "Vgrajeni DHCP strežnik lahko varno vklopite - v omrežju nismo našli nobenih aktivnih strežnikov DHCP. Priporočamo, da ga znova ročno preverite, saj samodejni preizkus trenutno ne zagotavlja 100% garancije.",
     "dhcp_found": "V omrežju je bil najden aktivni DHCP strežnik. Vgrajenega AdGuardovega DHCP strežnika ni varno vključiti.",
     "dhcp_leases": "Najemi DHCP",
     "dhcp_static_leases": "DHCP statični najemi",
     "dhcp_leases_not_found": "Ni najdenih najemov DHCP",
-    "dhcp_config_saved": "Nastavitve DHCP so bile uspešno shranjena",
+    "dhcp_config_saved": "Shranjena konfiguracija DHCP strežnika",
     "dhcp_ipv4_settings": "Nastavitve DHCP IPv4",
     "dhcp_ipv6_settings": "Nastavitve DHCP IPv6",
     "form_error_required": "Zahtevano polje",
@@ -37,8 +32,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_subnet": "Podomrežje \"{{cidr}}\" ne vsebuje naslova IP \"{{ip}}\"",
     "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",
@@ -55,16 +48,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "Ime gostitelja",
     "dhcp_table_expires": "Poteče",
-    "dhcp_warning": "Če želite vseeno omogočiti strežnik DHCP, se prepričajte, da v vašem omrežju ni nobenega drugega aktivnega strežnika DHCP, saj lahko to prekine internetno povezljivost naprav v omrežju!",
+    "dhcp_warning": "Če želite omogočiti DHCP strežnik, prepričajte se, da v vašem omrežju ni drugega aktivnega strežnika DHCP. V nasprotnem primeru lahko ta prekine internet za povezane naprave!",
-    "dhcp_error": "AdGuard Home ni mogel ugotoviti, ali je v omrežju še en aktivni strežnik DHCP.",
+    "dhcp_error": "Ni mogoče ugotoviti, ali je v omrežju še en strežnik DHCP.",
-    "dhcp_static_ip_error": "Za uporabo strežnika DHCP mora biti nastavljen statični naslov IP. AdGuard Home ni uspel ugotoviti, ali je ta omrežni vmesnik nastavljen s statičnim naslovom IP. Prosimo, nastavite statični naslov IP ročno.",
+    "dhcp_static_ip_error": "Za uporabo strežnika DHCP, morate nastaviti statični naslov IP. Ni bilo mogoče ugotoviti, ali je ta omrežni vmesnik konfiguriran s statičnim naslovom IP. Ročno nastavite statični naslov IP.",
-    "dhcp_dynamic_ip_found": "Vaš sistem uporablja dinamično nastavitev naslova IP kartice <0>{{interfaceName}}</0>. Za uporabo strežnika DHCP morate nastaviti statični naslov IP. Vaš trenutni naslov IP je<0>{{ipAddress}}</0>. AdGuard Home bo samodejno nastavil ta naslov IP kot statičen, če pritisnete gumb 'Omogoči strežnik DHCP'.",
+    "dhcp_dynamic_ip_found": "Vaš sistem uporablja dinamično konfiguracijo IP-naslova za vmesnik <0>{{interfaceName}}</0>. Za uporabo DHCP strežnika mora biti nastavljen statični naslov IP. Vaš trenutni naslov IP je <0>{{ipAddress}}</0>. Ta IP naslov bomo samodejno nastavili kot statični, če pritisnete na gumb 'Omogoči DHCP'.",
     "dhcp_lease_added": "Statičen najem \"{{key}}\" je uspešno dodan",
     "dhcp_lease_deleted": "Statičen najem \"{{key}}\" je uspešno izbrisan",
     "dhcp_new_static_lease": "Nov statični najem",
     "dhcp_static_leases_not_found": "Ni najdenih statičnih najemov DHCP",
     "dhcp_add_static_lease": "Dodaj statičen najem",
-    "dhcp_reset": "Ali ste prepričani, da želite ponastaviti nastavitve DHCP?",
+    "dhcp_reset": "Ali ste prepričani, da želite ponastaviti konfiguracijo DHCP?",
     "country": "Dežela",
     "city": "Mesto",
     "delete_confirm": "Ali ste prepričani, da želite izbrisati \"{{key}}\"?",
@@ -111,14 +104,14 @@
     "top_clients": "Najpogostejši odjemalci",
     "no_clients_found": "Ni najdenih odjemalcev",
     "general_statistics": "Splošna statistika",
-    "number_of_dns_query_days": "Število obdelanih poizvedb DNS v zadnjem {{count}} dnevu",
+    "number_of_dns_query_days": "Število poizvedb DNS, obdelanih zadnji {{count}} dan",
-    "number_of_dns_query_days_plural": "Število obdelanih poizvedb DNS v zadnjih {{count}} dneh",
+    "number_of_dns_query_days_plural": "Število poizvedb DNS, obdelanih zadnjih {{count}} dni",
-    "number_of_dns_query_24_hours": "Število obdelanih poizvedb DNS v zadnjih 24 urah",
+    "number_of_dns_query_24_hours": "Število opravljenih DNS poizvedb v zadnjih 24 urah",
-    "number_of_dns_query_blocked_24_hours": "Število zahtev DNS, ki so jih onemogočili filtri za zaviranje oglasov in seznami nedovoljenih, gostiteljev",
+    "number_of_dns_query_blocked_24_hours": "Število onemogočenih zahtev DNS s filtri oglasov, in seznami zaviranja gostiteljev",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Število zahtev DNS, ki jih je blokiral AdGuard zaščitni modul brskanja",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Število onemogočenih zahtev DNS z AdGuardovim modulom varnosti brskanja",
     "number_of_dns_query_blocked_24_hours_adult": "Število onemogočenih spletnih strani za odrasle",
     "enforced_save_search": "Prisilno varno iskanje",
-    "number_of_dns_query_to_safe_search": "Število zahtev DNS za iskalnike, za katere je bilo uveljavljeno varno iskanje",
+    "number_of_dns_query_to_safe_search": "Število zahtev DNS za iskalnike, ki jim je bilo vsiljeno varno iskanje",
     "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",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "Uporabi AdGuardovo spletno storitev 'Starševski nadzor'",
     "use_adguard_parental_hint": "AdGuard Home bo preveril, če domena vsebuje  vsebine za odrasle. Uporablja enako, za zasebnost prijazen API, kot spletno storitev za varnost brskanja.",
     "enforce_safe_search": "Vsili varno iskanje",
-    "enforce_save_search_hint": "AdGuard Home lahko prisili varno iskanje v naslednjih iskalnikih: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home lahko uveljavi varno iskanje v naslednjih iskalnikih: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Ni določenih strežnikov",
     "general_settings": "Splošne nastavitve",
     "dns_settings": "Nastavitve DNS",
@@ -254,22 +247,16 @@
     "custom_ip": "IP po meri",
     "blocking_ipv4": "Onemogočanje IPv4",
     "blocking_ipv6": "Onemogočanje IPv6",
-    "dnscrypt": "DNSCrypt",
     "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",
     "edns_enable": "Omogoči podmrežje odjemalcev EDNS",
     "edns_cs_desc": "Če je omogočeno, bo AdGuard Home pošiljal podmrežja odjemalca na strežnike DNS.",
-    "rate_limit_desc": "Dovoljeno število zahtev na sekundo na odjemalca. Nastavitev na 0 pomeni brez omejitve.",
+    "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",
@@ -282,7 +269,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",
@@ -292,7 +279,7 @@
     "install_settings_listen": "Poslušaj vmesnik",
     "install_settings_port": "Vrata",
     "install_settings_interface_link": "Vaš AdGuard Home Skrbniški spletni vmesnik bo na voljo na naslednjih naslovih:",
-    "form_error_port": "Vnesite veljavno številko vrat",
+    "form_error_port": "Vnesite veljavno vrednost vrat",
     "install_settings_dns": "DNS strežnik",
     "install_settings_dns_desc": "Vaše naprave ali usmerjevalnik boste morali konfigurirati za uporabo strežnika DNS na naslednjih naslovih:",
     "install_settings_all_interfaces": "Vsi vmesniki",
@@ -311,10 +298,10 @@
     "install_devices_router": "Usmerjevalnik",
     "install_devices_router_desc": "Ta namestitev bo samodejno pokrila vse naprave, povezane z domačim usmerjevalnikom, zato vam jih ni treba ročno konfigurirati.",
     "install_devices_address": "AdGuard Home strežnik DNS posluša naslednje naslove",
-    "install_devices_router_list_1": "Odprite nastavitve vašega usmerjevalnika. Običajno lahko imate dostop do njega iz brskalnika prek URL naslova, kot je http://192.168.0.1/ ali http://192.168.1.1/. Morda boste pozvani, da vnesete geslo. Če se tega ne spomnite, lahko geslo pogosto ponastavite s pritiskom na gumb na samem usmerjevalniku, vendar se zavedajte, da če izberete ta postopek, boste verjetno izgubili celotne nastavitve usmerjevalnika. Nekateri usmerjevalniki zahtevajo posebno aplikacijo, ki mora v tem primeru biti že nameščena v vašem računalniku ali telefonu.",
+    "install_devices_router_list_1": "Odprite nastavitve usmerjevalnika. Ponavadi lahko do nje dostopate iz brskalnika prek URL-ja (npr.  http://192.168.0.1/ ali http://192.168.1.1/). Morda boste morali vnesti geslo. Če se ne spomnite gesla, lahko pogosto ponastavite geslo s pritiskom na gumb na samem usmerjevalniku. Nekateri usmerjevalniki zahtevajo posebno aplikacijo, ki bi morala biti v tem primeru že nameščena na vašem računalniku/telefonu.",
     "install_devices_router_list_2": "Poiščite nastavitve DHCP/DNS. Poiščite črke DNS poleg polja, ki dovoljuje dva ali tri naborov številk, pri čemer je vsaka razdeljena na štiri skupine z enim do tremi števili.",
     "install_devices_router_list_3": "Tam vnesite svoje naslove strežnikov AdGuard Home.",
-    "install_devices_router_list_4": "Pri nekaterih vrstah usmerjevalnikov strežnika DNS po meri ni mogoče nastaviti. V tem primeru vam lahko pomaga nastavitev AdGuard Home kot <0>strežnika DHCP</0>. V nasprotnem primeru bi morali v priročniku usmerjevalnika preveriti, kako prilagodite strežnike DNS na vašem določenem modelu usmerjevalnika.",
+    "install_devices_router_list_4": "Na nekaterih vrstah usmerjevalnikov ne morete nastaviti strežnika DNS po meri. V tem primeru bo morda pomagalo, če boste AdGuard Home postavili kot <0>strežnik DHCP</0>. V nasprotnem primeru poiščite priročnik, kako prilagoditi strežnike DNS za vaš določen model usmerjevalnika.",
     "install_devices_windows_list_1": "Odprite 'Nadzorno ploščo' prek menija 'Začetek' ali 'Iskanja v sistemu Windows'.",
     "install_devices_windows_list_2": "Pojdite v 'Omrežje' in 'Kategorija interneta' in nato v 'Omrežje' in 'Središče za skupno rabo'.",
     "install_devices_windows_list_3": "Na levi strani zaslona poiščite 'Spremeni nastavitve kartice' in kliknite nanjo.",
@@ -340,7 +327,7 @@
     "install_saved": "Shranjeno uspešno",
     "encryption_title": "Šifriranje",
     "encryption_desc": "Podpora za šifriranje (HTTPS/TLS) za DNS in skrbniški spletni vmesnik",
-    "encryption_config_saved": "Nastavitve šifriranja so shranjene",
+    "encryption_config_saved": "Konfiguracija šifriranja je shranjena",
     "encryption_server": "Ime strežnika",
     "encryption_server_enter": "Vnesite ime vaše domene",
     "encryption_server_desc": "Za uporabo HTTPS morate vnesti ime strežnika, ki se ujema z vašim digitalnim certifikatom SSL.\n",
@@ -373,7 +360,7 @@
     "topline_expired_certificate": "Vaše digitalno potrdilo SSL je poteklo. Posodobi <0>Nastavitve šifriranja</0>.",
     "form_error_port_range": "Vnesite vrednost vrat v razponu med 80-65535",
     "form_error_port_unsafe": "To so nevarna vrata",
-    "form_error_equal": "Ne sme biti enako",
+    "form_error_equal": "Ne bi smelo biti enako",
     "form_error_password": "Geslo se ne ujema",
     "reset_settings": "Ponastavi nastavitve",
     "update_announcement": "Zdaj je na voljo AdGuard Home {{version}}! <0>Klinite tukaj</0> za več informacij.",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "V podomrežje \"{{cidr}}\" vnesite naslov IP",
     "form_enter_mac": "Vnesite MAC",
     "form_enter_id": "Vnesi identifikatorja",
     "form_add_id": "Dodaj identifikatorja",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "Zavrnjeni odjemalci",
     "access_disallowed_desc": "Seznam naslovov CIDR ali IP. Če je konfiguriran, bo AdGuard Home spustil zahteve iz teh IP naslovov.",
     "access_blocked_title": "Prepovedane domene",
-    "access_blocked_desc": "Ne mešajte tega s filtri. AdGuard Home bo v vprašanjih o zahtevah spuščal zahteve DNS s temi domenami. Tu lahko določite natančna imena domen, nadomestne znake in pravila filtriranja URL-jev, npr. 'primer.org', '*.primer.org' ali '||primer.org^'.",
+    "access_blocked_desc": "Tega ne zamenjujte s filtri. AdGuard Home bo v spustil poizvedbe DNS s temi domenami v vprašanju poizvedbe. Tu lahko določite natančna imena domen, nadomestne znake in pravila urlfilter, npr. 'primer.org', '*.primer.org' or '||primer.org^'.",
     "access_settings_saved": "Nastavitve dostopa so uspešno shranjene",
     "updates_checked": "Posodobitve so uspešno preverjene",
     "updates_version_equal": "AdGuard Home je posodobljen",
@@ -444,7 +430,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}}\"",
@@ -526,7 +511,7 @@
     "disable_ipv6": "Onemogoči IPv6",
     "disable_ipv6_desc": "Če je ta funkcija omogočena, bodo vse poizvedbe DNS za naslove IPv6 (vrste AAAA) izpadle.",
     "fastest_addr": "Najhitrejši IP naslov",
-    "fastest_addr_desc": "Zahtevajte vse strežnike DNS in vrne najhitrejši naslov IP med vsemi odgovori. To upočasni zahteve DNS, saj mora AdGuard Home čakati na odgovore vseh strežnikov DNS, vendar izboljša splošno povezljivost.",
+    "fastest_addr_desc": "Poizve vse strežnike DNS in vrne najhitrejši IP naslov med vsemi odgovori. To bo upočasnilo poizvedbe DNS, saj moramo čakati na odgovore vseh DNS strežnikov, vendar bo izboljšalo splošno povezljivost.",
     "autofix_warning_text": "Če kliknete 'Popravi', bo AdGuardHome konfiguriral vaš sistem za uporabo strežnika AdGuardHome DNS.",
     "autofix_warning_list": "To bo izvedlo naslednja opravila: <0>Deaktiviraj sistemski DNSStubListener</0> <0>Nastavi naslov strežnika DNS na 127.0.0.1</0> <0>Zamenjaj cilj simbolične povezave /etc/resolv.conf with /run/systemd/resolve/resolv.conf</0> <0>Zaustavi DNSStubListener (znova naloži storitev systemd-resolved)",
     "autofix_warning_result": "Kot rezultat, bo vse zahteve DNS iz vašega sistema privzeto obdelal AdGuard Home.",
@@ -544,6 +529,7 @@
     "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",
@@ -556,7 +542,7 @@
     "set_static_ip": "Nastavi statičen IP naslov",
     "install_static_ok": "Dobra novica! Statičen IP naslov je že konfiguriran",
     "install_static_error": "AdGuard Home tega omrežnega vmesnika ne more samodejno konfigurirati. Poiščite navodila, kako to storiti ročno.",
-    "install_static_configure": "AdGuard Home je zaznal, da se uporablja dinamični naslov IP <0>{{ip}}</0>. Ali želite, da je nastavljen kot vaš statični naslov?",
+    "install_static_configure": "Zaznali smo, da je uporabljen dinamičen IP naslov — <0>{{ip}}</0>. Ali ga želite uporabiti kot svoj statičen naslov?",
     "confirm_static_ip": "AdGuard Home bo konfiguriral {{ip}}, da bo postal vas statičen IP naslov. Ali želite nadaljevati?",
     "list_updated": "{{count}} posodobljen seznam",
     "list_updated_plural": "{{count}} posodobljenih seznamov",
@@ -594,11 +580,11 @@
     "filter_category_security_desc": "Seznami, ki so specializirani za onemogočanje domen zlonamernih programov, lažnega predstavljanja ali prevar",
     "filter_category_regional_desc": "Seznami, ki so osredotočeni na področne oglase in strežnike za sledenje",
     "filter_category_other_desc": "Drugi seznami za zaviranje",
-    "setup_config_to_enable_dhcp_server": "Nastavite nastavitve, da omogočite strežnik DHCP",
+    "setup_config_to_enable_dhcp_server": "Nastavitve za omogočanje strežnika DHCP",
     "original_response": "Izviren odgovor",
     "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,10 +1,15 @@
 {
     "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",
+    "load_balancing_desc": "Koristi jedan server. AdGuard Home će koristiti najnoviji nasumični algoritam da izabere server tako da će najbrži server biti češće korišćen.",
     "bootstrap_dns": "Bootstrap DNS serveri",
     "bootstrap_dns_desc": "Bootstrap DNS serveri se koriste da reše IP adrese od DoH/DoT razrešivača koje ste odredili kao upstream.",
     "check_dhcp_servers": "Proveri DHCP servere",
+    "save_config": "Sačuvaj konfiguraciju",
     "enabled_dhcp": "DHCP server uključen",
     "disabled_dhcp": "DHCP server isključen",
     "unavailable_dhcp": "DHCP nije dostupan",
@@ -13,10 +18,12 @@
     "dhcp_description": "Ako vaš ruter nema DHCP postavke, možete koristiti AdGuard' ugrađen DHCP server.",
     "dhcp_enable": "Uključi DHCP server",
     "dhcp_disable": "Isključi DHCP server",
+    "dhcp_not_found": "Bezbedno je da uključite ugrađeni DHCP server. Nismo pronašli nijedan aktivan DHCP server na mreži. međutim, ohrabrujemo vas da to ponovo proverite ručno, jer naš automatski test trenutno nije 100% pouzdan.",
     "dhcp_found": "Pronađen je aktivan DHCP server na mreži. Nije bezbedno da uključite ugrađeni DHCP server.",
     "dhcp_leases": "DHCP pozajmljivanja",
     "dhcp_static_leases": "DHCP statička pozajmljivanja",
     "dhcp_leases_not_found": "DHCP pozajmljivanja nisu pronađena",
+    "dhcp_config_saved": "Sačuvaj DHCP konfiguraciju servera",
     "dhcp_ipv4_settings": "DHCP IPv4 postavke",
     "dhcp_ipv6_settings": "DHCP IPv6 postavke",
     "form_error_required": "Obavezno polje",
@@ -41,11 +48,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "Ime hosta",
     "dhcp_table_expires": "Ističe",
+    "dhcp_warning": "Ako svakako želite da uključite DHCP server, uverite se da nema drugih aktivnih DHCP servera u vašoj mreži. U suprotnom, to može pokvariti Internet za povezane uređaje!",
+    "dhcp_error": "Ne možemo da odredimo da li ima drugih DHCP servera na mreži.",
+    "dhcp_static_ip_error": "Kako biste koristili DHCP server, morate podesiti statičku IP adresu. Nismo mogli da odredimo da li je ovo mrežno okruženje podešeno za korišćenje statičke IP adrese. Molimo vas da podesite statičku IP adresu ručno.",
+    "dhcp_dynamic_ip_found": "Vaš sistem koristi dinamičku IP adresu za okruženje <0>{{interfaceName}}</0>. Kako biste koristili DHCP server, morate podesiti statičku IP adresu. Vaša trenutna IP adresa je <0>{{ipAddress}}</0>. Automatski ćemo podesiti ovu IP adresu kao statičku ako pritisnete Uključi DHCP dugme.",
     "dhcp_lease_added": "Statičko iznajmljivanje \"{{key}}\" uspešno dodato",
     "dhcp_lease_deleted": "Statičko iznajmljivanje lease \"{{key}}\" uspešno izbrisano",
     "dhcp_new_static_lease": "Novo statičko iznajmljivanje",
     "dhcp_static_leases_not_found": "Nisu pronađena statička DHCP iznajmljivanja",
     "dhcp_add_static_lease": "Dodaj statičko iznajmljivanje",
+    "dhcp_reset": "Jeste li sigurni da želite da resetujete DHCP konfiguraciju?",
     "country": "Zemlja",
     "city": "Grad",
     "delete_confirm": "Jeste li sigurni da želite da izbrišete \"{{key}}\"?",
@@ -92,7 +104,14 @@
     "top_clients": "Najčešći klijenti",
     "no_clients_found": "Nema pronađenih klijenata",
     "general_statistics": "Opšte statistike",
+    "number_of_dns_query_days": "Broj obrađenih DNS unosa u poslednjih {{count}} dan",
+    "number_of_dns_query_days_plural": "Broj obrađenih DNS unosa u poslednjih {{count}} dana",
+    "number_of_dns_query_24_hours": "Broj obrađenih DNS unosa u poslednja 24 časa",
+    "number_of_dns_query_blocked_24_hours": "Broj DNS zahteva blokiranih od filtera blokatora reklama i blok liste hostova",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahteva blokiranih od AdGuard-ovog podprograma za bezbedno pregledanje",
+    "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih sajtova za odrasle",
     "enforced_save_search": "Nametni sigurno pretraživanje",
+    "number_of_dns_query_to_safe_search": "Broj DNS zahteva ka pretraživačima za koje je nametnuto sigurno pretraživanje",
     "average_processing_time": "Prosečno vreme obrade",
     "average_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",
@@ -102,6 +121,7 @@
     "use_adguard_parental": "Koristi AdGuard-ovu uslugu roditeljske kontrole",
     "use_adguard_parental_hint": "AdGuard Home će proveriti da li domen sadrži sadržaj za odrasle. Koristi se isti privatni prijateljski API kao i kod usluge bezbednog pregledanja.",
     "enforce_safe_search": "Nametni sigurno pretraživanje",
+    "enforce_save_search_hint": "AdGuard Home može nametnuti sigurno pretraživanje u sledećim pretraživačima: Google, Youtube, Bing, DuckDuckGo i Yandex.",
     "no_servers_specified": "Serveri nisu određeni",
     "general_settings": "Opšte postavke",
     "dns_settings": "DNS postavke",
@@ -113,6 +133,7 @@
     "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",
@@ -235,6 +256,7 @@
     "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",
@@ -247,6 +269,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",
@@ -256,6 +279,7 @@
     "install_settings_listen": "Okruženje slušanja",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Vaše AdGuard Home administratorsko web okruženje će biti dostupno na sledećim adresama:",
+    "form_error_port": "Unesite važeću vrednost za port",
     "install_settings_dns": "DNS server",
     "install_settings_dns_desc": "Potrebno je da konfigurišete vaše uređaje ili ruter da koristi DNS server sa sledećim adresama:",
     "install_settings_all_interfaces": "Sva okruženja",
@@ -274,8 +298,10 @@
     "install_devices_router": "Ruter",
     "install_devices_router_desc": "Ovo postavljanje će automatski pokriti sve uređaje koji su povezani na vaš kućni ruter pa nećete morati da konfigurišete svaki uređaj posebno.",
     "install_devices_address": "AdGuard Home DNS server sluša na sledećim adresama",
+    "install_devices_router_list_1": "Otvorite podešavanja vašeg rutera. Obično im možete pristupiti iz vašeg preglednika preko URL (kao http://192.168.0.1/ ili http://192.168.1.1/). Možda će vam biti zatraženo da unesete lozinku. Ako je ne znate ili je se ne sećate, najčešće je možete resetovati pritiskom na dugme na samom ruteru. Neki ruteri zahtevaju određenu aplikaciju, koja bi u tom slučaju već trebalo da bude instalirana na vašem računaru ili telefonu.",
     "install_devices_router_list_2": "Pronađite DHCP ili DNS postavke. Potražite DNS slova pored polja koje dozvoljava dve ili tri skupine brojeva, a svaka može da sadrži četiri grupe od jedne do tri cifre.",
     "install_devices_router_list_3": "Tamo unesite adrese AdGuard home servera.",
+    "install_devices_router_list_4": "Na nekim ruterima ne možete postaviti prilagođeni DNS server.",
     "install_devices_windows_list_1": "Otvorite kontrolnu tablu iz startnog menija ili kroz Windows pretragu.",
     "install_devices_windows_list_2": "Otvorite kategoriju mreža i internet a onda otiđite u centar za mrežu i deljenje.",
     "install_devices_windows_list_3": "Na levoj strani ekrana pronađite Promena postavke adaptera i kliknite tu.",
@@ -301,8 +327,10 @@
     "install_saved": "Uspešno sačuvano",
     "encryption_title": "Šifrovanje",
     "encryption_desc": "Šifrovanje (HTTPS/TLS) podrška za oba DNS i administratorsko okruženje",
+    "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",
@@ -330,10 +358,13 @@
     "encryption_reset": "Jeste li sigurni da želite dda resetujete postavke šifrovanja?",
     "topline_expiring_certificate": "Vaš SSL sertifikat uskoro ističe. Ažurirajte <0>postavke šifrovanja</0>.",
     "topline_expired_certificate": "Vaš SSL sertifikat je istekao. Ažurirajte <0>postavke šifrovanja</0>.",
+    "form_error_port_range": "Unesite vrednost porta u opsegu od 80-65535",
     "form_error_port_unsafe": "Ovo nije siguran port",
+    "form_error_equal": "Ne bi trebalo da bude jednako",
     "form_error_password": "Lozinke se ne podudaraju",
     "reset_settings": "Vrati postavke na podrazumevano",
     "update_announcement": "AdGuard Home {{version}} je sada dostupan! <0>Kliknite ovde</0> za više informacija.",
+    "setup_guide": "Uputstvo za podešavanje",
     "dns_addresses": "DNS adrese",
     "dns_start": "DNS server se pokreće",
     "dns_status_error": "Greška prilikom pribavljanja stanja DNS servera",
@@ -355,6 +386,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",
@@ -377,6 +409,7 @@
     "access_disallowed_title": "Zabranjeni klijenti",
     "access_disallowed_desc": "Lista CIDR ili IP adresa.. Ako je podešeno, AdGuard Home će odbijati zahteve od ovih IP adresa.",
     "access_blocked_title": "Blokirani domeni",
+    "access_blocked_desc": "Nemojte ovo mešati sa filterima. AdGuard Home će odbijati DNS unose ka ovim domenima.",
     "access_settings_saved": "Postavke pristupa su uspešno sačuvane",
     "updates_checked": "Ažuriranja su uspešno proverena",
     "updates_version_equal": "AdGuard Home je ažuriran na najnoviju verziju",
@@ -478,6 +511,7 @@
     "disable_ipv6": "Isključi IPv6",
     "disable_ipv6_desc": "Ako je ovo uključeno, svi DNS unosi za IPv6 adrese (type AAAA) će biti odbačeni.",
     "fastest_addr": "Najbrža IP adresa",
+    "fastest_addr_desc": "Pretražuje sve DNS servere i vraća najbržu IP adresu među svim odgovorima. Ovo će usporiti DNS pretragu jer moramo da čekamo na odgovore od svih DNS servera, ali će poboljšati sveukupnu povezanost.",
     "autofix_warning_text": "Ako kliknete \"Popravi\", AdGuardHome će konfigurisati vaš sistem da koristi AdGuardHome DNS server.",
     "autofix_warning_list": "To će izvršiti sledeće zadatke: <0>Deaktiviranje system DNSStubListener</0> <0>Set DNS server address to 127.0.0.1</0> <0>Replace symbolic link target of /etc/resolv.conf to /run/systemd/resolve/resolv.conf</0> <0>Stop DNSStubListener (reload systemd-resolved service)</0>",
     "autofix_warning_result": "Kao rezultat, svi DNS zahtevi sa vašeg sistema će biti obrađeni od AdGuardHome.",
@@ -495,6 +529,7 @@
     "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",
@@ -507,6 +542,7 @@
     "set_static_ip": "Postavite statičku IP adresu",
     "install_static_ok": "Dobre vesti! Statička IP adresa je već konfigurisana",
     "install_static_error": "AdGuard Home se ne može automatski konfigurisati za ovo mrežno okruženje. Pogledajte uputstvo kako da to ručno uradite.",
+    "install_static_configure": "Otkrili smo da se koristi dinamička IP adresa — <0>{{ip}}</0>. Želite li da je koristite kao vašu statičku adresu?",
     "confirm_static_ip": "AdGuard Home će konfigurisati {{ip}} da bude vaša statička IP adresa. Želite li da nastavite?",
     "list_updated": "{{count}} lista ažurirana",
     "list_updated_plural": "{{count}} lista ažurirano",
@@ -544,10 +580,11 @@
     "filter_category_security_desc": "Lista specijalizovana za blokiranje štetnog softvera, štetnih i fišing domena",
     "filter_category_regional_desc": "Lista koja se usredsređuje na regionalne reklame i servere praćenja",
     "filter_category_other_desc": "Ostale liste blokiranja",
+    "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"
-}
+}

client/src/__locales/sv.json

@@ -1,18 +1,23 @@
 {
     "client_settings": "Klientinställningar",
+    "example_upstream_reserved": "du kan specificera DNS-uppström <0>för en specifik domän</0>",
+    "upstream_parallel": "Använd parallella förfrågningar för att snabba upp dessa på uppströmsservrar.",
     "bootstrap_dns": "Bootstrap-DNS-servrar",
     "bootstrap_dns_desc": "Bootstrap-DNS-servrar används för att slå upp DoH/DoT-resolvrarnas IP-adresser som du specificerat som uppström.",
     "check_dhcp_servers": "Letar efter DHCP-servrar",
+    "save_config": "Spara inställningar",
     "enabled_dhcp": "DHCP-server aktiverad",
     "disabled_dhcp": "Dhcp-server avaktiverad",
     "dhcp_title": "DHCP-server (experimentell)",
     "dhcp_description": "Om din router inte har inställningar för DHCP kan du använda AdGuards inbyggda server.",
     "dhcp_enable": "Aktivera DHCP.-server",
     "dhcp_disable": "Avaktivera DHCP-server",
+    "dhcp_not_found": "Ingen aktiv DHCP-server hittades i nätverkat.",
     "dhcp_found": "Några aktiva DHCP-servar upptäcktes. Det är inte säkert att aktivera inbyggda DHCP-servrar.",
     "dhcp_leases": "DHCP-lease",
     "dhcp_static_leases": "Statiska DHCP-leases",
     "dhcp_leases_not_found": "Ingen DHCP-lease hittad",
+    "dhcp_config_saved": "Sparade inställningar för DHCP-servern",
     "form_error_required": "Obligatoriskt fält",
     "form_error_ip_format": "Ogiltigt IPv4-format",
     "form_error_mac_format": "Ogiltigt MAC-format",
@@ -29,6 +34,10 @@
     "dhcp_ip_addresses": "IP-adresser",
     "dhcp_table_hostname": "Värdnamn",
     "dhcp_table_expires": "Utgår",
+    "dhcp_warning": "Om du vill använda den inbyggda DHCP-servern ändå, se till att det inte finns några andra aktiva DHCP-servrar. Annars kan den störa internetanslutningen för anslutna enheter!",
+    "dhcp_error": "Vi kunde inte avgöra om det finns en till DHCP-server på nätverket.",
+    "dhcp_static_ip_error": "För att kunna använda en DHCP-server måste det finnas en statisk IP-adress. Vi kunde inte avgöra om nätverksgränssnittet är konfigurerat med en statisk IP-adress. Ställ in en statistik IP-adress manuellt.",
+    "dhcp_dynamic_ip_found": "Din enhet använder en dynamisk IP-adress för gränssnittet <0>{{interfaceName}}</0>. För att kunna använda DHCP-servern behövs en statisk IP-adress. Din nuvarande IP-adress är <0>{{ipAddress}}</0>. Vi kommer att göra denna IP-adress statisk automatiskt om du trycker på knappen \"Aktivera DHCP\".",
     "dhcp_lease_added": "Statisk lease \"{{key}}\" har lagts till",
     "dhcp_lease_deleted": "Statisk lease \"{{key}}\" har raderats",
     "dhcp_new_static_lease": "Ny statisk lease",
@@ -58,28 +67,36 @@
     "refresh_statics": "Uppdatera statistik",
     "dns_query": "DNS-förfrågningar",
     "blocked_by": "<0>Blockerat av filter</0>",
-    "stats_malware_phishing": "Blockerad skadekod/phishing",
+    "stats_malware_phishing": "Blockerad skadekod/phising",
     "stats_adult": "Blockerade vuxensajter",
     "stats_query_domain": "Mest eftersökta domäner",
-    "for_last_24_hours": "under de senaste 24 timmarna",
+    "for_last_24_hours": "under de senaste 24 timamrna",
     "for_last_days": "för den senaste {{count}} dagen",
     "for_last_days_plural": "för de senaste {{count}} dagarna",
     "no_domains_found": "Inga domäner hittade",
     "requests_count": "Förfrågningsantal",
     "top_blocked_domains": "Flest blockerade domäner",
     "top_clients": "Toppklienter",
-    "no_clients_found": "Inga klienter hittade",
+    "no_clients_found": "Inga hitatde klienter",
     "general_statistics": "Allmän statistik",
+    "number_of_dns_query_days": "Ett antal DNS-förfrågningar utfördes under den senaste {{count}} dagen",
+    "number_of_dns_query_days_plural": "Ett antal DNS-förfrågningar utfördes under de senaste {{count}} dagarna",
+    "number_of_dns_query_24_hours": "Ett antal DNS-förfrågningar utfördes under de senaste 244 timamrna",
+    "number_of_dns_query_blocked_24_hours": "Ett antal DNS-förfrågningar blockerades av annonsfilter och värdens bloceringsklistor",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Ett antal DNS-förfrågningar blockerades av AdGuards modul för surfsäkerhet",
+    "number_of_dns_query_blocked_24_hours_adult": "Ett anta vuxensajter blockerades",
     "enforced_save_search": "Aktivering av Säker surf",
+    "number_of_dns_query_to_safe_search": "Ett antal DNS-förfrågningar genomfördes på sökmotorer med Säker surf aktiverat",
     "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>.",
-    "use_adguard_browsing_sec": "Använd AdGuards webbservice för surfsäkerhet",
+    "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",
+    "use_adguard_parental": "Använda AdGuards webbservice för färäldrakontroll",
     "use_adguard_parental_hint": "AdGuard Home kommer att kontrollera domäner för innehåll av vuxenmaterial . Samma integritetsvänliga metod för  API-lookup som tillämpas i webbservicens surfsäkerhet används.",
     "enforce_safe_search": "Tillämpa Säker surf",
+    "enforce_save_search_hint": "AdGuard Home kan framtvinga säker surf i följande sökmoterer: Google, Youtube, Bing, och Yandex.",
     "no_servers_specified": "Inga servrar angivna",
     "general_settings": "Allmänna inställningar",
     "dns_settings": "DNS-inställningar",
@@ -160,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.",
@@ -167,6 +185,7 @@
     "install_settings_listen": "Övervakningsgränssnitt",
     "install_settings_port": "Port",
     "install_settings_interface_link": "Din administratörssida för AdGuard Home finns på följande adresser:",
+    "form_error_port": "Skriv in ett giltigt portnummer",
     "install_settings_dns": "DNS-server",
     "install_settings_dns_desc": "Du behöver ställa in dina enheter eller din router för att använda DNS-server på följande adresser.",
     "install_settings_all_interfaces": "Alla gränssnitt",
@@ -179,12 +198,13 @@
     "install_auth_password_enter": "Skriv in lösenord",
     "install_step": "Steg",
     "install_devices_title": "Ställ in dina enheter",
-    "install_devices_desc": "För att kunna använda AdGuard Home måste du ställa in dina enheter för att utnyttja den.",
+    "install_devices_desc": "För att kunna använda AdGuard Home måste du sälla in dina enheter för att utnyttja den.",
     "install_submit_title": "Grattis!",
     "install_submit_desc": "Inställningsproceduren är klar och du kan börja använda AdGuard Home.",
     "install_devices_router": "Router",
     "install_devices_router_desc": "Den här anpassningen kommer att automatiskt täcka in alla de enheter som är anslutna till din hemmarouter och du behöver därför inte konfigurera var och en individuellt.",
     "install_devices_address": "AdGuard Home DNS-server täcker följande adresser",
+    "install_devices_router_list_1": "Öppna routern Inställningar. Vanligtvis får man åtkomst via en URL (http://192.168.0.1 eller 192.168.1.1)- Du kommer att bli ombes att ange ett lösenord. Lösenordet kan stå angivet på routerns bak- eller undersida. Om lösenordet ändrats och du inte känner till det kan du återställa med Reset-knappen. En del routrar kräver en särskild applikation som skall finnas på antingen din dator eller i din mobil.",
     "install_devices_router_list_2": "Leta upp DHCP/DNS-inställningarna. Titta efter DNS-tecken intill ett fält med två eller tre uppsättningar siffror, var och en uppdelade i grupper om fyra med en eller tre siffror.",
     "install_devices_router_list_3": "Ange serveradressen till ditt AdGuard Home.",
     "install_devices_windows_list_1": "Öppna Kontrollpanelen via Start eller Windows Sök.",
@@ -212,8 +232,10 @@
     "install_saved": "Sparat utan fel",
     "encryption_title": "Kryptering",
     "encryption_desc": "Krypteringsstöd (HTTPS/TLS) för både DNS och adminwebbgränssnitt.",
+    "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",
@@ -239,10 +261,13 @@
     "encryption_reset": "Är du säker på att du vill återställa krypteringsinställningarna?",
     "topline_expiring_certificate": "Ditt SSL-certifikat håller på att gå ut. <0>Krypteringsinställningar</0>.",
     "topline_expired_certificate": "Ditt SSL-certifikat har gått ut. Uppdatera <0>Krypteringsinställningar</0>-",
+    "form_error_port_range": "Ange ett portnummer inom värdena 80-65535",
     "form_error_port_unsafe": "Det här är en osäker port",
+    "form_error_equal": "Skall inte vara lika",
     "form_error_password": "Lösenorden överensstämmer inte",
     "reset_settings": "Återställ inställningar",
     "update_announcement": "AdGuard Home {{version}} är nu tillgänglig! <0>Klicka här</0> för mer information.",
+    "setup_guide": "Inställningsguide",
     "dns_addresses": "DNS-adresser",
     "down": "Ner",
     "fix": "Fixa",
@@ -262,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",
@@ -280,6 +306,7 @@
     "access_disallowed_title": "Otillåtna klienter",
     "access_disallowed_desc": "En lista över CIDR eller IP-adresser. Om konfigurerad kommer AdGuard Home inte acceptera förfrågningar från dessa IP-adresser.",
     "access_blocked_title": "Blockerade domäner",
+    "access_blocked_desc": "Ej att blandas ihop med filter. AdGuard Home kommer inte accepter DNS-förfrågningar innehållande dessa domäner.",
     "access_settings_saved": "Åtkomstinställningar sparade",
     "updates_checked": "Sökning efter uppdateringar genomförd",
     "updates_version_equal": "AdGuard Home är uppdaterat",
@@ -313,7 +340,7 @@
     "interval_hours_plural": "{{count}} timmar",
     "filters_configuration": "Filterinställningar",
     "filters_enable": "Aktivera filter",
-    "filters_interval": "Filteruppdateringsintervall",
+    "filters_interval": "Filterppdateringsintervall",
     "disabled": "Avaktiverad",
     "username_label": "Användarnamn",
     "username_placeholder": "Skriv in användarnamn",
@@ -332,4 +359,4 @@
     "show_blocked_responses": "Blockerade",
     "blocked_adult_websites": "Blockerade vuxensajter",
     "blocked_threats": "Blockerade hot"
-}
+}

client/src/__locales/th.json

@@ -1,18 +1,23 @@
 {
     "client_settings": "การตั้งค่าไคลเอนต์",
+    "example_upstream_reserved": "คุณสามารถระบุ DNS อัปสตรีม <0>สำหรับโดเมนเฉพาะ</0>",
+    "upstream_parallel": "ใช้การสืบค้นแบบขนานเพื่อเพิ่มความเร็วในการแก้ไขโดยการสอบถามเซิร์ฟเวอร์ upstream ทั้งหมดพร้อมกัน",
     "bootstrap_dns": "Bootstrap เซิร์ฟเวอร์ DNS",
     "bootstrap_dns_desc": "เซิร์ฟเวอร์ Bootstrap DNS ใช้เพื่อแก้ไขที่อยู่ IP ของตัวแก้ไข DoH / DoT ที่คุณระบุว่าเป็น upstreams",
     "check_dhcp_servers": "ตรวจสอบ DHCP servers",
+    "save_config": "บันทึกการตั้งค่า",
     "enabled_dhcp": "เปิดการใช้งาน DHCP server แล้ว",
     "disabled_dhcp": "ปิดการใช้งาน DHCP server แล้ว",
     "dhcp_title": "DHCP server (ยังไม่สมบูรณ์)",
     "dhcp_description": "ถ้าหากเราเตอร์ของคุณไม่รองรับการตั้งค่า DHCP คุณสามารถใช้ ADGuard's ทำ DHCP server ได้",
     "dhcp_enable": "เปิด DHCP server",
     "dhcp_disable": "ปิด DHCP server",
+    "dhcp_not_found": "มีความปลอดภัยในการเปิดใช้งานเซิร์ฟเวอร์ DHCP ในตัว - เราไม่พบเซิร์ฟเวอร์ DHCP ที่ใช้งานอยู่ในเครือข่าย อย่างไรก็ตามเราขอแนะนำให้คุณตรวจสอบด้วยตนเองอีกครั้งเนื่องจากการทดสอบอัตโนมัติของเราไม่ได้รับประกัน 100%",
     "dhcp_found": "พบเซิร์ฟเวอร์ DHCP ที่ใช้งานอยู่ในเครือข่าย ไม่ปลอดภัยที่จะเปิดใช้งานเซิร์ฟเวอร์ DHCP ในตัว",
     "dhcp_leases": "สัญญาเช่า DHCP",
     "dhcp_static_leases": "DHCP แบบกำหนด",
     "dhcp_leases_not_found": "ไม่พบสัญญาเช่า DHCP",
+    "dhcp_config_saved": "บันทึกการกำหนดค่า DHCP สำเร็จแล้ว",
     "form_error_required": "ช่องที่ต้องกรอก",
     "form_error_ip4_format": "รูปแบบ IPv4 ไม่ถูกต้อง",
     "form_error_ip6_format": "รูปแบบ IPv6 ไม่ถูกต้อง",
@@ -33,11 +38,16 @@
     "dhcp_ip_addresses": "ที่อยู่ IP",
     "dhcp_table_hostname": "ชื่อโฮสต์",
     "dhcp_table_expires": "วันที่หมดอายุ",
+    "dhcp_warning": "หากคุณต้องการเปิดใช้งานเซิร์ฟเวอร์ DHCP ตรวจสอบให้แน่ใจว่าไม่มีเซิร์ฟเวอร์ DHCP ที่ใช้งานอยู่ในเครือข่ายของคุณ มิฉะนั้นจะทำให้อินเทอร์เน็ตสำหรับอุปกรณ์ที่เชื่อมต่อมีปัญหาได้!",
+    "dhcp_error": "เราไม่สามารถระบุได้ว่ามีเซิร์ฟเวอร์ DHCP อื่นในเครือข่ายหรือไม่",
+    "dhcp_static_ip_error": "ในการใช้เซิร์ฟเวอร์ DHCP จะต้องตั้งค่าที่อยู่ IP แบบคงที่ เราไม่สามารถระบุได้ว่ามีการกำหนดค่าอินเทอร์เฟซเครือข่ายนี้โดยใช้ที่อยู่ IP แบบคงที่หรือไม่ โปรดตั้งค่าที่อยู่ IP แบบคงที่ด้วยตนเอง",
+    "dhcp_dynamic_ip_found": "ระบบของคุณใช้การกำหนดค่าที่อยู่ IP แบบไดนามิกสำหรับอินเทอร์เฟซ <0>{{interfaceName}}</0> ในการใช้เซิร์ฟเวอร์ DHCP จะต้องตั้งค่าที่อยู่ IP แบบคงที่ ที่อยู่ IP ปัจจุบันของคุณคือ <0>{{ipAddress}}</0> เราจะตั้งค่าที่อยู่ IP นี้เป็นแบบคงที่โดยอัตโนมัติหากคุณกดปุ่มเปิดใช้งาน DHCP",
     "dhcp_lease_added": "เพิ่มสัญญาเช่าคงที่ \"{{key}}\" สำเร็จแล้ว",
     "dhcp_lease_deleted": "ลบสัญญาเช่าคงที่ \"{{key}}\" สำเร็จแล้ว",
     "dhcp_new_static_lease": "เช่าใหม่คงที่",
     "dhcp_static_leases_not_found": "ไม่พบสัญญาเช่า DHCP แบบคงที่",
     "dhcp_add_static_lease": "เพิ่มสัญญาเช่าคงที่",
+    "dhcp_reset": "คุณแน่ใจหรือว่าต้องการรีเซ็ตการกำหนดค่า DHCP?",
     "delete_confirm": "คุณแน่ใจหรือว่าต้องการลบ \"{{key}}\"?",
     "form_enter_hostname": "ป้อนชื่อโฮสต์",
     "error_details": "รายละเอียดข้อผิดพลาด",
@@ -74,7 +84,14 @@
     "top_clients": "ลูกข่ายที่ใช้งานบ่อยสุด",
     "no_clients_found": "ไม่มีเครื่องลูกข่าย",
     "general_statistics": "สถิติทั่วไป",
+    "number_of_dns_query_days": "จำนวนการสืบค้น DNS ที่ประมวลผลสำหรับ {{count}} วันล่าสุด",
+    "number_of_dns_query_days_plural": "จำนวนการสืบค้น DNS ที่ดำเนินการในช่วง {{count}} วันล่าสุด",
+    "number_of_dns_query_24_hours": "มีการสืบค้น DNS จำนวนมากใน 24 ชั่วโมงที่ผ่านมา",
+    "number_of_dns_query_blocked_24_hours": "จำนวนคำขอ DNS ที่ถูกปิดกั้นโดยตัวกรองปิดกั้นและโฮสต์รายการปิดกั้น",
+    "number_of_dns_query_blocked_24_hours_by_sec": "คำขอ DNS จำนวนหนึ่งถูกปิดกั้นโดยโมดูลความปลอดภัยการเรียกดู AdGuard",
+    "number_of_dns_query_blocked_24_hours_adult": "มีการปิดกั้นเว็บไซต์สำหรับผู้ใหญ่จำนวนหนึ่ง",
     "enforced_save_search": "บังคับใช้การค้นหาที่ปลอดภัย",
+    "number_of_dns_query_to_safe_search": "จำนวนคำขอ DNS ไปยังเครื่องมือค้นหาที่บังคับใช้การค้นหาปลอดภัย",
     "average_processing_time": "เวลาประมวลผลโดยเฉลี่ย",
     "average_processing_time_hint": "เวลาเฉลี่ยเป็นมิลลิวินาทีในการประมวลผลคำขอ DNS",
     "block_domain_use_filters_and_hosts": "ปิดกั้นโดเมนโดยใช้ตัวกรองและไฟล์โฮสต์",
@@ -84,6 +101,7 @@
     "use_adguard_parental": "ใช้บริการเว็บการควบคุมโดยผู้ปกครองของ AdGuard",
     "use_adguard_parental_hint": "AdGuard Home จะตรวจสอบว่าโดเมนมีเนื้อหาสำหรับผู้ใหญ่หรือไม่ มันใช้ API ความเป็นส่วนตัวเช่นเดียวกับบริการเว็บการรักษาความปลอดภัยการท่องเว็บ",
     "enforce_safe_search": "บังคับใช้การค้นหาที่ปลอดภัย",
+    "enforce_save_search_hint": "AdGuard Home สามารถบังคับใช้การค้นหาที่ปลอดภัยในเครื่องมือค้นหาต่อไปนี้: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay",
     "no_servers_specified": "ไม่ได้ระบุเซิร์ฟเวอร์",
     "general_settings": "การตั้งค่าทั่วไป",
     "dns_settings": "การตั้งค่า DNS",
@@ -182,6 +200,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 ปิดกั้นโฆษณาและติดตามทั่วทั้งเครือข่าย วัตถุประสงค์คือเพื่อให้คุณควบคุมเครือข่ายทั้งหมดและอุปกรณ์ทั้งหมดของคุณและไม่จำเป็นต้องใช้โปรแกรมฝั่งไคลเอ็นต์",
@@ -189,6 +208,7 @@
     "install_settings_listen": "รูปแบบการดักจับ",
     "install_settings_port": "พอร์ต",
     "install_settings_interface_link": "เว็บอินเตอร์เฟสผู้ดูแลระบบ AdGuard Home ของคุณจะพร้อมใช้งานตามที่อยู่ต่อไปนี้:",
+    "form_error_port": "ป้อนค่าพอร์ตที่ถูกต้อง",
     "install_settings_dns": "เซิรฟ์เวอร์ DNS",
     "install_settings_dns_desc": "คุณจะต้องกำหนดค่าอุปกรณ์หรือเราเตอร์ของคุณเพื่อใช้เซิร์ฟเวอร์ DNS ตามที่อยู่ต่อไปนี้:",
     "install_settings_all_interfaces": "อินเทอร์เฟซทั้งหมด",
@@ -207,6 +227,7 @@
     "install_devices_router": "เราเตอร์",
     "install_devices_router_desc": "การตั้งค่านี้จะครอบคลุมอุปกรณ์ทั้งหมดที่เชื่อมต่อกับเราเตอร์ที่บ้านของคุณโดยอัตโนมัติและคุณไม่จำเป็นต้องกำหนดค่าแต่ละอุปกรณ์ด้วยตนเอง",
     "install_devices_address": "เซิร์ฟเวอร์ DNS ของ AdGuard Home กำลังรับฟังตามที่อยู่ต่อไปนี้",
+    "install_devices_router_list_1": "เปิดการตั้งค่าสำหรับเราเตอร์ของคุณ โดยปกติแล้วคุณสามารถเข้าถึงได้จากเบราว์เซอร์ของคุณผ่าน URL (เช่น http://192.168.0.1/ หรือ http://192.168.1.1/) คุณอาจถูกขอให้ป้อนรหัสผ่าน หากคุณจำไม่ได้คุณสามารถรีเซ็ตรหัสผ่านได้บ่อยครั้งโดยกดปุ่มบนเราเตอร์เอง เราเตอร์บางตัวต้องการแอปพลิเคชั่นเฉพาะซึ่งในกรณีนี้ควรติดตั้งไว้ในคอมพิวเตอร์/โทรศัพท์ของคุณแล้ว",
     "install_devices_router_list_2": "ค้นหาการตั้งค่า DHCP/DNS ค้นหาตัวอักษร DNS ที่อยู่ถัดจากช่องที่อนุญาตให้มีตัวเลขสองหรือสามชุดโดยแต่ละกลุ่มแบ่งออกเป็นสี่กลุ่มหนึ่งถึงสามหลัก",
     "install_devices_router_list_3": "ป้อนที่อยู่เซิร์ฟเวอร์ AdGuard Home ของคุณที่นั่น",
     "install_devices_windows_list_1": "เปิด  Control Panel โดยใช้ Start menu หรือ Windows search",
@@ -234,8 +255,10 @@
     "install_saved": "บันทึกเรียบร้อยแล้ว",
     "encryption_title": "การเข้ารหัส",
     "encryption_desc": "การดข้ารหัส (HTTPS/TLS) รองรับทั้ง DNS และหน้าเว็บแอดมิน",
+    "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",
@@ -261,10 +284,13 @@
     "encryption_reset": "คุณแน่ใจนะว่าจะล้างค่าการเข้ารหัส?",
     "topline_expiring_certificate": "ใบรับรอง SSL ของคุณกำลังจะหมดอายุ กรุณาอัปเดท <0>การตั้งค่าเข้ารหัส</0>.",
     "topline_expired_certificate": "ใบรับรอง SSL ของคุณหมดอายุแล้ว กรุณาอัปเดท <0>การตั้งค่าเข้ารหัส</0>.",
+    "form_error_port_range": "ป้อนค่าพอร์ตในช่วง 80-65535",
     "form_error_port_unsafe": "เป็นพอร์ทที่ไม่ปลอดภัย",
+    "form_error_equal": "ไม่ควรตรงกัน",
     "form_error_password": "รหัสผ่านไม่ตรงกัน",
     "reset_settings": "รีเซ็ตการตั้งค่า",
     "update_announcement": "AdGuard Home {{version}} พร้อมแล้ว <0>กดตรงนี้</0> สำหรับข้อมูลเพิ่มเติม",
+    "setup_guide": "วิธีการตั้งค่า",
     "dns_addresses": "ที่อยู่ DNS",
     "dns_start": "เซิร์ฟเวอร์ DNS เริ่มทำงาน",
     "dns_status_error": "เกิดข้อผิดพลาดในการตรวจสอบสถานะเซิร์ฟเวอร์ DNS",
@@ -286,6 +312,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": "ป้อนตัวระบุ",
@@ -384,4 +411,4 @@
     "check_title": "ตรวจสอบการกรอง",
     "check_desc": "ตรวจสอบว่าชื่อโฮสต์ถูกกรอง",
     "form_enter_host": "ป้อนชื่อโฮสต์"
-}
+}

client/src/__locales/tr.json

@@ -2,43 +2,34 @@
     "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ümlemeyi hızlandırmak için paralel sorgular kullanın.",
+    "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 üst sunucusunu sorgulayın. AdGuard Home, en hızlı sunucunun daha sık kullanılması için sunucuyu seçmek için ağırlıklı rastgele algoritmayı kullanacaktır.",
     "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.",
-    "local_ptr_title": "Özel DNS sunucuları",
+    "check_dhcp_servers": "DHCP sunucularını yokla",
-    "local_ptr_desc": "AdGuard Home'un yerel olarak sunulan kaynaklar için sorgular için kullanacağı DNS sunucuları. Örneğin, bu sunucu özel IP adreslerine sahip istemciler için istemcilerin ana bilgisayar adlarını çözümlemek için kullanılacak. Ayarlanmazsa, AdGuard Home otomatik olarak varsayılan DNS çözümleyicinizi kullanır.",
+    "save_config": "Ayarları kaydet",
-    "local_ptr_placeholder": "Her satıra bir sunucu adresi girin",
-    "resolve_clients_title": "İstemcilerin IP adreslerinin ters çözümlenmesini etkinleştir",
-    "resolve_clients_desc": "Etkinleştirilirse, AdGuard Home ilgili çözümleyicilere (yerel istemciler için özel DNS sunucuları, genel IP adreslerine sahip istemciler için üst sunucusu) PTR sorguları göndererek istemcilerin IP adreslerini ana bilgisayar adlarına ters olarak çözümlemeye çalışır.",
-    "check_dhcp_servers": "DHCP sunucularını denetle",
-    "save_config": "Yapılandırmayı 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, çünkü AdGuard Home ağ üzerinde herhangi bir etkin DHCP sunucusu bulmamıştır. Ancak, otomatik deneme şu anda %100 garanti sağlamadığından, bunu elle yeniden kontrol etmelisiniz.",
+    "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.",
     "dhcp_found": "Ağ üzerinde bazı aktif DHCP sunucuları bulundu. Yerleşik DHCP sunucusunu aktif etmek sağlıklı olmayacaktır.",
     "dhcp_leases": "DHCP kiralamaları",
     "dhcp_static_leases": "Sabit DHCP kiralamaları",
     "dhcp_leases_not_found": "DHCP kiralaması bulunamadı",
-    "dhcp_config_saved": "DHCP yapılandırması başarıyla 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_ip4_format": "Geçersiz IPv4 formatı",
-    "form_error_ip6_format": "Geçersiz IPv6 biçimi",
+    "form_error_ip6_format": "Geçersiz IPv6 formatı",
-    "form_error_ip_format": "Geçersiz IP biçimi",
+    "form_error_ip_format": "Geçersiz IPv4 formatı",
     "form_error_mac_format": "Geçersiz MAC biçimi",
-    "form_error_client_id_format": "Geçersiz istemci kimliği biçimi",
+    "form_error_client_id_format": "Geçersiz müşteri kimliği formatı",
-    "form_error_server_name": "Geçersiz sunucu adı",
-    "form_error_subnet": "\"{{cidr}}\" alt ağı, \"{{ip}}\" IP adresini içermiyor",
     "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ı",
@@ -52,13 +43,13 @@
     "dhcp_interface_select": "DHCP arayüzünü seç",
     "dhcp_hardware_address": "Donanım adresi",
     "dhcp_ip_addresses": "IP adresleri",
-    "ip": "IP",
+    "ip": "IP Adresi",
-    "dhcp_table_hostname": "Ana bilgisayar Adı",
+    "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 aktif DHCP sunucusu olmadığından emin olun çünkü bu, ağdaki cihazların İnternet bağlantısını kesebilir!",
+    "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": "AdGuard Home, ağda başka bir etkin DHCP sunucusu olup olmadığını belirleyemedi.",
+    "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. AdGuard Home, bu ağ arayüzünün statik bir IP adresi kullanılarak yapılandırılıp yapılandırılmadığını belirleyemedi. Lütfen elle statik bir IP adresi ayarlayın.",
+    "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ı. Geçerli IP adresiniz <0>{{ipAddress}}</0>. \"DHCP sunucusunu etkinleştir\" düğmesine basarsanız, AdGuard Home bu IP adresini otomatikman statik olarak ayarlayacak.",
+    "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.",
     "dhcp_lease_added": "Sabit kiralama \"{{key}}\" başarıyla eklendi",
     "dhcp_lease_deleted": "Sabit kiralama \"{{key}}\" başarıyla silindi",
     "dhcp_new_static_lease": "Yeni sabit kiralama",
@@ -68,10 +59,8 @@
     "country": "Ülke",
     "city": "Şehir",
     "delete_confirm": "\"{{key}}\" silmek istediğinizden emin misiniz?",
-    "form_enter_hostname": "Ana bilgisayar adı girin",
+    "form_enter_hostname": "Cihaz ismi girin",
     "error_details": "Hata detayları",
-    "response_details": "Yanıt ayrıntıları",
-    "request_details": "İstek ayrıntıları",
     "client_details": "İstemci detayları",
     "details": "Detaylar",
     "back": "Geri",
@@ -80,7 +69,6 @@
     "filters": "Filtreler",
     "filter": "Filtre",
     "query_log": "Sorgu Günlüğü",
-    "compact": "Kompakt",
     "nothing_found": "Hiçbir şey bulunamadı",
     "faq": "SSS",
     "version": "Sürüm",
@@ -88,8 +76,8 @@
     "protocol": "Protokol",
     "on": "AÇIK",
     "off": "KAPALI",
-    "copyright": "Telif hakkı",
+    "copyright": "Tüm hakları saklıdır",
-    "homepage": "Ana sayfa",
+    "homepage": "Anasayfa",
     "report_an_issue": "Bir sorun bildir",
     "privacy_policy": "Gizlilik politikası",
     "enable_protection": "Korumayı etkinleştir",
@@ -114,28 +102,28 @@
     "number_of_dns_query_days": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
     "number_of_dns_query_days_plural": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
     "number_of_dns_query_24_hours": "Son 24 saat içinde işlenen DNS sorgularının sayısı",
-    "number_of_dns_query_blocked_24_hours": "Adblock filtreleri ve ana bilgisayar engelleme listeleri tarafından engellenen DNS isteklerinin sayısı",
+    "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve ana bilgisayar engelleme listeleri tarafından engellenen DNS isteklerinin sayısı",
     "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard gezinti koruması modülü tarafından engellenmiş DNS isteklerinin sayısı",
-    "number_of_dns_query_blocked_24_hours_adult": "Engellenen yetişkin sitelerinin sayısı",
+    "number_of_dns_query_blocked_24_hours_adult": "Engellenmiş yetişkin içerikli web sitelerinin sayısı",
     "enforced_save_search": "Zorunlu kılınmış güvenli arama",
     "number_of_dns_query_to_safe_search": "Güvenli Aramanın zorunlu kıldığı arama motorlarına gönderilen DNS isteklerinin sayısı",
     "average_processing_time": "Ortalama işlem süresi",
     "average_processing_time_hint": "Bir DNS isteğinin mili saniye cinsinden ortalama işlem süresi",
-    "block_domain_use_filters_and_hosts": "Filtre ve ana bilgisayar listelerini kullanarak alan adlarını engelle",
+    "block_domain_use_filters_and_hosts": "Filtreleri ve hosts listelerini kullanarak alan adlarını engelle",
     "filters_block_toggle_hint": "<a>Filtreler</a> sayfasından engelleme kurallarını ayarlayabilirsiniz.",
     "use_adguard_browsing_sec": "AdGuard gezinti koruması web hizmetini kullan",
     "use_adguard_browsing_sec_hint": "AdGuard Home, alan adının gezinti koruması web hizmetinde kara listede olup olmadığını kontrol edecek. Kontrol işlemi gizlilik dostu API kullanılarak yapılacak: yalnızca alan adının kısa bir ön eki SHA256 ile şifrelenip sunucuya gönderilecek.",
     "use_adguard_parental": "AdGuard ebeveyn kontrolü web hizmetini kullan",
     "use_adguard_parental_hint": "AdGuard Home, alan adının yetişkin içerik bulundurup bulundurmadığını kontrol edecek. Gezinti güvenliği web hizmeti ile kullandığımız aynı gizlilik dostu API'yi kullanıyoruz.",
     "enforce_safe_search": "Güvenli aramayı zorunlu kıl",
-    "enforce_save_search_hint": "AdGuard Home şu arama motorlarında güvenli aramayı zorunlu kılabilir: Google, YouTube, Bing, DuckDuckGo, Yandex ve Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home şu arama motorlarında güvenli aramayı zorunlu kılabilir: Google, Youtube, Bing, DuckDuckGo, Yandex ve Pixabay.",
     "no_servers_specified": "Sunucu adresi girilmedi",
     "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ı",
@@ -143,7 +131,7 @@
     "upstream_dns_help": "Her satıra bir sunucu adresi girin. Üst DNS sunucularını yapılandırma hakkında <a>daha fazla bilgi edinin</a>.",
     "upstream_dns_configured_in_file": "{{path}} içinde yapılandırıldı",
     "test_upstream_btn": "Üst sunucuyu test et",
-    "upstreams": "Üst kaynak",
+    "upstreams": "Upstreams",
     "apply_btn": "Uygula",
     "disabled_filtering_toast": "Filtreleme devre dışı",
     "enabled_filtering_toast": "Filtreleme çalışıyor",
@@ -157,17 +145,17 @@
     "name_table_header": "İsim",
     "list_url_table_header": "Liste URL'si",
     "rules_count_table_header": "Kural sayısı",
-    "last_time_updated_table_header": "Son güncelleme zamanı",
+    "last_time_updated_table_header": "Son güncelleme",
     "actions_table_header": "Eylemler",
     "request_table_header": "İstek",
     "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.",
+    "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": "Engelleme listesi eklenmedi",
+    "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",
@@ -180,16 +168,16 @@
     "choose_allowlist": "İzin verilen listelerini seç",
     "enter_valid_blocklist": "Engelleme listesine geçerli bir URL girin.",
     "enter_valid_allowlist": "İzin verilen listesine geçerli bir URL girin.",
-    "form_error_url_format": "Geçersiz URL biçimi",
+    "form_error_url_format": "Geçersiz url biçim",
     "form_error_url_or_path_format": "Geçersiz URL ya da listenin tam yolu",
     "custom_filter_rules": "Özel filtreleme kuralları",
-    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklama engelleme kuralı veya ana bilgisayar dosyası sözdizimi kullanabilirsiniz.",
+    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklama engelleme kuralı veya hosts dosyası söz dizimi kullanabilirsiniz.",
     "examples_title": "Örnekler",
     "example_meaning_filter_block": "example.org alan adına ve tüm alt alan adlarına olan erişimi engeller",
     "example_meaning_filter_whitelist": "example.org alan adına ve tüm alt alan adlarına olan erişim engelini kaldırır",
     "example_meaning_host_block": "AdGuard Home bu example.org adresi için 127.0.0.1 adresine yönlendirme yapacaktır (alt alan adları için geçerli değildir)",
     "example_comment": "! Buraya bir yorum ekledim",
-    "example_comment_meaning": "sadece bir yorum",
+    "example_comment_meaning": "yorum eklemek",
     "example_comment_hash": "# Bir yorum daha ekledim",
     "example_regex_meaning": "belirtilen düzenli ifadelerle eşleşen alan adlarına erişimi engelle",
     "example_upstream_regular": "normal DNS (UDP üzerinden)",
@@ -214,7 +202,6 @@
     "domain_or_client": "Alan adı veya istemci",
     "type_table_header": "Tür",
     "response_table_header": "Yanıt",
-    "response_code": "Yanıt kodu",
     "client_table_header": "İstemci",
     "empty_response_status": "Boş",
     "show_all_filter_type": "Tümünü göster",
@@ -233,10 +220,9 @@
     "query_log_filtered": "{{filter}} tarafından filtrelendi",
     "query_log_confirm_clear": "Tüm sorgu günlüğünü temizlemek istediğinizden emin misiniz?",
     "query_log_cleared": "Sorgu günlüğü başarıyla temizlendi",
-    "query_log_updated": "Sorgu günlüğü başarıyla güncellendi",
+    "query_log_clear": "Sorgu kayıtlarını temizle",
-    "query_log_clear": "Sorgu günlüklerini temizle",
+    "query_log_retention": "Sorgu kayıtlarının saklanması",
-    "query_log_retention": "Sorgu günlüklerinin saklanması",
+    "query_log_enable": "Günlük kaydını etkinleştir",
-    "query_log_enable": "Günlüğü etkinleştir",
     "query_log_configuration": "Günlük yapılandırması",
     "query_log_disabled": "Sorgu günlüğü devre dışı bırakıldı ve <0>ayarlar</0>da yapılandırılabilir",
     "query_log_strict_search": "Katı arama için çift tırnak işareti kullanın",
@@ -254,22 +240,14 @@
     "custom_ip": "Özel IP",
     "blocking_ipv4": "IPv4 engelleme",
     "blocking_ipv6": "IPv6 engelleme",
-    "dnscrypt": "DNSCrypt",
+    "dns_over_https": "DNS üzerinden HTTPS",
-    "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",
     "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 olarak ayarlamak, sınır olmadığı anlamına gelir.",
     "blocking_ipv4_desc": "Engellenen bir A isteği için geri döndürülecek IP adresi",
     "blocking_ipv6_desc": "Engellenen bir AAAA isteği için geri döndürülecek IP adresi",
     "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",
@@ -290,17 +268,17 @@
     "install_welcome_desc": "AdGuard Home, ağ genelinde reklam ve izleyicileri engelleyen bir DNS sunucusudur. Tüm ağınızı ve tüm cihazlarınızı kontrol etmenize yarayan bir araçtır, istemci tarafında bir program kullanmanıza gerek duymaz.",
     "install_settings_title": "Yönetici Web Arayüzü",
     "install_settings_listen": "Dinleme arayüzü",
-    "install_settings_port": "Bağlantı noktası",
+    "install_settings_port": "Port",
     "install_settings_interface_link": "AdGuard Home yönetici web arayüzü sayfanız şu adresten erişilebilir olacaktır:",
-    "form_error_port": "Geçerli bağlantı noktası numarası 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_password": "Şifre",
-    "install_auth_confirm": "Parolayı onayla",
+    "install_auth_confirm": "Şifreyi onayla",
     "install_auth_username_enter": "Kullanıcı adı girin",
     "install_auth_password_enter": "Şifre girin",
     "install_step": "Adım",
@@ -311,10 +289,10 @@
     "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. Genellikle tarayıcınızdan http://192.168.0.1/ veya http://192.168.1.1/ gibi bir URL aracılığıyla erişebilirsiniz. Bir parola girmeniz istenebilir. Hatırlamıyorsanız, genellikle yönlendiricinin üzerindeki bir düğmeye basarak parolayı sıfırlayabilirsiniz, ancak bu yöntemin seçilmesi durumunda muhtemelen tüm yönlendirici yapılandırmasını kaybedeceğinizi unutmayın. Yönlendiricinizin kurulması için bir uygulama gerekiyorsa, lütfen uygulamayı telefonunuza veya PC'nize yükleyin ve yönlendiricinin ayarlarına erişmek için kullanın.",
+    "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 türlerinde özel bir DNS sunucusu kurulamaz. Bu durumda, AdGuard Home'u bir <0>DHCP sunucusu</0> olarak kurmak yardımcı olabilir. Aksi takdirde, belirli yönlendirici modelinizdeki DNS sunucularını nasıl özelleştireceğiniz konusunda yönlendirici kılavuzunu kontrol etmelisiniz.",
+    "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.",
     "install_devices_windows_list_1": "Başlat menüsünden veya Windows aramasıyla Denetim Masası'na girin.",
     "install_devices_windows_list_2": "Ağ ve Internet kategorisine girin, sonra Ağ ve Paylaşım Merkezi'ne girin.",
     "install_devices_windows_list_3": "Sol taraftaki Bağdaştırıcı ayarlarını değiştir ayarını bulun ve ona tıklayın.",
@@ -328,22 +306,22 @@
     "install_devices_android_list_1": "Android cihazınızda Ayarlar simgesine dokunun.",
     "install_devices_android_list_2": "Wi-Fi menüsüne dokunun. Mevcut tüm ağlar listelenecektir (mobil bağlantı için isteğe bağlı DNS sunucusu ayarlanamaz).",
     "install_devices_android_list_3": "Bağlı olduğunuz ağa uzun basın ve Ağı Değiştir'e dokunun.",
-    "install_devices_android_list_4": "Bazı cihazlarda, diğer ayarları görmek için Gelişmiş kutucuğu işaretlemeniz gerekebilir. Android DNS ayarlarınızı yapmak için IP ayarlarını DHCP'den Statik'e geçirmeniz gerekecektir.",
+    "install_devices_android_list_4": "Bazı cihazlarda diğer ayarları görmek için Gelişmiş kutucuğuna dokunmanız gerekebilir. Android cihazınızın DNS ayarlarını değiştirmek için IP ayarlarını DHCP yerine Statik olarak değiştirmeniz gerekebilir.",
     "install_devices_android_list_5": "DNS 1 ve DNS 2 değerlerini AdGuard Home sunucusunun ip adresleri ile değiştirin.",
     "install_devices_ios_list_1": "Ana ekrandaki Ayarlar simgesine dokunun.",
     "install_devices_ios_list_2": "Sol menüdeki Wi-Fi bölümüne girin (mobil bağlantı için isteğe bağlı DNS sunucusu ayarlanamaz).",
     "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",
     "encryption_desc": "Hem DNS ve hem de yönetici web arayüzü için şifreleme (HTTPS/TLS) desteği",
-    "encryption_config_saved": "Şifreleme yapılandırması kaydedildi",
+    "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ı",
@@ -354,11 +332,11 @@
     "encryption_doq_desc": "Bu bağlantı noktası yapılandırılırsa, AdGuard Home bu bağlantı noktasında DNS-over-QUIC sunucusu çalıştıracaktır. Deneysel ve güvenilir olmayabilir. Ayrıca, şu anda bunu destekleyen çok fazla istemci yok.",
     "encryption_certificates": "Sertifikalar",
     "encryption_certificates_desc": "Şifrelemeyi kullanmak için alan adınız için geçerli bir SSL sertifika zinciri temin etmeniz gerekir. <0>{{link}}</0> adresinden ücretsiz temin edebilirsiniz veya güvenilir Sertifika Otoritelerinden satın alabilirsiniz.",
-    "encryption_certificates_input": "PEM biçimindeki sertifikalarınızı buraya yapıştırın.",
+    "encryption_certificates_input": "PEM formatındaki sertifikalarınızı buraya yapıştırın.",
     "encryption_status": "Durum",
     "encryption_expire": "Bitiş tarihi",
     "encryption_key": "Özel anahtar",
-    "encryption_key_input": "Sertifikanızın PEM biçimi özel anahtarını buraya yapıştırın.",
+    "encryption_key_input": "Sertifikanızın PEM formatı özel anahtarını buraya yapıştırın.",
     "encryption_enable": "Şifrelemeyi etkinleştir (HTTPS, DNS-over-HTTPS ve DNS-over-TLS)",
     "encryption_enable_desc": "Şifrelemeyi etkinleştirirseniz, AdGuard Home yönetici arayüzü HTTPS üzerinden çalışır ve DNS sunucusu DNS-over-HTTPS ve DNS-over-TLS üzerinden gelen istekleri dinler.",
     "encryption_chain_valid": "Sertifika zinciri geçerli",
@@ -367,13 +345,13 @@
     "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_range": "80-65535 aralığında geçerli bir port değeri girin.",
-    "form_error_port_unsafe": "Bu güvenli olmayan bir bağlantı noktası",
+    "form_error_port_unsafe": "Bu güvenli olmayan bir port",
-    "form_error_equal": "Eşit olmamalı",
+    "form_error_equal": "Aynı olmamalı",
     "form_error_password": "Şifreler uyuşmuyor",
     "reset_settings": "Ayarları sıfırla",
     "update_announcement": "AdGuard Home {{version}} şu an yüklenmeye hazır! Daha fazla bilgi için <0>buraya tıklayın.</0>",
@@ -399,14 +377,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_subnet_ip": "\"{{cidr}}\" alt ağına bir IP adresi 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",
@@ -423,7 +399,7 @@
     "access_disallowed_title": "İzin verilmeyen istemciler",
     "access_disallowed_desc": "CIDR veya IP adreslerinin listesi. Yapılandırılırsa, AdGuard Home yalnızca bu IP adreslerinden gelen istekleri cevapsız bırakacaktır.",
     "access_blocked_title": "Engellenmiş alan adları",
-    "access_blocked_desc": "Bunu filtrelerle karıştırmayın. AdGuard Home, sorguların sorularına bu alan adlarıyla DNS sorgularını bırakacaktır. Burada tam alan adlarını, joker karakterleri ve URL filtre kurallarını belirtebilirsiniz, örn. \"example.org\", \"*.example.org\" veya \"|| example.org^\".",
+    "access_blocked_desc": "Bunu filtrelerle karıştırmayın. AdGuard Home, bu alan adları için gelen DNS sorgularını cevapsız bırakacaktır.",
     "access_settings_saved": "Erişim ayarları başarıyla kaydedildi!",
     "updates_checked": "Güncelleme kontrolü başarılı",
     "updates_version_equal": "AdGuard Home yazılımı  günceldir",
@@ -431,8 +407,6 @@
     "dns_privacy": "DNS Gizliliği",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> dizesini kullan.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> dizesini kullan.",
-    "setup_dns_privacy_3": "<0>İşte kullanabileceğiniz yazılımların bir listesi.</0>",
-    "setup_dns_privacy_4": "Bir iOS 14 veya macOS Big Sur cihazında, DNS ayarlarına <highlight>DNS-over-HTTPS</highlight> veya <highlight>DNS-over-TLS</highlight> sunucuları ekleyen özel '.mobileconfig' dosyasını indirebilirsiniz.",
     "setup_dns_privacy_android_1": "Android 9 aslen DNS-over-TLS desteklemektedir. Yapılandırmak için, Ayarlar → Ağ ve internet → Gelişmiş → Özel DNS seçeneğine gidin ve alan adınızı buraya girin.",
     "setup_dns_privacy_android_2": "<0>AdGuard for Android</0>, <1>DNS-over-HTTPS</1> ve <1>DNS-over-TLS</1> desteklemektedir.",
     "setup_dns_privacy_android_3": "<0>Intra</0> Android'e <1>DNS-over-HTTPS</1> desteğini ekler.",
@@ -444,7 +418,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",
@@ -453,12 +426,12 @@
     "rewrite_confirm_delete": "\"{{key}}\" için DNS yeniden yazımını silmek istediğinize emin misiniz?",
     "rewrite_desc": "Belirli bir alan adı için kolayca özel DNS yanıtı yapılandırmanıza olanak tanır.",
     "rewrite_applied": "Uygulanan Yeniden Yazım kuralı",
-    "rewrite_hosts_applied": "Ana bilgisayar dosyası kuralı tarafından yeniden yazıldı",
+    "rewrite_hosts_applied": "Host dosyası kuralı tarafından yeniden yazıldı",
     "dns_rewrites": "DNS yeniden yazımları",
     "form_domain": "Alan adı girin",
     "form_answer": "IP adresini veya alan adı girin",
-    "form_error_domain_format": "Geçersiz alan adı biçimi",
+    "form_error_domain_format": "Geçersiz alan adı formatı",
-    "form_error_answer_format": "Geçersiz cevap biçimi",
+    "form_error_answer_format": "Geçersiz cevap formatı",
     "configure": "Yapılandır",
     "main_settings": "Ana ayarlar",
     "block_services": "Belirli hizmetleri engelle",
@@ -512,57 +485,54 @@
     "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ında en hızlı IP adresini döndürün. AdGuard Home'un tüm DNS sunucularından yanıt beklemesi gerektiğinden, bu DNS sorgularını yavaşlatır ancak genel bağlantıyı iyileştirir.",
+    "fastest_addr_desc": "Tüm DNS sunucularını sorgulayın ve tüm yanıtlar arasından en hızlı IP adresini döndürün. Bu, tüm DNS sunucularından yanıt beklememiz gerektiğinden DNS sorgularını yavaşlatacak ancak genel bağlantıyı iyileştirecektir.",
     "autofix_warning_text": "\"Düzelt\" i tıklatırsanız, AdGuardHome sisteminizi AdGuardHome DNS sunucusunu kullanacak şekilde yapılandırır.",
-    "autofix_warning_list": "Bu görevleri gerçekleştirecek: <0>Sistem DNSStubListener'ı devre dışı bırakın</0> <0>DNS sunucusu adresini 127.0.0.1 olarak ayarlayın</0> <0>/etc/resolv.conf'un sembolik bağlantı hedefini /run/systemd/resolve/resolv.conf ile değiştirin<0> <0>DNSStubListener'ı durdurun (systemd çözümlenmiş hizmeti yeniden yükleyin)</0>",
+    "autofix_warning_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 AdGuard Home tarafından işlenecektir.",
+    "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>",
+    "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": "İstemci etiketlerini seçin",
+    "form_select_tags": "Müşteri etiketlerini seçin",
-    "check_title": "Filtrelemeyi denetleyin",
+    "check_title": "Filtrelemeyi kontrol edin",
     "check_desc": "Ana bilgisayar adının filtrelenip filtrelenmediğini kontrol edin",
-    "check": "Denetle",
+    "check": "Kontrol",
-    "form_enter_host": "Ana bilgisayar adı girin",
+    "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",
     "install_static_ok": "İyi haberler! Statik IP adresi zaten yapılandırılmış",
     "install_static_error": "AdGuard Home, bu ağ arayüzü için otomatik olarak yapılandıramaz. Lütfen bunu manuel olarak nasıl yapacağınıza ilişkin bir talimat arayın.",
-    "install_static_configure": "AdGuard Home, <0>{{ip}}</0> dinamik IP adresinin kullanıldığını tespit etti. Statik adresiniz olarak ayarlanmasını ister misiniz?",
+    "install_static_configure": "Dinamik bir IP adresi kullanıldığını tespit ettik - <0> {{ip}} </0>. Statik adresiniz olarak kullanmak ister misiniz?",
     "confirm_static_ip": "AdGuard Home, {{ip}} adresini statik IP adresiniz olacak şekilde yapılandıracak. Devam etmek istiyor musunuz?",
     "list_updated": "{{count}} liste güncellendi",
     "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",
@@ -572,7 +542,6 @@
     "blocked_threats": "Engellenen Tehditler",
     "allowed": "İzin verildi",
     "filtered": "Filtrelenmiş",
-    "rewritten": "Yeniden yazılan",
     "safe_search": "Güvenli arama",
     "blocklist": "Engelleme listesi",
     "milliseconds_abbreviation": "ms",
@@ -592,13 +561,10 @@
     "filter_category_other": "Diğer",
     "filter_category_general_desc": "Çoğu cihazda izlemeyi ve reklamları engelleyen listeler",
     "filter_category_security_desc": "Kötü amaçlı yazılım, kimlik avı veya dolandırıcılık alanlarını engelleme konusunda özelleştirilmiş listeler",
-    "filter_category_regional_desc": "Bölgesel reklamlara ve izleme sunucularına odaklanan listeler",
     "filter_category_other_desc": "Diğer engelleme listeleri",
     "setup_config_to_enable_dhcp_server": "DHCP sunucusunu etkinleştirmek için kurulum yapılandırması",
-    "original_response": "Esas yanıt",
     "click_to_view_queries": "Sorguları görmek için tıklayın",
     "port_53_faq_link": "Port 53 genellikle \"DNSStubListener\" veya \"sistemd-resolved\" hizmetler tarafından kullanılır. Lütfen problemin nasıl çözüleceğine ilişkin <0>bu talimatı</0> okuyun.",
     "adg_will_drop_dns_queries": "AdGuard Home, bu istemciden gelen tüm DNS sorgularını iptal eder.",
-    "client_not_in_allowed_clients": "İstemciye \"İzin verilen istemciler\" listesinde olmadığı için izin verilmiyor.",
     "experimental": "Deneysel"
-}
+}

client/src/__locales/vi.json

@@ -1,13 +1,14 @@
 {
     "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>",
+    "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
     "parallel_requests": "Yêu cầu song song",
     "load_balancing": "Cân bằng tải",
+    "load_balancing_desc": "Chỉ truy xuất một máy chủ trong cùng thời điểm. AdGuard Home sẽ sử dụng thuật toán trọng số ngẫu nhiên để chọn một máy chủ nhanh nhất và sử dụng máy chủ đó thường xuyên hơn.",
     "bootstrap_dns": "Máy chủ DNS Bootstrap",
     "bootstrap_dns_desc": "Máy chủ DNS Bootstrap được sử dụng để phân giải địa chỉ IP của bộ phân giải DoH/DoT mà bạn chỉ định là ngược tuyến.",
-    "local_ptr_desc": "Máy chủ DNS hoặc các máy chủ mà AdGuard Home sẽ sử dụng cho các truy vấn về tài nguyên được phân phối cục bộ. Ví dụ: máy chủ này sẽ được sử dụng để phân giải tên máy khách của máy khách cho các máy khách có địa chỉ IP riêng. Nếu không được cài đặt, AdGuard Home sẽ tự động sử dụng trình phân giải DNS mặc định của bạn.",
-    "local_ptr_placeholder": "Nhập một địa chỉ máy chủ trên mỗi dòng",
-    "resolve_clients_title": "Kích hoạt cho phép phân giải ngược về địa chỉ IP của máy khách",
     "check_dhcp_servers": "Kiểm tra máy chủ DHCP",
+    "save_config": "Lưu thiết lập",
     "enabled_dhcp": "Máy chủ DHCP đã kích hoạt",
     "disabled_dhcp": "Máy chủ DHCP đã tắt",
     "unavailable_dhcp": "DHCP không khả dụng",
@@ -16,10 +17,12 @@
     "dhcp_description": "Nếu bộ định tuyến không trợ cài đặt DHCP, bạn có thể dùng máy chủ DHCP dựng sẵn của AdGuard",
     "dhcp_enable": "Bật máy chủ DHCP",
     "dhcp_disable": "Tắt máy chủ DHCP",
+    "dhcp_not_found": "Không  có máy chủ DHCP nào được tìm thấy trong mạng. Có thể bật máy chủ DHCP một cách an toàn",
     "dhcp_found": "Đã tìm thấy máy chủ DHCP trong mạng. Có thể có rủi ro nếu kích hoạt máy chủ DHCP dựng sẵn",
     "dhcp_leases": "Thuê DHCP",
     "dhcp_static_leases": "Thuê DHCP tĩnh",
     "dhcp_leases_not_found": "Không tìm thấy DHCP cho thuê",
+    "dhcp_config_saved": "Đã lưu cấu hình máy chủ DHCP",
     "dhcp_ipv4_settings": "Cài đặt DHCP IPv4",
     "dhcp_ipv6_settings": "Cài đặt DHCP IPv6",
     "form_error_required": "Trường bắt buộc",
@@ -28,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",
@@ -45,11 +47,16 @@
     "ip": "IP",
     "dhcp_table_hostname": "Tên máy chủ",
     "dhcp_table_expires": "Hết hạn",
+    "dhcp_warning": "Nếu bạn vẫn muốn bật máy chủ DHCP, hãy đảm bảo rằng không có máy chủ DHCP hoạt động nào khác trong mạng của bạn. Nếu không, nó có thể phá vỡ Internet cho các thiết bị được kết nối!",
+    "dhcp_error": "Chúng tôi không thể xác định liệu có một máy chủ DHCP khác trong mạng hay không.",
+    "dhcp_static_ip_error": "Để sử dụng máy chủ DHCP, phải đặt địa chỉ IP tĩnh. Chúng tôi không thể xác định xem giao diện mạng này có được cấu hình bằng địa chỉ IP tĩnh hay không. Vui lòng đặt địa chỉ IP tĩnh theo cách thủ công.",
+    "dhcp_dynamic_ip_found": "Hệ thống của bạn sử dụng cấu hình địa chỉ IP động cho giao diện <0>{{interfaceName}}</0>. Để sử dụng máy chủ DHCP, phải đặt địa chỉ IP tĩnh. Địa chỉ IP hiện tại của bạn là <0>{{ipAddress}}</0>. Chúng tôi sẽ tự động đặt địa chỉ IP này thành tĩnh nếu bạn nhấn nút Bật DHCP.",
     "dhcp_lease_added": "Cho thuê tĩnh \"{{key}}\" đã được thêm thành công",
     "dhcp_lease_deleted": "Cho thuê tĩnh \"{{key}}\" đã xóa thành công",
     "dhcp_new_static_lease": "Cho thuê tĩnh mới",
     "dhcp_static_leases_not_found": "Không tìm thấy DHCP cho thuê tĩnh",
     "dhcp_add_static_lease": "Thêm thuê tĩnh",
+    "dhcp_reset": "Bạn có chắc chắn muốn đặt lại thiết lập DHCP?",
     "country": "Quốc gia",
     "city": "Thành phố",
     "delete_confirm": "Bạn có chắc chắn muốn xóa \"{{key}}\" không?",
@@ -96,7 +103,14 @@
     "top_clients": "Người dùng hàng đầu",
     "no_clients_found": "Không có người dùng",
     "general_statistics": "Thống kê chung",
+    "number_of_dns_query_days": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
+    "number_of_dns_query_days_plural": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
+    "number_of_dns_query_24_hours": "Số yêu cầu DNS đã xử lý trong 24 giờ qua",
+    "number_of_dns_query_blocked_24_hours": "Số yêu cầu DNS bị chặn bởi bộ lọc quảng cáo và danh sách chặn host",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Số yêu cầu DNS bị chặn bởi chế độ bảo vệ duyệt web AdGuard",
+    "number_of_dns_query_blocked_24_hours_adult": "Số website người lớn đã chặn",
     "enforced_save_search": "Bắt buộc tìm kiếm an toàn",
+    "number_of_dns_query_to_safe_search": "Số yêu cầu DNS tới công cụ tìm kiếm đã chuyển thành tìm kiếm an toàn",
     "average_processing_time": "Thời gian xử lý trung bình",
     "average_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",
@@ -106,6 +120,7 @@
     "use_adguard_parental": "Sử dụng dịch vụ quản lý của phụ huynh AdGuard",
     "use_adguard_parental_hint": "AdGuard Home sẽ kiểm tra nếu tên miền chứa từ khoá người lớn. Tính năng sử dụng API thân thiện với quyền riêng tư tương tự với dịch vụ bảo vệ duyệt web",
     "enforce_safe_search": "Bắt buộc tìm kiếm an toàn",
+    "enforce_save_search_hint": "AdGuard Home có thể bắt buộc tìm kiếm an toàn với các dịch vụ tìm kiếm: Google, Youtube, Bing, Yandex.",
     "no_servers_specified": "Không có máy chủ nào được liệt kê",
     "general_settings": "Cài đặt chung",
     "dns_settings": "Cài đặt DNS",
@@ -117,7 +132,6 @@
     "encryption_settings": "Cài đặt mã hóa",
     "dhcp_settings": "Cài đặt DHCP",
     "upstream_dns": "Máy chủ DNS tìm kiếm",
-    "upstream_dns_configured_in_file": "Cấu hình tại {{path}}",
     "test_upstream_btn": "Kiểm tra",
     "upstreams": "Nguồn",
     "apply_btn": "Áp dụng",
@@ -171,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",
@@ -180,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",
@@ -225,21 +234,12 @@
     "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",
-    "dnscrypt": "DNSCrypt",
     "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",
@@ -247,8 +247,6 @@
     "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.",
     "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",
@@ -257,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",
@@ -266,6 +265,7 @@
     "install_settings_listen": "Giao diện nghe",
     "install_settings_port": "Cổng",
     "install_settings_interface_link": "Giao diện web quản trị viên AdGuard Home của bạn sẽ có sẵn trên các địa chỉ sau:",
+    "form_error_port": "Nhập giá trị cổng hợp lệ",
     "install_settings_dns": "Máy chủ DNS",
     "install_settings_dns_desc": "Bạn sẽ cần định cấu hình thiết bị hoặc bộ định tuyến của mình để sử dụng máy chủ DNS trên các địa chỉ sau:",
     "install_settings_all_interfaces": "Tất cả các giao diện",
@@ -284,8 +284,10 @@
     "install_devices_router": "Bộ định tuyến",
     "install_devices_router_desc": "Thiết lập này sẽ tự động bao gồm tất cả các thiết bị được kết nối với bộ định tuyến gia đình của bạn và bạn sẽ không cần phải định cấu hình từng thiết bị theo cách thủ công.",
     "install_devices_address": "Máy chủ DNS của AdGuard Home đang lắng nghe các địa chỉ sau",
+    "install_devices_router_list_1": "Mở các tùy chọn cho bộ định tuyến của bạn. Thông thường, bạn có thể truy cập nó từ trình duyệt của mình thông qua một URL (như http://192.168.0.1/ hoặc http://192.168.1.1/). Bạn có thể được yêu cầu nhập mật khẩu. Nếu bạn không nhớ nó, bạn có thể thường xuyên đặt lại mật khẩu bằng cách nhấn một nút trên chính bộ định tuyến. Một số bộ định tuyến yêu cầu một ứng dụng cụ thể, trong trường hợp đó nên được cài đặt trên máy tính/điện thoại của bạn.",
     "install_devices_router_list_2": "Tìm cài đặt DHCP/DNS. Tìm các chữ cái DNS bên cạnh một trường cho phép hai hoặc ba bộ số, mỗi bộ được chia thành bốn nhóm từ một đến ba chữ số.",
     "install_devices_router_list_3": "Nhập địa chỉ máy chủ AdGuard Home của bạn ở đó.",
+    "install_devices_router_list_4": "Bạn không thể đặt máy chủ DNS tùy chỉnh trên một số loại bộ định tuyến. Trong trường hợp này, có thể hữu ích nếu bạn thiết lập AdGuard Home làm <0> máy chủ DHCP </0>. Nếu không, bạn nên tìm kiếm hướng dẫn về cách tùy chỉnh máy chủ DNS cho kiểu bộ định tuyến cụ thể của mình.",
     "install_devices_windows_list_1": "Mở Control Panel thông qua Trình đơn Bắt đầu hoặc Tìm kiếm Windows.",
     "install_devices_windows_list_2": "Chuyển đến danh mục Mạng và Internet, sau đó đến Trung tâm Mạng và Chia sẻ.",
     "install_devices_windows_list_3": "Ở bên trái màn hình, tìm Thay đổi cài đặt bộ điều hợp và nhấp vào nó.",
@@ -311,16 +313,16 @@
     "install_saved": "Lưu thành công",
     "encryption_title": "Mã hóa",
     "encryption_desc": "Hỗ trợ mã hóa (HTTPS/TLS) cho cả giao diện web quản trị viên và DNS",
+    "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.",
@@ -340,10 +342,13 @@
     "encryption_reset": "Bạn có chắc chắn muốn đặt lại cài đặt mã hóa?",
     "topline_expiring_certificate": "Chứng chỉ SSL của bạn sắp hết hạn. Cập nhật <0>Cài đặt mã hóa</0>.",
     "topline_expired_certificate": "Chứng chỉ SSL của bạn đã hết hạn. Cập nhật <0>Cài đặt mã hóa</0>.",
+    "form_error_port_range": "Nhập giá trị cổng trong phạm vi 80-65535",
     "form_error_port_unsafe": "Đây là một cổng không an toàn",
+    "form_error_equal": "Không nên bằng nhau",
     "form_error_password": "Mật khẩu không khớp",
     "reset_settings": "Đặt lại cài đặt",
     "update_announcement": "AdGuard Home {{version}} hiện có sẵn! <0>Chạm vào đây</0> để biết thêm thông tin.",
+    "setup_guide": "Hướng dẫn thiết lập",
     "dns_addresses": "Địa chỉ DNS",
     "dns_start": "Máy chủ DNS đang khởi động",
     "dns_status_error": "Có lỗi khi kiểm tra trạng thái máy chủ DNS",
@@ -365,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",
@@ -387,6 +393,7 @@
     "access_disallowed_title": "Máy chủ không được phép",
     "access_disallowed_desc": "Một danh sách các địa chỉ CIDR hoặc IP. Nếu được định cấu hình, AdGuard Home sẽ bỏ yêu cầu từ các địa chỉ IP này.",
     "access_blocked_title": "Tên miền bị chặn",
+    "access_blocked_desc": "Đừng nhầm lẫn điều này với các bộ lọc. AdGuard Home sẽ bỏ các truy vấn DNS với các tên miền này trong câu hỏi của truy vấn.",
     "access_settings_saved": "Cài đặt truy cập đã lưu thành công",
     "updates_checked": "Đã kiểm tra thành công cập nhật",
     "updates_version_equal": "AdGuard Home đã được cập nhật",
@@ -394,8 +401,6 @@
     "dns_privacy": "DNS Riêng Tư",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
-    "setup_dns_privacy_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_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.",
@@ -407,7 +412,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",
@@ -489,6 +493,7 @@
     "disable_ipv6": "Tắt IPv6",
     "disable_ipv6_desc": "Nếu tính năng này được bật, tất cả các truy vấn DNS cho địa chỉ IPv6 (loại AAAA) sẽ bị loại bỏ.",
     "fastest_addr": "Địa chỉ IP nhanh nhất",
+    "fastest_addr_desc": "Truy vấn tất cả các máy chủ DNS và trả về địa chỉ IP nhanh nhất trong số tất cả các phản hồi",
     "autofix_warning_text": "Nếu bạn nhấp vào \"Khắc phục\", AdGuard Home sẽ định cấu hình hệ thống của bạn để sử dụng máy chủ DNS của AdGuard Home.",
     "autofix_warning_list": "Nó sẽ thực hiện các tác vụ sau: <0> Hủy kích hoạt hệ thống DNSStubListener </0> <0> Đặt địa chỉ máy chủ DNS thành 127.0.0.1 </0> <0> Thay thế mục tiêu liên kết tượng trưng của /etc/resolv.conf bằng / run / systemd /resolve/resolv.conf </0> <0> Dừng DNSStubListener (tải lại dịch vụ do hệ thống phân giải) </0>",
     "autofix_warning_result": "Do đó, tất cả các yêu cầu DNS từ hệ thống của bạn sẽ được AdGuard Home xử lý theo mặc định.",
@@ -506,8 +511,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}}?",
@@ -518,6 +523,7 @@
     "set_static_ip": "Thiết lập địa chỉ IP tĩnh",
     "install_static_ok": "Địa chỉ IP tĩnh đã được thiết lập",
     "install_static_error": "AdGuard Home không thể cấu hình tự động cho giao diện mạng này. Vui lòng tìm hướng dẫn về cách thực hiện việc này theo cách thủ công.",
+    "install_static_configure": "Chúng tôi đã phát hiện thấy rằng một địa chỉ IP động được sử dụng - <0> {{ip}} </0>. Bạn có muốn sử dụng nó làm địa chỉ tĩnh của mình không?",
     "confirm_static_ip": "AdGuard Home sẽ lấy {{ip}} làm địa chỉ IP tĩnh. Bạn có muốn tiếp tục?",
     "list_updated": "Đã cập nhật {{count}} bộ lọc",
     "list_updated_plural": "Đã cập nhật {{count}} bộ lọc",
@@ -539,14 +545,6 @@
     "milliseconds_abbreviation": "ms",
     "cache_size": "Kích thước cache",
     "cache_size_desc": "Kích thước cache DNS (bytes)",
-    "cache_ttl_min_override": "Ghi đè TTL tối thiểu",
-    "cache_ttl_max_override": "Ghi đè TTL tối đa",
-    "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",
     "filter_category_general": "Chung",
     "filter_category_security": "Bảo mật",
     "filter_category_regional": "Khu vực",
@@ -555,10 +553,8 @@
     "filter_category_security_desc": "Bộ lọc chuyên biệt chặn tên miền chứa mã độc và lừa đảo",
     "filter_category_regional_desc": "Bộ lọc tập trung vào từng khu vực",
     "filter_category_other_desc": "Bộ lọc chặn khác",
+    "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.",
+    "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"
-}

client/src/__locales/zh-cn.json

@@ -1,18 +1,13 @@
 {
     "client_settings": "客户端设置",
-    "example_upstream_reserved": "您可以<0>为特定域名</0>指定上游 DNS 服务器",
+    "example_upstream_reserved": "您可以将上游DNS 服务器<0>指定为特定域名</0>",
     "example_upstream_comment": "您可以指定注解",
-    "upstream_parallel": "使用并行请求以同时查询所有上游服务器来加快解析速度。",
+    "upstream_parallel": "通过同时查询所有上游服务器，使用并行请求以加速解析",
     "parallel_requests": "并行请求",
     "load_balancing": "负载均衡",
-    "load_balancing_desc": "一次查询一台服务器。AdGuard Home 将使用加权随机算法来选择服务器，以便更常使用最快的服务器。",
+    "load_balancing_desc": "一次查询一台服务器。 AdGuard Home将使用加权随机算法来选择服务器，以便更频繁地使用最快的服务器。",
     "bootstrap_dns": "Bootstrap DNS 服务器",
     "bootstrap_dns_desc": "Bootstrap DNS 服务器用于解析您指定为上游的 DoH / DoT 解析器的 IP 地址。",
-    "local_ptr_title": "私人 DNS 服务器",
-    "local_ptr_desc": "AdGuard Home 用于查询本地服务资源的 DNS 服务器。例如，该服务器将被用于解析具有私人 IP 地址的客户机的主机名，比如 \"192.168.12.34\"。如果没有设置，AdGuard Home 将自动使用您的默认 DNS 解析器。",
-    "local_ptr_placeholder": "每行输入一个服务器地址",
-    "resolve_clients_title": "启用客户端的 IP 地址的反向解析",
-    "resolve_clients_desc": "如果启用，AdGuard Home 将尝试通过发送 PTR 查询到对应的解析器 (本地客户端的私人 DNS 服务器，公有 IP 客户端的上游服务器) 将 IP 地址反向解析成其客户端主机名。",
     "check_dhcp_servers": "检查 DHCP 服务器",
     "save_config": "保存配置",
     "enabled_dhcp": "DHCP 服务器已启用",
@@ -23,22 +18,20 @@
     "dhcp_description": "如果你的路由器没有提供 DHCP （动态主机配置协议）设置，你可以使用 AdGuard 内置的 DHCP 服务器。",
     "dhcp_enable": "启用 DHCP 服务器",
     "dhcp_disable": "停用 DHCP 服务器",
-    "dhcp_not_found": "您可以安全地启用内置 DHCP 服务器。在当前网络中 AdGuard Home 未检测到任何起作用的 DHCP 服务器。然而，我们推荐您以手动方式重新检测，因为当前我们的自动检测不能确保 100% 准确。",
+    "dhcp_not_found": "您可以安全地启用内置 DHCP 服务器 - 在当前网络中未检测到任何起作用的 DHCP 服务器。然而，我们鼓励您以手动方式重新检测，因为当前我们的自动检测不能确保100%准确。",
     "dhcp_found": "在当前网络中检测到 DHCP 服务器。如果启用内置的 DHCP 服务器可能不安全。",
     "dhcp_leases": "DHCP 租约",
     "dhcp_static_leases": "DHCP 静态租约",
     "dhcp_leases_not_found": "未找到 DHCP 租约",
-    "dhcp_config_saved": "已成功保存 DHCP 服务器配置",
+    "dhcp_config_saved": "已保存 DHCP 服务器配置",
     "dhcp_ipv4_settings": "DHCP IPv4设置",
     "dhcp_ipv6_settings": "DHCP IPv6设置",
     "form_error_required": "必填字段",
     "form_error_ip4_format": "无效的 IPv4 格式",
     "form_error_ip6_format": "无效的 IPv6 格式",
-    "form_error_ip_format": "无效的 IP 格式",
+    "form_error_ip_format": "无效的 IPv4 格式",
     "form_error_mac_format": "无效的 MAC 格式",
     "form_error_client_id_format": "无效的客户端 ID 格式",
-    "form_error_server_name": "无效的服务器名",
-    "form_error_subnet": "子网 \"{{cidr}}\" 不包含 IP 地址 \"{{ip}}\"",
     "form_error_positive": "必须大于 0",
     "form_error_negative": "必须大于等于 0",
     "range_end_error": "必须大于范围起始值",
@@ -52,19 +45,19 @@
     "dhcp_interface_select": "选择 DHCP 接口",
     "dhcp_hardware_address": "硬件地址",
     "dhcp_ip_addresses": "IP 地址",
-    "ip": "IP 地址",
+    "ip": "IP地址",
     "dhcp_table_hostname": "主机名",
     "dhcp_table_expires": "到期",
     "dhcp_warning": "如果你想要启用内置的 DHCP 服务器，请确保在当前网络中没有其它起作用的 DHCP 服务器。否则，此操作可能会破坏已连接设备的网络连接！",
-    "dhcp_error": "AdGuard Home 无法确定在当前网络中是否存在其它 DHCP 服务器。",
+    "dhcp_error": "我们无法确定在当前网络中是否存在其它 DHCP 服务器。",
-    "dhcp_static_ip_error": "要使用 DHCP 服务器，则必须设置静态 IP 地址。AdGuard Home 无法确定此网络接口是否已被配置为使用静态 IP 地址。请手动为此网络接口设置静态 IP 地址。",
+    "dhcp_static_ip_error": "要使用 DHCP 服务器，则必须设置静态 IP 地址。我们无法确定此网络接口是否已被配置为使用静态 IP 地址。请手动为此网络接口设置静态 IP 地址。",
-    "dhcp_dynamic_ip_found": "您的系统对网络接口 <0>{{interfaceName}}</0> 使用了动态 IP 地址配置。要使用 DHCP 服务器，则必须对此网络接口使用静态 IP 地址配置。此网络接口当前的 IP 地址为 <0>{{ipAddress}}</0>。如您点击“启用 DHCP 服务器” 按钮，AdGuard Home 将自动修改此网络接口以使用静态 IP 地址。",
+    "dhcp_dynamic_ip_found": "您的系统对网络接口 <0>{{interfaceName}}</0> 使用了动态 IP 地址配置。要使用 DHCP 服务器，则必须对此网络接口使用静态 IP 地址配置。此网络接口当前的 IP 地址为 <0>{{ipAddress}}</0>。如您点击 启用 DHCP 按钮，我们将自动修改此网络接口以使用静态 IP 地址配置。",
     "dhcp_lease_added": "静态租约 \"{{key}}\" 已成功添加",
     "dhcp_lease_deleted": "静态租约 \"{{key}}\" 已成功删除",
     "dhcp_new_static_lease": "新建静态租约",
     "dhcp_static_leases_not_found": "未找到 DHCP 静态租约",
     "dhcp_add_static_lease": "添加静态租约",
-    "dhcp_reset": "您确定要重置 DHCP 设定吗？",
+    "dhcp_reset": "您确定要重置DHCP设定么？",
     "country": "国家",
     "city": "城市",
     "delete_confirm": "您确定要删除 \"{{key}}\"？",
@@ -111,12 +104,12 @@
     "top_clients": "客户端排行",
     "no_clients_found": "未找到客户端",
     "general_statistics": "概况统计",
-    "number_of_dns_query_days": "过去 {{count}} 天内处理的 DNS 查询总数",
+    "number_of_dns_query_days": "过去 {{count}} 天内 处理的DNS 查询总数",
     "number_of_dns_query_days_plural": "在过去的 {{count}} 天内处理了多少个 DNS 查询",
     "number_of_dns_query_24_hours": "过去 24 小时内处理的 DNS 请求总数",
-    "number_of_dns_query_blocked_24_hours": "被广告过滤器和 Hosts 拦截清单阻止的 DNS 请求总数",
+    "number_of_dns_query_blocked_24_hours": "被广告过滤器和 Hosts 拦截清单拦截的 DNS 请求总数",
-    "number_of_dns_query_blocked_24_hours_by_sec": "被 AdGuard 安全浏览模块阻止的 DNS 请求总数",
+    "number_of_dns_query_blocked_24_hours_by_sec": "被 AdGuard 安全浏览模块拦截的 DNS 请求总数",
-    "number_of_dns_query_blocked_24_hours_adult": "被阻止的成人网站总数",
+    "number_of_dns_query_blocked_24_hours_adult": "被拦截的成人网站总数",
     "enforced_save_search": "强制安全搜索",
     "number_of_dns_query_to_safe_search": "启用强制安全搜索后对搜索引擎的 DNS 请求总数",
     "average_processing_time": "平均处理时间",
@@ -128,7 +121,7 @@
     "use_adguard_parental": "使用 AdGuard 【家长控制】服务",
     "use_adguard_parental_hint": "AdGuard Home 将使用与浏览安全服务相同的隐私性强的 API 来检查域名指向的网站是否包含成人内容。",
     "enforce_safe_search": "强制安全搜索",
-    "enforce_save_search_hint": "AdGuard Home 对以下搜索引擎可强制启用安全搜索：Google、YouTube、Bing、DuckDuckGo、Yandex、Pixabay。",
+    "enforce_save_search_hint": "AdGuard Home 将对以下搜索引擎强制启用安全搜索：Google、YouTube、Bing 和 Yandex。",
     "no_servers_specified": "未找到指定的服务器",
     "general_settings": "常规设置",
     "dns_settings": "DNS 设置",
@@ -140,7 +133,7 @@
     "encryption_settings": "加密设置",
     "dhcp_settings": "DHCP 设置",
     "upstream_dns": "上游 DNS 服务器",
-    "upstream_dns_help": "每行输入一个服务器地址。<a>了解更多</a>关于配置上游 DNS 服务器的内容",
+    "upstream_dns_help": "每行输入一个服务器地址。<a>了解更多</a>关于配置上游DNS服务器的内容",
     "upstream_dns_configured_in_file": "配置路径{{path}}",
     "test_upstream_btn": "测试上游 DNS",
     "upstreams": "上游服务器",
@@ -254,22 +247,16 @@
     "custom_ip": "自定义 IP",
     "blocking_ipv4": "拦截 IPv4",
     "blocking_ipv6": "拦截 IPv6",
-    "dnscrypt": "DNSCrypt",
     "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": "速度限制",
     "edns_enable": "使用客户端的子网地址（EDNS)",
     "edns_cs_desc": "启用后AdGuard Home将会向DNS服务器发送客户端的子网地址进行查询",
-    "rate_limit_desc": "每个客户端每秒钟查询次数的限制。设置为 0 意味着不限制。",
+    "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 地址",
@@ -311,10 +298,10 @@
     "install_devices_router": "路由器",
     "install_devices_router_desc": "此设置将自动覆盖连接到您的家庭路由器的所有设备，您不需要手动配置它们。",
     "install_devices_address": "AdGuard Home DNS 服务器正在监听以下地址",
-    "install_devices_router_list_1": "打开您的路由器配置界面。通常情况下，您可以通过浏览器访问地址（如 http://192.168.0.1/ 或 http://192.168.1.1 ）。打开后您可能需要输入密码以进入配置界面。如果您不记得密码，通常可以通过路由器上的重置按钮来重设密码。但是，请注意，如您进行此操作，您最可能会失去所有路由器的配置。如果您的路由器需要通过特定的应用进行这一操作，请将相关应用程序安装到您的手机或计算机上并使用它设置您的路由器。",
+    "install_devices_router_list_1": "打开您的路由器配置界面。通常情况下，您可以通过浏览器访问地址（如 http://192.168.0.1/ 或 http://192.168.1.1 ）。打开后您可能需要输入密码以进入配置界面。如果您不记得密码，通常可以通过按下路由器上的重置按钮来重设密码。一些路由器可能需要通过特定的应用来进行这一操作，请确保您已经在计算机或手机上安装了相关应用。",
     "install_devices_router_list_2": "找到路由器的 DHCP/DNS 设置页面。您会在 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 服务器，可能会有所帮助。否则您应该查找如何根据特定路由器型号设置 DNS 服务器的使用手册。\n",
     "install_devices_windows_list_1": "通过开始菜单或 Windows 搜索功能打开控制面板。",
     "install_devices_windows_list_2": "点击进入 ”网络和 Internet“ 后，再次点击进入 “网络和共享中心”",
     "install_devices_windows_list_3": "在窗口的左侧找到 ”更改适配器设置“ 并点击进入。",
@@ -343,7 +330,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 端口",
@@ -373,7 +360,7 @@
     "topline_expired_certificate": "您的 SSL 证书已过期。请更新 <0>加密设置</0> 。",
     "form_error_port_range": "输入 80 - 65535 范围内的端口值",
     "form_error_port_unsafe": "这是一个不安全的端口",
-    "form_error_equal": "不可相同",
+    "form_error_equal": "不应该相同",
     "form_error_password": "密码不匹配",
     "reset_settings": "重置设置",
     "update_announcement": "AdGuard Home {{version}} 现已发布！ <0>点击此处</0> 以获取详细信息。",
@@ -399,9 +386,8 @@
     "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_subnet_ip": "输入一个 IP 地址，其须位于子网\"{{cidr}}\"",
     "form_enter_mac": "输入 MAC",
     "form_enter_id": "输入标识符",
     "form_add_id": "添加标识符",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "不允许的客户端",
     "access_disallowed_desc": "CIDR 或 IP 地址列表。如配置，则 AdGuard Home 会放弃源自这些 IP 地址的请求。",
     "access_blocked_title": "不允许的域名",
-    "access_blocked_desc": "不要将此功能与过滤器混淆。AdGuard Home 将在查询时删除具有这些网域的 DNS 查询。在此可以明确指定域名、通配符（wildcard）和网址过滤器的规则，例如 \"example.org\"、\"*.example.org\" 或 \"||example.org^\"。",
+    "access_blocked_desc": "不要将此功能与过滤器混淆。AdGuard Home 将在查询时删除具有这些网域的 DNS 查询。在此可以明确指定域名、通配符（wildcard）和网址过滤器规则，例如 'example.org'、'*.example.org' 或 '||example.org^'。",
     "access_settings_saved": "访问设置保存成功",
     "updates_checked": "检查更新成功",
     "updates_version_equal": "AdGuard Home已经是最新版本",
@@ -444,7 +430,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 重写",
@@ -526,7 +511,7 @@
     "disable_ipv6": "禁用 IPv6",
     "disable_ipv6_desc": "启用后，所有IPv6地址 (type AAAA) 的DNS查询都会被丢弃。",
     "fastest_addr": "最快的 IP 地址",
-    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器均有所回应，因而会降低 DNS 查询的速度，但同时，此举将会改善总体的连接。",
+    "fastest_addr_desc": "查询所有DNS服务器并返回所有响应中速度最快的IP地址。因必须等待全部DNS服务器均有所回应，因而会降低DNS查询的速度，但同时此举将会改善总体的连接。",
     "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/resolv/resolv.conf</0><0>停止DNSStubListener（重新加载系统解析服务）</0>",
     "autofix_warning_result": "因此，默认情况下所有来自系统的DNS请求都将由AdGuardHome处理。",
@@ -544,6 +529,7 @@
     "check_ip": "IP地址：{{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "原因：{{reason}}",
+    "check_rule": "规则：{{rule}}",
     "check_service": "服务名称：{{service}}",
     "service_name": "服务名称",
     "check_not_found": "未在您的筛选列表中找到",
@@ -556,7 +542,7 @@
     "set_static_ip": "设置一个静态IP",
     "install_static_ok": "好消息！静态IP地址已经配置",
     "install_static_error": "AdGuard Home 无法为这个网络接口自动配置它。请参阅如何手动完成此操作的说明。",
-    "install_static_configure": "AdGuard Home 检测到一个动态 IP 地址 <0>{{ip}}</0> 被使用。您想把它作为您的静态地址吗？",
+    "install_static_configure": "我们检测到一个动态IP地址—<0>{{ip}}</0>被使用。您想把它作为您的静态地址吗？",
     "confirm_static_ip": "AdGuard Home 将把{{ip}} 配置为您的静态IP地址。您想要继续吗？",
     "list_updated": "{{count}} 列表已更新",
     "list_updated_plural": "{{count}} 条列表已更新",
@@ -594,11 +580,11 @@
     "filter_category_security_desc": "专用于拦截恶意软件、钓鱼或欺诈域名的列表",
     "filter_category_regional_desc": "专注于区域广告和跟踪服务器的列表",
     "filter_category_other_desc": "其他阻止列表",
-    "setup_config_to_enable_dhcp_server": "设置配置以启用 DHCP 服务器",
+    "setup_config_to_enable_dhcp_server": "设置配置以启用DHCP服务器",
     "original_response": "原始响应",
     "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

@@ -2,12 +2,12 @@
     "client_settings": "用戶端設定",
     "example_upstream_reserved": "您可以<0>指定網域</0>使用特定 DNS 查詢",
     "example_upstream_comment": "您可以指定註解",
-    "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來加速解析結果",
+    "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來來加速解析結果",
     "parallel_requests": "平行處理",
-    "load_balancing": "負載平衡",
+    "load_balancing": "負載平衝",
     "load_balancing_desc": "一次只查詢一個伺服器。AdGuard Home 會使用加權隨機取樣來選擇使用的查詢結果，以確保速度最快的伺服器能被充分運用。",
     "bootstrap_dns": "引導（Boostrap） DNS 伺服器",
-    "bootstrap_dns_desc": "Bootstrap DNS 伺服器用於解析您所設定的上游 DoH/DoT 解析器的 IP 地址",
+    "bootstrap_dns_desc": "引導（Bootstrap）DNS 伺服器用來解析 DoH/DoT 的域名 IP。",
     "check_dhcp_servers": "檢查 DHCP 伺服器",
     "save_config": "儲存設定",
     "enabled_dhcp": "DHCP 伺服器已啟動",
@@ -32,7 +32,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": "必須大於起始值",
@@ -118,9 +117,9 @@
     "block_domain_use_filters_and_hosts": "使用過濾器與 hosts 檔案阻擋網域查詢",
     "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設定封鎖規則。",
     "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
-    "use_adguard_browsing_sec_hint": "AdGuard Home 將比對查詢網域是否在瀏覽安全服務黑名單內。AdGuard Home 選擇使用尊重個人隱私的 API 進行比對，先透過 SHA256 將網域編碼，取前置字串傳送到伺服器進行比對。",
+    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查查詢網域是否在瀏覽安全服務黑名單內。它使用尊重個人隱私的 API 來進行檢查：會先透過 SHA256 將網域編碼後取簡短前置字串傳送到伺服器核對。",
     "use_adguard_parental": "使用 AdGuard 家長監護功能",
-    "use_adguard_parental_hint": "AdGuard Home 將比對查詢網域是否含有成人內容。它使用與 AdGuard 瀏覽安全一樣的尊重個人隱私的 API 來進行檢查。",
+    "use_adguard_parental_hint": "AdGuard Home 將檢查查詢網域是否含有成人內容。它使用與 AdGuard 瀏覽安全一樣的尊重個人隱私的 API 來進行檢查。",
     "enforce_safe_search": "強制使用安全搜尋",
     "enforce_save_search_hint": "AdGuard Home 可在下列搜尋引擎使用強制安全搜尋：Google、YouTube、Bing、DuckDuckGo 和 Yandex。",
     "no_servers_specified": "沒有指定的伺服器",
@@ -134,8 +133,8 @@
     "encryption_settings": "加密設定",
     "dhcp_settings": "DHCP 設定",
     "upstream_dns": "上游 DNS 伺服器",
-    "upstream_dns_help": "每行輸入一個伺服器位址。<a>了解更多</a>有關設定上游 DNS 伺服器的內容",
+    "upstream_dns_help": "每行輸入一個伺服器位址。<a>了解更多</a>有關配置上遊 DNS 伺服器的內容",
-    "upstream_dns_configured_in_file": "設定在 {{path}}",
+    "upstream_dns_configured_in_file": "被配置在 {{path}}",
     "test_upstream_btn": "測試上游 DNS",
     "upstreams": "上游",
     "apply_btn": "套用",
@@ -189,19 +188,19 @@
     "example_upstream_regular": "一般 DNS（透過 UDP）",
     "example_upstream_dot": "<0>DNS-over-TLS</0>（流量加密）",
     "example_upstream_doh": "<0>DNS-over-HTTPS</0>（流量加密）",
-    "example_upstream_doq": "加密 <0>DNS-over-QUIC</0>",
+    "example_upstream_doq": "加密的<0>DNS-over-QUIC</0>",
     "example_upstream_sdns": "您可以使透過 <0>DNS Stamps</0> 來解析  <1>DNSCrypt</1> 或 <2>DNS-over-HTTPS</2>",
     "example_upstream_tcp": "一般 DNS（透過 TCP）",
-    "all_lists_up_to_date_toast": "所有清單已更新至最新",
+    "all_lists_up_to_date_toast": "所有清單已經是最新的",
     "updated_upstream_dns_toast": "已更新上游 DNS 伺服器",
     "dns_test_ok_toast": "設定中的 DNS 上游運作正常",
-    "dns_test_not_ok_toast": "DNS 設定中的 \"{{key}}\" 出現錯誤，請確認是否正確輸入",
+    "dns_test_not_ok_toast": "設定中的 \"{{key}}\" DNS 出現錯誤，請檢察拼字",
     "unblock": "解除封鎖",
     "block": "封鎖",
     "disallow_this_client": "不允許此用戶端",
     "allow_this_client": "允許此用戶端",
-    "block_for_this_client_only": "僅封鎖此用戶端",
+    "block_for_this_client_only": "僅為此用戶端封鎖",
-    "unblock_for_this_client_only": "僅解除封鎖此用戶端",
+    "unblock_for_this_client_only": "僅為此用戶端解除封鎖",
     "time_table_header": "時間",
     "date": "日期",
     "domain_name_table_header": "域名",
@@ -248,20 +247,14 @@
     "custom_ip": "自訂 IP 位址",
     "blocking_ipv4": "封鎖 IPv4",
     "blocking_ipv6": "封鎖 IPv6",
-    "dnscrypt": "DNSCrypt",
     "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": "速率限制",
-    "edns_enable": "啟用 EDNS Client Subnet",
+    "edns_enable": "編輯 EDNS 用戶端子網路",
     "edns_cs_desc": "開啟後 AdGuard Home 將會傳送用戶端的子網路給 DNS 伺服器。",
     "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
     "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
@@ -298,7 +291,7 @@
     "install_auth_username_enter": "輸入用戶名",
     "install_auth_password_enter": "輸入密碼",
     "install_step": "步驟",
-    "install_devices_title": "設定您的裝置",
+    "install_devices_title": "配置您的裝置",
     "install_devices_desc": "要開始使用 AdGuard Home，您需要設定好裝置才能使用。",
     "install_submit_title": "恭喜！",
     "install_submit_desc": "安裝步驟已完成，現在已經可以開始使用 AdGuard Home",
@@ -338,14 +331,14 @@
     "encryption_server": "伺服器名稱",
     "encryption_server_enter": "輸入您的網域名稱",
     "encryption_server_desc": "要使用 HTTPS，您必須輸入與您 SSL 憑證相符的伺服器名稱。",
-    "encryption_redirect": "自動重新導向到 HTTPS",
+    "encryption_redirect": "自重新導向到 HTTPS",
     "encryption_redirect_desc": "如果啟用，AdGuard Home 將會自動導向 HTTP 到 HTTPS。",
     "encryption_https": "HTTPS 連接埠",
     "encryption_https_desc": "如果已設定 HTTPS，AdGuard Home 網頁管理介面將會使用 HTTPS 來存取，且「/dns-query」也提供 DNS-over-HTTPS 查詢。",
     "encryption_dot": "DNS-over-TLS 連接埠",
     "encryption_dot_desc": "如果已設定此連接埠，AdGuard Home 將啟動 DNS-over-TLS 伺服器來監聽請求。",
-    "encryption_doq": "DNS-over-QUIC 連接埠",
+    "encryption_doq": "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>取得免費的 SSL 憑證或從受信任的 SSL 憑證簽發機構購買。",
     "encryption_certificates_input": "在這裡複製/貼上您的 PEM 憑證。",
@@ -377,7 +370,7 @@
     "dns_status_error": "檢查 DNS 伺服器狀態錯誤",
     "down": "離線",
     "fix": "修正",
-    "dns_providers": "下列為常見的<0> DNS 伺服器</0>。",
+    "dns_providers": "下列是可以使用的<0>軟體清單</0>。",
     "update_now": "立即更新",
     "update_failed": "自動更新發生錯誤。請嘗試依照<a>以下步驟</a> 來手動更新。",
     "processing_update": "請稍候，AdGuard Home 正在更新",
@@ -400,7 +393,7 @@
     "form_add_id": "新增識別碼",
     "form_client_name": "輸入用戶端名稱",
     "name": "名稱",
-    "client_global_settings": "使用全域設定",
+    "client_global_settings": "Use global settings",
     "client_deleted": "已刪除「{{key}}」",
     "client_added": "已新增「{{key}}」",
     "client_updated": "已更新「{{key}}」",
@@ -416,7 +409,7 @@
     "access_disallowed_title": "用戶端黑名單",
     "access_disallowed_desc": "輸入 CIDR 或 IP 位址格式的清單，設定後 AdGuard Home 將拒絕設定的 IP 位址查詢請求。",
     "access_blocked_title": "網域黑名單",
-    "access_blocked_desc": "請不要與過濾器搞混，AdGuard Home 將對這些網域執行過濾檢查後丟棄 DNS 請求。您可以輸入特定網域名稱來使用設定，或使用萬用字元，例如：「example.org」、「*.example.org」或「||example.org^」。",
+    "access_blocked_desc": "請不要與過濾器混淆，AdGuard Home 將對這些網域執行過濾檢查，而是直接拒絕查詢。您可以輸入特定網域名稱來使用設定，或使用萬用字元，例如：「example.org」、「*.example.org」或「||example.org^」。",
     "access_settings_saved": "存取設定已儲存",
     "updates_checked": "檢查更新成功",
     "updates_version_equal": "AdGuard Home 是最新的版本",
@@ -425,19 +418,18 @@
     "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_4": "在 iOS 14 或 macOS Big Sur 裝置上，您可以下載特定的 '.mobileconfig' 檔案。此檔案將<highlight>DNS-over-HTTPS</highlight> 或 <highlight>DNS-over-TLS</highlight> 伺服器添加至 DNS 設定。",
-    "setup_dns_privacy_android_1": "Android 9 原生支援 DNS-over-TLS。前往「設定」→「網路 & 網際網路」→「進階」→「私人 DNS」設定。",
+    "setup_dns_privacy_android_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>。",
     "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 覆寫刪除成功",
@@ -448,7 +440,7 @@
     "rewrite_applied": "已套用 DNS 覆寫規則",
     "rewrite_hosts_applied": "由「hosts 檔案」覆寫",
     "dns_rewrites": "DNS 覆寫",
-    "form_domain": "輸入網域名稱或使用 wildcard 字元。",
+    "form_domain": "輸入網域名稱或使用萬用字元。",
     "form_answer": "輸入 IP 或網域名稱",
     "form_error_domain_format": "網域格式無效",
     "form_error_answer_format": "回應格式無效",
@@ -505,11 +497,11 @@
     "network": "網路",
     "descr": "描述",
     "whois": "Whois",
-    "filtering_rules_learn_more": "<0>進一步了解</0>如何創建自己的「hosts 檔案」",
+    "filtering_rules_learn_more": "<0>進一步了解</0>關於創建自己的「hosts 檔案」",
     "blocked_by_response": "回應時被 CNAME 或 IP 封鎖",
     "blocked_by_cname_or_ip": "使用 CNAME 或 IP 封鎖",
     "try_again": "再試一次",
-    "domain_desc": "輸入您想要覆寫的網域或 wildcard 字元。",
+    "domain_desc": "輸入您想要覆寫的網域或萬用字元。",
     "example_rewrite_domain": "DNS 覆寫只套用在這個域名。",
     "example_rewrite_wildcard": "DNS 覆寫會套用在 <0>example.org</0> 及所有子域名。",
     "rewrite_ip_address": "IP 位址：使用 A 或 AAAA 紀錄回應",
@@ -517,26 +509,27 @@
     "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": "未在您的過濾清單中找到",
@@ -576,7 +569,7 @@
     "enter_cache_size": "輸入快取大小（bytes）",
     "enter_cache_ttl_min_override": "輸入最小 TTL 值（秒）",
     "enter_cache_ttl_max_override": "輸入最大 TTL 值（秒）",
-    "cache_ttl_min_override_desc": "快取 DNS 回應時，延長從上游伺服器收到的 TTL 值 (秒）",
+    "cache_ttl_min_override_desc": "快取 DNS 回應時，延長從上遊伺服器收到的 TTL 值 (秒）",
     "cache_ttl_max_override_desc": "設定 DNS 快取條目的最大 TTL 值（秒）",
     "ttl_cache_validation": "最小快取 TTL 值必須小於或等於最大值",
     "filter_category_general": "一般",
@@ -591,7 +584,7 @@
     "original_response": "原始回應",
     "click_to_view_queries": "按一下以檢視查詢結果",
     "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
-    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。",
+    "adg_will_drop_dns_queries": "AdGuard Home 將要終止所有來自此用戶端的 DNS 查詢。",
     "client_not_in_allowed_clients": "此用戶端不被允許，它不在\"允許的用戶端\"列表中。",
     "experimental": "實驗性"
-}
+}

client/src/__locales/zh-tw.json

@@ -1,18 +1,13 @@
 {
     "client_settings": "用戶端設定",
-    "example_upstream_reserved": "您可<0>對於特定的網域</0>明確指定 DNS 上游",
+    "example_upstream_reserved": "您可明確指定<0>用於特定的網域</0>之 DNS 上游",
     "example_upstream_comment": "您可明確指定註解",
-    "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析。",
+    "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析網域",
     "parallel_requests": "並行的請求",
     "load_balancing": "負載平衡",
-    "load_balancing_desc": "每次查詢一個上游伺服器。AdGuard Home 將使用加權隨機的演算法來選擇伺服器，以便最快的伺服器被更常使用。",
+    "load_balancing_desc": "每次查詢一個伺服器。AdGuard Home 將使用加權隨機的演算法來選擇伺服器，以便最快的伺服器將被更常使用。",
     "bootstrap_dns": "自我啟動（Bootstrap）DNS 伺服器",
     "bootstrap_dns_desc": "自我啟動（Bootstrap）DNS 伺服器被用於解析您明確指定作為上游的 DoH/DoT 解析器之 IP 位址。",
-    "local_ptr_title": "私人 DNS 伺服器",
-    "local_ptr_desc": "AdGuard Home 用於區域指標（PTR）查詢之 DNS 伺服器。這些伺服器被用於解析含私人 IP 位址的用戶端之主機名稱，例如，\"192.168.12.34\"，使用反向的 DNS（rDNS）。如果未被設定，AdGuard Home 使用您的作業系統之預設 DNS 解析器。",
-    "local_ptr_placeholder": "每行輸入一個伺服器位址",
-    "resolve_clients_title": "啟用用戶端的 IP 位址之反向的解析",
-    "resolve_clients_desc": "如果被啟用，透過傳送指標（PTR）查詢到對應的解析器（私人 DNS 伺服器供區域的用戶端，上游的伺服器供有公共 IP 位址的用戶端），AdGuard Home 將試圖反向地解析用戶端的 IP 位址變為它們的主機名稱。",
     "check_dhcp_servers": "檢查動態主機設定協定（DHCP）伺服器",
     "save_config": "儲存配置",
     "enabled_dhcp": "動態主機設定協定（DHCP）伺服器被啟用",
@@ -23,7 +18,7 @@
     "dhcp_description": "如果您的路由器未提供動態主機設定協定（DHCP）設定，您可使用 AdGuard 自身內建的 DHCP 伺服器。",
     "dhcp_enable": "啟用動態主機設定協定（DHCP）伺服器",
     "dhcp_disable": "禁用動態主機設定協定（DHCP）伺服器",
-    "dhcp_not_found": "因為 AdGuard Home 於該網路上未發現任何現行的 DHCP 伺服器，啟用內建的動態主機設定協定（DHCP）伺服器為安全的。然而，您應手動地重新檢查那個，因為自動的探查目前不予 100％ 保證。",
+    "dhcp_not_found": "啟用內建的動態主機設定協定（DHCP）伺服器為安全的 - 於該網路上，我們未發現任何現行的 DHCP 伺服器。然而，我們鼓勵您手動地重新檢查它，因為我們的自動之測試目前不予 100％ 保證。",
     "dhcp_found": "於該網路上，一個現行的動態主機設定協定（DHCP）伺服器被發現。啟用內建的 DHCP 伺服器為不安全的。",
     "dhcp_leases": "動態主機設定協定（DHCP）租約",
     "dhcp_static_leases": "動態主機設定協定（DHCP）靜態租約",
@@ -37,8 +32,6 @@
     "form_error_ip_format": "無效的 IP 格式",
     "form_error_mac_format": "無效的媒體存取控制（MAC）格式",
     "form_error_client_id_format": "無效的用戶端 ID 格式",
-    "form_error_server_name": "無效的伺服器名稱",
-    "form_error_subnet": "子網路 \"{{cidr}}\" 不包含該 IP 位址 \"{{ip}}\"",
     "form_error_positive": "必須大於 0",
     "form_error_negative": "必須等於或大於 0",
     "range_end_error": "必須大於起始範圍",
@@ -55,10 +48,10 @@
     "ip": "IP",
     "dhcp_table_hostname": "主機名稱",
     "dhcp_table_expires": "到期",
-    "dhcp_warning": "如果您無論如何想要啟用動態主機設定協定（DHCP）伺服器，確保在您的網路中無其它現行的 DHCP 伺服器，因為對於該網路上的裝置，這可能破壞其網際網路連線！",
+    "dhcp_warning": "如果您無論如何想要啟用動態主機設定協定（DHCP）伺服器，確保在您的網路中無其它現行的 DHCP 伺服器。否則，它可能會破壞供已連線的裝置之網際網路！",
-    "dhcp_error": "AdGuard Home 無法確定於該網路上是否有另外現行的動態主機設定協定（DHCP）伺服器。",
+    "dhcp_error": "我們無法確定在該網路是否有另外的動態主機設定協定（DHCP）伺服器。",
-    "dhcp_static_ip_error": "為了使用動態主機設定協定（DHCP）伺服器，靜態 IP 位址必須被設定。AdGuard Home 未能確定此網路介面是否被配置使用靜態 IP 位址。請手動地設定靜態 IP 位址。",
+    "dhcp_static_ip_error": "為了使用動態主機設定協定（DHCP）伺服器，靜態 IP 位址必須被設定。我們未能確定該網路介面是否被配置使用靜態 IP 位址。請手動地設定靜態 IP 位址。",
-    "dhcp_dynamic_ip_found": "您的系統使用動態 IP 位址配置供介面 <0>{{interfaceName}}</0>。為了使用動態主機設定協定（DHCP）伺服器，靜態 IP 位址必須被設定。您現行的 IP 位址為 <0>{{ipAddress}}</0>。如果您按\"啟用 DHCP 伺服器\" 按鈕，AdGuard Home 將自動地設定此 IP 位址作為靜態。",
+    "dhcp_dynamic_ip_found": "您的系統使用動態 IP 位址配置供介面 <0>{{interfaceName}}</0>。為了使用動態主機設定協定（DHCP）伺服器，靜態 IP 位址必須被設定。您現行的 IP 位址為 <0>{{ipAddress}}</0>。如果您按啟用 DHCP 按鈕，我們將自動地設定此 IP 位址作為靜態。",
     "dhcp_lease_added": "靜態租約 \"{{key}}\" 被成功地加入",
     "dhcp_lease_deleted": "靜態租約 \"{{key}}\" 被成功地刪除",
     "dhcp_new_static_lease": "新的靜態租約",
@@ -81,7 +74,7 @@
     "filter": "過濾器",
     "query_log": "查詢記錄",
     "compact": "精簡的",
-    "nothing_found": "沒找到什麼",
+    "nothing_found": "無什麼被找到",
     "faq": "常見問答集",
     "version": "版本",
     "address": "位址",
@@ -140,7 +133,7 @@
     "encryption_settings": "加密設定",
     "dhcp_settings": "動態主機設定協定（DHCP）設定",
     "upstream_dns": "上游的 DNS 伺服器",
-    "upstream_dns_help": "每行輸入一個伺服器位址。<a>了解更多</a>有關配置上游的 DNS 伺服器。",
+    "upstream_dns_help": "輸入伺服器位址，每行一個。<a>了解更多</a>有關配置上游的 DNS 伺服器。",
     "upstream_dns_configured_in_file": "被配置在 {{path}}",
     "test_upstream_btn": "測試上行資料流",
     "upstreams": "上游",
@@ -254,25 +247,19 @@
     "custom_ip": "自訂的 IP",
     "blocking_ipv4": "封鎖 IPv4",
     "blocking_ipv6": "封鎖 IPv6",
-    "dnscrypt": "DNSCrypt",
     "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 被識別。<0>於此</0>，您可了解更多關於如何識別用戶端。",
     "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": "速率限制",
     "edns_enable": "啟用對於 DNS 的擴充機制（EDNS）用戶端子網路",
     "edns_cs_desc": "如果被啟用，AdGuard Home 將持續傳送用戶端的子網路到 DNS 伺服器。",
-    "rate_limit_desc": "每個用戶端被允許的每秒請求之數量。設定它為 0 表示無限制。",
+    "rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（設定它為 0 表示無限制的）",
     "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
     "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
-    "blocking_mode_default": "預設：當被 AdBlock 樣式的規則封鎖時，以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
+    "blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
     "blocking_mode_refused": "已拒絕（REFUSED）：以 REFUSED 碼回覆",
     "blocking_mode_nxdomain": "不存在的網域（NXDOMAIN）：以 NXDOMAIN 碼回覆",
     "blocking_mode_null_ip": "無效的 IP：以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆",
@@ -292,7 +279,7 @@
     "install_settings_listen": "監聽介面",
     "install_settings_port": "連接埠",
     "install_settings_interface_link": "您的 AdGuard Home 管理員網路介面將於下列的位址上為可用的：",
-    "form_error_port": "輸入有效的連接埠號碼",
+    "form_error_port": "輸入有效的連接埠值",
     "install_settings_dns": "DNS 伺服器",
     "install_settings_dns_desc": "您將需要配置您的裝置或路由器以使用於下列的位址上之 DNS 伺服器：",
     "install_settings_all_interfaces": "所有的介面",
@@ -311,10 +298,10 @@
     "install_devices_router": "路由器",
     "install_devices_router_desc": "此設置將自動地涵蓋所有被連線至您的家庭路由器之裝置，且您將無需手動地配置它們每個。",
     "install_devices_address": "AdGuard Home DNS 伺服器正在監聽下列的位址",
-    "install_devices_router_list_1": "開啟用於您的路由器之偏好設定。通常地，您可透過網址，諸如 http://192.168.0.1/ 或 http://192.168.1.1/，從您的瀏覽器中存取它。您可能被提醒輸入密碼。如果您不記得它，您經常可透過按壓於該路由器本身上的按鈕來重置密碼，但請明白如果此步驟被選擇，您將可能失去整個路由器配置。如果您的路由器需要應用程式去設置它，請於您的手機或個人電腦上安裝該應用程式，並使用它來存取該路由器的設定。",
+    "install_devices_router_list_1": "開啟關於您的路由器之偏好設定。通常地，您可透過網址（如 http://192.168.0.1/ 或 http://192.168.1.1/）從您的瀏覽器中存取它。您可能被要求輸入該密碼。如果您不記得它，您經常可透過按壓於該路由器本身上的按鈕來重置密碼。某些路由器需要特定的應用程式，既然如此其應已被安裝於您的電腦/手機上。",
     "install_devices_router_list_2": "找到 DHCP/DNS 設定。尋找緊鄰著允許兩組或三組數字集的欄位之 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 作為 <0>DHCP 伺服器</0>，其可能有所幫助。否則，您應搜尋有關如何為您的特定路由器型號自訂 DNS 伺服器之用法說明。",
     "install_devices_windows_list_1": "通過開始功能表或 Windows 搜尋，開啟控制台。",
     "install_devices_windows_list_2": "去網路和網際網路類別，然後去網路和共用中心。",
     "install_devices_windows_list_3": "於畫面之左側上找到變更介面卡設定並向它點擊。",
@@ -343,7 +330,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 連接埠",
@@ -371,9 +358,9 @@
     "encryption_reset": "您確定您想要重置加密設定嗎？",
     "topline_expiring_certificate": "您的安全通訊端層（SSL）憑證即將到期。更新<0>加密設定</0>。",
     "topline_expired_certificate": "您的安全通訊端層（SSL）憑證為已到期的。更新<0>加密設定</0>。",
-    "form_error_port_range": "輸入在 80-65535 之範圍內的連接埠號碼",
+    "form_error_port_range": "在 80-65535 之範圍內輸入連接埠值",
     "form_error_port_unsafe": "此為不安全的連接埠",
-    "form_error_equal": "必須為不相等的",
+    "form_error_equal": "不應為相等的",
     "form_error_password": "不相符的密碼",
     "reset_settings": "重置設定",
     "update_announcement": "AdGuard Home {{version}} 現為可用的！關於更多的資訊，<0>點擊這裡</0>。",
@@ -399,9 +386,8 @@
     "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）位址識別。請注意，只要 AdGuard Home 也是<0>動態主機設定協定（DHCP）伺服器</0>，使用 MAC 作為識別碼是可能的",
     "form_enter_ip": "輸入 IP",
-    "form_enter_subnet_ip": "在子網路 \"{{cidr}}\" 中輸入一組 IP 位址",
     "form_enter_mac": "輸入媒體存取控制（MAC）",
     "form_enter_id": "輸入識別碼",
     "form_add_id": "增加識別碼",
@@ -423,7 +409,7 @@
     "access_disallowed_title": "不允許的用戶端",
     "access_disallowed_desc": "無類別網域間路由（CIDR）或 IP 位址之清單。如果被配置，AdGuard Home 將排除來自這些 IP 位址的請求。",
     "access_blocked_title": "不允許的網域",
-    "access_blocked_desc": "不要把這個和過濾器混淆。AdGuard Home 將從查詢的詢問中排除有這些網域的 DNS 查詢。您可於此明確指定確切的域名、萬用字元（wildcard）和網址過濾器的規則，例如，\"example.org\"、\"*.example.org\" 或 \"||example.org^\"。",
+    "access_blocked_desc": "不要把這個和過濾器混淆。AdGuard Home 將從查詢的詢問中排除有這些網域的 DNS 查詢。您可於此明確指定確切的域名、萬用字元（wildcard）和網址過濾器的規則，例如，'example.org'、'*.example.org' 或 '||example.org^'。",
     "access_settings_saved": "存取設定被成功地儲存",
     "updates_checked": "更新被成功地檢查",
     "updates_version_equal": "AdGuard Home 為最新的",
@@ -444,7 +430,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 改寫被成功地刪除",
@@ -526,7 +511,7 @@
     "disable_ipv6": "禁用 IPv6",
     "disable_ipv6_desc": "如果此功能被啟用，所有對於 IPv6 位址（類型 AAAA）的 DNS 查詢將被丟棄。",
     "fastest_addr": "最快的 IP 位址",
-    "fastest_addr_desc": "查詢所有的 DNS 伺服器並返回在所有的回應之中最快的 IP 位址。因為 AdGuard Home 必須等待來自所有的 DNS 伺服器之回應，這使 DNS 查詢變慢，但改善總體的連線。",
+    "fastest_addr_desc": "查詢所有的 DNS 伺服器並返回在所有的回應之中最快的 IP 位址。因為我們必須等待來自所有的 DNS 伺服器之回應，這將使 DNS 查詢變慢，但改善總體的連線。",
     "autofix_warning_text": "如果您點擊\"修復\"，AdGuard Home 將配置您的系統使用 AdGuard Home DNS 伺服器。",
     "autofix_warning_list": "它將執行這些任務：<0>撤銷系統 DNSStubListener</0> <0>設定 DNS 伺服器位址為 127.0.0.1</0> <0>用 /run/systemd/resolve/resolv.conf 取代 /etc/resolv.conf 的符號連結目標</0> <0>停止 DNSStubListener（重新載入 systemd 已解析的服務）</0>",
     "autofix_warning_result": "因此，預設下，來自您的系統之所有的 DNS 請求將被 AdGuard Home 處理。",
@@ -544,6 +529,7 @@
     "check_ip": "IP 位址：{{ip}}",
     "check_cname": "正規名稱（CNAME）：{{cname}}",
     "check_reason": "原因：{{reason}}",
+    "check_rule": "規則：{{rule}}",
     "check_service": "服務名稱：{{service}}",
     "service_name": "服務名稱",
     "check_not_found": "未在您的過濾器中被找到",
@@ -556,7 +542,7 @@
     "set_static_ip": "設定一組靜態 IP 位址",
     "install_static_ok": "好消息！該靜態 IP 位址已被配置",
     "install_static_error": "AdGuard Home 無法自動地配置它供此網路介面。請尋找有關如何手動地完成這個的用法說明。",
-    "install_static_configure": "AdGuard Home 已偵測到動態 IP 位址 <0>{{ip}}</0> 被使用。您想要它被設定為您的靜態位址嗎？",
+    "install_static_configure": "我們已偵測到一組動態 IP 位址被使用 — <0>{{ip}}</0>。您想要使用它作為您的靜態位址嗎？",
     "confirm_static_ip": "AdGuard Home 將配置 {{ip}} 為您的靜態 IP 位址。您想要繼續嗎？",
     "list_updated": "{{count}} 清單被更新",
     "list_updated_plural": "{{count}} 清單被更新",
@@ -599,6 +585,6 @@
     "click_to_view_queries": "點擊以檢視查詢",
     "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。",
     "adg_will_drop_dns_queries": "AdGuard Home 將持續排除來自此用戶端之所有的 DNS 查詢。",
-    "client_not_in_allowed_clients": "該用戶端未被允許，因為它不在\"已允許的用戶端\"清單中。",
+    "client_not_in_allowed_clients": "因為該用戶端不在\"已允許的用戶端\"清單中，它未被允許。",
     "experimental": "實驗性的"
-}
+}

client/src/__tests__/helpers.test.js

@@ -1,9 +1,4 @@
-import {
+import { sortIp, countClientsStatistics, findAddressType } from '../helpers/helpers';
-    sortIp,
-    countClientsStatistics,
-    findAddressType,
-    subnetMaskToBitMask,
-} from '../helpers/helpers';
 import { ADDRESS_TYPES } from '../helpers/constants';
 
 describe('sortIp', () => {
@@ -411,50 +406,3 @@ describe('countClientsStatistics', () => {
         })).toStrictEqual(0);
     });
 });
-
-describe('subnetMaskToBitMask', () => {
-    const subnetMasks = [
-        '0.0.0.0',
-        '128.0.0.0',
-        '192.0.0.0',
-        '224.0.0.0',
-        '240.0.0.0',
-        '248.0.0.0',
-        '252.0.0.0',
-        '254.0.0.0',
-        '255.0.0.0',
-        '255.128.0.0',
-        '255.192.0.0',
-        '255.224.0.0',
-        '255.240.0.0',
-        '255.248.0.0',
-        '255.252.0.0',
-        '255.254.0.0',
-        '255.255.0.0',
-        '255.255.128.0',
-        '255.255.192.0',
-        '255.255.224.0',
-        '255.255.240.0',
-        '255.255.248.0',
-        '255.255.252.0',
-        '255.255.254.0',
-        '255.255.255.0',
-        '255.255.255.128',
-        '255.255.255.192',
-        '255.255.255.224',
-        '255.255.255.240',
-        '255.255.255.248',
-        '255.255.255.252',
-        '255.255.255.254',
-        '255.255.255.255',
-    ];
-
-    test('correct for all subnetMasks', () => {
-        expect(
-            subnetMasks.map((subnetMask) => {
-                const bitmask = subnetMaskToBitMask(subnetMask);
-                return subnetMasks[bitmask] === subnetMask;
-            }).every((res) => res === true),
-        ).toEqual(true);
-    });
-});

client/src/actions/dnsConfig.js

@@ -33,10 +33,6 @@ export const setDnsConfig = (config) => async (dispatch) => {
             data.bootstrap_dns = splitByNewLine(config.bootstrap_dns);
             hasDnsSettings = true;
         }
-        if (Object.prototype.hasOwnProperty.call(data, 'local_ptr_upstreams')) {
-            data.local_ptr_upstreams = splitByNewLine(config.local_ptr_upstreams);
-            hasDnsSettings = true;
-        }
         if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
             data.upstream_dns = splitByNewLine(config.upstream_dns);
             hasDnsSettings = true;

client/src/actions/index.js

@@ -287,7 +287,7 @@ export const getDnsStatus = () => async (dispatch) => {
     try {
         checkStatus(handleRequestSuccess, handleRequestError);
     } catch (error) {
-        handleRequestError();
+        handleRequestError(error);
     }
 };
 
@@ -296,7 +296,7 @@ export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
 export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');
 
 export const testUpstream = (
-    { bootstrap_dns, upstream_dns, local_ptr_upstreams }, upstream_dns_file,
+    { bootstrap_dns, upstream_dns }, upstream_dns_file,
 ) => async (dispatch) => {
     dispatch(testUpstreamRequest());
     try {
@@ -304,7 +304,6 @@ export const testUpstream = (
 
         const config = {
             bootstrap_dns: splitByNewLine(bootstrap_dns),
-            private_upstream: splitByNewLine(local_ptr_upstreams),
             ...(upstream_dns_file ? null : {
                 upstream_dns: removeComments(upstream_dns),
             }),
@@ -333,17 +332,8 @@ export const testUpstream = (
 
 export const testUpstreamWithFormValues = () => async (dispatch, getState) => {
     const { upstream_dns_file } = getState().dnsConfig;
-    const {
+    const { bootstrap_dns, upstream_dns } = getState().form[FORM_NAME.UPSTREAM].values;
-        bootstrap_dns,
+    return dispatch(testUpstream({ bootstrap_dns, upstream_dns }, upstream_dns_file));
-        upstream_dns,
-        local_ptr_upstreams,
-    } = getState().form[FORM_NAME.UPSTREAM].values;
-
-    return dispatch(testUpstream({
-        bootstrap_dns,
-        upstream_dns,
-        local_ptr_upstreams,
-    }, upstream_dns_file));
 };
 
 export const changeLanguageRequest = createAction('CHANGE_LANGUAGE_REQUEST');

client/src/actions/queryLogs.js

@@ -1,12 +1,23 @@
 import { createAction } from 'redux-actions';
 
 import apiClient from '../api/Api';
-import { normalizeLogs } from '../helpers/helpers';
+import { normalizeLogs, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
 import {
     DEFAULT_LOGS_FILTER, FORM_NAME, QUERY_LOGS_PAGE_LIMIT,
 } from '../helpers/constants';
 import { addErrorToast, addSuccessToast } from './toasts';
 
+const enrichWithClientInfo = async (logs) => {
+    const clientsParams = getParamsForClientsSearch(logs, 'client');
+
+    if (Object.keys(clientsParams).length > 0) {
+        const clients = await apiClient.findClients(clientsParams);
+        return addClientInfo(logs, clients, 'client');
+    }
+
+    return logs;
+};
+
 const getLogsWithParams = async (config) => {
     const { older_than, filter, ...values } = config;
     const rawLogs = await apiClient.getQueryLog({
@@ -14,9 +25,11 @@ const getLogsWithParams = async (config) => {
         older_than,
     });
     const { data, oldest } = rawLogs;
+    const normalizedLogs = normalizeLogs(data);
+    const logs = await enrichWithClientInfo(normalizedLogs);
 
     return {
-        logs: normalizeLogs(data),
+        logs,
         oldest,
         older_than,
         filter,
@@ -79,8 +92,10 @@ export const updateLogs = () => async (dispatch, getState) => {
     try {
         const { logs, oldest, older_than } = getState().queryLogs;
 
+        const enrichedLogs = await enrichWithClientInfo(logs);
+
         dispatch(getLogsSuccess({
-            logs,
+            logs: enrichedLogs,
             oldest,
             older_than,
         }));

client/src/components/App/index.css

@@ -1,11 +1,10 @@
 :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;
-    --font-size-disable-autozoom: 1rem;
 }
 
 body {
@@ -14,13 +13,6 @@ body {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
 }
 
-/* Disable Auto Zoom in Input - Safari on iPhone https://stackoverflow.com/a/6394497 */
-@media screen and (max-width: 767px) {
-    input, select, textarea {
-        font-size: var(--font-size-disable-autozoom);
-    }
-}
-
 .status {
     margin-top: 30px;
 }
@@ -79,11 +71,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 (
+    return <div className="table__action pl-4">
-        <div className="table__action pl-4">
+        <button
-            <button
                 type="button"
                 className={buttonClass}
                 onClick={isNotInAllowedList ? undefined : onClick}
                 disabled={isNotInAllowedList || processingSet}
                 title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
-            >
+        >
-                <Trans>{text}</Trans>
+            <Trans>{text}</Trans>
-            </button>
+        </button>
-        </div>
+    </div>;
-    );
 };
 
 const ClientCell = (row) => {
@@ -96,14 +90,13 @@ const Clients = ({
     const { t } = useTranslation();
     const topClients = useSelector((state) => state.stats.topClients, shallowEqual);
 
-    return (
+    return <Card
-        <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

@@ -34,7 +34,7 @@
     align-items: center;
 }
 
-.dashboard-title__button {
+.dashboard-title__button{
     margin: 0 0.5rem;
 }
 
@@ -44,7 +44,7 @@
         align-items: flex-start;
     }
 
-    .dashboard-title__button {
+    .dashboard-title__button{
         margin: 0.5rem 0;
         display: block;
     }

client/src/components/Dashboard/index.js

@@ -44,7 +44,6 @@ const Dashboard = ({
     const refreshButton = <button
             type="button"
             className="btn btn-icon btn-outline-primary btn-sm"
-            title={t('refresh_btn')}
             onClick={() => getAllStats()}
     >
         <svg className="icons">

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 filter_id = useSelector((state) => state.filtering.check.filter_id);
-    const reason = useSelector((state) => state.filtering.check.reason);
+
+    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.FILTERED_BLACK_LIST]: filterName,
-        [FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: ruleAndFilterNames,
+        [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>
+        <div>{filterName}</div>
-            {t('rule_label')}:
-            &nbsp;
-            {ruleAndFilterNames}
-        </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/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,9 +16,11 @@ import { updateLogs } from '../../../actions/queryLogs';
 
 const ClientCell = ({
     client,
-    client_id,
-    client_info,
     domain,
+    info,
+    info: {
+        name, whois_info, disallowed, disallowed_rule,
+    },
     reason,
 }) => {
     const { t } = useTranslation();
@@ -30,22 +32,16 @@ const ClientCell = ({
 
     const autoClient = autoClients.find((autoClient) => autoClient.name === client);
     const source = autoClient?.source;
-    const whoisAvailable = client_info && Object.keys(client_info.whois).length > 0;
+    const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
-    const clientName = client_info?.name || client_id;
-    const clientInfo = client_info && {
-        ...client_info,
-        whois_info: client_info?.whois,
-        name: clientName,
-    };
 
     const id = nanoid();
 
     const data = {
         address: client,
-        name: clientName,
+        name,
-        country: client_info?.whois?.country,
+        country: whois_info?.country,
-        city: client_info?.whois?.city,
+        city: whois_info?.city,
-        network: client_info?.whois?.orgname,
+        network: whois_info?.orgname,
         source_label: source,
     };
 
@@ -54,7 +50,7 @@ const ClientCell = ({
     const isFiltered = checkFiltered(reason);
 
     const nameClass = classNames('w-90 o-hidden d-flex flex-column', {
-        'mt-2': isDetailed && !client_info?.name && !whoisAvailable,
+        'mt-2': isDetailed && !name && !whoisAvailable,
         'white-space--nowrap': isDetailed,
     });
 
@@ -70,11 +66,7 @@ const ClientCell = ({
             confirmMessage,
             buttonKey: blockingClientKey,
             isNotInAllowedList,
-        } = getBlockClientInfo(
+        } = getBlockClientInfo(client, disallowed, disallowed_rule);
-            client,
-            client_info?.disallowed || false,
-            client_info?.disallowed_rule || '',
-        );
 
         const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
         const clientNameBlockingFor = getBlockingClientName(clients, client);
@@ -90,11 +82,7 @@ const ClientCell = ({
                 name: blockingClientKey,
                 onClick: async () => {
                     if (window.confirm(confirmMessage)) {
-                        await dispatch(toggleClientBlock(
+                        await dispatch(toggleClientBlock(client, disallowed, disallowed_rule));
-                            client,
-                            client_info?.disallowed || false,
-                            client_info?.disallowed_rule || '',
-                        ));
                         await dispatch(updateLogs());
                     }
                 },
@@ -111,20 +99,13 @@ const ClientCell = ({
             if (options.length === 0) {
                 return null;
             }
-            return (
+            return <>{options.map(({ name, onClick, disabled }) => <button
-                <>
+                    key={name}
-                    {options.map(({ name, onClick, disabled }) => (
+                    className="button-action--arrow-option px-4 py-2"
-                        <button
+                    onClick={onClick}
-                            key={name}
+                    disabled={disabled}
-                            className="button-action--arrow-option px-4 py-2"
+            >{t(name)}
-                            onClick={onClick}
+            </button>)}</>;
-                            disabled={disabled}
-                        >
-                            {t(name)}
-                        </button>
-                    ))}
-                </>
-            );
         };
 
         const content = getOptions(BUTTON_OPTIONS);
@@ -144,82 +125,59 @@ const ClientCell = ({
             'button-action__container--detailed': isDetailed,
         });
 
-        return (
+        return <div className={containerClass}>
-            <div className={containerClass}>
+            <button type="button"
-                <button
-                    type="button"
                     className={buttonClass}
                     onClick={onClick}
                     disabled={processingRules}
-                >
+            >
-                    {t(buttonType)}
+                {t(buttonType)}
-                </button>
+            </button>
-                {content && (
+            {content && <button className={buttonArrowClass} disabled={processingRules}>
-                    <button className={buttonArrowClass} disabled={processingRules}>
+                <IconTooltip
-                        <IconTooltip
+                        className='h-100'
-                            className="h-100"
+                        tooltipClass='button-action--arrow-option-container'
-                            tooltipClass="button-action--arrow-option-container"
+                        xlinkHref='chevron-down'
-                            xlinkHref="chevron-down"
+                        triggerClass='button-action--icon'
-                            triggerClass="button-action--icon"
+                        content={content} placement="bottom-end" trigger="click"
-                            content={content}
+                        onVisibilityChange={setOptionsOpened}
-                            placement="bottom-end"
+                />
-                            trigger="click"
+            </button>}
-                            onVisibilityChange={setOptionsOpened}
+        </div>;
-                        />
-                    </button>
-                )}
-            </div>
-        );
     };
 
-    return (
+    return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
-        <div
+        <IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
-            className="o-hidden h-100 logs__cell logs__cell--client"
+                     xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
-            role="gridcell"
+                     content={processedData} placement="bottom" />
-        >
+        <div className={nameClass}>
-            <IconTooltip
+            <div data-tip={true} data-for={id}>
-                className={hintClass}
+                {renderFormattedClientCell(client, info, isDetailed, true)}
-                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>
-                )}
             </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,
-    client_info: propTypes.shape({
-        ids: propTypes.arrayOf(propTypes.string).isRequired,
-        name: propTypes.string.isRequired,
-        whois: propTypes.shape({
-            country: propTypes.string,
-            city: propTypes.string,
-            orgname: propTypes.string,
-        }).isRequired,
-        disallowed: propTypes.bool.isRequired,
-        disallowed_rule: propTypes.string.isRequired,
-    }),
     domain: propTypes.string.isRequired,
+    info: propTypes.oneOfType([
+        propTypes.string,
+        propTypes.shape({
+            name: propTypes.string.isRequired,
+            whois_info: propTypes.shape({
+                country: propTypes.string,
+                city: propTypes.string,
+                orgname: propTypes.string,
+            }),
+            disallowed: propTypes.bool.isRequired,
+            disallowed_rule: propTypes.string.isRequired,
+        }),
+    ]),
     reason: propTypes.string.isRequired,
 };
 

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 ? { service_name: getServiceName(service_name) } : { filter }),
-                && { service_name: getServiceName(service_name) }
+        rule_label: rule,
-        ),
-        ...(rules.length > 0
-                && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
-        ),
         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 filter;
-                return getFilterNames(rules, filters, whitelistFilters).join(', ');
             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({
+    rule: propTypes.string,
-        text: propTypes.string.isRequired,
+    filterId: propTypes.number,
-        filter_list_id: propTypes.number.isRequired,
-    })),
     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';
@@ -29,12 +29,11 @@ import DateCell from './DateCell';
 import DomainCell from './DomainCell';
 import ResponseCell from './ResponseCell';
 import ClientCell from './ClientCell';
+import '../Logs.css';
 import { toggleClientBlock } from '../../../actions/access';
 import { getBlockClientInfo, BUTTON_PREFIX } from './helpers';
 import { updateLogs } from '../../../actions/queryLogs';
 
-import '../Logs.css';
-
 const Row = memo(({
     style,
     rowProps,
@@ -62,15 +61,17 @@ const Row = memo(({
             client,
             domain,
             elapsedMs,
-            client_info,
+            info,
+            info: { disallowed, disallowed_rule },
+            reason,
             response,
             time,
             tracker,
             upstream,
             type,
             client_proto,
-            client_id,
+            filterId,
-            rules,
+            rule,
             originalResponse,
             status,
             service_name,
@@ -81,6 +82,11 @@ const Row = memo(({
         const autoClient = autoClients
             .find((autoClient) => autoClient.name === client);
 
+        const { whois_info } = info;
+        const country = whois_info?.country;
+        const city = whois_info?.city;
+        const network = whois_info?.orgname;
+
         const source = autoClient?.source;
 
         const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
@@ -101,15 +107,13 @@ const Row = memo(({
 
         const sourceData = getSourceData(tracker);
 
+        const filter = getFilterName(filters, whitelistFilters, filterId);
+
         const {
             confirmMessage,
             buttonKey: blockingClientKey,
             isNotInAllowedList,
-        } = getBlockClientInfo(
+        } = getBlockClientInfo(client, disallowed, disallowed_rule);
-            client,
-            client_info?.disallowed || false,
-            client_info?.disallowed_rule || '',
-        );
 
         const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
         const clientNameBlockingFor = getBlockingClientName(clients, client);
@@ -120,13 +124,7 @@ const Row = memo(({
 
         const onBlockingClientClick = async () => {
             if (window.confirm(confirmMessage)) {
-                await dispatch(
+                await dispatch(toggleClientBlock(client, disallowed, disallowed_rule));
-                    toggleClientBlock(
-                        client,
-                        client_info?.disallowed || false,
-                        client_info?.disallowed_rule || '',
-                    ),
-                );
                 await dispatch(updateLogs());
                 setModalOpened(false);
             }
@@ -174,17 +172,16 @@ const Row = memo(({
             response_details: 'title',
             install_settings_dns: upstream,
             elapsed: formattedElapsedMs,
-            ...(rules.length > 0
+            filter: rule ? filter : null,
-                    && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
+            rule_label: rule,
-            ),
             response_table_header: response?.join('\n'),
             response_code: status,
             client_details: 'title',
             ip_address: client,
-            name: client_info?.name || client_id,
+            name: info?.name,
-            country: client_info?.whois?.country,
+            country,
-            city: client_info?.whois?.city,
+            city,
-            network: client_info?.whois?.orgname,
+            network,
             source_label: source,
             validated_with_dnssec: dnssec_enabled ? Boolean(answer_dnssec) : false,
             original_response: originalResponse?.join('\n'),
@@ -223,28 +220,23 @@ Row.propTypes = {
         client: propTypes.string.isRequired,
         domain: propTypes.string.isRequired,
         elapsedMs: propTypes.string.isRequired,
+        info: propTypes.oneOfType([
+            propTypes.string,
+            propTypes.shape({
+                whois_info: propTypes.shape({
+                    country: propTypes.string,
+                    city: propTypes.string,
+                    orgname: propTypes.string,
+                }),
+            })]),
         response: propTypes.array.isRequired,
         time: propTypes.string.isRequired,
         tracker: propTypes.object,
         upstream: propTypes.string.isRequired,
         type: propTypes.string.isRequired,
         client_proto: propTypes.string.isRequired,
-        client_id: propTypes.string,
+        filterId: propTypes.number,
-        client_info: propTypes.shape({
+        rule: propTypes.string,
-            ids: propTypes.arrayOf(propTypes.string).isRequired,
-            name: propTypes.string.isRequired,
-            whois: propTypes.shape({
-                country: propTypes.string,
-                city: propTypes.string,
-                orgname: propTypes.string,
-            }).isRequired,
-            disallowed: propTypes.bool.isRequired,
-            disallowed_rule: propTypes.string.isRequired,
-        }),
-        rules: propTypes.arrayOf(propTypes.shape({
-            text: propTypes.string.isRequired,
-            filter_list_id: propTypes.number.isRequired,
-        })),
         originalResponse: propTypes.array,
         status: propTypes.string.isRequired,
         service_name: propTypes.string,

client/src/components/Logs/InfiniteTable.js

@@ -3,7 +3,7 @@ import React, {
     useEffect,
     useRef,
 } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import propTypes from 'prop-types';
 import throttle from 'lodash/throttle';
@@ -25,21 +25,19 @@ const InfiniteTable = ({
     const { t } = useTranslation();
     const dispatch = useDispatch();
     const loader = useRef(null);
-    const loadingRef = useRef(null);
 
-    const isEntireLog = useSelector((state) => state.queryLogs.isEntireLog);
+    const {
-    const processingGetLogs = useSelector((state) => state.queryLogs.processingGetLogs);
+        isEntireLog,
+        processingGetLogs,
+    } = useSelector((state) => state.queryLogs, shallowEqual);
+
     const loading = isLoading || processingGetLogs;
 
     const listener = useCallback(() => {
-        if (!loadingRef.current && loader.current && isScrolledIntoView(loader.current)) {
+        if (loader.current && isScrolledIntoView(loader.current)) {
             dispatch(getLogs());
         }
-    }, []);
+    }, [loader.current, isScrolledIntoView, getLogs]);
-
-    useEffect(() => {
-        loadingRef.current = processingGetLogs;
-    }, [processingGetLogs]);
 
     useEffect(() => {
         listener();
@@ -56,13 +54,13 @@ const InfiniteTable = ({
     }, []);
 
     const renderRow = (row, idx) => <Row
-        key={idx}
+                    key={idx}
-        rowProps={row}
+                    rowProps={row}
-        isSmallScreen={isSmallScreen}
+                    isSmallScreen={isSmallScreen}
-        setDetailedDataCurrent={setDetailedDataCurrent}
+                    setDetailedDataCurrent={setDetailedDataCurrent}
-        setButtonType={setButtonType}
+                    setButtonType={setButtonType}
-        setModalOpened={setModalOpened}
+                    setModalOpened={setModalOpened}
-    />;
+            />;
 
     const isNothingFound = items.length === 0 && !processingGetLogs;
 

client/src/components/Logs/Logs.css

@@ -9,18 +9,21 @@
     --size-response: 150;
     --size-client: 123;
     --gray-216: rgba(216, 216, 216, 0.23);
-    --gray-4d: #4d4d4d;
+    --gray-4d: #4D4D4D;
-    --gray-f3: #f3f3f3;
+    --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: #C23814;
-    --btn-block-active: #a62200;
+    --btn-block-disabled: #E3B3A6;
+    --btn-block-active: #A62200;
+
     --btn-unblock: #888888;
-    --btn-unblock-disabled: #d8d8d8;
+    --btn-unblock-disabled: #D8D8D8;
-    --btn-unblock-active: #4d4d4d;
+    --btn-unblock-active: #4D4D4D;
+
     --option-border-radius: 4px;
 }
 
@@ -37,7 +40,7 @@
 }
 
 .logs__text--bold {
-    font-weight: 600;
+    font-weight: bold;
 }
 
 .logs__time {
@@ -84,7 +87,7 @@
 }
 
 .custom-select__arrow--left {
-    background: var(--white) url("../ui/svg/chevron-down.svg") no-repeat;
+    background: var(--white) url('../ui/svg/chevron-down.svg') no-repeat;
     background-position: 5px 9px;
     background-size: 22px;
 }
@@ -164,13 +167,12 @@
 }
 
 .logs__refresh {
+    --size: 2.5rem;
     position: relative;
     top: 3px;
     display: inline-flex;
     align-items: center;
     justify-content: center;
-
-    --size: 2.5rem;
     width: var(--size);
     height: var(--size);
     padding: 0;
@@ -358,7 +360,7 @@
     color: var(--gray-4d);
     background-color: var(--white80);
     pointer-events: none;
-    font-weight: 600;
+    font-weight: bold;
     text-align: center;
     padding-top: 21rem;
     display: block;
@@ -429,13 +431,3 @@
     margin-right: 1px;
     opacity: 0.5;
 }
-
-.filteringRules__rule {
-    margin-bottom: 0;
-}
-
-.filteringRules__filter {
-    font-style: italic;
-    font-weight: normal;
-    margin-bottom: 1rem;
-}

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

@@ -282,7 +282,7 @@ let Form = (props) => {
                         <div className="form__desc mt-0">
                             <Trans
                                 components={[
-                                    <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient" key="0" target="_blank" rel="noopener noreferrer">
+                                    <a href="#dhcp" key="0">
                                         link
                                     </a>,
                                 ]}

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

@@ -3,14 +3,8 @@ import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
-
+import { renderInputField } from '../../../../helpers/form';
-import { renderInputField, normalizeMac } from '../../../../helpers/form';
+import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators';
-import {
-    validateIpv4,
-    validateMac,
-    validateRequiredValue,
-    validateIpv4InCidr,
-} from '../../../../helpers/validators';
 import { FORM_NAME } from '../../../../helpers/constants';
 import { toggleLeaseModal } from '../../../../actions';
 
@@ -20,7 +14,6 @@ const Form = ({
     pristine,
     submitting,
     processingAdding,
-    cidr,
 }) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
@@ -41,7 +34,6 @@ const Form = ({
                         type="text"
                         className="form-control"
                         placeholder={t('form_enter_mac')}
-                        normalize={normalizeMac}
                         validate={[validateRequiredValue, validateMac]}
                     />
                 </div>
@@ -52,8 +44,8 @@ const Form = ({
                         component={renderInputField}
                         type="text"
                         className="form-control"
-                        placeholder={t('form_enter_subnet_ip', { cidr })}
+                        placeholder={t('form_enter_ip')}
-                        validate={[validateRequiredValue, validateIpv4, validateIpv4InCidr]}
+                        validate={[validateRequiredValue, validateIpv4]}
                     />
                 </div>
                 <div className="form__group">
@@ -92,18 +84,11 @@ const Form = ({
 };
 
 Form.propTypes = {
-    initialValues: PropTypes.shape({
-        mac: PropTypes.string.isRequired,
-        ip: PropTypes.string.isRequired,
-        hostname: PropTypes.string.isRequired,
-        cidr: PropTypes.string.isRequired,
-    }),
     pristine: PropTypes.bool.isRequired,
     handleSubmit: PropTypes.func.isRequired,
     reset: PropTypes.func.isRequired,
     submitting: PropTypes.bool.isRequired,
     processingAdding: PropTypes.bool.isRequired,
-    cidr: PropTypes.string.isRequired,
 };
 
 export default reduxForm({ form: FORM_NAME.LEASE })(Form);

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

@@ -10,7 +10,6 @@ const Modal = ({
     isModalOpen,
     handleSubmit,
     processingAdding,
-    cidr,
 }) => {
     const dispatch = useDispatch();
 
@@ -33,15 +32,8 @@ const Modal = ({
                     </button>
                 </div>
                 <Form
-                    initialValues={{
-                        mac: '',
-                        ip: '',
-                        hostname: '',
-                        cidr,
-                    }}
                     onSubmit={handleSubmit}
                     processingAdding={processingAdding}
-                    cidr={cidr}
                 />
             </div>
         </ReactModal>
@@ -52,7 +44,6 @@ Modal.propTypes = {
     isModalOpen: PropTypes.bool.isRequired,
     handleSubmit: PropTypes.func.isRequired,
     processingAdding: PropTypes.bool.isRequired,
-    cidr: PropTypes.string.isRequired,
 };
 
 export default withTranslation()(Modal);

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

@@ -21,14 +21,12 @@ const StaticLeases = ({
     processingAdding,
     processingDeleting,
     staticLeases,
-    cidr,
 }) => {
     const [t] = useTranslation();
     const dispatch = useDispatch();
 
     const handleSubmit = (data) => {
-        const { mac, ip, hostname } = data;
+        dispatch(addStaticLease(data));
-        dispatch(addStaticLease({ mac, ip, hostname }));
     };
 
     const handleDelete = (ip, mac, hostname = '') => {
@@ -99,7 +97,6 @@ const StaticLeases = ({
                 isModalOpen={isModalOpen}
                 handleSubmit={handleSubmit}
                 processingAdding={processingAdding}
-                cidr={cidr}
             />
         </>
     );
@@ -110,7 +107,6 @@ StaticLeases.propTypes = {
     isModalOpen: PropTypes.bool.isRequired,
     processingAdding: PropTypes.bool.isRequired,
     processingDeleting: PropTypes.bool.isRequired,
-    cidr: PropTypes.string.isRequired,
 };
 
 cellWrap.propTypes = {

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

@@ -30,7 +30,6 @@ import Interfaces from './Interfaces';
 import {
     calculateDhcpPlaceholdersIpv4,
     calculateDhcpPlaceholdersIpv6,
-    subnetMaskToBitMask,
 } from '../../../helpers/helpers';
 import './index.css';
 
@@ -60,10 +59,6 @@ const Dhcp = () => {
     const interface_name = useSelector(
         (state) => state.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name,
     );
-    const isInterfaceIncludesIpv4 = useSelector(
-        (state) => !!state.dhcp?.interfaces?.[interface_name]?.ipv4_addresses,
-    );
-    const dhcp = useSelector((state) => state.form[FORM_NAME.DHCPv4], shallowEqual);
 
     const [ipv4placeholders, setIpv4Placeholders] = useState(DHCP_DESCRIPTION_PLACEHOLDERS.ipv4);
     const [ipv6placeholders, setIpv6Placeholders] = useState(DHCP_DESCRIPTION_PLACEHOLDERS.ipv6);
@@ -178,12 +173,6 @@ const Dhcp = () => {
 
     const toggleDhcpButton = getToggleDhcpButton();
 
-    const inputtedIPv4values = dhcp?.values?.v4?.gateway_ip && dhcp?.values?.v4?.subnet_mask;
-    const isEmptyConfig = !Object.values(dhcp?.values?.v4 ?? {}).some(Boolean);
-    const disabledLeasesButton = dhcp?.syncErrors || interfaces?.syncErrors
-        || !isInterfaceIncludesIpv4 || isEmptyConfig || processingConfig || !inputtedIPv4values;
-    const cidr = inputtedIPv4values ? `${dhcp?.values?.v4?.gateway_ip}/${subnetMaskToBitMask(dhcp?.values?.v4?.subnet_mask)}` : '';
-
     return <>
         <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')} containerClass="page-title--dhcp">
             {toggleDhcpButton}
@@ -267,7 +256,6 @@ const Dhcp = () => {
                             isModalOpen={isModalOpen}
                             processingAdding={processingAdding}
                             processingDeleting={processingDeleting}
-                            cidr={cidr}
                         />
                     </div>
                     <div className="col-12">
@@ -275,7 +263,6 @@ const Dhcp = () => {
                             type="button"
                             className="btn btn-success btn-standard mt-3"
                             onClick={toggleModal}
-                            disabled={disabledLeasesButton}
                         >
                             <Trans>dhcp_add_static_lease</Trans>
                         </button>

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

@@ -5,7 +5,7 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
 import classnames from 'classnames';
 import Examples from './Examples';
-import { renderRadioField, renderTextareaField, CheckboxField } from '../../../../helpers/form';
+import { renderRadioField, renderTextareaField } from '../../../../helpers/form';
 import {
     DNS_REQUEST_OPTIONS,
     FORM_NAME,
@@ -28,12 +28,11 @@ const renderField = ({
     const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
     const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);
 
-    return (
+    return <div
-        <div
             key={placeholder}
             className={classnames('col-12 mb-4', containerClass)}
-        >
+    >
-            <Field
+        <Field
                 id={name}
                 value={value}
                 name={name}
@@ -45,9 +44,8 @@ const renderField = ({
                 disabled={processingSetConfig || processingTestUpstream}
                 normalizeOnBlur={normalizeOnBlur}
                 onScroll={onScroll}
-            />
+        />
-        </div>
+    </div>;
-    );
 };
 
 renderField.propTypes = {
@@ -162,10 +160,10 @@ const Form = ({
                 {' '}
                 <Trans components={[
                     <a
-                        href="https://kb.adguard.com/general/dns-providers"
+                            href="https://kb.adguard.com/general/dns-providers"
-                        target="_blank"
+                            target="_blank"
-                        rel="noopener noreferrer"
+                            rel="noopener noreferrer"
-                        key="0"
+                            key="0"
                     >
                         DNS providers
                     </a>,
@@ -199,40 +197,6 @@ const Form = ({
                     normalizeOnBlur={removeEmptyLines}
                 />
             </div>
-            <div className="col-12">
-                <hr />
-            </div>
-            <div className="col-12 mb-4">
-                <label
-                    className="form__label form__label--with-desc"
-                    htmlFor="local_ptr"
-                >
-                    <Trans>local_ptr_title</Trans>
-                </label>
-                <div className="form__desc form__desc--top">
-                    <Trans>local_ptr_desc</Trans>
-                </div>
-                <Field
-                    id="local_ptr_upstreams"
-                    name="local_ptr_upstreams"
-                    component={renderTextareaField}
-                    type="text"
-                    className="form-control form-control--textarea form-control--textarea-small font-monospace"
-                    placeholder={t('local_ptr_placeholder')}
-                    disabled={processingSetConfig}
-                    normalizeOnBlur={removeEmptyLines}
-                />
-            </div>
-            <div className="col-12 mb-4">
-                <Field
-                    name="resolve_clients"
-                    type="checkbox"
-                    component={CheckboxField}
-                    placeholder={t('resolve_clients_title')}
-                    subtitle={t('resolve_clients_desc')}
-                    disabled={processingSetConfig}
-                />
-            </div>
         </div>
         <div className="card-actions">
             <div className="btn-list">

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

@@ -12,8 +12,6 @@ const Upstream = () => {
         upstream_dns,
         bootstrap_dns,
         upstream_mode,
-        resolve_clients,
-        local_ptr_upstreams,
     } = useSelector((state) => state.dnsConfig, shallowEqual);
 
     const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
@@ -23,15 +21,11 @@ const Upstream = () => {
             bootstrap_dns,
             upstream_dns,
             upstream_mode,
-            resolve_clients,
-            local_ptr_upstreams,
         } = values;
 
         const dnsConfig = {
             bootstrap_dns,
             upstream_mode,
-            resolve_clients,
-            local_ptr_upstreams,
             ...(upstream_dns_file ? null : { upstream_dns }),
         };
 
@@ -51,8 +45,6 @@ const Upstream = () => {
                         upstream_dns: upstreamDns,
                         bootstrap_dns,
                         upstream_mode,
-                        resolve_clients,
-                        local_ptr_upstreams,
                     }}
                     onSubmit={handleSubmit}
                 />

client/src/components/ui/Card.css

@@ -112,8 +112,6 @@
 }
 
 .card-wrap {
-    display: flex;
-    flex-direction: column;
     height: 100%;
 }
 

client/src/components/ui/Guide.js

@@ -3,12 +3,29 @@ import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
 import i18next from 'i18next';
 import { useSelector } from 'react-redux';
+import Tabs from './Tabs';
+import Icons from './Icons';
+import { getPathWithQueryString } from '../../helpers/helpers';
 
-import { MOBILE_CONFIG_LINKS } from '../../../helpers/constants';
+const MOBILE_CONFIG_LINKS = {
+    DOT: '/apple/dot.mobileconfig',
+    DOH: '/apple/doh.mobileconfig',
+};
 
-import Tabs from '../Tabs';
+/* FIXME: find out `client_id` */
-import Icons from '../Icons';
+const renderMobileconfigInfo = ({ label, components, server_name }) => <li key={label}>
-import MobileConfigForm from './MobileConfigForm';
+    <Trans components={components}>{label}</Trans>
+    <ul>
+        <li>
+            <a href={getPathWithQueryString(MOBILE_CONFIG_LINKS.DOT, { host: server_name, client_id: 'client_id' })}
+               download>{i18next.t('download_mobileconfig_dot')}</a>
+        </li>
+        <li>
+            <a href={getPathWithQueryString(MOBILE_CONFIG_LINKS.DOH, { host: server_name, client_id: 'client_id' })}
+               download>{i18next.t('download_mobileconfig_doh')}</a>
+        </li>
+    </ul>
+</li>;
 
 const renderLi = ({ label, components }) => <li key={label}>
     <Trans components={components?.map((props) => {
@@ -26,8 +43,49 @@ const renderLi = ({ label, components }) => <li key={label}>
     </Trans>
 </li>;
 
-const getDnsPrivacyList = () => [
+const getDnsPrivacyList = (server_name) => {
-    {
+    const iosList = [
+        {
+            label: 'setup_dns_privacy_ios_2',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://adguard.com/adguard-ios/overview.html',
+                },
+                <code key="1">text</code>,
+            ],
+        },
+        {
+            label: 'setup_dns_privacy_ios_1',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://itunes.apple.com/app/id1452162351',
+                },
+                <code key="1">text</code>,
+                {
+                    key: 2,
+                    href: 'https://dnscrypt.info/stamps',
+                },
+
+            ],
+        }];
+    /* Insert second element if can generate .mobileconfig links */
+    if (server_name) {
+        iosList.splice(1, 0, {
+            label: 'setup_dns_privacy_4',
+            components: {
+                highlight: <code />,
+            },
+            renderComponent: ({ label, components }) => renderMobileconfigInfo({
+                label,
+                components,
+                server_name,
+            }),
+        });
+    }
+
+    return [{
         title: 'Android',
         list: [
             {
@@ -57,32 +115,7 @@ const getDnsPrivacyList = () => [
     },
     {
         title: 'iOS',
-        list: [
+        list: iosList,
-            {
-                label: 'setup_dns_privacy_ios_2',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://adguard.com/adguard-ios/overview.html',
-                    },
-                    <code key="1">text</code>,
-                ],
-            },
-            {
-                label: 'setup_dns_privacy_ios_1',
-                components: [
-                    {
-                        key: 0,
-                        href: 'https://itunes.apple.com/app/id1452162351',
-                    },
-                    <code key="1">text</code>,
-                    {
-                        key: 2,
-                        href: 'https://dnscrypt.info/stamps',
-                    },
-                ],
-            },
-        ],
     },
     {
         title: 'setup_dns_privacy_other_title',
@@ -135,20 +168,20 @@ const getDnsPrivacyList = () => [
             },
         ],
     },
-];
+    ];
+};
 
-const renderDnsPrivacyList = ({ title, list }) => (
+const renderDnsPrivacyList = ({ title, list }) => <div className="tab__paragraph" key={title}>
-    <div className="tab__paragraph" key={title}>
+    <strong><Trans>{title}</Trans></strong>
-        <strong>
+    <ul>{list.map(
-            <Trans>{title}</Trans>
+        ({
-        </strong>
+            label,
-        <ul>
+            components,
-            {list.map(({ label, components, renderComponent = renderLi }) => (
+            renderComponent = renderLi,
-                renderComponent({ label, components })
+        }) => renderComponent({ label, components }),
-            ))}
+    )}
-        </ul>
+    </ul>
-    </div>
+</div>;
-);
 
 const getTabs = ({
     tlsAddress,
@@ -236,8 +269,8 @@ const getTabs = ({
                         </Trans>
                     </div>
                 )}
-                {showDnsPrivacyNotice ? (
+                {showDnsPrivacyNotice
-                    <div className="tab__paragraph">
+                    ? <div className="tab__paragraph">
                         <Trans
                             components={[
                                 <a
@@ -254,64 +287,35 @@ const getTabs = ({
                             setup_dns_notice
                         </Trans>
                     </div>
-                ) : (
+                    : <>
-                    <>
                         <div className="tab__paragraph">
                             <Trans components={[<p key="0">text</p>]}>
                                 setup_dns_privacy_3
                             </Trans>
                         </div>
-                        {getDnsPrivacyList().map(renderDnsPrivacyList)}
+                        {getDnsPrivacyList(server_name).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,
-                            }}
-                        />
-                    </>
-                )}
             </div>
         </div>;
         },
     },
 });
 
-const renderContent = ({ title, list, getTitle }) => (
+const renderContent = ({ title, list, getTitle }) => <div key={title} label={i18next.t(title)}>
-    <div key={title} label={i18next.t(title)}>
+    <div className="tab__title">{i18next.t(title)}</div>
-        <div className="tab__title">
+    <div className="tab__text">
-            {i18next.t(title)}
+        {getTitle?.()}
-        </div>
+        {list
-        <div className="tab__text">
+        && <ol>{list.map((item) => <li key={item}>
-            {getTitle?.()}
+            <Trans>{item}</Trans>
-            {list && (
+        </li>)}
-                <ol>
+        </ol>}
-                    {list.map((item) => (
-                        <li key={item}>
-                            <Trans>{item}</Trans>
-                        </li>
-                    ))}
-                </ol>
-            )}
-        </div>
     </div>
-);
+</div>;
 
 const Guide = ({ dnsAddresses }) => {
     const { t } = useTranslation();
-    const server_name = useSelector((state) => state.encryption?.server_name);
+    const server_name = useSelector((state) => state.encryption.server_name);
     const tlsAddress = dnsAddresses?.filter((item) => item.includes('tls://')) ?? '';
     const httpsAddress = dnsAddresses?.filter((item) => item.includes('https://')) ?? '';
     const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
@@ -330,14 +334,9 @@ const Guide = ({ dnsAddresses }) => {
 
     return (
         <div>
-            <Tabs
-                tabs={tabs}
-                activeTabLabel={activeTabLabel}
-                setActiveTabLabel={setActiveTabLabel}
-            >
-                {activeTab}
-            </Tabs>
             <Icons />
+            <Tabs tabs={tabs} activeTabLabel={activeTabLabel}
+                  setActiveTabLabel={setActiveTabLabel}>{activeTab}</Tabs>
         </div>
     );
 };
@@ -367,4 +366,6 @@ renderLi.propTypes = {
     components: PropTypes.string,
 };
 
+renderMobileconfigInfo.propTypes = renderLi.propTypes;
+
 export default Guide;

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

client/src/components/ui/texareaCommentsHighlight.css

@@ -15,7 +15,7 @@
     white-space: pre-wrap;
     line-height: 1.5rem;
     word-wrap: break-word;
-    font-size: var(--font-size-disable-autozoom);
+    font-size: 0.9375rem;
     margin: 0;
 }
 

client/src/helpers/constants.js

@@ -9,12 +9,13 @@ export const R_IPV6 = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1
 
 export const R_CIDR = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/;
 
-export const R_MAC = /^((([a-fA-F0-9][a-fA-F0-9]+[-:]){5})([a-fA-F0-9]{2})$)|^((([a-fA-F0-9][a-fA-F0-9]+[-:]){7})([a-fA-F0-9]{2})$)|^([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]+[.]){2}([a-fA-F0-9]{4})$|^([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]+[.]){3}([a-fA-F0-9]{4})$/;
+export const R_MAC = /^((([a-fA-F0-9][a-fA-F0-9]+[-]){5}|([a-fA-F0-9][a-fA-F0-9]+[:]){5})([a-fA-F0-9][a-fA-F0-9])$)|(^([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]+[.]){2}([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]))$/;
-export const R_MAC_WITHOUT_COLON = /^([a-fA-F0-9]{2}){5}([a-fA-F0-9]{2})$|^([a-fA-F0-9]{2}){7}([a-fA-F0-9]{2})$/;
 
 export const R_CIDR_IPV6 = /^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/(12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))$/;
 
-export const R_DOMAIN = /^([a-zA-Z0-9][a-zA-Z0-9-_]*\.)*[a-zA-Z0-9]*[a-zA-Z0-9-_]*[[a-zA-Z0-9]+$/;
+export const R_DOMAIN = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;
+
+export const R_SERVER_NAME = /^(\*\.)?[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;
 
 export const R_PATH_LAST_PART = /\/[^/]*$/;
 
@@ -24,8 +25,6 @@ export const R_UNIX_ABSOLUTE_PATH = /^(\/[^/\x00]+)+$/;
 // eslint-disable-next-line no-control-regex
 export const R_WIN_ABSOLUTE_PATH = /^([a-zA-Z]:)?(\\|\/)(?:[^\\/:*?"<>|\x00]+\\)*[^\\/:*?"<>|\x00]*$/;
 
-export const R_CLIENT_ID = /^[a-z0-9-]{1,64}$/;
-
 export const HTML_PAGES = {
     INSTALL: '/install.html',
     LOGIN: '/login.html',
@@ -200,146 +199,94 @@ export const FILTERS_URLS = {
 };
 
 export const SERVICES = [
-    {
-        id: '9gag',
-        name: '9Gag',
-    },
-    {
-        id: 'amazon',
-        name: 'Amazon',
-    },
-    {
-        id: 'cloudflare',
-        name: 'CloudFlare',
-    },
-    {
-        id: 'dailymotion',
-        name: 'Dailymotion',
-    },
-    {
-        id: 'discord',
-        name: 'Discord',
-    },
-    {
-        id: 'disneyplus',
-        name: 'Disney+',
-    },
-    {
-        id: 'ebay',
-        name: 'EBay',
-    },
-    {
-        id: 'epic_games',
-        name: 'Epic Games',
-    },
     {
         id: 'facebook',
         name: 'Facebook',
     },
-    {
-        id: 'hulu',
-        name: 'Hulu',
-    },
-    {
-        id: 'imgur',
-        name: 'Imgur',
-    },
-    {
-        id: 'instagram',
-        name: 'Instagram',
-    },
-    {
-        id: 'mail_ru',
-        name: 'Mail.ru',
-    },
-    {
-        id: 'netflix',
-        name: 'Netflix',
-    },
-    {
-        id: 'ok',
-        name: 'OK.ru',
-    },
-    {
-        id: 'origin',
-        name: 'Origin',
-    },
-    {
-        id: 'pinterest',
-        name: 'Pinterest',
-    },
-    {
-        id: 'qq',
-        name: 'QQ',
-    },
-    {
-        id: 'reddit',
-        name: 'Reddit',
-    },
-    {
-        id: 'skype',
-        name: 'Skype',
-    },
-    {
-        id: 'snapchat',
-        name: 'Snapchat',
-    },
-    {
-        id: 'spotify',
-        name: 'Spotify',
-    },
-    {
-        id: 'steam',
-        name: 'Steam',
-    },
-    {
-        id: 'telegram',
-        name: 'Telegram',
-    },
-    {
-        id: 'tiktok',
-        name: 'TikTok',
-    },
-    {
-        id: 'tinder',
-        name: 'Tinder',
-    },
-    {
-        id: 'twitch',
-        name: 'Twitch',
-    },
-    {
-        id: 'twitter',
-        name: 'Twitter',
-    },
-    {
-        id: 'viber',
-        name: 'Viber',
-    },
-    {
-        id: 'vimeo',
-        name: 'Vimeo',
-    },
-    {
-        id: 'vk',
-        name: 'VK.com',
-    },
-    {
-        id: 'wechat',
-        name: 'WeChat',
-    },
-    {
-        id: 'weibo',
-        name: 'Weibo',
-    },
     {
         id: 'whatsapp',
         name: 'WhatsApp',
     },
+    {
+        id: 'instagram',
+        name: 'Instagram',
+    },
+    {
+        id: 'twitter',
+        name: 'Twitter',
+    },
     {
         id: 'youtube',
         name: 'YouTube',
     },
+    {
+        id: 'netflix',
+        name: 'Netflix',
+    },
+    {
+        id: 'snapchat',
+        name: 'Snapchat',
+    },
+    {
+        id: 'twitch',
+        name: 'Twitch',
+    },
+    {
+        id: 'discord',
+        name: 'Discord',
+    },
+    {
+        id: 'skype',
+        name: 'Skype',
+    },
+    {
+        id: 'amazon',
+        name: 'Amazon',
+    },
+    {
+        id: 'ebay',
+        name: 'eBay',
+    },
+    {
+        id: 'origin',
+        name: 'Origin',
+    },
+    {
+        id: 'cloudflare',
+        name: 'Cloudflare',
+    },
+    {
+        id: 'steam',
+        name: 'Steam',
+    },
+    {
+        id: 'epic_games',
+        name: 'Epic Games',
+    },
+    {
+        id: 'reddit',
+        name: 'Reddit',
+    },
+    {
+        id: 'ok',
+        name: 'OK',
+    },
+    {
+        id: 'vk',
+        name: 'VK',
+    },
+    {
+        id: 'mail_ru',
+        name: 'mail.ru',
+    },
+    {
+        id: 'tiktok',
+        name: 'TikTok',
+    },
+    {
+        id: 'qq',
+        name: 'QQ',
+    },
 ];
 
 export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
@@ -396,7 +343,6 @@ export const FILTERED_STATUS = {
     FILTERED_BLOCKED_SERVICE: 'FilteredBlockedService',
     REWRITE: 'Rewrite',
     REWRITE_HOSTS: 'RewriteEtcHosts',
-    REWRITE_RULE: 'RewriteRule',
     FILTERED_SAFE_SEARCH: 'FilteredSafeSearch',
     FILTERED_SAFE_BROWSING: 'FilteredSafeBrowsing',
     FILTERED_PARENTAL: 'FilteredParental',
@@ -488,10 +434,6 @@ export const FILTERED_STATUS_TO_META_MAP = {
         LABEL: RESPONSE_FILTER.REWRITTEN.LABEL,
         COLOR: QUERY_STATUS_COLORS.BLUE,
     },
-    [FILTERED_STATUS.REWRITE_RULE]: {
-        LABEL: RESPONSE_FILTER.REWRITTEN.LABEL,
-        COLOR: QUERY_STATUS_COLORS.BLUE,
-    },
     [FILTERED_STATUS.FILTERED_SAFE_BROWSING]: {
         LABEL: RESPONSE_FILTER.BLOCKED_THREATS.LABEL,
         COLOR: QUERY_STATUS_COLORS.YELLOW,
@@ -535,7 +477,6 @@ export const BLOCK_ACTIONS = {
 };
 
 export const SCHEME_TO_PROTOCOL_MAP = {
-    dnscrypt: 'dnscrypt',
     doh: 'dns_over_https',
     dot: 'dns_over_tls',
     doq: 'dns_over_quic',
@@ -572,7 +513,6 @@ export const FORM_NAME = {
     INSTALL: 'install',
     LOGIN: 'login',
     CACHE: 'cache',
-    MOBILE_CONFIG: 'mobileConfig',
     ...DHCP_FORM_NAMES,
 };
 
@@ -633,7 +573,6 @@ export const TOAST_TIMEOUTS = {
 export const ADDRESS_TYPES = {
     IP: 'IP',
     CIDR: 'CIDR',
-    CLIENT_ID: 'CLIENT_ID',
     UNKNOWN: 'UNKNOWN',
 };
 
@@ -645,8 +584,3 @@ export const CACHE_CONFIG_FIELDS = {
 
 export const isFirefox = navigator.userAgent.indexOf('Firefox') !== -1;
 export const COMMENT_LINE_DEFAULT_TOKEN = '#';
-
-export const MOBILE_CONFIG_LINKS = {
-    DOT: 'apple/dot.mobileconfig',
-    DOH: 'apple/doh.mobileconfig',
-};

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" : {
+        "malwaredomainlist-com-hosts-list": {
-            "name": "WindowsSpyBlocker - Hosts spy rules",
+            "name": "MalwareDomainList.com Hosts List",
-            "categoryId": "general",
+            "categoryId": "security",
-            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "homepage": "https://www.malwaredomainlist.com/",
-            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
+            "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": {
+        "BarbBlock": {
-            "name": "IDN: ABPindo",
-            "categoryId": "regional",
-            "homepage": "https://github.com/ABPindo/indonesianadblockrules/",
-            "source": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt"
-        },
-        "barb-block": {
             "name": "BarbBlock",
             "categoryId": "other",
             "homepage": "https://github.com/paulgb/BarbBlock/",

client/src/helpers/form.js

@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Trans } from 'react-i18next';
 import { createOnBlurHandler } from './helpers';
-import { R_MAC_WITHOUT_COLON, R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';
+import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';
 
 export const renderField = (props, elementType) => {
     const {
@@ -260,15 +260,7 @@ renderServiceField.propTypes = {
     }).isRequired,
 };
 
-/**
+export const getLastIpv4Octet = (ipv4) => parseInt(ipv4.slice(ipv4.lastIndexOf('.') + 1), 10);
- *
- * @param {string} ip
- * @returns {*}
- */
-export const ip4ToInt = (ip) => {
-    const intIp = ip.split('.').reduce((int, oct) => (int * 256) + parseInt(oct, 10), 0);
-    return Number.isNaN(intIp) ? 0 : intIp;
-};
 
 /**
  * @param value {string}
@@ -282,15 +274,3 @@ export const toNumber = (value) => value && parseInt(value, 10);
  */
 export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
     || R_UNIX_ABSOLUTE_PATH.test(value);
-
-/**
- * @param value {string}
- * @returns {*|string}
- */
-export const normalizeMac = (value) => {
-    if (value && R_MAC_WITHOUT_COLON.test(value)) {
-        return value.match(/.{2}/g).join(':');
-    }
-
-    return value;
-};

client/src/helpers/helpers.js

@@ -4,9 +4,9 @@ import dateFormat from 'date-fns/format';
 import round from 'lodash/round';
 import axios from 'axios';
 import i18n from 'i18next';
+import uniqBy from 'lodash/uniqBy';
 import ipaddr from 'ipaddr.js';
 import queryString from 'query-string';
-import React from 'react';
 import { getTrackerData } from './trackers/trackers';
 
 import {
@@ -21,7 +21,6 @@ import {
     DHCP_VALUES_PLACEHOLDERS,
     FILTERED,
     FILTERED_STATUS,
-    R_CLIENT_ID,
     SERVICES_ID_NAME_MAP,
     STANDARD_DNS_PORT,
     STANDARD_HTTPS_PORT,
@@ -62,8 +61,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
         answer_dnssec,
         client,
         client_proto,
-        client_id,
-        client_info,
         elapsedMs,
         question,
         reason,
@@ -71,7 +68,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
         time,
         filterId,
         rule,
-        rules,
         service_name,
         original_answer,
         upstream,
@@ -84,15 +80,6 @@ export const normalizeLogs = (logs) => logs.map((log) => {
         return `${type}: ${value} (ttl=${ttl})`;
     }) : []);
 
-    let newRules = rules;
-    /* TODO 'filterId' and 'rule' are deprecated, will be removed in 0.106 */
-    if (rule !== undefined && filterId !== undefined && rules !== undefined && rules.length === 0) {
-        newRules = {
-            filter_list_id: filterId,
-            text: rule,
-        };
-    }
-
     return {
         time,
         domain,
@@ -101,12 +88,8 @@ export const normalizeLogs = (logs) => logs.map((log) => {
         reason,
         client,
         client_proto,
-        client_id,
-        client_info,
-        /* TODO 'filterId' and 'rule' are deprecated, will be removed in 0.106 */
         filterId,
         rule,
-        rules: newRules,
         status,
         service_name,
         originalAnswer: original_answer,
@@ -130,21 +113,12 @@ export const normalizeTopStats = (stats) => (
     }))
 );
 
-export const addClientInfo = (data, clients, ...params) => data.map((row) => {
+export const addClientInfo = (data, clients, param) => data.map((row) => {
-    let info = '';
+    const clientIp = row[param];
-    params.find((param) => {
+    const info = clients.find((item) => item[clientIp]) || '';
-        const id = row[param];
-        if (id) {
-            const client = clients.find((item) => item[id]) || '';
-            info = client?.[id] ?? '';
-        }
-
-        return info;
-    });
-
     return {
         ...row,
-        info,
+        info: info?.[clientIp] ?? '',
     };
 });
 
@@ -216,12 +190,7 @@ export const getIpList = (interfaces) => Object.values(interfaces)
     .reduce((acc, curr) => acc.concat(curr.ip_addresses), [])
     .sort();
 
-/**
+export const getDnsAddress = (ip, port = '') => {
- * @param {string} ip
- * @param {number} [port]
- * @returns {string}
- */
-export const getDnsAddress = (ip, port = 0) => {
     const isStandardDnsPort = port === STANDARD_DNS_PORT;
     let address = ip;
 
@@ -236,12 +205,7 @@ export const getDnsAddress = (ip, port = 0) => {
     return address;
 };
 
-/**
+export const getWebAddress = (ip, port = '') => {
- * @param {string} ip
- * @param {number} [port]
- * @returns {string}
- */
-export const getWebAddress = (ip, port = 0) => {
     const isStandardWebPort = port === STANDARD_WEB_PORT;
     let address = `http://${ip}`;
 
@@ -427,21 +391,14 @@ export const getPathWithQueryString = (path, params) => {
     return `${path}?${searchParams.toString()}`;
 };
 
-export const getParamsForClientsSearch = (data, param, additionalParam) => {
+export const getParamsForClientsSearch = (data, param) => {
-    const clients = new Set();
+    const uniqueClients = uniqBy(data, param);
-    data.forEach((e) => {
+    return uniqueClients
-        clients.add(e[param]);
+        .reduce((acc, item, idx) => {
-        if (e[additionalParam]) {
+            const key = `ip${idx}`;
-            clients.add(e[additionalParam]);
+            acc[key] = item[param];
-        }
+            return acc;
-    });
+        }, {});
-    const params = {};
-    const ids = Array.from(clients.values());
-    ids.forEach((id, i) => {
-        params[`ip${i}`] = id;
-    });
-
-    return params;
 };
 
 /**
@@ -551,19 +508,10 @@ export const isIpInCidr = (ip, cidr) => {
     }
 };
 
-/**
- *
- * @param {string} subnetMask
- * @returns {*}
- */
-export const subnetMaskToBitMask = (subnetMask) => subnetMask
-    .split('.')
-    .reduce((acc, cur) => acc - Math.log2(256 - Number(cur)), 32);
-
 /**
  *
  * @param ipOrCidr
- * @returns {'IP' | 'CIDR' | 'CLIENT_ID' | 'UNKNOWN'}
+ * @returns {'IP' | 'CIDR' | 'UNKNOWN'}
  *
  */
 export const findAddressType = (address) => {
@@ -576,9 +524,6 @@ export const findAddressType = (address) => {
         if (cidrMaybe && ipaddr.parseCIDR(address)) {
             return ADDRESS_TYPES.CIDR;
         }
-        if (R_CLIENT_ID.test(address)) {
-            return ADDRESS_TYPES.CLIENT_ID;
-        }
 
         return ADDRESS_TYPES.UNKNOWN;
     } catch (e) {
@@ -599,31 +544,20 @@ export const separateIpsAndCidrs = (ids) => ids.reduce((acc, curr) => {
     if (addressType === ADDRESS_TYPES.CIDR) {
         acc.cidrs.push(curr);
     }
-    if (addressType === ADDRESS_TYPES.CLIENT_ID) {
-        acc.clientIds.push(curr);
-    }
     return acc;
-}, { ips: [], cidrs: [], clientIds: [] });
+}, { ips: [], cidrs: [] });
 
 export const countClientsStatistics = (ids, autoClients) => {
-    const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids);
+    const { ips, cidrs } = separateIpsAndCidrs(ids);
 
     const ipsCount = ips.reduce((acc, curr) => {
         const count = autoClients[curr] || 0;
         return acc + count;
     }, 0);
 
-    const clientIdsCount = clientIds.reduce((acc, curr) => {
-        const count = autoClients[curr] || 0;
-        return acc + count;
-    }, 0);
-
     const cidrsCount = Object.entries(autoClients)
         .reduce((acc, curr) => {
             const [id, count] = curr;
-            if (!ipaddr.isValid(id)) {
-                return false;
-            }
             if (cidrs.some((cidr) => isIpInCidr(id, cidr))) {
             // eslint-disable-next-line no-param-reassign
                 acc += count;
@@ -631,7 +565,7 @@ export const countClientsStatistics = (ids, autoClients) => {
             return acc;
         }, 0);
 
-    return ipsCount + cidrsCount + clientIdsCount;
+    return ipsCount + cidrsCount;
 };
 
 /**
@@ -782,75 +716,6 @@ export const getFilterName = (
     return resolveFilterName(filter);
 };
 
-/**
- * @param {array} rules
- * @param {array} filters
- * @param {array} whitelistFilters
- * @returns {string[]}
- */
-export const getFilterNames = (rules, filters, whitelistFilters) => rules.map(
-    ({ filter_list_id }) => getFilterName(filters, whitelistFilters, filter_list_id),
-);
-
-/**
- * @param {array} rules
- * @returns {string[]}
- */
-export const getRuleNames = (rules) => rules.map(({ text }) => text);
-
-/**
- * @param {array} rules
- * @param {array} filters
- * @param {array} whitelistFilters
- * @returns {object}
- */
-export const getFilterNameToRulesMap = (rules, filters, whitelistFilters) => rules.reduce(
-    (acc, { text, filter_list_id }) => {
-        const filterName = getFilterName(filters, whitelistFilters, filter_list_id);
-
-        acc[filterName] = (acc[filterName] || []).concat(text);
-        return acc;
-    }, {},
-);
-
-/**
- * @param {array} rules
- * @param {array} filters
- * @param {array} whitelistFilters
- * @param {object} classes
- * @returns {JSXElement}
- */
-export const getRulesToFilterList = (rules, filters, whitelistFilters, classes = {
-    list: 'filteringRules',
-    rule: 'filteringRules__rule font-monospace',
-    filter: 'filteringRules__filter',
-}) => {
-    const filterNameToRulesMap = getFilterNameToRulesMap(rules, filters, whitelistFilters);
-
-    return <dl className={classes.list}>
-        {Object.entries(filterNameToRulesMap).reduce(
-            (acc, [filterName, rulesArr]) => acc
-                .concat(rulesArr.map((rule, i) => <dd key={i} className={classes.rule}>{rule}</dd>))
-                .concat(<dt className={classes.filter} key={classes.filter}>{filterName}</dt>),
-            [],
-        )}
-</dl>;
-};
-
-/**
-* @param {array} rules
-* @param {array} filters
-* @param {array} whitelistFilters
-* @returns {string}
-*/
-export const getRulesAndFilterNames = (rules, filters, whitelistFilters) => {
-    const filterNameToRulesMap = getFilterNameToRulesMap(rules, filters, whitelistFilters);
-
-    return Object.entries(filterNameToRulesMap).map(
-        ([filterName, filterRules]) => filterRules.concat(filterName).join('\n'),
-    ).join('\n\n');
-};
-
 /**
  * @param ip {string}
  * @param gateway_ip {string}

client/src/helpers/renderFormattedClientCell.js

@@ -31,7 +31,7 @@ const getFormattedWhois = (whois) => {
  * @param {object} info.whois_info
  * @param {boolean} [isDetailed]
  * @param {boolean} [isLogs]
- * @returns {JSXElement}
+ * @returns {JSX.Element}
  */
 export const renderFormattedClientCell = (value, info, isDetailed = false, isLogs = false) => {
     let whoisContainer = null;

client/src/helpers/validators.js

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import {
     MAX_PORT,
     R_CIDR,
@@ -10,17 +9,16 @@ import {
     R_URL_REQUIRES_PROTOCOL,
     STANDARD_WEB_PORT,
     UNSAFE_PORTS,
-    R_CLIENT_ID,
     R_DOMAIN,
+    R_SERVER_NAME,
 } from './constants';
-import { ip4ToInt, isValidAbsolutePath } from './form';
+import { getLastIpv4Octet, isValidAbsolutePath } from './form';
-import { isIpInCidr } from './helpers';
 
 // Validation functions
 // https://redux-form.com/8.3.0/examples/fieldlevelvalidation/
 // If the value is valid, the validation function should return undefined.
 /**
- * @param value {string|number}
+ * @param value {string}
  * @returns {undefined|string}
  */
 export const validateRequiredValue = (value) => {
@@ -32,9 +30,8 @@ export const validateRequiredValue = (value) => {
 };
 
 /**
+ * @param value {string}
  * @returns {undefined|string}
- * @param _
- * @param allValues
  */
 export const validateIpv4RangeEnd = (_, allValues) => {
     if (!allValues || !allValues.v4 || !allValues.v4.range_end || !allValues.v4.range_start) {
@@ -43,7 +40,7 @@ export const validateIpv4RangeEnd = (_, allValues) => {
 
     const { range_end, range_start } = allValues.v4;
 
-    if (ip4ToInt(range_end) <= ip4ToInt(range_start)) {
+    if (getLastIpv4Octet(range_end) <= getLastIpv4Octet(range_start)) {
         return 'range_end_error';
     }
 
@@ -69,14 +66,14 @@ export const validateClientId = (value) => {
     if (!value) {
         return undefined;
     }
-    const formattedValue = value.trim();
+    const formattedValue = value ? value.trim() : value;
     if (formattedValue && !(
         R_IPV4.test(formattedValue)
             || R_IPV6.test(formattedValue)
             || R_MAC.test(formattedValue)
             || R_CIDR.test(formattedValue)
             || R_CIDR_IPV6.test(formattedValue)
-            || R_CLIENT_ID.test(formattedValue)
+            || R_DOMAIN.test(formattedValue)
     )) {
         return 'form_error_client_id_format';
     }
@@ -92,7 +89,7 @@ export const validateServerName = (value) => {
         return undefined;
     }
     const formattedValue = value ? value.trim() : value;
-    if (formattedValue && !R_DOMAIN.test(formattedValue)) {
+    if (formattedValue && !R_SERVER_NAME.test(formattedValue)) {
         return 'form_error_server_name';
     }
     return undefined;
@@ -227,15 +224,3 @@ export const validatePath = (value) => {
     }
     return undefined;
 };
-
-/**
- * @param cidr {string}
- * @returns {Function}
- */
-
-export const validateIpv4InCidr = (valueIp, allValues) => {
-    if (!isIpInCidr(valueIp, allValues.cidr)) {
-        return i18next.t('form_error_subnet', { ip: valueIp, cidr: allValues.cidr });
-    }
-    return undefined;
-};

client/src/i18n.js

@@ -43,9 +43,6 @@ const resources = {
     en: {
         translation: en,
     },
-    enUS: {
-        translation: en,
-    },
     vi: {
         translation: vi,
     },

client/src/install/Setup/AddressList.js

@@ -41,13 +41,16 @@ const AddressList = ({
 AddressList.propTypes = {
     interfaces: PropTypes.object.isRequired,
     address: PropTypes.string.isRequired,
-    port: PropTypes.number.isRequired,
+    port: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+    ]),
     isDns: PropTypes.bool,
 };
 
 renderItem.propTypes = {
     ip: PropTypes.string.isRequired,
-    port: PropTypes.number.isRequired,
+    port: PropTypes.string.isRequired,
     isDns: PropTypes.bool.isRequired,
 };
 

client/src/install/Setup/Setup.css

@@ -1,10 +1,3 @@
-/* Disable Auto Zoom in Input - Safari on iPhone https://stackoverflow.com/a/6394497 */
-@media screen and (max-width: 767px) {
-    input, select, textarea {
-        font-size: 1rem;
-    }
-}
-
 .setup {
     min-height: calc(100vh - 71px);
     line-height: 1.48;

client/src/login/Login/Form.js

@@ -27,7 +27,6 @@ const Form = (props) => {
                         component={renderInputField}
                         placeholder={t('username_placeholder')}
                         autoComplete="username"
-                        autocapitalize="none"
                         disabled={processing}
                         validate={[validateRequiredValue]}
                     />

client/src/login/Login/Login.css

@@ -1,10 +1,3 @@
-/* Disable Auto Zoom in Input - Safari on iPhone https://stackoverflow.com/a/6394497 */
-@media screen and (max-width: 767px) {
-    input, select, textarea {
-        font-size: 1rem;
-    }
-}
-
 .login {
     display: flex;
     flex-direction: column;

client/src/reducers/access.js

@@ -24,7 +24,13 @@ const access = handleActions(
 
         [actions.setAccessListRequest]: (state) => ({ ...state, processingSet: true }),
         [actions.setAccessListFailure]: (state) => ({ ...state, processingSet: false }),
-        [actions.setAccessListSuccess]: (state) => ({ ...state, processingSet: false }),
+        [actions.setAccessListSuccess]: (state) => {
+            const newState = {
+                ...state,
+                processingSet: false,
+            };
+            return newState;
+        },
 
         [actions.toggleClientBlockRequest]: (state) => ({ ...state, processingSet: true }),
         [actions.toggleClientBlockFailure]: (state) => ({ ...state, processingSet: false }),

client/src/reducers/dnsConfig.js

@@ -16,7 +16,6 @@ const dnsConfig = handleActions(
                 blocking_ipv6,
                 upstream_dns,
                 bootstrap_dns,
-                local_ptr_upstreams,
                 ...values
             } = payload;
 
@@ -27,7 +26,6 @@ const dnsConfig = handleActions(
                 blocking_ipv6: blocking_ipv6 || DEFAULT_BLOCKING_IPV6,
                 upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
                 bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '',
-                local_ptr_upstreams: (local_ptr_upstreams && local_ptr_upstreams.join('\n')) || '',
                 processingGetConfig: false,
             };
         },

client/webpack.prod.js

@@ -3,10 +3,6 @@ const merge = require('webpack-merge');
 const common = require('./webpack.common.js');
 
 module.exports = merge(common, {
-    stats: 'minimal',
-    performance : {
-        hints : false
-    },
     module: {
         rules: [
             {

client2/.eslintignore

@@ -1,6 +0,0 @@
-scripts
-node_modules
-postcss.config.js
-src/lib/entities
-src/lib/apis
-openApi

client2/.eslintrc

@@ -1,5 +0,0 @@
-{
-    "extends": [
-        "./scripts/lint/dev.js"
-    ]
-}