Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home

* commit '1800c6583665da4672ff8dab2be410511ddf8ca6':
  * client: update chinese translations
  - client: fix translation
  * client: update translations

.travis.yml

@@ -14,7 +14,7 @@ before_install:
   - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.19.1
 
 install:
-  - npm --prefix client install
+  - npm --prefix client ci
 
 cache:
   directories:

AGHTechDoc.md

@@ -916,6 +916,8 @@ Response:
 	...
 	]
 
+`domain` can be an exact host name (`www.host.com`) or a wildcard (`*.host.com`).
+
 
 ### API: Add a rewrite entry
 

Makefile

@@ -14,7 +14,7 @@ all: build
 build: $(TARGET)
 
 client/node_modules: client/package.json client/package-lock.json
-	npm --prefix client install
+	npm --prefix client ci
 	touch client/node_modules
 
 $(STATIC): $(JSFILES) client/node_modules

client/package-lock.json

@@ -5214,8 +5214,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5236,14 +5235,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5258,20 +5255,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5388,8 +5382,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5401,7 +5394,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5416,7 +5408,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5424,14 +5415,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5450,7 +5439,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5531,8 +5519,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5544,7 +5531,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5630,8 +5616,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5667,7 +5652,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5687,7 +5671,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5731,14 +5714,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

client/public/index.html

@@ -5,6 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta name="theme-color" content="#000000">
         <meta name="google" content="notranslate">
+        <meta http-equiv="x-dns-prefetch-control" content="off">
         <link rel="icon" type="image/png" href="favicon.png" sizes="48x48">
         <title>AdGuard Home</title>
     </head>

client/src/__locales/bg.json

@@ -11,7 +11,9 @@
     "dhcp_found": "Вашата мрежа вече има активен DHCP сървър. Не е безопасно ползването на втори!",
     "dhcp_leases": "DHCP раздадени адреси",
     "dhcp_leases_not_found": "Няма намерени активни DHCP адреси",
+    "dhcp_config_saved": "Запиши конфигурацията на DHCP сървъра",
     "form_error_required": "Задължително поле",
+    "form_error_ip_format": "Невалиден IPv4 адрес",
     "form_error_positive": "Проверете дали е положително число",
     "dhcp_form_gateway_input": "IP шлюз",
     "dhcp_form_subnet_input": "Мрежова маска",
@@ -45,6 +47,7 @@
     "disabled_protection": "Защитата е забранена",
     "refresh_statics": "Обнови статистиката",
     "dns_query": "DNS запитвания",
+    "blocked_by": "Блокирани от",
     "stats_malware_phishing": "вируси/атаки",
     "stats_adult": "сайтове за възрастни",
     "stats_query_domain": "Най-отваряни страници",
@@ -55,6 +58,7 @@
     "top_clients": "Най-активни IP адреси",
     "no_clients_found": "Нямa намерени адреси",
     "general_statistics": "Обща статисика",
+    "number_of_dns_query_24_hours": "Сума на DNS заявки за последните 24 часа",
     "number_of_dns_query_blocked_24_hours": "Сума на блокирани DNS заявки от филтрите за реклама и местни",
     "number_of_dns_query_blocked_24_hours_by_sec": "Сума на блокирани DNS заявки от AdGuard свързани със сигурността",
     "number_of_dns_query_blocked_24_hours_adult": "Сума на блокирани сайтове за възрастни",
@@ -69,9 +73,11 @@
     "use_adguard_parental": "Включи AdGuard Родителски Надзор",
     "use_adguard_parental_hint": "Модул XXX в AdGuard Home ще провери дали страницата има материали за възвъстни. Използва се същия API за анонимност като при модула за Сигурност.",
     "enforce_safe_search": "Включи Безопасно Търсене",
+    "enforce_save_search_hint": "AdGuard Home прилага Безопасно Търсене в следните търсачки и сайтове: Google, Youtube, Bing, и Yandex.",
     "no_servers_specified": "Няма избрани услуги",
     "general_settings": "Общи настройки",
     "upstream_dns": "Главен DNS сървър",
+    "upstream_dns_hint": "Ако оставите празно, AdGuard Home ще използва <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> за главен. Използвай tls:// представка за DNS използващи TLS връзка.",
     "test_upstream_btn": "Тествай главния DNS",
     "apply_btn": "Приложи",
     "disabled_filtering_toast": "Забрани филтрирането",
@@ -155,6 +161,7 @@
     "install_settings_dns_desc": "За да работи, ще трябва да настроите вашият рутер или устройства да ползват DNS сървър с адрес:",
     "install_settings_all_interfaces": "Всички интерфейси",
     "install_auth_title": "Удостоверяване",
+    "install_auth_desc": "Много е важно да зададете име и парола за достъп до вашия панел за администрация на AdGuard Home. Препоръчваме ви да зададете име и парола независимо че го ползвате само в къщи.",
     "install_auth_username": "Потребител",
     "install_auth_password": "Парола",
     "install_auth_confirm": "Потвърдете паролата",

client/src/__locales/cs.json

@@ -23,7 +23,9 @@
     "form_error_ip6_format": "Neplatný formát IPv6",
     "form_error_ip_format": "Neplatný formát IP",
     "form_error_mac_format": "Neplatný formát MAC",
+    "form_error_client_id_format": "Neplatný formát ID klienta",
     "form_error_positive": "Musí být větší než 0",
+    "form_error_negative": "Musí být rovno 0 nebo vyšší",
     "dhcp_form_gateway_input": "IP brána",
     "dhcp_form_subnet_input": "Maska podsítě",
     "dhcp_form_range_title": "Rozsah IP adres",
@@ -74,7 +76,7 @@
     "stats_adult": "Blokované stránky pro dospělé",
     "stats_query_domain": "Nejčastěji dotazované domény",
     "for_last_24_hours": "za posledních 24 hodin",
-    "for_last_days": "za posledních {{value}} dní",
+    "for_last_days": "za posledních {{count}} dní",
     "for_last_days_plural": "za posledních {{count}} dní",
     "no_domains_found": "Nenalezeny žádné domény",
     "requests_count": "Počet požadavků",
@@ -82,7 +84,7 @@
     "top_clients": "Nejčastější klienti",
     "no_clients_found": "Nenalezeny žádní klienti",
     "general_statistics": "Obecné statistiky",
-    "number_of_dns_query_days": "Počet DNS dotazů zpracovaných za posledních {{value}} dní",
+    "number_of_dns_query_days": "Počet DNS dotazů zpracovaných za posledních {{count}} dní",
     "number_of_dns_query_days_plural": "Počet DNS dotazů zpracovaných za posledních {{count}} dní",
     "number_of_dns_query_24_hours": "Počet DNS dotazů zpracovaných za posledních 24 hodin",
     "number_of_dns_query_blocked_24_hours": "Počet požadavků DNS zablokovaných filtrem reklam a seznamy blokování hostitelů",
@@ -187,6 +189,22 @@
     "query_log_disabled": "Protokol dotazu je zakázán a lze jej nakonfigurovat v <0>nastavení</0>",
     "query_log_strict_search": "Pro striktní vyhledávání použijte dvojité uvozovky",
     "query_log_retention_confirm": "Opravdu chcete změnit uchovávání protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
+    "dns_config": "Konfigurace serveru DNS",
+    "blocking_mode": "Režim blokování",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Nulová IP",
+    "custom_ip": "Vlastní IP",
+    "blocking_ipv4": "Blokování IPv4",
+    "blocking_ipv6": "Blokování IPv6",
+    "form_enter_rate_limit": "Zadejte rychlostní limit",
+    "rate_limit": "Rychlostní limit",
+    "edns_enable": "Povolit klientskou podsíť EDNS",
+    "edns_cs_desc": "Pokud je povoleno, AdGuard Home bude odesílat podsítě klientů na servery DNS.",
+    "rate_limit_desc": "Počet požadavků za sekundu, které smí jeden klient provádět (0: neomezeno)",
+    "blocking_ipv4_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku A",
+    "blocking_ipv6_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku AAAA",
+    "blocking_mode_desc": "<0>NXDOMAIN – Odpověď s kódem NXDOMAIN;</0> <0>Nulová IP – Odpověď s nulovou IP adresou (0,0.0,0 pro A; :: pro AAAA);</0> <0>Vlastní IP adresa – Odpověď s ručně nastavenou IP adresou.</0>",
+    "upstream_dns_client_desc": "Pokud toto pole ponecháte prázdné, AdGuard Home použije servery nakonfigurované v<0>nastavení DNS</0>.",
     "source_label": "Zdroj",
     "found_in_known_domain_db": "Nalezeno v databázi známých domén",
     "category_label": "Kategorie",
@@ -409,5 +427,9 @@
     "descr": "Popis",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Další informace</0> o vytváření vlastních seznamů zakázaných hostitelů.",
-    "blocked_by_response": "Zakázáno s odpovědí CNAME nebo IP"
+    "blocked_by_response": "Zakázáno s odpovědí CNAME nebo IP",
+    "try_again": "Zkusit znovu",
+    "domain_desc": "Zadejte název domény nebo zástupný znak, který chcete přepsat.",
+    "example_rewrite_domain": "přepsat odezvy pouze pro tento název domény.",
+    "example_rewrite_wildcard": "přepsat odezvy pro všechny subdomény <0>example.org</0>."
 }

client/src/__locales/da.json

@@ -23,7 +23,9 @@
     "form_error_ip6_format": "Ugyldigt IPv6-format",
     "form_error_ip_format": "Ugyldigt IP-format",
     "form_error_mac_format": "Ugyldigt MAC-format",
+    "form_error_client_id_format": "Ugyldigt klient-ID-format",
     "form_error_positive": "Skal være større end 0",
+    "form_error_negative": "Skal være lig med 0 eller større",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Interval af IP-adresser",
@@ -187,6 +189,22 @@
     "query_log_disabled": "Forespørgselsloggen er deaktiveret og kan konfigureres i <0>indstillinger</0>",
     "query_log_strict_search": "Brug dobbelt anførselstegn til streng søgning",
     "query_log_retention_confirm": "Er du sikker på, at du vil ændre opbevaring af forespørgselsloggen? Hvis du mindsker intervalværdien, vil nogle data gå tabt",
+    "dns_config": "DNS-serverkonfiguration",
+    "blocking_mode": "Blokeringstilstand",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Null IP",
+    "custom_ip": "Tilpasset IP",
+    "blocking_ipv4": "IPv4-blokering",
+    "blocking_ipv6": "IPv6-blokering",
+    "form_enter_rate_limit": "Indtast hyppighedsgrænse",
+    "rate_limit": "Hyppighedsgrænse",
+    "edns_enable": "Aktiver EDNS Client Subnet",
+    "edns_cs_desc": "Hvis det er aktiveret, vil AdGuard Home sende klienters subnets til DNS-serverne.",
+    "rate_limit_desc": "Antallet af anmodninger pr. sekund, som en enkelt klient får lov til at fremsætte (0: ubegrænset)",
+    "blocking_ipv4_desc": "IP-adresse, der skal returneres for en blokeret A-anmodning",
+    "blocking_ipv6_desc": "IP-adresse, der skal returneres for en blokeret AAAA-anmodning",
+    "blocking_mode_desc": "<0>NXDOMAIN - Svar med NXDOMAIN-kode;</0> <0>Null IP - Svar med nul IP-adresse (0.0.0.0 for A, :: for AAAA);</0> <0>Brugerdefineret IP - Svar med en manuelt indstillet IP-adresse.</0>",
+    "upstream_dns_client_desc": "Hvis du lader dette felt være tomt, vil AdGuard Home bruge de servere, der er konfigureret i <0>DNS-indstillingerne</0>.",
     "source_label": "Kilde",
     "found_in_known_domain_db": "Fundet i databasen med kendte domæner.",
     "category_label": "Kategori",
@@ -354,7 +372,7 @@
     "rewrite_desc": "Gør det nemt at konfigurere det tilpassede DNS-svar for et specifikt domænenavn.",
     "rewrite_applied": "Anvendt Omskrivningsregel",
     "dns_rewrites": "DNS-omskrivninger",
-    "form_domain": "Indtast domæne",
+    "form_domain": "Indtast domænenavn eller wildcard",
     "form_answer": "Indtast IP-adresser eller domænenavne",
     "form_error_domain_format": "Ugyldigt domæneformat",
     "form_error_answer_format": "Ugyldigt svarformat",
@@ -409,5 +427,9 @@
     "descr": "Beskrivelse",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Lær mere</0> om at oprette dine egne værtsblokeringslister.",
-    "blocked_by_response": "Blokeret af CNAME eller IP som svar"
+    "blocked_by_response": "Blokeret af CNAME eller IP som svar",
+    "try_again": "Prøv igen",
+    "domain_desc": "Indtast det domænenavn eller wildcard, du ønsker skal omskrives.",
+    "example_rewrite_domain": "omskriv kun svar for dette domænenavn.",
+    "example_rewrite_wildcard": "omskriv svar for alle <0>example.org</0> subdomæner."
 }

client/src/__locales/de.json

@@ -17,9 +17,15 @@
     "dhcp_leases": "DHCP-Leasingverträge",
     "dhcp_static_leases": "DHCP statische Leases",
     "dhcp_leases_not_found": "Keine DHCP-Leasingverträge gefunden\n",
+    "dhcp_config_saved": "Gespeicherte DHCP-Server-Konfiguration",
     "form_error_required": "Pflichtfeld",
+    "form_error_ip4_format": "Ungültiges IPv4-Format",
+    "form_error_ip6_format": "Ungültiges IPv6-Format",
+    "form_error_ip_format": "Ungültiges IPv4-Format",
     "form_error_mac_format": "Ungültiges MAC-Format",
+    "form_error_client_id_format": "Ungültiges Client-ID-Format",
     "form_error_positive": "Muss größer als 0 sein.",
+    "form_error_negative": "Muss gleich oder größer als 0 (Null) sein",
     "dhcp_form_gateway_input": "Gateway-IP",
     "dhcp_form_subnet_input": "Subnetz-Maske",
     "dhcp_form_range_title": "Bereich von IP-Adressen",
@@ -41,6 +47,7 @@
     "dhcp_new_static_lease": "Neuer statischer Lease",
     "dhcp_static_leases_not_found": "Keine statischen DHCP-Leases gefunden",
     "dhcp_add_static_lease": "Statischen Lease hinzufügen",
+    "dhcp_reset": "Möchten Sie die DHCP-Konfiguration wirklich zurücksetzen?",
     "delete_confirm": "Möchten Sie „{{key}}” wirklich löschen?",
     "form_enter_hostname": "Gerätenamen eingeben",
     "error_details": "Fehlerdetails",
@@ -69,7 +76,7 @@
     "stats_adult": "Blockierte Webseiten für Erwachsene",
     "stats_query_domain": "Am häufigsten angefragte Domains",
     "for_last_24_hours": "für die letzten 24 Stunden",
-    "for_last_days": "am letzten {{value}} Tag",
+    "for_last_days": "am letzten {{count}} Tag",
     "for_last_days_plural": "in den letzten {{count}} Tage",
     "no_domains_found": "Keine Domains gefunden",
     "requests_count": "Anzahl der Anfragen",
@@ -77,7 +84,7 @@
     "top_clients": "Top Clients",
     "no_clients_found": "Keine Clients gefunden",
     "general_statistics": "Allgemeine Statistiken",
-    "number_of_dns_query_days": "Anzahl der in den letzten {{value}}} Tagen verarbeiteten DNS-Anfragen",
+    "number_of_dns_query_days": "Anzahl der in den letzten {{count}} Tagen verarbeiteten DNS-Anfragen",
     "number_of_dns_query_days_plural": "Anzahl der DNS-Abfragen, die in den letzten {{count}}} Tagen verarbeitet wurden",
     "number_of_dns_query_24_hours": "Anzahl der in den letzten 24 Stunden durchgeführten DNS-Anfragen",
     "number_of_dns_query_blocked_24_hours": "Anzahl der durch Werbefilter und Host-Blocklisten geblockten DNS-Anfragen",
@@ -94,13 +101,16 @@
     "use_adguard_parental": "AdGuard Webservice für Kindersicherung verwenden",
     "use_adguard_parental_hint": "AdGuard Home wird überprüfen, ob die Domain Inhalte hat, die nur für Erwachsene geeignet sind. Zum Schutz Ihrer Privatsphäre wird die gleiche API wie für den Webservice für Internet-Sicherheit verwendet.",
     "enforce_safe_search": "SafeSearch erzwingen",
+    "enforce_save_search_hint": "AdGuard kann SafeSearch für folgende Suchmaschinen erzwingen: Google, Youtube, Bing und Yandex.",
     "no_servers_specified": "Keine Server festgelegt",
     "general_settings": "Allgemeine Einstellungen",
     "dns_settings": "DNS-Einstellungen",
     "encryption_settings": "Verschlüsselungseinstellungen",
     "dhcp_settings": "DHCP-Einstellungen",
     "upstream_dns": "Upstream-DNS-Server",
+    "upstream_dns_hint": "Wenn Sie dieses Feld leer lassen wird AdGuard Home <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> als Upstream verwenden. Verwenden Sie das Präfix tls:// für DNS über TLS-Server.",
     "test_upstream_btn": "Upstreams testen",
+    "upstreams": "Upstreams",
     "apply_btn": "Anwenden",
     "disabled_filtering_toast": "Filtern deaktiviert",
     "enabled_filtering_toast": "Filtern aktiviert",
@@ -179,6 +189,22 @@
     "query_log_disabled": "Das Abfrageprotokoll ist deaktiviert und kann in den <0>Einstellungen</0> konfiguriert werden.",
     "query_log_strict_search": "Doppelte Anführungszeichen für die strikte Suche verwenden",
     "query_log_retention_confirm": "Möchten Sie die Aufbewahrung des Abfrageprotokolls wirklich ändern? Wenn Sie den Zeitabstand verringern, gehen einige Daten verloren.",
+    "dns_config": "DNS-Serverkonfiguration",
+    "blocking_mode": "Sperrmodus",
+    "nxdomain": "NXDomain",
+    "null_ip": "Null-IP-Adresse",
+    "custom_ip": "Benutzerdefinierte IP",
+    "blocking_ipv4": "IPv4-Sperren",
+    "blocking_ipv6": "IPv6-Sperren",
+    "form_enter_rate_limit": "Begrenzungswert eingeben",
+    "rate_limit": "Begrenzungswert",
+    "edns_enable": "EDNS Client Subnetz aktivieren",
+    "edns_cs_desc": "Wenn aktiviert, sendet AdGuard Home die Subnetze der Clients an die DNS-Server.",
+    "rate_limit_desc": "Die Anzahl der Anfragen pro Sekunde, die ein einzelner Client stellen darf (0: unbegrenzt)",
+    "blocking_ipv4_desc": "IP-Adresse, die für eine gesperrte A-Anfrage zurückgegeben werden soll",
+    "blocking_ipv6_desc": "IP-Adresse, die für eine gesperrte AAAA-Anfrage zurückgegeben werden soll",
+    "blocking_mode_desc": "<0>NXDomain - Antwortet mit NXDomain-Code;</0> <0>Null-IP-Adresse - Antwortet mit Null-IP-Adresse (0.0.0.0 für A; :: für AAAA);</0> <0>Benutzerdefinierte IP - Antwortet mit einer manuell festgelegten IP-Adresse.</0>",
+    "upstream_dns_client_desc": "Wenn Sie dieses Feld leer lassen, verwendet AdGuard Home die Server, die in den <0>DNS-Einstellungen</0> konfiguriert sind.",
     "source_label": "Quelle",
     "found_in_known_domain_db": "In der Datenbank der bekannten Domains gefunden.",
     "category_label": "Kategorie",
@@ -275,6 +301,8 @@
     "update_announcement": "AdGuard Home {{version}} ist jetzt verfügbar! <0>Klicken Sie hier</0> für weitere Informationen.",
     "setup_guide": "Einrichtungsassistent",
     "dns_addresses": "DNS-Adressen",
+    "dns_start": "DNS-Server wird gestartet",
+    "dns_status_error": "Fehler bei Statusabfrage des DNS-Server",
     "down": "Nicht erreichbar",
     "fix": "Beheben",
     "dns_providers": "Hier finden Sie eine <0>Liste der bekannten DNS-Anbieter</0> zur Auswahl.",
@@ -293,8 +321,11 @@
     "client_edit": "Client bearbeiten",
     "client_identifier": "Bezeichner",
     "ip_address": "IP-Adresse",
+    "client_identifier_desc": "Clients können durch die IP-Adresse oder MAC-Adresse identifiziert werden. Bitte beachten Sie, dass die Verwendung der MAC-Adresse als Identifikator nur möglich ist, wenn AdGuard Home gleichzeitig auch ein <0>DHCP-Server</0> ist.",
     "form_enter_ip": "IP-Adresse eingeben",
     "form_enter_mac": "MAC-Adresse eingeben",
+    "form_enter_id": "Kennung eingeben",
+    "form_add_id": "Kennung hinzufügen",
     "form_client_name": "Clientnamen eingeben",
     "client_global_settings": "Allgemeine Einstellungen nutzen",
     "client_deleted": "Client „{{key}}” erfolgreich entfernt",
@@ -395,5 +426,10 @@
     "netname": "Netzwerkname",
     "descr": "Beschreibung",
     "whois": "Whois",
-    "filtering_rules_learn_more": "<0>Erfahren Sie mehr</0> über die Erstellung eigener Hosts-Blocklisten."
+    "filtering_rules_learn_more": "<0>Erfahren Sie mehr</0> über die Erstellung eigener Hosts-Blocklisten.",
+    "blocked_by_response": "Nach CNAME oder IP-Antwort blockiert",
+    "try_again": "Erneut versuchen",
+    "domain_desc": "Geben Sie den Domain-Namen oder den Platzhalter ein, der umgeschrieben werden soll.",
+    "example_rewrite_domain": "Antworten nur für diesen Domain-Namen umschreiben.",
+    "example_rewrite_wildcard": "Antworten nur für alle <0>example.org</0> Subdomains umschreiben."
 }

client/src/__locales/en.json

@@ -23,6 +23,7 @@
     "form_error_ip6_format": "Invalid IPv6 format",
     "form_error_ip_format": "Invalid IP format",
     "form_error_mac_format": "Invalid MAC format",
+    "form_error_client_id_format": "Invalid client ID format",
     "form_error_positive": "Must be greater than 0",
     "form_error_negative": "Must be equal to 0 or greater",
     "dhcp_form_gateway_input": "Gateway IP",
@@ -301,7 +302,7 @@
     "setup_guide": "Setup guide",
     "dns_addresses": "DNS addresses",
     "dns_start": "DNS server is starting up",
-    "dns_status_error": "Error of getting DNS server status",
+    "dns_status_error": "Error checking the DNS server status",
     "down": "Down",
     "fix": "Fix",
     "dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.",
@@ -371,7 +372,7 @@
     "rewrite_desc": "Allows to easily configure custom DNS response for a specific domain name.",
     "rewrite_applied": "Applied Rewrite rule",
     "dns_rewrites": "DNS rewrites",
-    "form_domain": "Enter domain",
+    "form_domain": "Enter domain name or wildcard",
     "form_answer": "Enter IP address or domain name",
     "form_error_domain_format": "Invalid domain format",
     "form_error_answer_format": "Invalid answer format",
@@ -427,5 +428,8 @@
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Learn more</0> about creating your own hosts blocklists.",
     "blocked_by_response": "Blocked by CNAME or IP in response",
-    "try_again": "Try again"
+    "try_again": "Try again",
+    "domain_desc": "Enter the domain name or wildcard you want to be rewritten.",
+    "example_rewrite_domain": "rewrite responses for this domain name only.",
+    "example_rewrite_wildcard": "rewrite responses for all <0>example.org</0> subdomains."
 }

client/src/__locales/es.json

@@ -12,7 +12,7 @@
     "dhcp_description": "Si su router no proporciona la configuración DHCP, puede utilizar el propio servidor DHCP incorporado de AdGuard.",
     "dhcp_enable": "Habilitar servidor DHCP",
     "dhcp_disable": "Deshabilitar servidor DHCP",
-    "dhcp_not_found": "Es seguro habilitar el servidor DHCP incorporado. No se ha encontrado ningún servidor DHCP activo en la red, sin embargo le recomendamos que lo vuelva a comprobar manualmente, ya que nuestra prueba automática no ofrece actualmente una garantía del 100%.",
+    "dhcp_not_found": "Es seguro habilitar el servidor DHCP incorporado. No se ha encontrado ningún servidor DHCP activo en la red, sin embargo le recomendamos que lo vuelva a comprobar manualmente, ya que nuestra prueba automática no ofrece actualmente una garantía del 100 %.",
     "dhcp_found": "Un servidor DHCP activo se encuentra en la red. No es seguro habilitar el servidor DHCP incorporado.",
     "dhcp_leases": "Asignaciones DHCP",
     "dhcp_static_leases": "Asignaciones DHCP estáticas",
@@ -23,7 +23,9 @@
     "form_error_ip6_format": "Formato IPv6 no válido",
     "form_error_ip_format": "Formato IP no válido",
     "form_error_mac_format": "Formato MAC no válido",
+    "form_error_client_id_format": "Formato de ID de cliente no válido",
     "form_error_positive": "Debe ser mayor que 0",
+    "form_error_negative": "Debe ser igual o mayor que 0",
     "dhcp_form_gateway_input": "IP de puerta de enlace",
     "dhcp_form_subnet_input": "Máscara de subred",
     "dhcp_form_range_title": "Rango de direcciones IP",
@@ -139,9 +141,9 @@
     "custom_filter_rules": "Reglas de filtrado personalizado",
     "custom_filter_rules_hint": "Ingrese una regla por línea. Puede utilizar reglas de bloqueo o la sintaxis de los archivos hosts.",
     "examples_title": "Ejemplos",
-    "example_meaning_filter_block": "bloquea el acceso al dominio ejemplo.org\ny a todos sus subdominios",
+    "example_meaning_filter_block": "bloquea el acceso al dominio ejemplo.org y a todos sus subdominios",
     "example_meaning_filter_whitelist": "desbloquea el acceso al dominio ejemplo.org y a todos sus subdominios",
-    "example_meaning_host_block": "AdGuard Home regresará la dirección 127.0.0.1 para el dominio ejemplo.org (pero no para sus subdominios).",
+    "example_meaning_host_block": "AdGuard Home devolverá la dirección 127.0.0.1 para el dominio ejemplo.org (pero no para sus subdominios).",
     "example_comment": "! Aquí va un comentario",
     "example_comment_meaning": "solo un comentario",
     "example_comment_hash": "# También un comentario",
@@ -187,11 +189,21 @@
     "query_log_disabled": "El registro de consultas está deshabilitado y se puede configurar en la <0>configuración</0>",
     "query_log_strict_search": "Usar comillas dobles para una búsqueda estricta",
     "query_log_retention_confirm": "¿Está seguro de que desea cambiar la retención del registro de consultas? Si disminuye el valor del intervalo, se perderán algunos datos",
+    "dns_config": "Configuración del servidor DNS",
     "blocking_mode": "Modo de bloqueo",
     "nxdomain": "NXDOMAIN",
+    "null_ip": "IP nulo",
     "custom_ip": "IP personalizada",
+    "blocking_ipv4": "Bloqueo de IPv4",
+    "blocking_ipv6": "Bloqueo de IPv6",
+    "form_enter_rate_limit": "Ingrese el límite de cantidad",
+    "rate_limit": "Límite de cantidad",
+    "edns_enable": "Habilitar subred de cliente EDNS",
     "edns_cs_desc": "Si está habilitado, AdGuard Home enviará las subredes de los clientes a los servidores DNS.",
     "rate_limit_desc": "Número de peticiones por segundo que un solo cliente puede hacer (0: ilimitado)",
+    "blocking_ipv4_desc": "Dirección IP devolverá una petición A bloqueada",
+    "blocking_ipv6_desc": "Dirección IP devolverá una petición AAAA bloqueada",
+    "blocking_mode_desc": "<0>NXDOMAIN - Responde con el código NXDOMAIN.</0> <0>IP nulo - Responde con una dirección IP cero (0.0.0.0 para A; :: para AAAA).</0> <0>IP personalizada - Responde con una dirección IP establecida manualmente.</0>",
     "upstream_dns_client_desc": "Si mantiene este campo vacío, AdGuard Home utilizará los servidores configurados en la <0>configuración del DNS</0>.",
     "source_label": "Fuente",
     "found_in_known_domain_db": "Encontrado en la base de datos de dominios conocidos.",
@@ -360,7 +372,7 @@
     "rewrite_desc": "Permite configurar fácilmente la respuesta DNS personalizada para un nombre de dominio específico.",
     "rewrite_applied": "Regla de reescritura aplicada",
     "dns_rewrites": "Reescrituras DNS",
-    "form_domain": "Ingrese el dominio",
+    "form_domain": "Ingrese el nombre del dominio o comodín",
     "form_answer": "Ingrese la dirección IP o el nombre del dominio",
     "form_error_domain_format": "Formato de dominio no válido",
     "form_error_answer_format": "Formato de respuesta no válido",
@@ -415,5 +427,9 @@
     "descr": "Descripción",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Más información</0> sobre cómo crear tus propias listas para bloqueo de hosts.",
-    "blocked_by_response": "Bloqueado por CNAME o IP en respuesta"
+    "blocked_by_response": "Bloqueado por CNAME o IP en respuesta",
+    "try_again": "Volver a intentar",
+    "domain_desc": "Ingrese el nombre de dominio o comodín que desea reescribir.",
+    "example_rewrite_domain": "reescribe las respuestas solo para este nombre de dominio.",
+    "example_rewrite_wildcard": "reescribe las respuestas para todos los subdominios de <0>ejemplo.org</0>."
 }

client/src/__locales/fa.json

@@ -17,9 +17,14 @@
     "dhcp_leases": "اجاره DHCP",
     "dhcp_static_leases": "اجاره DHCP ایستا",
     "dhcp_leases_not_found": "اجاره DHCP یافت نشد",
+    "dhcp_config_saved": "پیکربندی سرور DHCP ذخیره شده است",
     "form_error_required": "فیلد مورد نیاز",
+    "form_error_ip4_format": "فرمت نامعتبر IPv4",
+    "form_error_ip6_format": "فرمت نامعتبر IPv6",
+    "form_error_ip_format": "فرمت IPv4 نامعتبر است",
     "form_error_mac_format": "فرمت مَک نامعتبر است",
     "form_error_positive": "باید بزرگتر از 0 باشد",
+    "form_error_negative": "باید برابر با 0 یا بزرگتر باشد",
     "dhcp_form_gateway_input": "آی پی دروازه",
     "dhcp_form_subnet_input": "ماسک زیر شبکه",
     "dhcp_form_range_title": "دامنه آدرس های آی پی",
@@ -41,6 +46,7 @@
     "dhcp_new_static_lease": "اجاره ایستا جدید",
     "dhcp_static_leases_not_found": "هیچ اجاره DHCP ایستا یافت نشد",
     "dhcp_add_static_lease": "افزودن اجاره ایستا",
+    "dhcp_reset": "آیا میخواهید پیکربندی DHCP را ریست کنید؟",
     "delete_confirm": "آیا میخواهید \"{{key}}\" را حذف کنید؟",
     "form_enter_hostname": "نام میزبان را وارد کنید",
     "error_details": "جزئیات خطا",
@@ -69,7 +75,7 @@
     "stats_adult": "وبسایت غیراخلاقی مسدود شده است",
     "stats_query_domain": "دامنه جستار بالا",
     "for_last_24_hours": "برای 24 ساعت گذشته",
-    "for_last_days": "برای {{value}} روز آخر",
+    "for_last_days": "برای {{count}} روز آخر",
     "for_last_days_plural": "برای {{count}} روز گذشته",
     "no_domains_found": "دامنه یافت نشد",
     "requests_count": "تعداد درخواست ها",
@@ -77,7 +83,7 @@
     "top_clients": "بالاترین کلاینت ها",
     "no_clients_found": "کلاینتی یافت نشد",
     "general_statistics": "آمار عمومی",
-    "number_of_dns_query_days": "تعداد جستار DNS پردازش شده در {{value}} روز آخر",
+    "number_of_dns_query_days": "تعداد جستار DNS پردازش شده در {{count}} روز آخر",
     "number_of_dns_query_days_plural": "تعداد جستار DNS پردازش شده در {{count}} روز گذشته",
     "number_of_dns_query_24_hours": "تعداد جستار DNS پردازش شده در 24 ساعت گذشته",
     "number_of_dns_query_blocked_24_hours": "تعداد درخواست DNS مسدود شده با فیلترهای مسدودساز تبلیغ و لیست سیاه میزبان",
@@ -94,13 +100,16 @@
     "use_adguard_parental": "از سرویس وب نظارت والدین AdGuard استفاده کن",
     "use_adguard_parental_hint": "AdGuard Home بررسی می کند اگر دامنه حاوی موارد غیر اخلاقی است.آن از همان اِی پی آی دارای حریم خصوصی سرویس وب امنیت وب گردی استفاده می کند.",
     "enforce_safe_search": "اجبار جستجوی اَمن",
+    "enforce_save_search_hint": "AdGuard Home میتواند جستجوی اَمن را در موتور جستجوهای زیر اعمال کند:گوگل،یوتوب،بینگ و یاندکس",
     "no_servers_specified": "سروری تعیین نشده است",
     "general_settings": "تنظیمات عمومی",
     "dns_settings": "تنظیمات DNS",
     "encryption_settings": "تنظیمات رمزگُذاری",
     "dhcp_settings": "تنظیمات DHCP",
     "upstream_dns": "سرورهای DNS جریان ارسالی",
+    "upstream_dns_hint": "اگر این فیلد را خالی نگه دارید، AdGuard Home از <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> بعنوان یک جریان ارسالی استفاده می کند. از پیشوند tls:// برای سرورهای DNS over TLS استفاده کنید.",
     "test_upstream_btn": "تست جریان ارسالی",
+    "upstreams": "جریان ارسالی",
     "apply_btn": "اِعمال",
     "disabled_filtering_toast": "فیلترینگ غیرفعال شده است",
     "enabled_filtering_toast": "فیلترینگ فعال شده است",
@@ -137,6 +146,7 @@
     "example_comment": "! در اینجا نظر قرار می گیرد",
     "example_comment_meaning": "فقط یک توضیح",
     "example_comment_hash": "# همچنین یک نظر",
+    "example_regex_meaning": "مسدودسازی دسترسی به دامنه مطابق <0>با عبارت منظم خاص</0>",
     "example_upstream_regular": "DNS عادی (بر UDP)",
     "example_upstream_dot": "کُدگذاری شده <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
     "example_upstream_doh": "کُدگذاری شده <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
@@ -169,6 +179,31 @@
     "rule_added_to_custom_filtering_toast": "دستور به دستورات فیلترینگ دستی اضافه شد",
     "query_log_response_status": "وضعیت: {{value}}",
     "query_log_filtered": "فیلتر شده با {{filter}}",
+    "query_log_confirm_clear": "آیا واقعا میخواهید کل وقایع جستار را پاک کنید؟",
+    "query_log_cleared": "وقایع جستار با موفقیت پاک شد",
+    "query_log_clear": "پاکسازی وقایع جستار",
+    "query_log_retention": "حفظ وقایع جستار برای",
+    "query_log_enable": "فعالسازی وقایع",
+    "query_log_configuration": "پیکربندی وقایع",
+    "query_log_disabled": "وقایع جستار غیرفعال شده است و میتواند در <0>تنظیمات</0> پیکربندی شود",
+    "query_log_strict_search": "برای جستجوی موکد از علامت نقل قول دوتایی استفاده کنید",
+    "query_log_retention_confirm": "آیا واقعا میخواهید مدت حفظ وقایع جستار را تغییر دهید؟ اگر فاصله را کاهش دهید، برخی داده ها حذف میشود",
+    "dns_config": "پیکربندی DNS سرور",
+    "blocking_mode": "حالت مسدودسازی",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Null IP",
+    "custom_ip": "آی پی دستی",
+    "blocking_ipv4": "مسدودسازی IPv4",
+    "blocking_ipv6": "مسدودسازی IPv6",
+    "form_enter_rate_limit": "میزان محدودیت را وارد کنید",
+    "rate_limit": "میزان محدودیت",
+    "edns_enable": "فعالسازی زیرشبکه کلاینت EDNS",
+    "edns_cs_desc": "اگر فعال باشد،AdGuard Home زیرشبکه های کلاینت ها را به سرورهای DNS می فرستد.",
+    "rate_limit_desc": "تعداد درخواست های بر ثانیه مجازی که یک کلاینت میتواند بسازد (0: نامحدود)",
+    "blocking_ipv4_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده A",
+    "blocking_ipv6_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده AAAA",
+    "blocking_mode_desc": "<0>NXDOMAIN – با کد NXDOMAIN پاسخ می دهد،</0> <0>Null IP – با آدرس آی پی صفر پاسخ میدهد (0.0.0.0 برای A; :: برای AAAA);</0> <0>آی پی دستی - با آدرس آی پی دستی تنظیم شده پاسخ میدهد.</0>",
+    "upstream_dns_client_desc": "اگر این فیلد را خالی نگه دارید، AdGuard Home از سرور پیکربندی شده در <0> تنظیماتDNS </0> استفاده می کند.",
     "source_label": "منبع",
     "found_in_known_domain_db": "در پایگاه داده دامنه های شناخته شده پیدا شد",
     "category_label": "دسته بندی",
@@ -186,6 +221,7 @@
     "install_settings_dns_desc": "نیاز است شما دستگاه یا روتر خود را برای استفاده از سرور DNS روی آدرس های زیر پیکربندی کنید:",
     "install_settings_all_interfaces": "همه رابط ها",
     "install_auth_title": "احراز هویت",
+    "install_auth_desc": "بسیار توصیه میشود که رمزعبور احراز هویت را برای رابط وب آدمین AdGuard Home پیکربندی کنید.حتی اگر فقط در شبکه محلی خود قابل دسترسی باشد،برای حفاظت و مسدود کردن دسترسی غیر مجاز و نامحدود این بسیار ضروری است.",
     "install_auth_username": "نام کاربر",
     "install_auth_password": "رمزعبور",
     "install_auth_confirm": "تأیید رمزعبور",
@@ -264,6 +300,8 @@
     "update_announcement": "AdGuard Home {{version}} در دسترس است! <0>اینجا کلیک</0> کنید برای اطلاعات بیشتر.",
     "setup_guide": "راهنمای راه اندازی",
     "dns_addresses": "آدرس های DNS",
+    "dns_start": "سرور DNS در حال شروع است",
+    "dns_status_error": "خطا در دریافت وضعیت DNS",
     "down": "کار نمی کند",
     "fix": "تعمیر",
     "dns_providers": "در اینجا یک <0>لیست از سرویس های ارائه دهنده DNS</0> برای انتخاب هست.",
@@ -282,8 +320,11 @@
     "client_edit": "ویرایش کلاینت",
     "client_identifier": "احراز با",
     "ip_address": "آدرس آی پی",
+    "client_identifier_desc": "کلاینت میتواند با آدرس آی پی یا آدرس مَک احراز شود. لطفا توجه کنید،که استفاده از مَک بعنوان عامل احراز زمانی امکان دارد که  AdGuard Home نیز <0>سرور DHCP </0> باشد",
     "form_enter_ip": "آی پی را وارد کنید",
     "form_enter_mac": "مَک را وارد کنید",
+    "form_enter_id": "خطای احرازکننده",
+    "form_add_id": "افزودن احرازکننده",
     "form_client_name": "نام کلاینت را وارد کنید",
     "client_global_settings": "استفاده از تنظیمات سراسری",
     "client_deleted": "کلاینت \"{{key}}\" را با موفقیت حذف کرد",
@@ -358,9 +399,33 @@
     "domain": "دامنه",
     "answer": "پاسخ",
     "filter_added_successfully": "فیلتر با موفقیت اضافه شد",
+    "statistics_configuration": "پیکربندی آمارها",
     "statistics_retention": "مدت حفظ آمارها",
     "statistics_retention_desc": "اگر مقدار فاصله را کاهش دهید،برخی داده ها از بین خواهد رفت",
     "statistics_clear": " پاکسازی آمار",
     "statistics_clear_confirm": "آیا واقعا میخواهید آمار را پاک کنید؟",
-    "statistics_cleared": "آمارها با موفقیت حذف شد"
+    "statistics_retention_confirm": "آیا واقعا میخواهید مدت حفظ آمار را تغییر دهید؟ اگر فاصله را کاهش دهید، برخی داده ها حذف میشود",
+    "statistics_cleared": "آمارها با موفقیت حذف شد",
+    "interval_hours": "{{count}} ساعت",
+    "interval_hours_plural": "{{count}} ساعت",
+    "filters_configuration": "پیکربندی فیلترها",
+    "filters_enable": "فعالسازی فیلترها",
+    "filters_interval": "فاصله بروز رسانی فیلترها",
+    "disabled": "غير فعال شده",
+    "username_label": "نام کاربر",
+    "username_placeholder": "نام کاربر را وارد کنید",
+    "password_label": "رمزعبور",
+    "password_placeholder": "رمزعبور را وارد کنید",
+    "sign_in": "ورود",
+    "sign_out": "خروج",
+    "forgot_password": "رمزعبور را فراموش کرده اید؟",
+    "forgot_password_desc": "لطفا <0>این مراحل</0> را برای ایجاد رمزعبور جدید برای حساب کاربری خود دنبال کنید.",
+    "location": "مکان",
+    "orgname": "نام سازمان",
+    "netname": "نام شبکه",
+    "descr": "توضيحات",
+    "whois": "هوئیز",
+    "filtering_rules_learn_more": "درباره ایجاد لیست سیاه میزبان برای خود <0>بیشتر بدانید</0>.",
+    "blocked_by_response": "مسدودسازی با CNAME  یا IP در پاسخ",
+    "try_again": "امتحان دوباره"
 }

client/src/__locales/fr.json

@@ -15,8 +15,10 @@
     "dhcp_not_found": "Aucun serveur DHCP actif trouvé sur le réseau. Vous pouvez activer le serveur DHCP intégré.",
     "dhcp_found": "Il y a plusieurs serveurs DHCP actifs sur le réseau. Ce n'est pas prudent d'activer le serveur DHCP intégré en ce moment.",
     "dhcp_leases": "Locations des serveurs DHCP",
+    "dhcp_static_leases": "Baux statiques DHCP",
     "dhcp_leases_not_found": "Aucune location des serveurs DHCP trouvée",
     "form_error_required": "Champ requis",
+    "form_error_mac_format": "Format MAC invalide",
     "form_error_positive": "Doit être supérieur à 0",
     "dhcp_form_gateway_input": "IP de la passerelle",
     "dhcp_form_subnet_input": "Masque de sous-réseau",
@@ -30,33 +32,54 @@
     "dhcp_ip_addresses": "Adresses IP",
     "dhcp_table_hostname": "Nom de machine",
     "dhcp_table_expires": "Expire le",
+    "dhcp_warning": "Si vous souhaitez tout de même activer le serveur DHCP, assurez-vous qu'il n'y a d'autre serveur DHCP actif sur votre réseau. Sinon, cela peut faire dysfonctionner Internet sur tous les appareils connectés au réseau !",
+    "dhcp_error": "Nous ne pouvons pas déterminer s'il y a un autre serveur DHCP sur le réseau.",
+    "dhcp_static_ip_error": "Pour utiliser un serveur DHCP, une adresse IP statique est requise. Nous ne sommes pas parvenus à déterminer si cette interface réseau est configurée via une adresse IP statique. Veuillez définir une adresse IP manuellement.",
+    "dhcp_dynamic_ip_found": "Votre système utilise une configuration d'adresses IP dynamiques pour l'interface <0>{{interfaceName}}</0>. Pour utiliser un serveur DHCP, une adresse IP statique est requise. Votre adresse IP actuelle est <0>{{ipAddress}}</0>. Nous allons automatiquement définir une adresse IP comme statique si vous appuyez sur le bouton Activer DHCP.",
+    "dhcp_lease_added": "\"{{key}}\" de bail statique ajoutée avec succès",
+    "dhcp_lease_deleted": "\"{{key}}\" de bail statique supprimée avec succès",
+    "dhcp_new_static_lease": "Nouveau bail statique",
+    "dhcp_static_leases_not_found": "Aucun bail statique DHCP trouvé",
+    "dhcp_add_static_lease": "Ajoutez un bail statique",
+    "delete_confirm": "Voulez-vous vraiment supprimer \"{{key}}\" ?",
+    "form_enter_hostname": "Saisissez un nom d'hôte",
+    "error_details": "Détails des erreurs",
     "back": "Retour",
     "dashboard": "Tableau de bord",
     "settings": "Paramètres",
     "filters": "Filtres",
     "query_log": "Journal des requêtes",
+    "faq": "FAQ",
     "version": "version",
     "address": "addresse",
     "on": "Activé",
     "off": "Éteint",
+    "copyright": "Copyright",
     "homepage": "Page d'accueil",
     "report_an_issue": "Signaler un problème",
+    "privacy_policy": "Politique de confidentialité",
     "enable_protection": "Activer la protection",
     "enabled_protection": "Protection activée",
     "disable_protection": "Désactiver la protection",
     "disabled_protection": "Protection désactivée",
     "refresh_statics": "Renouveler les statistiques",
     "dns_query": "Requêtes DNS",
+    "blocked_by": "<0>Bloqué par Filtres</0>",
     "stats_malware_phishing": "Tentative de malware/hammeçonnage bloquée",
     "stats_adult": "Sites à contenu adulte bloqués",
     "stats_query_domain": "Domaines les plus recherchés",
     "for_last_24_hours": "pendant les dernières 24 heures",
+    "for_last_days": "pour les {{count}} derniers jours",
+    "for_last_days_plural": "pour les {{count}} derniers jours",
     "no_domains_found": "Pas de domaines trouvés",
     "requests_count": "Nombre de requêtes",
     "top_blocked_domains": "Les domaines les plus fréquemment bloqués",
     "top_clients": "Meilleurs clients",
     "no_clients_found": "Pas de clients trouvés",
     "general_statistics": "Statistiques générales",
+    "number_of_dns_query_days": "Le nombre de requêtes DNS traitées pour les {{count}} derniers jours",
+    "number_of_dns_query_days_plural": "Le nombre de requêtes DNS traitées ces {{count}} derniers jours",
+    "number_of_dns_query_24_hours": "Un nombre de requêtes DNS quieries traitées pendant les 24 heures dernières",
     "number_of_dns_query_blocked_24_hours": "Un nombre de requêtes DNS bloquées par les filtres  adblock et les listes de blocage des hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Un nombre de requêtes DNS bloquées par le module Sécurité de navigation d'AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Un nombre de sites à contenu adulte bloqués",
@@ -71,10 +94,16 @@
     "use_adguard_parental": "Utiliser le contrôle parental d'AdGuard",
     "use_adguard_parental_hint": "AdGuard Home va vérifier s'il y a du contenu pour adultes sur le domaine. Ce sera fait par aide du même API discret que celui utilisé par le service de Sécurité de navigation.",
     "enforce_safe_search": "Renforcer la recherche sécurisée",
+    "enforce_save_search_hint": "AdGuard Home peut renforcer la Recherche sécurisée dans les moteurs de recherche suivants : Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Pas de serveurs spécifiés",
     "general_settings": "Paramètres généraux",
+    "dns_settings": "Paramètres DNS",
+    "encryption_settings": "Paramètres de cryptage",
+    "dhcp_settings": "Paramètres DHCP",
     "upstream_dns": "Serveurs DNS upstream",
+    "upstream_dns_hint": "Si vous laissez ce champ vide, AdGuard Home va utiliser <a href='https://www.quad9.net/' target='_blank'>Quad9</a> comme upstream.",
     "test_upstream_btn": "Tester les upstreams",
+    "upstreams": "En amont",
     "apply_btn": "Appliquer",
     "disabled_filtering_toast": "Filtrage désactivé",
     "enabled_filtering_toast": "Filtrage activé",
@@ -89,6 +118,8 @@
     "filter_url_table_header": "URL du filtre",
     "rules_count_table_header": "Nombre des règles",
     "last_time_updated_table_header": "Dernière mise à jour",
+    "actions_table_header": "Actions",
+    "edit_table_action": "Modifier",
     "delete_table_action": "Supprimer",
     "filters_and_hosts": "Listes de blocage des filtres et hosts",
     "filters_and_hosts_hint": "AdGuard Home comprend les règles basiques de blocage ainsi que la syntaxe des fichiers hosts.",
@@ -109,6 +140,7 @@
     "example_comment": "! Voici comment ajouter une déscription",
     "example_comment_meaning": "commentaire",
     "example_comment_hash": "# Et comme ça aussi on peut laisser des commentaires",
+    "example_regex_meaning": "bloquer l'accés aux domaines correspondants à l'expression régulière spécifiée",
     "example_upstream_regular": "DNS classique (au-dessus de UDP)",
     "example_upstream_dot": "<a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-au-dessus-de-TLS</a> chiffré",
     "example_upstream_doh": "<a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-au-dessus-de-HTTPS</a> chiffré",
@@ -116,13 +148,15 @@
     "example_upstream_tcp": "DNS classique (au-dessus de TCP)",
     "all_filters_up_to_date_toast": "Tous les filtres sont mis à jour",
     "updated_upstream_dns_toast": "Les serveurs DNS upstream sont mis à jour",
-    "dns_test_ok_toast": "Les serveurs DNS spécifiés fonctionnent de manière correcte",
+    "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",
     "unblock_btn": "Débloquer",
     "block_btn": "Bloquer",
     "time_table_header": "Temps",
     "domain_name_table_header": "Nom de domaine",
+    "type_table_header": "Type",
     "response_table_header": "Réponse",
+    "client_table_header": "Client",
     "empty_response_status": "Vide",
     "show_all_filter_type": "Montrer tout",
     "show_filtered_type": "Montrer les sites filtrés",
@@ -131,16 +165,64 @@
     "previous_btn": "Précédent",
     "next_btn": "Suivant",
     "loading_table_status": "Chargement en cours ...",
+    "page_table_footer_text": "Page",
     "of_table_footer_text": "de",
     "rows_table_footer_text": "lignes",
     "updated_custom_filtering_toast": "Règles de filtrage d'utilisateur mises à jour",
     "rule_removed_from_custom_filtering_toast": "Règle retirée des règles d'utilisateur",
     "rule_added_to_custom_filtering_toast": "Règle ajoutée aux règles d'utilisateur",
+    "query_log_response_status": "Statut : {{value}}",
+    "query_log_filtered": "Filtré par {{filter}}",
+    "query_log_confirm_clear": "Êtes-vous sûr de vouloir effacer tout le journal des requêtes ?",
+    "query_log_cleared": "Le journal des requêtes a été effacé",
+    "query_log_clear": "Effacer journal des requêtes",
+    "query_log_retention": "Rétention du journal des requêtes",
+    "query_log_enable": "Activer le journal",
+    "query_log_configuration": "Configuration du journal",
+    "query_log_disabled": "Le journal des requêtes est désactivé et peut être configuré dans les <0>paramètres</0>",
+    "query_log_strict_search": "Utilisez les doubles guillemets pour une recherche stricte",
+    "query_log_retention_confirm": "Êtes-vous sûr de vouloir modifier la rétention des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
+    "dns_config": "Configuration du serveur DNS",
+    "blocking_mode": "Mode du blocage",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "IP nulle",
+    "custom_ip": "IP personnalisée",
+    "blocking_ipv4": "Blocage IPv4",
+    "blocking_ipv6": "Blocage IPv6",
+    "form_enter_rate_limit": "Entrez la limite de taux",
+    "rate_limit": "Limite de taux",
+    "edns_enable": "Activer le sous-réseau du client EDNS",
+    "edns_cs_desc": "Si activé, AdGuard Home enverra les sous-réseaux des clients aux serveurs DNS.",
+    "rate_limit_desc": "Le nombre de requêtes par seconde qu’un seul client est autorisé à faire (0 : illimité)",
+    "blocking_ipv4_desc": "Adresse IP à renvoyer pour une demande A bloquée",
+    "blocking_ipv6_desc": "Adresse IP à renvoyer pour une demande AAAA bloquée",
+    "blocking_mode_desc": "<0>NXDOMAIN – Répondre avec le code NXDOMAIN;</0> <0>IP nulle – Répondre avec une adresse IP de zéros (0.0.0.0 pour A; :: pour AAAA);</0> <0>IP personnalisée – Répondre avec une adresse IP définie manuellement.</0>",
+    "upstream_dns_client_desc": "Si vous laissez ce champ vide, AdGuard Home utilisera les serveurs configurés dans les <0>paramètres DNS</0>.",
+    "source_label": "Source",
     "found_in_known_domain_db": "Trouvé dans la base de données des domaines connus",
     "category_label": "Catégorie",
     "rule_label": "Règle",
     "filter_label": "Filtre",
     "unknown_filter": "Filtre inconnu {{filterId}}",
+    "install_welcome_title": "Bienvenue sur AdGuard Home !",
+    "install_welcome_desc": "AdGuard Home est un seveur DNS pour bloquer les pubs et traceurs sur tout un réseau. Son but est de vous donner le contrôle sur l'ensemble de votre réseau et tous vos appareils sans programme côté client supplémentaire.",
+    "install_settings_title": "Interface web administrateur",
+    "install_settings_listen": "Interface d'écoute",
+    "install_settings_port": "Port",
+    "install_settings_interface_link": "Votre interface web administrateur AdGuard Home sera disponible sur les adresses suivantes :",
+    "form_error_port": "Saisissez un port valide",
+    "install_settings_dns": "Serveur DNS",
+    "install_settings_dns_desc": "Vous devrez configurer vos appareils et votre routeur pour utiliser le serveur DNS sur les adresses suivantes :",
+    "install_settings_all_interfaces": "Toutes les interfaces",
+    "install_auth_title": "Authentification",
+    "install_auth_desc": "Il est fortement recommandé de configurer un mot de passe pour accéder à l'interface web administrateur AdGuard Home. Même si elle est disponible que dans votre réseau local, cela reste important de se protéger contre des accès non désirés.",
+    "install_auth_username": "Nom d'utilisateur",
+    "install_auth_password": "Mot de passe",
+    "install_auth_confirm": "Confirmer le mot de passe",
+    "install_auth_username_enter": "Saisir un nom d'utilisateur",
+    "install_auth_password_enter": "Saisir un mot de passe",
+    "install_step": "Étape",
+    "install_devices_title": "Configurer vos appareils",
     "install_devices_desc": "Pour commencer à utiliser AdGuard Home, vous devez configurer vos appareils.",
     "install_submit_title": "Félicitations !",
     "install_submit_desc": "La procédure d'installation est terminée et vous êtes prêt(e) pour commencer à utiliser AdGuard Home.",
@@ -155,5 +237,131 @@
     "install_devices_windows_list_3": "Sur la partie gauche de l'écran, recherchez Modifier les paramètres de la carte et cliquez dessus.",
     "install_devices_windows_list_4": "Sélectionnez votre connexion active, clic droit dessus et sélectionnez Propriétés.",
     "install_devices_windows_list_5": "Recherchez la version du protocole Internet 4 (TCP/IP) dans la liste, sélectionnez-la puis cliquez à nouveau sur Propriétés.",
-    "updates_version_equal": "AdGuard Home est à jour"
-}
+    "install_devices_windows_list_6": "Sélectionnez Utiliser l’adresse de serveur DNS suivante et saisissez votre adresse de seveur AdGuard Home.",
+    "install_devices_macos_list_1": "Cliquez sur l'icône Apple et allez dans les Préférences Système.",
+    "install_devices_macos_list_2": "Cliquez sur Réseau.",
+    "form_error_port_range": "Saisissez une valeur de port entre 80 et 65535",
+    "form_error_port_unsafe": "C'est un port non fiable",
+    "form_error_equal": "Ne devrait pas être égal",
+    "form_error_password": "Mots de passe différents",
+    "reset_settings": "Réinitialiser les paramètres",
+    "update_announcement": "AdGuard Home {{version}} est disponible ! <0>Cliquez ici</0> pour plus d'informations.",
+    "setup_guide": "Guide d'installation",
+    "dns_addresses": "Adresses DNS",
+    "dns_start": "Démarrage du serveur DNS",
+    "dns_status_error": "Erreur lors de la récupération du statut du serveur DNS",
+    "down": "Descendant",
+    "fix": "Corriger",
+    "dns_providers": "Voici une <0>liste de fournisseurs DNS connus</0>.",
+    "update_now": "Mettre à jour maintenant",
+    "update_failed": "Échec de la mise à jour automatique. Veuillez <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>suivre ces étapes</a> pour mettre à jour manuellement.",
+    "processing_update": "Veuillez patienter, AdGuard Home est en cours de mise à jour",
+    "clients_title": "Clients",
+    "clients_desc": "Configurer les appareils connectés à AdGuard Home",
+    "settings_global": "Général",
+    "settings_custom": "Personnalisé",
+    "table_client": "Client",
+    "table_name": "Nom",
+    "save_btn": "Enregistrer",
+    "client_add": "Ajouter un client",
+    "client_new": "Nouveau client",
+    "client_edit": "Modifier le client",
+    "client_identifier": "Identifiant",
+    "ip_address": "Adresse IP",
+    "client_identifier_desc": "Les clients peuvent être identifiés par les adresses IP ou MAC. Veuillez noter que l'utilisation de l'adresse MAC comme identifiant est possible uniquement si AdGuard Home est aussi un <0>serveur DHCP</0>",
+    "form_enter_ip": "Saisissez l'IP",
+    "form_enter_mac": "Saisissez MAC",
+    "form_enter_id": "Entrer identifiant",
+    "form_add_id": "Ajouter identifiant",
+    "form_client_name": "Saisissez le nom du client",
+    "client_global_settings": "Utiliser les paramètres généraux",
+    "client_deleted": "Le client \"{{key}}\" a été supprimé avec succès",
+    "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}}\" ?",
+    "filter_confirm_delete": "Voulez-vous vraiment supprimer ce filtre ?",
+    "auto_clients_title": "Clients (exécution)",
+    "auto_clients_desc": "Les données des clients qu'utilisent AdGuard Home, mais non stockées dans la configuration",
+    "access_title": "Paramètres d'accès",
+    "access_desc": "Ici vous pouvez configurer les règles d'accès au serveur DNS AdGuard Home.",
+    "access_allowed_title": "Clients autorisés",
+    "access_allowed_desc": "Une liste d'adresses IP ou CIDR. Si configuré, AdGuard Home acceptera uniquement les requêtes provenant de ces adresses IP.",
+    "access_disallowed_title": "Clients non autorisés",
+    "access_disallowed_desc": "Une liste d'adresses IP ou CIDR. Si configuré, AdGuard Home bloquera les requêtes provenant de ces adresses IP.",
+    "access_blocked_title": "Domaines bloqués",
+    "access_blocked_desc": "Ne confondez pas ceci avec les filtres. AdGuard Home bloquera les requêtes DNS avec ces domaines dans la requête.",
+    "access_settings_saved": "Paramètres d'accès enregistrés avec succès",
+    "updates_checked": "Mises à jour vérifiées",
+    "updates_version_equal": "AdGuard Home est à jour",
+    "check_updates_now": "Vérifier les mises à jour",
+    "dns_privacy": "Confidentialité DNS",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS :</0> Utiliser le string <1>{{address}}</1>.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS :</0> Utiliser le string <1>{{address}}</1>.",
+    "setup_dns_privacy_3": "<0>Veuillez noter que les protocoles DNS chiffrés sont supportés que sur Android 9. Donc vous devez installer un logiciel complémentaire pour les autres systèmes opérationnels.</0><0>Voici une liste de logiciels que vous pouvez utiliser.</0>",
+    "setup_dns_privacy_android_1": "Android 9 supporte nativement le DNS-over-TLS. Pour le configurer, allez dans Paramètres → Réseau et Internet → Avancés → DNS privé et saisissez votre nom de domaine ici.",
+    "setup_dns_privacy_android_2": "<0>AdGuard pour Android</0> supporte le <1>DNS-over-HTTPS</1> et le <1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_android_3": "<0>Intra</0> ajoute le support <1>DNS-over-HTTPS</1> sur Android.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> supporte le <1>DNS-over-HTTPS</1> mais pour le configurer pour utiliser votre propre serveur, vous devrez générer un <2>DNS Stamp</2> pour lui.",
+    "setup_dns_privacy_ios_2": "<0>AdGuard pour iOS</0> supporte les configurations <1>DNS-over-HTTPS</1> et <1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_other_title": "Autres implémentations",
+    "setup_dns_privacy_other_1": "AdGuard Home lui-même peut être un client DNS sécurisé sur n'importe quelle plateforme.",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> supporte tous les protocoles DNS sécurisés connus.",
+    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> supporte le <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supporte le <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_5": "Vous trouverez plus d'implémentations <0>ici</0> et <1>ici</1>.",
+    "setup_dns_notice": "Pour utiliser le <1>DNS-over-HTTPS</1> ou le <1>DNS-over-TLS</1>, vous devez <0>configurer le Cryptage</0> dans les paramètres de AdGuard Home.",
+    "rewrite_added": "Réécriture DNS pour \"{{key}}\" ajoutée",
+    "rewrite_deleted": "Réécriture DNS pour \"{{key}}\" supprimée",
+    "rewrite_add": "Ajouter une réécriture DNS",
+    "rewrite_not_found": "Aucune réécriture DNS trouvée",
+    "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",
+    "dns_rewrites": "Réécritures DNS",
+    "form_domain": "Saisissez un domaine ou caracrtère générique",
+    "form_answer": "Saisissez une adresse IP ou un nom de domaine",
+    "form_error_domain_format": "Format de domaine invalide",
+    "form_error_answer_format": "Format de réponse invalide",
+    "configure": "Configurer",
+    "main_settings": "Paramètres principaux",
+    "block_services": "Bloquer des services spécifiques",
+    "blocked_services": "Services bloqués",
+    "blocked_services_desc": "Permet de bloquer les sites et services populaires rapidement.",
+    "blocked_services_saved": "Services bloqués enregistrés",
+    "encryption_certificate_path": "Emplacement du certificat",
+    "encryption_private_key_path": "Emplacement de la clef privée",
+    "encryption_certificates_source_path": "Définir un emplacement du fichier des certificats",
+    "encryption_certificates_source_content": "Coller les contenus des certificats",
+    "encryption_key_source_path": "Définir un fichier pour la clef privée",
+    "encryption_key_source_content": "Coller les contenus de la clef privée",
+    "interval_days_plural": "{{count}} jours",
+    "statistics_configuration": "Configuration des statistiques",
+    "statistics_retention": "Maintien des statistiques",
+    "statistics_retention_desc": "Si vous baissez la valeur de l'intervalle, des données seront perdues",
+    "statistics_clear": " Effacer les statistiques",
+    "statistics_clear_confirm": "Voulez-vous vraiment effacer les statistiques ?",
+    "statistics_retention_confirm": "Êtes-vous sûr de vouloir modifier le maintien des statistiques ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
+    "statistics_cleared": "Statistiques effacées",
+    "interval_hours": "{{count}} heure",
+    "interval_hours_plural": "{{count}} heures",
+    "filters_configuration": "Configuration des filtres",
+    "filters_enable": "Activer les filtres",
+    "disabled": "Désactivé",
+    "username_label": "Nom d'utilisateur",
+    "username_placeholder": "Saisir un nom d'utilisateur",
+    "password_label": "Mot de passe",
+    "password_placeholder": "Saisir un mot de passe",
+    "sign_in": "Connexion",
+    "sign_out": "Déconnexion",
+    "forgot_password": "Mot de passe oublié ?",
+    "forgot_password_desc": "Veuillez suivre <0>ces quelques étapes</0> pour créer un nouveau mot de passe pour votre compte.",
+    "location": "Localisation",
+    "orgname": "Nom de l'organisation",
+    "netname": "Nom du réseau",
+    "descr": "Description",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Apprenez-en plus</0> à propos de la création de vos propres listes de blocage d’hôtes.",
+    "blocked_by_response": "Bloqué par un CNAME ou une réponse IP",
+    "try_again": "Réessayer"
+}

client/src/__locales/hr.json

@@ -23,7 +23,9 @@
     "form_error_ip6_format": "Nevažeći IPv6 format",
     "form_error_ip_format": "Nevažeći format IP adrese",
     "form_error_mac_format": "Nevažeći MAC format",
+    "form_error_client_id_format": "Nevažeći format ID-a klijenta",
     "form_error_positive": "Mora biti veće od 0",
+    "form_error_negative": "Mora biti jednako ili veće od 0",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Subnet maskiranje",
     "dhcp_form_range_title": "Raspon IP adresa",
@@ -187,6 +189,22 @@
     "query_log_disabled": "Zapisnik upita je onemogućen i može se postaviti u <0>postavkama</0>",
     "query_log_strict_search": "Koristite dvostruke navodnike za strogo pretraživanje",
     "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje zapisnika upita? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
+    "dns_config": "DNS postavke poslužitelja",
+    "blocking_mode": "Način blokiranja",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Null IP",
+    "custom_ip": "Prilagođen IP",
+    "blocking_ipv4": "Blokiranje IPv4",
+    "blocking_ipv6": "Blokiranje IPv6",
+    "form_enter_rate_limit": "Unesite ograničenje",
+    "rate_limit": "Ograničenje",
+    "edns_enable": "Omogući EDNS Client Subnet",
+    "edns_cs_desc": "Ako je omogućeno, AdGuard Home će slati podmreže klijenata na DNS poslužitelje.",
+    "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu (0: neograničeno)",
+    "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve",
+    "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve",
+    "blocking_mode_desc": "<0>NXDOMAIN – Odgovor s NXDOMAIN kôdom;</0> <0>Null IP – Odgovor s nuliranom IP adresom (0.0.0.0 za A; :: za AAAA);</0> <0>Prilagođeni IP - Odgovor s ručno postavljenom IP adresom.</0>",
+    "upstream_dns_client_desc": "Ako ovo polje ostane prazno, AdGuard Home će upotrijebiti poslužitelje postavljene u <0>DNS postavkama</0>.",
     "source_label": "Izvor",
     "found_in_known_domain_db": "Pronađeno u bazi poznatih domena.",
     "category_label": "Kategorija",
@@ -354,7 +372,7 @@
     "rewrite_desc": "Omogućuje jednostavno postavljanje prilagođenog DNS odgovora za određenu domenu.",
     "rewrite_applied": "Primijenjena pravila prijepisa",
     "dns_rewrites": "DNS prijepisi",
-    "form_domain": "Unesite domenu",
+    "form_domain": "Unesite naziv domene ili zamjenski znak",
     "form_answer": "Unesite IP adresu ili naziv domene",
     "form_error_domain_format": "Nevažeći format domene",
     "form_error_answer_format": "Nevažeći format odgovora",
@@ -409,5 +427,9 @@
     "descr": "Opis",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Saznajte više</0> o stvaranju vlastitog hosts popisa neželjenih.",
-    "blocked_by_response": "Blokirano od strane CNAME-a ili IP-a u odgovoru"
+    "blocked_by_response": "Blokirano od strane CNAME-a ili IP-a u odgovoru",
+    "try_again": "Pokušajte ponovno",
+    "domain_desc": "Unesite naziv domene ili zamjenski znak koji želite prepisati.",
+    "example_rewrite_domain": "prepiši odgovore samo za ovaj naziv domene.",
+    "example_rewrite_wildcard": "prepiši odgovore za sve <0>example.org</0> poddomene."
 }

client/src/__locales/id.json

@@ -17,7 +17,9 @@
     "dhcp_leases": "DHCP leases",
     "dhcp_static_leases": "DHCP static leases",
     "dhcp_leases_not_found": "DHCP lease tidak ditemukan",
+    "dhcp_config_saved": "Pengaturan server DHCP tersimpan",
     "form_error_required": "Kolom yang harus diisi",
+    "form_error_ip_format": "Format IPv4 tidak valid",
     "form_error_mac_format": "Format MAC tidak valid",
     "form_error_positive": "Harus lebih dari 0",
     "dhcp_form_gateway_input": "IP gateway",
@@ -69,7 +71,7 @@
     "stats_adult": "Situs dewasa diblokir",
     "stats_query_domain": "Kueri domain teratas",
     "for_last_24_hours": "untuk 24 jam terakhir",
-    "for_last_days": "untuk {{value}} hari terakhir",
+    "for_last_days": "untuk {{count}} hari terakhir",
     "for_last_days_plural": "selama {{count}} hari terakhir",
     "no_domains_found": "Domain tidak ditemukan",
     "requests_count": "Jumlah permintaan",
@@ -77,7 +79,7 @@
     "top_clients": "Klien teratas",
     "no_clients_found": "Tidak ditemukan klien",
     "general_statistics": "Statistik umum",
-    "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{value}} hari terakhir",
+    "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{count}} hari terakhir",
     "number_of_dns_query_days_plural": "Jumlah kueri DNS yang diproses selama {{count}} hari terakhir",
     "number_of_dns_query_24_hours": "Jumlah kueri DNS diproses selama 24 jam terakhir",
     "number_of_dns_query_blocked_24_hours": "Julah DNS diblokir oleh penyaring adblock dan daftar blokir hosts",
@@ -94,12 +96,14 @@
     "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
     "use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
     "enforce_safe_search": "Paksa penelusuran aman",
+    "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, dan Yandex.",
     "no_servers_specified": "Sever tidak disebutkan",
     "general_settings": "Pengaturan umum",
     "dns_settings": "Pengaturan DNS",
     "encryption_settings": "Pengaturan enkripsi",
     "dhcp_settings": "Pengaturan DHCP",
     "upstream_dns": "Server DNS hulu",
+    "upstream_dns_hint": "Jika Anda mengosongkan kolom ini, AdGuard Home akan menggunakan  <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> sebagai hulu. Gunakan tls:// untuk server DNS over TLS.",
     "test_upstream_btn": "Uji hulu",
     "apply_btn": "Terapkan",
     "disabled_filtering_toast": "Penyaringan nonaktif",
@@ -137,6 +141,7 @@
     "example_comment": "! Komentar di sini",
     "example_comment_meaning": "hanya sebuah komentar",
     "example_comment_hash": "Juga sebuah komentar",
+    "example_regex_meaning": "blokir akses ke domain yang cocok dengan <0>ekspresi reguler yang ditentukan</0>",
     "example_upstream_regular": "DNS reguler (melalui UDP)",
     "example_upstream_dot": "terenkripsi <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
     "example_upstream_doh": "terenkripsi <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
@@ -169,6 +174,15 @@
     "rule_added_to_custom_filtering_toast": "Aturan ditambah ke aturan penyaringan khusus",
     "query_log_response_status": "Status: {{value}}",
     "query_log_filtered": "Difilter oleh {{filter}}",
+    "query_log_confirm_clear": "Apakah Anda yakin ingin menghapus seluruh kueri log?",
+    "query_log_cleared": "Kueri log telah berhasil dihapus",
+    "query_log_clear": "Hapus kueri log",
+    "query_log_retention": "Retensi kueri log",
+    "query_log_enable": "Aktifkan log",
+    "query_log_configuration": "Konfigurasi log",
+    "query_log_disabled": "Kueri log dinonaktifkan dan dapat dikonfigurasi di <0>pengaturan</0>",
+    "query_log_strict_search": "Gunakan tanda kutip ganda untuk pencarian ketat",
+    "query_log_retention_confirm": "Apakah Anda yakin ingin mengubah retensi kueri log? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
     "source_label": "Sumber",
     "found_in_known_domain_db": "Ditemukan di database domain dikenal",
     "category_label": "Kategori",
@@ -186,6 +200,7 @@
     "install_settings_dns_desc": "Anda perlu mengkonfigurasi perangkat atau router anda untuk menggunakan server DNS berikut ini",
     "install_settings_all_interfaces": "Semua antarmuka",
     "install_auth_title": "Otentikasi",
+    "install_auth_desc": "Sangat disarankan untuk mengkonfigurasi otentikasi kata sandi ke antarmuka web admin AdGuard Home Anda. Meskipun hanya dapat diakses di jaringan lokal Anda, tetap penting untuk melindunginya dari akses tak terbatas.",
     "install_auth_username": "Nama Pengguna",
     "install_auth_password": "Kata Sandi",
     "install_auth_confirm": "Konfirmasi kata sandi",
@@ -264,6 +279,7 @@
     "update_announcement": "AdGuard Home {{version}} sekarang tersedia! <0>Klik di sini</0> untuk info lebih lanjut.",
     "setup_guide": "Panduan Penyiapan",
     "dns_addresses": "Alamat DNS",
+    "dns_status_error": "Kesalahan dalam mendapatkan status server DNS",
     "down": "Padam",
     "fix": "Perbaiki",
     "dns_providers": "Berikut adalah <0>daftar penyedia DNS yang dikenal</0> untuk dipilih.",
@@ -282,6 +298,7 @@
     "client_edit": "Ubah Klien",
     "client_identifier": "Identifikasi",
     "ip_address": "Alamat IP",
+    "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
     "form_enter_ip": "Masukkan IP",
     "form_enter_mac": "Masukkan MAC",
     "form_client_name": "Masukkan nama klien",
@@ -330,7 +347,6 @@
     "rewrite_desc": "Memungkinkan untuk dengan mudah mengkonfigurasi respons DNS kustom untuk nama domain tertentu.",
     "rewrite_applied": "Aturan Rewrite yang diterapkan",
     "dns_rewrites": "DNS rewrite",
-    "form_domain": "Masukkan nama domain",
     "form_answer": "Masaukan alamat IP atau nama domain",
     "form_error_domain_format": "Nama domain tidak valid",
     "form_error_answer_format": "Format jawaban tidak valid",
@@ -353,14 +369,36 @@
     "stats_params": "Konfigurasi statistik",
     "config_successfully_saved": "Konfigurasi berhasil disimpan",
     "interval_24_hour": "24 jam",
-    "interval_days": "{{value}} hari",
+    "interval_days": "{{count}} hari",
     "interval_days_plural": "{{count}} hari",
     "domain": "Domain",
     "answer": "Jawab",
     "filter_added_successfully": "Filter telah berhasil ditambahkan",
+    "statistics_configuration": "Konfigurasi statistik",
     "statistics_retention": "Statistik disimpan",
     "statistics_retention_desc": "Jika Anda menurunkan nilai interval, beberapa data akan hilang",
     "statistics_clear": " Hapus statistik",
     "statistics_clear_confirm": "Apakah Anda yakin ingin menghapus statistik?",
-    "statistics_cleared": "Statistik berhasil dihapus"
+    "statistics_retention_confirm": "Apakah Anda yakin ingin mengubah retensi statistik? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
+    "statistics_cleared": "Statistik berhasil dihapus",
+    "interval_hours": "{{count}} jam",
+    "interval_hours_plural": "{{count}} jam",
+    "filters_configuration": "Konfigurasi filter",
+    "filters_enable": "Aktifkan filter",
+    "filters_interval": "Interval pembaruan filter",
+    "disabled": "Tidak aktif",
+    "username_label": "Nama pengguna",
+    "username_placeholder": "Masukkan nama pengguna",
+    "password_label": "Kata sandi",
+    "password_placeholder": "Masukkan kata sandi",
+    "sign_in": "Masuk",
+    "sign_out": "Keluar",
+    "forgot_password": "Lupa kata sandi?",
+    "forgot_password_desc": "Ikuti <0>langkah-langkah ini</0> untuk membuat kata sandi baru untuk akun pengguna Anda.",
+    "location": "Lokasi",
+    "orgname": "Nama organisasi",
+    "netname": "Nama jaringan",
+    "descr": "Deskripsi",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Pelajari lebih lanjut</0> tentang membuat daftar hitam host Anda sendiri."
 }

client/src/__locales/it.json

@@ -69,7 +69,7 @@
     "stats_adult": "Siti per adulti bloccati",
     "stats_query_domain": "Domini maggiormente richiesti",
     "for_last_24_hours": "nelle ultime 24 ore",
-    "for_last_days": "per gli ultimi {{value}} giorni",
+    "for_last_days": "per gli ultimi {{count}} giorni",
     "for_last_days_plural": "per gli ultimi {{count}} giorni",
     "no_domains_found": "Nessun dominio trovato",
     "requests_count": "Numero richieste",
@@ -341,7 +341,6 @@
     "rewrite_desc": "Consente di configurare facilmente la risposta DNS personalizzata per un nome di dominio specifico.",
     "rewrite_applied": "Regola di riscrittura applicata",
     "dns_rewrites": "Riscrittura DNS",
-    "form_domain": "Inserisci il dominio",
     "form_answer": "Inserisci l'indirizzo IP o il nome del dominio",
     "form_error_domain_format": "Formato del dominio non valido",
     "form_error_answer_format": "Formato di risposta non valido",

client/src/__locales/ja.json

@@ -17,9 +17,15 @@
     "dhcp_leases": "DHCP割り当て",
     "dhcp_static_leases": "DHCP静的割り当て",
     "dhcp_leases_not_found": "DHCP割当はありません",
+    "dhcp_config_saved": "DHCP設定の保存に成功しました",
     "form_error_required": "必須項目",
+    "form_error_ip4_format": "IPv4フォーマットではありません",
+    "form_error_ip6_format": "IPv6フォーマットではありません",
+    "form_error_ip_format": "IPv4フォーマットではありません",
     "form_error_mac_format": "MACフォーマットではありません",
+    "form_error_client_id_format": "Client IDの形式が無効です",
     "form_error_positive": "0より大きい必要があります",
+    "form_error_negative": "0以上である必要があります",
     "dhcp_form_gateway_input": "ゲートウェイIP",
     "dhcp_form_subnet_input": "サブネットマスク",
     "dhcp_form_range_title": "IPアドレスの範囲",
@@ -41,6 +47,7 @@
     "dhcp_new_static_lease": "新規静的割り当て",
     "dhcp_static_leases_not_found": "DHCP静的割り当てはありません",
     "dhcp_add_static_lease": "静的割り当てを追加する",
+    "dhcp_reset": "DHCP設定をリセットして良いですか？",
     "delete_confirm": "\"{{key}}\" を削除してもよろしいですか？",
     "form_enter_hostname": "ホスト名を入力してください",
     "error_details": "エラー詳細",
@@ -64,16 +71,22 @@
     "disabled_protection": "保護を無効にしました",
     "refresh_statics": "統計データを最新にする",
     "dns_query": "DNSクエリ",
+    "blocked_by": "<0>フィルタにブロックされたDNSクエリ</0>",
     "stats_malware_phishing": "ブロックされたマルウェア／フィッシング",
     "stats_adult": "ブロックされたアダルトウェブサイト",
     "stats_query_domain": "最も問合せされたドメイン",
     "for_last_24_hours": "過去24時間以内",
+    "for_last_days": "過去{{count}}日間以内",
+    "for_last_days_plural": "過去{{count}}日間以内",
     "no_domains_found": "ドメイン情報はありません",
     "requests_count": "リクエスト数",
     "top_blocked_domains": "最もブロックされたドメイン",
     "top_clients": "トップクライアント",
     "no_clients_found": "クライアント情報はありません",
     "general_statistics": "全般的な統計",
+    "number_of_dns_query_days": "過去{{count}}日間に処理されたDNSクエリの数",
+    "number_of_dns_query_days_plural": "過去{{count}}日間に処理されたDNSクエリの数",
+    "number_of_dns_query_24_hours": "過去24時間に処理されたDNSクエリの数",
     "number_of_dns_query_blocked_24_hours": "広告ブロックフィルタとhostsブロックリストによってブロックされたDNSリクエストの数",
     "number_of_dns_query_blocked_24_hours_by_sec": "AdGuardブラウジングセキュリティモジュールによってブロックされたDNSリクエストの数",
     "number_of_dns_query_blocked_24_hours_adult": "ブロックされたアダルトウェブサイトの数",
@@ -88,13 +101,16 @@
     "use_adguard_parental": "AdGuardペアレンタルコントロール・ウェブサービスを使用する",
     "use_adguard_parental_hint": "AdGuard Homeは、ドメインにアダルトコンテンツが含まれているかどうかを確認します。 ブラウジングセキュリティ・ウェブサービスと同じプライバシーに優しいAPIを使用します。",
     "enforce_safe_search": "セーフサーチを強制する",
+    "enforce_save_search_hint": "AdGuard Homeは、Google、Youtube、Bing、DuckDuckGo、Yandexの検索エンジンでセーフサーチを強制できます。",
     "no_servers_specified": "サーバが指定されていません",
     "general_settings": "一般設定",
     "dns_settings": "DNS設定",
     "encryption_settings": "暗号化設定",
     "dhcp_settings": "DHCP設定",
     "upstream_dns": "上流DNSサーバ",
+    "upstream_dns_hint": "このフィールドを未入力のままにすると、AdGuard Homeは上流として<a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a>を使用します。DNS over TLSサーバには、｢tls://」プレフィックスを使用してください。",
     "test_upstream_btn": "上流サーバをテストする",
+    "upstreams": "上流",
     "apply_btn": "適用する",
     "disabled_filtering_toast": "フィルタリングを無効にしました",
     "enabled_filtering_toast": "フィルタリングを有効にしました",
@@ -131,6 +147,7 @@
     "example_comment": "! ここにはコメントが入ります",
     "example_comment_meaning": "ただのコメントです",
     "example_comment_hash": "# ここもコメントです",
+    "example_regex_meaning": "指定の正規表現に一致するドメインへのアクセスをブロックします",
     "example_upstream_regular": "通常のDNS（UDPでの問い合わせ）",
     "example_upstream_dot": "暗号化されている <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
     "example_upstream_doh": "暗号化されている <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
@@ -161,6 +178,33 @@
     "updated_custom_filtering_toast": "カスタム・フィルタリングルールを更新しました",
     "rule_removed_from_custom_filtering_toast": "ルールをカスタム・フィルタリングルールから除去しました",
     "rule_added_to_custom_filtering_toast": "ルールをカスタム・フィルタリングルールに追加しました",
+    "query_log_response_status": "ステータス: {{value}}",
+    "query_log_filtered": "{{filter}}によるフィルタ",
+    "query_log_confirm_clear": "クエリ・ログ全体を消去してもよろしいですか？",
+    "query_log_cleared": "クエリ・ログの消去に成功しました",
+    "query_log_clear": "クエリ・ログを消去する",
+    "query_log_retention": "クエリ・ログの保持",
+    "query_log_enable": "ログを有効にする",
+    "query_log_configuration": "ログ設定",
+    "query_log_disabled": "クエリ・ログは無効になっており、<0>設定</0>で構成できます",
+    "query_log_strict_search": "完全一致検索には二重引用符を使用します",
+    "query_log_retention_confirm": "クエリ・ログの保持を変更してもよろしいですか？ 期間を短くすると、一部のデータが失われます",
+    "dns_config": "DNSサーバ設定",
+    "blocking_mode": "ブロックモード",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Null IP",
+    "custom_ip": "カスタムIP",
+    "blocking_ipv4": "ブロック中のIPv4",
+    "blocking_ipv6": "ブロック中のIPv6",
+    "form_enter_rate_limit": "頻度制限を入力してください",
+    "rate_limit": "頻度制限",
+    "edns_enable": "EDNSクライアント・サブネットを有効にする",
+    "edns_cs_desc": "有効にすると、AdGuard HomeはクライアントのサブネットをDNSサーバへ送信します。",
+    "rate_limit_desc": "単一のクライアントに許可される1秒あたりのリクエスト数（0：無制限）",
+    "blocking_ipv4_desc": "ブロックされたAリクエストに対して応答されるIPアドレス",
+    "blocking_ipv6_desc": "ブロックされたAAAAリクエストに対して応答されるIPアドレス",
+    "blocking_mode_desc": "<0>NXDOMAIN - NXDOMAINコードで応答;</0> <0>Null IP - ゼロのIPアドレスで応答（Aの場合は0.0.0.0; AAAAの場合は::）;</0> <0>カスタムIP - 手動で設定されたIPアドレスで応答。</0>",
+    "upstream_dns_client_desc": "このフィールドを未入力のままにすると、AdGuard Homeは<0>DNS設定</0>で構成されたサーバを使用します。",
     "source_label": "ソース",
     "found_in_known_domain_db": "既知のドメインデータベースに見つかりました。",
     "category_label": "カテゴリ",
@@ -178,6 +222,7 @@
     "install_settings_dns_desc": "次のアドレスでDNSサーバを使用するようにあなたのデバイスまたはルータを設定する必要があります:",
     "install_settings_all_interfaces": "すべてのインターフェイス",
     "install_auth_title": "認証",
+    "install_auth_desc": "AdGuard Homeの管理ウェブインターフェースにパスワード認証を設定することを強くお勧めします。ローカルネットワークでのみアクセス可能であっても、制限のないアクセスから保護することは重要です。",
     "install_auth_username": "ユーザ名",
     "install_auth_password": "パスワード",
     "install_auth_confirm": "パスワード（確認用）",
@@ -256,6 +301,8 @@
     "update_announcement": "AdGuard Home {{version}}がリリースされました。詳しくは<0>こちらをクリック</0>してください。",
     "setup_guide": "セットアップガイド",
     "dns_addresses": "DNSアドレス",
+    "dns_start": "DNSサーバが起動処理中です",
+    "dns_status_error": "DNSサーバ・ステータスの取得エラー",
     "down": "ダウン",
     "fix": "改善",
     "dns_providers": "こちらは、選択可能な<0>既知のDNSプロバイダの一覧</0>です。",
@@ -274,8 +321,11 @@
     "client_edit": "クライアントの編集",
     "client_identifier": "識別子",
     "ip_address": "IPアドレス",
+    "client_identifier_desc": "クライアントはIPアドレスまたはMACアドレスで識別できます。AdGuard Homeが<0>DHCPサーバ</0>でもある場合にのみ、識別子としてMACを使用することが可能であることにご注意ください。",
     "form_enter_ip": "IPアドレスを入力してください",
     "form_enter_mac": "MACアドレスを入力してください",
+    "form_enter_id": "識別子を入力してください",
+    "form_add_id": "識別子を追加する",
     "form_client_name": "クライアント名を入力してください",
     "client_global_settings": "グローバル設定を使用する",
     "client_deleted": "クライアント \"{{key}}\" の削除に成功しました",
@@ -322,7 +372,7 @@
     "rewrite_desc": "特定のドメイン名に対するDNS応答を簡単にカスタマイズすることを可能にします。",
     "rewrite_applied": "書き換えルールを適用済み",
     "dns_rewrites": "DNS書き換え",
-    "form_domain": "ドメイン名を入力",
+    "form_domain": "ドメイン名を入力してください",
     "form_answer": "IPアドレスかドメイン名を入力",
     "form_error_domain_format": "ドメイン名のフォーマットが間違っています",
     "form_error_answer_format": "応答フォーマットが間違っています",
@@ -335,5 +385,51 @@
     "blocked_services_global": "ブロックするサービスに対しグローバル設定を使用する",
     "blocked_service": "ブロックするサービス",
     "block_all": "すべてブロック",
-    "unblock_all": "すべてのブロックを解除"
+    "unblock_all": "すべてのブロックを解除",
+    "encryption_certificate_path": "証明書のパスを入力してください",
+    "encryption_private_key_path": "秘密鍵のパスを入力してください",
+    "encryption_certificates_source_path": "証明書のパスを設定する",
+    "encryption_certificates_source_content": "証明書の内容をペーストする",
+    "encryption_key_source_path": "秘密鍵のパスを設定する",
+    "encryption_key_source_content": "秘密鍵の内容をペーストする",
+    "stats_params": "統計設定",
+    "config_successfully_saved": "設定の保存に成功しました",
+    "interval_24_hour": "24時間",
+    "interval_days": "{{count}}日",
+    "interval_days_plural": "{{count}}日",
+    "domain": "ドメイン",
+    "answer": "応答",
+    "filter_added_successfully": "フィルタの追加に成功しました",
+    "statistics_configuration": "統計設定",
+    "statistics_retention": "統計保持",
+    "statistics_retention_desc": "期間を短くすると、一部のデータが失われます",
+    "statistics_clear": "統計を消去する",
+    "statistics_clear_confirm": "統計を消去してもよろしいですか？",
+    "statistics_retention_confirm": "統計の保持を変更してもよろしいですか？ 期間を短くすると、一部のデータが失われます",
+    "statistics_cleared": "統計の消去に成功しました",
+    "interval_hours": "{{count}}時間",
+    "interval_hours_plural": "{{count}}時間",
+    "filters_configuration": "フィルタ設定",
+    "filters_enable": "フィルタを有効にする",
+    "filters_interval": "フィルタの更新間隔",
+    "disabled": "無効",
+    "username_label": "ユーザ名",
+    "username_placeholder": "ユーザ名を入力してください",
+    "password_label": "パスワード",
+    "password_placeholder": "パスワードを入力して下さい",
+    "sign_in": "サインイン",
+    "sign_out": "サインアウト",
+    "forgot_password": "パスワードをお忘れですか？",
+    "forgot_password_desc": "<0>こちらの手順</0>に従って、新しいパスワードを作成してください。",
+    "location": "ロケーション",
+    "orgname": "組織名",
+    "netname": "ネットワーク名",
+    "descr": "説明",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "独自のブラックリストの作成に関して<0>詳しく学習します</0>。",
+    "blocked_by_response": "応答されたCNAMEかIPアドレスによるブロック",
+    "try_again": "再試行する",
+    "domain_desc": "DNSリライトしたいドメイン名やワイルドカードを入力してください。",
+    "example_rewrite_domain": "このドメイン名のみへのレスポンスをリライトする",
+    "example_rewrite_wildcard": "<0>example.org</0>のすべてのサブドメインへのレスポンスをリライトする"
 }

client/src/__locales/ko.json

@@ -17,8 +17,13 @@
     "dhcp_leases": "DHCP 임대",
     "dhcp_static_leases": "DHCP 고정 임대",
     "dhcp_leases_not_found": "DHCP 임대를 찾을 수 없음",
+    "dhcp_config_saved": "DHCP 서버 설정 저장됨",
     "form_error_required": "필수 필드",
+    "form_error_ip4_format": "잘못된 IPv4 형식",
+    "form_error_ip6_format": "잘못된 IPv6 형식",
+    "form_error_ip_format": "잘못된 IP 형식",
     "form_error_mac_format": "잘못된 MAC 형식",
+    "form_error_client_id_format": "잘못된 클라이언트 ID 형식",
     "form_error_positive": "0보다 커야 합니다",
     "dhcp_form_gateway_input": "게이트웨이 IP",
     "dhcp_form_subnet_input": "서브넷 마스크",
@@ -41,6 +46,7 @@
     "dhcp_new_static_lease": "새 고정 임대",
     "dhcp_static_leases_not_found": "DHCP 고정 임대를 찾을 수 없음",
     "dhcp_add_static_lease": "고정 임대 추가",
+    "dhcp_reset": "정말로 DHCP 설정을 초기화할까요?",
     "delete_confirm": "\"{{key}}\"을 삭제하시겠습니까?",
     "form_enter_hostname": "호스트 이름을 입력해주세요",
     "error_details": "오류 상세 정보",
@@ -69,7 +75,7 @@
     "stats_adult": "차단된 성인 웹사이트",
     "stats_query_domain": "쿼리 도메인",
     "for_last_24_hours": "지난 24시간 동안",
-    "for_last_days": "마지막 {{value}} 일",
+    "for_last_days": "마지막 {{count}} 일",
     "for_last_days_plural": "마지막 {{count}} 일의 기록",
     "no_domains_found": "도메인이 없습니다",
     "requests_count": "요청 수",
@@ -77,7 +83,7 @@
     "top_clients": "클라이언트",
     "no_clients_found": "클라이언트가 없습니다",
     "general_statistics": "일반 통계",
-    "number_of_dns_query_days": "최근 {{value}} 일 동안 처리된 DNS 쿼리의 수",
+    "number_of_dns_query_days": "최근 {{count}} 일 동안 처리된 DNS 쿼리의 수",
     "number_of_dns_query_days_plural": "최근 {{count}} 일 동안 처리된 DNS 쿼리 수",
     "number_of_dns_query_24_hours": "최근 24시간 동안 처리된 DNS 쿼리의 수",
     "number_of_dns_query_blocked_24_hours": "애드블록 필터 및 호스트 차단 목록에 의해 차단된 DNS 요청수",
@@ -94,13 +100,16 @@
     "use_adguard_parental": "AdGuard 자녀 보호 웹 서비스 사용",
     "use_adguard_parental_hint": "AdGuard Home은 도메인에 성인 자료가 포함되어 있는지 확인합니다. 브라우징 보안 웹 서비스와 동일한 개인정보 보호 API를 사용함.",
     "enforce_safe_search": "세이프서치 강제",
+    "enforce_save_search_hint": "AdGuard Home은 다음과 같은 검색엔진(구글, 유투브, 빙, 덕덕고, 얀덱스)에서 안전검색이 가능합니다.",
     "no_servers_specified": "지정된 서버 없음",
     "general_settings": "일반 설정",
     "dns_settings": "DNS 설정",
     "encryption_settings": "암호화 설정",
     "dhcp_settings": "DHCP 설정",
     "upstream_dns": "업스트림 DNS 서버",
+    "upstream_dns_hint": "이 항목을 비워 두면 AdGuard Home에서 <a href='https://1.1.1.1/' target='_blank'> Cloudflare DNS </a>를 업스트림으로 사용합니다.",
     "test_upstream_btn": "업스트림 테스트",
+    "upstreams": "업스트림",
     "apply_btn": "적용",
     "disabled_filtering_toast": "필터링 비활성화됨",
     "enabled_filtering_toast": "필터링 활성화됨",
@@ -275,6 +284,8 @@
     "update_announcement": "AdGuard Home {{version}} 사용 가능합니다! <0>이곳</0>을 클릭하여 더 많은 정보를 확인하세요.",
     "setup_guide": "설치 안내",
     "dns_addresses": "DNS 주소",
+    "dns_start": "DNS 서버를 시작하고 있습니다",
+    "dns_status_error": "DNS 서버 상태를 가져오는 도중 오류가 발생했습니다",
     "down": "다운로드",
     "fix": "수정",
     "dns_providers": "여기에 선택가능한 DNS 목록 </0>이 있습니다.",
@@ -293,8 +304,11 @@
     "client_edit": "클라이언트 수정",
     "client_identifier": "식별자",
     "ip_address": "IP 주소",
+    "client_identifier_desc": "사용자는 IP 주소 또는 MAC 주소로 식별할 수 있지만 AdGuard Home이 <0>DHCP 서버인 </0> 경우에만 사용자는 MAC 주소로 식별할 수 있습니다.",
     "form_enter_ip": "IP 입력",
     "form_enter_mac": "MAC 입력",
+    "form_enter_id": "식별자 입력",
+    "form_add_id": "식별자 추가",
     "form_client_name": "클라이언트 이름 입력",
     "client_global_settings": "글로벌 설정 사용",
     "client_deleted": "클라이언트 \"{{key}}\"가 정상적으로 삭제되었습니다",
@@ -341,7 +355,7 @@
     "rewrite_desc": "특정 도메인 이름에 대한 사용자 지정 DNS 응답을 쉽게 구성할 수 있습니다.",
     "rewrite_applied": "적용된 변경 규칙",
     "dns_rewrites": "DNS 변경",
-    "form_domain": "도메인을 입력하세요",
+    "form_domain": "도메인 이름 또는 와일드카드를 입력합니다",
     "form_answer": "IP 주소 또는 도메인 이름을 입력하세요",
     "form_error_domain_format": "도메인 형식이 잘못되었습니다",
     "form_error_answer_format": "답변 형식이 잘못되었습니다. ",
@@ -364,7 +378,7 @@
     "stats_params": "통계 구성",
     "config_successfully_saved": "설정이 성공적으로 저장되었습니다.",
     "interval_24_hour": "24시간",
-    "interval_days": "{{value}} 일",
+    "interval_days": "{{count}} 일",
     "interval_days_plural": "{{count}} 일",
     "domain": "도메인",
     "answer": "응답",
@@ -395,5 +409,10 @@
     "netname": "네트워크 이름",
     "descr": "설명",
     "whois": "후이즈",
-    "filtering_rules_learn_more": "차단 리스트를 직접 호스트하는 법을 <0>알아보세요</0>."
+    "filtering_rules_learn_more": "차단 리스트를 직접 호스트하는 법을 <0>알아보세요</0>.",
+    "blocked_by_response": "응답 중 차단된 CNAME 또는 IP",
+    "try_again": "다시 시도해주세요",
+    "domain_desc": "다시 작성할 도메인 이름 또는 와일드카드를 입력합니다.",
+    "example_rewrite_domain": "이 도메인 이름에 대한 응답을 변경합니다.",
+    "example_rewrite_wildcard": "모든 서브 도메인에 대한 <0>example.org</0> 응답을 변경합니다"
 }

client/src/__locales/nl.json

@@ -15,10 +15,13 @@
     "dhcp_not_found": "Geen actieve DHCP servers gevonden op het netwerk. Het is VEILIG om de ingebouwde DHCP server in te schakelen",
     "dhcp_found": "Actieve DHCP server(s) gevonden op het netwerk. het is NIET veilig om de ingebouwde DHCP server in te schakelen.",
     "dhcp_leases": "DHCP lease overzicht",
+    "dhcp_static_leases": "DHCP statische lease",
     "dhcp_leases_not_found": "Geen DHCP lease gevonden",
+    "dhcp_config_saved": "DHCP server configuratie opgeslagen",
     "form_error_required": "Vereist veld",
     "form_error_ip4_format": "Ongeldig IPv4 formaat",
     "form_error_ip6_format": "Ongeldig IPv6 formaat",
+    "form_error_ip_format": "Ongeldig IPv4 formaat",
     "form_error_mac_format": "Ongeldig MAC formaat.",
     "form_error_positive": "Moet groter zijn dan 0",
     "dhcp_form_gateway_input": "Gateway IP",
@@ -34,6 +37,11 @@
     "dhcp_table_hostname": "Host naam",
     "dhcp_table_expires": "Verloopt op",
     "dhcp_warning": "Indien je de ingebouwde DHCP server wilt inschakelen, let dan op dat er geen andere actieve DHCP server aanwezig is. Dit kan de internet verbinding instabiel maken!.",
+    "dhcp_error": "We kunnen niet bepalen of er een andere DHCP server in het netwerk is.",
+    "dhcp_static_ip_error": "Om de DHCP server te gebruiken, moet een statisch IP-adres worden ingesteld. We hebben niet kunnen vaststellen of de netwerkinterface is geconfigureerd met een statisch IP-adres. Stel handmatig een statisch IP-adres in.",
+    "dhcp_dynamic_ip_found": "Om de DHCP server te gebruiken voor interface <0>{{interfaceName}}</0>, moet er een statisch IP-adres worden ingesteld. Uw huidige IP-adres is <0>{{ipAddress}}</0>. We stellen automatische dit IP-adres in, als statisch IP-adres, wanneer u op de knop DHCP inschakelen drukt.",
+    "dhcp_lease_added": "Statische uitgifte \"{{key}}\" met succes toegevoegd",
+    "dhcp_lease_deleted": "Statische uitgifte \"{{key}}\" met succes verwijderd",
     "dhcp_new_static_lease": "Voeg static lease toe",
     "dhcp_static_leases_not_found": "Geen DHCP static lease gevonden",
     "dhcp_add_static_lease": "Voeg statische lease toe",
@@ -61,10 +69,12 @@
     "disabled_protection": "Bescherming uitgeschakeld",
     "refresh_statics": "Ververs statistieken",
     "dns_query": "DNS-queries",
+    "blocked_by": "<0>Geblokkeerd door Filters</0>",
     "stats_malware_phishing": "Geblokkeerde malware/phishing",
     "stats_adult": "Geblokkeerde 18+ websites",
     "stats_query_domain": "Meest bezochte domeinen",
     "for_last_24_hours": "van de laatste 24-uur",
+    "for_last_days": "sinds de laatste {{count}} dagen",
     "for_last_days_plural": "sinds de laatste {{count}} dagen",
     "no_domains_found": "Geen domeinen gevonden",
     "requests_count": "Verzoek teller",
@@ -72,6 +82,7 @@
     "top_clients": "Top gebruikers",
     "no_clients_found": "Geen gebruikers gevonden",
     "general_statistics": "Generieke statistieken",
+    "number_of_dns_query_days": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dagen",
     "number_of_dns_query_days_plural": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dagen",
     "number_of_dns_query_24_hours": "Aantal verwerkte aanvragen van de laatste 24 uur",
     "number_of_dns_query_blocked_24_hours": "Aantal geblokkeerde DNS aanvragen door advertentie blokkering en hosts blokkeerlijsten",
@@ -88,12 +99,14 @@
     "use_adguard_parental": "Gebruik AdGuard Ouderlijk toezicht web service",
     "use_adguard_parental_hint": "AdGuard Home controleert of het domein 18+ content bevat. Dit gebeurt dmv dezelfde privacy vriendelijke API als de Browsing Security web service.",
     "enforce_safe_search": "Forceer Veilig Zoeken",
+    "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en Yandex.",
     "no_servers_specified": "Geen servers gespecificeerd",
     "general_settings": "Generieke instellingen",
     "dns_settings": "DNS Instellingen",
     "encryption_settings": "Encryptie Instellingen",
     "dhcp_settings": "DHCP Instellingen",
     "upstream_dns": "Upstream DNS servers",
+    "upstream_dns_hint": "Indien je dit veld leeg laat, zal AdGuard Home <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> gebruiken als upstream.",
     "test_upstream_btn": "Test upstream",
     "upstreams": "Upstreams",
     "apply_btn": "Toepassen",
@@ -132,6 +145,7 @@
     "example_comment": "! Hier komt een opmerking",
     "example_comment_meaning": "zomaar een opmerking",
     "example_comment_hash": "# Nog een opmerking",
+    "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
     "example_upstream_regular": "standaard DNS (over UDP)",
     "example_upstream_dot": "versleutelde<a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
     "example_upstream_doh": "versleutelde<a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
@@ -164,6 +178,16 @@
     "rule_added_to_custom_filtering_toast": "Regel toegevoegd aan de aangepaste filterregels",
     "query_log_response_status": "Status: {{value}}",
     "query_log_filtered": "Gefilterd door {{filter}}",
+    "query_log_confirm_clear": "Weet u zeker dat u het hele query logboek wilt legen?",
+    "query_log_cleared": "Het query logboek is succesvol geleegd",
+    "query_log_clear": "Leeg query logs",
+    "query_log_retention": "Query logs bewaartermijn",
+    "query_log_enable": "Log bestanden inschakelen",
+    "query_log_configuration": "Logbestanden instellingen",
+    "query_log_disabled": "Het query logboek is uitgeschakeld en kan worden geconfigureerd in de <0>instellingen</0>",
+    "query_log_strict_search": "Gebruik dubbele aanhalingstekens voor strikt zoeken",
+    "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
+    "custom_ip": "Aangepast IP",
     "source_label": "Bron",
     "found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
     "category_label": "Categorie",
@@ -181,6 +205,7 @@
     "install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
     "install_settings_all_interfaces": "Alle interfaces",
     "install_auth_title": "Authenticatie",
+    "install_auth_desc": "Het wordt ten zeerste aanbevolen om wachtwoordverificatie te configureren voor de AdGuard Home admin webinterface. Zelfs als het alleen toegankelijk is in uw lokale netwerk, is het nog steeds belangrijk om het te beschermen tegen onbeperkte toegang.",
     "install_auth_username": "Gebruikersnaam",
     "install_auth_password": "Wachtwoord",
     "install_auth_confirm": "Bevestig wachtwoord",
@@ -279,6 +304,7 @@
     "client_edit": "Wijzig gebruiker",
     "client_identifier": "Identificeer via",
     "ip_address": "IP adres",
+    "client_identifier_desc": "Gebruikers kunnen worden geïdentificeerd door het IP-adres of MAC-adres. Houd er rekening mee dat het gebruik van MAC als ID alleen mogelijk is als AdGuard Home ook een <0> DHCP-server </0> is",
     "form_enter_ip": "Vul IP in",
     "form_enter_mac": "Vul MAC in",
     "form_enter_id": "ID invoeren",
@@ -309,9 +335,26 @@
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Gebruik <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
     "setup_dns_privacy_3": "<0>Hou er rekening mee dat het beveiligde DNS protocol alleen beschikbaar is voor Android 9. U moet dus extra software installeren voor andere besturingssystemen.</0><0>Hier is een lijst van te gebruiken software.</0>",
+    "setup_dns_privacy_android_1": "Android 9 ondersteunt native DNS-over-TLS. Om het te configureren, ga naar Instellingen → Netwerk & internet → Geavanceerd → Privé DNS en voer daar uw domeinnaam in.",
+    "setup_dns_privacy_android_2": "<0>AdGuard voor Android</0>ondersteunt<1>DNS-over-HTTPS </1>en<1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_android_3": "<0> Intra </0> voegt <1> DNS-over-HTTPS</1> ondersteuning toe aan Android.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> ondersteunt <1> DNS-over-HTTPS </1>, maar om het te configureren om op uw eigen server te gebruiken moet er een <2> DNS-stempel </2> gegenereerd worden.",
+    "setup_dns_privacy_ios_2": "<0> AdGuard voor iOS </0> ondersteunt de instellingen <1> DNS-over-HTTPS </1> en <1> DNS-over-TLS </1>.",
     "setup_dns_privacy_other_title": "Overig gebruik",
     "setup_dns_privacy_other_1": "AdGuard Home kan op elk platform een ​​veilige DNS-client zijn.",
-    "form_domain": "Vul domein in",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> ondersteunt alle bekende beveiligde DNS-protocollen.",
+    "setup_dns_privacy_other_3": "<0> dnscrypt-proxy </0> ondersteunt <1> DNS-over-HTTPS </1>.",
+    "setup_dns_privacy_other_4": "<0> Mozilla Firefox </0> ondersteunt <1> DNS-over-HTTPS </1>.",
+    "setup_dns_privacy_other_5": "U vindt meer implementaties <0> hier </0> en <1> hier </1>.",
+    "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
+    "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
+    "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
+    "rewrite_add": "DNS-herschrijving toevoegen",
+    "rewrite_not_found": "Geen DNS-herschrijving gevonden",
+    "rewrite_confirm_delete": "Bent u zeker dat u DNS-herschrijving \"{{key}}\" wilt verwijderen?",
+    "rewrite_desc": "Hiermee kunt u eenvoudig aangepaste DNS-antwoorden configureren voor een specifieke domeinnaam.",
+    "rewrite_applied": "Toegepaste herschrijf regel",
+    "dns_rewrites": "DNS herschrijvingen",
     "form_answer": "Vul IP adres of domeinnaam in",
     "form_error_domain_format": "Ongeldige domeinnaam",
     "form_error_answer_format": "Ongeldig antwoord",
@@ -334,14 +377,38 @@
     "stats_params": "Statistieken configuratie",
     "config_successfully_saved": "Configuratie succesvol opgeslagen",
     "interval_24_hour": "24 uur",
+    "interval_days": "{{count}} dagen",
     "interval_days_plural": "{{count}} dagen",
     "domain": "Domein",
     "answer": "Antwoord",
     "filter_added_successfully": "Het filter is succesvol toegevoegd",
+    "statistics_configuration": "Statistieken configuratie",
     "statistics_retention": "Statistieken retentie",
     "statistics_retention_desc": "Als je de interval waarde vermindert, zullen sommige gegevens verloren gaan",
     "statistics_clear": " Statistieken wissen",
     "statistics_clear_confirm": "Alle statistieken werkelijk wissen?",
+    "statistics_retention_confirm": "Weet u zeker dat u de bewaartermijn van de statistieken wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
     "statistics_cleared": "Statistieken succesvol gewist",
-    "blocked_by_response": "Geblokkeerd door CNAME of IP als antwoord"
+    "interval_hours": "{{count}} uur",
+    "interval_hours_plural": "{{count}} uren",
+    "filters_configuration": "Filters instellingen",
+    "filters_enable": "Filters inschakelen",
+    "filters_interval": "Filters update frequentie",
+    "disabled": "Uitgeschakeld",
+    "username_label": "Gebruikersnaam",
+    "username_placeholder": "Voer gebruikersnaam in",
+    "password_label": "Wachtwoord",
+    "password_placeholder": "Voer wachtwoord in",
+    "sign_in": "Aanmelden",
+    "sign_out": "Afmelden",
+    "forgot_password": "Wachtwoord vergeten?",
+    "forgot_password_desc": "Volg <0>deze stappen</0> om een nieuw wachtwoord voor uw gebruikersaccount te maken.",
+    "location": "Locatie",
+    "orgname": "Naam organisatie",
+    "netname": "Netwerk naam",
+    "descr": "Beschrijving",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Meer informatie</0> over het maken van uw eigen hosts-blocklists.",
+    "blocked_by_response": "Geblokkeerd door CNAME of IP als antwoord",
+    "try_again": "Probeer opnieuw"
 }

client/src/__locales/no.json

@@ -17,6 +17,7 @@
     "dhcp_leases": "DHCP-leieavtaler",
     "dhcp_static_leases": "Statiske DHCP-leieavtaler",
     "dhcp_leases_not_found": "Ingen DHCP-leieavtaler ble funnet",
+    "dhcp_config_saved": "Lagret DHCP-tjeneroppsettet",
     "form_error_required": "Påkrevd felt",
     "form_error_ip4_format": "Ugyldig IPv4-format",
     "form_error_ip6_format": "Ugyldig IPv6-format",
@@ -71,17 +72,12 @@
     "stats_malware_phishing": "Blokkert skadevare/phishing",
     "stats_adult": "Blokkerte voksennettsteder",
     "stats_query_domain": "Mest forespurte domener",
-    "for_last_24_hours": "de siste 24 timene",
-    "for_last_days": "det siste døgnet",
-    "for_last_days_plural": "de siste {{count}} dagene",
     "no_domains_found": "Ingen domener ble funnet",
     "requests_count": "Antall forespørsler",
     "top_blocked_domains": "Mest blokkerte domener",
     "top_clients": "Vanligste klienter",
     "no_clients_found": "Ingen klienter ble funnet",
     "general_statistics": "Generelle statistikker",
-    "number_of_dns_query_days": "Antall DNS-forespørsler som ble behandlet det siste døgnet",
-    "number_of_dns_query_days_plural": "Antall DNS-forespørsler som ble behandlet de siste {{count}} dagene",
     "number_of_dns_query_24_hours": "Antall DNS-forespørsler som ble behandlet de siste 24 timene",
     "number_of_dns_query_blocked_24_hours": "Antall DNS-forespørsler som ble blokkert av adblock-filtre, hosts-lister, og domene-lister",
     "number_of_dns_query_blocked_24_hours_by_sec": "Antall DNS-forespørsler som ble blokkert av AdGuard sin nettlesersikkerhetsmodul",
@@ -104,6 +100,7 @@
     "encryption_settings": "Krypteringsinnstillinger",
     "dhcp_settings": "DHCP-innstillinger",
     "upstream_dns": "Oppstrøms-DNS-tjenere",
+    "upstream_dns_hint": "Hvis du lar dette feltet stå tomt, vil AdGuard Home will bruke <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> som en oppstrømstjener.",
     "test_upstream_btn": "Test oppstrømstilkoblinger",
     "apply_btn": "Benytt",
     "disabled_filtering_toast": "Skrudde av filtrering",
@@ -297,6 +294,7 @@
     "client_edit": "Rediger klienten",
     "client_identifier": "Identifikator",
     "ip_address": "IP-adresse",
+    "client_identifier_desc": "Klienter kan bli identifisert gjennom IP-adressen eller MAC-adressen. Vennligst bemerk at å bruke MAC som en identifikator, bare er mulig dersom AdGuard Home også er en <0>DHCP-tjener</0>",
     "form_enter_ip": "Skriv inn IP",
     "form_enter_mac": "Skriv inn MAC",
     "form_client_name": "Skriv inn klientnavnet",

client/src/__locales/pl.json

@@ -17,9 +17,15 @@
     "dhcp_leases": "Dzierżawa DHCP",
     "dhcp_static_leases": "Dzierżawy statyczne DHCP",
     "dhcp_leases_not_found": "Nie znaleziono dzierżaw DHCP",
+    "dhcp_config_saved": "Konfiguracja DHCP pomyślnie zapisana",
     "form_error_required": "Pole wymagane",
+    "form_error_ip4_format": "Nieprawidłowy format IPv4",
+    "form_error_ip6_format": "Nieprawidłowy format IPv6",
+    "form_error_ip_format": "Nieprawidłowy format IP",
     "form_error_mac_format": "Nieprawidłowy format MAC",
+    "form_error_client_id_format": "Nieprawidłowy format identyfikatora klienta",
     "form_error_positive": "Musi być większa niż 0",
+    "form_error_negative": "Musi być równy 0 lub większy",
     "dhcp_form_gateway_input": "Adres IP bramy",
     "dhcp_form_subnet_input": "Maska podsieci",
     "dhcp_form_range_title": "Zakres adresów IP",
@@ -41,6 +47,7 @@
     "dhcp_new_static_lease": "Nowa dzierżawa statyczna",
     "dhcp_static_leases_not_found": "Nie znaleziono statycznych dzierżaw DHCP",
     "dhcp_add_static_lease": "Dodaj dzierżawę statyczną",
+    "dhcp_reset": "Czy na pewno chcesz zresetować konfigurację DHCP?",
     "delete_confirm": "Czy na pewno chcesz usunąć \"{{key}}\"?",
     "form_enter_hostname": "Wpisz nazwę hosta",
     "error_details": "Szczegóły błędu",
@@ -69,7 +76,7 @@
     "stats_adult": "Zablokowane witryny dla dorosłych",
     "stats_query_domain": "Najczęściej wyszukiwane domeny",
     "for_last_24_hours": "przez ostatnie 24 godziny",
-    "for_last_days": "z ostatnich {{value}} dni",
+    "for_last_days": "z ostatnich {{count}} dni",
     "for_last_days_plural": "z ostatnich {{count}} dni",
     "no_domains_found": "Nie znaleziono domen",
     "requests_count": "Licznik żądań",
@@ -77,7 +84,7 @@
     "top_clients": "Główni klienci",
     "no_clients_found": "Nie znaleziono klienta",
     "general_statistics": "Ogólne statystyki",
-    "number_of_dns_query_days": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{value}} dni",
+    "number_of_dns_query_days": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} dni",
     "number_of_dns_query_days_plural": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} dni",
     "number_of_dns_query_24_hours": "Liczba zapytań DNS przetworzonych w ciągu ostatnich 24 godzin",
     "number_of_dns_query_blocked_24_hours": "Liczba żądań DNS zablokowanych przez filtry blokowania reklam i listy bloków hosta",
@@ -94,13 +101,16 @@
     "use_adguard_parental": "Użyj usługi Kontrola Rodzicielska AdGuard",
     "use_adguard_parental_hint": "AdGuard Home sprawdzi, czy domena zawiera materiały dla dorosłych. Używa tego samego interfejsu API przyjaznego prywatności, co usługa sieciowa Bezpieczne Przeglądanie. ",
     "enforce_safe_search": "Wymuszaj bezpieczne wyszukiwanie",
+    "enforce_save_search_hint": "AdGuard Home może wymusić bezpieczne wyszukiwanie w następujących wyszukiwarkach: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Nie określono serwerów",
     "general_settings": "Ustawienia główne",
     "dns_settings": "Ustawienia DNS",
     "encryption_settings": "Ustawienia szyfrowania",
     "dhcp_settings": "Ustawienia DHCP",
     "upstream_dns": "Serwery DNS z wyższego poziomu",
+    "upstream_dns_hint": "Jeśli to pole pozostanie puste, AdGuard Home użyje <a href='https://www.quad9.net/' target='_blank'>Quad9</a> jako upstream.",
     "test_upstream_btn": "Test upstreamów",
+    "upstreams": "Upstreams",
     "apply_btn": "Zastosuj",
     "disabled_filtering_toast": "Wyłączone filtrowanie",
     "enabled_filtering_toast": "Włączone filtrowanie",
@@ -137,6 +147,7 @@
     "example_comment": "! Tutaj idzie komentarz",
     "example_comment_meaning": "komentarz",
     "example_comment_hash": "# Również komentarz",
+    "example_regex_meaning": "blokuj dostęp do domen pasujących do określonego wyrażenia regularnego",
     "example_upstream_regular": "normalny DNS (przez UDP)",
     "example_upstream_dot": "zaszyfrowany <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-przez-TLS</a>",
     "example_upstream_doh": "zaszyfrowany <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-przez-HTTPS</a>",
@@ -169,6 +180,31 @@
     "rule_added_to_custom_filtering_toast": "Reguła dodana do niestandardowych reguł filtrowania",
     "query_log_response_status": "Status: {{value}}",
     "query_log_filtered": "Filtrowane przez {{filter}}",
+    "query_log_confirm_clear": "Czy na pewno chcesz wyczyścić cały dziennik zapytań?",
+    "query_log_cleared": "Dziennik zapytań został pomyślnie wyczyszczony",
+    "query_log_clear": "Wyczyść dzienniki zapytań",
+    "query_log_retention": "Przechowywanie dzienników zapytań",
+    "query_log_enable": "Włącz dziennik",
+    "query_log_configuration": "Konfiguracja dzienników",
+    "query_log_disabled": "Dziennik zapytań jest wyłączony i można go skonfigurować w <0>ustawieniach</0>",
+    "query_log_strict_search": "Używaj podwójnych cudzysłowów do ścisłego wyszukiwania",
+    "query_log_retention_confirm": "Czy na pewno chcesz zmienić sposób przechowywania dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
+    "dns_config": "Konfiguracja serwera DNS",
+    "blocking_mode": "Tryb blokowania",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Null IP",
+    "custom_ip": "Niestandardowe IP",
+    "blocking_ipv4": "Blokowanie IPv4",
+    "blocking_ipv6": "Blokowanie IPv6",
+    "form_enter_rate_limit": "Wprowadź limit ilościowy",
+    "rate_limit": "Limit ilościowy",
+    "edns_enable": "Włącz podsieć klienta EDNS",
+    "edns_cs_desc": "Po włączeniu AdGuard Home będzie wysyłał podsieci klientów na serwery DNS.",
+    "rate_limit_desc": "Liczba żądań na sekundę, które może wykonać pojedynczy klient (0: nieograniczona)",
+    "blocking_ipv4_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania A",
+    "blocking_ipv6_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania AAAA",
+    "blocking_mode_desc": "<0>NXDOMAIN – Odpowiedz kodem NXDOMAIN;</0> <0>Null IP – Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA);</0> <0>Niestandardowe IP - Odpowiedz z ręcznie ustawionym adresem IP.</0>",
+    "upstream_dns_client_desc": "Jeśli to pole pozostanie puste, AdGuard Home użyje serwerów skonfigurowanych w <0>Ustawieniach DNS</0>.",
     "source_label": "Źródło",
     "found_in_known_domain_db": "Znaleziono w bazie danych znanych domen.",
     "category_label": "Kategoria",
@@ -186,6 +222,7 @@
     "install_settings_dns_desc": "Konieczne będzie skonfigurowanie urządzenia lub routera do korzystania z serwera DNS pod następującymi adresami:",
     "install_settings_all_interfaces": "Wszystkie interfejsy",
     "install_auth_title": "Uwierzytelnianie",
+    "install_auth_desc": "Zalecamy skonfigurowanie strony AdGuard Home Admin, aby zweryfikować swoją tożsamość za pomocą hasła. Chociaż jest dostępny tylko w sieci lokalnej, nadal ważne jest, aby chronić go przed nieograniczonym dostępem.",
     "install_auth_username": "Nazwa użytkownika",
     "install_auth_password": "Hasło",
     "install_auth_confirm": "Potwierdź hasło",
@@ -264,6 +301,8 @@
     "update_announcement": "AdGuard Home {{version}} jest już dostępny! <0>Kliknij tutaj</0> aby uzyskać więcej informacji.",
     "setup_guide": "Przewodnik instalacji",
     "dns_addresses": "Adresy DNS",
+    "dns_start": "Serwer DNS uruchamia się",
+    "dns_status_error": "Błąd uzyskania statusu serwera DNS",
     "down": "Utrata połączenia",
     "fix": "Napraw",
     "dns_providers": "Oto lista <0>znanych dostawców DNS</0> do wyboru.",
@@ -282,8 +321,11 @@
     "client_edit": "Edytuj klienta",
     "client_identifier": "Identyfikator",
     "ip_address": "Adres IP",
+    "client_identifier_desc": "Klienci mogą być identyfikowani na podstawie adresu IP, CIDR, adresu MAC. Pamiętaj, że użycie MAC jako identyfikatora jest możliwe tylko wtedy, gdy AdGuard Home jest również <0>serwerem DHCP</0>",
     "form_enter_ip": "Wpisz adres IP",
     "form_enter_mac": "Wpisz adres MAC",
+    "form_enter_id": "Wprowadź identyfikator",
+    "form_add_id": "Dodaj identyfikator",
     "form_client_name": "Wpisz nazwę klienta",
     "client_global_settings": "Użyj ustawień globalnych",
     "client_deleted": "Klient \"{{key}}\" został pomyślnie usunięty",
@@ -330,7 +372,7 @@
     "rewrite_desc": "Pozwala łatwo skonfigurować niestandardową odpowiedź DNS dla określonej nazwy domeny.",
     "rewrite_applied": "Przepisano regułę",
     "dns_rewrites": "Przepisywanie DNS",
-    "form_domain": "Wprowadź domenę",
+    "form_domain": "Wpisz nazwę domeny lub symbol wieloznaczny",
     "form_answer": "Wpisz adres IP lub nazwę domeny",
     "form_error_domain_format": "Niepoprawny format domeny",
     "form_error_answer_format": "Nieprawidłowy format odpowiedzi",
@@ -353,14 +395,41 @@
     "stats_params": "Konfiguracja statystyk",
     "config_successfully_saved": "Konfiguracja została pomyślnie zapisana",
     "interval_24_hour": "24 godziny",
-    "interval_days": "{{value}} dni",
+    "interval_days": "{{count}} dni",
     "interval_days_plural": "{{count}} dni",
     "domain": "Domena",
     "answer": "Odpowiedź",
     "filter_added_successfully": "Pomyślnie dodano filtr",
+    "statistics_configuration": "Konfiguracja statystyk",
     "statistics_retention": "Przechowywanie statystyk",
     "statistics_retention_desc": "Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
     "statistics_clear": " Wyczyść statystyki",
     "statistics_clear_confirm": "Czy na pewno chcesz wyczyścić statystyki?",
-    "statistics_cleared": "Statystyki zostały pomyślnie wyczyszczone"
+    "statistics_retention_confirm": "Czy chcesz zmienić sposób przechowania statystyk? Jeżeli obniżysz wartość interwału, niektóre dane będą utracone",
+    "statistics_cleared": "Statystyki zostały pomyślnie wyczyszczone",
+    "interval_hours": "{{count}} godzin",
+    "interval_hours_plural": "{{count}} godziny",
+    "filters_configuration": "Konfiguracja filtrów",
+    "filters_enable": "Włącz filtry",
+    "filters_interval": "Częstotliwość aktualizacji filtrów",
+    "disabled": "Wyłączone",
+    "username_label": "Nazwa użytkownika",
+    "username_placeholder": "Wpisz nazwę użytkownika",
+    "password_label": "Hasło",
+    "password_placeholder": "Wprowadź hasło",
+    "sign_in": "Zaloguj się",
+    "sign_out": "Wyloguj się",
+    "forgot_password": "Zapomniałeś hasła?",
+    "forgot_password_desc": "Wykonaj <0>te kroki</0> aby utworzyć nowe hasło do konta użytkownika.",
+    "location": "Lokalizacja",
+    "orgname": "Nazwa firmy",
+    "netname": "Nazwa sieci",
+    "descr": "Opis",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Dowiedz się więcej</0> o tworzeniu własnych czarnych list hostów.",
+    "blocked_by_response": "W odpowiedzi zablokowany przez CNAME lub IP",
+    "try_again": "Spróbuj ponownie",
+    "domain_desc": "Wpisz nazwę domeny lub symbol wieloznaczny, który chcesz przepisać.",
+    "example_rewrite_domain": "przepisz odpowiedzi tylko dla tej nazwy domeny.",
+    "example_rewrite_wildcard": "przepisz odpowiedzi dla wszystkich subdomen <0>example.org</0>."
 }

client/src/__locales/pt-br.json

@@ -24,6 +24,7 @@
     "form_error_ip_format": "Formato de endereço IPv inválido",
     "form_error_mac_format": "Formato do endereço MAC inválido",
     "form_error_positive": "Deve ser maior que 0",
+    "form_error_negative": "Deve ser igual ou superior a 0",
     "dhcp_form_gateway_input": "IP do gateway",
     "dhcp_form_subnet_input": "Máscara de sub-rede",
     "dhcp_form_range_title": "Faixa de endereços IP",
@@ -187,6 +188,22 @@
     "query_log_disabled": "O registro de consulta está desativado e pode ser configurado em <0>configurações</0>",
     "query_log_strict_search": "Use aspas duplas para uma pesquisa mais criteriosa",
     "query_log_retention_confirm": "Você tem certeza de que deseja alterar o arquivamento do registro de consulta? Se diminuir o valor de intervalo, alguns dados serão perdidos",
+    "dns_config": "Configuração do servidor DNS",
+    "blocking_mode": "Modo de bloqueio",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "IP nulo",
+    "custom_ip": "IP personalizado",
+    "blocking_ipv4": "Bloqueando IPv4",
+    "blocking_ipv6": "Bloqueando IPv6",
+    "form_enter_rate_limit": "Insira a taxa limite",
+    "rate_limit": "Taxa limite",
+    "edns_enable": "Ativar a sub-rede do cliente EDNS",
+    "edns_cs_desc": "Se ativado, o AdGuard Home estará enviando as sub-redes dos clientes para os servidores DNS.",
+    "rate_limit_desc": "O número de solicitações por segundo que um único cliente pode fazer (0: ilimitado)",
+    "blocking_ipv4_desc": "Endereço de IP a ser retornado para uma solicitação bloqueada",
+    "blocking_ipv6_desc": "Endereço de IP a ser retornado para uma solicitação AAAA bloqueada",
+    "blocking_mode_desc": "<0>NXDOMAIN - Responde com o código NXDOMAIN;</0> <0>IP nulo - Responde com endereço IP zero (0.0.0.0.0 para A; :: para AAAA);</0><0>IP personalizado - Responde com um endereço de IP definido manualmente.</0>",
+    "upstream_dns_client_desc": "Se você mantiver este campo vazio, o AdGuard Home usará os servidores configurados nas configurações <0>DNS</0>.",
     "source_label": "Fonte",
     "found_in_known_domain_db": "Encontrado no banco de dados de domínios conhecidos.",
     "category_label": "Categoria",
@@ -354,7 +371,6 @@
     "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
     "rewrite_applied": "Regra de reescrita aplicada",
     "dns_rewrites": "Reescritas de DNS",
-    "form_domain": "Digite o domínio",
     "form_answer": "Digite o endereço de IP ou nome de domínio",
     "form_error_domain_format": "Formato de domínio inválido",
     "form_error_answer_format": "Formato de resposta inválido",
@@ -409,5 +425,6 @@
     "descr": "Descrição",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Saiba mais</0> sobre como criar as suas próprias listas negras de servidores.",
-    "blocked_by_response": "Bloqueado por CNAME ou IP na resposta"
+    "blocked_by_response": "Bloqueado por CNAME ou IP na resposta",
+    "try_again": "Tente novamente"
 }

client/src/__locales/pt-pt.json

@@ -24,6 +24,7 @@
     "form_error_ip_format": "Formato de endereço IPv4 inválido",
     "form_error_mac_format": "Formato do endereço MAC inválido",
     "form_error_positive": "Deve ser maior que 0",
+    "form_error_negative": "Deve ser igual ou superior a 0",
     "dhcp_form_gateway_input": "IP do gateway",
     "dhcp_form_subnet_input": "Máscara de sub-rede",
     "dhcp_form_range_title": "Faixa de endereços IP",
@@ -187,6 +188,22 @@
     "query_log_disabled": "O registo de consulta está desactivado e pode ser configurado em <0>definições</0>",
     "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
     "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
+    "dns_config": "Configuração do servidor DNS",
+    "blocking_mode": "Modo de bloqueio",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "IP nulo",
+    "custom_ip": "IP Personalizado",
+    "blocking_ipv4": "A bloquear IPv4",
+    "blocking_ipv6": "A bloquear IPv6",
+    "form_enter_rate_limit": "Insira o limite de taxa",
+    "rate_limit": "Limite de taxa",
+    "edns_enable": "Activar sub-rede do cliente EDNS",
+    "edns_cs_desc": "Se activado, o AdGuard Home enviará sub-redes dos clientes para os servidores DNS.",
+    "rate_limit_desc": "O número de solicitações por segundo que um único cliente pode fazer (0: ilimitado)",
+    "blocking_ipv4_desc": "Endereço IP a ser devolvido para uma solicitação A bloqueada",
+    "blocking_ipv6_desc": "Endereço IP a ser devolvido para uma solicitação AAAA bloqueada",
+    "blocking_mode_desc": "<0>NXDOMAIN – Responda com o código NXDOMAIN;;</0> <0>IP nulo - responda com zero endereço IP (0.0.0.0 for A; :: for AAAA);</0> <0>IP personalizado - Responda com um endereço IP definido manualmente.</0>",
+    "upstream_dns_client_desc": "Se mantiver esse campo vazio, o AdGuard Home usará os servidores configurados nas <0>Definições de DNS</0>.",
     "source_label": "Fonte",
     "found_in_known_domain_db": "Encontrado no banco de dados de domínios conhecido.",
     "category_label": "Categoria",
@@ -354,7 +371,6 @@
     "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
     "rewrite_applied": "Regra de reescrita aplicada",
     "dns_rewrites": "Reescritas de DNS",
-    "form_domain": "Inserir domínio",
     "form_answer": "Insira o endereço de IP ou nome de domínio",
     "form_error_domain_format": "Formato de domínio inválido",
     "form_error_answer_format": "Formato de resposta inválido",
@@ -409,5 +425,6 @@
     "descr": "Descrição",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Saiba mais</0>sobre como criar as suas próprias listas negras de servidores.",
-    "blocked_by_response": "Bloqueado por CNAME ou IP em resposta"
+    "blocked_by_response": "Bloqueado por CNAME ou IP em resposta",
+    "try_again": "Tente novamente"
 }

client/src/__locales/ru.json

@@ -23,6 +23,7 @@
     "form_error_ip6_format": "Неверный формат IPv6",
     "form_error_ip_format": "Неверный формат IP-адреса",
     "form_error_mac_format": "Некорректный формат MAC",
+    "form_error_client_id_format": "Неверный формат ID клиента",
     "form_error_positive": "Должно быть больше 0",
     "form_error_negative": "Должно быть не меньше 0",
     "dhcp_form_gateway_input": "IP-адрес шлюза",
@@ -105,6 +106,7 @@
     "upstream_dns": "Upstream DNS-серверы",
     "upstream_dns_hint": "Если вы оставите это поле пустым, то AdGuard Home использует <a href='https://www.quad9.net/' target='_blank'>Quad9</a> в качестве DNS сервера.",
     "test_upstream_btn": "Тест upstream серверов",
+    "upstreams": "Upstreams",
     "apply_btn": "Применить",
     "disabled_filtering_toast": "Фильтрация выкл.",
     "enabled_filtering_toast": "Фильтрация вкл.",
@@ -416,6 +418,12 @@
     "netname": "Название сети",
     "descr": "Описание",
     "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Узнайте больше</0> о создании собственных списков блокировки хостов.",
+    "blocked_by_response": "Заблокировано по CNAME или IP в ответе",
+    "try_again": "Попробовать еще раз",
+    "domain_desc": "Введите имя или маску домена, который вы хотите перенаправить.",
+    "example_rewrite_domain": "перенаправляет ответы только для этого домена.",
+    "example_rewrite_wildcard": "перенаправляет ответы для всех поддоменов <0>example.org</0>.",
     "interval_hours_0": "{{count}} час",
     "interval_hours_1": "{{count}} часа",
     "interval_hours_2": "{{count}} часов",
@@ -427,8 +435,5 @@
     "for_last_days_2": "за последние {{count}} дней",
     "number_of_dns_query_days_0": "Количество DNS-запросов за {{count}} день",
     "number_of_dns_query_days_1": "Количество DNS-запросов за {{count}} дня",
-    "number_of_dns_query_days_2": "Количество DNS-запросов за {{count}} дней",
-    "filtering_rules_learn_more": "<0>Узнайте больше</0> о создании собственных списков блокировки хостов.",
-    "blocked_by_response": "Заблокировано по CNAME или IP в ответе",
-    "try_again": "Попробовать еще раз"
-}
+    "number_of_dns_query_days_2": "Количество DNS-запросов за {{count}} дней"
+}

client/src/__locales/sk.json

@@ -23,7 +23,9 @@
     "form_error_ip6_format": "Nesprávny formát IPv6",
     "form_error_ip_format": "Nesprávny formát IPv4",
     "form_error_mac_format": "Nesprávny MAC formát",
+    "form_error_client_id_format": "Neplatný formát client ID",
     "form_error_positive": "Musí byť väčšie ako 0",
+    "form_error_negative": "Musí byť číslo 0 alebo viac",
     "dhcp_form_gateway_input": "IP brána",
     "dhcp_form_subnet_input": "Maska podsiete",
     "dhcp_form_range_title": "Rozsah IP adries",
@@ -34,7 +36,7 @@
     "dhcp_interface_select": "Zvoľte DHCP rozhranie",
     "dhcp_hardware_address": "Hardware adresa",
     "dhcp_ip_addresses": "IP adresy",
-    "dhcp_table_hostname": "Názov hostiteľa",
+    "dhcp_table_hostname": "Meno hostiteľa",
     "dhcp_table_expires": "Vyprší",
     "dhcp_warning": "Ak chcete server DHCP napriek tomu povoliť, uistite sa, že v sieti nie je žiadny iný aktívny DHCP server. V opačnom prípade sa môže prerušiť internet pre už pripojené zariadenia!",
     "dhcp_error": "Nebolo možné určiť, či je v sieti iný DHCP server.",
@@ -47,7 +49,7 @@
     "dhcp_add_static_lease": "Pridať statický prenájom",
     "dhcp_reset": "Naozaj chcete obnoviť konfiguráciu DHCP?",
     "delete_confirm": "Naozaj chcete vymazať \"{{key}}\"?",
-    "form_enter_hostname": "Zadajte názov hostiteľa",
+    "form_enter_hostname": "Zadajte meno hostiteľa",
     "error_details": "Podrobnosti chyby",
     "back": "Naspäť",
     "dashboard": "Riadiaci panel",
@@ -99,7 +101,7 @@
     "use_adguard_parental": "Použiť AdGuard službu Rodičovská kontrola",
     "use_adguard_parental_hint": "AdGuard Home skontroluje, či doména obsahuje materiály pre dospelých. Používa rovnaké API priateľské k ochrane osobných údajov ako služba Bezpečného prehliadania.",
     "enforce_safe_search": "Vynútiť bezpečné vyhľadávanie",
-    "enforce_save_search_hint": "AdGuard Home môže vynútiť bezpečné vyhľadávanie v nasledujúcich vyhľadávačoch: Google, Youtube, Bing, DuckDuckGo and Yandex.",
+    "enforce_save_search_hint": "AdGuard Home môže vynútiť bezpečné vyhľadávanie v nasledujúcich vyhľadávačoch: Google, Youtube, Bing, DuckDuckGo a Yandex.",
     "no_servers_specified": "Neboli špecifikované žiadne servery",
     "general_settings": "Všeobecné nastavenia",
     "dns_settings": "Nastavenia DNS",
@@ -119,8 +121,8 @@
     "disabled_safe_search_toast": "Vypnuté bezpečné vyhľadávanie",
     "enabled_save_search_toast": "Zapnuté bezpečné vyhľadávanie",
     "enabled_table_header": "Zapnuté",
-    "name_table_header": "Názov",
-    "filter_url_table_header": "URL filtra",
+    "name_table_header": "Meno",
+    "filter_url_table_header": "URL adresa filtra",
     "rules_count_table_header": "Počet pravidiel",
     "last_time_updated_table_header": "Posledná aktualizácia",
     "actions_table_header": "Akcie",
@@ -131,13 +133,13 @@
     "no_filters_added": "Neboli pridané žiadne filtre",
     "add_filter_btn": "Pridať filter",
     "cancel_btn": "Zrušiť",
-    "enter_name_hint": "Zadajte názov",
-    "enter_url_hint": "Vložte URL adresu",
+    "enter_name_hint": "Zadajte meno",
+    "enter_url_hint": "Zadajte URL adresu",
     "check_updates_btn": "Skontrolovať aktualizácie",
     "new_filter_btn": "Odber nového filtra",
-    "enter_valid_filter_url": "Vložte platnú URL adresu na odber filtra alebo zoznamov adries.",
+    "enter_valid_filter_url": "Zadajte platnú URL adresu na odber filtra alebo zoznamov adries.",
     "custom_filter_rules": "Vlastné filtračné pravidlá",
-    "custom_filter_rules_hint": "Vložte na každý riadok jedno pravidlo. Môžete použiť buď adblock pravidlá alebo syntax host súborov.",
+    "custom_filter_rules_hint": "Zadajte na každý riadok jedno pravidlo. Môžete použiť buď adblock pravidlá alebo syntax host súborov.",
     "examples_title": "Príklady",
     "example_meaning_filter_block": "zablokovať prístup k doméne example.org  a všetkým jej subdoménam",
     "example_meaning_filter_whitelist": "odblokovať prístup k doméne example.org  a všetkým jej subdoménam",
@@ -158,7 +160,7 @@
     "unblock_btn": "Odblokovať",
     "block_btn": "Zablokovať",
     "time_table_header": "Čas",
-    "domain_name_table_header": "Názov domény",
+    "domain_name_table_header": "Meno domény",
     "type_table_header": "Typ",
     "response_table_header": "Odozva",
     "client_table_header": "Klient",
@@ -187,6 +189,22 @@
     "query_log_disabled": "Protokol dopytov je vypnutý a možno ho nakonfigurovať v <0>nastaveniach</0>",
     "query_log_strict_search": "Na prísne vyhľadávanie použite dvojité úvodzovky",
     "query_log_retention_confirm": "Naozaj chcete zmeniť uchovávanie denníku dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
+    "dns_config": "Konfigurácia DNS servera",
+    "blocking_mode": "Spôsob blokovania",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Nulová IP adresa",
+    "custom_ip": "Vlastná IP adresa",
+    "blocking_ipv4": "Blokovanie IPv4",
+    "blocking_ipv6": "Blokovanie IPv6",
+    "form_enter_rate_limit": "Zadajte rýchlostný limit",
+    "rate_limit": "Rýchlostný limit",
+    "edns_enable": "Povoliť klientsku podsiete EDNS",
+    "edns_cs_desc": "Ak je povolená, program AdGuard Home bude odosielať podsiete klientov na DNS servery.",
+    "rate_limit_desc": "Počet požiadaviek za sekundu, ktoré môže jeden klient vykonať (0: neobmedzene)",
+    "blocking_ipv4_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti A",
+    "blocking_ipv6_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti AAAA",
+    "blocking_mode_desc": "<0>NXDOMAIN - Odpoveď s kódom NXDOMAIN;</0> <0>Null IP - Odpoveď s nulovou IP adresou (0,0.0,0 pre A; :: pre AAAA);</0> <0>Vlastná IP adresa - Odpoveď s manuálne nastavenou IP adresou.</0>",
+    "upstream_dns_client_desc": "Ak ponecháte toto pole prázdne, AdGuard Home použije servery nakonfigurované v <0>nastaveniach DNS</0>.",
     "source_label": "Zdroj",
     "found_in_known_domain_db": "Nájdené v databáze známych domén.",
     "category_label": "Kategória",
@@ -222,15 +240,15 @@
     "install_devices_router_list_2": "Nájdite nastavenia DHCP/DNS. Hľadajte skratku DNS vedľa poľa, ktoré umožňuje vložiť dve alebo tri sady čísel, každé rozdelené do štyroch skupín s jedným až tromi číslicami.",
     "install_devices_router_list_3": "Zadajte tam adresy Vášho AdGuard Home servera.",
     "install_devices_windows_list_1": "Otvorte panel Nastavenia cez menu Štart alebo vyhľadávanie Windows.",
-    "install_devices_windows_list_2": "Choďte do kategórie Sieť a internet",
+    "install_devices_windows_list_2": "Prejdite do kategórie Sieť a internet a potom do Centra sietí a zdieľania.",
     "install_devices_windows_list_3": "Vyhľadajte položku Zmeniť možnosti adaptéra a kliknite na ňu",
     "install_devices_windows_list_4": "Zvoľte aktívne pripojený adaptér a pravým klikom otvorte Vlastnosti",
     "install_devices_windows_list_5": "Vyhľadajte položku Protokol TCP/IPv4, zvoľte ju a dvojklikom otvorte jej vlastnosti.",
-    "install_devices_windows_list_6": "Zvoľte Použiť tieto adresy serverov DNS a vložte adresy Vašich AdGuard Home serverov.",
+    "install_devices_windows_list_6": "Zvoľte Použiť tieto adresy serverov DNS a zadajte adresy Vašich AdGuard Home serverov.",
     "install_devices_macos_list_1": "Kliknite na ikonu Apple a prejdite na položku Systémové predvoľby.",
     "install_devices_macos_list_2": "Kliknite na Sieť.",
     "install_devices_macos_list_3": "Zvoľte prvé pripojenie vo Vašom zozname a kliknite na Pokročilé.",
-    "install_devices_macos_list_4": "Vyberte kartu DNS a zadajte adresy serverov AdGuard Home.",
+    "install_devices_macos_list_4": "Vyberte kartu DNS a zadajte adresy Vašich AdGuard Home serverov.",
     "install_devices_android_list_1": "Na domovskej obrazovke ponuky Android klepnite na Nastavenia.",
     "install_devices_android_list_2": "V ponuke klepnite na položku Wi-Fi. Zobrazí sa obrazovka so zoznamom všetkých dostupných sietí (nie je možné nastaviť vlastný DNS pre mobilné pripojenie).",
     "install_devices_android_list_3": "Dlho stlačte sieť, ku ktorej ste pripojení, a klepnite na Modifikovať sieť.",
@@ -238,8 +256,8 @@
     "install_devices_android_list_5": "Zmeňte nastavené hodnoty DNS 1 a DNS 2 na adresy serverov AdGuard Home.",
     "install_devices_ios_list_1": "Na domácej obrazovke ťuknite na položku Nastavenia.",
     "install_devices_ios_list_2": "V ľavej ponuke vyberte Wi-Fi (nie je možné nakonfigurovať DNS pre mobilné siete).",
-    "install_devices_ios_list_3": "Klepnite na názov aktuálne aktívnej siete",
-    "install_devices_ios_list_4": "Do poľa DNS zadajte adresy serverov AdGuard Home.",
+    "install_devices_ios_list_3": "Klepnite na meno aktuálne aktívnej siete.",
+    "install_devices_ios_list_4": "Do poľa DNS zadajte adresy Vašich AdGuard Home serverov.",
     "get_started": "Začíname",
     "next": "Ďalej",
     "open_dashboard": "Otvoriť riadiaci panel",
@@ -247,9 +265,9 @@
     "encryption_title": "Šifrovanie",
     "encryption_desc": "Podpora šifrovania (HTTPS/TLS) pre webové rozhranie DNS aj administrátora",
     "encryption_config_saved": "Konfigurácia šifrovania uložená",
-    "encryption_server": "Názov servera",
+    "encryption_server": "Meno servera",
     "encryption_server_enter": "Zadajte meno Vašej domény",
-    "encryption_server_desc": "Ak chcete používať HTTPS, musíte zadať názov servera, ktorý zodpovedá Vášmu SSL certifikátu.",
+    "encryption_server_desc": "Ak chcete používať HTTPS, musíte zadať meno servera, ktoré zodpovedá Vášmu SSL certifikátu.",
     "encryption_redirect": "Automaticky presmerovať na HTTPS",
     "encryption_redirect_desc": "Ak je táto možnosť začiarknutá, služba AdGuard Home Vás automaticky presmeruje z adresy HTTP na adresy HTTPS.",
     "encryption_https": "HTTPS port",
@@ -296,7 +314,7 @@
     "settings_global": "Globálne",
     "settings_custom": "Vlastné",
     "table_client": "Klient",
-    "table_name": "Názov",
+    "table_name": "Meno",
     "save_btn": "Uložiť",
     "client_add": "Pridať klienta",
     "client_new": "Nový klient",
@@ -304,11 +322,11 @@
     "client_identifier": "Identifikátor",
     "ip_address": "IP adresa",
     "client_identifier_desc": "Klienti môžu byť identifikovaní podľa IP adresy alebo MAC adresy. Upozorňujeme, že používanie MAC ako identifikátora je možné len vtedy, ak je AdGuard Home tiež <0>DHCP server</0>",
-    "form_enter_ip": "Zadajte IP",
-    "form_enter_mac": "Zadajte MAC",
+    "form_enter_ip": "Zadajte IP adresu",
+    "form_enter_mac": "Zadajte MAC adresu",
     "form_enter_id": "Zadajte identifikátor",
     "form_add_id": "Pridajte identifikátor",
-    "form_client_name": "Zadajte názov klienta",
+    "form_client_name": "Zadajte meno klienta",
     "client_global_settings": "Použiť globálne nastavenia",
     "client_deleted": "\"{{key}}\" klienta bol úspešne vymazaný",
     "client_added": "\"{{key}}\" klienta bol úspešne pridaný",
@@ -334,7 +352,7 @@
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Použiť <1>{{address}}</1> reťazec.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Použiť <1>{{address}}</1> reťazec.",
     "setup_dns_privacy_3": "<0>Upozorňujeme, že šifrované protokoly DNS sú podporované iba v systéme Android 9. Preto je potrebné nainštalovať ďalší softvér pre iné operačné systémy.</0><0>Tu je zoznam softvéru, ktorý môžete používať.</0>",
-    "setup_dns_privacy_android_1": "Android 9 podporuje DNS-over-TLS natívne. Ak ho chcete konfigurovať, prejdite na Nastavenia → Sieť a internet → Pokročilé → Súkromné DNS a zadajte tam názov Vašej domény.",
+    "setup_dns_privacy_android_1": "Android 9 podporuje DNS-over-TLS natívne. Ak ho chcete konfigurovať, prejdite na Nastavenia → Sieť a internet → Pokročilé → Súkromné DNS a zadajte tam meno Vašej domény.",
     "setup_dns_privacy_android_2": "<0>AdGuard pre Android</0> podporuje <1>DNS-over-HTTPS</1> a <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> pridáva <1>DNS-over-HTTPS</1> podporu pre Android.",
     "setup_dns_privacy_ios_1": "<0>DNSCloak</0> podporuje funkciu <1>DNS-over-HTTPS</1>, ale aby ste ju mohli nakonfigurovať na používanie vlastného servera, musíte kvôli tomu vygenerovať značku <2>DNS Stamp</2>.",
@@ -351,11 +369,11 @@
     "rewrite_add": "Pridať DNS prepísanie",
     "rewrite_not_found": "Neboli nájdené žiadne DNS prepísania",
     "rewrite_confirm_delete": "Naozaj chcete odstrániť prepísanie DNS pre \"{{key}}\"?",
-    "rewrite_desc": "Umožňuje ľahko nakonfigurovať vlastnú odpoveď DNS pre konkrétny názov domény.",
+    "rewrite_desc": "Umožňuje ľahko nakonfigurovať vlastnú odpoveď DNS pre konkrétne meno domény.",
     "rewrite_applied": "Použilo sa pravidlo prepisovania",
     "dns_rewrites": "DNS prepisovanie",
-    "form_domain": "Vložte meno domény",
-    "form_answer": "Zadajte IP adresu alebo názov domény",
+    "form_domain": "Zadajte meno domény alebo zástupný znak",
+    "form_answer": "Zadajte IP adresu alebo meno domény",
     "form_error_domain_format": "Neplatný formát domény",
     "form_error_answer_format": "Neplatný formát odpovede",
     "configure": "Konfigurovať",
@@ -371,7 +389,7 @@
     "encryption_certificate_path": "Cesta k certifikátu",
     "encryption_private_key_path": "Cesta k súkromného kľúču",
     "encryption_certificates_source_path": "Nastavte cestu k súboru s certifikátom",
-    "encryption_certificates_source_content": "Vložiť obsah certifikátu",
+    "encryption_certificates_source_content": "Vložte obsah certifikátu",
     "encryption_key_source_path": "Nastaviť súbor s privátnym kľúčom",
     "encryption_key_source_content": "Vložte obsah privátneho kľúča",
     "stats_params": "Konfigurácia štatistiky",
@@ -409,5 +427,9 @@
     "descr": "Popis",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Viac informácií</0> o vytváraní vlastných zoznamov hostiteľov.",
-    "blocked_by_response": "Blokované pomocou CNAME alebo IP v odpovedi"
+    "blocked_by_response": "Blokované pomocou CNAME alebo IP v odpovedi",
+    "try_again": "Skúste znova",
+    "domain_desc": "Zadajte meno domény alebo zástupný znak, ktorý chcete prepísať.",
+    "example_rewrite_domain": "prepísať odpovede iba pre toto meno domény.",
+    "example_rewrite_wildcard": "prepísať odpovede pre všetky subdomény <0>example.org</0>."
 }

client/src/__locales/sl.json

@@ -23,7 +23,9 @@
     "form_error_ip6_format": "Neveljaven format IPv6",
     "form_error_ip_format": "Neveljaven format IP",
     "form_error_mac_format": "Neveljaven MAC format",
+    "form_error_client_id_format": "Neveljaven format ID odjemalca",
     "form_error_positive": "Mora biti večja od 0",
+    "form_error_negative": "Mora biti enako ali več kot 0",
     "dhcp_form_gateway_input": "IP prehoda",
     "dhcp_form_subnet_input": "Maska podomrežja",
     "dhcp_form_range_title": "Razpon naslovov IP",
@@ -187,6 +189,22 @@
     "query_log_disabled": "Dnevnik poizvedb je onemogočen in ga je mogoče konfigurirati v <0>nastavitvah</0>",
     "query_log_strict_search": "Za strogo iskanje uporabite dvojne narekovaje",
     "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
+    "dns_config": "Konfiguracija strežnika DNS",
+    "blocking_mode": "Način zaviranja",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Prazen IP",
+    "custom_ip": "IP po meri",
+    "blocking_ipv4": "Onemogočanje IPv4",
+    "blocking_ipv6": "Onemogočanje IPv6",
+    "form_enter_rate_limit": "Vnesite omejitev hitrosti",
+    "rate_limit": "Omejitev hitrosti",
+    "edns_enable": "Omogoči podmrežje odjemalcev EDNS",
+    "edns_cs_desc": "Če je omogočeno, bo AdGuard Home pošiljal podmrežja odjemalca na strežnike DNS.",
+    "rate_limit_desc": "Število zahtev na sekundo, ki jih lahko pošlje posamezni odjemalec (0: neomejeno)",
+    "blocking_ipv4_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo A",
+    "blocking_ipv6_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo AAAA",
+    "blocking_mode_desc": "<0>NXDOMAIN – Odziva se s kodo NXDOMAIN;</0> <0>Prazen IP – Odziva se z ničelnim naslovom IP (0,0.0,0 za A; :: za AAAA);</0> <0>IP po meri - Odziva se z ročno nastavljenim IP naslovom.</0>",
+    "upstream_dns_client_desc": "Če pustite to polje prazno, bo AdGuard Home uporabil strežnike, konfigurirane v <0>nastavitvah DNS</0>.",
     "source_label": "Vir",
     "found_in_known_domain_db": "Najdeno v zbirki podatkov znanih domen.",
     "category_label": "Kategorija",
@@ -354,7 +372,6 @@
     "rewrite_desc": "Omogoča enostavno konfiguriranje odgovora DNS po meri za določeno ime domene.",
     "rewrite_applied": "Uporabljeno Pravilo za prepisovanje",
     "dns_rewrites": "Prepisovanja NDS",
-    "form_domain": "Vnesi domeno",
     "form_answer": "Vnesite IP naslov ali ime domene",
     "form_error_domain_format": "Neveljavna oblika domene",
     "form_error_answer_format": "Neveljavna oblika odgovora",
@@ -409,5 +426,9 @@
     "descr": "Opis",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Več o tem</0>, o ustvarjanju lastnih Seznamov nedovoljenih gostiteljev.",
-    "blocked_by_response": "Onemogočeno z CNAME ali IP v odgovoru"
+    "blocked_by_response": "Onemogočeno z CNAME ali IP v odgovoru",
+    "try_again": "Poskusi ponovno",
+    "domain_desc": "Vnesite ime domene ali nadomestni znak, ki ga želite prepisati.",
+    "example_rewrite_domain": "prepiše odgovore samo za to ime domene.",
+    "example_rewrite_wildcard": "prepiše odgovore za vse poddomene <0>example.org</0>."
 }

client/src/__locales/sr-cs.json

@@ -23,6 +23,7 @@
     "form_error_ip6_format": "Nevažeći IPv6 format",
     "form_error_ip_format": "Nevažeći IPv4 oblik",
     "form_error_mac_format": "Nevažeći MAC format",
+    "form_error_client_id_format": "Nevažeći format klijenta",
     "form_error_positive": "Mora biti veće od 0",
     "form_error_negative": "Mora biti 0 ili veće",
     "dhcp_form_gateway_input": "IP mrežnog prolaza",
@@ -427,5 +428,8 @@
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Saznajte više</0> o stvaranju vaše lične blokliste hostova.",
     "blocked_by_response": "Blokirano od CNAME ili IP u odgovoru",
-    "try_again": "Pokušaj ponovo"
+    "try_again": "Pokušaj ponovo",
+    "domain_desc": "Unesite domen ili džoker koji želite da prepišete.",
+    "example_rewrite_domain": "prepiši odgovore samo za ovaj domen.",
+    "example_rewrite_wildcard": "prepiši odgovore za sve poddomene na <0>example.org</0>."
 }

client/src/__locales/sv.json

@@ -17,7 +17,9 @@
     "dhcp_leases": "DHCP-lease",
     "dhcp_static_leases": "Statiska DHCP-leases",
     "dhcp_leases_not_found": "Ingen DHCP-lease hittad",
+    "dhcp_config_saved": "Sparade inställningar för DHCP-servern",
     "form_error_required": "Obligatoriskt fält",
+    "form_error_ip_format": "Ogiltigt IPv4-format",
     "form_error_mac_format": "Ogiltigt MAC-format",
     "form_error_positive": "Måste vara större än noll",
     "dhcp_form_gateway_input": "Gateway-IP",
@@ -77,6 +79,8 @@
     "top_clients": "Toppklienter",
     "no_clients_found": "Inga hitatde klienter",
     "general_statistics": "Allmän statistik",
+    "number_of_dns_query_days": "Ett antal DNS-förfrågningar utfördes under den senaste {{count}} dagen",
+    "number_of_dns_query_days_plural": "Ett antal DNS-förfrågningar utfördes under de senaste {{count}} dagarna",
     "number_of_dns_query_24_hours": "Ett antal DNS-förfrågningar utfördes under de senaste 244 timamrna",
     "number_of_dns_query_blocked_24_hours": "Ett antal DNS-förfrågningar blockerades av annonsfilter och värdens bloceringsklistor",
     "number_of_dns_query_blocked_24_hours_by_sec": "Ett antal DNS-förfrågningar blockerades av AdGuards modul för surfsäkerhet",
@@ -92,12 +96,14 @@
     "use_adguard_parental": "Använda AdGuards webbservice för färäldrakontroll",
     "use_adguard_parental_hint": "AdGuard Home kommer att kontrollera domäner för innehåll av vuxenmaterial . Samma integritetsvänliga metod för  API-lookup som tillämpas i webbservicens surfsäkerhet används.",
     "enforce_safe_search": "Tillämpa Säker surf",
+    "enforce_save_search_hint": "AdGuard Home kan framtvinga säker surf i följande sökmoterer: Google, Youtube, Bing, och Yandex.",
     "no_servers_specified": "Inga servrar angivna",
     "general_settings": "Allmänna inställningar",
     "dns_settings": "DNS-inställningar",
     "encryption_settings": "Krypteringsinställningar",
     "dhcp_settings": "DHCP-inställningar",
     "upstream_dns": "Upstream DNS-servrar",
+    "upstream_dns_hint": "Om du låter fältet vara tomt kommer AdGuard Home att använda <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> för uppström.",
     "test_upstream_btn": "Testa uppströmmar",
     "apply_btn": "Tillämpa",
     "disabled_filtering_toast": "Filtrering bortkopplad",
@@ -291,6 +297,7 @@
     "client_edit": "Redigera klient",
     "client_identifier": "Identifikator",
     "ip_address": "IP-adress",
+    "client_identifier_desc": "Klienter kan identifieras genom IP-adresser eller MAC-adresser. Notera att användning av MAC som identifierare bara är möjligt om AdGuard Home också är en <0>DHCP-server</0>",
     "form_enter_ip": "Skriv in IP",
     "form_enter_mac": "Skriv in MAC",
     "form_client_name": "Skriv in klientnamn",
@@ -306,16 +313,41 @@
     "access_title": "Åtkomstinställningar",
     "access_desc": "Här kan du konfigurera åtkomstregler för AdGuard Homes DNS-server.",
     "access_allowed_title": "Tillåtna klienter",
+    "access_allowed_desc": "En lista över CIDR eller IP-adresser. Om konfigurerad kommer AdGuard Home endast acceptera förfrågningar från dessa IP-adresser.",
     "access_disallowed_title": "Otillåtna klienter",
+    "access_disallowed_desc": "En lista över CIDR eller IP-adresser. Om konfigurerad kommer AdGuard Home inte acceptera förfrågningar från dessa IP-adresser.",
     "access_blocked_title": "Blockerade domäner",
+    "access_blocked_desc": "Ej att blandas ihop med filter. AdGuard Home kommer inte accepter DNS-förfrågningar innehållande dessa domäner.",
     "access_settings_saved": "Åtkomstinställningar sparade",
     "updates_checked": "Sökning efter uppdateringar genomförd",
     "updates_version_equal": "AdGuard Home är uppdaterat",
     "check_updates_now": "Sök efter uppdateringar nu",
+    "dns_privacy": "DNS-Integritet",
+    "setup_dns_privacy_1": "<0>DNS-över-TLS:</0> Använd: <1>{{address}}</1>",
+    "setup_dns_privacy_2": "<0>DNS-över-HTTPS:</0> Använd: <1>{{address}}</1>",
+    "setup_dns_privacy_3": "<0>Notera att krypterade DNS-protokoll endast stöds på Android 9. Du behöver därför installera ytterligare mjukvara för andra operativsystem.</0><0>Här är en lista över program du kan använda.</0>",
+    "setup_dns_privacy_android_1": "Android 9 har inbyggt stöd för DNS-över-TLS. Konfigurera och uppge domännamn under Inställningar → Nätverk & Internet → Avancerat → Privat DNS.",
+    "setup_dns_privacy_android_2": "<0>AdGuard för Android</0> stödjer <1>DNS-över-HTTPS</1> samt <1>DNS-över-TLS</1>.",
+    "setup_dns_privacy_android_3": "<0>Intra</0> lägger till stöd för <1>DNS-ÖVER-HTTPS</1> till Android.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> stödjer <1>DNS-ÖVER-HTTPS</1>, men för konfigurering krävs att du använder dig egen server. Du behöver generera en <2>DNS-Stämpel</2> till programmet.",
+    "setup_dns_privacy_ios_2": "<0>AdGuard för iOS</0> stödjer <1>DNS-över-HTTPS</1> samt <1>DNS-över-TLS</1>.",
+    "setup_dns_privacy_other_title": "Andra implementeringar",
+    "setup_dns_privacy_other_1": "AdGuard Home kan själv vara en säker DNS-klient på alla plattformar.",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> stödjer alla bekräftat säkra DNS-protokoll.",
+    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> stödjer <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> stödjer <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_5": "Du kan hitta fler implementeringar <0>här</0> och <1>här</1>.",
+    "setup_dns_notice": "För att kunna använda <1>DNS-över-HTTPS</1> eller <1>DNS-över-TLS</1>, behöver du <0>konfigurera Kryptering</0> i AdGuard Home-inställningar.",
+    "rewrite_added": "DNS-omskrivning för \"{{key}}\" lyckad",
+    "rewrite_deleted": "DNS-omskrivning för \"{{key}}\" har tagits bort",
     "interval_24_hour": "24 timmar",
     "domain": "Domän",
     "answer": "Svar",
+    "statistics_retention_desc": "Om du minskar intervallet kommer viss data att gå förlorad",
     "statistics_clear": " Rensa statistik",
+    "statistics_clear_confirm": "Är du säker på att du vill radera statistiken?",
+    "statistics_retention_confirm": "Är du säker på att du vill ändra retentionstiden för statistik? Om du minskar intervallet kommer viss data att gå förlorad",
+    "statistics_cleared": "Statistiken har rensats",
     "interval_hours": "{{count}} timme",
     "interval_hours_plural": "{{count}} timmar",
     "filters_configuration": "Filterinställningar",

client/src/__locales/tr.json

@@ -17,9 +17,14 @@
     "dhcp_leases": "DHCP kiralamaları",
     "dhcp_static_leases": "Sabit DHCP kiralamaları",
     "dhcp_leases_not_found": "DHCP kiralaması bulunamadı",
+    "dhcp_config_saved": "DHCP sunucusu ayarı kaydedildi",
     "form_error_required": "Gerekli alan",
+    "form_error_ip4_format": "Geçersiz IPv4 formatı",
+    "form_error_ip6_format": "Geçersiz IPv6 formatı",
+    "form_error_ip_format": "Geçersiz IPv4 formatı",
     "form_error_mac_format": "Geçersiz MAC biçimi",
     "form_error_positive": "0'dan büyük olmalı",
+    "form_error_negative": "0 veya daha büyük olmalıdır",
     "dhcp_form_gateway_input": "Ağ Geçidi IP'si",
     "dhcp_form_subnet_input": "Alt Ağ Maskesi",
     "dhcp_form_range_title": "IP adres aralığı",
@@ -41,6 +46,7 @@
     "dhcp_new_static_lease": "Yeni sabit kiralama",
     "dhcp_static_leases_not_found": "Sabit DHCP kiralaması bulunamadı",
     "dhcp_add_static_lease": "Sabit kiralama ekle",
+    "dhcp_reset": "DHCP yapılandırmasını sıfırlamak istediğinizden emin misiniz?",
     "delete_confirm": "\"{{key}}\" silmek istediğinizden emin misiniz?",
     "form_enter_hostname": "Cihaz ismi girin",
     "error_details": "Hata detayları",
@@ -69,7 +75,7 @@
     "stats_adult": "Yetişkin içerikli site engellendi",
     "stats_query_domain": "En fazla sorgulanan alan adları",
     "for_last_24_hours": "son 24 saat içindekiler",
-    "for_last_days": "son {{value}} gün için",
+    "for_last_days": "son {{count}} gün için",
     "for_last_days_plural": "son {{count}} gün boyunca",
     "no_domains_found": "Alan adı bulunamadı",
     "requests_count": "İstek sayısı",
@@ -77,7 +83,7 @@
     "top_clients": "En aktif istemciler",
     "no_clients_found": "İstemci bulunamadı",
     "general_statistics": "Genel istatistikler",
-    "number_of_dns_query_days": "Son {{value}} gün boyunca işlenen DNS sorgularının sayısı",
+    "number_of_dns_query_days": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
     "number_of_dns_query_days_plural": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
     "number_of_dns_query_24_hours": "Son 24 saat içinde işlenen DNS sorgularının sayısı",
     "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve hosts listeleri tarafından engellenmiş DNS isteklerinin sayısı",
@@ -94,13 +100,16 @@
     "use_adguard_parental": "AdGuard ebeveyn kontrolü web hizmetini kullan",
     "use_adguard_parental_hint": "AdGuard Home, alan adının yetişkin içerik bulundurup bulundurmadığını kontrol edecek. Gezinti güvenliği web hizmeti ile kullandığımız aynı gizlilik dostu API'yi kullanıyoruz.",
     "enforce_safe_search": "Güvenli aramayı zorunlu kıl",
+    "enforce_save_search_hint": "AdGuard Home şu arama motorlarında güvenli aramayı zorunlu kılabilir: Google, Youtube, Bing, DuckDuckGo ve Yandex.",
     "no_servers_specified": "Sunucu adresi girilmedi",
     "general_settings": "Genel ayarlar",
     "dns_settings": "DNS ayarları",
     "encryption_settings": "Şifreleme ayarları",
     "dhcp_settings": "DHCP ayarları",
     "upstream_dns": "Üst DNS sunucusu",
+    "upstream_dns_hint": "Eğer bu alanı boş bırakırsanız AdGuard Home üst sunucu olarak  <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> adresini kullanacaktır.",
     "test_upstream_btn": "Üst sunucuyu test et",
+    "upstreams": "Upstreams",
     "apply_btn": "Uygula",
     "disabled_filtering_toast": "Filtreleme devre dışı",
     "enabled_filtering_toast": "Filtreleme çalışıyor",
@@ -137,6 +146,7 @@
     "example_comment": "! Buraya bir yorum ekledim",
     "example_comment_meaning": "yorum eklemek",
     "example_comment_hash": "# Bir yorum daha ekledim",
+    "example_regex_meaning": "belirtilen düzenli ifadelerle eşleşen alan adlarına erişimi engelle",
     "example_upstream_regular": "normal DNS (UDP üzerinden)",
     "example_upstream_dot": "<0>DNS-over-TLS</0> şifrelemesi",
     "example_upstream_doh": "<0>DNS-over-HTTPS</0> şifrelemesi",
@@ -169,6 +179,31 @@
     "rule_added_to_custom_filtering_toast": "Kural isteğe bağlı filtreleme kurallarına eklendi",
     "query_log_response_status": "Durum: {{value}}",
     "query_log_filtered": "{{filter}} tarafından filtrelendi",
+    "query_log_confirm_clear": "Tüm sorgu günlüğünü temizlemek istediğinizden emin misiniz?",
+    "query_log_cleared": "Sorgu günlüğü başarıyla temizlendi",
+    "query_log_clear": "Sorgu kayıtlarını temizle",
+    "query_log_retention": "Sorgu kayıtlarının saklanması",
+    "query_log_enable": "Günlük kaydını etkinleştir",
+    "query_log_configuration": "Günlük yapılandırması",
+    "query_log_disabled": "Sorgu günlüğü devre dışı bırakıldı ve <0>ayarlar</0>da yapılandırılabilir",
+    "query_log_strict_search": "Katı arama için çift tırnak işareti kullanın",
+    "query_log_retention_confirm": "Sorgu günlüğü saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
+    "dns_config": "DNS sunucusu yapılandırması",
+    "blocking_mode": "Engelleme modu",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Boş IP",
+    "custom_ip": "Özel IP",
+    "blocking_ipv4": "IPv4 engelleme",
+    "blocking_ipv6": "IPv6 engelleme",
+    "form_enter_rate_limit": "Sıklık limitini girin",
+    "rate_limit": "Sıklık limiti",
+    "edns_enable": "EDNS İstemci Alt Ağını Etkinleştir",
+    "edns_cs_desc": "Etkinleştirilirse, AdGuard Home, istemcilerin alt ağlarını DNS sunucularına gönderir.",
+    "rate_limit_desc": "Tek bir istemcinin saniye başına yapmasına izin verilen istek sayısı (0: sınırsız)",
+    "blocking_ipv4_desc": "Engellenen bir A isteği için geri döndürülecek IP adresi",
+    "blocking_ipv6_desc": "Engellenen bir AAAA isteği için geri döndürülecek IP adresi",
+    "blocking_mode_desc": "<0>NXDOMAIN – NXDOMAIN ile yanıtla code;</0> <0> Boş IP – Sıfır IP adresi ile cevap verin (A için 0.0.0.0; :: AAAA için); </0> <0> Özel IP - Elle ayarlanmış bir IP adresi ile cevap verin.</0>",
+    "upstream_dns_client_desc": "Bu alanı boş tutarsanız, AdGuard Home, <0>DNS ayarlarında</0> yapılandırılmış sunucuları kullanır.",
     "source_label": "Kaynak",
     "found_in_known_domain_db": "Bilinen alan adları veri tabanı içinde bulundu",
     "category_label": "Kategori",
@@ -186,6 +221,7 @@
     "install_settings_dns_desc": "Cihazlarınızı veya yönlendiricinizi şu adresteki DNS sunucusunu kullanması için ayarlamanız gerekecek:",
     "install_settings_all_interfaces": "Tüm arayüzler",
     "install_auth_title": "Kimlik Doğrulama",
+    "install_auth_desc": "AdAdGuard Home yönetici web arayüzüne erişim için kullanıcı adı ve şifresi oluşturmanız şiddetle tavsiye edilir. Sadece yerel ağınız erişilebilir olsa bile izinsiz giriş yapılmasını engellemek için şifrenizin olması önemlidir.",
     "install_auth_username": "Kullanıcı adı",
     "install_auth_password": "Şifre",
     "install_auth_confirm": "Şifreyi onayla",
@@ -264,6 +300,8 @@
     "update_announcement": "AdGuard Home {{version}} şu an yüklenmeye hazır! Daha fazla bilgi için <0>buraya tıklayın.</0>",
     "setup_guide": "Kurulum rehberi",
     "dns_addresses": "DNS adresleri",
+    "dns_start": "DNS sunucusu başlatılıyor",
+    "dns_status_error": "DNS sunucusu durumunu alma hatası",
     "down": "kapalı",
     "fix": "Düzelt",
     "dns_providers": "Aralarından seçim yapabileceğiniz bilinen <0>DNS sağlayıcıların listesi</0>.",
@@ -282,8 +320,11 @@
     "client_edit": "İstemciyi düzenle",
     "client_identifier": "Tanımlayıcı",
     "ip_address": "IP adresi",
+    "client_identifier_desc": "İstemciler IP adresleri veya MAC adresleri ile tanımlanabilir. Lütfen not edin, MAC adresi ile tanımlamayı kullanmak için AdGuard Home'un <0>DHCP Sunucusu</0> olması gerekir.",
     "form_enter_ip": "IP Girin",
     "form_enter_mac": "MAC Girin",
+    "form_enter_id": "Tanımlayıcı girin",
+    "form_add_id": "Tanımlayıcı ekle",
     "form_client_name": "İstemci ismi girin",
     "client_global_settings": "Genel ayarları kullan",
     "client_deleted": "\"{{key}}\" istemcisi başarıyla silindi",
@@ -353,14 +394,38 @@
     "stats_params": "İstatistik yapılandırması",
     "config_successfully_saved": "Yapılandırma başarıyla kaydedildi",
     "interval_24_hour": "24 saat",
-    "interval_days": "{{value}} gün",
+    "interval_days": "{{count}} gün",
     "interval_days_plural": "{{count}} gün",
     "domain": "Alan adı",
     "answer": "Cevap",
     "filter_added_successfully": "Filtre başarıyla eklendi",
+    "statistics_configuration": "İstatistik yapılandırması",
     "statistics_retention": "İstatistikleri depolama",
     "statistics_retention_desc": "Zaman değerini azaltırsanız bazı veriler kaybolacaktır",
     "statistics_clear": " İstatistikleri temizle",
     "statistics_clear_confirm": "İstatistikleri temizlemeyi istediğinizden emin misiniz?",
-    "statistics_cleared": "İstatistikler başarıyla temizlendi"
+    "statistics_retention_confirm": "İstatistik saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
+    "statistics_cleared": "İstatistikler başarıyla temizlendi",
+    "interval_hours": "{{count}} saat",
+    "interval_hours_plural": "{{count}} saat",
+    "filters_configuration": "Filtre yapılandırması",
+    "filters_enable": "Filtreleri etkinleştir",
+    "filters_interval": "Filtreleri güncelleme sıklığı",
+    "disabled": "Devre dışı",
+    "username_label": "Kullanıcı adı",
+    "username_placeholder": "Kullanıcı adını girin",
+    "password_label": "Parola",
+    "password_placeholder": "Parolayı girin",
+    "sign_in": "Oturum aç",
+    "sign_out": "Oturumu kapat",
+    "forgot_password": "Parolanızı mı unuttunuz?",
+    "forgot_password_desc": "Kullanıcı hesabınız için yeni bir parola oluşturmak için lütfen <0>bu adımları</0> takip edin.",
+    "location": "Konum",
+    "orgname": "Organizasyon adı",
+    "netname": "Ağ adı",
+    "descr": "Açıklama",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "Ana makinelere dair kendi kara listelerinizi oluşturmakla alakalı <0>daha fazla bilgi edinin</0>.",
+    "blocked_by_response": "Cevap olarak CNAME veya IP tarafından engellendi",
+    "try_again": "Tekrar deneyin"
 }

client/src/__locales/vi.json

@@ -1,4 +1,9 @@
 {
+    "client_settings": "Cài đặt máy khách",
+    "example_upstream_reserved": "bạn có thể chỉ định DNS ngược tuyến <0>cho một tên miền cụ thể(hoặc nhiều)</0>",
+    "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
+    "bootstrap_dns": "Máy chủ DNS Bootstrap",
+    "bootstrap_dns_desc": "Máy chủ DNS Bootstrap được sử dụng để phân giải địa chỉ IP của bộ phân giải DoH/DoT mà bạn chỉ định là ngược tuyến.",
     "check_dhcp_servers": "Kiểm tra máy chủ DHCP",
     "save_config": "Lưu thiết lập",
     "enabled_dhcp": "Máy chủ DHCP đã kích hoạt",
@@ -9,9 +14,38 @@
     "dhcp_disable": "Tắt máy chủ DHCP",
     "dhcp_not_found": "Không  có máy chủ DHCP nào được tìm thấy trong mạng. Có thể bật máy chủ DHCP một cách an toàn",
     "dhcp_found": "Đã tìm thấy máy chủ DHCP trong mạng. Có thể có rủi ro nếu kích hoạt máy chủ DHCP dựng sẵn",
+    "dhcp_leases": "Thuê DHCP",
+    "dhcp_static_leases": "Thuê DHCP tĩnh",
+    "dhcp_leases_not_found": "Không tìm thấy DHCP cho thuê",
+    "dhcp_config_saved": "Đã lưu cấu hình máy chủ DHCP",
+    "form_error_required": "Trường bắt buộc",
+    "form_error_ip_format": "Định dạng IPv4 không hợp lệ",
+    "form_error_mac_format": "Định dạng MAC không hợp lệ",
     "form_error_positive": "Phải lớn hơn 0",
+    "dhcp_form_gateway_input": "Cổng IP",
+    "dhcp_form_subnet_input": "Mặt nạ mạng con",
+    "dhcp_form_range_title": "Phạm vi của địa chỉ IP",
+    "dhcp_form_range_start": "Phạm vi bắt đầu",
     "dhcp_form_range_end": "IP kết thúc",
+    "dhcp_form_lease_title": "Thời gian thuê DHCP (tính bằng giây)",
+    "dhcp_form_lease_input": "Thời hạn thuê",
     "dhcp_interface_select": "Chọn một card mạng",
+    "dhcp_hardware_address": "Địa chỉ phần cứng",
+    "dhcp_ip_addresses": "Các địa chỉ IP",
+    "dhcp_table_hostname": "Tên máy chủ",
+    "dhcp_table_expires": "Hết hạn",
+    "dhcp_warning": "Nếu bạn vẫn muốn bật máy chủ DHCP, hãy đảm bảo rằng không có máy chủ DHCP hoạt động nào khác trong mạng của bạn. Nếu không, nó có thể phá vỡ Internet cho các thiết bị được kết nối!",
+    "dhcp_error": "Chúng tôi không thể xác định liệu có một máy chủ DHCP khác trong mạng hay không.",
+    "dhcp_static_ip_error": "Để sử dụng máy chủ DHCP, phải đặt địa chỉ IP tĩnh. Chúng tôi không thể xác định xem giao diện mạng này có được cấu hình bằng địa chỉ IP tĩnh hay không. Vui lòng đặt địa chỉ IP tĩnh theo cách thủ công.",
+    "dhcp_dynamic_ip_found": "Hệ thống của bạn sử dụng cấu hình địa chỉ IP động cho giao diện <0>{{interfaceName}}</0>. Để sử dụng máy chủ DHCP, phải đặt địa chỉ IP tĩnh. Địa chỉ IP hiện tại của bạn là <0>{{ipAddress}}</0>. Chúng tôi sẽ tự động đặt địa chỉ IP này thành tĩnh nếu bạn nhấn nút Bật DHCP.",
+    "dhcp_lease_added": "Cho thuê tĩnh \"{{key}}\" đã được thêm thành công",
+    "dhcp_lease_deleted": "Cho thuê tĩnh \"{{key}}\" đã xóa thành công",
+    "dhcp_new_static_lease": "Cho thuê tĩnh mới",
+    "dhcp_static_leases_not_found": "Không tìm thấy DHCP cho thuê tĩnh",
+    "dhcp_add_static_lease": "Thêm thuê tĩnh",
+    "delete_confirm": "Bạn có chắc chắn muốn xóa \"{{key}}\" không?",
+    "form_enter_hostname": "Nhập tên máy chủ",
+    "error_details": "Chi tiết lỗi",
     "back": "Quay lại",
     "dashboard": "Tổng quan",
     "settings": "Cài đặt",
@@ -25,22 +59,29 @@
     "copyright": "Bản quyền",
     "homepage": "Trang chủ",
     "report_an_issue": "Báo lỗi",
+    "privacy_policy": "Chính sách riêng tư",
     "enable_protection": "Bật bảo vệ",
     "enabled_protection": "Đã bật bảo vệ",
     "disable_protection": "Tắt bảo vệ",
     "disabled_protection": "Đã tắt bảo vệ",
     "refresh_statics": "Làm mới thống kê",
     "dns_query": "Truy vấn DNS",
+    "blocked_by": "Chặn bởi Bộ lọc",
     "stats_malware_phishing": "Mã độc/lừa đảo đã chặn",
     "stats_adult": "Website người lớn đã chặn",
     "stats_query_domain": "Tên miền truy vấn nhiều",
     "for_last_24_hours": "trong 24 giờ qua",
+    "for_last_days": "trong {{count}} ngày qua",
+    "for_last_days_plural": "trong {{count}} ngày qua",
     "no_domains_found": "Không có tên miền nào",
     "requests_count": "Số lần yêu cầu",
     "top_blocked_domains": "Tên miền chặn nhiều",
     "top_clients": "Client dùng nhiều",
     "no_clients_found": "Không có client nào",
     "general_statistics": "Thống kê chung",
+    "number_of_dns_query_days": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
+    "number_of_dns_query_days_plural": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
+    "number_of_dns_query_24_hours": "Số yêu cầu DNS đã xử lý trong 24 giờ qua",
     "number_of_dns_query_blocked_24_hours": "Số yêu cầu DNS bị chặn bởi bộ lọc quảng cáo và danh sách chặn host",
     "number_of_dns_query_blocked_24_hours_by_sec": "Số yêu cầu DNS bị chặn bởi chế độ bảo vệ duyệt web AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Số website người lớn đã chặn",
@@ -55,9 +96,14 @@
     "use_adguard_parental": "Sử dụng dịch vụ quản lý của phụ huynh AdGuard",
     "use_adguard_parental_hint": "AdGuard Home sẽ kiểm tra nếu tên miền chứa từ khoá người lớn. Tính năng sử dụng API thân thiện với quyền riêng tư tương tự với dịch vụ bảo vệ duyệt web",
     "enforce_safe_search": "Bắt buộc tìm kiếm an toàn",
+    "enforce_save_search_hint": "AdGuard Home có thể bắt buộc tìm kiếm an toàn với các dịch vụ tìm kiếm: Google, Youtube, Bing, Yandex.",
     "no_servers_specified": "Không có máy chủ nào được liệt kê",
     "general_settings": "Cài đặt chung",
+    "dns_settings": "Cài đặt DNS",
+    "encryption_settings": "Cài đặt mã hóa",
+    "dhcp_settings": "Cài đặt DHCP",
     "upstream_dns": "Máy chủ DNS tìm kiếm",
+    "upstream_dns_hint": "Nếu bạn để trống mục này, AdGuard Home sẽ sử dụng <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> để tìm kiếm. Sử dụng tiền tố tls:// cho các máy chủ DNS dựa trên TLS.",
     "test_upstream_btn": "Kiểm tra",
     "apply_btn": "Áp dụng",
     "disabled_filtering_toast": "Đã tắt chặn quảng cáo",
@@ -74,6 +120,7 @@
     "rules_count_table_header": "Số quy tắc",
     "last_time_updated_table_header": "Cập nhật cuối",
     "actions_table_header": "Thao tác",
+    "edit_table_action": "Chỉnh sửa",
     "delete_table_action": "Xoá",
     "filters_and_hosts": "Danh sách bộ lọc và hosts",
     "filters_and_hosts_hint": "AdGuard home hiểu các quy tắc chặn quảng cáo đơn giản và cú pháp file hosts",
@@ -94,6 +141,7 @@
     "example_comment": "! Đây là một chú thích",
     "example_comment_meaning": "Chỉ là một chú thích",
     "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 <0>biểu thức chính được quy định</0>",
     "example_upstream_regular": "DNS thông thường (dùng UDP)",
     "example_upstream_dot": "được mã hoá <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
     "example_upstream_doh": "được mã hoá <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
@@ -124,10 +172,233 @@
     "updated_custom_filtering_toast": "Đã cập nhật quy tắc lọc tuỳ chỉnh",
     "rule_removed_from_custom_filtering_toast": "Quy tắc đã được xoá khỏi quy tắc lọc tuỳ chỉnh",
     "rule_added_to_custom_filtering_toast": "Quy tắc đã được thêm vào quy tắc lọc tuỳ chỉnh",
+    "query_log_response_status": "Trạng thái: {{value}}",
+    "query_log_filtered": "Được lọc bởi {{filter}}",
+    "query_log_confirm_clear": "Bạn có chắc chắn muốn xóa toàn bộ nhật ký truy vấn không?",
+    "query_log_cleared": "Nhật ký truy vấn đã được xóa thành công",
+    "query_log_clear": "Xóa nhật ký truy vấn",
+    "query_log_retention": "Lưu giữ nhật ký truy vấn",
+    "query_log_enable": "Bật nhật ký",
+    "query_log_configuration": "Cấu hình nhật ký",
+    "query_log_disabled": "Nhật ký truy vấn bị vô hiệu hóa và có thể được định cấu hình trong <0>cài đặt</ 0>",
+    "query_log_strict_search": "Sử dụng dấu ngoặc kép để tìm kiếm nghiêm ngặt",
+    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ nhật ký truy vấn? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
     "source_label": "Nguồn",
     "found_in_known_domain_db": "Tìm thấy trong cơ sở dữ liệu tên miền",
     "category_label": "Thể loại",
     "rule_label": "Quy tắc",
     "filter_label": "Bộ lọc",
-    "unknown_filter": "Bộ lọc không rõ {{filterId}}"
+    "unknown_filter": "Bộ lọc không rõ {{filterId}}",
+    "install_welcome_title": "Chào mừng bạn đến với AdGuard Home!",
+    "install_welcome_desc": "AdGuard Home là một máy chủ DNS chặn quảng cáo và theo dõi trên toàn mạng. Mục đích của nó là cho phép bạn kiểm soát toàn bộ mạng và tất cả các thiết bị của mình và không yêu cầu sử dụng chương trình phía máy khách.",
+    "install_settings_title": "Giao Diện Web Quản Trị",
+    "install_settings_listen": "Giao diện nghe",
+    "install_settings_port": "Cổng",
+    "install_settings_interface_link": "Giao diện web quản trị viên AdGuard Home của bạn sẽ có sẵn trên các địa chỉ sau:",
+    "form_error_port": "Nhập giá trị cổng hợp lệ",
+    "install_settings_dns": "Máy chủ DNS",
+    "install_settings_dns_desc": "Bạn sẽ cần định cấu hình thiết bị hoặc bộ định tuyến của mình để sử dụng máy chủ DNS trên các địa chỉ sau:",
+    "install_settings_all_interfaces": "Tất cả các giao diện",
+    "install_auth_title": "Xác thực",
+    "install_auth_desc": "Rất khuyến khích cấu hình xác thực mật khẩu cho giao diện web quản trị viên AdGuard Home của bạn. Ngay cả khi nó chỉ có thể truy cập được trong mạng cục bộ của bạn, điều quan trọng là phải bảo vệ nó khỏi sự truy cập không hạn chế.",
+    "install_auth_username": "Tên đăng nhập",
+    "install_auth_password": "Mật khẩu",
+    "install_auth_confirm": "Xác nhận mật khẩu",
+    "install_auth_username_enter": "Nhập tên đăng nhập",
+    "install_auth_password_enter": "Nhập mật khẩu",
+    "install_step": "Bước",
+    "install_devices_title": "Định cấu hình thiết bị của bạn",
+    "install_devices_desc": "Để bắt đầu sử dụng AdGuard Home, bạn cần định cấu hình thiết bị của mình để sử dụng nó.",
+    "install_submit_title": "Xin chúc mừng!",
+    "install_submit_desc": "Quy trình thiết lập đã kết thúc và bạn đã sẵn sàng bắt đầu sử dụng AdGuard Home.",
+    "install_devices_router": "Bộ định tuyến",
+    "install_devices_router_desc": "Thiết lập này sẽ tự động bao gồm tất cả các thiết bị được kết nối với bộ định tuyến gia đình của bạn và bạn sẽ không cần phải định cấu hình từng thiết bị theo cách thủ công.",
+    "install_devices_address": "Máy chủ DNS của AdGuard Home đang lắng nghe các địa chỉ sau",
+    "install_devices_router_list_1": "Mở các tùy chọn cho bộ định tuyến của bạn. Thông thường, bạn có thể truy cập nó từ trình duyệt của mình thông qua một URL (như http://192.168.0.1/ hoặc http://192.168.1.1/). Bạn có thể được yêu cầu nhập mật khẩu. Nếu bạn không nhớ nó, bạn có thể thường xuyên đặt lại mật khẩu bằng cách nhấn một nút trên chính bộ định tuyến. Một số bộ định tuyến yêu cầu một ứng dụng cụ thể, trong trường hợp đó nên được cài đặt trên máy tính/điện thoại của bạn.",
+    "install_devices_router_list_2": "Tìm cài đặt DHCP/DNS. Tìm các chữ cái DNS bên cạnh một trường cho phép hai hoặc ba bộ số, mỗi bộ được chia thành bốn nhóm từ một đến ba chữ số.",
+    "install_devices_router_list_3": "Nhập địa chỉ máy chủ AdGuard Home của bạn ở đó.",
+    "install_devices_windows_list_1": "Mở Control Panel thông qua Trình đơn Bắt đầu hoặc Tìm kiếm Windows.",
+    "install_devices_windows_list_2": "Chuyển đến danh mục Mạng và Internet, sau đó đến Trung tâm Mạng và Chia sẻ.",
+    "install_devices_windows_list_3": "Ở bên trái màn hình, tìm Thay đổi cài đặt bộ điều hợp và nhấp vào nó.",
+    "install_devices_windows_list_4": "Chọn kết nối hoạt động của bạn, nhấp chuột phải vào nó và chọn Thuộc tính.",
+    "install_devices_windows_list_5": "Tìm Giao Thức Internet Phiên Bản 4 (TCP/IP) trong danh sách, chọn nó và sau đó nhấp vào Thuộc tính một lần nữa.",
+    "install_devices_windows_list_6": "Chọn Sử dụng các địa chỉ máy chủ DNS sau và nhập địa chỉ máy chủ AdGuard Home của bạn.",
+    "install_devices_macos_list_1": "Nhấp vào biểu tượng Apple và đi đến Tùy Chọn Hệ Thống.",
+    "install_devices_macos_list_2": "Nhấp vào Mạng.",
+    "install_devices_macos_list_3": "Chọn kết nối đầu tiên trong danh sách của bạn và nhấp vào Nâng cao.",
+    "install_devices_macos_list_4": "Chọn thẻ DNS và nhập địa chỉ máy chủ AdGuard Home của bạn.",
+    "install_devices_android_list_1": "Từ màn hình chính của Trình Đơn Android, chạm Cài đặt.",
+    "install_devices_android_list_2": "Nhấp Wi-Fi trên trình đơn. Màn hình liệt kê tất cả các mạng khả dụng sẽ được hiển thị (không thể đặt DNS tùy chỉnh cho kết nối di động).",
+    "install_devices_android_list_3": "Nhấn và giữ mạng mà bạn đã kết nối và chạm Sửa Đổi Mạng.",
+    "install_devices_android_list_4": "Trên một số thiết bị, bạn có thể cần chọn hộp Nâng cao để xem thêm cài đặt. Để điều chỉnh cài đặt DNS Android của bạn, bạn sẽ cần chuyển cài đặt IP từ DHCP sang Tĩnh.",
+    "install_devices_android_list_5": "Thay đổi giá trị DNS 1 và DNS 2 thành địa chỉ máy chủ AdGuard Home của bạn.",
+    "install_devices_ios_list_1": "Từ màn hình chính, chạm Cài đặt.",
+    "install_devices_ios_list_2": "Chọn Wi-Fi trong trình đơn bên trái (không thể định cấu hình DNS cho mạng di động).",
+    "install_devices_ios_list_3": "Chạm vào tên của mạng hiện đang hoạt động.",
+    "install_devices_ios_list_4": "Trong trường DNS nhập địa chỉ máy chủ AdGuard Home của bạn.",
+    "get_started": "Bắt Đầu",
+    "next": "Tiếp",
+    "open_dashboard": "Mở Bảng Điều Khiển",
+    "install_saved": "Đã lưu thành công",
+    "encryption_title": "Mã hóa",
+    "encryption_desc": "Hỗ trợ mã hóa (HTTPS/TLS) cho cả giao diện web quản trị viên và DNS",
+    "encryption_config_saved": "Đã lưu cấu hình mã hóa",
+    "encryption_server": "Tên máy chủ",
+    "encryption_server_enter": "Nhập tên miền của bạn",
+    "encryption_server_desc": "Để sử dụng HTTPS, bạn cần nhập tên máy chủ phù hợp với chứng chỉ SSL của bạn.",
+    "encryption_redirect": "Tự động chuyển hướng đến HTTPS",
+    "encryption_redirect_desc": "Nếu được chọn, AdGuard Home sẽ tự động chuyển hướng bạn từ địa chỉ HTTP sang địa chỉ HTTPS.",
+    "encryption_https": "Cổng HTTPS",
+    "encryption_https_desc": "Nếu cổng HTTPS được định cấu hình, giao diện quản trị viên AdGuard Home sẽ có thể truy cập thông qua HTTPS và nó cũng sẽ cung cấp DNS-over-HTTPS trên vị trí '/dns-query'.",
+    "encryption_dot": "Cổng DNS-over-TLS",
+    "encryption_dot_desc": "Nếu cổng này được định cấu hình, AdGuard Home sẽ chạy máy chủ DNS-over-TLS trên cổng này.",
+    "encryption_certificates": "Giấy chứng nhận",
+    "encryption_certificates_desc": "Để sử dụng mã hóa, bạn cần cung cấp chuỗi chứng chỉ SSL hợp lệ cho miền của mình. Bạn có thể nhận chứng chỉ miễn phí trên <0>{{link}}</0> hoặc bạn có thể mua chứng chỉ từ một trong các Cơ Quan Chứng Nhận tin cậy.",
+    "encryption_certificates_input": "Sao chép/dán chứng chỉ được mã hóa PEM của bạn tại đây.",
+    "encryption_status": "Trạng thái",
+    "encryption_expire": "Hết hạn",
+    "encryption_key": "Khóa riêng",
+    "encryption_key_input": "Sao chép/dán khóa riêng được mã hóa PEM cho chứng chỉ của bạn tại đây.",
+    "encryption_enable": "Kích Hoạt Mã Hóa (HTTPS, DNS-over-HTTPS và DNS-over-TLS)",
+    "encryption_enable_desc": "Nếu mã hóa được bật, giao diện quản trị viên AdGuard Home sẽ hoạt động trên HTTPS và máy chủ DNS sẽ lắng nghe các yêu cầu qua DNS-over-HTTPS và DNS-over-TLS.",
+    "encryption_chain_valid": "Chuỗi chứng chỉ hợp lệ",
+    "encryption_chain_invalid": "Chuỗi chứng chỉ không hợp lệ",
+    "encryption_key_valid": "Đây là khóa riêng {{type}} hợp lệ",
+    "encryption_key_invalid": "Đây là khóa riêng {{type}} không hợp lệ",
+    "encryption_subject": "Chủ đề",
+    "encryption_issuer": "Phát hành",
+    "encryption_hostnames": "Tên máy chủ",
+    "encryption_reset": "Bạn có chắc chắn muốn đặt lại cài đặt mã hóa?",
+    "topline_expiring_certificate": "Chứng chỉ SSL của bạn sắp hết hạn. Cập nhật <0>Cài đặt mã hóa</0>.",
+    "topline_expired_certificate": "Chứng chỉ SSL của bạn đã hết hạn. Cập nhật <0>Cài đặt mã hóa</0>.",
+    "form_error_port_range": "Nhập giá trị cổng trong phạm vi 80-65535",
+    "form_error_port_unsafe": "Đây là một cổng không an toàn",
+    "form_error_equal": "Không nên bằng nhau",
+    "form_error_password": "Mật khẩu không khớp",
+    "reset_settings": "Đặt lại cài đặt",
+    "update_announcement": "AdGuard Home {{version}} hiện có sẵn! <0>Chạm vào đây</0> để biết thêm thông tin.",
+    "setup_guide": "Hướng dẫn thiết lập",
+    "dns_addresses": "Địa chỉ DNS",
+    "down": "Xuống",
+    "fix": "Sửa",
+    "dns_providers": "Dưới đây là một <0>danh sách của các nhà cung cấp DNS đã biết</0> để lựa chọn.",
+    "update_now": "Cập nhật ngay",
+    "update_failed": "Tự động cập nhật thất bại. Vui lòng <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>làm theo các bước</a> để cập nhật thủ công.",
+    "processing_update": "Xin vui lòng chờ, AdGuard Home đang được cập nhật",
+    "clients_title": "Máy khách",
+    "clients_desc": "Định cấu hình thiết bị được kết nối với AdGuard Home",
+    "settings_global": "Toàn cầu",
+    "settings_custom": "Tùy chỉnh",
+    "table_client": "Máy khách",
+    "table_name": "Tên",
+    "save_btn": "Lưu",
+    "client_add": "Thêm Máy Khách",
+    "client_new": "Máy Khách Mới",
+    "client_edit": "Chỉnh Sửa Máy Khách",
+    "client_identifier": "Định danh",
+    "ip_address": "Địa chỉ IP",
+    "client_identifier_desc": "Các máy khách có thể được xác định bằng địa chỉ IP hoặc địa chỉ MAC. Xin lưu ý rằng chỉ có thể sử dụng MAC làm định danh nếu AdGuard Home cũng là <0>máy chủ DHCP</0>",
+    "form_enter_ip": "Nhập IP",
+    "form_enter_mac": "Nhập MAC",
+    "form_client_name": "Nhập tên máy khách",
+    "client_global_settings": "Sử dụng cài đặt toàn cầu",
+    "client_deleted": "Máy khách \"{{key}}\" đã xóa thành công",
+    "client_added": "Máy khách \"{{key}}\" đã thêm thành công",
+    "client_updated": "Máy khách \"{{key}}\" đã cập nhật thành công",
+    "clients_not_found": "Không tìm thấy máy khách",
+    "client_confirm_delete": "Bạn có chắc chắn muốn xóa máy khách \"{{key}}\" không?",
+    "filter_confirm_delete": "Bạn có chắc chắn muốn xóa bộ lọc?",
+    "auto_clients_title": "Máy khách (thời gian chạy)",
+    "auto_clients_desc": "Dữ liệu trên các máy khách sử dụng AdGuard Home, nhưng không được lưu trong cấu hình",
+    "access_title": "Cài đặt truy cập",
+    "access_desc": "Tại đây bạn có thể định cấu hình quy tắc truy cập cho máy chủ AdGuard Home DNS.",
+    "access_allowed_title": "Máy chủ được phép",
+    "access_allowed_desc": "Một danh sách các địa chỉ CIDR hoặc IP. Nếu được định cấu hình, AdGuard Home sẽ chỉ chấp nhận các yêu cầu từ các địa chỉ IP này.",
+    "access_disallowed_title": "Máy chủ không được phép",
+    "access_disallowed_desc": "Một danh sách các địa chỉ CIDR hoặc IP. Nếu được định cấu hình, AdGuard Home sẽ bỏ yêu cầu từ các địa chỉ IP này.",
+    "access_blocked_title": "Tên miền bị chặn",
+    "access_blocked_desc": "Đừng nhầm lẫn điều này với các bộ lọc. AdGuard Home sẽ bỏ các truy vấn DNS với các tên miền này trong câu hỏi của truy vấn.",
+    "access_settings_saved": "Cài đặt truy cập đã lưu thành công",
+    "updates_checked": "Đã kiểm tra thành công cập nhật",
+    "updates_version_equal": "AdGuard Home đã được cập nhật",
+    "check_updates_now": "Kiểm tra cập nhật ngay bây giờ",
+    "dns_privacy": "DNS Riêng Tư",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
+    "setup_dns_privacy_3": "<0>Xin lưu ý rằng các giao thức DNS được mã hóa chỉ được hỗ trợ trên Android 9. Vì vậy, bạn cần cài đặt phần mềm bổ sung cho các hệ điều hành khác.</0><0>Đây là danh sách các phần mềm bạn có thể sử dụng.</0>",
+    "setup_dns_privacy_android_1": "Android 9 hỗ trợ DNS trên TLS nguyên bản. Để định cấu hình, hãy đi tới Cài đặt → Mạng & internet → Nâng cao → DNS Riêng Tư và nhập tên miền của bạn vào đó.",
+    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> hỗ trợ <1>DNS-over-HTTPS</1> và <1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_android_3": "<0>Intra</0> thêm <1>DNS-over-HTTPS</1> hỗ trợ cho Android.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> hỗ trợ <1>DNS-over-HTTPS</1>, nhưng để định cấu hình nó để sử dụng máy chủ của riêng bạn, bạn sẽ cần phải tạo một <2>DNS Stamp</2> cho nó.",
+    "setup_dns_privacy_ios_2": "<0>AdGuard for iOS</0> hỗ trợ thiết lập <1>DNS-over-HTTPS</1> và <1>DNS-over-TLS</1>.",
+    "setup_dns_privacy_other_title": "Triển khai khác",
+    "setup_dns_privacy_other_1": "Bản thân AdGuard Home có thể là máy khách DNS an toàn trên mọi nền tảng.",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> hỗ trợ tất cả các giao thức DNS bảo mật đã biết.",
+    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> hỗ trợ <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> hỗ trợ <1>DNS-over-HTTPS</1>.",
+    "setup_dns_privacy_other_5": "Bạn sẽ tìm thấy nhiều triển khai hơn <0>tại đây</0> và <1>tại đây</1>.",
+    "setup_dns_notice": "Để sử dụng <1>DNS-over-HTTPS</1> hoặc <1>DNS-over-TLS</1>, bạn cần <0>định cấu hình Mã hóa</0> trong cài đặt AdGuard Home.",
+    "rewrite_added": "DNS viết lại cho \"{{key}}\" đã thêm thành công",
+    "rewrite_deleted": "DNS viết lại cho \"{{key}}\" đã xóa thành công",
+    "rewrite_add": "Thêm DNS viết lại",
+    "rewrite_not_found": "Không tìm thấy DNS viết lại",
+    "rewrite_confirm_delete": "Bạn có chắc chắn muốn xóa DNS viết lại cho \"{{key}}\" không?",
+    "rewrite_desc": "Cho phép dễ dàng định cấu hình tùy chỉnh DNS phản hồi cho một tên miền cụ thể.",
+    "rewrite_applied": "Đã áp dụng quy tắc Viết lại",
+    "dns_rewrites": "DNS viết lại",
+    "form_domain": "Nhập tên miền",
+    "form_answer": "Nhập địa chỉ IP hoặc tên miền",
+    "form_error_domain_format": "Định dạng tên miền không hợp lệ",
+    "form_error_answer_format": "Định dạng câu trả lời không hợp lệ",
+    "configure": "Cấu hình",
+    "main_settings": "Cài đặt chính",
+    "block_services": "Chặn các dịch vụ cụ thể",
+    "blocked_services": "Dịch vụ bị chặn",
+    "blocked_services_desc": "Cho phép nhanh chóng chặn các trang web và dịch vụ phổ biến.",
+    "blocked_services_saved": "Dịch vụ bị chặn đã lưu thành công",
+    "blocked_services_global": "Sử dụng các dịch vụ bị chặn toàn cầu",
+    "blocked_service": "Dịch vụ bị chặn",
+    "block_all": "Chặn tất cả",
+    "unblock_all": "Bỏ chặn tất cả",
+    "encryption_certificate_path": "Đường dẫn chứng chỉ",
+    "encryption_private_key_path": "Đường dẫn khóa riêng",
+    "encryption_certificates_source_path": "Đặt đường dẫn tệp chứng chỉ",
+    "encryption_certificates_source_content": "Dán nội dung chứng chỉ",
+    "encryption_key_source_path": "Đặt tệp khóa riêng",
+    "encryption_key_source_content": "Dán nội dung khóa riêng",
+    "stats_params": "Cấu hình thống kê",
+    "config_successfully_saved": "Cấu hình được lưu thành công",
+    "interval_24_hour": "24 giờ",
+    "interval_days": "{{count}} ngày",
+    "interval_days_plural": "{{count}} ngày",
+    "domain": "Tên miền",
+    "answer": "Trả lời",
+    "filter_added_successfully": "Bộ lọc đã được thêm thành công",
+    "statistics_configuration": "Cấu hình thống kê",
+    "statistics_retention": "Duy trì thống kê",
+    "statistics_retention_desc": "Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
+    "statistics_clear": " Xoá thống kê",
+    "statistics_clear_confirm": "Bạn có chắc chắn muốn xóa số liệu thống kê?",
+    "statistics_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ số liệu thống kê? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
+    "statistics_cleared": "Xoá thống kê thành công",
+    "interval_hours": "{{count}} giờ",
+    "interval_hours_plural": "{{count}} giờ",
+    "filters_configuration": "Cấu hình bộ lọc",
+    "filters_enable": "Kích hoạt bộ lọc",
+    "filters_interval": "Khoảng thời gian cập nhật bộ lọc",
+    "disabled": "Đã vô hiệu",
+    "username_label": "Tên đăng nhập",
+    "username_placeholder": "Nhập tên đăng nhập",
+    "password_label": "Mật khẩu",
+    "password_placeholder": "Nhập mật khẩu",
+    "sign_in": "Đăng nhập",
+    "sign_out": "Đăng xuất",
+    "forgot_password": "Quên mật khẩu?",
+    "forgot_password_desc": "Vui lòng làm theo <0>các bước này</0> để tạo mật khẩu mới cho tài khoản người dùng của bạn.",
+    "location": "Vị trí",
+    "orgname": "Tên tổ chức",
+    "netname": "Tên mạng",
+    "descr": "Mô tả",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Tìm hiểu thêm</0> về việc tạo danh sách chặn máy chủ của riêng bạn."
 }

client/src/__locales/zh-cn.json

@@ -17,9 +17,15 @@
     "dhcp_leases": "DHCP 租约",
     "dhcp_static_leases": "DHCP 静态租约",
     "dhcp_leases_not_found": "未检测到 DHCP 租约",
+    "dhcp_config_saved": "已保存 DHCP 服务器配置",
     "form_error_required": "必填字段",
+    "form_error_ip4_format": "无效的 IPv4 格式",
+    "form_error_ip6_format": "无效的 IPv6 格式",
+    "form_error_ip_format": "无效的 IPv4 格式",
     "form_error_mac_format": "无效的 MAC 格式",
+    "form_error_client_id_format": "无效的客户端 ID 格式",
     "form_error_positive": "必须大于 0",
+    "form_error_negative": "必须大于等于 0",
     "dhcp_form_gateway_input": "网关 IP",
     "dhcp_form_subnet_input": "子网掩码",
     "dhcp_form_range_title": "IP 地址范围",
@@ -41,6 +47,7 @@
     "dhcp_new_static_lease": "新建静态租约",
     "dhcp_static_leases_not_found": "未找到 DHCP 静态租约",
     "dhcp_add_static_lease": "添加静态租约",
+    "dhcp_reset": "您确定要重置DHCP设定么？",
     "delete_confirm": "您确定要删除 \"{{key}}\"？",
     "form_enter_hostname": "输入主机名称",
     "error_details": "详细错误信息",
@@ -64,16 +71,22 @@
     "disabled_protection": "保护已禁用",
     "refresh_statics": "刷新状态",
     "dns_query": "DNS查询",
+    "blocked_by": "已被过滤器拦截",
     "stats_malware_phishing": "被拦截的恶意/钓鱼网站",
     "stats_adult": "被拦截的成人网站",
     "stats_query_domain": "请求域名排行",
     "for_last_24_hours": "在过去 24 小时",
+    "for_last_days": "最近 {{count}} 天",
+    "for_last_days_plural": "最近 {{count}} 天",
     "no_domains_found": "未找到域名",
     "requests_count": "请求数",
     "top_blocked_domains": "被拦截域名排行",
     "top_clients": "客户端排行",
     "no_clients_found": "未找到客户端",
     "general_statistics": "概况统计",
+    "number_of_dns_query_days": "过去 {{count}} 天内 处理的DNS 查询总数",
+    "number_of_dns_query_days_plural": "在过去的 {{count}} 天内处理了多少个 DNS 查询",
+    "number_of_dns_query_24_hours": "过去 24 小时内处理的 DNS 请求总数",
     "number_of_dns_query_blocked_24_hours": "被广告过滤器和 Hosts 拦截清单拦截的 DNS 请求总数",
     "number_of_dns_query_blocked_24_hours_by_sec": "被 AdGuard 安全浏览模块拦截的 DNS 请求总数",
     "number_of_dns_query_blocked_24_hours_adult": "被拦截的成人网站总数",
@@ -88,13 +101,16 @@
     "use_adguard_parental": "使用 AdGuard 【家长控制】服务",
     "use_adguard_parental_hint": "AdGuard Home 将使用与浏览安全服务相同的隐私性强的 API 来检查域名指向的网站是否包含成人内容。",
     "enforce_safe_search": "强制安全搜索",
+    "enforce_save_search_hint": "AdGuard Home 将对以下搜索引擎强制启用安全搜索：Google、YouTube、Bing 和 Yandex。",
     "no_servers_specified": "未找到指定的服务器",
     "general_settings": "常规设置",
     "dns_settings": "DNS 设置",
     "encryption_settings": "加密设置",
     "dhcp_settings": "DHCP 设置",
     "upstream_dns": "上游 DNS 服务器",
+    "upstream_dns_hint": "如果此处留空，AdGuard Home 将会使用 <a href='https://www.quad9.net/' target='_blank'>Quad9</a> 作为上游 DNS。如果想要使用使用 DNS over TLS，请以 tls:// 为开头。",
     "test_upstream_btn": "测试上游 DNS",
+    "upstreams": "上游服务器",
     "apply_btn": "应用",
     "disabled_filtering_toast": "过滤器已禁用",
     "enabled_filtering_toast": "过滤器已启用",
@@ -131,6 +147,7 @@
     "example_comment": "! 这是一行注释",
     "example_comment_meaning": "只是一条注释",
     "example_comment_hash": "# 这也是一行注释",
+    "example_regex_meaning": "阻止访问与<0>指定的正则表达式</0>匹配的域",
     "example_upstream_regular": "常规 DNS（基于 UDP）",
     "example_upstream_dot": "加密 <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
     "example_upstream_doh": "加密 <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
@@ -161,6 +178,33 @@
     "updated_custom_filtering_toast": "自定义过滤规则已更新",
     "rule_removed_from_custom_filtering_toast": "规则已从自定义过滤规则列表中移除",
     "rule_added_to_custom_filtering_toast": "规则已添加到自定义过滤规则列表中",
+    "query_log_response_status": "状态： {{value}}",
+    "query_log_filtered": "被 {{filter}} 过滤",
+    "query_log_confirm_clear": "你确定想要清除全部查询日志吗？",
+    "query_log_cleared": "查询日志已成功清除",
+    "query_log_clear": "清除查询日志",
+    "query_log_retention": "查询记录保留时间",
+    "query_log_enable": "启用日志",
+    "query_log_configuration": "日志配置",
+    "query_log_disabled": "查询日志已禁用，在<0>这些设置</0>中能配置它们",
+    "query_log_strict_search": "使用双引号进行严谨搜索",
+    "query_log_retention_confirm": "您确定要更改查询记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
+    "dns_config": "DNS服务设定",
+    "blocking_mode": "拦截模式",
+    "nxdomain": "无效域名",
+    "null_ip": "无效 IP",
+    "custom_ip": "自定义 IP",
+    "blocking_ipv4": "拦截 IPv4",
+    "blocking_ipv6": "拦截 IPv6",
+    "form_enter_rate_limit": "输入限制速率",
+    "rate_limit": "速度限制",
+    "edns_enable": "使用客户端的子网地址（EDNS)",
+    "edns_cs_desc": "启用后AdGuard Home将会向DNS服务器发送客户端的子网地址进行查询",
+    "rate_limit_desc": "每个客户端每秒钟查询次数的限制 (0：不限制)",
+    "blocking_ipv4_desc": "拦截 A 记录请求返回的 IP 地址",
+    "blocking_ipv6_desc": "拦截 AAAA 记录请求返回的 IP 地址",
+    "blocking_mode_desc": "<0>无效域名 – 返回 NXDOMAIN 响应；</0> <0>无效 IP – 返回零 IP 地址（A记录：0.0.0.0；AAAA记录：::）；</0> <0>自定义 IP – 返回手动设置的 IP 地址。</0>",
+    "upstream_dns_client_desc": "如果将此字段留空，AdGuard Home 将使用在<0>DNS设置</0>中配置的服务器。",
     "source_label": "源",
     "found_in_known_domain_db": "成功在已知域名数据库中查询到",
     "category_label": "类别",
@@ -178,6 +222,7 @@
     "install_settings_dns_desc": "您将需要使用以下地址来设置您的设备或路由器的 DNS 服务器：",
     "install_settings_all_interfaces": "所有接口",
     "install_auth_title": "身份认证",
+    "install_auth_desc": "我们强烈建议您为 AdGuard Home 的网页管理界面配置密码。即使该页面只能通过您的本地网络访问，但避免它被不加限制地访问仍十分重要。",
     "install_auth_username": "用户名",
     "install_auth_password": "密码",
     "install_auth_confirm": "确认密码",
@@ -256,6 +301,8 @@
     "update_announcement": "AdGuard Home {{version}} 现已发布！ <0>点击此处</0> 以获取详细信息。",
     "setup_guide": "设置指导",
     "dns_addresses": "DNS 地址",
+    "dns_start": "正在启动DNS服务",
+    "dns_status_error": "检查DNS服务器状态时出错",
     "down": "下移",
     "fix": "修复",
     "dns_providers": "此为可从中选择的<0>已知 DNS 提供商列表</0>。",
@@ -274,8 +321,11 @@
     "client_edit": "编辑客户端",
     "client_identifier": "标识符",
     "ip_address": "IP 地址",
+    "client_identifier_desc": "客户端可通过 IP 地址或 MAC 地址识别。请注意，如 AdGuard Home 也是 <0>DHCP 服务器</0>，则仅能将 MAC 用作标识符",
     "form_enter_ip": "输入 IP",
     "form_enter_mac": "输入 MAC",
+    "form_enter_id": "输入标识符",
+    "form_add_id": "添加标识符",
     "form_client_name": "输入客户端名称",
     "client_global_settings": "使用全局设置",
     "client_deleted": "客户端 \"{{key}}\" 删除成功",
@@ -313,5 +363,73 @@
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> 支持 <1>DNS-over-HTTPS</1>。",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> 支持 <1>DNS-over-HTTPS</1>。",
     "setup_dns_privacy_other_5": "您可以从 <0>这里</0> 和 <1>这里</1> 找到更多的实施方案。",
-    "setup_dns_notice": "为了使用 <1>DNS-over-HTTPS</1> 或者 <1>DNS-over-TLS</1> ，您需要在 AdGuard Home 设置中 <0>配置加密</0> 。"
+    "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_add": "添加 DNS 重写",
+    "rewrite_not_found": "未找到 DNS 重写",
+    "rewrite_confirm_delete": "您确定要删除 \"{{key}}\" 的 DNS 重写？",
+    "rewrite_desc": "可以轻松地配置特定的域名的自定义 DNS 响应。",
+    "rewrite_applied": "已应用的重写规则",
+    "dns_rewrites": "DNS 重写",
+    "form_domain": "输入域",
+    "form_answer": "输入 IP 地址或域名",
+    "form_error_domain_format": "无效的域格式",
+    "form_error_answer_format": "无效的响应格式",
+    "configure": "配置",
+    "main_settings": "主要设置",
+    "block_services": "阻止特定服务",
+    "blocked_services": "已阻止的服务",
+    "blocked_services_desc": "允许快速地阻止热门网站和服务。",
+    "blocked_services_saved": "已阻止服务的设置保存成功",
+    "blocked_services_global": "使用全局已阻止服务设置",
+    "blocked_service": "已阻止的服务",
+    "block_all": "阻止所有",
+    "unblock_all": "允许所有",
+    "encryption_certificate_path": "证书路径",
+    "encryption_private_key_path": "私钥路径",
+    "encryption_certificates_source_path": "设置证书路径",
+    "encryption_certificates_source_content": "粘贴证书内容",
+    "encryption_key_source_path": "设置私钥文件",
+    "encryption_key_source_content": "粘贴私钥内容",
+    "stats_params": "统计配置",
+    "config_successfully_saved": "配置保存成功",
+    "interval_24_hour": "24 小时",
+    "interval_days": "{{count}} 天",
+    "interval_days_plural": "{{count}} 天",
+    "domain": "域",
+    "answer": "应答",
+    "filter_added_successfully": "已成功添加过滤器",
+    "statistics_configuration": "统计配置",
+    "statistics_retention": "统计保留",
+    "statistics_retention_desc": "如果您减少该间隔的数值， 某些数据可能会丢失",
+    "statistics_clear": " 清除统计数据",
+    "statistics_clear_confirm": "您确定要清除统计数据？",
+    "statistics_retention_confirm": "您确定要更改统计记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
+    "statistics_cleared": "统计数据已成功清除",
+    "interval_hours": "{{count}} 小时",
+    "interval_hours_plural": "{{count}} 小时",
+    "filters_configuration": "过滤器配置",
+    "filters_enable": "启用过滤器",
+    "filters_interval": "过滤器更新间隔",
+    "disabled": "已禁用",
+    "username_label": "用户名",
+    "username_placeholder": "输入用户名",
+    "password_label": "密码",
+    "password_placeholder": "输入密码",
+    "sign_in": "登入",
+    "sign_out": "登出",
+    "forgot_password": "忘记密码？",
+    "forgot_password_desc": "请遵从<0>这些步骤</0>来为你的用户账号创建一个新密码",
+    "location": "地址",
+    "orgname": "机构名称",
+    "netname": "网络名称",
+    "descr": "描述",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>了解更多</0>关于如何创建您自己的主机（hosts）拦截清单。",
+    "blocked_by_response": "因响应的CNAME或IP被屏蔽",
+    "try_again": "重试",
+    "domain_desc": "输入您要重写的域名或通配符。",
+    "example_rewrite_domain": "仅重写此域名的响应。",
+    "example_rewrite_wildcard": "重写所有<0>example.org</0> 子域的响应。"
 }

client/src/__locales/zh-tw.json

@@ -23,7 +23,9 @@
     "form_error_ip6_format": "無效的 IPv6 格式",
     "form_error_ip_format": "無效的 IP 格式",
     "form_error_mac_format": "無效的媒體存取控制（MAC）格式",
+    "form_error_client_id_format": "無效的用戶端 ID 格式",
     "form_error_positive": "必須大於 0",
+    "form_error_negative": "必須等於 0 或更大",
     "dhcp_form_gateway_input": "閘道 IP",
     "dhcp_form_subnet_input": "子網路遮罩",
     "dhcp_form_range_title": "IP 位址範圍",
@@ -187,6 +189,22 @@
     "query_log_disabled": "查詢記錄被禁用並可在<0>設定</0>中被配置",
     "query_log_strict_search": "使用雙引號於嚴謹的搜尋",
     "query_log_retention_confirm": "您確定您想要更改查詢記錄保留嗎？如果您減少該間隔值，某些資料將被丟失",
+    "dns_config": "DNS 伺服器配置",
+    "blocking_mode": "封鎖模式",
+    "nxdomain": "不存在的網域（NXDOMAIN）",
+    "null_ip": "無效的 IP",
+    "custom_ip": "自訂的 IP",
+    "blocking_ipv4": "封鎖 IPv4",
+    "blocking_ipv6": "封鎖 IPv6",
+    "form_enter_rate_limit": "輸入速率限制",
+    "rate_limit": "速率限制",
+    "edns_enable": "啟用對於 DNS 的擴充機制（EDNS）用戶端子網路",
+    "edns_cs_desc": "如果被啟用，AdGuard Home 將持續傳送用戶端的子網路到 DNS 伺服器。",
+    "rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（0：無限制的）",
+    "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
+    "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
+    "blocking_mode_desc": "<0>不存在的網域（NXDOMAIN）– 以 NXDOMAIN 碼回覆；</0> <0>無效的 IP – 以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；</0> <0>自訂的 IP - 以手動地被設定的 IP 位址回覆。</0>",
+    "upstream_dns_client_desc": "如果您將該欄位留空，AdGuard Home 將使用在 <0>DNS 設定</0>中被配置的伺服器。",
     "source_label": "來源",
     "found_in_known_domain_db": "在已知的域名資料庫中被發現。",
     "category_label": "類別",
@@ -284,7 +302,7 @@
     "setup_guide": "設置指南",
     "dns_addresses": "DNS 位址",
     "dns_start": "DNS 伺服器正在啟動",
-    "dns_status_error": "取得 DNS 伺服器狀態之錯誤",
+    "dns_status_error": "檢查 DNS 伺服器狀態出錯",
     "down": "停止運作的",
     "fix": "修復",
     "dns_providers": "這裡是一個從中選擇之<0>已知的 DNS 供應商之清單</0>。",
@@ -354,7 +372,7 @@
     "rewrite_desc": "允許輕易地配置自訂的 DNS 回應供特定的域名。",
     "rewrite_applied": "已套用的改寫規則",
     "dns_rewrites": "DNS 改寫",
-    "form_domain": "輸入網域",
+    "form_domain": "輸入域名或萬用字元（wildcard）",
     "form_answer": "輸入 IP 位址或域名",
     "form_error_domain_format": "無效的網域格式",
     "form_error_answer_format": "無效的回應格式",
@@ -409,5 +427,9 @@
     "descr": "說明",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>了解更多</0>有關創建您自己的主機（hosts）封鎖清單。",
-    "blocked_by_response": "被正規名稱（CNAME）或 IP 封鎖作為回應"
+    "blocked_by_response": "被正規名稱（CNAME）或 IP 封鎖作為回應",
+    "try_again": "再次嘗試",
+    "domain_desc": "輸入您想要被改寫的域名或萬用字元（wildcard）。",
+    "example_rewrite_domain": "僅對於此域名改寫回應。",
+    "example_rewrite_wildcard": "對於所有的 <0>example.org</0> 子網域改寫回應。"
 }

client/src/actions/index.js

@@ -233,6 +233,7 @@ export const getProfile = () => async (dispatch) => {
 export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST');
 export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
 export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS');
+export const setDnsRunningStatus = createAction('SET_DNS_RUNNING_STATUS');
 
 export const getDnsStatus = () => async (dispatch) => {
     dispatch(dnsStatusRequest());
@@ -242,15 +243,17 @@ export const getDnsStatus = () => async (dispatch) => {
         dispatch(dnsStatusFailure());
         window.location.reload(true);
     };
-
     const handleRequestSuccess = (response) => {
         const dnsStatus = response.data;
-        const runningStatus = dnsStatus && dnsStatus.running;
+        const { running } = dnsStatus;
+        const runningStatus = dnsStatus && running;
         if (runningStatus === true) {
             dispatch(dnsStatusSuccess(dnsStatus));
             dispatch(getVersion());
             dispatch(getTlsStatus());
             dispatch(getProfile());
+        } else {
+            dispatch(setDnsRunningStatus(running));
         }
     };
 

client/src/actions/queryLogs.js

@@ -5,20 +5,28 @@ import { addErrorToast, addSuccessToast } from './index';
 import { normalizeLogs, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
 import { TABLE_DEFAULT_PAGE_SIZE } from '../helpers/constants';
 
-const getLogsWithParams = async (config) => {
-    const { older_than, filter, ...values } = config;
-    const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
-    const { data, oldest } = rawLogs;
-    const logs = normalizeLogs(data);
-    const clientsParams = getParamsForClientsSearch(logs, 'client');
-    const clients = await apiClient.findClients(clientsParams);
-    const logsWithClientInfo = addClientInfo(logs, clients, 'client');
+// Cache clients in closure
+const getLogsWithParamsWrapper = () => {
+    let clients = {};
+    return async (config) => {
+        const { older_than, filter, ...values } = config;
+        const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
+        const { data, oldest } = rawLogs;
+        const logs = normalizeLogs(data);
+        const clientsParams = getParamsForClientsSearch(logs, 'client');
+        if (!Object.values(clientsParams).every(client => client in clients)) {
+            clients = await apiClient.findClients(clientsParams);
+        }
+        const logsWithClientInfo = addClientInfo(logs, clients, 'client');
 
-    return {
-        logs: logsWithClientInfo, oldest, older_than, filter, ...values,
+        return {
+            logs: logsWithClientInfo, oldest, older_than, filter, ...values,
+        };
     };
 };
 
+const getLogsWithParams = getLogsWithParamsWrapper();
+
 export const getAdditionalLogsRequest = createAction('GET_ADDITIONAL_LOGS_REQUEST');
 export const getAdditionalLogsFailure = createAction('GET_ADDITIONAL_LOGS_FAILURE');
 export const getAdditionalLogsSuccess = createAction('GET_ADDITIONAL_LOGS_SUCCESS');

client/src/actions/stats.js

@@ -39,30 +39,38 @@ export const getStatsRequest = createAction('GET_STATS_REQUEST');
 export const getStatsFailure = createAction('GET_STATS_FAILURE');
 export const getStatsSuccess = createAction('GET_STATS_SUCCESS');
 
-export const getStats = () => async (dispatch) => {
-    dispatch(getStatsRequest());
-    try {
-        const stats = await apiClient.getStats();
-        const normalizedTopClients = normalizeTopStats(stats.top_clients);
-        const clientsParams = getParamsForClientsSearch(normalizedTopClients, 'name');
-        const clients = await apiClient.findClients(clientsParams);
-        const topClientsWithInfo = addClientInfo(normalizedTopClients, clients, 'name');
+// Cache clients in closure
+const getStatsWrapper = () => {
+    let clients = {};
+    return () => async (dispatch) => {
+        dispatch(getStatsRequest());
+        try {
+            const stats = await apiClient.getStats();
+            const normalizedTopClients = normalizeTopStats(stats.top_clients);
+            const clientsParams = getParamsForClientsSearch(normalizedTopClients, 'name');
+            if (!Object.values(clientsParams).every(client => client in clients)) {
+                clients = await apiClient.findClients(clientsParams);
+            }
+            const topClientsWithInfo = addClientInfo(normalizedTopClients, clients, 'name');
 
-        const normalizedStats = {
-            ...stats,
-            top_blocked_domains: normalizeTopStats(stats.top_blocked_domains),
-            top_clients: topClientsWithInfo,
-            top_queried_domains: normalizeTopStats(stats.top_queried_domains),
-            avg_processing_time: secondsToMilliseconds(stats.avg_processing_time),
-        };
+            const normalizedStats = {
+                ...stats,
+                top_blocked_domains: normalizeTopStats(stats.top_blocked_domains),
+                top_clients: topClientsWithInfo,
+                top_queried_domains: normalizeTopStats(stats.top_queried_domains),
+                avg_processing_time: secondsToMilliseconds(stats.avg_processing_time),
+            };
 
-        dispatch(getStatsSuccess(normalizedStats));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(getStatsFailure());
-    }
+            dispatch(getStatsSuccess(normalizedStats));
+        } catch (error) {
+            dispatch(addErrorToast({ error }));
+            dispatch(getStatsFailure());
+        }
+    };
 };
 
+export const getStats = getStatsWrapper();
+
 export const resetStatsRequest = createAction('RESET_STATS_REQUEST');
 export const resetStatsFailure = createAction('RESET_STATS_FAILURE');
 export const resetStatsSuccess = createAction('RESET_STATS_SUCCESS');

client/src/components/App/index.js

@@ -89,12 +89,13 @@ class App extends Component {
                     <LoadingBar className="loading-bar" updateTime={1000} />
                     <Route component={Header} />
                     <div className="container container--wrap">
-                        {dashboard.processing && !dashboard.isCoreRunning && (
+                        {dashboard.processing && <Loading />}
+                        {!dashboard.isCoreRunning && (
                             <div className="row row-cards">
                                 <div className="col-lg-12">
                                     <Status reloadPage={this.reloadPage}
                                             message="dns_start"
-                                    />
+                                        />
                                     <Loading />
                                 </div>
                             </div>

client/src/components/Logs/Filters/Form.js

@@ -4,7 +4,7 @@ import { Field, reduxForm } from 'redux-form';
 import { withNamespaces, Trans } from 'react-i18next';
 import flow from 'lodash/flow';
 
-import { renderField } from '../../../helpers/form';
+import { renderInputField } from '../../../helpers/form';
 import { RESPONSE_FILTER } from '../../../helpers/constants';
 import Tooltip from '../../ui/Tooltip';
 
@@ -65,7 +65,7 @@ const Form = (props) => {
                     <Field
                         id="filter_question_type"
                         name="filter_question_type"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={t('type_table_header')}

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

@@ -11,15 +11,6 @@ import whoisCell from './whoisCell';
 const COLUMN_MIN_WIDTH = 200;
 
 class AutoClients extends Component {
-    getStats = (ip, stats) => {
-        if (stats) {
-            const statsForCurrentIP = stats.find(item => item.name === ip);
-            return statsForCurrentIP && statsForCurrentIP.count;
-        }
-
-        return '';
-    };
-
     columns = [
         {
             Header: this.props.t('table_client'),
@@ -47,11 +38,12 @@ class AutoClients extends Component {
         },
         {
             Header: this.props.t('requests_count'),
-            accessor: 'statistics',
+            accessor: row => this.props.normalizedTopClients[row.ip] || 0,
+            sortMethod: (a, b) => b - a,
+            id: 'statistics',
             minWidth: COLUMN_MIN_WIDTH,
             Cell: (row) => {
-                const clientIP = row.original.ip;
-                const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
+                const { value: clientStats } = row;
 
                 if (clientStats) {
                     return (
@@ -80,6 +72,12 @@ class AutoClients extends Component {
                 <ReactTable
                     data={autoClients || []}
                     columns={this.columns}
+                    defaultSorted={[
+                        {
+                            id: 'statistics',
+                            asc: true,
+                        },
+                    ]}
                     className="-striped -highlight card-table-overflow"
                     showPagination={true}
                     defaultPageSize={10}
@@ -100,7 +98,7 @@ class AutoClients extends Component {
 AutoClients.propTypes = {
     t: PropTypes.func.isRequired,
     autoClients: PropTypes.array.isRequired,
-    topClients: PropTypes.array.isRequired,
+    normalizedTopClients: PropTypes.object.isRequired,
 };
 
 export default withNamespaces()(AutoClients);

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

@@ -9,8 +9,6 @@ import Card from '../../ui/Card';
 import Modal from './Modal';
 import WrapCell from './WrapCell';
 
-import whoisCell from './whoisCell';
-
 class ClientsTable extends Component {
     handleFormAdd = (values) => {
         this.props.addClient(values);
@@ -62,15 +60,6 @@ class ClientsTable extends Component {
         };
     };
 
-    getStats = (name, stats) => {
-        if (stats) {
-            const currentStats = stats.find(item => item.info && item.info.name === name);
-            return currentStats && currentStats.count;
-        }
-
-        return '';
-    };
-
     handleDelete = (data) => {
         // eslint-disable-next-line no-alert
         if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
@@ -138,13 +127,13 @@ class ClientsTable extends Component {
                     <div className="logs__row logs__row--icons">
                         {value && value.length > 0
                             ? value.map(service => (
-                                  <svg
-                                      className="service__icon service__icon--table"
-                                      title={service}
-                                      key={service}
-                                  >
-                                      <use xlinkHref={`#service_${service}`} />
-                                  </svg>
+                                <svg
+                                    className="service__icon service__icon--table"
+                                    title={service}
+                                    key={service}
+                                >
+                                    <use xlinkHref={`#service_${service}`} />
+                                </svg>
                             ))
                             : '–'}
                     </div>
@@ -169,19 +158,14 @@ class ClientsTable extends Component {
                 );
             },
         },
-        {
-            Header: this.props.t('whois'),
-            accessor: 'whois_info',
-            minWidth: 200,
-            Cell: whoisCell(this.props.t),
-        },
         {
             Header: this.props.t('requests_count'),
-            accessor: 'statistics',
+            id: 'statistics',
+            accessor: row => this.props.normalizedTopClients[row.name] || 0,
+            sortMethod: (a, b) => b - a,
             minWidth: 120,
             Cell: (row) => {
-                const { name } = row.original;
-                const clientStats = this.getStats(name, this.props.topClients);
+                const { value: clientStats } = row;
 
                 if (clientStats) {
                     return (
@@ -265,6 +249,12 @@ class ClientsTable extends Component {
                     <ReactTable
                         data={clients || []}
                         columns={this.columns}
+                        defaultSorted={[
+                            {
+                                id: 'statistics',
+                                asc: true,
+                            },
+                        ]}
                         className="-striped -highlight card-table-overflow"
                         showPagination={true}
                         defaultPageSize={10}
@@ -304,7 +294,7 @@ class ClientsTable extends Component {
 ClientsTable.propTypes = {
     t: PropTypes.func.isRequired,
     clients: PropTypes.array.isRequired,
-    topClients: PropTypes.array.isRequired,
+    normalizedTopClients: PropTypes.object.isRequired,
     toggleClientModal: PropTypes.func.isRequired,
     deleteClient: PropTypes.func.isRequired,
     addClient: PropTypes.func.isRequired,

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

@@ -10,7 +10,9 @@ import Tabs from '../../ui/Tabs';
 import Examples from '../Dns/Upstream/Examples';
 import { toggleAllServices } from '../../../helpers/helpers';
 import {
-    renderField,
+    required,
+    clientId,
+    renderInputField,
     renderGroupField,
     renderSelectField,
     renderServiceField,
@@ -40,38 +42,30 @@ const settingsCheckboxes = [
         placeholder: 'enforce_safe_search',
     },
 ];
-
 const validate = (values) => {
     const errors = {};
     const { name, ids } = values;
-
-    if (!name || !name.length) {
-        errors.name = i18n.t('form_error_required');
-    }
+    errors.name = required(name);
 
     if (ids && ids.length) {
         const idArrayErrors = [];
         ids.forEach((id, idx) => {
-            if (!id || !id.length) {
-                idArrayErrors[idx] = i18n.t('form_error_required');
-            }
+            idArrayErrors[idx] = required(id) || clientId(id);
         });
 
         if (idArrayErrors.length) {
             errors.ids = idArrayErrors;
         }
     }
-
     return errors;
 };
 
-const renderFields = (placeholder, buttonTitle) =>
+
+const renderFieldsWrapper = (placeholder, buttonTitle) =>
     function cell(row) {
         const {
             fields,
-            meta: { error },
         } = row;
-
         return (
             <div className="form__group">
                 {fields.map((ip, index) => (
@@ -84,6 +78,7 @@ const renderFields = (placeholder, buttonTitle) =>
                             placeholder={placeholder}
                             isActionAvailable={index !== 0}
                             removeField={() => fields.remove(index)}
+                            normalize={data => data && data.trim()}
                         />
                     </div>
                 ))}
@@ -97,11 +92,13 @@ const renderFields = (placeholder, buttonTitle) =>
                         <use xlinkHref="#plus" />
                     </svg>
                 </button>
-                {error && <div className="error">{error}</div>}
             </div>
         );
     };
 
+// Should create function outside of component to prevent component re-renders
+const renderFields = renderFieldsWrapper(i18n.t('form_enter_id'), i18n.t('form_add_id'));
+
 let Form = (props) => {
     const {
         t,
@@ -126,10 +123,11 @@ let Form = (props) => {
                         <Field
                             id="name"
                             name="name"
-                            component={renderField}
+                            component={renderInputField}
                             type="text"
                             className="form-control"
                             placeholder={t('form_client_name')}
+                            normalize={data => data && data.trim()}
                         />
                     </div>
 
@@ -155,7 +153,7 @@ let Form = (props) => {
                     <div className="form__group">
                         <FieldArray
                             name="ids"
-                            component={renderFields(t('form_enter_id'), t('form_add_id'))}
+                            component={renderFields}
                         />
                     </div>
                 </div>

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

@@ -33,7 +33,7 @@ class Clients extends Component {
                     <Fragment>
                         <ClientsTable
                             clients={dashboard.clients}
-                            topClients={stats.topClients}
+                            normalizedTopClients={stats.normalizedTopClients}
                             isModalOpen={clients.isModalOpen}
                             modalClientName={clients.modalClientName}
                             modalType={clients.modalType}
@@ -47,7 +47,7 @@ class Clients extends Component {
                         />
                         <AutoClients
                             autoClients={dashboard.autoClients}
-                            topClients={stats.topClients}
+                            normalizedTopClients={stats.normalizedTopClients}
                         />
                     </Fragment>
                 )}

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

@@ -5,7 +5,7 @@ import { Field, reduxForm, formValueSelector } from 'redux-form';
 import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 
-import { renderField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
+import { renderInputField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
 
 const renderInterfaces = (interfaces => (
     Object.keys(interfaces).map((item) => {
@@ -116,8 +116,9 @@ let Form = (props) => {
                     <div className="form__group form__group--settings">
                         <label>{t('dhcp_form_gateway_input')}</label>
                         <Field
+                            id="gateway_ip"
                             name="gateway_ip"
-                            component={renderField}
+                            component={renderInputField}
                             type="text"
                             className="form-control"
                             placeholder={t('dhcp_form_gateway_input')}
@@ -127,8 +128,9 @@ let Form = (props) => {
                     <div className="form__group form__group--settings">
                         <label>{t('dhcp_form_subnet_input')}</label>
                         <Field
+                            id="subnet_mask"
                             name="subnet_mask"
-                            component={renderField}
+                            component={renderInputField}
                             type="text"
                             className="form-control"
                             placeholder={t('dhcp_form_subnet_input')}
@@ -144,8 +146,9 @@ let Form = (props) => {
                             </div>
                             <div className="col">
                                 <Field
+                                    id="range_start"
                                     name="range_start"
-                                    component={renderField}
+                                    component={renderInputField}
                                     type="text"
                                     className="form-control"
                                     placeholder={t('dhcp_form_range_start')}
@@ -154,8 +157,9 @@ let Form = (props) => {
                             </div>
                             <div className="col">
                                 <Field
+                                    id="range_end"
                                     name="range_end"
-                                    component={renderField}
+                                    component={renderInputField}
                                     type="text"
                                     className="form-control"
                                     placeholder={t('dhcp_form_range_end')}
@@ -168,7 +172,7 @@ let Form = (props) => {
                         <label>{t('dhcp_form_lease_title')}</label>
                         <Field
                             name="lease_duration"
-                            component={renderField}
+                            component={renderInputField}
                             type="number"
                             className="form-control"
                             placeholder={t('dhcp_form_lease_input')}

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

@@ -4,7 +4,7 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 
-import { renderField, ipv4, mac, required } from '../../../../helpers/form';
+import { renderInputField, ipv4, mac, required } from '../../../../helpers/form';
 
 const Form = (props) => {
     const {
@@ -24,7 +24,7 @@ const Form = (props) => {
                     <Field
                         id="mac"
                         name="mac"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={t('form_enter_mac')}
@@ -35,7 +35,7 @@ const Form = (props) => {
                     <Field
                         id="ip"
                         name="ip"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={t('form_enter_ip')}
@@ -46,7 +46,7 @@ const Form = (props) => {
                     <Field
                         id="hostname"
                         name="hostname"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={t('form_enter_hostname')}

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

@@ -219,46 +219,44 @@ class Dhcp extends Component {
                             </div>
                         </Card>
                         {dhcp.config.enabled && (
-                            <Fragment>
-                                <Card
-                                    title={t('dhcp_leases')}
-                                    bodyType="card-body box-body--settings"
-                                >
-                                    <div className="row">
-                                        <div className="col">
-                                            <Leases leases={dhcp.leases} />
-                                        </div>
+                            <Card
+                                title={t('dhcp_leases')}
+                                bodyType="card-body box-body--settings"
+                            >
+                                <div className="row">
+                                    <div className="col">
+                                        <Leases leases={dhcp.leases} />
                                     </div>
-                                </Card>
-                                <Card
-                                    title={t('dhcp_static_leases')}
-                                    bodyType="card-body box-body--settings"
-                                >
-                                    <div className="row">
-                                        <div className="col-12">
-                                            <StaticLeases
-                                                staticLeases={dhcp.staticLeases}
-                                                isModalOpen={dhcp.isModalOpen}
-                                                addStaticLease={addStaticLease}
-                                                removeStaticLease={removeStaticLease}
-                                                toggleLeaseModal={toggleLeaseModal}
-                                                processingAdding={dhcp.processingAdding}
-                                                processingDeleting={dhcp.processingDeleting}
-                                            />
-                                        </div>
-                                        <div className="col-12">
-                                            <button
-                                                type="button"
-                                                className="btn btn-success btn-standard mt-3"
-                                                onClick={() => toggleLeaseModal()}
-                                            >
-                                                <Trans>dhcp_add_static_lease</Trans>
-                                            </button>
-                                        </div>
-                                    </div>
-                                </Card>
-                            </Fragment>
+                                </div>
+                            </Card>
                         )}
+                        <Card
+                            title={t('dhcp_static_leases')}
+                            bodyType="card-body box-body--settings"
+                        >
+                            <div className="row">
+                                <div className="col-12">
+                                    <StaticLeases
+                                        staticLeases={dhcp.staticLeases}
+                                        isModalOpen={dhcp.isModalOpen}
+                                        addStaticLease={addStaticLease}
+                                        removeStaticLease={removeStaticLease}
+                                        toggleLeaseModal={toggleLeaseModal}
+                                        processingAdding={dhcp.processingAdding}
+                                        processingDeleting={dhcp.processingDeleting}
+                                    />
+                                </div>
+                                <div className="col-12">
+                                    <button
+                                        type="button"
+                                        className="btn btn-success btn-standard mt-3"
+                                        onClick={() => toggleLeaseModal()}
+                                    >
+                                        <Trans>dhcp_add_static_lease</Trans>
+                                    </button>
+                                </div>
+                            </div>
+                        </Card>
                     </Fragment>
                 )}
             </Fragment>

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

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
 import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
+import { renderTextareaField } from '../../../../helpers/form';
 
 const Form = (props) => {
     const {
@@ -21,7 +22,7 @@ const Form = (props) => {
                 <Field
                     id="allowed_clients"
                     name="allowed_clients"
-                    component="textarea"
+                    component={renderTextareaField}
                     type="text"
                     className="form-control form-control--textarea"
                     disabled={processingSet}
@@ -37,7 +38,7 @@ const Form = (props) => {
                 <Field
                     id="disallowed_clients"
                     name="disallowed_clients"
-                    component="textarea"
+                    component={renderTextareaField}
                     type="text"
                     className="form-control form-control--textarea"
                     disabled={processingSet}
@@ -53,7 +54,7 @@ const Form = (props) => {
                 <Field
                     id="blocked_hosts"
                     name="blocked_hosts"
-                    component="textarea"
+                    component={renderTextareaField}
                     type="text"
                     className="form-control form-control--textarea"
                     disabled={processingSet}
@@ -81,6 +82,7 @@ Form.propTypes = {
     initialValues: PropTypes.object.isRequired,
     processingSet: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
+    textarea: PropTypes.bool,
 };
 
 export default flow([withNamespaces(), reduxForm({ form: 'accessForm' })])(Form);

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

@@ -6,7 +6,7 @@ import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 
 import {
-    renderField,
+    renderInputField,
     renderRadioField,
     renderSelectField,
     required,
@@ -45,7 +45,7 @@ let Form = ({
                     <Field
                         name="ratelimit"
                         type="number"
-                        component={renderField}
+                        component={renderInputField}
                         className="form-control"
                         placeholder={t('form_enter_rate_limit')}
                         normalize={toNumber}
@@ -90,7 +90,7 @@ let Form = ({
                             </div>
                             <Field
                                 name="blocking_ipv4"
-                                component={renderField}
+                                component={renderInputField}
                                 className="form-control"
                                 placeholder={t('form_enter_ip')}
                                 validate={[ipv4, required]}
@@ -107,7 +107,7 @@ let Form = ({
                             </div>
                             <Field
                                 name="blocking_ipv6"
-                                component={renderField}
+                                component={renderInputField}
                                 className="form-control"
                                 placeholder={t('form_enter_ip')}
                                 validate={[ipv6, required]}

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

@@ -4,7 +4,7 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 
-import { renderField, required, domain, answer } from '../../../../helpers/form';
+import { renderInputField, required, domain, answer } from '../../../../helpers/form';
 
 const Form = (props) => {
     const {
@@ -20,22 +20,41 @@ const Form = (props) => {
     return (
         <form onSubmit={handleSubmit}>
             <div className="modal-body">
+                <div className="form__desc form__desc--top">
+                    <Trans>domain_desc</Trans>
+                </div>
                 <div className="form__group">
                     <Field
                         id="domain"
                         name="domain"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={t('form_domain')}
                         validate={[required, domain]}
                     />
                 </div>
+
+                <Trans>examples_title</Trans>:
+                <ol className="leading-loose">
+                    <li>
+                        <code>example.org</code> – <Trans>example_rewrite_domain</Trans>
+                    </li>
+                    <li>
+                        <code>*.example.org</code> –&nbsp;
+                        <span>
+                            <Trans components={[<code key="0">text</code>]}>
+                                example_rewrite_wildcard
+                            </Trans>
+                        </span>
+                    </li>
+                </ol>
+
                 <div className="form__group">
                     <Field
                         id="answer"
                         name="answer"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={t('form_answer')}

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

@@ -6,7 +6,7 @@ import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 
 import {
-    renderField,
+    renderInputField,
     renderSelectField,
     renderRadioField,
     toNumber,
@@ -117,7 +117,7 @@ let Form = (props) => {
                         <Field
                             id="server_name"
                             name="server_name"
-                            component={renderField}
+                            component={renderInputField}
                             type="text"
                             className="form-control"
                             placeholder={t('encryption_server_enter')}
@@ -154,7 +154,7 @@ let Form = (props) => {
                         <Field
                             id="port_https"
                             name="port_https"
-                            component={renderField}
+                            component={renderInputField}
                             type="number"
                             className="form-control"
                             placeholder={t('encryption_https')}
@@ -176,7 +176,7 @@ let Form = (props) => {
                         <Field
                             id="port_dns_over_tls"
                             name="port_dns_over_tls"
-                            component={renderField}
+                            component={renderInputField}
                             type="number"
                             className="form-control"
                             placeholder={t('encryption_dot')}
@@ -252,7 +252,7 @@ let Form = (props) => {
                             <Field
                                 id="certificate_path"
                                 name="certificate_path"
-                                component={renderField}
+                                component={renderInputField}
                                 type="text"
                                 className="form-control"
                                 placeholder={t('encryption_certificate_path')}
@@ -321,7 +321,7 @@ let Form = (props) => {
                             <Field
                                 id="private_key_path"
                                 name="private_key_path"
-                                component={renderField}
+                                component={renderInputField}
                                 type="text"
                                 className="form-control"
                                 placeholder={t('encryption_private_key_path')}

client/src/helpers/constants.js

@@ -1,8 +1,9 @@
 export const R_URL_REQUIRES_PROTOCOL = /^https?:\/\/[^/\s]+(\/.*)?$/;
-export const R_HOST = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$/;
-export const R_IPV4 = /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/g;
-export const R_IPV6 = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/g;
-export const R_MAC = /^((([a-fA-F0-9][a-fA-F0-9]+[-]){5}|([a-fA-F0-9][a-fA-F0-9]+[:]){5})([a-fA-F0-9][a-fA-F0-9])$)|(^([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]+[.]){2}([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]))$/g;
+export const R_HOST = /^(\*\.)?([\w-]+\.)+[\w-]+$/;
+export const R_IPV4 = /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/;
+export const R_IPV6 = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
+export const R_CIDR = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/;
+export const R_MAC = /^((([a-fA-F0-9][a-fA-F0-9]+[-]){5}|([a-fA-F0-9][a-fA-F0-9]+[:]){5})([a-fA-F0-9][a-fA-F0-9])$)|(^([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]+[.]){2}([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]))$/;
 
 export const STATS_NAMES = {
     avg_processing_time: 'average_processing_time',

client/src/helpers/form.js

@@ -1,33 +1,45 @@
 import React, { Fragment } from 'react';
 import { Trans } from 'react-i18next';
+import PropTypes from 'prop-types';
+import { R_IPV4, R_MAC, R_HOST, R_IPV6, R_CIDR, UNSAFE_PORTS } from '../helpers/constants';
 
-import { R_IPV4, R_MAC, R_HOST, R_IPV6, UNSAFE_PORTS } from '../helpers/constants';
+export const renderField = (props, elementType) => {
+    const {
+        input, id, className, placeholder, type, disabled,
+        autoComplete, meta: { touched, error },
+    } = props;
 
-export const renderField = ({
-    input,
-    id,
-    className,
-    placeholder,
-    type,
-    disabled,
-    autoComplete,
-    meta: { touched, error },
-}) => (
-    <Fragment>
-        <input
-            {...input}
-            id={id}
-            placeholder={placeholder}
-            type={type}
-            className={className}
-            disabled={disabled}
-            autoComplete={autoComplete}
-        />
-        {!disabled &&
-            touched &&
-            (error && <span className="form__message form__message--error">{error}</span>)}
-    </Fragment>
-);
+    const element = React.createElement(elementType, {
+        ...input,
+        id,
+        className,
+        placeholder,
+        autoComplete,
+        disabled,
+        type,
+    });
+    return (
+        <Fragment>
+            {element}
+            {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
+        </Fragment>
+    );
+};
+
+renderField.propTypes = {
+    id: PropTypes.string.isRequired,
+    input: PropTypes.object.isRequired,
+    meta: PropTypes.object.isRequired,
+    className: PropTypes.string,
+    placeholder: PropTypes.string,
+    type: PropTypes.string,
+    disabled: PropTypes.bool,
+    autoComplete: PropTypes.bool,
+};
+
+export const renderTextareaField = props => renderField(props, 'textarea');
+
+export const renderInputField = props => renderField(props, 'input');
 
 export const renderGroupField = ({
     input,
@@ -53,7 +65,7 @@ export const renderGroupField = ({
                 autoComplete={autoComplete}
             />
             {isActionAvailable &&
-                <span className="input-group-append">
+            <span className="input-group-append">
                     <button
                         type="button"
                         className="btn btn-secondary btn-icon"
@@ -66,10 +78,9 @@ export const renderGroupField = ({
                 </span>
             }
         </div>
-
         {!disabled &&
-            touched &&
-            (error && <span className="form__message form__message--error">{error}</span>)}
+        touched &&
+        (error && <span className="form__message form__message--error">{error}</span>)}
     </Fragment>
 );
 
@@ -82,8 +93,8 @@ export const renderRadioField = ({
             <span className="custom-control-label">{placeholder}</span>
         </label>
         {!disabled &&
-            touched &&
-            (error && <span className="form__message form__message--error">{error}</span>)}
+        touched &&
+        (error && <span className="form__message form__message--error">{error}</span>)}
     </Fragment>
 );
 
@@ -112,8 +123,8 @@ export const renderSelectField = ({
             </span>
         </label>
         {!disabled &&
-            touched &&
-            (error && <span className="form__message form__message--error">{error}</span>)}
+        touched &&
+        (error && <span className="form__message form__message--error">{error}</span>)}
     </Fragment>
 );
 
@@ -141,52 +152,67 @@ export const renderServiceField = ({
             </svg>
         </label>
         {!disabled &&
-            touched &&
-            (error && <span className="form__message form__message--error">{error}</span>)}
+        touched &&
+        (error && <span className="form__message form__message--error">{error}</span>)}
     </Fragment>
 );
 
 // Validation functions
+// If the value is valid, the validation function should return undefined.
+// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
 export const required = (value) => {
-    if (value || value === 0) {
-        return false;
+    const formattedValue = typeof value === 'string' ? value.trim() : value;
+    if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
+        return undefined;
     }
     return <Trans>form_error_required</Trans>;
 };
 
 export const ipv4 = (value) => {
-    if (value && !new RegExp(R_IPV4).test(value)) {
+    if (value && !R_IPV4.test(value)) {
         return <Trans>form_error_ip4_format</Trans>;
     }
-    return false;
+    return undefined;
+};
+
+export const clientId = (value) => {
+    if (!value) {
+        return undefined;
+    }
+    const formattedValue = value ? value.trim() : value;
+    if (formattedValue && !(R_IPV4.test(formattedValue) || R_IPV6.test(formattedValue)
+        || R_MAC.test(formattedValue) || R_CIDR.test(formattedValue))) {
+        return <Trans>form_error_client_id_format</Trans>;
+    }
+    return undefined;
 };
 
 export const ipv6 = (value) => {
-    if (value && !new RegExp(R_IPV6).test(value)) {
+    if (value && !R_IPV6.test(value)) {
         return <Trans>form_error_ip6_format</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const ip = (value) => {
-    if (value && !new RegExp(R_IPV4).test(value) && !new RegExp(R_IPV6).test(value)) {
+    if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
         return <Trans>form_error_ip_format</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const mac = (value) => {
-    if (value && !new RegExp(R_MAC).test(value)) {
+    if (value && !R_MAC.test(value)) {
         return <Trans>form_error_mac_format</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const isPositive = (value) => {
     if ((value || value === 0) && value <= 0) {
         return <Trans>form_error_positive</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const biggerOrEqualZero = (value) => {
@@ -200,42 +226,37 @@ export const port = (value) => {
     if ((value || value === 0) && (value < 80 || value > 65535)) {
         return <Trans>form_error_port_range</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const portTLS = (value) => {
     if (value === 0) {
-        return false;
+        return undefined;
     } else if (value && (value < 80 || value > 65535)) {
         return <Trans>form_error_port_range</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const isSafePort = (value) => {
     if (UNSAFE_PORTS.includes(value)) {
         return <Trans>form_error_port_unsafe</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const domain = (value) => {
-    if (value && !new RegExp(R_HOST).test(value)) {
+    if (value && !R_HOST.test(value)) {
         return <Trans>form_error_domain_format</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const answer = (value) => {
-    if (
-        value &&
-        (!new RegExp(R_IPV4).test(value) &&
-            !new RegExp(R_IPV6).test(value) &&
-            !new RegExp(R_HOST).test(value))
-    ) {
+    if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
         return <Trans>form_error_answer_format</Trans>;
     }
-    return false;
+    return undefined;
 };
 
 export const toNumber = value => value && parseInt(value, 10);

client/src/helpers/helpers.js

@@ -261,6 +261,13 @@ export const redirectToCurrentProtocol = (values, httpPort = 80) => {
 
 export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
 
+export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
+    const { name, count } = clientObj;
+    // eslint-disable-next-line no-param-reassign
+    accumulator[name] = count;
+    return accumulator;
+}, {});
+
 export const getClientInfo = (clients, ip) => {
     const client = clients
         .find(item => item.ip_addrs && item.ip_addrs.find(clientIp => clientIp === ip));

client/src/install/Setup/Auth.js

@@ -6,7 +6,7 @@ import flow from 'lodash/flow';
 
 import i18n from '../../i18n';
 import Controls from './Controls';
-import renderField from './renderField';
+import { renderInputField } from '../../helpers/form';
 
 const required = (value) => {
     if (value || value === 0) {
@@ -48,7 +48,7 @@ const Auth = (props) => {
                     </label>
                     <Field
                         name="username"
-                        component={renderField}
+                        component={renderInputField}
                         type="text"
                         className="form-control"
                         placeholder={ t('install_auth_username_enter') }
@@ -62,7 +62,7 @@ const Auth = (props) => {
                     </label>
                     <Field
                         name="password"
-                        component={renderField}
+                        component={renderInputField}
                         type="password"
                         className="form-control"
                         placeholder={ t('install_auth_password_enter') }
@@ -76,7 +76,7 @@ const Auth = (props) => {
                     </label>
                     <Field
                         name="confirm_password"
-                        component={renderField}
+                        component={renderInputField}
                         type="password"
                         className="form-control"
                         placeholder={ t('install_auth_confirm') }

client/src/install/Setup/Settings.js

@@ -7,9 +7,9 @@ import flow from 'lodash/flow';
 
 import Controls from './Controls';
 import AddressList from './AddressList';
-import renderField from './renderField';
 import { getInterfaceIp } from '../../helpers/helpers';
 import { ALL_INTERFACES_IP } from '../../helpers/constants';
+import { renderInputField } from '../../helpers/form';
 
 const required = (value) => {
     if (value || value === 0) {
@@ -133,7 +133,7 @@ class Settings extends Component {
                                 </label>
                                 <Field
                                     name="web.port"
-                                    component={renderField}
+                                    component={renderInputField}
                                     type="number"
                                     className="form-control"
                                     placeholder="80"
@@ -201,7 +201,7 @@ class Settings extends Component {
                                 </label>
                                 <Field
                                     name="dns.port"
-                                    component={renderField}
+                                    component={renderInputField}
                                     type="number"
                                     className="form-control"
                                     placeholder="80"

client/src/install/Setup/renderField.js

@@ -1,19 +0,0 @@
-import React, { Fragment } from 'react';
-
-const renderField = ({
-    input, className, placeholder, type, disabled, autoComplete, meta: { touched, error },
-}) => (
-    <Fragment>
-        <input
-            {...input}
-            placeholder={placeholder}
-            type={type}
-            className={className}
-            disabled={disabled}
-            autoComplete={autoComplete}
-        />
-        {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
-    </Fragment>
-);
-
-export default renderField;

client/src/login/Login/Form.js

@@ -4,7 +4,7 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 
-import { renderField, required } from '../../helpers/form';
+import { renderInputField, required } from '../../helpers/form';
 
 const Form = (props) => {
     const {
@@ -19,10 +19,11 @@ const Form = (props) => {
                         <Trans>username_label</Trans>
                     </label>
                     <Field
+                        id="username1"
                         name="username"
                         type="text"
                         className="form-control"
-                        component={renderField}
+                        component={renderInputField}
                         placeholder={t('username_placeholder')}
                         autoComplete="username"
                         disabled={processing}
@@ -38,7 +39,7 @@ const Form = (props) => {
                         name="password"
                         type="password"
                         className="form-control"
-                        component={renderField}
+                        component={renderInputField}
                         placeholder={t('password_placeholder')}
                         autoComplete="current-password"
                         disabled={processing}

client/src/reducers/index.js

@@ -58,12 +58,13 @@ const settings = handleActions(
 
 const dashboard = handleActions(
     {
+        [actions.setDnsRunningStatus]: (state, { payload }) =>
+            ({ ...state, isCoreRunning: payload }),
         [actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
         [actions.dnsStatusFailure]: state => ({ ...state, processing: false }),
         [actions.dnsStatusSuccess]: (state, { payload }) => {
             const {
                 version,
-                running,
                 dns_port: dnsPort,
                 dns_addresses: dnsAddresses,
                 upstream_dns: upstreamDns,
@@ -75,7 +76,7 @@ const dashboard = handleActions(
             } = payload;
             const newState = {
                 ...state,
-                isCoreRunning: running,
+                isCoreRunning: true,
                 processing: false,
                 dnsVersion: version,
                 dnsPort,
@@ -187,7 +188,7 @@ const dashboard = handleActions(
     },
     {
         processing: true,
-        isCoreRunning: false,
+        isCoreRunning: true,
         processingVersion: true,
         processingFiltering: true,
         processingClients: true,

client/src/reducers/stats.js

@@ -1,4 +1,5 @@
 import { handleActions } from 'redux-actions';
+import { normalizeTopClients } from '../helpers/helpers';
 
 import * as actions from '../actions/stats';
 
@@ -64,6 +65,7 @@ const stats = handleActions(
                 replacedSafebrowsing,
                 topBlockedDomains,
                 topClients,
+                normalizedTopClients: normalizeTopClients(topClients),
                 topQueriedDomains,
                 numBlockedFiltering,
                 numDnsQueries,

dhcpd/dhcpd.go

@@ -100,9 +100,14 @@ func (s *Server) CheckConfig(config ServerConfig) error {
 func Create(config ServerConfig) *Server {
 	s := Server{}
 	s.conf = config
+	s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
 	if s.conf.HTTPRegister != nil {
 		s.registerHandlers()
 	}
+
+	// we can't delay database loading until DHCP server is started,
+	//  because we need static leases functionality available beforehand
+	s.dbLoad()
 	return &s
 }
 
@@ -112,7 +117,6 @@ func (s *Server) Init(config ServerConfig) error {
 	if err != nil {
 		return err
 	}
-	s.dbLoad()
 	return nil
 }
 
@@ -178,7 +182,7 @@ func (s *Server) setConfig(config ServerConfig) error {
 	s.conf.WorkDir = oldconf.WorkDir
 	s.conf.HTTPRegister = oldconf.HTTPRegister
 	s.conf.ConfigModified = oldconf.ConfigModified
-	s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
+	s.conf.DBFilePath = oldconf.DBFilePath
 	return nil
 }
 
@@ -565,10 +569,6 @@ func (s *Server) handleDecline(p dhcp4.Packet, options dhcp4.Options) dhcp4.Pack
 
 // AddStaticLease adds a static lease (thread-safe)
 func (s *Server) AddStaticLease(l Lease) error {
-	if s.IPpool == nil {
-		return fmt.Errorf("DHCP server isn't started")
-	}
-
 	if len(l.IP) != 4 {
 		return fmt.Errorf("Invalid IP")
 	}
@@ -629,10 +629,6 @@ func (s *Server) rmLease(l Lease) error {
 
 // RemoveStaticLease removes a static lease (thread-safe)
 func (s *Server) RemoveStaticLease(l Lease) error {
-	if s.IPpool == nil {
-		return fmt.Errorf("DHCP server isn't started")
-	}
-
 	if len(l.IP) != 4 {
 		return fmt.Errorf("Invalid IP")
 	}
@@ -675,10 +671,6 @@ func (s *Server) StaticLeases() []Lease {
 	s.leasesLock.Lock()
 	defer s.leasesLock.Unlock()
 
-	if s.IPpool == nil {
-		s.dbLoad()
-	}
-
 	var result []Lease
 	for _, lease := range s.leases {
 		if lease.Expiry.Unix() == 1 {
@@ -717,9 +709,17 @@ func (s *Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
 	s.leasesLock.RLock()
 	defer s.leasesLock.RUnlock()
 
+	ip4 := ip.To4()
+	if ip4 == nil {
+		return nil
+	}
+
 	for _, l := range s.leases {
-		if l.Expiry.Unix() > now && l.IP.Equal(ip) {
-			return l.HWAddr
+		if l.IP.Equal(ip4) {
+			unix := l.Expiry.Unix()
+			if unix > now || unix == leaseExpireStatic {
+				return l.HWAddr
+			}
 		}
 	}
 	return nil

dhcpd/dhcpd_test.go

@@ -23,6 +23,7 @@ func check(t *testing.T, result bool, msg string) {
 func TestDHCP(t *testing.T) {
 	var s = Server{}
 	s.conf.DBFilePath = dbFilename
+	defer func() { _ = os.Remove(dbFilename) }()
 	var p, p2 dhcp4.Packet
 	var hw net.HardwareAddr
 	var lease *Lease
@@ -185,7 +186,7 @@ func TestDB(t *testing.T) {
 	lease, _ = s.reserveLease(p)
 	lease.Expiry = time.Unix(4000000002, 0)
 
-	os.Remove("leases.db")
+	_ = os.Remove("leases.db")
 	s.dbStore()
 	s.reset()
 
@@ -198,7 +199,7 @@ func TestDB(t *testing.T) {
 	check(t, bytes.Equal(s.leases[1].IP, []byte{1, 1, 1, 2}), "leases[1].IP")
 	check(t, s.leases[1].Expiry.Unix() == 4000000002, "leases[1].Expiry")
 
-	os.Remove("leases.db")
+	_ = os.Remove("leases.db")
 }
 
 func TestIsValidSubnetMask(t *testing.T) {

dnsfilter/dnsfilter.go

@@ -263,7 +263,17 @@ func (r Reason) Matched() bool {
 	return r != NotFilteredNotFound
 }
 
-// CheckHost tries to match host against rules, then safebrowsing and parental if they are enabled
+// CheckHostRules tries to match the host against filtering rules only
+func (d *Dnsfilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
+	if !setts.FilteringEnabled {
+		return Result{}, nil
+	}
+
+	return d.matchHost(host, qtype)
+}
+
+// CheckHost tries to match the host against filtering rules,
+// then safebrowsing and parental if they are enabled
 func (d *Dnsfilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
 	// sometimes DNS clients will try to resolve ".", which is a request to get root servers
 	if host == "" {
@@ -334,6 +344,13 @@ func (d *Dnsfilter) CheckHost(host string, qtype uint16, setts *RequestFiltering
 	return Result{}, nil
 }
 
+// Return TRUE of host name matches a wildcard pattern
+func matchDomainWildcard(host, wildcard string) bool {
+	return len(wildcard) >= 2 &&
+		wildcard[0] == '*' && wildcard[1] == '.' &&
+		strings.HasSuffix(host, wildcard[1:])
+}
+
 // Process rewrites table
 // . Find CNAME for a domain name
 //  . if found, set domain name to canonical name
@@ -347,7 +364,9 @@ func (d *Dnsfilter) processRewrites(host string, qtype uint16) Result {
 
 	for _, r := range d.Rewrites {
 		if r.Domain != host {
-			continue
+			if !matchDomainWildcard(host, r.Domain) {
+				continue
+			}
 		}
 
 		ip := net.ParseIP(r.Answer)
@@ -362,7 +381,9 @@ func (d *Dnsfilter) processRewrites(host string, qtype uint16) Result {
 
 	for _, r := range d.Rewrites {
 		if r.Domain != host {
-			continue
+			if !matchDomainWildcard(host, r.Domain) {
+				continue
+			}
 		}
 
 		ip := net.ParseIP(r.Answer)

dnsfilter/dnsfilter_test.go

@@ -474,6 +474,60 @@ func TestClientSettings(t *testing.T) {
 	assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService)
 }
 
+func TestRewrites(t *testing.T) {
+	d := Dnsfilter{}
+	// CNAME, A, AAAA
+	d.Rewrites = []RewriteEntry{
+		RewriteEntry{"somecname", "somehost.com"},
+		RewriteEntry{"somehost.com", "0.0.0.0"},
+
+		RewriteEntry{"host.com", "1.2.3.4"},
+		RewriteEntry{"host.com", "1.2.3.5"},
+		RewriteEntry{"host.com", "1:2:3::4"},
+		RewriteEntry{"www.host.com", "host.com"},
+	}
+	r := d.processRewrites("host2.com", dns.TypeA)
+	assert.Equal(t, NotFilteredNotFound, r.Reason)
+
+	r = d.processRewrites("www.host.com", dns.TypeA)
+	assert.Equal(t, ReasonRewrite, r.Reason)
+	assert.Equal(t, "host.com", r.CanonName)
+	assert.True(t, len(r.IPList) == 2)
+	assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+	assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
+
+	r = d.processRewrites("www.host.com", dns.TypeAAAA)
+	assert.Equal(t, ReasonRewrite, r.Reason)
+	assert.True(t, len(r.IPList) == 1)
+	assert.True(t, r.IPList[0].Equal(net.ParseIP("1:2:3::4")))
+
+	// wildcard
+	d.Rewrites = []RewriteEntry{
+		RewriteEntry{"*.host.com", "1.2.3.5"},
+		RewriteEntry{"host.com", "1.2.3.4"},
+	}
+	r = d.processRewrites("host.com", dns.TypeA)
+	assert.Equal(t, ReasonRewrite, r.Reason)
+	assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+
+	r = d.processRewrites("www.host.com", dns.TypeA)
+	assert.Equal(t, ReasonRewrite, r.Reason)
+	assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
+
+	r = d.processRewrites("www.host2.com", dns.TypeA)
+	assert.Equal(t, NotFilteredNotFound, r.Reason)
+
+	// wildcard + CNAME
+	d.Rewrites = []RewriteEntry{
+		RewriteEntry{"*.host.com", "host.com"},
+		RewriteEntry{"host.com", "1.2.3.4"},
+	}
+	r = d.processRewrites("www.host.com", dns.TypeA)
+	assert.Equal(t, ReasonRewrite, r.Reason)
+	assert.Equal(t, "host.com", r.CanonName)
+	assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+}
+
 // BENCHMARKS
 
 func BenchmarkSafeBrowsing(b *testing.B) {

dnsforward/access.go

@@ -119,13 +119,13 @@ type accessListJSON struct {
 }
 
 func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
-	s.Lock()
+	s.RLock()
 	j := accessListJSON{
 		AllowedClients:    s.conf.AllowedClients,
 		DisallowedClients: s.conf.DisallowedClients,
 		BlockedHosts:      s.conf.BlockedHosts,
 	}
-	s.Unlock()
+	s.RUnlock()
 
 	w.Header().Set("Content-Type", "application/json")
 	err := json.NewEncoder(w).Encode(j)

dnsforward/dnsforward.go

@@ -94,7 +94,7 @@ func stringArrayDup(a []string) []string {
 
 // WriteDiskConfig - write configuration
 func (s *Server) WriteDiskConfig(c *FilteringConfig) {
-	s.Lock()
+	s.RLock()
 	sc := s.conf.FilteringConfig
 	*c = sc
 	c.RatelimitWhitelist = stringArrayDup(sc.RatelimitWhitelist)
@@ -103,7 +103,7 @@ func (s *Server) WriteDiskConfig(c *FilteringConfig) {
 	c.DisallowedClients = stringArrayDup(sc.DisallowedClients)
 	c.BlockedHosts = stringArrayDup(sc.BlockedHosts)
 	c.UpstreamDNS = stringArrayDup(sc.UpstreamDNS)
-	s.Unlock()
+	s.RUnlock()
 }
 
 // FilteringConfig represents the DNS filtering configuration of AdGuard Home
@@ -113,7 +113,7 @@ type FilteringConfig struct {
 	FilterHandler func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
 
 	// This callback function returns the list of upstream servers for a client specified by IP address
-	GetUpstreamsByClient func(clientAddr string) []string `yaml:"-"`
+	GetUpstreamsByClient func(clientAddr string) []upstream.Upstream `yaml:"-"`
 
 	ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
 
@@ -233,6 +233,13 @@ func (s *Server) startInternal() error {
 func (s *Server) Prepare(config *ServerConfig) error {
 	if config != nil {
 		s.conf = *config
+		if s.conf.BlockingMode == "custom_ip" {
+			s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
+			s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
+			if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
+				return fmt.Errorf("DNS: invalid custom blocking IP address specified")
+			}
+		}
 	}
 
 	if len(s.conf.UpstreamDNS) == 0 {
@@ -345,23 +352,6 @@ func (s *Server) IsRunning() bool {
 	return s.isRunning
 }
 
-// Restart - restart server
-func (s *Server) Restart() error {
-	s.Lock()
-	defer s.Unlock()
-	log.Print("Start reconfiguring the server")
-	err := s.stopInternal()
-	if err != nil {
-		return errorx.Decorate(err, "could not reconfigure the server")
-	}
-	err = s.startInternal()
-	if err != nil {
-		return errorx.Decorate(err, "could not reconfigure the server")
-	}
-
-	return nil
-}
-
 // Reconfigure applies the new configuration to the DNS server
 func (s *Server) Reconfigure(config *ServerConfig) error {
 	s.Lock()
@@ -475,13 +465,9 @@ func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
 		if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
 			clientIP := ipFromAddr(d.Addr)
 			upstreams := s.conf.GetUpstreamsByClient(clientIP)
-			for _, us := range upstreams {
-				u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: 30 * time.Second})
-				if err != nil {
-					log.Error("upstream.AddressToUpstream: %s: %s", us, err)
-					continue
-				}
-				d.Upstreams = append(d.Upstreams, u)
+			if len(upstreams) > 0 {
+				log.Debug("Using custom upstreams for %s", clientIP)
+				d.Upstreams = upstreams
 			}
 		}
 
@@ -502,7 +488,7 @@ func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
 
 		} else if res.Reason != dnsfilter.NotFilteredWhiteList {
 			origResp2 := d.Res
-			res, err = s.filterResponse(d)
+			res, err = s.filterDNSResponse(d)
 			if err != nil {
 				return err
 			}
@@ -603,22 +589,28 @@ func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dns
 	s.stats.Update(e)
 }
 
-// filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
-func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) {
-	if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
-		return &dnsfilter.Result{}, nil
-	}
-
+// getClientRequestFilteringSettings lookups client filtering settings
+// using the client's IP address from the DNSContext
+func (s *Server) getClientRequestFilteringSettings(d *proxy.DNSContext) *dnsfilter.RequestFilteringSettings {
 	setts := s.dnsFilter.GetConfig()
 	setts.FilteringEnabled = true
 	if s.conf.FilterHandler != nil {
 		clientAddr := ipFromAddr(d.Addr)
 		s.conf.FilterHandler(clientAddr, &setts)
 	}
+	return &setts
+}
 
+// filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
+func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) {
+	if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
+		return &dnsfilter.Result{}, nil
+	}
+
+	setts := s.getClientRequestFilteringSettings(d)
 	req := d.Req
 	host := strings.TrimSuffix(req.Question[0].Name, ".")
-	res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, &setts)
+	res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
 	if err != nil {
 		// Return immediately if there's an error
 		return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
@@ -628,8 +620,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 		d.Res = s.genDNSFilterMessage(d, &res)
 
 	} else if res.Reason == dnsfilter.ReasonRewrite && len(res.IPList) != 0 {
-		resp := dns.Msg{}
-		resp.SetReply(req)
+		resp := s.makeResponse(req)
 
 		name := host
 		if len(res.CanonName) != 0 {
@@ -642,7 +633,6 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 				a := s.genAAnswer(req, ip)
 				a.Hdr.Name = dns.Fqdn(name)
 				resp.Answer = append(resp.Answer, a)
-
 			} else if req.Question[0].Qtype == dns.TypeAAAA {
 				a := s.genAAAAAnswer(req, ip)
 				a.Hdr.Name = dns.Fqdn(name)
@@ -650,7 +640,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 			}
 		}
 
-		d.Res = &resp
+		d.Res = resp
 	}
 
 	return &res, err
@@ -658,7 +648,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 
 // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
 // If this is a match, we set a new response in d.Res and return.
-func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) {
+func (s *Server) filterDNSResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) {
 	for _, a := range d.Res.Answer {
 		host := ""
 
@@ -686,9 +676,8 @@ func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error)
 			s.RUnlock()
 			continue
 		}
-		setts := dnsfilter.RequestFilteringSettings{}
-		setts.FilteringEnabled = true
-		res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, &setts)
+		setts := s.getClientRequestFilteringSettings(d)
+		res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts)
 		s.RUnlock()
 
 		if err != nil {
@@ -704,6 +693,15 @@ func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error)
 	return nil, nil
 }
 
+// Create a DNS response by DNS request and set necessary flags
+func (s *Server) makeResponse(req *dns.Msg) *dns.Msg {
+	resp := dns.Msg{}
+	resp.SetReply(req)
+	resp.RecursionAvailable = true
+	resp.Compress = true
+	return &resp
+}
+
 // genDNSFilterMessage generates a DNS message corresponding to the filtering result
 func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
 	m := d.Req
@@ -751,17 +749,15 @@ func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg {
 }
 
 func (s *Server) genARecord(request *dns.Msg, ip net.IP) *dns.Msg {
-	resp := dns.Msg{}
-	resp.SetReply(request)
+	resp := s.makeResponse(request)
 	resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
-	return &resp
+	return resp
 }
 
 func (s *Server) genAAAARecord(request *dns.Msg, ip net.IP) *dns.Msg {
-	resp := dns.Msg{}
-	resp.SetReply(request)
+	resp := s.makeResponse(request)
 	resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
-	return &resp
+	return resp
 }
 
 func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
@@ -797,9 +793,8 @@ func (s *Server) genResponseWithIP(req *dns.Msg, ip net.IP) *dns.Msg {
 	}
 
 	// empty response
-	resp := dns.Msg{}
-	resp.SetReply(req)
-	return &resp
+	resp := s.makeResponse(req)
+	return resp
 }
 
 func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSContext) *dns.Msg {
@@ -827,9 +822,7 @@ func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSCo
 		return s.genServerFailure(request)
 	}
 
-	resp := dns.Msg{}
-	resp.SetReply(request)
-	resp.Authoritative, resp.RecursionAvailable = true, true
+	resp := s.makeResponse(request)
 	if newContext.Res != nil {
 		for _, answer := range newContext.Res.Answer {
 			answer.Header().Name = request.Question[0].Name
@@ -837,7 +830,7 @@ func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSCo
 		}
 	}
 
-	return &resp
+	return resp
 }
 
 // Make a CNAME response

dnsforward/dnsforward_http.go

@@ -121,7 +121,7 @@ func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
 	s.conf.ConfigModified()
 
 	if restart {
-		err = s.Restart()
+		err = s.Reconfigure(nil)
 		if err != nil {
 			httpError(r, w, http.StatusInternalServerError, "%s", err)
 			return
@@ -172,7 +172,7 @@ func (s *Server) handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request)
 	s.Unlock()
 	s.conf.ConfigModified()
 
-	err = s.Restart()
+	err = s.Reconfigure(nil)
 	if err != nil {
 		httpError(r, w, http.StatusInternalServerError, "%s", err)
 		return

dnsforward/dnsforward_test.go

@@ -384,6 +384,30 @@ func TestBlockCNAME(t *testing.T) {
 	_ = s.Stop()
 }
 
+func TestClientRulesForCNAMEMatching(t *testing.T) {
+	s := createTestServer(t)
+	testUpstm := &testUpstream{testCNAMEs, testIPv4, nil}
+	s.conf.FilterHandler = func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) {
+		settings.FilteringEnabled = false
+	}
+	err := s.startWithUpstream(testUpstm)
+	assert.Nil(t, err)
+	addr := s.dnsProxy.Addr(proxy.ProtoUDP)
+
+	// 'badhost' has a canonical name 'null.example.org' which is blocked by filters:
+	// response is blocked
+	req := dns.Msg{}
+	req.Id = dns.Id()
+	req.Question = []dns.Question{
+		{Name: "badhost.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
+	}
+	// However, in our case it should not be blocked
+	// as filtering is disabled on the client level
+	reply, err := dns.Exchange(&req, addr.String())
+	assert.Nil(t, err)
+	assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
+}
+
 func TestNullBlockedRequest(t *testing.T) {
 	s := createTestServer(t)
 	s.conf.FilteringConfig.BlockingMode = "null_ip"
@@ -424,6 +448,55 @@ func TestNullBlockedRequest(t *testing.T) {
 	}
 }
 
+func TestBlockedCustomIP(t *testing.T) {
+	rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1	host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
+	filters := map[int]string{}
+	filters[0] = rules
+	c := dnsfilter.Config{}
+
+	f := dnsfilter.New(&c, filters)
+	s := NewServer(f, nil, nil)
+	conf := ServerConfig{}
+	conf.UDPListenAddr = &net.UDPAddr{Port: 0}
+	conf.TCPListenAddr = &net.TCPAddr{Port: 0}
+	conf.ProtectionEnabled = true
+	conf.BlockingMode = "custom_ip"
+	conf.BlockingIPv4 = "bad IP"
+	conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"}
+	err := s.Prepare(&conf)
+	assert.True(t, err != nil) // invalid BlockingIPv4
+
+	conf.BlockingIPv4 = "0.0.0.1"
+	conf.BlockingIPv6 = "::1"
+	err = s.Prepare(&conf)
+	assert.True(t, err == nil)
+	err = s.Start()
+	assert.True(t, err == nil, "%s", err)
+
+	addr := s.dnsProxy.Addr(proxy.ProtoUDP)
+
+	req := createTestMessageWithType("null.example.org.", dns.TypeA)
+	reply, err := dns.Exchange(req, addr.String())
+	assert.True(t, err == nil)
+	assert.True(t, len(reply.Answer) == 1)
+	a, ok := reply.Answer[0].(*dns.A)
+	assert.True(t, ok)
+	assert.True(t, a.A.String() == "0.0.0.1")
+
+	req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
+	reply, err = dns.Exchange(req, addr.String())
+	assert.True(t, err == nil)
+	assert.True(t, len(reply.Answer) == 1)
+	a6, ok := reply.Answer[0].(*dns.AAAA)
+	assert.True(t, ok)
+	assert.True(t, a6.AAAA.String() == "::1")
+
+	err = s.Stop()
+	if err != nil {
+		t.Fatalf("DNS server failed to stop: %s", err)
+	}
+}
+
 func TestBlockedByHosts(t *testing.T) {
 	s := createTestServer(t)
 	err := s.Start()
@@ -514,7 +587,11 @@ func TestBlockedBySafeBrowsing(t *testing.T) {
 }
 
 func createTestServer(t *testing.T) *Server {
-	rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1	host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
+	rules := `||nxdomain.example.org
+||null.example.org^
+127.0.0.1	host.example.org
+@@||whitelist.example.org^
+||127.0.0.255`
 	filters := map[int]string{}
 	filters[0] = rules
 	c := dnsfilter.Config{}
@@ -652,6 +729,16 @@ func createTestMessage(host string) *dns.Msg {
 	return &req
 }
 
+func createTestMessageWithType(host string, qtype uint16) *dns.Msg {
+	req := dns.Msg{}
+	req.Id = dns.Id()
+	req.RecursionDesired = true
+	req.Question = []dns.Question{
+		{Name: host, Qtype: qtype, Qclass: dns.ClassINET},
+	}
+	return &req
+}
+
 func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
 	assertResponse(t, reply, "8.8.8.8")
 }

go.mod

@@ -3,9 +3,9 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.13
 
 require (
-	github.com/AdguardTeam/dnsproxy v0.23.2
+	github.com/AdguardTeam/dnsproxy v0.23.5
 	github.com/AdguardTeam/golibs v0.3.0
-	github.com/AdguardTeam/urlfilter v0.7.0
+	github.com/AdguardTeam/urlfilter v0.7.2
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/etcd-io/bbolt v1.3.3
 	github.com/go-test/deep v1.0.4 // indirect
@@ -14,12 +14,12 @@ require (
 	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
 	github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b
 	github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
-	github.com/miekg/dns v1.1.19
+	github.com/miekg/dns v1.1.26
 	github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0
 	github.com/stretchr/testify v1.4.0
 	go.etcd.io/bbolt v1.3.3 // indirect
-	golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
-	golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
-	golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
+	golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+	golang.org/x/sys v0.0.0-20191224085550-c709ea063b76
 	gopkg.in/yaml.v2 v2.2.3
 )

go.sum

@@ -1,5 +1,5 @@
-github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
-github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
+github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
+github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
 github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
 github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
 github.com/AdguardTeam/golibs v0.3.0 h1:1zO8ulGEOdXDDM++Ap4sYfTsT/Z4tZBZtiWSA4ykcOU=
@@ -7,6 +7,8 @@ github.com/AdguardTeam/golibs v0.3.0/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZY
 github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
 github.com/AdguardTeam/urlfilter v0.7.0 h1:ffFLt4rA3GX8PJYGL3bGcT5bSxZlML5k6cKpSeN2UI8=
 github.com/AdguardTeam/urlfilter v0.7.0/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
+github.com/AdguardTeam/urlfilter v0.7.2 h1:0XyepkVAvY1eYtNKgDRCkookfaBmROvY6VE23ebPUNc=
+github.com/AdguardTeam/urlfilter v0.7.2/go.mod h1:GHXPzEG59ezyff22lXSQ7dicj1kFZBrH5kmZ6EvQzfk=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
@@ -90,6 +92,8 @@ github.com/miekg/dns v1.1.8 h1:1QYRAKU3lN5cRfLCkPU08hwvLJFhvjP6MqNMmQz6ZVI=
 github.com/miekg/dns v1.1.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.19 h1:0ymbfaLG1/utH2+BydNiF+dx1jSEmdr/nylOtkGHZZg=
 github.com/miekg/dns v1.1.19/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 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/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -141,6 +145,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc h1:KyTYo8xkh/2WdbFLUyQwBS0Jfn3qfZ9QmuPbok2oENE=
 golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
+golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q=
@@ -152,6 +158,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs=
 golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
@@ -173,6 +181,8 @@ golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed h1:5TJcLJn2a55mJjzYk0yOoqN8X1OdvBDUnaZaKKyQtkY=
 golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

home/clients.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/dnsforward"
+	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/utils"
 )
@@ -62,8 +63,14 @@ type clientsContainer struct {
 	list    map[string]*Client     // name -> client
 	idIndex map[string]*Client     // IP -> client
 	ipHost  map[string]*ClientHost // IP -> Hostname
-	lock    sync.Mutex
 
+	// cache for Upstream instances that are used in the case
+	// when custom DNS servers are configured for a client
+	upstreamsCache map[string][]upstream.Upstream // name -> []Upstream
+
+	lock sync.Mutex
+
+	// dhcpServer is used for looking up clients IP addresses by MAC addresses
 	dhcpServer *dhcpd.Server
 
 	testing bool // if TRUE, this object is used for internal tests
@@ -78,6 +85,7 @@ func (clients *clientsContainer) Init(objects []clientObject, dhcpServer *dhcpd.
 	clients.list = make(map[string]*Client)
 	clients.idIndex = make(map[string]*Client)
 	clients.ipHost = make(map[string]*ClientHost)
+	clients.upstreamsCache = make(map[string][]upstream.Upstream)
 	clients.dhcpServer = dhcpServer
 	clients.addFromConfig(objects)
 
@@ -168,7 +176,7 @@ func (clients *clientsContainer) Exists(ip string, source clientSource) bool {
 	clients.lock.Lock()
 	defer clients.lock.Unlock()
 
-	_, ok := clients.idIndex[ip]
+	_, ok := clients.findByIP(ip)
 	if ok {
 		return true
 	}
@@ -185,14 +193,58 @@ func (clients *clientsContainer) Exists(ip string, source clientSource) bool {
 
 // Find searches for a client by IP
 func (clients *clientsContainer) Find(ip string) (Client, bool) {
+	clients.lock.Lock()
+	defer clients.lock.Unlock()
+
+	return clients.findByIP(ip)
+}
+
+// FindUpstreams looks for upstreams configured for the client
+// If no client found for this IP, or if no custom upstreams are configured,
+// this method returns nil
+func (clients *clientsContainer) FindUpstreams(ip string) []upstream.Upstream {
+	clients.lock.Lock()
+	defer clients.lock.Unlock()
+
+	c, ok := clients.findByIP(ip)
+	if !ok {
+		return nil
+	}
+
+	if len(c.Upstreams) == 0 {
+		return nil
+	}
+
+	upstreams, ok := clients.upstreamsCache[c.Name]
+	if ok {
+		return upstreams
+	}
+
+	for _, us := range c.Upstreams {
+		u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
+		if err != nil {
+			log.Error("upstream.AddressToUpstream: %s: %s", us, err)
+			continue
+		}
+		upstreams = append(upstreams, u)
+	}
+
+	if len(upstreams) == 0 {
+		clients.upstreamsCache[c.Name] = nil
+	} else {
+		clients.upstreamsCache[c.Name] = upstreams
+	}
+
+	return upstreams
+}
+
+// Find searches for a client by IP (and does not lock anything)
+func (clients *clientsContainer) findByIP(ip string) (Client, bool) {
 	ipAddr := net.ParseIP(ip)
 	if ipAddr == nil {
 		return Client{}, false
 	}
 
-	clients.lock.Lock()
-	defer clients.lock.Unlock()
-
 	c, ok := clients.idIndex[ip]
 	if ok {
 		return *c, true
@@ -350,6 +402,9 @@ func (clients *clientsContainer) Del(name string) bool {
 	// update Name index
 	delete(clients.list, name)
 
+	// update upstreams cache
+	delete(clients.upstreamsCache, name)
+
 	// update ID index
 	for _, id := range c.IDs {
 		delete(clients.idIndex, id)
@@ -413,10 +468,13 @@ func (clients *clientsContainer) Update(name string, c Client) error {
 
 	// update Name index
 	if old.Name != c.Name {
-		delete(clients.list, old.Name)
 		clients.list[c.Name] = old
 	}
 
+	// update upstreams cache
+	delete(clients.upstreamsCache, name)
+	delete(clients.upstreamsCache, old.Name)
+
 	*old = c
 	return nil
 }
@@ -426,10 +484,9 @@ func (clients *clientsContainer) SetWhoisInfo(ip string, info [][]string) {
 	clients.lock.Lock()
 	defer clients.lock.Unlock()
 
-	c, ok := clients.idIndex[ip]
+	_, ok := clients.findByIP(ip)
 	if ok {
-		c.WhoisInfo = info
-		log.Debug("Clients: set WHOIS info for client %s: %v", c.Name, c.WhoisInfo)
+		log.Debug("Clients: client for %s is already created, ignore WHOIS info", ip)
 		return
 	}
 
@@ -440,6 +497,7 @@ func (clients *clientsContainer) SetWhoisInfo(ip string, info [][]string) {
 		return
 	}
 
+	// Create a ClientHost implicitly so that we don't do this check again
 	ch = &ClientHost{
 		Source: ClientSourceWHOIS,
 	}
@@ -455,8 +513,8 @@ func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (
 	clients.lock.Lock()
 	defer clients.lock.Unlock()
 
-	// check index
-	_, ok := clients.idIndex[ip]
+	// check existing clients first
+	_, ok := clients.findByIP(ip)
 	if ok {
 		return false, nil
 	}
@@ -520,7 +578,6 @@ func (clients *clientsContainer) addFromHostsFile() {
 // The command's output is:
 // HOST (IP) at MAC on IFACE
 func (clients *clientsContainer) addFromSystemARP() {
-
 	if runtime.GOOS == "windows" {
 		return
 	}

home/clients_http.go

@@ -257,7 +257,6 @@ func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http
 			}
 			cj := clientHostToJSON(ip, ch)
 			el[ip] = cj
-
 		} else {
 			cj := clientToJSON(&c)
 			el[ip] = cj

home/clients_test.go

@@ -1,7 +1,12 @@
 package home
 
 import (
+	"net"
+	"os"
 	"testing"
+	"time"
+
+	"github.com/AdguardTeam/AdGuardHome/dhcpd"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -162,13 +167,63 @@ func TestClientsWhois(t *testing.T) {
 	clients.SetWhoisInfo("1.1.1.1", whois)
 	assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
 
-	// set whois info on existing client
+	// Check that we cannot set whois info on existing client
 	c = Client{
 		IDs:  []string{"1.1.1.2"},
 		Name: "client1",
 	}
 	_, _ = clients.Add(c)
 	clients.SetWhoisInfo("1.1.1.2", whois)
-	assert.True(t, clients.idIndex["1.1.1.2"].WhoisInfo[0][1] == "orgname-val")
+	assert.Nil(t, clients.idIndex["1.1.1.2"].WhoisInfo)
 	_ = clients.Del("client1")
 }
+
+func TestClientsAddExistingHost(t *testing.T) {
+	var c Client
+	clients := clientsContainer{}
+	clients.testing = true
+	clients.Init(nil, nil)
+
+	// some test variables
+	mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
+	testIP := "1.2.3.4"
+
+	// add a client
+	c = Client{
+		IDs:  []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
+		Name: "client1",
+	}
+	ok, err := clients.Add(c)
+	assert.True(t, ok)
+	assert.Nil(t, err)
+
+	// try adding a duplicate by IP
+	ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
+	assert.False(t, ok)
+	assert.Nil(t, err)
+
+	// now some more complicated stuff
+	// first, init a DHCP server with a single static lease
+	config := dhcpd.ServerConfig{
+		DBFilePath: "leases.db",
+	}
+	defer func() { _ = os.Remove("leases.db") }()
+	clients.dhcpServer = dhcpd.Create(config)
+	err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
+		HWAddr:   mac,
+		IP:       net.ParseIP(testIP).To4(),
+		Hostname: "testhost",
+		Expiry:   time.Now().Add(time.Hour),
+	})
+	assert.Nil(t, err)
+
+	// try adding a duplicate IP which for a Mac-based client
+	ok, err = clients.AddHost(testIP, "test", ClientSourceRDNS)
+	assert.False(t, ok)
+	assert.Nil(t, err)
+
+	// don't allow duplicates by CIDR
+	ok, err = clients.AddHost("2.2.2.2", "test", ClientSourceRDNS)
+	assert.False(t, ok)
+	assert.Nil(t, err)
+}

home/config.go

@@ -117,6 +117,9 @@ type tlsConfigSettings struct {
 	PortHTTPS      int    `yaml:"port_https" json:"port_https,omitempty"`               // HTTPS port. If 0, HTTPS will be disabled
 	PortDNSOverTLS int    `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DOT will be disabled
 
+	// Allow DOH queries via unencrypted HTTP (e.g. for reverse proxying)
+	AllowUnencryptedDOH bool `yaml:"allow_unencrypted_doh" json:"allow_unencrypted_doh"`
+
 	dnsforward.TLSConfig `yaml:",inline" json:",inline"`
 }
 

home/control.go

@@ -144,7 +144,7 @@ func handleGetProfile(w http.ResponseWriter, r *http.Request) {
 // DNS-over-HTTPS
 // --------------
 func handleDOH(w http.ResponseWriter, r *http.Request) {
-	if r.TLS == nil {
+	if !config.TLS.AllowUnencryptedDOH && r.TLS == nil {
 		httpError(w, http.StatusNotFound, "Not Found")
 		return
 	}

home/control_install.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"os/exec"
+	"runtime"
 	"strconv"
 
 	"github.com/AdguardTeam/golibs/log"
@@ -117,6 +118,10 @@ func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
 
 // Check if DNSStubListener is active
 func checkDNSStubListener() bool {
+	if runtime.GOOS != "linux" {
+		return false
+	}
+
 	cmd := exec.Command("systemctl", "is-enabled", "systemd-resolved")
 	log.Tracef("executing %s %v", cmd.Path, cmd.Args)
 	_, err := cmd.Output()

home/dns.go

@@ -11,6 +11,7 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/querylog"
 	"github.com/AdguardTeam/AdGuardHome/stats"
 	"github.com/AdguardTeam/dnsproxy/proxy"
+	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/joomcode/errorx"
 )
@@ -70,6 +71,9 @@ func initDNSServer() error {
 
 	sessFilename := filepath.Join(baseDir, "sessions.db")
 	config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
+	if config.auth == nil {
+		return fmt.Errorf("Couldn't initialize Auth module")
+	}
 	config.Users = nil
 
 	Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
@@ -175,18 +179,12 @@ func generateServerConfig() dnsforward.ServerConfig {
 	return newconfig
 }
 
-func getUpstreamsByClient(clientAddr string) []string {
-	c, ok := Context.clients.Find(clientAddr)
-	if !ok {
-		return []string{}
-	}
-	log.Debug("Using upstreams %v for client %s (IP: %s)", c.Upstreams, c.Name, clientAddr)
-	return c.Upstreams
+func getUpstreamsByClient(clientAddr string) []upstream.Upstream {
+	return Context.clients.FindUpstreams(clientAddr)
 }
 
 // If a client has his own settings, apply them
 func applyAdditionalFiltering(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
-
 	ApplyBlockedServices(setts, config.DNS.BlockedServices)
 
 	if len(clientAddr) == 0 {
@@ -254,6 +252,10 @@ func reconfigureDNSServer() error {
 }
 
 func stopDNSServer() error {
+	if !isRunning() {
+		return nil
+	}
+
 	err := Context.dnsServer.Stop()
 	if err != nil {
 		return errorx.Decorate(err, "Couldn't stop forwarding DNS server")

home/helpers.go

@@ -242,6 +242,10 @@ func checkPortAvailable(host string, port int) error {
 		return err
 	}
 	ln.Close()
+
+	// It seems that net.Listener.Close() doesn't close file descriptors right away.
+	// We wait for some time and hope that this fd will be closed.
+	time.Sleep(100 * time.Millisecond)
 	return nil
 }
 
@@ -251,6 +255,10 @@ func checkPacketPortAvailable(host string, port int) error {
 		return err
 	}
 	ln.Close()
+
+	// It seems that net.Listener.Close() doesn't close file descriptors right away.
+	// We wait for some time and hope that this fd will be closed.
+	time.Sleep(100 * time.Millisecond)
 	return err
 }
 

home/home.go

@@ -20,6 +20,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/isdelve"
+
 	"github.com/AdguardTeam/AdGuardHome/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/dnsfilter"
 	"github.com/AdguardTeam/AdGuardHome/dnsforward"
@@ -284,7 +286,8 @@ func httpServerLoop() {
 //  and if not, ask and try to run as root
 func requireAdminRights() {
 	admin, _ := haveAdminRights()
-	if admin {
+	if //noinspection ALL
+	admin || isdelve.Enabled {
 		return
 	}
 

home/home_test.go

@@ -2,6 +2,7 @@ package home
 
 import (
 	"context"
+	"encoding/base64"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -9,7 +10,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/AdguardTeam/dnsproxy/proxyutil"
 	"github.com/AdguardTeam/dnsproxy/upstream"
+	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -61,6 +64,7 @@ tls:
   force_https: false
   port_https: 443
   port_dns_over_tls: 853
+  allow_unencrypted_doh: true
   certificate_chain: ""
   private_key: ""
   certificate_path: ""
@@ -99,6 +103,7 @@ schema_version: 5
 // . Start AGH instance
 // . Check Web server
 // . Check DNS server
+// . Check DNS server with DOH
 // . Wait until the filters are downloaded
 // . Stop and cleanup
 func TestHome(t *testing.T) {
@@ -131,12 +136,34 @@ func TestHome(t *testing.T) {
 	assert.Truef(t, err == nil, "%s", err)
 	assert.Equal(t, 200, resp.StatusCode)
 
+	// test DNS over UDP
 	r := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
 	addrs, err := r.LookupIPAddr(context.TODO(), "static.adguard.com")
 	assert.Truef(t, err == nil, "%s", err)
 	haveIP := len(addrs) != 0
 	assert.True(t, haveIP)
 
+	// test DNS over HTTP without encryption
+	req := dns.Msg{}
+	req.Id = dns.Id()
+	req.RecursionDesired = true
+	req.Question = []dns.Question{{Name: "static.adguard.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET}}
+	buf, err := req.Pack()
+	assert.True(t, err == nil, "%s", err)
+	requestURL := "http://127.0.0.1:3000/dns-query?dns=" + base64.RawURLEncoding.EncodeToString(buf)
+	resp, err = http.DefaultClient.Get(requestURL)
+	assert.True(t, err == nil, "%s", err)
+	body, err := ioutil.ReadAll(resp.Body)
+	assert.True(t, err == nil, "%s", err)
+	assert.True(t, resp.StatusCode == http.StatusOK)
+	response := dns.Msg{}
+	err = response.Unpack(body)
+	assert.True(t, err == nil, "%s", err)
+	addrs = nil
+	proxyutil.AppendIPAddrs(&addrs, response.Answer)
+	haveIP = len(addrs) != 0
+	assert.True(t, haveIP)
+
 	for i := 1; ; i++ {
 		st, err := os.Stat(filepath.Join(dir, "data", "filters", "1.txt"))
 		if err == nil && st.Size() != 0 {

home/whois.go

@@ -16,6 +16,7 @@ const (
 	defaultServer  = "whois.arin.net"
 	defaultPort    = "43"
 	maxValueLength = 250
+	whoisTTL       = 1 * 60 * 60 // 1 hour
 )
 
 // Whois - module context
@@ -205,8 +206,7 @@ func (w *Whois) Begin(ip string) {
 		// TTL expired
 	}
 	expire = make([]byte, 8)
-	const ttl = 1 * 60 * 60
-	binary.BigEndian.PutUint64(expire, now+ttl)
+	binary.BigEndian.PutUint64(expire, now+whoisTTL)
 	_ = w.ipAddrs.Set([]byte(ip), expire)
 
 	log.Debug("Whois: adding %s", ip)

isdelve/delve.go

@@ -0,0 +1,5 @@
+// +build delve
+
+package isdelve
+
+const Enabled = true

isdelve/doc.go

@@ -0,0 +1,3 @@
+// Package isdelve is for checking if we're debugging:
+// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
+package isdelve

isdelve/nodelve.go

@@ -0,0 +1,5 @@
+// +build !delve
+
+package isdelve
+
+const Enabled = false

scripts/translations/README.md

@@ -9,3 +9,9 @@ TWOSKY_URI=<API URI> TWOSKY_CLIENT_ID=<PROJECT ID> node upload.js
 ```
 
 After download you'll find the output locales in the `client/src/__locales/` folder.
+
+Examples:
+```
+TWOSKY_URI=https://twosky.example/api/v1 TWOSKY_CLIENT_ID=adguardhome node download.js
+TWOSKY_URI=https://twosky.example/api/v1 TWOSKY_CLIENT_ID=adguardhome node upload.js
+```