From 2c9dcc12ff8b5b364abcf3e8e7293b8352f852ff Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 24 Aug 2023 14:30:19 +0300 Subject: [PATCH] Pull request 1976: upd-all Squashed commit of the following: commit 13300d57c5f01109fff7d61751dd369c05a45b8d Author: Ainar Garipov Date: Thu Aug 24 14:10:43 2023 +0300 all: upd deps, filters, i18n, svcs, trackers --- client/src/__locales/ar.json | 4 + client/src/__locales/be.json | 3 + client/src/__locales/cs.json | 4 + client/src/__locales/da.json | 4 + client/src/__locales/de.json | 4 + client/src/__locales/es.json | 4 + client/src/__locales/fa.json | 3 + client/src/__locales/fi.json | 4 + client/src/__locales/fr.json | 4 + client/src/__locales/hr.json | 3 + client/src/__locales/hu.json | 3 + client/src/__locales/id.json | 3 + client/src/__locales/it.json | 4 + client/src/__locales/ja.json | 22 +-- client/src/__locales/ko.json | 4 + client/src/__locales/nl.json | 4 + client/src/__locales/no.json | 3 + client/src/__locales/pl.json | 3 + client/src/__locales/pt-br.json | 4 + client/src/__locales/pt-pt.json | 4 + client/src/__locales/ro.json | 3 + client/src/__locales/ru.json | 4 + client/src/__locales/sk.json | 3 + client/src/__locales/sl.json | 4 + client/src/__locales/sr-cs.json | 3 + client/src/__locales/sv.json | 4 + client/src/__locales/tr.json | 4 + client/src/__locales/uk.json | 4 + client/src/__locales/vi.json | 4 + client/src/__locales/zh-cn.json | 4 + client/src/__locales/zh-tw.json | 4 + client/src/helpers/filters/filters.js | 36 +++++ client/src/helpers/trackers/trackers.json | 23 ++- go.mod | 6 +- go.sum | 14 +- internal/filtering/servicelist.go | 182 +++++++++++++++++++++- 36 files changed, 361 insertions(+), 32 deletions(-) diff --git a/client/src/__locales/ar.json b/client/src/__locales/ar.json index 55b176ad..bb940264 100644 --- a/client/src/__locales/ar.json +++ b/client/src/__locales/ar.json @@ -125,6 +125,8 @@ "top_clients": "كبار العملاء", "no_clients_found": "لم يتم العثور على عملاء", "general_statistics": "الإحصاءات العامة", + "top_upstreams": "أعلى الخوادم upstream", + "no_upstreams_data_found": "لم يتم العثور على بيانات خوادم upstream", "number_of_dns_query_days": "عدد استعلامات DNS التي تمت معالجتها لآخر {{count}} يوم", "number_of_dns_query_days_plural": "عدد استعلامات DNS التي تمت معالجتها لآخر {{count}} أيام", "number_of_dns_query_24_hours": "عدد استعلامات DNS التي تمت معالجتها لآخر 24 ساعة", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "تم اعداده في {{path}}", "test_upstream_btn": "اختبار upstream", "upstreams": "Upstreams", + "upstream": "Upstream", "apply_btn": "تطبيق", "disabled_filtering_toast": "تم تعطيل الفلترة", "enabled_filtering_toast": "تم تمكين الفلترة", @@ -212,6 +215,7 @@ "example_upstream_udp": "regular DNS (over UDP, hostname);", "example_upstream_dot": "مشفر<0>DNS-over-TLS;", "example_upstream_doh": "مشفر <0>DNS-over-HTTPS;", + "example_upstream_doh3": "DNS-over-HTTPS المشفر مع فرض <0> HTTP / 3 ولا يوجد رجوع إلى HTTP / 2 أو أقل ؛", "example_upstream_doq": "encrypted <0>DNS-over-QUIC;", "example_upstream_sdns": "<0>DNS Stamps for <1>DNSCrypt or <2>DNS-over-HTTPS resolvers;", "example_upstream_tcp": "regular DNS (over TCP);", diff --git a/client/src/__locales/be.json b/client/src/__locales/be.json index 5e29a8e4..bbfd3734 100644 --- a/client/src/__locales/be.json +++ b/client/src/__locales/be.json @@ -125,6 +125,8 @@ "top_clients": "Частыя кліенты", "no_clients_found": "Кліентаў не знойдзена", "general_statistics": "Агульная статыстыка", + "top_upstreams": "Часта запытаныя upstream серверы", + "no_upstreams_data_found": "Няма дадзеных аб upstream серверах", "number_of_dns_query_days": "Колькасць DNS-запытаў за апошні {{count}} дзень", "number_of_dns_query_days_plural": "Колькасць DNS запытаў, апрацаваных за апошнія {{count}} дзён", "number_of_dns_query_24_hours": "Колькасць DNS-запытаў за 24 гадзіны", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Наладжаны ў {{path}}", "test_upstream_btn": "Тэст upstream сервераў", "upstreams": "Upstreams", + "upstream": "Upstream сервер", "apply_btn": "Ужыць", "disabled_filtering_toast": "Фільтрацыя выкл.", "enabled_filtering_toast": "Фільтрацыя ўкл.", diff --git a/client/src/__locales/cs.json b/client/src/__locales/cs.json index 94f89d8a..9a5ca883 100644 --- a/client/src/__locales/cs.json +++ b/client/src/__locales/cs.json @@ -125,6 +125,8 @@ "top_clients": "Nejčastější klienti", "no_clients_found": "Nenalezeny žádní klienti", "general_statistics": "Obecné statistiky", + "top_upstreams": "Top odchozí připojení", + "no_upstreams_data_found": "Nebyla nalezena žádná data odchozích připojení", "number_of_dns_query_days": "Počet DNS dotazů zpracovaných za posledních {{count}} den", "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", @@ -134,6 +136,7 @@ "enforced_save_search": "Vynucené bezpečné vyhledávání", "number_of_dns_query_to_safe_search": "Počet požadavků DNS na vyhledávače, při kterých bylo vynucené bezpečné vyhledávání", "average_processing_time": "Průměrný čas zpracování", + "processing_time": "Doba zpracování", "average_processing_time_hint": "Průměrný čas zpracování požadavků DNS v milisekundách", "block_domain_use_filters_and_hosts": "Blokovat domény pomocí filtrů a seznamů adres", "filters_block_toggle_hint": "Pravidla blokování můžete nastavit v nastavení Filtry.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Konfigurováno v {{path}}", "test_upstream_btn": "Test upstreamů", "upstreams": "Odesláno", + "upstream": "Odchozí připojení", "apply_btn": "Použít", "disabled_filtering_toast": "Vypnuté filtrování", "enabled_filtering_toast": "Zapnuté filtrování", diff --git a/client/src/__locales/da.json b/client/src/__locales/da.json index d8168b8e..abd3139e 100644 --- a/client/src/__locales/da.json +++ b/client/src/__locales/da.json @@ -125,6 +125,8 @@ "top_clients": "Hyppigste klienter", "no_clients_found": "Ingen klienter fundet", "general_statistics": "Generelle statistikker", + "top_upstreams": "Top-upstreams", + "no_upstreams_data_found": "Ingen upstreams-data fundet", "number_of_dns_query_days": "Antallet af DNS-forespørgsler behandlet den seneste {{count}} dag", "number_of_dns_query_days_plural": "Antallet af DNS-forespørgsler behandlet de seneste {{count}} dage", "number_of_dns_query_24_hours": "Antallet af DNS-forespørgsler behandlet de seneste 24 timer", @@ -134,6 +136,7 @@ "enforced_save_search": "Håndhævet sikker søgning", "number_of_dns_query_to_safe_search": "Antallet af DNS-forespørgsler til søgemaskiner, hvor Sikker Søgning blev håndhævet", "average_processing_time": "Gennemsnitlig behandlingstid", + "processing_time": "Behandlingstid", "average_processing_time_hint": "Gennemsnitlig behandlingstid i millisekunder af DNS-forespørgsel", "block_domain_use_filters_and_hosts": "Blokér domæner vha. filtre og værtsfiler", "filters_block_toggle_hint": "Du kan opsætte blokeringsregler i Filterindstillingerne.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Opsat i {{path}}", "test_upstream_btn": "Test upstreams", "upstreams": "Upstreams", + "upstream": "Upstream", "apply_btn": "Anvend", "disabled_filtering_toast": "Filtrering deaktiveret", "enabled_filtering_toast": "Filtrering aktiveret", diff --git a/client/src/__locales/de.json b/client/src/__locales/de.json index 7dc23d85..25ec0c3c 100644 --- a/client/src/__locales/de.json +++ b/client/src/__locales/de.json @@ -125,6 +125,8 @@ "top_clients": "Top Clients", "no_clients_found": "Keine Clients gefunden", "general_statistics": "Allgemeine Statistiken", + "top_upstreams": "Top Upstreams", + "no_upstreams_data_found": "Keine Upstream-Daten gefunden", "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", @@ -134,6 +136,7 @@ "enforced_save_search": "Sichere Suche erzwungen", "number_of_dns_query_to_safe_search": "Anzahl der DNS-Anfragen bei denen Sichere Suche für Suchanfragen erzwungen wurde", "average_processing_time": "Durchschnittliche Bearbeitungsdauer", + "processing_time": "Verarbeitungszeit", "average_processing_time_hint": "Durchschnittliche Zeit in Millisekunden zur Bearbeitung von DNS-Anfragen", "block_domain_use_filters_and_hosts": "Domains durch Filter und Host-Dateien sperren", "filters_block_toggle_hint": "Sie können Blockierregeln in den Filtereinstellungen erstellen.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Konfiguriert in {{path}}", "test_upstream_btn": "Upstreams testen", "upstreams": "Upstreams", + "upstream": "Upstream", "apply_btn": "Anwenden", "disabled_filtering_toast": "Filtern deaktiviert", "enabled_filtering_toast": "Filtern aktiviert", diff --git a/client/src/__locales/es.json b/client/src/__locales/es.json index 47502910..dd9aca9d 100644 --- a/client/src/__locales/es.json +++ b/client/src/__locales/es.json @@ -125,6 +125,8 @@ "top_clients": "Clientes más frecuentes", "no_clients_found": "No se han encontrado clientes", "general_statistics": "Estadísticas generales", + "top_upstreams": "Mejores upstreams", + "no_upstreams_data_found": "No se han encontrado datos de upstreams", "number_of_dns_query_days": "Número de consultas DNS procesadas durante el último {{count}} día", "number_of_dns_query_days_plural": "Número de consultas DNS procesadas durante los últimos {{count}} días", "number_of_dns_query_24_hours": "Número de consultas DNS procesadas durante las últimas 24 horas", @@ -134,6 +136,7 @@ "enforced_save_search": "Búsquedas seguras forzadas", "number_of_dns_query_to_safe_search": "Número de peticiones DNS a los motores de búsqueda para los que se aplicó la búsqueda segura forzada", "average_processing_time": "Tiempo promedio de procesamiento", + "processing_time": "Tiempo de procesamiento", "average_processing_time_hint": "Tiempo promedio en milisegundos al procesar una petición DNS", "block_domain_use_filters_and_hosts": "Bloquear dominios usando filtros y archivos hosts", "filters_block_toggle_hint": "Puedes configurar las reglas de bloqueo en la configuración de filtros.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Configurado en {{path}}", "test_upstream_btn": "Probar DNS de subida", "upstreams": "DNS de subida", + "upstream": "Upstream", "apply_btn": "Aplicar", "disabled_filtering_toast": "Filtrado deshabilitado", "enabled_filtering_toast": "Filtrado habilitado", diff --git a/client/src/__locales/fa.json b/client/src/__locales/fa.json index 4f4bf2f0..6fb6a963 100644 --- a/client/src/__locales/fa.json +++ b/client/src/__locales/fa.json @@ -118,6 +118,8 @@ "top_clients": "بالاترین کلاینت ها", "no_clients_found": "کلاینتی یافت نشد", "general_statistics": "آمار عمومی", + "top_upstreams": "سرورهای بالادست بالا", + "no_upstreams_data_found": "هیچ اطلاعاتی در مورد سرورهای بالادست یافت نشد", "number_of_dns_query_days": "تعداد جستار DNS پردازش شده در {{count}} روز آخر", "number_of_dns_query_days_plural": "تعداد جستار DNS پردازش شده در {{count}} روز گذشته", "number_of_dns_query_24_hours": "تعداد جستار DNS پردازش شده در 24 ساعت گذشته", @@ -149,6 +151,7 @@ "upstream_dns": "سرورهای DNS جریان ارسالی", "test_upstream_btn": "تست جریان ارسالی", "upstreams": "جریان ارسالی", + "upstream": "سرور مادر", "apply_btn": "اِعمال", "disabled_filtering_toast": "فیلترینگ غیرفعال شده است", "enabled_filtering_toast": "فیلترینگ فعال شده است", diff --git a/client/src/__locales/fi.json b/client/src/__locales/fi.json index f56db735..51627b13 100644 --- a/client/src/__locales/fi.json +++ b/client/src/__locales/fi.json @@ -125,6 +125,8 @@ "top_clients": "Käytetyimmät päätelaitteet", "no_clients_found": "Päätelaitteita ei löytynyt", "general_statistics": "Yleiset tilastot", + "top_upstreams": "Käytetyimmät ylävirrat", + "no_upstreams_data_found": "Ylävirtatietoja ei löytynyt", "number_of_dns_query_days": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten {{count}} päivän ajalta", "number_of_dns_query_days_plural": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten {{count}} päivän ajalta", "number_of_dns_query_24_hours": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten 24 tunnin ajalta", @@ -134,6 +136,7 @@ "enforced_save_search": "Turvallinen haku pakotettiin", "number_of_dns_query_to_safe_search": "DNS-pyyntöjen määrä, joille turvallinen haku pakotettiin käyttöön", "average_processing_time": "Keskimääräinen käsittelyaika", + "processing_time": "Käsittelyaika", "average_processing_time_hint": "Keskimääräinen DNS-pyynnön käsittelyyn kulutettu aika millisekunteina", "block_domain_use_filters_and_hosts": "Estä verkkotunnuksia suodattimilla ja hosts-tiedostoilla", "filters_block_toggle_hint": "Voit määrittää estosääntöjä suodatinasetuksissa.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Määritetty tiedostossa {{path}}", "test_upstream_btn": "Testaa ylävirtoja", "upstreams": "Ylävirrat", + "upstream": "Ylävirta", "apply_btn": "Käytä", "disabled_filtering_toast": "Suodatus poistettiin käytöstä", "enabled_filtering_toast": "Suodatus otettiin käyttöön", diff --git a/client/src/__locales/fr.json b/client/src/__locales/fr.json index d69f9762..3d2a0072 100644 --- a/client/src/__locales/fr.json +++ b/client/src/__locales/fr.json @@ -125,6 +125,8 @@ "top_clients": "Meilleurs clients", "no_clients_found": "Pas de clients trouvés", "general_statistics": "Statistiques générales", + "top_upstreams": "Top amonts", + "no_upstreams_data_found": "Aucune donnée en amont trouvée", "number_of_dns_query_days": "Le nombre de requêtes DNS traitées pour les {{count}} derniers jours", "number_of_dns_query_days_plural": "Le nombre de requêtes DNS traitées ces {{count}} derniers jours", "number_of_dns_query_24_hours": "Le nombre de requêtes DNS traitées au cours des 24 dernières heures", @@ -134,6 +136,7 @@ "enforced_save_search": "Recherche sécurisée forcée", "number_of_dns_query_to_safe_search": "Le nombre de requêtes DNS faites avec la Recherche securisée", "average_processing_time": "Temps moyen de traitement", + "processing_time": "Délai de traitement", "average_processing_time_hint": "Temps moyen (en millisecondes) de traitement d'une requête DNS", "block_domain_use_filters_and_hosts": "Bloquez les domaines à l'aide des filtres et fichiers hosts", "filters_block_toggle_hint": "Vous pouvez configurer les règles de filtrage dans les paramètres des Filtres.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Configuré dans {{path}}", "test_upstream_btn": "Tester les upstreams", "upstreams": "En amont", + "upstream": "Amont", "apply_btn": "Appliquer", "disabled_filtering_toast": "Filtrage désactivé", "enabled_filtering_toast": "Filtrage activé", diff --git a/client/src/__locales/hr.json b/client/src/__locales/hr.json index feb50c0b..6b48d86e 100644 --- a/client/src/__locales/hr.json +++ b/client/src/__locales/hr.json @@ -125,6 +125,8 @@ "top_clients": "Top klijenti", "no_clients_found": "Nema pronađenih klijenata", "general_statistics": "Opća statistika", + "top_upstreams": "Top upstream poslužitelji", + "no_upstreams_data_found": "Nema podataka o upstream poslužiteljima", "number_of_dns_query_days": "Broj DNS upita obrađenih u posljednja {{count}} dan", "number_of_dns_query_days_plural": "Broj DNS upita obrađenih u posljednja {{count}} dana", "number_of_dns_query_24_hours": "Broj DNS upita obrađenih u posljednja 24 sata", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Postavljeno u {{path}}", "test_upstream_btn": "Testiraj upstream-ove", "upstreams": "Upstreams", + "upstream": "Upstream poslužitelj", "apply_btn": "Primijeni", "disabled_filtering_toast": "Onemogućeno filtriranje", "enabled_filtering_toast": "Omogućeno filtriranje", diff --git a/client/src/__locales/hu.json b/client/src/__locales/hu.json index 37e5cdfe..8cb5f4f9 100644 --- a/client/src/__locales/hu.json +++ b/client/src/__locales/hu.json @@ -125,6 +125,8 @@ "top_clients": "Legaktívabb kliensek", "no_clients_found": "Nem található kliens", "general_statistics": "Általános statisztikák", + "top_upstreams": "Top upstream szerverek", + "no_upstreams_data_found": "Nem található upstream szerver adat", "number_of_dns_query_days": "Lekérdezések száma az utolsó {{count}} napban", "number_of_dns_query_days_plural": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} napban", "number_of_dns_query_24_hours": "Az elmúlt 24 órában feldolgozott DNS lekérdezések száma", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Beállítva itt: {{path}}", "test_upstream_btn": "Upstreamek tesztelése", "upstreams": "Upstream-ek", + "upstream": "Upstream szerver", "apply_btn": "Alkalmaz", "disabled_filtering_toast": "Szűrés letiltva", "enabled_filtering_toast": "Szűrés engedélyezve", diff --git a/client/src/__locales/id.json b/client/src/__locales/id.json index c83b9581..4627cd66 100644 --- a/client/src/__locales/id.json +++ b/client/src/__locales/id.json @@ -125,6 +125,8 @@ "top_clients": "Klien teratas", "no_clients_found": "Tidak ditemukan klien", "general_statistics": "Statistik umum", + "top_upstreams": "Top servers upstream", + "no_upstreams_data_found": "Tidak ada data server upstream yang ditemukan", "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{value}} 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", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Diatur dalam {{path}}", "test_upstream_btn": "Uji hulu", "upstreams": "Upstream", + "upstream": "Server upstream", "apply_btn": "Terapkan", "disabled_filtering_toast": "Penyaringan nonaktif", "enabled_filtering_toast": "Penyaringan aktif", diff --git a/client/src/__locales/it.json b/client/src/__locales/it.json index c4ddf3aa..c3b3f71e 100644 --- a/client/src/__locales/it.json +++ b/client/src/__locales/it.json @@ -125,6 +125,8 @@ "top_clients": "Client più utilizzati", "no_clients_found": "Nessun client trovato", "general_statistics": "Statistiche generali", + "top_upstreams": "Top upstream", + "no_upstreams_data_found": "Nessun dato upstream trovato", "number_of_dns_query_days": "Numero di richieste DNS elaborate negli ultimi {{count}} giorni", "number_of_dns_query_days_plural": "Numero di richieste DNS elaborate negli ultimi {{count}} giorni", "number_of_dns_query_24_hours": "Numero di richieste DNS elaborate nelle ultime 24 ore", @@ -134,6 +136,7 @@ "enforced_save_search": "Ricerca sicura forzata", "number_of_dns_query_to_safe_search": "Numero di richieste DNS dai motori di ricerca per i quali la Ricerca Sicura è stata forzata", "average_processing_time": "Tempo di elaborazione medio", + "processing_time": "Tempo di elaborazione", "average_processing_time_hint": "Tempo medio in millisecondi per elaborare una richiesta DNS", "block_domain_use_filters_and_hosts": "Blocca domini utilizzando filtri e file hosts", "filters_block_toggle_hint": "Puoi impostare le regole di blocco nelle impostazioni dei Filtri.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Configurato su {{path}}", "test_upstream_btn": "Testa gli upstream", "upstreams": "Upstream", + "upstream": "Upstream", "apply_btn": "Applica", "disabled_filtering_toast": "Disattiva filtri", "enabled_filtering_toast": "Attiva filtri", diff --git a/client/src/__locales/ja.json b/client/src/__locales/ja.json index 95199d5a..eb04660f 100644 --- a/client/src/__locales/ja.json +++ b/client/src/__locales/ja.json @@ -7,16 +7,16 @@ "load_balancing": "ロードバランシング", "load_balancing_desc": "一度に1つのアップストリームサーバに処理要求します。 AdGuard Homeは、重み付きランダムアルゴリズム（weighted random algorithm）を使用してサーバを選択するため、最速のサーバがより頻繁に使用されます。", "bootstrap_dns": "ブートストラップDNSサーバ", - "bootstrap_dns_desc": "ブートストラップDNSサーバは、上流として指定したDoH／DoTリゾルバのIPアドレスを解決するために使用されます。", + "bootstrap_dns_desc": "ブートストラップDNSサーバは、アップストリームとして指定したDoH／DoTリゾルバのIPアドレスを解決するために使用されます。", "local_ptr_title": "プライベートリバースDNSサーバー", "local_ptr_desc": "AdGuard HomeがローカルPTRクエリに使用するDNSサーバーです。これらのサーバーは、rDNSを使ってプライベートIPアドレス（例えば\"192.168.12.34\"）を持つクライアントのホスト名を解決するために使用されます。設定されていない場合、AdGuard HomeはOSのデフォルトDNSリゾルバーのアドレス（AdGuard Home自体のアドレスを除く）を自動的に使用します。", "local_ptr_default_resolver": "デフォルトでは、AdGuard Homeは次のリバースDNSリゾルバを使用します: {{ip}}", "local_ptr_no_default_resolver": "AdGuard Homeは、このシステムに適したプライベートリバースDNSリゾルバを特定できませんでした。", "local_ptr_placeholder": "1行に1つのサーバを入力してください。", "resolve_clients_title": "クライアントのIPアドレスの逆解決を有効にする", - "resolve_clients_desc": "対応するリゾルバー（ローカルクライアントの場合はプライベートDNSサーバ、パブリックIPを持つクライアントの場合は上流サーバ）にPTRクエリを送信することにより、クライアントのIPアドレスをホストネームに逆解決します。", + "resolve_clients_desc": "対応するリゾルバー（ローカルクライアントの場合はプライベートDNSサーバ、パブリックIPを持つクライアントの場合はアップストリームサーバー）にPTRクエリを送信することにより、クライアントのIPアドレスをホストネームに逆解決します。", "use_private_ptr_resolvers_title": "プライベートリバースDNSリゾルバを使用", - "use_private_ptr_resolvers_desc": "これらの上流サーバを使用して、ローカルで提供されるアドレスのリバースDNSルックアップを実行します。無効にすると、AdGuard Homeは、DHCP, /etc/hosts などから認識されるクライアントを除き、すべてのこのようなPTR要求にNXDOMAINで応答します。", + "use_private_ptr_resolvers_desc": "これらのアップストリームサーバーを使用して、ローカルで提供されるアドレスのリバースDNSルックアップを実行します。無効にすると、AdGuard Homeは、DHCP, /etc/hosts などから認識されるクライアントを除き、すべてのこのようなPTR要求にNXDOMAINで応答します。", "check_dhcp_servers": "DHCPサーバをチェックする", "save_config": "構成を保存する", "enabled_dhcp": "DHCPサーバを有効にしました", @@ -125,6 +125,8 @@ "top_clients": "トップクライアント", "no_clients_found": "クライアント情報はありません", "general_statistics": "全般的な統計", + "top_upstreams": "上位のアップストリーム", + "no_upstreams_data_found": "アップストリームのデータが見つかりません", "number_of_dns_query_days": "過去{{count}}日間に処理されたDNSクエリの数", "number_of_dns_query_days_plural": "過去{{count}}日間に処理されたDNSクエリの数", "number_of_dns_query_24_hours": "過去24時間に処理されたDNSクエリの数", @@ -134,6 +136,7 @@ "enforced_save_search": "強制されたセーフサーチ", "number_of_dns_query_to_safe_search": "セーフサーチが強制適用された検索エンジンへのDNSリクエストの数", "average_processing_time": "平均処理時間", + "processing_time": "処理時間", "average_processing_time_hint": "DNSリクエストの処理にかかる平均時間（ミリ秒単位）", "block_domain_use_filters_and_hosts": "フィルタとhostsファイルを使用してドメインをブロックする", "filters_block_toggle_hint": "フィルタの設定でブロックするルールを設定することができます。", @@ -153,11 +156,12 @@ "custom_filtering_rules": "カスタム・フィルタリングルール", "encryption_settings": "暗号化設定", "dhcp_settings": "DHCP設定", - "upstream_dns": "上流DNSサーバ", - "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。上流DNSサーバの構成設定について詳しくはこちらでご確認いただけます。", + "upstream_dns": "アップストリームDNSサーバー", + "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。アップストリームDNSサーバーの構成設定について詳しくはこちらでご確認いただけます。", "upstream_dns_configured_in_file": "{{path}} にて設定されています", - "test_upstream_btn": "上流サーバをテストする", - "upstreams": "上流", + "test_upstream_btn": "アップストリームをテストする", + "upstreams": "アップストリーム", + "upstream": "アップストリーム", "apply_btn": "適用する", "disabled_filtering_toast": "フィルタリングを無効にしました", "enabled_filtering_toast": "フィルタリングを有効にしました", @@ -220,7 +224,7 @@ "example_upstream_tcp_port": "レギュラーDNS（over TCP、ポート付き);", "example_upstream_tcp_hostname": "通常のDNS（over TCP, ホスト名）。", "all_lists_up_to_date_toast": "すべてのリストは既に最新です", - "updated_upstream_dns_toast": "上流DNSサーバを保存しました。", + "updated_upstream_dns_toast": "アップストリームサーバーを保存しました。", "dns_test_ok_toast": "指定されたDNSサーバは正しく動作しています", "dns_test_not_ok_toast": "サーバ \"{{key}}\": 使用できませんでした。正しく入力されているかどうかを確認してください", "dns_test_warning_toast": "アップストリーム\"{{key}}\"はテストリクエストに応答せず、正しく動作しない可能性があります。", @@ -623,7 +627,7 @@ "enter_cache_size": "キャッシュサイズ（バイト単位）を入力してください", "enter_cache_ttl_min_override": "最小TTL（秒単位）を入力してください", "enter_cache_ttl_max_override": "最大TTL（秒単位）を入力してください", - "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、上流サーバから受信した短いTTL（秒単位）を延長します。", + "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、アップストリームサーバーから受信した短いTTL（秒単位）を延長します。", "cache_ttl_max_override_desc": "DNSキャッシュ内のエントリの最大TTL（秒単位）を設定します。", "ttl_cache_validation": "最小キャッシュTTL上書き値は最大値以下にする必要があります", "cache_optimistic": "Optimistic cashing (オプティミスティック・キャッシュ)", diff --git a/client/src/__locales/ko.json b/client/src/__locales/ko.json index 6ec7a352..a93c19e2 100644 --- a/client/src/__locales/ko.json +++ b/client/src/__locales/ko.json @@ -125,6 +125,8 @@ "top_clients": "클라이언트", "no_clients_found": "클라이언트가 없습니다", "general_statistics": "일반 통계", + "top_upstreams": "상위 업스트림", + "no_upstreams_data_found": "업스트림 데이터 없음", "number_of_dns_query_days": "최근 {{count}}일 동안 처리된 DNS 쿼리의 수", "number_of_dns_query_days_plural": "최근 {{count}}일 동안 처리된 DNS 쿼리의 수", "number_of_dns_query_24_hours": "최근 24시간 동안 처리된 DNS 쿼리의 수", @@ -134,6 +136,7 @@ "enforced_save_search": "세이프서치 강제", "number_of_dns_query_to_safe_search": "세이프서치가 적용된 검색 엔진에 대해 DNS 요청 수", "average_processing_time": "평균처리 시간", + "processing_time": "처리 시간", "average_processing_time_hint": "DNS 요청 처리시 평균 시간(밀리초)", "block_domain_use_filters_and_hosts": "필터 및 호스트 파일을 사용하여 도메인 차단", "filters_block_toggle_hint": "차단규칙필터을 설정할 수 있습니다.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "{{path}}에서 구성됨", "test_upstream_btn": "업스트림 테스트", "upstreams": "업스트림", + "upstream": "업스트림", "apply_btn": "적용", "disabled_filtering_toast": "필터링 비활성화됨", "enabled_filtering_toast": "필터링 활성화됨", diff --git a/client/src/__locales/nl.json b/client/src/__locales/nl.json index 6bde6d51..a29912b0 100644 --- a/client/src/__locales/nl.json +++ b/client/src/__locales/nl.json @@ -125,6 +125,8 @@ "top_clients": "Top gebruikers", "no_clients_found": "Geen gebruikers gevonden", "general_statistics": "Algemene statistieken", + "top_upstreams": "Top upstreams", + "no_upstreams_data_found": "Geen upstreams-gegevens gevonden", "number_of_dns_query_days": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dag", "number_of_dns_query_days_plural": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dagen", "number_of_dns_query_24_hours": "Aantal verwerkte DNS aanvragen van de laatste 24 uur", @@ -134,6 +136,7 @@ "enforced_save_search": "Geforceerd veilig zoeken", "number_of_dns_query_to_safe_search": "Aantal DNS aanvragen in zoekmachines dmv geforceerd veilig zoeken", "average_processing_time": "Gemiddelde procestijd", + "processing_time": "Verwerkingstijd", "average_processing_time_hint": "Gemiddelde verwerkingstijd in milliseconden van een DNS aanvraag", "block_domain_use_filters_and_hosts": "Domeinen blokkeren d.m.v. filters en host-bestanden", "filters_block_toggle_hint": "Je kan blokkeringsregels toevoegen in de Filters instellingen.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Geconfigureerd in {{path}}", "test_upstream_btn": "Test upstream", "upstreams": "Upstreams", + "upstream": "Upstream", "apply_btn": "Toepassen", "disabled_filtering_toast": "Filters uitgeschakeld", "enabled_filtering_toast": "Filters ingeschakeld", diff --git a/client/src/__locales/no.json b/client/src/__locales/no.json index 9607f208..6b63a4ae 100644 --- a/client/src/__locales/no.json +++ b/client/src/__locales/no.json @@ -114,6 +114,8 @@ "top_clients": "Vanligste klienter", "no_clients_found": "Ingen klienter ble funnet", "general_statistics": "Generelle statistikker", + "top_upstreams": "Topp oppstrøms servere", + "no_upstreams_data_found": "Ingen oppstrøms servere data funnet", "number_of_dns_query_days": "Antall DNS-spørringer behandlet for de siste {{count}} dagene", "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", @@ -147,6 +149,7 @@ "upstream_dns_configured_in_file": "Satt opp i {{path}}", "test_upstream_btn": "Test oppstrømstilkoblinger", "upstreams": "Oppstrømstjenere", + "upstream": "Oppstrøms server", "apply_btn": "Benytt", "disabled_filtering_toast": "Skrudde av filtrering", "enabled_filtering_toast": "Skrudde på filtrering", diff --git a/client/src/__locales/pl.json b/client/src/__locales/pl.json index f9e83813..04a41d44 100644 --- a/client/src/__locales/pl.json +++ b/client/src/__locales/pl.json @@ -125,6 +125,8 @@ "top_clients": "Główni klienci", "no_clients_found": "Nie znaleziono klienta", "general_statistics": "Ogólne statystyki", + "top_upstreams": "Często żądane serwery nadrzędne", + "no_upstreams_data_found": "Brak danych dotyczących serwerów nadrzędnych", "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", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Skonfigurowano w {{path}}", "test_upstream_btn": "Test głównych serwerów DNS", "upstreams": "Główne serwery DNS", + "upstream": "Serwer nadrzędny", "apply_btn": "Zastosuj", "disabled_filtering_toast": "Wyłączone filtrowanie", "enabled_filtering_toast": "Włączone filtrowanie", diff --git a/client/src/__locales/pt-br.json b/client/src/__locales/pt-br.json index 21094be5..588a9530 100644 --- a/client/src/__locales/pt-br.json +++ b/client/src/__locales/pt-br.json @@ -125,6 +125,8 @@ "top_clients": "Principais clientes", "no_clients_found": "Nenhuma cliente encontrado", "general_statistics": "Estatísticas gerais", + "top_upstreams": "Melhores servidores DNS primários", + "no_upstreams_data_found": "Nenhum dado de servidor DNS primário encontrado", "number_of_dns_query_days": "O número de consultas DNS processadas nos últimos {{count}} dias", "number_of_dns_query_days_plural": "Número de consultas DNS processadas nos últimos {{count}} dias", "number_of_dns_query_24_hours": "O número de consultas DNS processadas nas últimas 24 horas", @@ -134,6 +136,7 @@ "enforced_save_search": "Forçar pesquisa segura", "number_of_dns_query_to_safe_search": "O número de solicitações de DNS para mecanismos de pesquisa para os quais a pesquisa segura foi aplicada", "average_processing_time": "Tempo médio de processamento", + "processing_time": "Tempo de processamento", "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS", "block_domain_use_filters_and_hosts": "Bloquear domínios usando arquivos de filtros e hosts", "filters_block_toggle_hint": "Você pode configurar as regras de bloqueio nas configurações de Filtros.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Configurado em {{path}}", "test_upstream_btn": "Testar DNS primário", "upstreams": "DNS primário", + "upstream": "Servidor DNS primário", "apply_btn": "Aplicar", "disabled_filtering_toast": "Filtragem desativada", "enabled_filtering_toast": "Filtragem ativada", diff --git a/client/src/__locales/pt-pt.json b/client/src/__locales/pt-pt.json index c6e8953a..5011b642 100644 --- a/client/src/__locales/pt-pt.json +++ b/client/src/__locales/pt-pt.json @@ -125,6 +125,8 @@ "top_clients": "Principais clientes", "no_clients_found": "Nenhum cliente foi encontrado", "general_statistics": "Estatísticas gerais", + "top_upstreams": "Melhores servidores DNS primários", + "no_upstreams_data_found": "Nenhum dado de servidor DNS primário encontrado", "number_of_dns_query_days": "Número de consultas DNS processadas durante los últimos {{count}} días", "number_of_dns_query_days_plural": "Número de consultas DNS processadas durante os últimos {{count}} dias", "number_of_dns_query_24_hours": "O número de consultas DNS processadas nas últimas 24 horas", @@ -134,6 +136,7 @@ "enforced_save_search": "Forçar pesquisa segura", "number_of_dns_query_to_safe_search": "O número de solicitações de DNS para motores de busca para os quais a pesquisa segura foi aplicada", "average_processing_time": "Tempo médio de processamento", + "processing_time": "Tempo de processamento", "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS", "block_domain_use_filters_and_hosts": "Bloquear domínios usando ficheiros de filtros e hosts", "filters_block_toggle_hint": "Pode configurar as regras de bloqueio nas configurações de Filtros.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Configurado em {{path}}", "test_upstream_btn": "Testar DNS primário", "upstreams": "DNS primário", + "upstream": "Servidor DNS primário", "apply_btn": "Aplicar", "disabled_filtering_toast": "Filtragem desativada", "enabled_filtering_toast": "Filtragem ativada", diff --git a/client/src/__locales/ro.json b/client/src/__locales/ro.json index 411cf75b..91a87282 100644 --- a/client/src/__locales/ro.json +++ b/client/src/__locales/ro.json @@ -125,6 +125,8 @@ "top_clients": "Clienți de top", "no_clients_found": "Nu au fost găsiți clienți", "general_statistics": "Statistici generale", + "top_upstreams": "Top servere în amonte", + "no_upstreams_data_found": "Nu există date despre serverele din amonte", "number_of_dns_query_days": "Numărul de interogări DNS procesate în ultima {{count}} zi", "number_of_dns_query_days_plural": "Numărul de interogări DNS procesate în ultimele {{count}} zile", "number_of_dns_query_24_hours": "Numărul de interogări DNS procesate în ultimele 24 de ore", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Configurat în {{path}}", "test_upstream_btn": "Testați upstreams", "upstreams": "Upstreams", + "upstream": "Server în amonte", "apply_btn": "Aplică", "disabled_filtering_toast": "Filtrare dezactivată", "enabled_filtering_toast": "Filtrare activată", diff --git a/client/src/__locales/ru.json b/client/src/__locales/ru.json index 053cf448..9903a803 100644 --- a/client/src/__locales/ru.json +++ b/client/src/__locales/ru.json @@ -125,6 +125,8 @@ "top_clients": "Частые клиенты", "no_clients_found": "Клиентов не найдено", "general_statistics": "Общая статистика", + "top_upstreams": "Часто запрашиваемые upstream-серверы", + "no_upstreams_data_found": "Нет данных об upstream-серверах", "number_of_dns_query_days": "Количество DNS-запросов за последний {{count}} день", "number_of_dns_query_days_plural": "Количество DNS запросов, обработанных за последние {{count}} дней", "number_of_dns_query_24_hours": "Количество DNS-запросов за последние 24 часа", @@ -134,6 +136,7 @@ "enforced_save_search": "Применён безопасный поиск", "number_of_dns_query_to_safe_search": "Количество запросов DNS для поисковых систем, для которых был применён Безопасный поиск", "average_processing_time": "Среднее время обработки запроса", + "processing_time": "Время обработки", "average_processing_time_hint": "Среднее время для обработки запроса DNS в миллисекундах", "block_domain_use_filters_and_hosts": "Блокировать домены с использованием фильтров и файлов hosts", "filters_block_toggle_hint": "Вы можете настроить правила блокировки в «Фильтрах».", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Настроен в {{path}}", "test_upstream_btn": "Тест upstream серверов", "upstreams": "Upstreams", + "upstream": "Upstream-сервер", "apply_btn": "Применить", "disabled_filtering_toast": "Фильтрация выкл.", "enabled_filtering_toast": "Фильтрация вкл.", diff --git a/client/src/__locales/sk.json b/client/src/__locales/sk.json index 47e78933..d4a64e8c 100644 --- a/client/src/__locales/sk.json +++ b/client/src/__locales/sk.json @@ -125,6 +125,8 @@ "top_clients": "Najčastejší klienti", "no_clients_found": "Neboli nájdení žiadni klienti", "general_statistics": "Všeobecná štatistika", + "top_upstreams": "Často požadované upstream servery", + "no_upstreams_data_found": "Nenašli sa žiadne údaje o upstream serveroch", "number_of_dns_query_days": "Počet DNS dopytov spracovaných za posledný {{count}} deň", "number_of_dns_query_days_plural": "Počet DNS dopytov spracovaných za posledných {{count}} dní", "number_of_dns_query_24_hours": "Počet DNS dopytov spracovaných za posledných 24 hodín", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Konfigurované v {{path}}", "test_upstream_btn": "Test upstreamov", "upstreams": "Upstreams", + "upstream": "Upstream server", "apply_btn": "Použiť", "disabled_filtering_toast": "Vypnutá filtrácia", "enabled_filtering_toast": "Zapnutá filtrácia", diff --git a/client/src/__locales/sl.json b/client/src/__locales/sl.json index d1362923..6185e689 100644 --- a/client/src/__locales/sl.json +++ b/client/src/__locales/sl.json @@ -125,6 +125,8 @@ "top_clients": "Najpogostejši odjemalci", "no_clients_found": "Ni najdenih odjemalcev", "general_statistics": "Splošna statistika", + "top_upstreams": "Pogosto zahtevani gorvodni strežniki", + "no_upstreams_data_found": "Ni podatkov o gorvodnih strežnikih", "number_of_dns_query_days": "Število obdelanih poizvedb DNS v zadnjem {{count}} dnevu", "number_of_dns_query_days_plural": "Število obdelanih poizvedb DNS v zadnjih {{count}} dneh", "number_of_dns_query_24_hours": "Število obdelanih poizvedb DNS v zadnjih 24 urah", @@ -134,6 +136,7 @@ "enforced_save_search": "Prisilno varno iskanje", "number_of_dns_query_to_safe_search": "Število zahtev DNS za iskalnike, za katere je bilo uveljavljeno varno iskanje", "average_processing_time": "Povprečni čas obdelave", + "processing_time": "Čas obdelave", "average_processing_time_hint": "Povprečni čas v milisekundah pri obdelavi zahteve DNS", "block_domain_use_filters_and_hosts": "Onemogoči domene s filtri in gostiteljskimi datotekami", "filters_block_toggle_hint": "Pravila zaviranja lahko nastavite v nastavitvah Filtri.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Nastavljen v {{path}}", "test_upstream_btn": "Preizkusi upstreame", "upstreams": "Tokovi navzgor", + "upstream": "Gorvodni strežnik", "apply_btn": "Uporabi", "disabled_filtering_toast": "Onemogočeno filtriranje", "enabled_filtering_toast": "Omogočeno filtriranje", diff --git a/client/src/__locales/sr-cs.json b/client/src/__locales/sr-cs.json index f9e737ff..e4e2f558 100644 --- a/client/src/__locales/sr-cs.json +++ b/client/src/__locales/sr-cs.json @@ -125,6 +125,8 @@ "top_clients": "Najčešći klijenti", "no_clients_found": "Nema pronađenih klijenata", "general_statistics": "Opšte statistike", + "top_upstreams": "Često traženi upstream serveri", + "no_upstreams_data_found": "Nema podataka o upstream serverima", "number_of_dns_query_days": "Broj obrađenih DNS unosa u poslednjih {{count}} dan", "number_of_dns_query_days_plural": "Broj obrađenih DNS unosa u poslednjih {{count}} dana", "number_of_dns_query_24_hours": "Broj obrađenih DNS unosa u poslednja 24 časa", @@ -158,6 +160,7 @@ "upstream_dns_configured_in_file": "Konfiguriši u {{path}}", "test_upstream_btn": "Testiraj upstreams", "upstreams": "Upstreams", + "upstream": "Upstream-server", "apply_btn": "Primeni", "disabled_filtering_toast": "Isključeno filtriranje", "enabled_filtering_toast": "Uključeno filtriranje", diff --git a/client/src/__locales/sv.json b/client/src/__locales/sv.json index 1c02da65..03995f12 100644 --- a/client/src/__locales/sv.json +++ b/client/src/__locales/sv.json @@ -125,6 +125,8 @@ "top_clients": "Toppklienter", "no_clients_found": "Inga klienter hittade", "general_statistics": "Allmän statistik", + "top_upstreams": "Topp uppströmsservrar", + "no_upstreams_data_found": "Inga uppströmsdata hittades", "number_of_dns_query_days": "Antalet DNS-förfrågningar som utfördes under 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": "Antalet DNS-förfrågningar som utfördes under de senaste 24 timmarna", @@ -134,6 +136,7 @@ "enforced_save_search": "Aktivering av Säker surf", "number_of_dns_query_to_safe_search": "Antalet DNS-förfrågningar mot sökmotorer där Säker surf tvingats", "average_processing_time": "Genomsnittlig processtid", + "processing_time": "Bearbetningstid", "average_processing_time_hint": "Genomsnittlig processtid i millisekunder för DNS-förfrågning", "block_domain_use_filters_and_hosts": "Blockera domäner med filter- och värdfiler", "filters_block_toggle_hint": "Du kan ställa in egna blockerings regler i Filterinställningar.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Konfigurerad i {{path}}", "test_upstream_btn": "Testa uppströmmar", "upstreams": "Uppströms", + "upstream": "Uppströms server", "apply_btn": "Tillämpa", "disabled_filtering_toast": "Filtrering bortkopplad", "enabled_filtering_toast": "Filtrering inkopplad", diff --git a/client/src/__locales/tr.json b/client/src/__locales/tr.json index 3771f894..4b8cc169 100644 --- a/client/src/__locales/tr.json +++ b/client/src/__locales/tr.json @@ -125,6 +125,8 @@ "top_clients": "Başlıca istemciler", "no_clients_found": "İstemci bulunamadı", "general_statistics": "Genel istatistikler", + "top_upstreams": "Başlıca üst kaynaklar", + "no_upstreams_data_found": "Üst kaynak verisi bulunamadı", "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ı", @@ -134,6 +136,7 @@ "enforced_save_search": "Uygulanan güvenli arama", "number_of_dns_query_to_safe_search": "Güvenli Aramanın uygulandığı arama motorlarına gönderilen DNS isteklerinin sayısı", "average_processing_time": "Ortalama işlem süresi", + "processing_time": "İşlem süresi", "average_processing_time_hint": "Bir DNS isteğinin milisaniye cinsinden ortalama işlem süresi", "block_domain_use_filters_and_hosts": "Filtre ve hosts dosyalarını kullanarak alan adlarını engelle", "filters_block_toggle_hint": "Filtreler ayarlarında engelleme kuralları oluşturabilirsiniz.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "{{path}} dosyasında yapılandırıldı", "test_upstream_btn": "Üst sunucuyu test et", "upstreams": "Üst kaynak", + "upstream": "Üst kaynak", "apply_btn": "Uygula", "disabled_filtering_toast": "Filtreleme devre dışı", "enabled_filtering_toast": "Filtreleme etkin", diff --git a/client/src/__locales/uk.json b/client/src/__locales/uk.json index 8cb111d0..d7cc4860 100644 --- a/client/src/__locales/uk.json +++ b/client/src/__locales/uk.json @@ -125,6 +125,8 @@ "top_clients": "Найактивніші клієнти", "no_clients_found": "Клієнтів не знайдено", "general_statistics": "Загальна статистика", + "top_upstreams": "Часто запитувані upstream-сервери", + "no_upstreams_data_found": "Немає даних про upstream-сервери", "number_of_dns_query_days": "Кількість DNS-запитів, оброблених за останні {{count}} дні", "number_of_dns_query_days_plural": "Кількість DNS-запитів, оброблених за останні {{count}} днів", "number_of_dns_query_24_hours": "Кількість DNS-запитів, оброблених за останні 24 години", @@ -134,6 +136,7 @@ "enforced_save_search": "Примусовий безпечний пошук", "number_of_dns_query_to_safe_search": "Кількість DNS-запитів до пошукових систем, для яких примусово застосований безпечний пошук", "average_processing_time": "Середній час обробки", + "processing_time": "Час обробки", "average_processing_time_hint": "Середній час обробки DNS запиту в мілісекундах", "block_domain_use_filters_and_hosts": "Блокування доменів за допомогою фільтрів та hosts-файлів", "filters_block_toggle_hint": "Ви можете налаштувати правила блокування в розділі Фільтри.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Налаштовано в {{path}}", "test_upstream_btn": "Перевірити сервери", "upstreams": "Upstreams", + "upstream": "Upstream-сервер", "apply_btn": "Застосувати", "disabled_filtering_toast": "Фільтрування вимкнено", "enabled_filtering_toast": "Фільтрування увімкнено", diff --git a/client/src/__locales/vi.json b/client/src/__locales/vi.json index 52ffccec..a6577a2a 100644 --- a/client/src/__locales/vi.json +++ b/client/src/__locales/vi.json @@ -125,6 +125,8 @@ "top_clients": "Người dùng hàng đầu", "no_clients_found": "Không có người dùng", "general_statistics": "Thống kê chung", + "top_upstreams": "Máy chủ thượng nguồn hàng đầu", + "no_upstreams_data_found": "Không tìm thấy dữ liệu máy chủ ngược dòng", "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", @@ -134,6 +136,7 @@ "enforced_save_search": "Bắt buộc tìm kiếm an toàn", "number_of_dns_query_to_safe_search": "Số yêu cầu DNS tới công cụ tìm kiếm đã chuyển thành tìm kiếm an toàn", "average_processing_time": "Thời gian xử lý trung bình", + "processing_time": "Thời gian xử lý", "average_processing_time_hint": "Thời gian trung bình cho một yêu cầu DNS tính bằng mili giây", "block_domain_use_filters_and_hosts": "Chặn tên miền sử dụng các bộ lọc và file hosts", "filters_block_toggle_hint": "Bạn có thể thiết lập quy tắc chặn tại cài đặt Bộ lọc.", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "Cấu hình tại {{path}}", "test_upstream_btn": "Kiểm tra", "upstreams": "Nguồn", + "upstream": "Máy chủ thượng nguồn", "apply_btn": "Áp dụng", "disabled_filtering_toast": "Đã tắt chặn quảng cáo", "enabled_filtering_toast": "Đã bật chặn quảng cáo", diff --git a/client/src/__locales/zh-cn.json b/client/src/__locales/zh-cn.json index baa98d37..9f28edf7 100644 --- a/client/src/__locales/zh-cn.json +++ b/client/src/__locales/zh-cn.json @@ -125,6 +125,8 @@ "top_clients": "客户端排行", "no_clients_found": "未找到客户端", "general_statistics": "概况统计", + "top_upstreams": "经常请求的上游服务器", + "no_upstreams_data_found": "未找到上游服务器数据", "number_of_dns_query_days": "过去 {{count}} 天内处理的 DNS 查询总数", "number_of_dns_query_days_plural": "在过去的 {{count}} 天内处理了多少个 DNS 查询", "number_of_dns_query_24_hours": "过去 24 小时内处理的 DNS 请求总数", @@ -134,6 +136,7 @@ "enforced_save_search": "强制安全搜索", "number_of_dns_query_to_safe_search": "启用强制安全搜索后对搜索引擎的 DNS 请求总数", "average_processing_time": "平均处理时间", + "processing_time": "处理时间", "average_processing_time_hint": "处理 DNS 请求的平均时间（毫秒）", "block_domain_use_filters_and_hosts": "使用过滤器和 Hosts 文件以拦截指定域名", "filters_block_toggle_hint": "你可以在 过滤器 设置中添加过滤规则。", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "配置路径{{path}}", "test_upstream_btn": "测试上游 DNS", "upstreams": "上游服务器", + "upstream": "上游服务器", "apply_btn": "应用", "disabled_filtering_toast": "过滤器已禁用", "enabled_filtering_toast": "过滤器已启用", diff --git a/client/src/__locales/zh-tw.json b/client/src/__locales/zh-tw.json index 0d6419e1..e39c942e 100644 --- a/client/src/__locales/zh-tw.json +++ b/client/src/__locales/zh-tw.json @@ -125,6 +125,8 @@ "top_clients": "熱門用戶端", "no_clients_found": "無已發現之用戶端", "general_statistics": "一般的統計資料", + "top_upstreams": "經常請求的上游伺服器", + "no_upstreams_data_found": "找不到上游伺服器資料", "number_of_dns_query_days": "在最近的 {{count}} 日內已處理的 DNS 查詢之數量", "number_of_dns_query_days_plural": "在最近的 {{count}} 日內已處理的 DNS 查詢之數量", "number_of_dns_query_24_hours": "在最近的 24 小時內已處理的 DNS 查詢之數量", @@ -134,6 +136,7 @@ "enforced_save_search": "已強制執行的安全搜尋", "number_of_dns_query_to_safe_search": "安全搜尋已被強制執行之屬於搜尋引擎的 DNS 請求之數量", "average_processing_time": "平均的處理時間", + "processing_time": "處理時間", "average_processing_time_hint": "在處理一項 DNS 請求時以毫秒（ms）計的平均時間", "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域", "filters_block_toggle_hint": "您可在過濾器設定中設置封鎖規則。", @@ -158,6 +161,7 @@ "upstream_dns_configured_in_file": "被配置在 {{path}}", "test_upstream_btn": "測試上行資料流", "upstreams": "上游", + "upstream": "上游伺服器", "apply_btn": "套用", "disabled_filtering_toast": "已禁用過濾", "enabled_filtering_toast": "已啟用過濾", diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js index 8bc5a230..bd140867 100644 --- a/client/src/helpers/filters/filters.js +++ b/client/src/helpers/filters/filters.js @@ -64,6 +64,12 @@ export default { "homepage": "https://github.com/MasterKia/PersianBlocker", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_19.txt" }, + "ISR_easyList_hebrew": { + "name": "ISR: EasyList Hebrew", + "categoryId": "regional", + "homepage": "https://github.com/easylist/EasyListHebrew", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_43.txt" + }, "KOR_list_kr": { "name": "KOR: List-KR DNS", "categoryId": "regional", @@ -172,12 +178,36 @@ export default { "homepage": "https://github.com/DandelionSprout/adfilt", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_6.txt" }, + "hagezi_allowlist_referral": { + "name": "HaGeZi's Allowlist Referral", + "categoryId": "other", + "homepage": "https://github.com/hagezi/dns-blocklists#referral", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_45.txt" + }, + "hagezi_antipiracy_blocklist": { + "name": "HaGeZi's Anti-Piracy Blocklist", + "categoryId": "other", + "homepage": "https://github.com/hagezi/dns-blocklists#piracy", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_46.txt" + }, + "hagezi_gambling_blocklist": { + "name": "HaGeZi's Gambling Blocklist", + "categoryId": "other", + "homepage": "https://github.com/hagezi/dns-blocklists#gambling", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_47.txt" + }, "hagezi_multinormal": { "name": "HaGeZi Multi NORMAL", "categoryId": "general", "homepage": "https://github.com/hagezi/dns-blocklists", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_34.txt" }, + "hagezi_threat_intelligence_feeds": { + "name": "HaGeZi's Threat Intelligence Feeds", + "categoryId": "security", + "homepage": "https://github.com/hagezi/dns-blocklists", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_44.txt" + }, "no_google": { "name": "No Google", "categoryId": "other", @@ -220,6 +250,12 @@ export default { "homepage": "https://pgl.yoyo.org/adservers/", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_3.txt" }, + "phishing_army": { + "name": "Phishing Army", + "categoryId": "security", + "homepage": "https://gitlab.com/malware-filter/phishing-filter", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_18.txt" + }, "scam_blocklist_by_durablenapkin": { "name": "Scam Blocklist by DurableNapkin", "categoryId": "security", diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json index e061c1d4..787d9a6f 100644 --- a/client/src/helpers/trackers/trackers.json +++ b/client/src/helpers/trackers/trackers.json @@ -1,5 +1,5 @@ { - "timeUpdated": "2023-08-01T00:10:42.759Z", + "timeUpdated": "2023-08-22T14:37:56.630Z", "categories": { "0": "audio_video_player", "1": "comments", @@ -181,7 +181,7 @@ "name": "7plus", "categoryId": 0, "url": "https://7plus.com.au/", - "companyId": "7plus", + "companyId": "seven_group_holdings", "source": "AdGuard" }, "7tv.de": { @@ -15298,7 +15298,7 @@ "sectigo": { "name": "Sectigo Limited", "categoryId": 5, - "url": "https://www.solaredge.com/", + "url": "https://www.sectigo.com", "companyId": "sectigo", "source": "AdGuard" }, @@ -17762,10 +17762,11 @@ "companyId": "amazon_associates" }, "twitter": { - "name": "Twitter", + "name": "X (formerly Twitter)", "categoryId": 7, "url": "https://twitter.com", - "companyId": "twitter" + "companyId": "twitter", + "source": "AdGuard" }, "twitter_ads": { "name": "Twitter Advertising", @@ -18746,6 +18747,13 @@ "url": null, "companyId": null }, + "vungle": { + "name": "Vungle", + "categoryId": 4, + "url": "https://vungle.com/", + "companyId": "blackstone", + "source": "AdGuard" + }, "vuukle": { "name": "Vuukle", "categoryId": 6, @@ -24349,6 +24357,9 @@ "trafmag.com": "trafmag.com", "api.transcend.io": "transcend", "cdn.transcend.io": "transcend", + "sync-transcend-cdn.com": "transcend", + "transcend-cdn.com": "transcend", + "transcend.io": "transcend", "telemetry.transcend.io": "transcend_telemetry", "backoffice.transmatico.com": "transmatic", "travelaudience.com": "travel_audience", @@ -24636,6 +24647,8 @@ "v0cdn.net": "vscode", "vscode-cdn.net": "vscode", "vtracy.de": "vtracy.de", + "liftoff.io": "vungle", + "vungle.com": "vungle", "vuukle.com": "vuukle", "view.vzaar.com": "vzaar", "w3counter.com": "w3counter", diff --git a/go.mod b/go.mod index f97e0843..f82c2ca7 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/google/go-cmp v0.5.9 github.com/google/gopacket v1.1.19 github.com/google/renameio/v2 v2.0.0 - github.com/google/uuid v1.3.0 - github.com/insomniacslk/dhcp v0.0.0-20230731140434-0f9eb93a696c + github.com/google/uuid v1.3.1 + github.com/insomniacslk/dhcp v0.0.0-20230816195147-b3ca2534940d github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 github.com/kardianos/service v1.2.2 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 @@ -50,7 +50,7 @@ require ( github.com/golang/mock v1.6.0 // indirect github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect github.com/mdlayher/socket v0.4.1 // indirect - github.com/onsi/ginkgo/v2 v2.11.0 // indirect + github.com/onsi/ginkgo/v2 v2.12.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index 431cdaca..5f527069 100644 --- a/go.sum +++ b/go.sum @@ -48,11 +48,11 @@ github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0Z github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= -github.com/insomniacslk/dhcp v0.0.0-20230731140434-0f9eb93a696c h1:P/3mFnHCv1A/ej4m8pF5EB6FUt9qEL2Q9lfrcUNwCYs= -github.com/insomniacslk/dhcp v0.0.0-20230731140434-0f9eb93a696c/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4= +github.com/insomniacslk/dhcp v0.0.0-20230816195147-b3ca2534940d h1:Ka64cclWedOkGzm9M2/XYuwJUdmWRUozmsxW0PyKA3A= +github.com/insomniacslk/dhcp v0.0.0-20230816195147-b3ca2534940d/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= @@ -78,9 +78,9 @@ github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8Ku github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= -github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= +github.com/onsi/ginkgo/v2 v2.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI= +github.com/onsi/ginkgo/v2 v2.12.0/go.mod h1:ZNEzXISYlqpb8S36iN71ifqLi3vVD1rVJGvWRCJOUpQ= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go index 246b2bc3..45b506e5 100644 --- a/internal/filtering/servicelist.go +++ b/internal/filtering/servicelist.go @@ -30,10 +30,13 @@ var blockedServices = []blockedService{{ }, { ID: "activision_blizzard", Name: "Activision Blizzard", - IconSVG: []byte(""), + IconSVG: []byte(""), Rules: []string{ "||activision.com^", "||activisionblizzard.com^", + "||callofduty.com^", + "||callofdutyleague.com^", + "||codmwest.com^", "||demonware.net^", }, }, { @@ -287,6 +290,53 @@ var blockedServices = []blockedService{{ "||bnet.163.com^", "||bnet.cn^", }, +}, { + ID: "betano", + Name: "Betano", + IconSVG: []byte(""), + Rules: []string{ + "||betano.bg^", + "||betano.ca^", + "||betano.com^", + "||betano.cz^", + "||betano.de^", + "||betano.ng^", + "||betano.pt^", + }, +}, { + ID: "betfair", + Name: "Betfair", + IconSVG: []byte(""), + Rules: []string{ + "||betfair.com.au^", + "||betfair.com^", + "||betfair.es^", + "||betfair.it^", + "||betfair.ro^", + "||betfair.se^", + }, +}, { + ID: "betway", + Name: "Betway", + IconSVG: []byte(""), + Rules: []string{ + "||betway.be^", + "||betway.bet.ar^", + "||betway.co.za^", + "||betway.com.gh^", + "||betway.com.ng^", + "||betway.com^", + "||betway.de^", + "||betway.es^", + "||betway.fr^", + "||betway.it^", + "||betway.mx^", + "||betway.pl^", + "||betway.se^", + "||betwaygroup.com^", + "||betwaysatta.com^", + "||vietnambetway88.com^", + }, }, { ID: "bilibili", Name: "Bilibili", @@ -336,6 +386,16 @@ var blockedServices = []blockedService{{ "||mincdn.com^", "||yo9.com^", }, +}, { + ID: "blaze", + Name: "Blaze", + IconSVG: []byte(""), + Rules: []string{ + "||blaze.bet^", + "||blaze.com.br^", + "||blaze.com^", + "||blazecareers.com^", + }, }, { ID: "blizzard_entertainment", Name: "Blizzard Entertainment", @@ -344,12 +404,12 @@ var blockedServices = []blockedService{{ "||battle.net^", "||battlenet.com.cn^", "||blizzard.cn^", + "||blizzard.com^", "||blizzardgames.cn^", "||blz-contentstack.com^", "||blzstatic.cn^", "||bnet.163.com^", "||bnet.cn^", - "||lizzard.com^", }, }, { ID: "claro", @@ -855,6 +915,29 @@ var blockedServices = []blockedService{{ "||easyanticheat.net^", "||epicgames.com^", }, +}, { + ID: "espn", + Name: "ESPN", + IconSVG: []byte(""), + Rules: []string{ + "||es.pn^", + "||espn.cl^", + "||espn.co.uk^", + "||espn.com.ar^", + "||espn.com.au^", + "||espn.com.co^", + "||espn.com.ec^", + "||espn.com.mx^", + "||espn.com.pa^", + "||espn.com.pe^", + "||espn.com.uy^", + "||espn.com.ve^", + "||espn.com^", + "||espn.in", + "||espn.net^", + "||espncdn.com^", + "||espncricinfo.com^", + }, }, { ID: "facebook", Name: "Facebook", @@ -1304,6 +1387,14 @@ var blockedServices = []blockedService{{ "||zuckerberg.com^", "||zuckerberg.net^", }, +}, { + ID: "fifa", + Name: "FIFA", + IconSVG: []byte(""), + Rules: []string{ + "||fifa.com^", + "||fifaplus.com^", + }, }, { ID: "flickr", Name: "Flickr", @@ -1360,6 +1451,23 @@ var blockedServices = []blockedService{{ "||mask-h2.icloud.com^$dnsrewrite=NXDOMAIN;;", "||mask.icloud.com^$dnsrewrite=NXDOMAIN;;", }, +}, { + ID: "iheartradio", + Name: "iHeartRadio", + IconSVG: []byte(""), + Rules: []string{ + "||937theriver.com^", + "||iheart.com^", + "||iheart.mx^", + "||iheartmedia.com^", + "||iheartradio.ca^", + "||iheartradio.co.nz^", + "||iheartradio.com^", + "||ihrdev.com^", + "||ihrhls.com^", + "||ihrint.com^", + "||ihrstage.com^", + }, }, { ID: "imgur", Name: "Imgur", @@ -1557,7 +1665,6 @@ var blockedServices = []blockedService{{ "||aus.social^", "||awscommunity.social^", "||climatejustice.social^", - "||cupoftea.social^", "||cyberplace.social^", "||defcon.social^", "||det.social^", @@ -1581,7 +1688,6 @@ var blockedServices = []blockedService{{ "||masto.es^", "||masto.nu^", "||masto.pt^", - "||mastodon.au^", "||mastodon.bida.im^", "||mastodon.com.tr^", "||mastodon.eus^", @@ -1597,14 +1703,15 @@ var blockedServices = []blockedService{{ "||mastodon.sdf.org^", "||mastodon.social^", "||mastodon.social^", + "||mastodon.top^", "||mastodon.uno^", "||mastodon.world^", - "||mastodon.zaclys.com^", "||mastodonapp.uk^", "||mastodonners.nl^", "||mastodont.cat^", "||mastodontech.de^", "||mastodontti.fi^", + "||mastouille.fr^", "||mathstodon.xyz^", "||metalhead.club^", "||mindly.social^", @@ -1635,6 +1742,7 @@ var blockedServices = []blockedService{{ "||social.linux.pizza^", "||social.politicaconciencia.org^", "||social.vivaldi.net^", + "||sself.co^", "||stranger.social^", "||sueden.social^", "||tech.lgbt^", @@ -1654,6 +1762,32 @@ var blockedServices = []blockedService{{ "||wien.rocks^", "||wxw.moe^", }, +}, { + ID: "mercado_libre", + Name: "Mercado Libre", + IconSVG: []byte(""), + Rules: []string{ + "||mercadolibre.cl^", + "||mercadolibre.co.cr^", + "||mercadolibre.com.ar^", + "||mercadolibre.com.bo^", + "||mercadolibre.com.co^", + "||mercadolibre.com.do^", + "||mercadolibre.com.ec^", + "||mercadolibre.com.gt^", + "||mercadolibre.com.hn^", + "||mercadolibre.com.mx^", + "||mercadolibre.com.ni^", + "||mercadolibre.com.pa^", + "||mercadolibre.com.pe^", + "||mercadolibre.com.py^", + "||mercadolibre.com.sv^", + "||mercadolibre.com.uy^", + "||mercadolibre.com.ve^", + "||mercadolibre.com^", + "||mercadolivre.com.br^", + "||mlstatic.com^", + }, }, { ID: "minecraft", Name: "Minecraft", @@ -1764,6 +1898,14 @@ var blockedServices = []blockedService{{ "||origin.tv^", "||signin.ea.com^", }, +}, { + ID: "paramountplus", + Name: "Paramount Plus", + IconSVG: []byte(""), + Rules: []string{ + "||paramountplus.com^", + "||pplusstatic.com^", + }, }, { ID: "pinterest", Name: "Pinterest", @@ -1833,6 +1975,13 @@ var blockedServices = []blockedService{{ "||sonyentertainmentnetwork.com", "||station.sony.com", }, +}, { + ID: "pluto_tv", + Name: "Pluto TV", + IconSVG: []byte(""), + Rules: []string{ + "||pluto.tv^", + }, }, { ID: "qq", Name: "QQ", @@ -1879,8 +2028,14 @@ var blockedServices = []blockedService{{ Name: "Roblox", IconSVG: []byte(""), Rules: []string{ + "||blox.com^", + "||rbx.cn^", + "||rbx.com^", "||rbxadder.com^", "||rbxcdn.com^", + "||rbxcdn.net^", + "||rbxinfra.com^", + "||rbxinfra.net^", "||roblox.cn^", "||roblox.com^", "||roblox.qq.com^", @@ -1889,12 +2044,22 @@ var blockedServices = []blockedService{{ }, }, { ID: "rockstar_games", - Name: "Rockstar games", + Name: "Rockstar Games", IconSVG: []byte(""), Rules: []string{ "||rockstargames.com^", "||rsg.sc^", }, +}, { + ID: "shein", + Name: "Shein", + IconSVG: []byte(""), + Rules: []string{ + "||shein.co.uk^", + "||shein.com^", + "||shein.se^", + "||sheinsz.ltwebstatic.com^", + }, }, { ID: "shopee", Name: "Shopee", @@ -2105,8 +2270,8 @@ var blockedServices = []blockedService{{ }, }, { ID: "twitter", - Name: "Twitter", - IconSVG: []byte(""), + Name: "X (formerly Twitter)", + IconSVG: []byte(""), Rules: []string{ "||ads-twitter.com^", "||cms-twdigitalassets.com^", @@ -2130,6 +2295,7 @@ var blockedServices = []blockedService{{ "||twttr.net^", "||twvid.com^", "||vine.co^", + "||x.com^", }, }, { ID: "ubisoft",