+ client: Add choosing filter lists

Fix #1325 Squashed commit of the following: commit d8f7de7 Merge: f9bbe86 36f3218 Author: Andrey Meshkov <[email protected]> Date: Mon Jul 6 19:34:53 2020 +0300 Merge branch 'master' into feature/1325 commit f9bbe86 Merge: 99710fe 4f8138b Author: Andrey Meshkov <[email protected]> Date: Mon Jul 6 19:33:53 2020 +0300 Merge branch 'master' into feature/1325 commit 99710fe Merge: 8329326 a5380ea Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 18:04:32 2020 +0300 Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325 commit 8329326 Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 18:03:56 2020 +0300 Update locales, add title for select modal commit a5380ea Author: Andrey Meshkov <[email protected]> Date: Mon Jul 6 17:26:37 2020 +0300 Update readme commit dfe6e25 Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 13:44:19 2020 +0300 Change info icon width commit 06120cf Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 13:38:58 2020 +0300 Review changes commit ae3c6ca Merge: dd56a3b 73c5d9e Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 12:01:57 2020 +0300 Merge branch 'master' into feature/1325 commit dd56a3b Author: Andrey Meshkov <[email protected]> Date: Fri Jul 3 15:52:01 2020 +0300 Added blocklists commit f08f0eb Merge: 854d4f8 21dfb5f Author: Andrey Meshkov <[email protected]> Date: Fri Jul 3 14:06:19 2020 +0300 Merge branch 'master' into feature/1325 commit 854d4f8 Merge: 2394626 2c47053 Author: ArtemBaskal <[email protected]> Date: Mon Jun 22 14:09:31 2020 +0300 Merge branch 'master' into feature/1325 commit 2394626 Author: ArtemBaskal <[email protected]> Date: Tue May 26 19:00:26 2020 +0300 Math filters by url commit 661e048 Author: ArtemBaskal <[email protected]> Date: Mon May 25 21:07:21 2020 +0300 Change data format commit ac4ff48 Author: ArtemBaskal <[email protected]> Date: Thu May 14 19:52:45 2020 +0300 + client: Add choosing filter lists
AdguardTeam · Jul 6, 2020 · 49646cf · 49646cf
1 parent 36f3218
commit 49646cf
Show file tree

Hide file tree

Showing 29 changed files with 617 additions and 132 deletions.
diff --git a/README.md b/README.md
@@ -63,6 +63,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole," t
     * [Test unstable versions](#test-unstable-versions)
     * [Reporting issues](#reporting-issues)
     * [Help with translations](#translate)
+    * [Other](#help-other)
 * [Projects that use AdGuardHome](#uses)
 * [Acknowledgments](#acknowledgments)
 
@@ -224,6 +225,15 @@ If you want to help with AdGuard Home translations, please learn more about tran
 
 Here is a link to AdGuard Home project: https://crowdin.com/project/adguard-applications/en#/adguard-home
 
+<a id="help-other"></a>
+### Other
+
+Here's what you can also do to contribute:
+
+1. [Look for issues](https://github.com/AdguardTeam/AdGuardHome/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22+) marked as "help wanted".
+2. Actualize the list of *Blocked services*. It it can be found in [dnsfilter/blocked_services.go](https://github.com/AdguardTeam/AdGuardHome/blob/master/dnsfilter/blocked_services.go).
+3. Actualize the list of known *trackers*. It it can be found in [client/src/helpers/trackers/adguard.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/trackers/adguard.json).
+4. Actualize the list of vetted *blocklists*. It it can be found in [client/src/helpers/filters/filters.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/filters/filters.json).
 
 <a id="uses"></a>
 ## Projects that use AdGuardHome
@@ -255,5 +265,3 @@ This software wouldn't have been possible without:
 You might have seen that [CoreDNS](https://coredns.io) was mentioned here before — we've stopped using it in AdGuardHome. While we still use it on our servers for [AdGuard DNS](https://adguard.com/adguard-dns/overview.html) service, it seemed like an overkill for Home as it impeded with Home features that we plan to implement.
 
 For a full list of all node.js packages in use, please take a look at [client/package.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/package.json) file.
-
-For info on which exact domains that are blocked by the *Blocked services* function, it can be found at [dnsfilter/blocked_services.go](https://github.com/AdguardTeam/AdGuardHome/blob/master/dnsfilter/blocked_services.go)
diff --git a/client/src/__locales/cs.json b/client/src/__locales/cs.json
@@ -68,7 +68,7 @@
     "filter": "Filtr",
     "query_log": "Protokol dotazů",
     "compact": "Kompaktní",
-    "nothing_found": "Nic nebylo nalezeno",
+    "nothing_found": "Nic nenalezeno",
     "faq": "FAQ",
     "version": "Verze",
     "address": "Adresa",

diff --git a/client/src/__locales/de.json b/client/src/__locales/de.json
@@ -530,4 +530,4 @@
     "safe_search": "Sichere Suche",
     "blocklist": "Sperrliste",
     "milliseconds_abbreviation": "ms"
-}
+}
diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
@@ -162,6 +162,8 @@
     "new_allowlist": "New allowlist",
     "edit_blocklist": "Edit blocklist",
     "edit_allowlist": "Edit allowlist",
+    "choose_blocklist": "Choose blocklists",
+    "choose_allowlist": "Choose allowlists",
     "enter_valid_blocklist": "Enter a valid URL to the blocklist.",
     "enter_valid_allowlist": "Enter a valid URL to the allowlist.",
     "form_error_url_format": "Invalid URL format",
@@ -447,6 +449,7 @@
     "domain": "Domain",
     "answer": "Answer",
     "filter_added_successfully": "The list has been successfully added",
+    "filter_removed_successfully": "The list has been successfully removed",
     "filter_updated": "The list has been successfully updated",
     "statistics_configuration": "Statistics configuration",
     "statistics_retention": "Statistics retention",
@@ -500,6 +503,8 @@
     "check": "Check",
     "form_enter_host": "Enter a host name",
     "filtered_custom_rules": "Filtered by Custom filtering rules",
+    "choose_from_list": "Choose from the list",
+    "add_custom_list": "Add a custom list",
     "host_whitelisted": "The host is whitelisted",
     "check_ip": "IP addresses: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
@@ -547,5 +552,13 @@
     "cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server. This value can't larger than 3600 (1 hour)",
     "cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server",
     "min_exceeds_max_value": "Minimum value exceeds maximum value",
-    "value_not_larger_than": "Value can't be larger than {{maximum}}"
+    "value_not_larger_than": "Value can't be larger than {{maximum}}",
+    "filter_category_general": "General",
+    "filter_category_security": "Security",
+    "filter_category_regional": "Regional",
+    "filter_category_other": "Other",
+    "filter_category_general_desc": "Lists that block tracking and advertising on most of the devices",
+    "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains",
+    "filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
+    "filter_category_other_desc": "Other blocklists"
 }
diff --git a/client/src/__locales/ja.json b/client/src/__locales/ja.json
@@ -530,4 +530,4 @@
     "safe_search": "セーフサーチ",
     "blocklist": "ブロックリスト",
     "milliseconds_abbreviation": "ms"
-}
+}
diff --git a/client/src/__locales/ko.json b/client/src/__locales/ko.json
@@ -530,4 +530,4 @@
     "safe_search": "세이프 서치",
     "blocklist": "차단 목록",
     "milliseconds_abbreviation": "ms"
-}
+}
diff --git a/client/src/__locales/nl.json b/client/src/__locales/nl.json
@@ -28,6 +28,7 @@
     "form_error_mac_format": "Ongeldig MAC formaat.",
     "form_error_client_id_format": "Opmaak cliënt-ID is ongeldig",
     "form_error_positive": "Moet groter zijn dan 0",
+    "form_error_negative": "Moet 0 of hoger dan 0 zijn",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Bereik van IP adressen",
@@ -221,11 +222,29 @@
     "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
     "anonymize_client_ip": "Cliënt IP anonimiseren",
     "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in log- en statistiekbestanden",
+    "dns_config": "DNS server configuratie",
+    "blocking_mode": "Blocking modus",
     "default": "Standaard",
+    "nxdomain": "NXDOMAIN",
+    "null_ip": "Nul IP",
     "custom_ip": "Aangepast IP",
+    "blocking_ipv4": "Blokkeren IP4",
+    "blocking_ipv6": "Blokkeren IP6",
     "dns_over_https": "DNS-via-HTTPS",
     "dns_over_tls": "DNS-via-TLS",
     "plain_dns": "Gewone DNS",
+    "form_enter_rate_limit": "Voer ratio limiet in",
+    "rate_limit": "Ratio limiet",
+    "edns_enable": "Zet EDNS client subnet aan",
+    "edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
+    "rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
+    "blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
+    "blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
+    "blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
+    "blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
+    "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
+    "blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
+    "upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.",
     "tracker_source": "Bron volger",
     "source_label": "Bron",
     "found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
@@ -460,20 +479,43 @@
     "domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.",
     "example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.",
     "example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <0>example.org</0>.",
+    "disable_ipv6": "Zet IPv6 uit",
+    "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
     "fastest_addr": "Snelste IP adres",
     "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
+    "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
+    "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
+    "autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.",
     "tags_title": "Labels",
+    "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
+    "form_select_tags": "Kies client tags",
+    "check_title": "Controleer de filtering",
+    "check_desc": "Controleer of de hostnaam wordt gefilterd",
     "check": "Controleren",
     "form_enter_host": "Voer een hostnaam in",
+    "filtered_custom_rules": "Gefilterd door aangepaste filterregels",
     "host_whitelisted": "De host staat op de toestemmingslijst",
     "check_ip": "IP-adressen: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Reden: {{reason}}",
     "check_rule": "Regel: {{rule}}",
     "check_service": "Servicenaam: {{service}}",
+    "check_not_found": "Niet in je lijst met filters gevonden",
+    "client_confirm_block": "Weet je zeker dat je client \"{{ip}}\" wil blokkeren?",
+    "client_confirm_unblock": "Weet je zeker dat je client \"{{ip}}\" niet meer wil blokkeren?",
+    "client_blocked": "Client \"{{ip}}\" wordt nu geblokkeerd",
+    "client_unblocked": "Client \"{{ip}}\" wordt niet meer geblokkeerd",
+    "static_ip": "Statisch IP-adres",
+    "static_ip_desc": "AdGuard Home is een server en heeft daarom een statisch IP-adres nodig om goed te kunnen functioneren, anders kan uw router op een bepaald moment een ander IP-adres aan dit apparaat toewijzen.",
+    "set_static_ip": "Stel een statisch IP-adres in",
+    "install_static_ok": "Goed nieuws! Het statische IP-adres was al geconfigureerd",
+    "install_static_error": "AdGuard Home kan dit niet automatisch configureren op deze netwerkinterface. Zoek een instructie om dit handmatig te doen.",
+    "install_static_configure": "We hebben vastgesteld dat er een dynamisch IP-adres wordt gebruikt - <0> {{ip}} </0>. Wil je dit als je statische adres gebruiken?",
+    "confirm_static_ip": "AdGuard Home configureert {{ip}} als jouw statische IP-adres. Wil je doorgaan?",
     "list_updated": "{{count}} lijst geüpdatet",
     "list_updated_plural": "{{count}} lijsten geüpdatet",
     "dnssec_enable": "DNSSEC inschakelen",
+    "dnssec_enable_desc": "Zet de DNSSEC-vlag aan bij uitgaande DNS-query's en controleer het resultaat (DNSSEC-compatibele resolver is vereist)",
     "validated_with_dnssec": "Gevalideerd met DNSSEC",
     "show_all_responses": "Alle reacties",
     "show_blocked_responses": "Geblokkeerd",

diff --git a/client/src/__locales/no.json b/client/src/__locales/no.json
@@ -492,4 +492,4 @@
     "blocked_threats": "Blokkerte trusler",
     "allowed": "Unntak",
     "blocklist": "Blokkeringsliste"
-}
+}
diff --git a/client/src/__locales/pl.json b/client/src/__locales/pl.json
@@ -527,4 +527,4 @@
     "safe_search": "Bezpieczne wyszukiwanie",
     "blocklist": "Lista zablokowanych",
     "milliseconds_abbreviation": "ms"
-}
+}