Merge branch 'master' into 4926-scroll

Pull request: 4926 fix tabs scroll on mobile
Updates #4926 Squashed commit of the following: commit 23a352d214 Merge: 44c64893 8e89cc12 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Sep 19 19:35:48 2022 +0300 Merge branch 'master' into 4926-scroll commit 44c64893bb Author: Ildar Kamalov <ik@adguard.com> Date: Mon Sep 19 19:34:54 2022 +0300 fix commit 3f8f8c7253 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Sep 19 19:30:59 2022 +0300 client: fix tabs scroll on mobile
2022-09-20 13:20:03 +03:00 · 2022-09-19 20:22:26 +03:00 · 2022-09-19 19:35:48 +03:00 · 2022-09-19 19:34:54 +03:00 · 2022-09-19 19:34:14 +03:00 · 2022-09-19 19:30:59 +03:00
180 changed files with 3533 additions and 2907 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'

 'env':
-  'GO_VERSION': '1.18'
+  'GO_VERSION': '1.18.6'
  'NODE_VERSION': '14'

 'on':
@@ -31,7 +31,7 @@
      'with':
        'fetch-depth': 0
    - 'name': 'Set up Go'
-      'uses': 'actions/setup-go@v2'
+      'uses': 'actions/setup-go@v3'
      'with':
        'go-version': '${{ env.GO_VERSION }}'
    - 'name': 'Set up Node'
@@ -72,7 +72,7 @@
      'with':
        'fetch-depth': 0
    - 'name': 'Set up Go'
-      'uses': 'actions/setup-go@v2'
+      'uses': 'actions/setup-go@v3'
      'with':
        'go-version': '${{ env.GO_VERSION }}'
    - 'name': 'Set up Node'
@@ -112,7 +112,9 @@
    # Use always() to signal to the runner that this job must run even if the
    # previous ones failed.
    'if':
-      ${{ always() &&
+      ${{
+        always() &&
+        github.repository_owner == 'AdguardTeam' &&
        (
          github.event_name == 'push' ||
          github.event.pull_request.head.repo.full_name == github.repository
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'

 'env':
-  'GO_VERSION': '1.18'
+  'GO_VERSION': '1.18.6'

 'on':
  'push':
@@ -17,7 +17,7 @@
    'steps':
    - 'uses': 'actions/checkout@v2'
    - 'name': 'Set up Go'
-      'uses': 'actions/setup-go@v2'
+      'uses': 'actions/setup-go@v3'
      'with':
        'go-version': '${{ env.GO_VERSION }}'
    - 'name': 'run-lint'
@@ -43,7 +43,9 @@
    # Use always() to signal to the runner that this job must run even if the
    # previous ones failed.
    'if':
-      ${{ always() &&
+      ${{
+        always() &&
+        github.repository_owner == 'AdguardTeam' &&
        (
          github.event_name == 'push' ||
          github.event.pull_request.head.repo.full_name == github.repository
--- a/AGHTechDoc.md
+++ b/AGHTechDoc.md
@@ -1355,6 +1355,19 @@ Internally, all supported services are stored as a map:
 	service name -> list of rules


+### API: Get blocked services list of available services
+
+Request:
+
+	GET /control/blocked_services/services
+
+Response:
+
+	200 OK
+
+	[ "name1", ... ]
+
+
 ### API: Get blocked services list

 Request:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,21 +20,117 @@ and this project adheres to
 - Weaker cipher suites that use the CBC (cipher block chaining) mode of
  operation have been disabled ([#2993]).

-### Deprecated
+### Added

- Go 1.18 support.  v0.109.0 will require at least Go 1.19 to build.
+- Support for plain (unencrypted) HTTP/2 ([#4930]).  This is useful for AdGuard
+  Home installations behind a reverse proxy.

 [#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993
+[#4930]: https://github.com/AdguardTeam/AdGuardHome/issues/4930
+



 <!--
-## [v0.107.12] - 2022-09-28 (APPROX.)
+## [v0.107.14] - 2022-10-05 (APPROX.)
+
+See also the [v0.107.14 GitHub milestone][ms-v0.107.14].
+
+[ms-v0.107.14]:   https://github.com/AdguardTeam/AdGuardHome/milestone/50?closed=1
+-->
+
+
+
+## [v0.107.13] - 2022-09-14
+
+See also the [v0.107.13 GitHub milestone][ms-v0.107.13].
+
+### Added
+
+- The new optional `dns.ipset_file` property, which can be set in the
+  configuration file.  It allows loading the `ipset` list from a file, just like
+  `dns.upstream_dns_file` does for upstream servers ([#4686]).
+
+### Changed
+
+- The minimum DHCP message size is reassigned back to BOOTP's constraint of 300
+  bytes ([#4904]).
+
+### Fixed
+
+- Panic when adding a static lease within the disabled DHCP server ([#4722]).
+
+[#4686]: https://github.com/AdguardTeam/AdGuardHome/issues/4686
+[#4722]: https://github.com/AdguardTeam/AdGuardHome/issues/4722
+[#4904]: https://github.com/AdguardTeam/AdGuardHome/issues/4904
+
+[ms-v0.107.13]:   https://github.com/AdguardTeam/AdGuardHome/milestone/49?closed=1
+
+
+
+## [v0.107.12] - 2022-09-07

 See also the [v0.107.12 GitHub milestone][ms-v0.107.12].

-[ms-v0.107.12]: https://github.com/AdguardTeam/AdGuardHome/milestone/47?closed=1
-->
+### Security
+
+- Go version was updated to prevent the possibility of exploiting the
+  CVE-2022-27664 and CVE-2022-32190 Go vulnerabilities fixed in
+  [Go 1.18.6][go-1.18.6].
+
+### Added
+
+- New `bool`, `dur`, `u8`, and `u16` DHCP options to provide more convenience on
+  options control by setting values in a human-readable format ([#4705]).  See
+  also a [Wiki page][wiki-dhcp-opts].
+- New `del` DHCP option which removes the corresponding option from server's
+  response ([#4337]).  See also a [Wiki page][wiki-dhcp-opts].
+
+  **NOTE:** This modifier affects all the parameters in the response and not
+  only the requested ones.
+- A new HTTP API, `GET /control/blocked_services/services`, that lists all
+  available blocked services ([#4535]).
+
+### Changed
+
+- The DHCP options handling is now closer to the [RFC 2131][rfc-2131] ([#4705]).
+- When the DHCP server is enabled, queries for domain names under
+  `dhcp.local_domain_name` not pointing to real DHCP client hostnames are now
+  processed by filters ([#4865]).
+- The `DHCPREQUEST` handling is now closer to the [RFC 2131][rfc-2131]
+  ([#4863]).
+- The internal DNS client, used to resolve hostnames of external clients and
+  also during automatic updates, now respects the upstream mode settings for the
+  main DNS client ([#4403]).
+
+### Deprecated
+
+- Ports 784 and 8853 for DNS-over-QUIC in Docker images.  Users who still serve
+  DoQ on these ports are encouraged to move to the standard port 853.  These
+  ports will be removed from the `EXPOSE` section of our `Dockerfile` in a
+  future release.
+- Go 1.18 support.  Future versions will require at least Go 1.19 to build.
+
+### Fixed
+
+- The length of the DHCP server's response is now at least 576 bytes as per
+  [RFC 2131][rfc-2131] recommendation ([#4337]).
+- Dynamic leases created with empty hostnames ([#4745]).
+- Unnecessary logging of non-critical statistics errors ([#4850]).
+
+[#4337]: https://github.com/AdguardTeam/AdGuardHome/issues/4337
+[#4403]: https://github.com/AdguardTeam/AdGuardHome/issues/4403
+[#4535]: https://github.com/AdguardTeam/AdGuardHome/issues/4535
+[#4705]: https://github.com/AdguardTeam/AdGuardHome/issues/4705
+[#4745]: https://github.com/AdguardTeam/AdGuardHome/issues/4745
+[#4850]: https://github.com/AdguardTeam/AdGuardHome/issues/4850
+[#4863]: https://github.com/AdguardTeam/AdGuardHome/issues/4863
+[#4865]: https://github.com/AdguardTeam/AdGuardHome/issues/4865
+
+[go-1.18.6]:      https://groups.google.com/g/golang-announce/c/x49AQzIVX-s
+[ms-v0.107.12]:   https://github.com/AdguardTeam/AdGuardHome/milestone/48?closed=1
+[rfc-2131]:       https://datatracker.ietf.org/doc/html/rfc2131
+[wiki-dhcp-opts]: https://github.com/adguardTeam/adGuardHome/wiki/DHCP#config-4



@@ -214,9 +310,10 @@ See also the [v0.107.7 GitHub milestone][ms-v0.107.7].
  seconds.
 - Domain-specific private reverse DNS upstream servers are now validated to
  allow only `*.in-addr.arpa` and `*.ip6.arpa` domains pointing to
-  locally-served networks ([#3381]).  **Note:**  If you already have invalid
-  entries in your configuration, consider removing them manually, since they
-  essentially had no effect.
+  locally-served networks ([#3381]).
+
+  **NOTE:**  If you already have invalid entries in your configuration, consider
+  removing them manually, since they essentially had no effect.
 - Response filtering is now performed using the record types of the answer
  section of messages as opposed to the type of the question ([#4238]).
 - Instead of adding the build time information, the build scripts now use the
@@ -1139,11 +1236,13 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].


 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.12...HEAD
-[v0.107.12]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.11...v0.107.12
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.14...HEAD
+[v0.107.14]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.13...v0.107.14
 -->

-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.11...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.13...HEAD
+[v0.107.13]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.12...v0.107.13
+[v0.107.12]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.11...v0.107.12
 [v0.107.11]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.10...v0.107.11
 [v0.107.10]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.9...v0.107.10
 [v0.107.9]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.8...v0.107.9
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
 &nbsp;
 <p align="center">
-  <img src="https://cdn.adtidy.org/public/Adguard/Common/adguard_home.svg" width="300px" alt="AdGuard Home" />
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="doc/adguard_home_darkmode.svg">
+        <img alt="AdGuard Home" src="doc/adguard_home_lightmode.svg" width="300px">
+    </picture>
 </p>
 <h3 align="center">Privacy protection center for you and your devices</h3>
 <p align="center">
-  Free and open source, powerful network-wide ads & trackers blocking DNS server.
+    Free and open source, powerful network-wide ads & trackers blocking DNS
+    server.
 </p>

 <p align="center">
@@ -366,6 +370,7 @@ Here's what you can also do to contribute:
 * [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)
 * [Asuswrt-Merlin-AdGuardHome-Installer](https://github.com/jumpsmm7/Asuswrt-Merlin-AdGuardHome-Installer) by [@jumpsmm7](https://github.com/jumpsmm7) aka [@SomeWhereOverTheRainBow](https://www.snbforums.com/members/somewhereovertherainbow.64179/)
+* [Node.js library](https://github.com/Andrea055/AdguardHomeAPI) by [@Andrea055](https://github.com/Andrea055/)

 <a id="acknowledgments"></a>
 ## Acknowledgments
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
  'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:5.0'
+  'dockerGo': 'adguard/golang-ubuntu:5.1'

 'stages':
 - 'Build frontend':
@@ -322,7 +322,7 @@
    # need to build a few of these.
    'variables':
      'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:5.0'
+      'dockerGo': 'adguard/golang-ubuntu:5.1'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -337,4 +337,4 @@
    # are the ones that actually get released.
    'variables':
      'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:5.0'
+      'dockerGo': 'adguard/golang-ubuntu:5.1'
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
  'key': 'AHBRTSPECS'
  'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:5.0'
+  'dockerGo': 'adguard/golang-ubuntu:5.1'

 'stages':
 - 'Tests':
--- a/client/src/__locales/ar.json
+++ b/client/src/__locales/ar.json
@@ -1,5 +1,5 @@
 {
-    "client_settings": "الإعدادات",
+    "client_settings": "إعدادات العميل",
    "example_upstream_reserved": "يمكنك تحديد <0> DNS upstream لنطاق معين (نطاقات) </0>",
    "example_upstream_comment": "يمكنك تحديد تعليق",
    "upstream_parallel": "استخدام الاستعلامات المتوازية لتسريع الحل عن طريق الاستعلام في وقت واحد عن جميع خوادم المنبع",
@@ -47,6 +47,7 @@
    "form_error_server_name": "اسم الخادم غير صالح",
    "form_error_subnet": "لا تحتوي الشبكة الفرعية \"{{cidr}}\" على عنوان IP \"{{ip}}\"",
    "form_error_positive": "يجب أن يكون أكبر من 0",
+    "form_error_gateway_ip": "لا يمكن الحصول على عنوان IP الخاص بالبوابة",
    "out_of_range_error": "يجب أن يكون خارج النطاق \"{{start}}\" - \"{{end}}\"",
    "lower_range_start_error": "يجب أن يكون أقل من نطاق البداية",
    "greater_range_start_error": "يجب أن يكون أكبر من نطاق البداية",
@@ -210,17 +211,20 @@
    "example_comment_hash": "# تعليق أيضًا",
    "example_regex_meaning": "منع الوصول إلى النطاقات المطابقة للتعبير العادي المحدد.",
    "example_upstream_regular": "regular DNS (over UDP);",
+    "example_upstream_regular_port": "DNS عادي (عبر UDP ، مع المنفذ) ؛",
    "example_upstream_udp": "regular DNS (over UDP, hostname);",
    "example_upstream_dot": "مشفر<0>DNS-over-TLS</0>;",
    "example_upstream_doh": "مشفر <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "encrypted <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamps</0> for <1>DNSCrypt</1> or <2>DNS-over-HTTPS</2> resolvers;",
    "example_upstream_tcp": "regular DNS (over TCP);",
+    "example_upstream_tcp_port": "DNS عادي (عبر TCP ، مع منفذ) ؛",
    "example_upstream_tcp_hostname": "regular DNS (over TCP, hostname);",
    "all_lists_up_to_date_toast": "جميع القوائم محدثة بالفعل",
    "updated_upstream_dns_toast": "تم حفظ خوادم Upstream بنجاح",
    "dns_test_ok_toast": "تعمل خوادم DNS المحددة بشكل صحيح",
    "dns_test_not_ok_toast": "خادم \"{{key}}\": لا يمكن استخدامه يرجى التحقق من كتابته بشكل صحيح",
+    "dns_test_warning_toast": "المنبع \"{{key}}\" لا يستجيب لطلبات الاختبار وقد لا يعمل بشكل صحيح",
    "unblock": "إلغاء الحظر",
    "block": "حظر",
    "disallow_this_client": "منع هذا العميل",
@@ -362,6 +366,7 @@
    "encryption_config_saved": "تم حفظ اعدادات التشفير",
    "encryption_server": "اسم الخادم",
    "encryption_server_enter": "ادخل عنوان النطاق الخاص بك",
+    "encryption_server_desc": "من أجل استخدام HTTPS ، تحتاج إلى إدخال اسم الخادم الذي يتطابق مع شهادة SSL أو شهادة البدل. إذا لم يتم تعيين الحقل ، فسيقبل اتصالات TLS لأي مجال.",
    "encryption_redirect": "إعادة التوجيه إلى HTTPS تلقائيًا",
    "encryption_redirect_desc": "إذا تم تحديده ، فسيقوم AdGuard Home بإعادة توجيهك تلقائيًا من عناوين HTTP إلى عناوين HTTPS.",
    "encryption_https": "منفذ HTTPS",
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -70,7 +70,7 @@
    "dhcp_warning": "Калі вы ўсё адно хочаце ўключыць DHCP-сервер, пераканайцеся, што ў сеціве больш няма актыўных DHCP-сервераў. Інакш гэта можа зламаць доступ у сеціва для падлучаных прылад!",
    "dhcp_error": "AdGuard Home не можа вызначыць, ці ёсць у сетцы іншы актыўны DHCP-сервер",
    "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_deleted": "Статычная арэнда «{{key}}» паспяхова выдалена",
    "dhcp_new_static_lease": "Новая статычная арэнда",
@@ -211,12 +211,14 @@
    "example_comment_hash": "# І вось так таксама.",
    "example_regex_meaning": "блакаваць доступ да даменаў, якія адпавядаюць зададзенаму рэгулярнаму выразу.",
    "example_upstream_regular": "звычайны DNS (наўзверх UDP);",
+    "example_upstream_regular_port": "звычайны DNS (праз UDP, імя хаста);",
    "example_upstream_udp": "звычайны 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_sdns": "<0>DNS Stamps</0> для <1>DNSCrypt</1> ці <2>DNS-over-HTTPS</2> рэзалвераў;",
    "example_upstream_tcp": "звычайны DNS (наўзверх TCP);",
+    "example_upstream_tcp_port": "звычайны DNS (праз TCP, імя хаста);",
    "example_upstream_tcp_hostname": "звычайны DNS (праз TCP, імя хаста);",
    "all_lists_up_to_date_toast": "Усе спісы ўжо абноўлены",
    "updated_upstream_dns_toast": "Upstream DNS-серверы абноўлены",
@@ -445,7 +447,7 @@
    "access_disallowed_title": "Забароненыя кліенты",
    "access_disallowed_desc": "Спіс CIDR, IP-адрасоў або <a>ClientID</a>. Калі ў гэтым спісе ёсць запісы, AdGuard Home выдаліць запыты ад гэтых кліентаў. Гэта поле ігнаруецца, калі ёсць запісы ў Дазволеныя кліенты.",
    "access_blocked_title": "Заблакаваныя дамены",
-    "access_blocked_desc": "Не блытайце гэта з фільтрамі. AdGuard Home будзе ігнараваць DNS-запыты з гэтымі даменамі.",
+    "access_blocked_desc": "Не блытаць з фільтрамі. AdGuard Home выдаляе запыты DNS, якія адпавядаюць гэтым даменам, і гэтыя запыты нават не з'яўляюцца ў журнале запытаў. Вы можаце ўказаць дакладныя даменныя імёны, падстаноўныя знакі або правілы фільтрацыі URL-адрасоў, напрыклад, «example.org», «*.example.org» ці «||example.org^» адпаведна.",
    "access_settings_saved": "Налады доступу паспяхова захаваны",
    "updates_checked": "Даступная новая версія AdGuard Home",
    "updates_version_equal": "Версія AdGuard Home актуальная",
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Také komentář.",
    "example_regex_meaning": "blokuje přístup doménám, které vyhovují regulárnímu výrazu.",
    "example_upstream_regular": "obvyklý DNS (přes UDP);",
+    "example_upstream_regular_port": "obvyklý DNS (skrze UDP, s portem);",
    "example_upstream_udp": "obvyklý DNS (skrze UDP, název hostitele);",
    "example_upstream_dot": "šifrovaný <0>DNS skrze TLS</0>;",
    "example_upstream_doh": "šifrovaný <0>DNS skrze HTTPS</0>;",
    "example_upstream_doq": "šifrovaný <0>DNS skrze QUIC</0>;",
    "example_upstream_sdns": "<0>DNS razítka</0> pro <1>DNSCrypt</1> nebo <2>DNS skrze HTTPS</2> řešitele;",
    "example_upstream_tcp": "obvyklý DNS (přes TCP);",
+    "example_upstream_tcp_port": "obvyklý DNS (skrze TCP, s portem);",
    "example_upstream_tcp_hostname": "obvyklý DNS (skrze TCP, název hostitele);",
    "all_lists_up_to_date_toast": "Všechny seznamy jsou již aktuální",
    "updated_upstream_dns_toast": "Odchozí servery byly úspěšně uloženy",
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Også en kommentar.",
    "example_regex_meaning": "blokér adgang til domæner matchernde det angivne regulære udtryk",
    "example_upstream_regular": "almindelig DNS (over UDP)",
+    "example_upstream_regular_port": "almindelig DNS (over UDP, med port);",
    "example_upstream_udp": "almindelig DNS (over UDP, værtsnavn);",
    "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": "<0>DNS Stamps</0> til <1>DNSCrypt</1> eller <2>DNS-over-HTTPS</2>-opløsere;",
    "example_upstream_tcp": "almindelig DNS (over TCP)",
+    "example_upstream_tcp_port": "almindelig DNS (over TCP, med port);",
    "example_upstream_tcp_hostname": "almindelig DNS (over TCP, værtsnavn);",
    "all_lists_up_to_date_toast": "Alle lister er allerede opdaterede",
    "updated_upstream_dns_toast": "Upstream-servere er gemt",
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Auch ein Kommentar.",
    "example_regex_meaning": "Zugriff auf die Domains sperren, die dem angegebenen regulären Ausdruck entsprechen.",
    "example_upstream_regular": "reguläres DNS (over UDP);",
+    "example_upstream_regular_port": "normales DNS (über UDP, mit Port);",
    "example_upstream_udp": "normales DNS (über UDP, Hostname);",
    "example_upstream_dot": "verschlüsseltes <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "verschlüsseltes <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "verschlüsseltes <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS-Stempel</0> für <1>DNSCrypt</1> oder <2>DNS-over-HTTPS</2> Resolver;",
    "example_upstream_tcp": "reguläres DNS (over TCP);",
+    "example_upstream_tcp_port": "normales DNS (über TCP, mit Port);",
    "example_upstream_tcp_hostname": "normales DNS (über TCP, Hostname);",
    "all_lists_up_to_date_toast": "Alle Listen sind bereits auf dem neuesten Stand",
    "updated_upstream_dns_toast": "Upstream-Server erfolgreich gespeichert",
@@ -445,7 +447,7 @@
    "access_disallowed_title": "Nicht zugelassene Clients",
    "access_disallowed_desc": "Eine Liste von CIDRs, IP-Adressen oder <a>ClientIDs</a>. Wenn diese Liste gefüllt ist, weist AdGuard Home Anfragen von diesen Clients zurück. Dieses Feld wird ignoriert, wenn es Einträge in der Liste „Zugelassene Clients“ gibt.",
    "access_blocked_title": "Nicht zugelassene Domains",
-    "access_blocked_desc": "Verwechseln Sie dies nicht mit Filtern. AdGuard Home verwirft DNS-Abfragen, die mit diesen Domänen übereinstimmen, und diese Abfragen erscheinen nicht einmal im Abfrageprotokoll. 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 verwirft DNS-Abfragen, die mit diesen Domänen übereinstimmen, und diese Abfragen erscheinen nicht einmal im Abfrageprotokoll. Hier können Sie die genauen Domain-Namen, Wildcards und URL-Filter-Regeln angeben, z.B. „example.org“, „*.example.org“ oder „||example.org^“.",
    "access_settings_saved": "Zugriffseinstellungen erfolgreich gespeichert",
    "updates_checked": "Neue Version von AdGuard Home ist jetzt verfügbar",
    "updates_version_equal": "AdGuard Home ist aktuell",
@@ -625,7 +627,7 @@
    "setup_config_to_enable_dhcp_server": "Einrichten der Konfiguration zur Aktivierung des DHCP-Servers",
    "original_response": "Ursprüngliche Antwort",
    "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.",
+    "port_53_faq_link": "Port 53 wird oft von Diensten wie „DNSStubListener“ oder „system-resolved“ 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.",
    "filter_allowlist": "Warnhinweis: Durch diese Aktion wird außerdem die Regel „{{disallowed_rule}}“ aus der Liste der zugelassenen Clients ausgeschlossen.",
    "last_rule_in_allowlist": "Dieser Client kann nicht gesperrt werden, da das Ausschließen der Regel „{{disallowed_rule}}“ die Liste „Zugelassene Clients“ deaktivieren würde.",
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Also a comment.",
    "example_regex_meaning": "block access to domains matching the specified regular expression.",
    "example_upstream_regular": "regular DNS (over UDP);",
+    "example_upstream_regular_port": "regular DNS (over UDP, with port);",
    "example_upstream_udp": "regular DNS (over UDP, hostname);",
    "example_upstream_dot": "encrypted <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "encrypted <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "encrypted <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamps</0> for <1>DNSCrypt</1> or <2>DNS-over-HTTPS</2> resolvers;",
    "example_upstream_tcp": "regular DNS (over TCP);",
+    "example_upstream_tcp_port": "regular DNS (over TCP, with port);",
    "example_upstream_tcp_hostname": "regular DNS (over TCP, hostname);",
    "all_lists_up_to_date_toast": "All lists are already up-to-date",
    "updated_upstream_dns_toast": "Upstream servers successfully saved",
@@ -633,5 +635,6 @@
    "parental_control": "Parental Control",
    "safe_browsing": "Safe Browsing",
    "served_from_cache": "{{value}} <i>(served from cache)</i>",
-    "form_error_password_length": "Password must be at least {{value}} characters long"
+    "form_error_password_length": "Password must be at least {{value}} characters long",
+    "anonymizer_notification": "<0>Note:</0> IP anonymization is enabled. You can disable it in <1>General settings</1>."
 }
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# También un comentario.",
    "example_regex_meaning": "bloquea el acceso a los dominios que coincidan con la expresión regular especificada.",
    "example_upstream_regular": "DNS regular (mediante UDP).",
+    "example_upstream_regular_port": "DNS regular (mediante UDP, con puerto).",
    "example_upstream_udp": "DNS regular (mediante UDP, nombre del host).",
    "example_upstream_dot": "cifrado <0>DNS mediante TLS</0>.",
    "example_upstream_doh": "cifrado <0>DNS mediante HTTPS</0>.",
    "example_upstream_doq": "cifrado <0>DNS mediante QUIC</0>.",
    "example_upstream_sdns": "<0>DNS Stamps</0> para <1>DNSCrypt</1> o resolutores <2>DNS mediante HTTPS</2>.",
    "example_upstream_tcp": "DNS regular (mediante TCP).",
+    "example_upstream_tcp_port": "DNS regular (mediante TCP, con puerto).",
    "example_upstream_tcp_hostname": "DNS regular (mediante TCP, nombre del host).",
    "all_lists_up_to_date_toast": "Todas las listas ya están actualizadas",
    "updated_upstream_dns_toast": "Servidores DNS de subida guardados correctamente",
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -1,11 +1,14 @@
 {
    "client_settings": "تنظیمات کلاینت",
    "example_upstream_reserved": "میتوانید جریان ارسالی DNS <0> را برای یک دامنه مشخص تعیین کنید </0>",
+    "example_upstream_comment": "یک نظر.",
    "upstream_parallel": "استفاده از جستار موازی برای سرعت دادن به تفکیک با جستار همزمان همه جریان های ارسالی",
    "parallel_requests": "درخواست های موازی",
+    "load_balancing": "متعادل کننده بار",
    "bootstrap_dns": "خودراه انداز سرورهای DNS",
    "bootstrap_dns_desc": "خودراه انداز سرورهای DNS برای تفکیک آدرس آی پی  تفکیک کننده های DoH/DoT که شما بعنوان جریان ارسالی تعیین کردید استفاده میشود.",
    "local_ptr_title": "سرورهای خصوصی DNS",
+    "local_ptr_desc": "سرور یا سرور های DNS ای که AdGuard Home برای درخواست های منابع محلی ارائه شده مورد استفاده قرار خواهد داد. برای مثال، این سرور برای تعیین نام های سرویس دهنده برای سرویس گیرنده با آدرس های آی پی خصوصی مورد استفاده قرار خواهد گرفت. اگر تعیین نشود،AdGuard Home به طور خودکار از تعیین کننده ی DNS پیش فرض شما استفاده خواهد کرد.",
    "local_ptr_default_resolver": "به طور پیش فرض، AdGuard Home از تعیین کننده های DNS معکوس زیر استفاده می کند: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home نتوانست برای این دستگاه تعیین کننده های DNS معکوس محرمانه مناسب را معین کند.",
    "local_ptr_placeholder": "در هر خط یک آدرس سرور را وارد کنید",
@@ -207,6 +210,9 @@
    "dns_test_not_ok_toast": "سرور \"{{key}}\": نمیتواند مورد استفاده قرار گیرد،لطفا بررسی کنید آن را بدرستی نوشته اید",
    "unblock": "رفع انسداد",
    "block": "مسدود کردن",
+    "disallow_this_client": "این مشتری را رد کنید",
+    "allow_this_client": "به این مشتری اجازه دهید",
+    "block_for_this_client_only": "مسدود کردن فقط برای این مشتری",
    "time_table_header": "زمان",
    "date": "تاریخ",
    "domain_name_table_header": "نام دامنه",
@@ -320,6 +326,7 @@
    "install_devices_android_list_5": "گروه مقادیر DNS 1 و DNS 2 را به آدرس سرور AdGuard Home خود تغییر دهید.",
    "install_devices_ios_list_1": "از صفحه خانه،تنظیمات را فشار دهید.",
    "install_devices_ios_list_2": "وای فای را از منوی چپ انتخاب کنید (پیکربندی DNS دستی برای ارتباط موبایلی غیرممکن است).",
+    "install_devices_ios_list_3": "روی نام شبکه فعال فعلی کلیک کنید.",
    "install_devices_ios_list_4": "در فیلد DNS آدرس سرور AdGuard Home را وارد کنید",
    "get_started": "شروع به کار",
    "next": "بعدی",
@@ -552,6 +559,7 @@
    "safe_search": "جستجوی اَمن",
    "blocklist": "لیست سیاه",
    "milliseconds_abbreviation": "هـ ثـ",
+    "cache_size": "اندازه کش",
    "cache_optimistic": "حالت ویژه پردازش",
    "cache_optimistic_desc": "AdGuard Home را وادار می کند که از سمت حافظه پنهان پاسخ دهد حتی وقتی که موارد وارد شده منقضی شده باشد و همچنین سعی بر تازه کردن آنها می کند.",
    "filter_category_general": "General",
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -210,13 +210,15 @@
    "example_comment_meaning": "vain kommentti;",
    "example_comment_hash": "# Tämäkin on kommentti.",
    "example_regex_meaning": "estä pääsy määritettyä säännöllistä lauseketta vastaaviin verkkotunnuksiin.",
-    "example_upstream_regular": "tavallinen DNS (UDP:n välityksellä);",
+    "example_upstream_regular": "tavallinen DNS (UDP);",
+    "example_upstream_regular_port": "tavallinen DNS (UDP, portti);",
    "example_upstream_udp": "tavallinen DNS (UDP, isäntänimi);",
    "example_upstream_dot": "salattu <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "salattu <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "salattu <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamp</0> -merkinnät <1>DNSCrypt</1> tai <2>DNS-over-HTTPS</2> -resolvereille;",
-    "example_upstream_tcp": "tavallinen DNS (TCP:n välityksellä);",
+    "example_upstream_tcp": "tavallinen DNS (TCP);",
+    "example_upstream_tcp_port": "tavallinen DNS (TCP, portti);",
    "example_upstream_tcp_hostname": "tavallinen DNS (TCP, isäntänimi);",
    "all_lists_up_to_date_toast": "Kaikki listat ovat ajan tasalla",
    "updated_upstream_dns_toast": "Ylävirtojen palvelimet tallennettiin",
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -71,8 +71,8 @@
    "dhcp_error": "AdGuard Home ne peut pas déterminer s'il y a un autre serveur DHCP actif 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_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_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_added": "« {{key}} » de bail statique ajoutée",
+    "dhcp_lease_deleted": "« {{key}} » de bail statique supprimée",
    "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",
@@ -206,23 +206,25 @@
    "example_meaning_filter_block": "bloque l’accès au domaine example.org et à tous ses sous-domaines ;",
    "example_meaning_filter_whitelist": "débloque l’accès au domaine example.org et à tous ses sous-domaines ;",
    "example_meaning_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": "! Voici un commentaire.",
    "example_comment_meaning": "juste un commentaire ;",
    "example_comment_hash": "# Aussi un commentaire.",
    "example_regex_meaning": "bloque 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_regular_port": "DNS normal (sur UDP, avec port) ;",
    "example_upstream_udp": "DNS normal (sur UDP, nom d’hôte) ;",
    "example_upstream_dot": "<0>DNS-over-TLS</0> chiffré ;",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0> chiffré ;",
    "example_upstream_doq": "<0>DNS-over-QUIC</0> chiffré;",
    "example_upstream_sdns": "vous pouvez utiliser <0>DNS Stamps</0> pour <1>DNSCrypt</1> ou les résolveurs <2>DNS_over_HTTPS</2> ;",
    "example_upstream_tcp": "DNS classique (au-dessus de TCP) ;",
+    "example_upstream_tcp_port": "DNS normal (sur TCP, avec port) ;",
    "example_upstream_tcp_hostname": "DNS normal (sur TCP, nom d’hôte) ;",
    "all_lists_up_to_date_toast": "Toutes les listes sont déjà à jour",
    "updated_upstream_dns_toast": "Serveurs en amont enregistrés",
    "dns_test_ok_toast": "Les serveurs DNS spécifiés fonctionnent correctement",
    "dns_test_not_ok_toast": "Impossible d'utiliser le serveur « {{key}} »: veuillez vérifier si le nom saisi est bien correct",
-    "dns_test_warning_toast": "L'amont « {{key}} » ne répond pas aux demandes de test et peut ne pas fonctionner correctement.",
+    "dns_test_warning_toast": "L'amont «{{key}}» ne répond pas aux demandes de test et peut ne pas fonctionner correctement",
    "unblock": "Débloquer",
    "block": "Bloquer",
    "disallow_this_client": "Interdire ce client",
@@ -338,7 +340,7 @@
    "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_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": "Dans le panneau de gauche, cliquez sur « Modifier les paramètres de l'adaptateur ».",
+    "install_devices_windows_list_3": "Cliquez « Modifier les paramètres de l'adaptateur » sur le panneau à gauche.",
    "install_devices_windows_list_4": "Cliquez avec le bouton droit de la souris sur votre connexion active et sélectionnez Propriétés.",
    "install_devices_windows_list_5": "Recherchez « Protocole Internet Version 4 (TCP/IPv4) » (soit, pour IPv6, « Protocole Internet Version 6 (TCP/IPv6) ») dans la liste, sélectionnez-la puis cliquez à nouveau sur Propriétés.",
    "install_devices_windows_list_6": "Sélectionnez « Utiliser l’adresse de serveur DNS suivante » et saisissez votre adresse de serveur AdGuard Home.",
@@ -430,11 +432,11 @@
    "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é",
    "client_added": "Le client « {{key}} » a été ajouté",
    "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 d'exécution",
    "auto_clients_desc": "Appareils ne figurant pas sur la liste des clients persistants qui peuvent encore utiliser AdGuard Home.",
@@ -472,7 +474,7 @@
    "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",
@@ -553,11 +555,11 @@
    "disable_ipv6_desc": "Abandonner toutes les requêtes DNS pour les adresses IPv6 (type AAAA).",
    "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.",
-    "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 », AdGuard Home configurera votre système pour utiliser le serveur DNS AdGuard Home.",
    "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",
-    "tags_desc": "Vous pouvez sélectionner les mots clés qui correspondent au client. Les mots clés peuvent être inclus dans les règles de filtrage et vous permettent de les appliquer plus précisément. <0>En savoir plus</0> .",
+    "tags_desc": "Vous pouvez sélectionner les mots clés qui correspondent au client. Les mots clés peuvent être inclus dans les règles de filtrage et vous permettent de les appliquer plus précisément. <0>En savoir plus</0>.",
    "form_select_tags": "Sélectionner les mots clés du client",
    "check_title": "Vérification du filtrage",
    "check_desc": "Vérifier si le nom d’hôte est filtré .",
@@ -573,10 +575,10 @@
    "check_service": "Nom du service : {{service}}",
    "service_name": "Nom du service",
    "check_not_found": "Introuvable dans vos listes de filtres",
-    "client_confirm_block": "Voulez-vous vraiment bloquer le client « {{ip}} »?",
-    "client_confirm_unblock": "Voulez-vous vraiment débloquer le client « {{ip}} »?",
-    "client_blocked": "Client « {{ip}} » bloqué avec succès",
-    "client_unblocked": "Client « {{ip}} » débloqué avec succès",
+    "client_confirm_block": "Voulez-vous vraiment bloquer le client « {{ip}} » ?",
+    "client_confirm_unblock": "Voulez-vous vraiment débloquer le client « {{ip}} » ?",
+    "client_blocked": "Client « {{ip}} » bloqué",
+    "client_unblocked": "Client « {{ip}} » débloqué",
    "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",
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Također komentar.",
    "example_regex_meaning": "blokira pristup domenama koje se podudaraju s regularnim izrazom.",
    "example_upstream_regular": "zadani DNS (putem UDP);",
+    "example_upstream_regular_port": "obični DNS (preko UDP-a, s portom);",
    "example_upstream_udp": "obični DNS (preko UDP-a, ime hosta);",
    "example_upstream_dot": "šifrirano <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "šifrirano <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "šifrirano <0>DNS-over-QUIC</0> (eksperimentalno);",
    "example_upstream_sdns": "<0>DNS Stamps</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2> rezolvere;",
    "example_upstream_tcp": "zadani DNS (putem TCP);",
+    "example_upstream_tcp_port": "obični DNS (preko TCP-a, s portom);",
    "example_upstream_tcp_hostname": "obični DNS (preko TCP-a, ime hosta);",
    "all_lists_up_to_date_toast": "Svi popisi su ažurirani",
    "updated_upstream_dns_toast": "Uzvodni poslužitelji uspješno su spremljeni",
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Ez is egy megjegyzés.",
    "example_regex_meaning": "blokkolja a hozzáférést azokhoz a domainekhez, amik illeszkednek a megadott reguláris kifejezésre.",
    "example_upstream_regular": "hagyományos DNS (UDP felett);",
+    "example_upstream_regular_port": "normál DNS (UDP-n keresztül, porttal);",
    "example_upstream_udp": "normál DNS (UDP felett, hostnév);",
    "example_upstream_dot": "titkosított <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "titkosított <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "titkosított <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamps</0> a <1>DNSCrypt</1> vagy <2>DNS-over-HTTPS</2> feloldókhoz;",
    "example_upstream_tcp": "hagyományos DNS (TCP felett);",
+    "example_upstream_tcp_port": "normál DNS (TCP-n keresztül, porttal);",
    "example_upstream_tcp_hostname": "normál DNS (TCP felett, hostnév);",
    "all_lists_up_to_date_toast": "Már minden lista naprakész",
    "updated_upstream_dns_toast": "Upstream szerverek sikeresen mentve",
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Juga sebuah komentar.",
    "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan.",
    "example_upstream_regular": "DNS reguler (melalui UDP);",
+    "example_upstream_regular_port": "DNS biasa (lebih dari UDP, dengan port);",
    "example_upstream_udp": "DNS biasa (lebih dari UDP, nama host);",
    "example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>;",
    "example_upstream_tcp": "DNS reguler (melalui TCP);",
+    "example_upstream_tcp_port": "DNS biasa (melalui TCP, dengan port);",
    "example_upstream_tcp_hostname": "DNS biasa (lebih dari TCP, nama host);",
    "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
    "updated_upstream_dns_toast": "Server upstream berhasil disimpan",
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -23,7 +23,7 @@
    "disabled_dhcp": "Server DHCP disattivato",
    "unavailable_dhcp": "DHCP non disponibile",
    "unavailable_dhcp_desc": "AdGuard Home non può eseguire un server DHCP sul tuo sistema operativo",
-    "dhcp_title": "Server DHCP",
+    "dhcp_title": "Server DHCP (sperimentale!)",
    "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",
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Anche un commento.",
    "example_regex_meaning": "blocca l'accesso ai domini corrispondenti alla specifica espressione regolare.",
    "example_upstream_regular": "DNS regolare (over UDP);",
+    "example_upstream_regular_port": "DNS regolare (su UDP, con porta);",
    "example_upstream_udp": "DNS regolare (over UDP, nome host);",
    "example_upstream_dot": "<0>DNS su TLS</0> crittografato;",
    "example_upstream_doh": "<0>DNS su HTTPS</0> crittografato;",
    "example_upstream_doq": "<0>DNS su QUIC</0> crittografato;",
    "example_upstream_sdns": "<0>DNS Stamps</0> per <1>DNSCrypt</1> oppure i risolutori <2>DNS su HTTPS</2>;",
    "example_upstream_tcp": "DNS regolare (over TCP);",
+    "example_upstream_tcp_port": "DNS regolare (su TCP, con porta);",
    "example_upstream_tcp_hostname": "DNS regolare (over TCP, nome host);",
    "all_lists_up_to_date_toast": "Tutti gli elenchi sono aggiornati",
    "updated_upstream_dns_toast": "I server upstream sono stati salvati correttamente",
@@ -327,7 +329,7 @@
    "install_step": "Passo",
    "install_devices_title": "Configura i tuoi dispositivi",
    "install_devices_desc": "Affinché AdGuard Home inizi a funzionare, è necessario configurare i dispositivi per utilizzarlo.",
-    "install_submit_title": "Congratulazioni!",
+    "install_submit_title": "Felicitazioni!",
    "install_submit_desc": "La procedura di configurazione è completa e ora sei pronto per iniziare ad utilizzare AdGuard Home.",
    "install_devices_router": "Router",
    "install_devices_router_desc": "Questa configurazione copre automaticamente tutti i dispositivi collegati al router di casa, non è necessario configurarli manualmente.",
@@ -341,7 +343,7 @@
    "install_devices_windows_list_3": "Sul lato sinistro dello schermo, clicca su \"Cambia impostazioni adattatore\".",
    "install_devices_windows_list_4": "Fai clic destro sulla tua connessione attiva e seleziona Proprietà.",
    "install_devices_windows_list_5": "Trova \"Protocollo Internet versione 4 (TCP/IPv4)\" (o, per IPv6, \"Protocollo Internet versione 6 (TCP/IPv6)\" nell'elenco, selezionalo e quindi clicca nuovamente su Proprietà.",
-    "install_devices_windows_list_6": "Scegli \"Utilizza i seguenti indirizzi server DNS\" ed inserisci i tuoi indirizzi server AdGuard Home.",
+    "install_devices_windows_list_6": "Scegli \"Utilizza i seguenti indirizzi server DNS\" e inserisci i tuoi indirizzi server AdGuard Home.",
    "install_devices_macos_list_1": "Fai clic sull'icona Apple e dirigiti sulle Preferenze di Sistema.",
    "install_devices_macos_list_2": "Clicca su Rete.",
    "install_devices_macos_list_3": "Seleziona la prima connessione nel tuo elenco e clicca su Avanzate.",
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -23,7 +23,7 @@
    "disabled_dhcp": "DHCPサーバを無効にしました",
    "unavailable_dhcp": "DHCPは利用できません",
    "unavailable_dhcp_desc": "AdGuard Homeはお使いのOS上でDHCPサーバを実行できません。",
-    "dhcp_title": "DHCPサーバ（実験的！）",
+    "dhcp_title": "DHCPサーバ（※実験的）",
    "dhcp_description": "あなたのルータがDHCPの設定を提供していないのなら、AdGuardに内蔵されているDHCPサーバを利用できます。",
    "dhcp_enable": "DHCPサーバを有効にする",
    "dhcp_disable": "DHCPサーバを無効にする",
@@ -71,8 +71,8 @@
    "dhcp_error": "ネットワーク上に別の稼働中DHCPサーバがあるかどうか、AdGuard Homeは判断できませんでした",
    "dhcp_static_ip_error": "DHCPサーバーを使用するには、静的IPアドレスを設定する必要があります。このネットワークインターフェースが静的IPアドレスを使用するように設定されているかどうかを、AdGuard Homeは判断できませんでした。手動で静的IPアドレスを設定してください。",
    "dhcp_dynamic_ip_found": "お使いのシステムは、インターフェース<0>{{interfaceName}}</0>用に動的IPアドレス構成を使用しています。DHCPサーバを使用するには、静的IPアドレスで設定する必要があります。あなたの現在のIPアドレスは<0>{{ipAddress}}</0>です。「DHCPサーバを有効にする」ボタンを押すと、AdGuard Homeは自動的にこのIPアドレスを静的IPアドレスとして設定します。",
-    "dhcp_lease_added": "静的割り当て \"{{key}}\" の追加に成功しました",
-    "dhcp_lease_deleted": "静的割り当て \"{{key}}\" の削除に成功しました",
+    "dhcp_lease_added": "静的リース \"{{key}}\" の追加が完了しました。",
+    "dhcp_lease_deleted": "静的リース \"{{key}}\" の削除が完了しました。",
    "dhcp_new_static_lease": "新規静的割り当て",
    "dhcp_static_leases_not_found": "DHCP静的割り当てはありません",
    "dhcp_add_static_lease": "静的割り当てを追加する",
@@ -211,12 +211,14 @@
    "example_comment_hash": "# これもコメントです",
    "example_regex_meaning": "指定の正規表現に一致するドメインへのアクセスをブロックします。",
    "example_upstream_regular": "通常のDNS（over UDP）。",
+    "example_upstream_regular_port": "レギュラーDNS（over UDP、ポート付き)",
    "example_upstream_udp": "通常のDNS（over 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_sdns": "<1>DNSCrypt</1> または <2>DNS-over-HTTPS</2> リゾルバのための <0>DNS Stamps</0>。",
    "example_upstream_tcp": "通常のDNS（over TCP）。",
+    "example_upstream_tcp_port": "レギュラーDNS（over TCP、ポート付き);",
    "example_upstream_tcp_hostname": "通常のDNS（over TCP, ホスト名）。",
    "all_lists_up_to_date_toast": "すべてのリストは既に最新です",
    "updated_upstream_dns_toast": "上流DNSサーバを保存しました。",
@@ -468,11 +470,11 @@
    "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書き換え情報を削除完了しました",
+    "rewrite_added": "\"{{key}}\" のDNS書き換え情報を追加完了しました",
+    "rewrite_deleted": "\"{{key}}\" のDNS書き換え情報を削除完了しました",
    "rewrite_add": "DNS書き換え情報を追加する",
    "rewrite_not_found": "DNS書き換え情報はありません",
-    "rewrite_confirm_delete": "\"{{key}}\" のためのDNS書き換え情報を削除してもよろしいですか？",
+    "rewrite_confirm_delete": "\"{{key}}\" のDNS書き換え情報を削除してもよろしいですか？",
    "rewrite_desc": "特定のドメイン名に対するDNS応答を簡単にカスタマイズすることを可能にします。",
    "rewrite_applied": "書き換えルールを適用済み",
    "rewrite_hosts_applied": "hostsファイルのルールによって書き換え済み",
@@ -553,7 +555,7 @@
    "disable_ipv6_desc": "IPv6アドレス（タイプAAAA）に対するすべてのDNSクエリをドロップします。",
    "fastest_addr": "最速のIPアドレス",
    "fastest_addr_desc": "すべてのDNSサーバーに処理要求し、全応答の中で最速のIPアドレスを返します。これにより、AdGuard HomeがすべてのDNSサーバーからの応答を待つ必要があるため、DNSクエリが遅くなりますが、全体的な接続性は向上します。",
-    "autofix_warning_text": "\"改善\"をクリックすると、AdGuardHomeはAdGuardHome 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/resolve/resolv.confに置換します</0> <0>DNSStubListenerを停止します（systemd-resolvedサービスをリロードします）</0>",
    "autofix_warning_result": "その結果、システムからのすべてのDNSリクエストは、デフォルトでAdGuard Homeによって処理されます。",
    "tags_title": "タグ",
@@ -576,7 +578,7 @@
    "client_confirm_block": "クライアント\"{{ip}}\"をブロックしてもよろしいですか？",
    "client_confirm_unblock": "クライアント\"{{ip}}\"のブロックを解除してもよろしいですか？",
    "client_blocked": "クライアント\"{{ip}}\"のブロックに成功しました",
-    "client_unblocked": "クライアント\"{{ip}}\"のブロックの解除に成功しました",
+    "client_unblocked": "クライアント\"{{ip}}\"のブロック解除に成功しました",
    "static_ip": "静的IPアドレス",
    "static_ip_desc": "AdGuard Homeはサーバであり、正しく機能させるには静的IPアドレスが必要です。そうしないと、ある時点で、ルータがこのデバイスに異なるIPアドレスを割り当てるかもしれません。",
    "set_static_ip": "静的IPアドレスを設定する",
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -45,10 +45,10 @@
    "form_error_mac_format": "잘못된 MAC 주소",
    "form_error_client_id_format": "ClientID는 숫자, 소문자 및 붙임표(-)만 포함해야 합니다",
    "form_error_server_name": "유효하지 않은 서버 이름",
-    "form_error_subnet": "서브넷 \"{{cidr}}\"에 \"{{ip}}\" IP 주소가 없습니다",
+    "form_error_subnet": "서브넷 '{{cidr}}'에 '{{ip}}' IP 주소가 없습니다",
    "form_error_positive": "0보다 커야 합니다",
    "form_error_gateway_ip": "임대는 게이트웨이의 IP 주소를 가질 수 없습니다",
-    "out_of_range_error": "\"{{start}}\"-\"{{end}}\" 범위 밖이어야 합니다",
+    "out_of_range_error": "'{{start}}'-'{{end}}' 범위 밖이어야 합니다",
    "lower_range_start_error": "범위 시작보다 작은 값이어야 합니다",
    "greater_range_start_error": "범위 시작보다 큰 값이어야 합니다",
    "greater_range_end_error": "범위 종료보다 큰 값이어야 합니다",
@@ -71,8 +71,8 @@
    "dhcp_error": "AdGuard Home이 네트워크에 다른 활성 DHCP 서버가 있는지 확인할 수 없습니다",
    "dhcp_static_ip_error": "DHCP 서버를 사용하려면 고정 IP 주소를 설정해야 합니다. AdGuard Home이 이 네트워크 인터페이스가 고정 IP 주소를 사용하는지 확인할 수 없습니다. 고정 IP 주소를 수동으로 설정하십시오.",
    "dhcp_dynamic_ip_found": "시스템은 <0>{{interfaceName}}</0> 인터페이스에 동적 IP 주소를 사용합니다. DHCP 서버를 사용하려면 고정 IP 주소를 설정해야 합니다. 현재 IP 주소는 <0>{{ipAddress}}</0>입니다. 'DHCP 서버 활성화' 버튼을 누르면 AdGuard Home이 이 IP 주소를 고정 IP 주소로 자동 설정합니다.",
-    "dhcp_lease_added": "\"{{key}}\" 고정 임대 정상적으로 추가되었습니다",
-    "dhcp_lease_deleted": "\"{{key}}\" 고정 임대 정상적으로 삭제되었습니다",
+    "dhcp_lease_added": "'{{key}}' 고정 임대 정상적으로 추가되었습니다",
+    "dhcp_lease_deleted": "'{{key}}' 고정 임대 정상적으로 삭제되었습니다",
    "dhcp_new_static_lease": "새 고정 임대",
    "dhcp_static_leases_not_found": "DHCP 고정 임대를 찾을 수 없음",
    "dhcp_add_static_lease": "고정 임대 추가",
@@ -82,7 +82,7 @@
    "dhcp_reset": "정말로 DHCP 설정을 초기화할까요?",
    "country": "지역",
    "city": "도시",
-    "delete_confirm": "\"{{key}}\"을 삭제하시겠습니까?",
+    "delete_confirm": "'{{key}}'을(를) 삭제하시겠습니까?",
    "form_enter_hostname": "호스트 이름을 입력해주세요",
    "error_details": "오류 상세 정보",
    "response_details": "응답 정보",
@@ -211,17 +211,19 @@
    "example_comment_hash": "# 이것 또한 댓글입니다.",
    "example_regex_meaning": "특정 정규 표현식에 맞는 도메인 접근을 차단합니다.",
    "example_upstream_regular": "일반 DNS (UDP을 통한 접속);",
+    "example_upstream_regular_port": "일반 DNS (UDP 이용, 포트 포함);",
    "example_upstream_udp": "일반 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_sdns": "<1>DNSCrypt</1> 또는 <2>DNS-over-HTTPS</2> 리졸버를 위한 <0>DNS 스탬프</0>;",
    "example_upstream_tcp": "일반 DNS (TCP를 통한 접속);",
+    "example_upstream_tcp_port": "일반 DNS (TCP 이용, 포트 포함);",
    "example_upstream_tcp_hostname": "일반 DNS (TCP를 통한, 호스트명);",
    "all_lists_up_to_date_toast": "모든 리스트가 이미 최신입니다",
    "updated_upstream_dns_toast": "업스트림 서버가 성공적으로 저장되었습니다",
    "dns_test_ok_toast": "특정 DNS 서버들은 정상적으로 동작 중입니다",
-    "dns_test_not_ok_toast": "서버 \"{{key}}\": 사용할 수 없습니다, 제대로 작성했는지 확인하세요.",
+    "dns_test_not_ok_toast": "서버 '{{key}}': 사용할 수 없습니다, 제대로 작성했는지 확인하세요",
    "dns_test_warning_toast": "업스트림 '{{key}}'이(가) 테스트 요청에 응답하지 않으며 제대로 작동하지 않을 수 있습니다",
    "unblock": "차단 해제",
    "block": "차단",
@@ -423,18 +425,18 @@
    "ip_address": "IP 주소",
    "client_identifier_desc": "클라이언트는 IP 주소, CIDR, MAC 주소 또는 ClientID(DoT/DoH/DoQ에 사용 가능)로 식별할 수 있습니다. <0>여기에서</0> 클라이언트를 식별하는 방법에 대한 자세한 내용은 확인하실 수 있습니다.",
    "form_enter_ip": "IP 입력",
-    "form_enter_subnet_ip": "서브넷 \"{{cidr}}\" 내의 IP 주소 입력",
+    "form_enter_subnet_ip": "서브넷 '{{cidr}}' 내의 IP 주소 입력",
    "form_enter_mac": "MAC 입력",
    "form_enter_id": "식별자 입력",
    "form_add_id": "식별자 추가",
    "form_client_name": "클라이언트 이름 입력",
    "name": "이름",
    "client_global_settings": "글로벌 설정 사용",
-    "client_deleted": "클라이언트 \"{{key}}\"가 정상적으로 삭제되었습니다",
-    "client_added": "클라이언트 \"{{key}}\"가 정상적으로 추가되었습니다",
-    "client_updated": "클라이언트 \"{{key}}\"가 정상적으로 업데이트되었습니다",
+    "client_deleted": "클라이언트 '{{key}}'이(가) 정상적으로 삭제되었습니다",
+    "client_added": "클라이언트 '{{key}}'이(가) 정상적으로 추가되었습니다",
+    "client_updated": "클라이언트 '{{key}}'이(가) 정상적으로 업데이트되었습니다",
    "clients_not_found": "클라이언트 없음",
-    "client_confirm_delete": "정말 클라이언트 \"{{key}}\" 삭제하시겠습니까?",
+    "client_confirm_delete": "정말 클라이언트 '{{key}}'을(를) 삭제하시겠습니까?",
    "list_confirm_delete": "정말로 이 목록을 제거하시겠습니까?",
    "auto_clients_title": "런타임 클라이언트",
    "auto_clients_desc": "AdGuard Home을 계속 사용할 수 있는 영구 클라이언트 목록에 없는 디바이스입니다",
@@ -468,11 +470,11 @@
    "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 수정 정보를 성공적으로 삭제 됩니다.",
+    "rewrite_added": "'{{key}}'에 대한 DNS 수정 정보를 성공적으로 추가 됩니다",
+    "rewrite_deleted": "'{{key}}'에 대한 DNS 수정 정보를 성공적으로 삭제 됩니다",
    "rewrite_add": "DNS 변환 정보를 추가합니다",
    "rewrite_not_found": "DNS 변경 정보를 찾을 수 없습니다",
-    "rewrite_confirm_delete": "\"{{key}}\"에 대한 DNS 변경 정보를 삭제하시겠습니까?",
+    "rewrite_confirm_delete": "'{{key}}'에 대한 DNS 변경 정보를 삭제하시겠습니까?",
    "rewrite_desc": "특정 도메인 이름에 대한 사용자 지정 DNS 응답을 쉽게 구성할 수 있습니다.",
    "rewrite_applied": "리디렉션 규칙이 적용됩니다",
    "rewrite_hosts_applied": "호스트 파일 규칙에 따라 재작성",
@@ -553,7 +555,7 @@
    "disable_ipv6_desc": "IPv6 주소(타입 AAAA)의 모든 DNS 쿼리가 무시됩니다.",
    "fastest_addr": "가장 빠른 IP 주소",
    "fastest_addr_desc": "모든 DNS 서버에 쿼리를 수행한 다음 반응이 가장 빠른 IP주소를 반송합니다. AdGuard Home이 모든 DNS 서버의 응답을 기다려야 하기 때문에 DNS 쿼리 속도가 느려지지만 전반적인 연결이 향상됩니다.",
-    "autofix_warning_text": "\"Fix\"를 클릭한다면 AdGuard Home은 시스템이 AdGuard Home의 DNS 서버를 사용하도록 설정합니다.",
+    "autofix_warning_text": "'수정'을 클릭하면 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에 의해 처리됩니다.",
    "tags_title": "태그",
@@ -573,10 +575,10 @@
    "check_service": "서비스 이름: {{service}}",
    "service_name": "서비스 이름",
    "check_not_found": "필터 목록에서 찾을 수 없음",
-    "client_confirm_block": "정말로 클라이언트 \"{{ip}}\"을(를) 차단하시겠습니까?",
-    "client_confirm_unblock": "정말로 클라이언트 \"{{ip}}\"의 차단을 해제하시겠습니까?",
-    "client_blocked": "클라이언트 \"{{ip}}\"(이)가 성공적으로 차단되었습니다",
-    "client_unblocked": "클라이언트 \"{{ip}}\"의 차단을 성공적으로 해제했습니다",
+    "client_confirm_block": "정말로 클라이언트 '{{ip}}'을(를) 차단하시겠습니까?",
+    "client_confirm_unblock": "정말로 클라이언트 '{{ip}}'의 차단을 해제하시겠습니까?",
+    "client_blocked": "클라이언트 '{{ip}}'(이)가 성공적으로 차단되었습니다",
+    "client_unblocked": "클라이언트 '{{ip}}'의 차단을 성공적으로 해제했습니다",
    "static_ip": "고정 IP 주소",
    "static_ip_desc": "AdGuard Home는 서버라서 정상적으로 작동하려면 고정 IP 주소가 필요합니다. 그렇지 않다면 라우터가 언젠가 이 기기에 다른 IP 주소를 할당할 수도 있습니다.",
    "set_static_ip": "고정 IP 주소 설정",
@@ -625,7 +627,7 @@
    "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은 이 클라이언트에서 모든 DNS 쿼리를 삭제합니다.",
    "filter_allowlist": "경고: 이 경우 허용된 클라이언트 목록에서 '{{disallowed_rule}}' 규칙 또한 제외됩니다.",
    "last_rule_in_allowlist": "'{{disallowed_rule}}' 규칙을 제외하면 '허용된 클라이언트' 목록이 꺼지므로 해당 클라이언트를 제외할 수 없습니다.",
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -150,9 +150,9 @@
    "general_settings": "Algemene instellingen",
    "dns_settings": "DNS instellingen",
    "dns_blocklists": "DNS blokkeerlijsten",
-    "dns_allowlists": "DNS toestemmingslijsten",
+    "dns_allowlists": "DNS-toelatingslijsten",
    "dns_blocklists_desc": "AdGuard Home zal domeinen blokkeren die voorkomen in de blokkeerlijsten.",
-    "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
+    "dns_allowlists_desc": "Domeinen van DNS-toelatingslijsten zijn toegestaan, zelfs als ze op een van de blokkeerlijsten staan.",
    "custom_filtering_rules": "Aangepaste filter regels",
    "encryption_settings": "Encryptie instellingen",
    "dhcp_settings": "DHCP instellingen",
@@ -182,21 +182,21 @@
    "elapsed": "Verstreken",
    "filters_and_hosts_hint": "AdGuard Home kan overweg met basic adblock regels en hosts bestanden syntaxis.",
    "no_blocklist_added": "Geen blokkeerlijsten toegevoegd",
-    "no_whitelist_added": "Geen toestemmingslijsten toegevoegd",
+    "no_whitelist_added": "Geen toelatingslijsten toegevoegd",
    "add_blocklist": "Blokkeerlijst toevoegen",
-    "add_allowlist": "Toestemmingslijst toevoegen",
+    "add_allowlist": "Toelatingslijst toevoegen",
    "cancel_btn": "Annuleren",
    "enter_name_hint": "Voeg naam toe",
    "enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
    "check_updates_btn": "Controleer op updates",
    "new_blocklist": "Nieuwe blokkeerlijst",
-    "new_allowlist": "Nieuwe toestemmingslijst",
+    "new_allowlist": "Nieuwe toelatingslijst",
    "edit_blocklist": "Blokkeerlijst beheren",
-    "edit_allowlist": "Toestemmingslijst beheren",
+    "edit_allowlist": "Toelatingslijst bewerken",
    "choose_blocklist": "Blokkeringslijsten selecteren",
-    "choose_allowlist": "Toestemmingslijsten selecteren",
+    "choose_allowlist": "Toelatingslijsten selecteren",
    "enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
-    "enter_valid_allowlist": "Voer een geldige URL in voor de toestemmingslijst.",
+    "enter_valid_allowlist": "Voer een geldige URL naar de toelatingslijst in.",
    "form_error_url_format": "Ongeldig URL-opmaak",
    "form_error_url_or_path_format": "Ongeldig URL of pad van de lijst",
    "custom_filter_rules": "Aangepaste filterregels",
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Ook een opmerking.",
    "example_regex_meaning": "toegang blokkeren tot de domeinen die overeenkomen met de opgegeven reguliere expressie.",
    "example_upstream_regular": "standaard DNS (over UDP);",
+    "example_upstream_regular_port": "standaard DNS (via UDP, met poort);",
    "example_upstream_udp": "standaard DNS (via UDP, hostnaam);",
    "example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>;",
    "example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>;",
    "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen;",
    "example_upstream_tcp": "standaard DNS (over TCP);",
+    "example_upstream_tcp_port": "standaard DNS (via TCP, met poort);",
    "example_upstream_tcp_hostname": "standaard DNS (via TCP, hostnaam);",
    "all_lists_up_to_date_toast": "Alle lijsten zijn reeds actueel",
    "updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen",
@@ -566,7 +568,7 @@
    "filtered_custom_rules": "Gefilterd door aangepaste filterregels",
    "choose_from_list": "Uit de lijst selecteren",
    "add_custom_list": "Aangepaste lijst toevoegen",
-    "host_whitelisted": "De host staat op de toestemmingslijst",
+    "host_whitelisted": "De host staat op de toelatingslijst",
    "check_ip": "IP-adressen: {{ip}}",
    "check_cname": "CNAME: {{cname}}",
    "check_reason": "Reden: {{reason}}",
@@ -591,7 +593,7 @@
    "validated_with_dnssec": "Gevalideerd met DNSSEC",
    "all_queries": "Alle vragen",
    "show_blocked_responses": "Geblokkeerd",
-    "show_whitelisted_responses": "Op toestemmingslijst",
+    "show_whitelisted_responses": "Op toelatingslijst",
    "show_processed_responses": "Verwerkt",
    "blocked_safebrowsing": "Geblokkeerd door Veilig browsen",
    "blocked_adult_websites": "Geblokkeerd door ouderlijk toezicht",
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Również komentarz.",
    "example_regex_meaning": "zablokuj dostęp do domen pasujących do określonego wyrażenia regularnego.",
    "example_upstream_regular": "normalny DNS (przez UDP);",
+    "example_upstream_regular_port": "zwykły DNS (przez UDP, z portem);",
    "example_upstream_udp": "zwykły DNS (przez UDP, nazwa hosta);",
    "example_upstream_dot": "zaszyfrowany <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "zaszyfrowany <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "zaszyfrowany <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>Stempel DNS</0> dla resolwerów <1>DNSCrypt</1> lub <2>DNS-over-HTTPS</2>;",
    "example_upstream_tcp": "zwykły DNS (przez TCP);",
+    "example_upstream_tcp_port": "zwykły DNS (przez TCP, z portem);",
    "example_upstream_tcp_hostname": "zwykły DNS (przez TCP, nazwa hosta);",
    "all_lists_up_to_date_toast": "Wszystkie listy są już aktualne",
    "updated_upstream_dns_toast": "Serwery nadrzędne zostały pomyślnie zapisane",
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Também um comentário.",
    "example_regex_meaning": "bloqueia o acesso aos domínios que correspondem à expressão regular especificada.",
    "example_upstream_regular": "dNS regular (através do UDP);",
+    "example_upstream_regular_port": "DNS normal (através do UDP, com porta);",
    "example_upstream_udp": "DNS normal (através do UDP, nome do servidor);",
    "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": "<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);",
+    "example_upstream_tcp_port": "dNS normal (através do TCP, com porta);",
    "example_upstream_tcp_hostname": "DNS normal (através do TCP, nome do servidor);",
    "all_lists_up_to_date_toast": "Todas as listas já estão atualizadas",
    "updated_upstream_dns_toast": "Servidores DNS primário salvos com sucesso",
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -111,7 +111,7 @@
    "enabled_protection": "Ativar proteção",
    "disable_protection": "Desativar proteção",
    "disabled_protection": "Desativar proteção",
-    "refresh_statics": "Actualizar estatísticas",
+    "refresh_statics": "Atualizar estatísticas",
    "dns_query": "Consultas de DNS",
    "blocked_by": "<0>Bloqueado por filtros</0>",
    "stats_malware_phishing": "Malware/phishing bloqueados",
@@ -211,12 +211,14 @@
    "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_port": "DNS normal (através do UDP, com porta);",
    "example_upstream_udp": "DNS normal (através do UDP, nome do servidor);",
    "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": "<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);",
+    "example_upstream_tcp_port": "dNS normal (através do TCP, com porta);",
    "example_upstream_tcp_hostname": "DNS normal (através do TCP, nome do servidor);",
    "all_lists_up_to_date_toast": "Todas as listas já estão atualizadas",
    "updated_upstream_dns_toast": "Servidores DNS primário guardados com sucesso",
@@ -254,7 +256,7 @@
    "query_log_filtered": "Filtrado por {{filter}}",
    "query_log_confirm_clear": "Tem a certeza de que deseja limpar todo o registo de consulta?",
    "query_log_cleared": "O registo de consulta foi limpo com sucesso",
-    "query_log_updated": "O registro da consulta foi atualizado com sucesso",
+    "query_log_updated": "O registo da consulta foi atualizado com sucesso",
    "query_log_clear": "Limpar registos de consulta",
    "query_log_retention": "Retenção de registos de consulta",
    "query_log_enable": "Ativar registo",
@@ -263,7 +265,7 @@
    "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
    "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
    "anonymize_client_ip": "Tornar anónimo o IP do cliente",
-    "anonymize_client_ip_desc": "Não gurda o endereço de IP completo do cliente em registros ou estatísticas",
+    "anonymize_client_ip_desc": "Não gurda o endereço de IP completo do cliente em registo ou estatísticas",
    "dns_config": "Definição do servidor DNS",
    "dns_cache_config": "Definição de cache DNS",
    "dns_cache_config_desc": "Aqui você pode configurar o cache do DNS",
@@ -289,7 +291,7 @@
    "form_enter_rate_limit": "Insira o limite de taxa",
    "rate_limit": "Limite de taxa",
    "edns_enable": "Ativar a sub-rede do cliente EDNS",
-    "edns_cs_desc": "Adicione a opção de sub-rede de cliente EDNS (ECS) às solicitações de servidor DNS primário e registre os valores enviados pelos clientes no registro de consulta.",
+    "edns_cs_desc": "Adicione a opção de sub-rede de cliente EDNS (ECS) às solicitações de servidor DNS primário e registre os valores enviados pelos clientes no registo de consulta.",
    "rate_limit_desc": "O número de solicitações por segundo permitido por cliente. Configurando para 0 significa sem limite.",
    "blocking_ipv4_desc": "Endereço IP a ser devolvido para uma solicitação A bloqueada",
    "blocking_ipv6_desc": "Endereço IP a ser devolvido para uma solicitação AAAA bloqueada",
@@ -410,7 +412,7 @@
    "manual_update": "Por favor, <a>siga estes passos</a> para atualizar manualmente.",
    "processing_update": "Por favor espere, o AdGuard Home está a atualizar-se",
    "clients_title": "Clientes persistentes",
-    "clients_desc": "Configure registros de cliente persistentes para dispositivos conectados ao AdGuard Home",
+    "clients_desc": "Configure registos de cliente persistentes para dispositivos conectados ao AdGuard Home",
    "settings_global": "Global",
    "settings_custom": "Personalizar",
    "table_client": "Cliente",
@@ -445,7 +447,7 @@
    "access_disallowed_title": "Clientes não permitidos",
    "access_disallowed_desc": "Uma lista de CIDRs, endereços IP ou <a>IDs de cliente</a>. Se essa lista tiver entradas, o AdGuard Home descartará as solicitações desses clientes. Este campo é ignorado se houver entradas em clientes permitidos.",
    "access_blocked_title": "Domínios bloqueados",
-    "access_blocked_desc": "Não deve ser confundido com filtros. O AdGuard Home elimina as consultas DNS que correspondem a esses domínios, e essas consultas nem aparecem no registro de consultas. Você pode especificar nomes de domínio exatos, caracteres curinga ou regras de filtro de URL, por exemplo \"exemplo.org\", \"*.exemplo.org\", ou \"||exemplo.org^\" correspondentemente.",
+    "access_blocked_desc": "Não deve ser confundido com filtros. O AdGuard Home elimina as consultas DNS que correspondem a esses domínios, e essas consultas nem aparecem no registo de consultas. Você pode especificar nomes de domínio exatos, caracteres curinga ou regras de filtro de URL, por exemplo \"exemplo.org\", \"*.exemplo.org\", ou \"||exemplo.org^\" correspondentemente.",
    "access_settings_saved": "Definições de acesso foram guardadas com sucesso",
    "updates_checked": "Uma nova versão do AdGuard Home está disponível\n",
    "updates_version_equal": "O AdGuard Home está atualizado",
@@ -546,9 +548,9 @@
    "example_rewrite_domain": "reescrever resposta apenas para este domínio.",
    "example_rewrite_wildcard": "reescrever resposta para todos <0>example.org</0> sub-domínios.",
    "rewrite_ip_address": "Endereço IP: use esse IP em uma resposta A ou AAAA",
-    "rewrite_domain_name": "Nome de domínio: adicione um registro CNAME",
-    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registros do upstream",
-    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do servidor DNS primário",
+    "rewrite_domain_name": "Nome de domínio: adicione um registo CNAME",
+    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registos do upstream",
+    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registos do servidor DNS primário",
    "disable_ipv6": "Desativar resolução de endereços IPv6",
    "disable_ipv6_desc": "Descarta todas as consultas DNS para endereços IPv6 (tipo AAAA).",
    "fastest_addr": "Endereço de IP mais rápido",
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# De asemenea, un comentariu.",
    "example_regex_meaning": "blochează accesul la domeniile care corespund expresiei regulate specificate.",
    "example_upstream_regular": "DNS clasic (over UDP);",
+    "example_upstream_regular_port": "DNS obișnuit (over UDP, cu port);",
    "example_upstream_udp": "DNS obișnuit (over UDP, nume de gazdă);",
    "example_upstream_dot": "<0>DNS-over-TLS</0> criptat;",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0> criptat;",
    "example_upstream_doq": "criptat <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamps</0> pentru <1>DNSCrypt</1> sau rezolvatori <2>DNS-over-HTTPS</2>;",
    "example_upstream_tcp": "DNS clasic (over TCP);",
+    "example_upstream_tcp_port": "DNS obișnuit (over TCP, cu port);",
    "example_upstream_tcp_hostname": "DNS obișnuit (over TCP, nume de gazdă);",
    "all_lists_up_to_date_toast": "Toate listele sunt deja la zi",
    "updated_upstream_dns_toast": "Serverele din amonte au fost salvate cu succes",
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# И вот так тоже.",
    "example_regex_meaning": "блокировать доступ к доменам, соответствующим заданному регулярному выражению.",
    "example_upstream_regular": "обычный DNS (поверх UDP);",
+    "example_upstream_regular_port": "обычный DNS (поверх UDP, с портом);",
    "example_upstream_udp": "обычный 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_sdns": "<0>DNS Stamps</0> для <1>DNSCrypt</1> или <2>DNS-over-HTTPS</2> серверов;",
    "example_upstream_tcp": "обычный DNS (поверх TCP);",
+    "example_upstream_tcp_port": "обычный DNS (поверх TCP, с портом);",
    "example_upstream_tcp_hostname": "обычный DNS (поверх TCP, с именем хоста);",
    "all_lists_up_to_date_toast": "Все списки уже обновлены",
    "updated_upstream_dns_toast": "DNS-серверы успешно обновлены",
@@ -626,7 +628,7 @@
    "original_response": "Первоначальный ответ",
    "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
    "port_53_faq_link": "Порт 53 часто занят службами «DNSStubListener» или «systemd-resolved». Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить.",
-    "adg_will_drop_dns_queries": "AdGuard Home AdGuard Home сбросит все DNS-запросы от этого клиента.",
+    "adg_will_drop_dns_queries": "AdGuard Home сбросит все DNS-запросы от этого клиента.",
    "filter_allowlist": "ВНИМАНИЕ: Это действие также исключит правило «{{disallowed_rule}}» из списка разрешённых клиентов.",
    "last_rule_in_allowlist": "Нельзя заблокировать этого клиента, так как исключение правила «{{disallowed_rule}}» ОТКЛЮЧИТ режим белого списка.",
    "use_saved_key": "Использовать сохранённый ранее ключ",
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -315,7 +315,7 @@
    "install_devices_router": "මාර්ගකාරකය",
    "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධිත සියළුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒ සෑම එකක්ම අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවේ.",
    "install_devices_address": "ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය පහත ලිපිනයන්ට සවන් දෙමින් පවතී",
-    "install_devices_router_list_1": "ඔබගේ මාර්ගකාරකය සඳහා වූ මනාපයන් විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ අතිරික්සුවෙන් ඒ.ස.නි.(URL) ක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) ප්‍රවේශ විය හැකිය. මුරපදය ඇතුල් කිරීමට සිදු විය හැකි නමුත් එය මතක නැතිනම් බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසිය හැකිය. නමුත් මෙම ක්‍රියා පටිපාටිය තෝරා ගන්නේ නම්, බොහෝ විට ඔබගේ මාර්ගකාරකයේ සමස්ථ වින්‍යාසය අහිමි වනු ඇති බව මතක තබා ගන්න.එය පිහිටුවීමට ඔබගේ මාර්ගකාරකයට යෙදුමක් ඇවැසි නම්, කරුණාකර එය ඔබගේ පරිගණකයේ හෝ දුරකථනයේ ස්ථාපනය කර මාර්ගකාරකයේ සැකසුම් වෙත ප්‍රවේශ වීමට භාවිතා කරන්න.",
+    "install_devices_router_list_1": "ඔබගේ මාර්ගකාරකයෙහි අභිප්‍රේත විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ අතිරික්සුවෙන් ඒ.ස.නි.(URL) ක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) ප්‍රවේශ විය හැකිය. මුරපදය ඇතුල් කිරීමට සිදු විය හැකි නමුත් එය මතක නැතිනම් බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසීමට හැකිය. නමුත් මෙම ක්‍රියා පටිපාටිය තෝරා ගන්නේ නම්, බොහෝ විට ඔබගේ මාර්ගකාරකයේ සමස්ථ වින්‍යාසය අහිමි වනු ඇති බව මතක තබා ගන්න. මෙය පිහිටුවීමට ඔබගේ මාර්ගකාරකයට යෙදුමක් ඇවැසි නම්, කරුණාකර එය ඔබගේ පරිගණකයේ හෝ දුරකථනයේ ස්ථාපනය කර මාර්ගකාරකයේ සැකසුම් වෙත ප්‍රවේශ වීමට භාවිතා කරන්න.",
    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. අංක කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අකුරු බලන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුල් කරන්න.",
    "install_devices_router_list_4": "සමහර වර්ගයේ මාර්ගකාරක වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසීමට නොහැකිය. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරකය සඳහා වූ ව.නා.ප. සේවාදායක රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත පරීක්‍ෂා කළ යුතුය.",
@@ -325,7 +325,7 @@
    "install_devices_windows_list_4": "ඔබගේ ක්‍රියාකාරී සම්බන්ධතාවය මත දකුණු-ක්ලික් කර ගුණාංග තෝරන්න.",
    "install_devices_windows_list_5": "ලැයිස්තුවෙන් \"අන්තර්ජාල කෙටුම්පත් අනුවාදය 4 (TCP/IPv4)\" (හෝ, IPv6 සඳහා, \"අන්තර්ජාල කෙටුම්පත් අනුවාදය 6 (TCP/IPv6)\") සොයාගෙන එය තෝරා ඉන්පසු ගුණාංග මත නැවත ඔබන්න.",
    "install_devices_windows_list_6": "'පහත සඳහන් ව.නා.ප. සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
-    "install_devices_macos_list_1": "ඇපල් නිරූපකය එබීමෙන් පසු පද්ධතියේ මනාප වෙත යන්න.",
+    "install_devices_macos_list_1": "ඇපල් නිරූපකය එබීමෙන් පසු පද්ධතියේ අභිප්‍රේත වෙත යන්න.",
    "install_devices_macos_list_2": "ජාලය මත ඔබන්න.",
    "install_devices_macos_list_3": "ඔබගේ ලැයිස්තුවේ පළමු සම්බන්ධතාවය තෝරා වැඩිදුර යන්න ඔබන්න.",
    "install_devices_macos_list_4": "ව.නා.ප. (DNS) තීරුව තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Tiež komentár.",
    "example_regex_meaning": "zablokovať prístup k doménam zodpovedajúcim zadanému regulárnemu výrazu.",
    "example_upstream_regular": "obyčajná DNS (cez UDP);",
+    "example_upstream_regular_port": "bežný DNS (cez UDP, s portom);",
    "example_upstream_udp": "štandardné DNS (cez UDP, hostname);",
    "example_upstream_dot": "šifrované <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "šifrované <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "šifrované <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS pečiatky</0> pre <1>DNSCrypt</1> alebo <2>DNS-over-HTTPS</2> rezolvery;",
    "example_upstream_tcp": "obyčajná DNS (cez TCP);",
+    "example_upstream_tcp_port": "bežný DNS (cez TCP, s portom);",
    "example_upstream_tcp_hostname": "štandardné DNS (cez TCP, hostname);",
    "all_lists_up_to_date_toast": "Všetky zoznamy sú už aktuálne",
    "updated_upstream_dns_toast": "Upstream servery boli úspešne uložené",
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Tudi komentar.",
    "example_regex_meaning": "onemogoča dostop do domen, ki se ujemajo z določenim regularnim izrazom.",
    "example_upstream_regular": "redni DNS (nad UDP);",
+    "example_upstream_regular_port": "redni DNS (nad UDP, z vrati);",
    "example_upstream_udp": "redni DNS (nad UDP, ime gostitelja);",
    "example_upstream_dot": "šifriran <0>DNS-prek-TLS</0>;",
    "example_upstream_doh": "šifriran <0>DNS-prek-HTTPS</0>;",
    "example_upstream_doq": "šifriran <0>DNS-prek-QUIC</0>;",
    "example_upstream_sdns": "lahko uporabite <0>DNS Žige</0> za reševalce <1>DNSCrypt</1> ali <2>DNS-prek-HTTPS</2>;",
    "example_upstream_tcp": "redni DNS (nad TCP);",
+    "example_upstream_tcp_port": "redni DNS (nad TCP, z vrati);",
    "example_upstream_tcp_hostname": "redni DNS (nad TCP, ime gostitelja);",
    "all_lists_up_to_date_toast": "Vsi seznami so že posodobljeni",
    "updated_upstream_dns_toast": "Gorvodni trežniki so uspešno shranjeni",
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Takođe komentar.",
    "example_regex_meaning": "blokiranje pristupa domenima koji odgovaraju određenom uobičajenom izrazu.",
    "example_upstream_regular": "uobičajeno DNS (preko UDP);",
+    "example_upstream_regular_port": "uobičajen DNS (preko UDP, sa portom);",
    "example_upstream_udp": "uobičajen DNS (preko UDP, imena domaćina);",
    "example_upstream_dot": "šifrovano <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "šifrovano <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "šifrovano <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS brojeve</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2> razrešivače;",
    "example_upstream_tcp": "uobičajeni DNS (preko TCP);",
+    "example_upstream_tcp_port": "uobičajen DNS (preko TCP, sa portom);",
    "example_upstream_tcp_hostname": "uobičajen DNS (preko TCP, imena domaćina);",
    "all_lists_up_to_date_toast": "Sve liste su već ažurirane",
    "updated_upstream_dns_toast": "Upstream serveri su uspešno sačuvani",
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Också en kommentar",
    "example_regex_meaning": "blockera åtkomst till domäner som matchar det angivna uttrycket",
    "example_upstream_regular": "vanlig DNS (över UDP)",
+    "example_upstream_regular_port": "vanlig DNS (via UDP, med port);",
    "example_upstream_udp": "vanlig DNS (över UDP, värdnamn);",
    "example_upstream_dot": "krypterat <0>DNS-over-TLS</0>",
    "example_upstream_doh": "krypterat <0>DNS-over-HTTPS</0>",
    "example_upstream_doq": "krypterat <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "Du kan använda <0>DNS-stamps</0> för <1>DNSCrypt</1> eller <2>DNS-over-HTTPS</2>-resolvers",
    "example_upstream_tcp": "vanlig DNS (över UDP)",
+    "example_upstream_tcp_port": "vanlig DNS (via TCP, med port);",
    "example_upstream_tcp_hostname": "vanlig DNS (över TCP, värdnamn);",
    "all_lists_up_to_date_toast": "Alla listor är redan uppdaterade",
    "updated_upstream_dns_toast": "Sparade uppströms dns-servrar",
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -44,16 +44,16 @@
    "form_error_ip_format": "Geçersiz IP adresi",
    "form_error_mac_format": "Geçersiz MAC adresi",
    "form_error_client_id_format": "İstemci Kimliği yalnızca sayılar, küçük harfler ve kısa çizgiler içermelidir",
-    "form_error_server_name": "Geçersiz sunucu adı",
+    "form_error_server_name": "Sunucu adı geçersiz",
    "form_error_subnet": "\"{{cidr}}\" alt ağı, \"{{ip}}\" IP adresini içermiyor",
    "form_error_positive": "0'dan büyük olmalıdır",
-    "form_error_gateway_ip": "Kiralama, ağ geçidinin IP adresine sahip olamaz",
+    "form_error_gateway_ip": "Kiralama, ağ geçidinin IP adresiyle aynı olamaz",
    "out_of_range_error": "\"{{start}}\"-\"{{end}}\" aralığının dışında olmalıdır",
    "lower_range_start_error": "Başlangıç aralığından daha düşük olmalıdır",
    "greater_range_start_error": "Başlangıç aralığından daha büyük olmalıdır",
    "greater_range_end_error": "Bitiş aralığından daha büyük olmalıdır",
    "subnet_error": "Adresler bir alt ağda olmalıdır",
-    "gateway_or_subnet_invalid": "Alt ağ maskesi geçersiz.",
+    "gateway_or_subnet_invalid": "Alt ağ maskesi geçersiz",
    "dhcp_form_gateway_input": "Ağ geçidi IP",
    "dhcp_form_subnet_input": "Alt ağ maskesi",
    "dhcp_form_range_title": "IP adresi aralığı",
@@ -108,9 +108,9 @@
    "report_an_issue": "Bir sorun bildir",
    "privacy_policy": "Gizlilik Politikası",
    "enable_protection": "Korumayı etkinleştir",
-    "enabled_protection": "Koruma etkileştirildi",
+    "enabled_protection": "Koruma etkinleştirildi",
    "disable_protection": "Korumayı devre dışı bırak",
-    "disabled_protection": "Koruma durduruldu",
+    "disabled_protection": "Koruma devre dışı bırakıldı",
    "refresh_statics": "İstatistikleri yenile",
    "dns_query": "DNS Sorguları",
    "blocked_by": "<0>Filtreler tarafından engellenen</0>",
@@ -180,7 +180,7 @@
    "edit_table_action": "Düzenle",
    "delete_table_action": "Sil",
    "elapsed": "Geçen süre",
-    "filters_and_hosts_hint": "AdGuard Home, temel reklam engelleme kurallarını ve ana makine engelleme dosyalarının söz dizimini anlar.",
+    "filters_and_hosts_hint": "AdGuard Home, temel reklam engelleme kurallarını ve ana makine dosyalarının söz dizimini anlar.",
    "no_blocklist_added": "Engel listesi eklenmedi",
    "no_whitelist_added": "İzin listesi eklenmedi",
    "add_blocklist": "Engel listesi ekle",
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Ayrıca bir yorum.",
    "example_regex_meaning": "belirtilen düzenli ifadelerle eşleşen alan adlarına erişimi engelle.",
    "example_upstream_regular": "normal DNS (UDP üzerinden);",
+    "example_upstream_regular_port": "normal DNS (UDP üzerinden, bağlantı noktası ile);",
    "example_upstream_udp": "normal DNS (UDP üzerinden, ana makine adı);",
    "example_upstream_dot": "şifrelenmiş <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "şifrelenmiş <0>DNS-over-HTTPS</0>;",
    "example_upstream_doq": "şifrelenmiş <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<1>DNSCrypt</1> veya <2>DNS-over-HTTPS</2> çözümleyicileri için <0>DNS Damgaları</0>;",
    "example_upstream_tcp": "normal DNS (TCP üzerinden);",
+    "example_upstream_tcp_port": "normal DNS (TCP üzerinden, bağlantı noktası ile);",
    "example_upstream_tcp_hostname": "normal DNS (TCP üzerinden, ana makine adı);",
    "all_lists_up_to_date_toast": "Tüm listeler güncel durumda",
    "updated_upstream_dns_toast": "Üst sunucular başarıyla kaydedildi",
@@ -384,8 +386,8 @@
    "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",
    "encryption_chain_invalid": "Sertifika zinciri geçersiz.",
-    "encryption_key_valid": "Bu geçerli bir {{type}} özel anahtar.",
-    "encryption_key_invalid": "Bu geçersiz bir {{type}} özel anahtar.",
+    "encryption_key_valid": "Bu geçerli bir {{type}} özel anahtarıdır",
+    "encryption_key_invalid": "Bu geçersiz bir {{type}} özel anahtarıdır",
    "encryption_subject": "Konu",
    "encryption_issuer": "Sağlayan",
    "encryption_hostnames": "Ana makine adları",
--- a/client/src/__locales/uk.json
+++ b/client/src/__locales/uk.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Також коментар.",
    "example_regex_meaning": "блокувати доступ до доменів, що відповідають вказаному регулярному виразу.",
    "example_upstream_regular": "звичайний DNS (через UDP);",
+    "example_upstream_regular_port": "звичайний DNS (поверх UDP, з портом);",
    "example_upstream_udp": "звичайний 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_sdns": "<0>DNS Stamps</0> для <1>DNSCrypt-</1> або <2>DNS-over-HTTPS-</2>вирішувачів;",
    "example_upstream_tcp": "звичайний DNS (через TCP);",
+    "example_upstream_tcp_port": "звичайний DNS (поверх TCP, з портом);",
    "example_upstream_tcp_hostname": "звичайний DNS (поверх TCP, з назвою вузла);",
    "all_lists_up_to_date_toast": "Всі списки вже оновлені",
    "updated_upstream_dns_toast": "DNS-сервери успішно збережено",
@@ -445,7 +447,7 @@
    "access_disallowed_title": "Заборонені клієнти",
    "access_disallowed_desc": "Перелік CIDR, IP-адрес та <a>ClientIDs</a>. Якщо налаштовано, AdGuard Home буде скасовувати запити від цих клієнтів. Проте якщо налаштовано список Дозволених клієнтів, то це поле проігнорується.",
    "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» або «||example.org^» відповідно.",
    "access_settings_saved": "Налаштування доступу успішно збережено",
    "updates_checked": "Доступна нова версія AdGuard Home",
    "updates_version_equal": "AdGuard Home останньої версії",
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# Cũng là một chú thích.",
    "example_regex_meaning": "chặn quyền truy cập vào các miền khớp với biểu thức chính được quy định.",
    "example_upstream_regular": "DNS thông thường (dùng UDP);",
+    "example_upstream_regular_port": "DNS thông thường (qua UDP, với cổng);",
    "example_upstream_udp": "DNS thông thường (qua UDP, tên máy chủ);",
    "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);",
+    "example_upstream_tcp_port": "DNS thông thường (qua TCP, với cổng);",
    "example_upstream_tcp_hostname": "DNS thông thường (qua TCP, tên máy chủ);",
    "all_lists_up_to_date_toast": "Tất cả danh sách đã ở phiên bản mới nhất",
    "updated_upstream_dns_toast": "Các máy chủ thượng nguồn đã được lưu thành công",
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -70,7 +70,7 @@
    "dhcp_warning": "如果你想要启用内置的 DHCP 服务器，请确保在当前网络中没有其它起作用的 DHCP 服务器。否则，此操作可能会破坏已连接设备的网络连接！",
    "dhcp_error": "AdGuard Home 无法确定在当前网络中是否存在其它 DHCP 服务器",
    "dhcp_static_ip_error": "要使用 DHCP 服务器，则必须设置静态 IP 地址。AdGuard Home 无法确定此网络接口是否已被配置为使用静态 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 服务器」按钮，AdGuard Home 将自动修改此网络接口以使用静态 IP 地址。",
    "dhcp_lease_added": "静态租约 \"{{key}}\" 已成功添加",
    "dhcp_lease_deleted": "静态租约 \"{{key}}\" 已成功删除",
    "dhcp_new_static_lease": "新建静态租约",
@@ -211,12 +211,14 @@
    "example_comment_hash": "# 这也是一行注释。",
    "example_regex_meaning": "阻止访问与指定的正则表达式匹配的域名。",
    "example_upstream_regular": "常规 DNS（基于 UDP）；",
+    "example_upstream_regular_port": "常规 DNS（通过 UDP，带端口）；",
    "example_upstream_udp": "常规 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_sdns": "<1>DNSCrypt</1> 的 <0>DNS Stamps</0> 或者 <2>DNS-over-HTTPS</2> 解析器；",
    "example_upstream_tcp": "常规 DNS（基于 TCP ）；",
+    "example_upstream_tcp_port": "常规 DNS（通过 TCP，带端口）；",
    "example_upstream_tcp_hostname": "常规 DNS（通过 TCP、主机名）；",
    "all_lists_up_to_date_toast": "所有列表都是最新的",
    "updated_upstream_dns_toast": "上游服务器保存成功",
@@ -341,7 +343,7 @@
    "install_devices_windows_list_3": "在窗口的左侧点击「更改适配器设置」。",
    "install_devices_windows_list_4": "选择您正在连接的网络设备，右击它并选择「属性”」。",
    "install_devices_windows_list_5": "在列表中找到「Internet 协议版本 4 (TCP/IPv4)」，选择并再次点击「属性」。",
-    "install_devices_windows_list_6": "选择“使用下面的 DNS 服务器地址”，并输入您的 AdGuard Home 服务器地址。",
+    "install_devices_windows_list_6": "选择「使用下面的 DNS 服务器地址」，并输入您的 AdGuard Home 服务器地址。",
    "install_devices_macos_list_1": "点击苹果图标，进入「系统首选项」。",
    "install_devices_macos_list_2": "点击「网络」。",
    "install_devices_macos_list_3": "选择在列表中的第一个连接，并点击「高级」。",
@@ -397,7 +399,7 @@
    "form_error_equal": "不可相同",
    "form_error_password": "密码不匹配",
    "reset_settings": "重置设置",
-    "update_announcement": "AdGuard Home {{version}} 现已发布！ <0>点击此处</0> 以获取详细信息。",
+    "update_announcement": "AdGuard Home {{version}} 现已发布！ <0>点击此处</0>以获取详细信息。",
    "setup_guide": "设置指导",
    "dns_addresses": "DNS 地址",
    "dns_start": "正在启动DNS服务",
@@ -423,7 +425,7 @@
    "ip_address": "IP 地址",
    "client_identifier_desc": "客户端可通过 IP 、MAC 地址、CIDR 或客户端 ID（可用于 DoT/DoH/DoQ）被识别。<0>这里</0>您可多了解如何识别客户端。",
    "form_enter_ip": "输入 IP",
-    "form_enter_subnet_ip": "输入一个 IP 地址，其须位于子网\"{{cidr}}\"",
+    "form_enter_subnet_ip": "输入一个 IP 地址，其须位于子网 \"{{cidr}}\"",
    "form_enter_mac": "输入 MAC",
    "form_enter_id": "输入标识符",
    "form_add_id": "添加标识符",
@@ -473,7 +475,7 @@
    "rewrite_add": "添加 DNS 重写",
    "rewrite_not_found": "未找到 DNS 重写",
    "rewrite_confirm_delete": "您确定要删除 \"{{key}}\" 的 DNS 重写？",
-    "rewrite_desc": "可以轻松地配置特定的域名的自定义 DNS 响应。",
+    "rewrite_desc": "可以轻松地为特定域名配置自定义 DNS 响应。",
    "rewrite_applied": " 重定向规则已应用",
    "rewrite_hosts_applied": "根据hosts文件规则已被重写",
    "dns_rewrites": "DNS 重写",
@@ -553,7 +555,7 @@
    "disable_ipv6_desc": "丢弃所有 IPv6 地址 (AAAA) 的 DNS 查询。",
    "fastest_addr": "最快的 IP 地址",
    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器均有所回应，因而会降低 DNS 查询的速度，但同时，此举将会改善总体的连接。",
-    "autofix_warning_text": "若您单击“修复”，AdGuardHome将会配置您的系统以使用AdGuardHome的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处理。",
    "tags_title": "标签",
@@ -573,14 +575,14 @@
    "check_service": "服务名称：{{service}}",
    "service_name": "服务名称",
    "check_not_found": "未在您的筛选列表中找到",
-    "client_confirm_block": "您确定要阻止客户端\"{{ip}}\"?",
-    "client_confirm_unblock": "您确定要解除对客户端\"{{ip}}\"的封锁吗？",
-    "client_blocked": "客户端 \"{{ip}}\"被成功拦截",
-    "client_unblocked": "成功解锁客户端\"{{ip}}\"",
+    "client_confirm_block": "您确定要阻止客户端 \"{{ip}}\"?",
+    "client_confirm_unblock": "您确定要解除对客户端 \"{{ip}}\" 的封锁吗？",
+    "client_blocked": "客户端 \"{{ip}}\" 被成功拦截",
+    "client_unblocked": "成功解锁客户端 \"{{ip}}\"",
    "static_ip": "静态IP地址",
    "static_ip_desc": "AdGuard Home 是一个服务器，所以它需要一个静态IP地址才能正常工作。否则，在某些情况下，你的路由器可能会给这个设备分配一个不同的IP地址。",
    "set_static_ip": "设置一个静态IP",
-    "install_static_ok": "好消息！静态IP地址已经配置",
+    "install_static_ok": "好消息！静态 IP 地址已经配置",
    "install_static_error": "AdGuard Home 无法为这个网络接口自动配置它。请参阅如何手动完成此操作的说明。",
    "install_static_configure": "AdGuard Home 检测到一个动态 IP 地址 <0>{{ip}}</0> 被使用。您想把它作为您的静态地址吗？",
    "confirm_static_ip": "AdGuard Home 将把{{ip}} 配置为您的静态IP地址。您想要继续吗？",
@@ -625,8 +627,8 @@
    "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查询。",
+    "port_53_faq_link": "53端口常被 DNSStubListener 或 systemdn 解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>。",
+    "adg_will_drop_dns_queries": "AdGuard Home 会丢弃所有来自此客户端的 DNS 查询。",
    "filter_allowlist": "警告：此操作将把规则 \"{{disallowed_rule}}\" 排除在允许客户端的列表之外。",
    "last_rule_in_allowlist": "无法禁止此客户端，因为排除 “{{disallowed_rule}}” 规则将禁用“允许客户端”的列表。",
    "use_saved_key": "使用之前保存的密钥",
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -211,12 +211,14 @@
    "example_comment_hash": "# 也是一個註解。",
    "example_regex_meaning": "封鎖至與該已明確指定的規則運算式（Regular Expression）相符的網域之存取。",
    "example_upstream_regular": "常規 DNS（透過 UDP）；",
+    "example_upstream_regular_port": "常規 DNS（透過 UDP，含連接埠）；",
    "example_upstream_udp": "常規 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_sdns": "關於 <1>DNSCrypt</1> 或 <2>DNS-over-HTTPS</2> 解析器之 <0>DNS 戳記</0>；",
    "example_upstream_tcp": "常規 DNS（透過 TCP）；",
+    "example_upstream_tcp_port": "常規 DNS（透過 TCP，含連接埠）；",
    "example_upstream_tcp_hostname": "常規 DNS（透過 TCP，主機名稱）；",
    "all_lists_up_to_date_toast": "所有的清單已是最新的",
    "updated_upstream_dns_toast": "上游的伺服器被成功地儲存",
--- a/client/src/actions/services.js
+++ b/client/src/actions/services.js
@@ -2,6 +2,21 @@ import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
 import { addErrorToast, addSuccessToast } from './toasts';

+export const getBlockedServicesAvailableServicesRequest = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_REQUEST');
+export const getBlockedServicesAvailableServicesFailure = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_FAILURE');
+export const getBlockedServicesAvailableServicesSuccess = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_SUCCESS');
+
+export const getBlockedServicesAvailableServices = () => async (dispatch) => {
+    dispatch(getBlockedServicesAvailableServicesRequest());
+    try {
+        const data = await apiClient.getBlockedServicesAvailableServices();
+        dispatch(getBlockedServicesAvailableServicesSuccess(data));
+    } catch (error) {
+        dispatch(addErrorToast({ error }));
+        dispatch(getBlockedServicesAvailableServicesFailure());
+    }
+};
+
 export const getBlockedServicesRequest = createAction('GET_BLOCKED_SERVICES_REQUEST');
 export const getBlockedServicesFailure = createAction('GET_BLOCKED_SERVICES_FAILURE');
 export const getBlockedServicesSuccess = createAction('GET_BLOCKED_SERVICES_SUCCESS');
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -481,10 +481,17 @@ class Api {
    }

    // Blocked services
+    BLOCKED_SERVICES_SERVICES = { path: 'blocked_services/services', method: 'GET' };
+
    BLOCKED_SERVICES_LIST = { path: 'blocked_services/list', method: 'GET' };

    BLOCKED_SERVICES_SET = { path: 'blocked_services/set', method: 'POST' };

+    getBlockedServicesAvailableServices() {
+        const { path, method } = this.BLOCKED_SERVICES_SERVICES;
+        return this.makeRequest(path, method);
+    }
+
    getBlockedServices() {
        const { path, method } = this.BLOCKED_SERVICES_LIST;
        return this.makeRequest(path, method);
--- a/client/src/components/Filters/Table.js
+++ b/client/src/components/Filters/Table.js
@@ -41,13 +41,13 @@ class Table extends Component {
        {
            Header: <Trans>name_table_header</Trans>,
            accessor: 'name',
-            minWidth: 200,
+            minWidth: 180,
            Cell: CellWrap,
        },
        {
            Header: <Trans>list_url_table_header</Trans>,
            accessor: 'url',
-            minWidth: 200,
+            minWidth: 180,
            Cell: ({ value }) => (
                <div className="logs__row">
                    {isValidAbsolutePath(value) ? value
@@ -73,7 +73,7 @@ class Table extends Component {
            Header: <Trans>last_time_updated_table_header</Trans>,
            accessor: 'lastUpdated',
            className: 'text-center',
-            minWidth: 150,
+            minWidth: 180,
            Cell: this.getDateCell,
        },
        {
--- a/client/src/components/Logs/AnonymizerNotification.js
+++ b/client/src/components/Logs/AnonymizerNotification.js
@@ -0,0 +1,16 @@
+import React from 'react';
+import { Trans } from 'react-i18next';
+import { HashLink as Link } from 'react-router-hash-link';
+
+const AnonymizerNotification = () => (
+    <div className="alert alert-primary mt-6">
+        <Trans components={[
+            <strong key="0">text</strong>,
+            <Link to="/settings#logs-config" key="1">link</Link>,
+        ]}>
+            anonymizer_notification
+        </Trans>
+    </div>
+);
+
+export default AnonymizerNotification;
--- a/client/src/components/Logs/index.js
+++ b/client/src/components/Logs/index.js
@@ -25,6 +25,7 @@ import {
 import InfiniteTable from './InfiniteTable';
 import './Logs.css';
 import { BUTTON_PREFIX } from './Cells/helpers';
+import AnonymizerNotification from './AnonymizerNotification';

 const processContent = (data) => Object.entries(data)
    .map(([key, value]) => {
@@ -73,6 +74,7 @@ const Logs = () => {
        processingGetConfig,
        processingAdditionalLogs,
        processingGetLogs,
+        anonymize_client_ip: anonymizeClientIp,
    } = useSelector((state) => state.queryLogs, shallowEqual);
    const filter = useSelector((state) => state.queryLogs.filter, shallowEqual);
    const logs = useSelector((state) => state.queryLogs.logs, shallowEqual);
@@ -104,6 +106,8 @@ const Logs = () => {
        setIsSmallScreen(e.matches);
        if (e.matches) {
            dispatch(toggleDetailedLogs(false));
+        } else {
+            dispatch(toggleDetailedLogs(true));
        }
    };

@@ -204,11 +208,18 @@ const Logs = () => {
        </Modal>
    </>;

-    return <>
-        {enabled && processingGetConfig && <Loading />}
-        {enabled && !processingGetConfig && renderPage()}
-        {!enabled && !processingGetConfig && <Disabled />}
-    </>;
+    return (
+        <>
+            {enabled && (
+                <>
+                    {processingGetConfig && <Loading />}
+                    {anonymizeClientIp && <AnonymizerNotification />}
+                    {!processingGetConfig && renderPage()}
+                </>
+            )}
+            {!enabled && !processingGetConfig && <Disabled />}
+        </>
+    );
 };

 export default Logs;
--- a/client/src/components/Settings/Dns/Upstream/Examples.js
+++ b/client/src/components/Settings/Dns/Upstream/Examples.js
@@ -8,133 +8,123 @@ const Examples = (props) => (
        <Trans>examples_title</Trans>:
        <ol className="leading-loose">
            <li>
-                <code>94.140.14.140</code>: {props.t('example_upstream_regular')}
+                <code>94.140.14.140</code>, <code>2a10:50c0::1:ff</code>: {props.t('example_upstream_regular')}
+            </li>
+            <li>
+                <code>94.140.14.140:53</code>, <code>[2a10:50c0::1:ff]:53</code>: {props.t('example_upstream_regular_port')}
            </li>
            <li>
                <code>udp://unfiltered.adguard-dns.com</code>: <Trans>example_upstream_udp</Trans>
            </li>
            <li>
-                <code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
+                <code>tcp://94.140.14.140</code>, <code>tcp://[2a10:50c0::1:ff]</code>: <Trans>example_upstream_tcp</Trans>
+            </li>
+            <li>
+                <code>tcp://94.140.14.140:53</code>, <code>tcp://[2a10:50c0::1:ff]:53</code>: <Trans>example_upstream_tcp_port</Trans>
            </li>
            <li>
                <code>tcp://unfiltered.adguard-dns.com</code>: <Trans>example_upstream_tcp_hostname</Trans>
            </li>
            <li>
-                <code>tls://unfiltered.adguard-dns.com</code>:
-                <span>
-                    <Trans
-                        components={[
-                            <a
-                                href="https://en.wikipedia.org/wiki/DNS_over_TLS"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="0"
-                            >
-                                DNS-over-TLS
-                            </a>,
-                        ]}
-                    >
-                        example_upstream_dot
-                    </Trans>
-                </span>
+                <code>tls://unfiltered.adguard-dns.com</code>: <Trans
+                    components={[
+                        <a
+                            href="https://en.wikipedia.org/wiki/DNS_over_TLS"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="0"
+                        >
+                            DNS-over-TLS
+                        </a>,
+                    ]}
+                >
+                    example_upstream_dot
+                </Trans>
            </li>
            <li>
-                <code>https://unfiltered.adguard-dns.com/dns-query</code>:
-                <span>
-                    <Trans
-                        components={[
-                            <a
-                                href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="0"
-                            >
-                                DNS-over-HTTPS
-                            </a>,
-                        ]}
-                    >
-                        example_upstream_doh
-                    </Trans>
-                </span>
+                <code>https://unfiltered.adguard-dns.com/dns-query</code>: <Trans
+                    components={[
+                        <a
+                            href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="0"
+                        >
+                            DNS-over-HTTPS
+                        </a>,
+                    ]}
+                >
+                    example_upstream_doh
+                </Trans>
            </li>
            <li>
-                <code>quic://unfiltered.adguard-dns.com:784</code>:
-                <span>
-                    <Trans
-                        components={[
-                            <a
-                                href="https://datatracker.ietf.org/doc/html/rfc9250"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="0"
-                            >
-                                DNS-over-QUIC
-                            </a>,
-                        ]}
-                    >
-                        example_upstream_doq
-                    </Trans>
-                </span>
+                <code>quic://unfiltered.adguard-dns.com</code>: <Trans
+                    components={[
+                        <a
+                            href="https://datatracker.ietf.org/doc/html/rfc9250"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="0"
+                        >
+                            DNS-over-QUIC
+                        </a>,
+                    ]}
+                >
+                    example_upstream_doq
+                </Trans>
            </li>
            <li>
-                <code>sdns://...</code>:
-                <span>
-                    <Trans
-                        components={[
-                            <a
-                                href="https://dnscrypt.info/stamps/"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="0"
-                            >
-                                DNS Stamps
-                            </a>,
-                            <a
-                                href="https://dnscrypt.info/"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="1"
-                            >
-                                DNSCrypt
-                            </a>,
-                            <a
-                                href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="2"
-                            >
-                                DNS-over-HTTPS
-                            </a>,
-                        ]}
-                    >
-                        example_upstream_sdns
-                    </Trans>
-                </span>
+                <code>sdns://...</code>: <Trans
+                    components={[
+                        <a
+                            href="https://dnscrypt.info/stamps/"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="0"
+                        >
+                            DNS Stamps
+                        </a>,
+                        <a
+                            href="https://dnscrypt.info/"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="1"
+                        >
+                            DNSCrypt
+                        </a>,
+                        <a
+                            href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="2"
+                        >
+                            DNS-over-HTTPS
+                        </a>,
+                    ]}
+                >
+                    example_upstream_sdns
+                </Trans>
            </li>
            <li>
-                <code>[/example.local/]94.140.14.140</code>:
-                <span>
-                    <Trans
-                        components={[
-                            <a
-                                href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="0"
-                            >
-                                Link
-                            </a>,
-                        ]}
-                    >
-                        example_upstream_reserved
-                    </Trans>
-                </span>
+                <code>[/example.local/]94.140.14.140</code>: <Trans
+                    components={[
+                        <a
+                            href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="0"
+                        >
+                            Link
+                        </a>,
+                    ]}
+                >
+                    example_upstream_reserved
+                </Trans>
            </li>
            <li>
-                <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
-                <span>
-                    <Trans>example_upstream_comment</Trans>
-                </span>
+                <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
+                    example_upstream_comment
+                </Trans>
            </li>
        </ol>
    </div>
--- a/client/src/components/ui/Tabler.css
+++ b/client/src/components/ui/Tabler.css
@@ -2820,6 +2820,11 @@ fieldset:disabled a.btn {
 }

 .btn-outline-primary:focus,
+.btn-outline-primary.focus {
+    box-shadow: none;
+}
+
+.btn-outline-primary:focus-visible,
 .btn-outline-primary.focus {
    box-shadow: 0 0 0 2px rgba(70, 127, 207, 0.5);
 }
@@ -2858,6 +2863,11 @@ fieldset:disabled a.btn {
 }

 .btn-outline-secondary:focus,
+.btn-outline-secondary.focus {
+    box-shadow: none;
+}
+
+.btn-outline-secondary:focus-visible,
 .btn-outline-secondary.focus {
    box-shadow: 0 0 0 2px rgba(134, 142, 150, 0.5);
 }
--- a/client/src/components/ui/Tabs.css
+++ b/client/src/components/ui/Tabs.css
@@ -67,6 +67,7 @@
    height: 24px;
    margin-bottom: 6px;
    fill: #4a4a4a;
+    touch-action: initial;
 }

 .tab__text {
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -81,7 +81,7 @@ export const STANDARD_DNS_PORT = 53;
 export const STANDARD_WEB_PORT = 80;
 export const STANDARD_HTTPS_PORT = 443;
 export const DNS_OVER_TLS_PORT = 853;
-export const DNS_OVER_QUIC_PORT = 784;
+export const DNS_OVER_QUIC_PORT = 853;
 export const MAX_PORT = 65535;

 export const EMPTY_DATE = '0001-01-01T00:00:00Z';
@@ -526,8 +526,8 @@ export const DEFAULT_DATE_FORMAT_OPTIONS = {
    month: 'numeric',
    day: 'numeric',
    hour: 'numeric',
+    hourCycle: 'h23',
    minute: 'numeric',
-    hour12: false,
 };

 export const DETAILED_DATE_FORMAT_OPTIONS = {
--- a/client2/src/lib/apis/blockedServices.ts
+++ b/client2/src/lib/apis/blockedServices.ts
@@ -1,6 +1,18 @@
 // This file was autogenerated. Please do not change.
 // All changes will be overwrited on commit.
 export default class BlockedServicesApi {
+    static async blockedServicesAvailableServices(): Promise<string[] | Error> {
+        return await fetch(`/control/blocked_services/services`, {
+            method: 'GET',
+        }).then(async (res) => {
+            if (res.status === 200) {
+                return res.json();
+            } else {
+                return new Error(String(res.status));
+            }
+        })
+    }
+
    static async blockedServicesList(): Promise<string[] | Error> {
        return await fetch(`/control/blocked_services/list`, {
            method: 'GET',
--- a/doc/adguard_home_darkmode.svg
+++ b/doc/adguard_home_darkmode.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 374 93.5" style="enable-background:new 0 0 374 93.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#D8D8D8;}
+	.st1{fill:#68BC71;}
+	.st2{fill:#67B279;}
+	.st3{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M296.4,50.1l-2.7-6.7h-13.2l-2.5,6.7h-9l14.3-34.2h8l14.2,34.2H296.4z M287.3,25l-4.3,11.7h8.6L287.3,25z
+		 M266.8,36.6c0,2-0.3,3.8-1,5.5c-0.7,1.6-1.7,3.1-3,4.2c-1.3,1.2-2.9,2.1-4.7,2.8c-1.8,0.7-3.9,1-6.1,1c-2.3,0-4.3-0.3-6.2-1
+		c-1.8-0.7-3.4-1.6-4.6-2.8c-1.3-1.2-2.3-2.6-2.9-4.2c-0.7-1.6-1-3.5-1-5.5V15.9h8.3V36c0,0.9,0.1,1.8,0.4,2.6
+		c0.2,0.8,0.6,1.5,1.1,2.2c0.5,0.6,1.2,1.2,2,1.5c0.8,0.4,1.8,0.6,3,0.6s2.2-0.2,3-0.6c0.8-0.4,1.5-0.9,2-1.5
+		c0.5-0.6,0.9-1.4,1.1-2.2c0.2-0.8,0.3-1.7,0.3-2.6V15.9h8.4V36.6L266.8,36.6z M230.3,47.3c-1.7,0.8-3.6,1.5-5.9,2
+		c-2.2,0.5-4.7,0.8-7.3,0.8c-2.7,0-5.3-0.4-7.6-1.2c-2.3-0.8-4.3-2-5.9-3.5c-1.7-1.5-3-3.3-3.9-5.4c-0.9-2.1-1.4-4.4-1.4-7
+		c0-2.6,0.5-5,1.4-7.1c0.9-2.1,2.2-3.9,3.9-5.4c1.7-1.5,3.7-2.7,5.9-3.4c2.3-0.8,4.7-1.2,7.3-1.2c2.7,0,5.2,0.4,7.5,1.2
+		c2.3,0.8,4.2,1.8,5.6,3.1l-5.2,5.6c-0.8-0.9-1.9-1.6-3.2-2.2c-1.3-0.6-2.8-0.9-4.5-0.9c-1.4,0-2.8,0.3-4,0.8
+		c-1.2,0.5-2.3,1.2-3.2,2.1c-0.9,0.9-1.6,2-2.1,3.2c-0.5,1.3-0.8,2.7-0.7,4.1c0,1.5,0.2,2.9,0.7,4.1c0.4,1.3,1.1,2.3,2,3.2
+		c0.9,0.9,2,1.6,3.3,2.1c1.3,0.5,2.8,0.8,4.5,0.8c1,0,1.9-0.1,2.7-0.2c0.9-0.1,1.7-0.4,2.4-0.7v-5.9h-6.5v-6.3h14.1V47.3L230.3,47.3
+		z M374,32.9c0,3-0.6,5.6-1.7,7.8c-1,2.1-2.5,3.9-4.4,5.4c-1.8,1.4-3.9,2.5-6.2,3.1c-2.3,0.7-4.6,1-7,1h-12.8V15.9h12.4
+		c2.4,0,4.8,0.3,7.2,0.8c2.3,0.5,4.4,1.5,6.3,2.8c1.8,1.3,3.3,3.1,4.4,5.2C373.5,27,374,29.7,374,32.9L374,32.9z M365.4,32.9
+		c0-1.9-0.3-3.5-0.9-4.8c-0.6-1.2-1.4-2.3-2.5-3c-1.1-0.8-2.3-1.3-3.6-1.6c-1.4-0.3-2.7-0.5-4.1-0.5h-4.1v20h3.9
+		c1.5,0,2.9-0.2,4.3-0.5c1.3-0.3,2.5-0.9,3.6-1.7c1.1-0.8,1.9-1.9,2.5-3.1C365.1,36.4,365.4,34.8,365.4,32.9L365.4,32.9z
+		 M193.8,32.9c0,3-0.6,5.6-1.7,7.8c-1,2.1-2.5,3.9-4.4,5.4c-1.8,1.4-3.9,2.5-6.2,3.1c-2.3,0.7-4.6,1-7,1h-12.8V15.9h12.4
+		c2.4,0,4.8,0.3,7.2,0.8c2.3,0.5,4.4,1.5,6.3,2.8c1.8,1.3,3.3,3.1,4.4,5.2C193.2,27,193.8,29.7,193.8,32.9L193.8,32.9z M185.2,32.9
+		c0-1.9-0.3-3.5-0.9-4.8c-0.6-1.2-1.4-2.3-2.5-3c-1.1-0.8-2.3-1.3-3.6-1.6c-1.4-0.3-2.7-0.5-4.1-0.5h-4.1v20h3.9
+		c1.5,0,2.9-0.2,4.3-0.5c1.3-0.3,2.5-0.9,3.6-1.7c1.1-0.8,1.9-1.9,2.5-3.1C184.9,36.4,185.2,34.8,185.2,32.9z M150.4,50.1l-2.7-6.7
+		h-13.2l-2.5,6.7h-9l14.3-34.2h8l14.2,34.2H150.4z M141.2,25l-4.3,11.7h8.6L141.2,25z M328.1,50.1l-7.2-13.6h-2.7v13.6h-7.9V15.9
+		h12.8c1.6,0,3.2,0.2,4.7,0.5c1.5,0.3,2.9,0.9,4.1,1.7c1.2,0.8,2.2,1.9,2.9,3.2c0.7,1.3,1.1,3,1.1,4.9c0,2.3-0.6,4.3-1.8,5.9
+		c-1.2,1.6-2.9,2.7-5.1,3.4l8.7,14.6H328.1z M327.7,26.4c0-0.8-0.2-1.5-0.5-2c-0.3-0.5-0.8-0.9-1.3-1.2c-0.5-0.3-1.1-0.5-1.7-0.6
+		c-0.6-0.1-1.2-0.1-1.9-0.1h-4.3v8h3.8c0.7,0,1.3-0.1,2-0.2c0.7-0.1,1.3-0.3,1.9-0.6c0.6-0.3,1-0.7,1.4-1.3
+		C327.6,27.9,327.7,27.2,327.7,26.4z M125.3,86.3V66.4h2.2v8.8h11.1v-8.8h2.2v19.9h-2.2v-8.9h-11.1v8.9L125.3,86.3L125.3,86.3z
+		 M155.2,86.6c-5.9,0-9.8-4.7-9.8-10.3c0-5.5,4-10.3,9.8-10.3c5.9,0,9.8,4.7,9.8,10.3C165,81.8,161,86.6,155.2,86.6z M155.2,84.5
+		c4.4,0,7.5-3.6,7.5-8.2c0-4.5-3.2-8.2-7.6-8.2s-7.5,3.6-7.5,8.2C147.6,80.9,150.8,84.5,155.2,84.5z M169.6,86.3V66.4h2.2l7,10.8
+		l7-10.8h2.2v19.9h-2.2V70.2l-7,10.6h-0.1l-7-10.6v16.1H169.6L169.6,86.3z M193.4,86.3V66.4h13.9v2h-11.7v6.8h10.5v2h-10.5v6.9h11.9
+		v2C207.5,86.3,193.4,86.3,193.4,86.3z"/>
+	<g id="logo">
+		<g id="Group-10" transform="translate(12.000000, 12.000000)">
+			<g id="Group-9">
+				<g id="Group-8">
+					<g id="Group-7">
+						<path id="Path" class="st1" d="M33.6-12C19.4-12,2.2-8.6-12-1.3c0,15.9-0.2,55.7,45.6,82.8C79.5,54.4,79.3,14.7,79.3-1.3
+							C65.1-8.6,47.9-12,33.6-12L33.6-12z"/>
+						<path id="Combined-Shape" class="st2" d="M33.6,81.5C-12.2,54.4-12,14.7-12-1.3C2.1-8.6,19.3-12,33.6-12
+							C33.6-12,33.6,81.5,33.6,81.5z"/>
+					</g>
+					<path id="Fill-11" class="st3" d="M32,50.4l27.6-37.2c-2-1.6-3.8-0.5-4.8,0.4l0,0l-23,23.9l-8.7-10.4C18.9,22.4,13.3,26,12,27
+						L32,50.4"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
--- a/doc/adguard_home_lightmode.svg
+++ b/doc/adguard_home_lightmode.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 374 93.5" style="enable-background:new 0 0 374 93.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#68BC71;}
+	.st1{fill:#67B279;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g>
+	<path d="M296.4,50.1l-2.7-6.7h-13.2l-2.5,6.7h-9l14.3-34.2h8l14.2,34.2H296.4z M287.3,25l-4.3,11.7h8.6L287.3,25z M266.8,36.6
+		c0,2-0.3,3.8-1,5.5c-0.7,1.6-1.7,3.1-3,4.2c-1.3,1.2-2.9,2.1-4.7,2.8c-1.8,0.7-3.9,1-6.1,1c-2.3,0-4.3-0.3-6.2-1
+		c-1.8-0.7-3.4-1.6-4.6-2.8c-1.3-1.2-2.3-2.6-2.9-4.2c-0.7-1.6-1-3.5-1-5.5V15.9h8.3V36c0,0.9,0.1,1.8,0.4,2.6
+		c0.2,0.8,0.6,1.5,1.1,2.2c0.5,0.6,1.2,1.2,2,1.5c0.8,0.4,1.8,0.6,3,0.6s2.2-0.2,3-0.6c0.8-0.4,1.5-0.9,2-1.5
+		c0.5-0.6,0.9-1.4,1.1-2.2c0.2-0.8,0.3-1.7,0.3-2.6V15.9h8.4V36.6L266.8,36.6z M230.3,47.3c-1.7,0.8-3.6,1.5-5.9,2
+		c-2.2,0.5-4.7,0.8-7.3,0.8c-2.7,0-5.3-0.4-7.6-1.2c-2.3-0.8-4.3-2-5.9-3.5c-1.7-1.5-3-3.3-3.9-5.4c-0.9-2.1-1.4-4.4-1.4-7
+		c0-2.6,0.5-5,1.4-7.1c0.9-2.1,2.2-3.9,3.9-5.4c1.7-1.5,3.7-2.7,5.9-3.4c2.3-0.8,4.7-1.2,7.3-1.2c2.7,0,5.2,0.4,7.5,1.2
+		c2.3,0.8,4.2,1.8,5.6,3.1l-5.2,5.6c-0.8-0.9-1.9-1.6-3.2-2.2c-1.3-0.6-2.8-0.9-4.5-0.9c-1.4,0-2.8,0.3-4,0.8
+		c-1.2,0.5-2.3,1.2-3.2,2.1c-0.9,0.9-1.6,2-2.1,3.2c-0.5,1.3-0.8,2.7-0.7,4.1c0,1.5,0.2,2.9,0.7,4.1c0.4,1.3,1.1,2.3,2,3.2
+		c0.9,0.9,2,1.6,3.3,2.1c1.3,0.5,2.8,0.8,4.5,0.8c1,0,1.9-0.1,2.7-0.2c0.9-0.1,1.7-0.4,2.4-0.7v-5.9h-6.5v-6.3h14.1V47.3L230.3,47.3
+		z M374,32.9c0,3-0.6,5.6-1.7,7.8c-1,2.1-2.5,3.9-4.4,5.4c-1.8,1.4-3.9,2.5-6.2,3.1c-2.3,0.7-4.6,1-7,1h-12.8V15.9h12.4
+		c2.4,0,4.8,0.3,7.2,0.8c2.3,0.5,4.4,1.5,6.3,2.8c1.8,1.3,3.3,3.1,4.4,5.2C373.5,27,374,29.7,374,32.9L374,32.9z M365.4,32.9
+		c0-1.9-0.3-3.5-0.9-4.8c-0.6-1.2-1.4-2.3-2.5-3c-1.1-0.8-2.3-1.3-3.6-1.6c-1.4-0.3-2.7-0.5-4.1-0.5h-4.1v20h3.9
+		c1.5,0,2.9-0.2,4.3-0.5c1.3-0.3,2.5-0.9,3.6-1.7c1.1-0.8,1.9-1.9,2.5-3.1C365.1,36.4,365.4,34.8,365.4,32.9L365.4,32.9z
+		 M193.8,32.9c0,3-0.6,5.6-1.7,7.8c-1,2.1-2.5,3.9-4.4,5.4c-1.8,1.4-3.9,2.5-6.2,3.1c-2.3,0.7-4.6,1-7,1h-12.8V15.9h12.4
+		c2.4,0,4.8,0.3,7.2,0.8c2.3,0.5,4.4,1.5,6.3,2.8c1.8,1.3,3.3,3.1,4.4,5.2C193.2,27,193.8,29.7,193.8,32.9L193.8,32.9z M185.2,32.9
+		c0-1.9-0.3-3.5-0.9-4.8c-0.6-1.2-1.4-2.3-2.5-3c-1.1-0.8-2.3-1.3-3.6-1.6c-1.4-0.3-2.7-0.5-4.1-0.5h-4.1v20h3.9
+		c1.5,0,2.9-0.2,4.3-0.5c1.3-0.3,2.5-0.9,3.6-1.7c1.1-0.8,1.9-1.9,2.5-3.1C184.9,36.4,185.2,34.8,185.2,32.9z M150.4,50.1l-2.7-6.7
+		h-13.2l-2.5,6.7h-9l14.3-34.2h8l14.2,34.2H150.4z M141.2,25l-4.3,11.7h8.6L141.2,25z M328.1,50.1l-7.2-13.6h-2.7v13.6h-7.9V15.9
+		h12.8c1.6,0,3.2,0.2,4.7,0.5c1.5,0.3,2.9,0.9,4.1,1.7c1.2,0.8,2.2,1.9,2.9,3.2c0.7,1.3,1.1,3,1.1,4.9c0,2.3-0.6,4.3-1.8,5.9
+		c-1.2,1.6-2.9,2.7-5.1,3.4l8.7,14.6H328.1z M327.7,26.4c0-0.8-0.2-1.5-0.5-2c-0.3-0.5-0.8-0.9-1.3-1.2c-0.5-0.3-1.1-0.5-1.7-0.6
+		c-0.6-0.1-1.2-0.1-1.9-0.1h-4.3v8h3.8c0.7,0,1.3-0.1,2-0.2c0.7-0.1,1.3-0.3,1.9-0.6c0.6-0.3,1-0.7,1.4-1.3
+		C327.6,27.9,327.7,27.2,327.7,26.4z M125.3,86.3V66.4h2.2v8.8h11.1v-8.8h2.2v19.9h-2.2v-8.9h-11.1v8.9L125.3,86.3L125.3,86.3z
+		 M155.2,86.6c-5.9,0-9.8-4.7-9.8-10.3c0-5.5,4-10.3,9.8-10.3c5.9,0,9.8,4.7,9.8,10.3C165,81.8,161,86.6,155.2,86.6z M155.2,84.5
+		c4.4,0,7.5-3.6,7.5-8.2c0-4.5-3.2-8.2-7.6-8.2s-7.5,3.6-7.5,8.2C147.6,80.9,150.8,84.5,155.2,84.5z M169.6,86.3V66.4h2.2l7,10.8
+		l7-10.8h2.2v19.9h-2.2V70.2l-7,10.6h-0.1l-7-10.6v16.1H169.6L169.6,86.3z M193.4,86.3V66.4h13.9v2h-11.7v6.8h10.5v2h-10.5v6.9h11.9
+		v2C207.5,86.3,193.4,86.3,193.4,86.3z"/>
+	<g id="logo">
+		<g id="Group-10" transform="translate(12.000000, 12.000000)">
+			<g id="Group-9">
+				<g id="Group-8">
+					<g id="Group-7">
+						<path id="Path" class="st0" d="M33.6-12C19.4-12,2.2-8.6-12-1.3c0,15.9-0.2,55.7,45.6,82.8C79.5,54.4,79.3,14.7,79.3-1.3
+							C65.1-8.6,47.9-12,33.6-12L33.6-12z"/>
+						<path id="Combined-Shape" class="st1" d="M33.6,81.5C-12.2,54.4-12,14.7-12-1.3C2.1-8.6,19.3-12,33.6-12
+							C33.6-12,33.6,81.5,33.6,81.5z"/>
+					</g>
+					<path id="Fill-11" class="st2" d="M32,50.4l27.6-37.2c-2-1.6-3.8-0.5-4.8,0.4l0,0l-23,23.9l-8.7-10.4C18.9,22.4,13.3,26,12,27
+						L32,50.4"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/AdguardTeam/golibs v0.10.9
 	github.com/AdguardTeam/urlfilter v0.16.0
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ameshkov/dnscrypt/v2 v2.2.3
+	github.com/ameshkov/dnscrypt/v2 v2.2.5
 	github.com/digineo/go-ipset/v2 v2.2.1
 	github.com/dimfeld/httptreemux/v5 v5.4.0
 	github.com/fsnotify/fsnotify v1.5.4
@@ -16,22 +16,22 @@ require (
 	github.com/google/gopacket v1.1.19
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.3.0
-	github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f
+	github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84
 	github.com/kardianos/service v1.2.1
-	github.com/lucas-clemente/quic-go v0.28.1
+	github.com/lucas-clemente/quic-go v0.29.0
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
 	github.com/mdlayher/netlink v1.6.0
 	// TODO(a.garipov): This package is deprecated; find a new one or use
 	// our own code for that.  Perhaps, use gopacket.
 	github.com/mdlayher/raw v0.1.0
 	github.com/miekg/dns v1.1.50
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.8.0
 	github.com/ti-mo/netfilter v0.4.0
 	go.etcd.io/bbolt v1.3.6
-	golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
-	golang.org/x/net v0.0.0-20220812174116-3211cb980234
-	golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+	golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
+	golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
+	golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v3 v3.0.1
 	howett.net/plist v1.0.0
@@ -43,12 +43,10 @@ require (
 	github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
 	github.com/ameshkov/dnsstamps v1.0.3 // indirect
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
-	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/golang/mock v1.6.0 // indirect
 	github.com/josharian/native v1.0.0 // indirect
-	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
-	github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect
 	github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
 	github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
 	github.com/mdlayher/packet v1.0.0 // indirect
@@ -58,10 +56,9 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,23 +1,12 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
-dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
-dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
-dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
-dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
-git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE=
 github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU=
 github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
-github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
 github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0=
 github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
 github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
 github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
 github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
@@ -28,21 +17,12 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
-github.com/ameshkov/dnscrypt/v2 v2.2.3 h1:X9UP5AHtwp46Ji+sGFfF/1Is6OPI/SjxLqhKpx0P5UI=
-github.com/ameshkov/dnscrypt/v2 v2.2.3/go.mod h1:xJB9cE1/GF+NB6EEQqRlkoa4bjcV2w7VYn1G+zVq7Bs=
-github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
+github.com/ameshkov/dnscrypt/v2 v2.2.5 h1:Ju1gQeez+6XLtk/b/k3RoJ2t+Ls+BSItLTZjZeedneY=
+github.com/ameshkov/dnscrypt/v2 v2.2.5/go.mod h1:Cu5GgMvCR10BeXgACiGDwXyOpfMktsSIidml1XBp6uM=
 github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
 github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=
 github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
-github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
-github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -51,75 +31,49 @@ github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1M
 github.com/digineo/go-ipset/v2 v2.2.1/go.mod h1:wBsNzJlZlABHUITkesrggFnZQtgW5wkqw1uo8Qxe0VU=
 github.com/dimfeld/httptreemux/v5 v5.4.0 h1:IiHYEjh+A7pYbhWyjmGnj5HZK6gpOOvyBXCJ+BE8/Gs=
 github.com/dimfeld/httptreemux/v5 v5.4.0/go.mod h1:QeEylH57C0v3VO0tkKraVz9oD3Uu93CKPnTLbsidvSw=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
 github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
 github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
-github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
-github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f h1:l1QCwn715k8nYkj4Ql50rzEog3WnMdrd4YYMMwemxEo=
-github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
-github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
+github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84 h1:MJTy6H+EpXLeAn0P5WAWeLk6dJA3V0ik6S3VJfUyQuI=
+github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
 github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
@@ -127,33 +81,19 @@ github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+
 github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
 github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
 github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kardianos/service v1.2.1 h1:AYndMsehS+ywIS6RB9KOlcXzteWUzxgMgBymJD7+BYk=
 github.com/kardianos/service v1.2.1/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lucas-clemente/quic-go v0.28.1 h1:Uo0lvVxWg5la9gflIF9lwa39ONq85Xq2D91YNEIslzU=
-github.com/lucas-clemente/quic-go v0.28.1/go.mod h1:oGz5DKK41cJt5+773+BSO9BXDsREY4HLf7+0odGAPO0=
-github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
-github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
-github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
-github.com/marten-seemann/qtls-go1-17 v0.1.2 h1:JADBlm0LYiVbuSySCHeY863dNkcpMmDR7s0bLKJeYlQ=
-github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
+github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
+github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
 github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
 github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
-github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
 github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
 github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og=
@@ -175,15 +115,9 @@ github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5A
 github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL1CV+f0E=
 github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
 github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
-github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
-github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -191,16 +125,11 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
-github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
-github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -208,51 +137,20 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
 github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
-github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
-github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
-github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
-github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
-github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
-github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
-github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
-github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg=
-github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
-github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
-github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
-github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
-github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
-github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0=
-github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
-github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
-github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
-github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
-github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
 github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
 github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
@@ -263,57 +161,34 @@ github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcy
 github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
 github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
 github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
-github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
-github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
-go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
-golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
-golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
+golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
 golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -321,34 +196,21 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
+golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
+golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -357,15 +219,11 @@ golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -389,29 +247,19 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8=
-golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
+golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -422,57 +270,29 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
-google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
 howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
-sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
--- a/internal/aghalg/aghalg.go
+++ b/internal/aghalg/aghalg.go
@@ -10,9 +10,14 @@ import (
 	"golang.org/x/exp/slices"
 )

-// Coalesce returns the first non-zero value.  It is named after the function
+// Coalesce returns the first non-zero value.  It is named after function
 // COALESCE in SQL.  If values or all its elements are empty, it returns a zero
 // value.
+//
+// T is comparable, because Go currently doesn't have a comparableWithZeroValue
+// constraint.
+//
+// TODO(a.garipov): Think of ways to merge with [CoalesceSlice].
 func Coalesce[T comparable](values ...T) (res T) {
 	var zero T
 	for _, v := range values {
@@ -24,6 +29,20 @@ func Coalesce[T comparable](values ...T) (res T) {
 	return zero
 }

+// CoalesceSlice returns the first non-zero value.  It is named after function
+// COALESCE in SQL.  If values or all its elements are empty, it returns nil.
+//
+// TODO(a.garipov): Think of ways to merge with [Coalesce].
+func CoalesceSlice[E any, S []E](values ...S) (res S) {
+	for _, v := range values {
+		if v != nil {
+			return v
+		}
+	}
+
+	return nil
+}
+
 // UniqChecker allows validating uniqueness of comparable items.
 //
 // TODO(a.garipov): The Ordered constraint is only really necessary in Validate.
--- a/internal/aghnet/arpdb_bsd.go
+++ b/internal/aghnet/arpdb_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd
-// +build darwin freebsd

 package aghnet

@@ -33,8 +32,7 @@ func newARPDB() (arp *cmdARPDB) {
 // parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD.
 // The expected input format:
 //
-//   host.name (192.168.0.1) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet]
-//
+//	host.name (192.168.0.1) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet]
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {
--- a/internal/aghnet/arpdb_bsd_test.go
+++ b/internal/aghnet/arpdb_bsd_test.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd
-// +build darwin freebsd

 package aghnet

--- a/internal/aghnet/arpdb_linux.go
+++ b/internal/aghnet/arpdb_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

@@ -117,9 +116,8 @@ func (arp *fsysARPDB) Neighbors() (ns []Neighbor) {
 // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt.  The
 // expected input format:
 //
-//   IP address     HW type  Flags  HW address         Mask  Device
-//   192.168.11.98  0x1      0x2    5a:92:df:a9:7e:28  *     wan
-//
+//	IP address     HW type  Flags  HW address         Mask  Device
+//	192.168.11.98  0x1      0x2    5a:92:df:a9:7e:28  *     wan
 func parseArpAWrt(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	if !sc.Scan() {
 		// Skip the header.
@@ -161,8 +159,7 @@ func parseArpAWrt(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 // parseArpA parses the output of the "arp -a -n" command on Linux.  The
 // expected input format:
 //
-//   hostname (192.168.1.1) at ab:cd:ef:ab:cd:ef [ether] on enp0s3
-//
+//	hostname (192.168.1.1) at ab:cd:ef:ab:cd:ef [ether] on enp0s3
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {
@@ -208,8 +205,7 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 // parseIPNeigh parses the output of the "ip neigh" command on Linux.  The
 // expected input format:
 //
-//   192.168.1.1 dev enp0s3 lladdr ab:cd:ef:ab:cd:ef REACHABLE
-//
+//	192.168.1.1 dev enp0s3 lladdr ab:cd:ef:ab:cd:ef REACHABLE
 func parseIPNeigh(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {
--- a/internal/aghnet/arpdb_linux_test.go
+++ b/internal/aghnet/arpdb_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/arpdb_openbsd.go
+++ b/internal/aghnet/arpdb_openbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

@@ -32,9 +31,8 @@ func newARPDB() (arp *cmdARPDB) {
 // parseArpA parses the output of the "arp -a -n" command on OpenBSD.  The
 // expected input format:
 //
-//   Host        Ethernet Address  Netif Expire    Flags
-//   192.168.1.1 ab:cd:ef:ab:cd:ef   em0 19m59s
-//
+//	Host        Ethernet Address  Netif Expire    Flags
+//	192.168.1.1 ab:cd:ef:ab:cd:ef   em0 19m59s
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	// Skip the header.
 	if !sc.Scan() {
--- a/internal/aghnet/arpdb_openbsd_test.go
+++ b/internal/aghnet/arpdb_openbsd_test.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/arpdb_windows.go
+++ b/internal/aghnet/arpdb_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

@@ -25,12 +24,10 @@ func newARPDB() (arp *cmdARPDB) {
 // parseArpA parses the output of the "arp /a" command on Windows.  The expected
 // input format (the first line is empty):
 //
-//
-//   Interface: 192.168.56.16 --- 0x7
-//     Internet Address      Physical Address      Type
-//     192.168.56.1          0a-00-27-00-00-00     dynamic
-//     192.168.56.255        ff-ff-ff-ff-ff-ff     static
-//
+//	Interface: 192.168.56.16 --- 0x7
+//	  Internet Address      Physical Address      Type
+//	  192.168.56.1          0a-00-27-00-00-00     dynamic
+//	  192.168.56.255        ff-ff-ff-ff-ff-ff     static
 func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
 	ns = make([]Neighbor, 0, lenHint)
 	for sc.Scan() {
--- a/internal/aghnet/arpdb_windows_test.go
+++ b/internal/aghnet/arpdb_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/dhcp_unix.go
+++ b/internal/aghnet/dhcp_unix.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || openbsd

 package aghnet

--- a/internal/aghnet/dhcp_windows.go
+++ b/internal/aghnet/dhcp_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/hostgen.go
+++ b/internal/aghnet/hostgen.go
@@ -45,11 +45,11 @@ func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
 // GenerateHostname generates the hostname from ip.  In case of using IPv4 the
 // result should be like:
 //
-//   192-168-10-1
+//	192-168-10-1
 //
 // In case of using IPv6, the result is like:
 //
-//   ff80-f076-0000-0000-0000-0000-0000-0010
+//	ff80-f076-0000-0000-0000-0000-0000-0010
 //
 // ip must be either an IPv4 or an IPv6.
 func GenerateHostname(ip net.IP) (hostname string) {
--- a/internal/aghnet/hostscontainer.go
+++ b/internal/aghnet/hostscontainer.go
@@ -70,8 +70,7 @@ func (rm *requestMatcher) MatchRequest(
 // rule or an empty string if the last doesn't exist.  The returned rules are in
 // a processed format like:
 //
-//   ip host1 host2 ...
-//
+//	ip host1 host2 ...
 func (rm *requestMatcher) Translate(rule string) (hostRule string) {
 	rm.stateLock.RLock()
 	defer rm.stateLock.RUnlock()
--- a/internal/aghnet/hostscontainer_linux.go
+++ b/internal/aghnet/hostscontainer_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/hostscontainer_others.go
+++ b/internal/aghnet/hostscontainer_others.go
@@ -1,5 +1,4 @@
 //go:build !(windows || linux)
-// +build !windows,!linux

 package aghnet

--- a/internal/aghnet/hostscontainer_windows.go
+++ b/internal/aghnet/hostscontainer_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/interfaces_linux.go
+++ b/internal/aghnet/interfaces_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/interfaces_unix.go
+++ b/internal/aghnet/interfaces_unix.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd netbsd openbsd solaris
+//go:build darwin || freebsd || openbsd

 package aghnet

--- a/internal/aghnet/interfaces_windows.go
+++ b/internal/aghnet/interfaces_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/ipset.go
+++ b/internal/aghnet/ipset.go
@@ -18,7 +18,7 @@ type IpsetManager interface {
 //
 // The syntax of the ipsetConf is:
 //
-//   DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...
+//	DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...
 //
 // If ipsetConf is empty, msg and err are nil.  The error is of type
 // *aghos.UnsupportedError if the OS is not supported.
--- a/internal/aghnet/ipset_linux.go
+++ b/internal/aghnet/ipset_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/ipset_linux_test.go
+++ b/internal/aghnet/ipset_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/ipset_others.go
+++ b/internal/aghnet/ipset_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package aghnet

--- a/internal/aghnet/net_bsd.go
+++ b/internal/aghnet/net_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || openbsd
-// +build darwin freebsd openbsd

 package aghnet

--- a/internal/aghnet/net_darwin.go
+++ b/internal/aghnet/net_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin

 package aghnet

--- a/internal/aghnet/net_freebsd.go
+++ b/internal/aghnet/net_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package aghnet

--- a/internal/aghnet/net_freebsd_test.go
+++ b/internal/aghnet/net_freebsd_test.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package aghnet

--- a/internal/aghnet/net_linux.go
+++ b/internal/aghnet/net_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/net_linux_test.go
+++ b/internal/aghnet/net_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/net_openbsd.go
+++ b/internal/aghnet/net_openbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/net_openbsd_test.go
+++ b/internal/aghnet/net_openbsd_test.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/net_unix.go
+++ b/internal/aghnet/net_unix.go
@@ -1,5 +1,4 @@
-//go:build openbsd || freebsd || linux || darwin
-// +build openbsd freebsd linux darwin
+//go:build darwin || freebsd || linux || openbsd

 package aghnet

--- a/internal/aghnet/net_windows.go
+++ b/internal/aghnet/net_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/systemresolvers_others.go
+++ b/internal/aghnet/systemresolvers_others.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package aghnet

--- a/internal/aghnet/systemresolvers_others_test.go
+++ b/internal/aghnet/systemresolvers_others_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package aghnet

--- a/internal/aghnet/systemresolvers_windows.go
+++ b/internal/aghnet/systemresolvers_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

@@ -62,9 +61,8 @@ func writeExit(w io.WriteCloser) {
 // scanAddrs scans the DNS addresses from nslookup's output.  The expected
 // output of nslookup looks like this:
 //
-//   Default Server:  192-168-1-1.qualified.domain.ru
-//   Address:  192.168.1.1
-//
+//	Default Server:  192-168-1-1.qualified.domain.ru
+//	Address:  192.168.1.1
 func scanAddrs(s *bufio.Scanner) (addrs []string) {
 	for s.Scan() {
 		line := strings.TrimSpace(s.Text())
--- a/internal/aghnet/systemresolvers_windows_test.go
+++ b/internal/aghnet/systemresolvers_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghos/endian_big.go
+++ b/internal/aghos/endian_big.go
@@ -1,5 +1,4 @@
 //go:build mips || mips64
-// +build mips mips64

 // This file is an adapted version of github.com/josharian/native.

--- a/internal/aghos/endian_little.go
+++ b/internal/aghos/endian_little.go
@@ -1,5 +1,4 @@
 //go:build amd64 || 386 || arm || arm64 || mipsle || mips64le || ppc64le
-// +build amd64 386 arm arm64 mipsle mips64le ppc64le

 // This file is an adapted version of github.com/josharian/native.

--- a/internal/aghos/os.go
+++ b/internal/aghos/os.go
@@ -121,13 +121,12 @@ func PIDByCommand(command string, except ...int) (pid int, err error) {
 }

 // parsePSOutput scans the output of ps searching the largest PID of the process
-// associated with cmdName ignoring PIDs from ignore.  A valid line from
-// r should look like these:
-//
-//    123 ./example-cmd
-//   1230 some/base/path/example-cmd
-//   3210 example-cmd
+// associated with cmdName ignoring PIDs from ignore.  A valid line from r
+// should look like these:
 //
+//	 123 ./example-cmd
+//	1230 some/base/path/example-cmd
+//	3210 example-cmd
 func parsePSOutput(r io.Reader, cmdName string, ignore []int) (largest, instNum int, err error) {
 	s := bufio.NewScanner(r)
 	for s.Scan() {
--- a/internal/aghos/os_bsd.go
+++ b/internal/aghos/os_bsd.go
@@ -1,5 +1,4 @@
-//go:build darwin || netbsd || openbsd
-// +build darwin netbsd openbsd
+//go:build darwin || openbsd

 package aghos

--- a/internal/aghos/os_freebsd.go
+++ b/internal/aghos/os_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package aghos

--- a/internal/aghos/os_linux.go
+++ b/internal/aghos/os_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghos

--- a/internal/aghos/os_unix.go
+++ b/internal/aghos/os_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || linux || openbsd
-// +build darwin freebsd linux openbsd

 package aghos

--- a/internal/aghos/os_windows.go
+++ b/internal/aghos/os_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghos

--- a/internal/aghos/syslog_others.go
+++ b/internal/aghos/syslog_others.go
@@ -1,5 +1,4 @@
-//go:build !(windows || plan9)
-// +build !windows,!plan9
+//go:build !windows

 package aghos

--- a/internal/aghos/syslog_windows.go
+++ b/internal/aghos/syslog_windows.go
@@ -1,5 +1,4 @@
-//go:build windows || plan9
-// +build windows plan9
+//go:build windows

 package aghos

--- a/Show More
+++ b/Show More