From 9e9d0206b8e135252f27ef229047a42fb9bd6c65 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 17 Oct 2023 17:44:34 +0300 Subject: [PATCH] Pull request 2045: upd-all Squashed commit of the following: commit 7305330b1cde1bb0eed5eb97fdb83bbb2b3a475c Author: Ainar Garipov Date: Tue Oct 17 17:26:44 2023 +0300 all: upd i18n, svcs, tools, trackers --- client/src/__locales/be.json | 6 +- client/src/__locales/cs.json | 6 +- client/src/__locales/da.json | 6 +- client/src/__locales/de.json | 6 +- client/src/__locales/es.json | 6 +- client/src/__locales/fi.json | 6 +- client/src/__locales/fr.json | 6 +- client/src/__locales/hr.json | 6 +- client/src/__locales/hu.json | 6 +- client/src/__locales/id.json | 6 +- client/src/__locales/it.json | 6 +- client/src/__locales/ja.json | 6 +- client/src/__locales/ko.json | 6 +- client/src/__locales/nl.json | 6 +- client/src/__locales/pl.json | 6 +- client/src/__locales/pt-br.json | 8 +- client/src/__locales/pt-pt.json | 6 +- client/src/__locales/ro.json | 6 +- client/src/__locales/ru.json | 6 +- client/src/__locales/sk.json | 6 +- client/src/__locales/sl.json | 6 +- client/src/__locales/sr-cs.json | 6 +- client/src/__locales/sv.json | 6 +- client/src/__locales/tr.json | 6 +- client/src/__locales/uk.json | 6 +- client/src/__locales/vi.json | 6 +- client/src/__locales/zh-cn.json | 6 +- client/src/__locales/zh-tw.json | 6 +- client/src/helpers/trackers/trackers.json | 226 ++++++++++++++-------- internal/filtering/servicelist.go | 81 ++++++++ internal/tools/go.mod | 6 +- internal/tools/go.sum | 10 +- 32 files changed, 341 insertions(+), 152 deletions(-) diff --git a/client/src/__locales/be.json b/client/src/__locales/be.json index 9ec3a7a1..3dd62d98 100644 --- a/client/src/__locales/be.json +++ b/client/src/__locales/be.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Заблакаваныя шкодныя і фішынгавыя сайты", "stats_adult": "Заблакаваныя «дарослыя» сайты", "stats_query_domain": "Часта запытаныя дамены", - "for_last_24_hours": "за 24 гадзіны", + "for_last_hours": "за апошнюю {{count}} гадзіну", + "for_last_hours_plural": "за апошнія {{count}} гадзін", "for_last_days": "за апошні {{count}} дзень", "for_last_days_plural": "за апошнія {{count}} дзён", "stats_disabled": "Статыстыка была адключаная. Вы можаце ўключыць яго <0>на старонцы налад .", @@ -134,7 +135,8 @@ "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 гадзіны", + "number_of_dns_query_hours": "Колькасць DNS-запытаў, апрацаваных за апошнюю {{count}} гадзіну", + "number_of_dns_query_hours_plural": "Колькасць DNS-запытаў, апрацаваных за апошнія {{count}} гадзін", "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": "Колькасць заблакаваных «сайтаў для дарослых»", diff --git a/client/src/__locales/cs.json b/client/src/__locales/cs.json index 4571fe13..7db7aae9 100644 --- a/client/src/__locales/cs.json +++ b/client/src/__locales/cs.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blokovaný malware/podvody", "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_hours": "za poslední {{count}} hodinu", + "for_last_hours_plural": "za posledních {{count}} hodin", "for_last_days": "za posledních {{count}} dní", "for_last_days_plural": "za posledních {{count}} dní", "stats_disabled": "Statistiky byly vypnuty. Můžete je zapnout ze <0>stránky nastavení.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Počet DNS dotazů zpracovaných za poslední {{count}} hodinu", + "number_of_dns_query_hours_plural": "Počet DNS dotazů zpracovaných za posledních {{count}} hodin", "number_of_dns_query_blocked_24_hours": "Počet požadavků DNS zablokovaných filtrem reklam a seznamy blokování hostitelů", "number_of_dns_query_blocked_24_hours_by_sec": "Počet požadavků DNS zablokovaných AdGuard modulem Bezpečné prohlížení", "number_of_dns_query_blocked_24_hours_adult": "Počet zablokovaných stránek pro dospělé", diff --git a/client/src/__locales/da.json b/client/src/__locales/da.json index b415bc24..064d4123 100644 --- a/client/src/__locales/da.json +++ b/client/src/__locales/da.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blokeret malware/phishing", "stats_adult": "Blokerede voksne websteder", "stats_query_domain": "Mest forespurgte domæner", - "for_last_24_hours": "de seneste 24 timer", + "for_last_hours": "den seneste {{count}} time", + "for_last_hours_plural": "de seneste {{count}} timer", "for_last_days": "den seneste {{count}} dag", "for_last_days_plural": "de seneste {{count}} dage", "stats_disabled": "Statistikker er deaktiveret. De kan aktiveres via <0>indstillingssiden.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Antallet af DNS-forespørgsler behandlet den seneste {{count}} time", + "number_of_dns_query_hours_plural": "Antallet af DNS-forespørgsler behandlet de seneste {{count}} timer", "number_of_dns_query_blocked_24_hours": "Antallet af DNS-forespørgsler blokeret af adblockfiltre og værtssortlister", "number_of_dns_query_blocked_24_hours_by_sec": "Antallet af DNS-forespørgsler blokeret af AdGuards browsingsikkerhedsmodul", "number_of_dns_query_blocked_24_hours_adult": "Antallet af blokerede voksenwebsteder", diff --git a/client/src/__locales/de.json b/client/src/__locales/de.json index 6d78073c..7c40eb89 100644 --- a/client/src/__locales/de.json +++ b/client/src/__locales/de.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Websites", "stats_adult": "Gesperrte jugendgefährdende Websites", "stats_query_domain": "Am häufigsten angefragte Domains", - "for_last_24_hours": "für die letzten 24 Stunden", + "for_last_hours": "in die letzte {{count}} Stunde", + "for_last_hours_plural": "in die letzten {{count}} Stunden", "for_last_days": "am letzten {{count}} Tag", "for_last_days_plural": "in den letzten {{count}} Tage", "stats_disabled": "Die Statistik wurde deaktiviert. Sie können diese in den <0>Einstellungen erneut aktivieren.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Die Anzahl der DNS-Anfragen, die in der letzten {{count}} Stunde verarbeitet wurden", + "number_of_dns_query_hours_plural": "Die Anzahl der DNS-Anfragen, die in den letzten {{count}} Stunden verarbeitet wurden", "number_of_dns_query_blocked_24_hours": "Anzahl der durch Werbefilter und Host-Sperrlisten abgelehnte DNS-Anfragen", "number_of_dns_query_blocked_24_hours_by_sec": "Anzahl der durch das AdGuard-Modul „Internetsicherheit“ gesperrten DNS-Anfragen", "number_of_dns_query_blocked_24_hours_adult": "Anzahl der gesperrten Websites mit jugendgefährdenden Inhalten", diff --git a/client/src/__locales/es.json b/client/src/__locales/es.json index 3cc1ec52..2af3c571 100644 --- a/client/src/__locales/es.json +++ b/client/src/__locales/es.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Malware/phishing bloqueado", "stats_adult": "Sitios web para adultos bloqueado", "stats_query_domain": "Dominios más consultados", - "for_last_24_hours": "en las últimas 24 horas", + "for_last_hours": "de la última {{count}} hora", + "for_last_hours_plural": "de las últimas {{count}} horas", "for_last_days": "durante los últimos {{count}} días", "for_last_days_plural": "durante los últimos {{count}} días", "stats_disabled": "Las estadísticas se han deshabilitado. Puedes habilitarlas desde la <0>página de configuración.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Número de consultas DNS procesadas durante la última {{count}} hora", + "number_of_dns_query_hours_plural": "Número de consultas DNS procesadas durante las últimas {{count}} horas", "number_of_dns_query_blocked_24_hours": "Número de peticiones DNS bloqueadas por los filtros y listas de bloqueo de hosts", "number_of_dns_query_blocked_24_hours_by_sec": "Número de peticiones DNS bloqueadas por el módulo de seguridad de navegación de AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Número de sitios web para adultos bloqueado", diff --git a/client/src/__locales/fi.json b/client/src/__locales/fi.json index 5c37f822..5a3f4fb5 100644 --- a/client/src/__locales/fi.json +++ b/client/src/__locales/fi.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Estetyt haittaohjelmat/tietojenkalastelut", "stats_adult": "Estetyt aikuisille tarkoitetut sivustot", "stats_query_domain": "Kysytyimmät verkkotunnukset", - "for_last_24_hours": "viimeisten 24 tunnin ajalta", + "for_last_hours": "viimeisen {{count}} tunnin ajalta", + "for_last_hours_plural": "viimeisen {{count}} tunnin ajalta", "for_last_days": "viimeisten {{count}} päivän ajalta", "for_last_days_plural": "viimeisten {{count}} päivän ajalta", "stats_disabled": "Tilastointi ei ole käytössä. Voit ottaa sen käyttöön <0>asetuksista.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Viimeisen {{count}} tunnin aikana käsiteltyjen DNS-kyselyiden määrä", + "number_of_dns_query_hours_plural": "Viimeisen {{count}} tunnin aikana käsiteltyjen DNS-kyselyiden määrä", "number_of_dns_query_blocked_24_hours": "Mainoseston suodattimien ja hosts-estolistojen estämien DNS-pyyntöjen määrä", "number_of_dns_query_blocked_24_hours_by_sec": "AdGuardin Turvallinen selaus -moduulin estämien DNS-pyyntöjen määrä", "number_of_dns_query_blocked_24_hours_adult": "Estettyjen aikuisille tarkoitettujen sivustojen määrä", diff --git a/client/src/__locales/fr.json b/client/src/__locales/fr.json index 1ae169e6..146a3860 100644 --- a/client/src/__locales/fr.json +++ b/client/src/__locales/fr.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Tentative de malware/hameç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_hours": "pendant la dernière {{count}} heure", + "for_last_hours_plural": "pendant les dernières {{count}} heures", "for_last_days": "pour les {{count}} derniers jours", "for_last_days_plural": "pour les {{count}} derniers jours", "stats_disabled": "Les statistiques ont été désactivées. Vous pouvez l'activer à partir de la <0>page des paramètres.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Le nombre de requêtes DNS traitées pendant la dernière {{count}} heure", + "number_of_dns_query_hours_plural": "Le nombre de requêtes DNS traitées pendant les dernières {{count}} heures", "number_of_dns_query_blocked_24_hours": "Le nombre de requêtes DNS bloquées par les filtres adblock et les listes de blocage des hôtes", "number_of_dns_query_blocked_24_hours_by_sec": "Le nombre de requêtes DNS bloquées par le module Sécurité de navigation d'AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Le nombre de sites à contenu adulte bloqués", diff --git a/client/src/__locales/hr.json b/client/src/__locales/hr.json index 6e4c7d7e..5cef8b1b 100644 --- a/client/src/__locales/hr.json +++ b/client/src/__locales/hr.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blokiran zločudni program/krađe identiteta", "stats_adult": "Blokirane web stranice za odrasle", "stats_query_domain": "Top tražene domene", - "for_last_24_hours": "u zadnja 24 sata", + "for_last_hours": "za posljednji {{count}} sat", + "for_last_hours_plural": "za posljednjih {{count}} sati", "for_last_days": "zadnjih {{count}} dana", "for_last_days_plural": "zadnjih {{count}} dana", "stats_disabled": "Statistika je onemogućena. Možete ga uključiti sa <0>stranice s postavkama.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Broj DNS upita obrađenih za posljednji {{count}} sat", + "number_of_dns_query_hours_plural": "Broj DNS upita obrađenih za posljednjih {{count}} sati", "number_of_dns_query_blocked_24_hours": "Broj DNS zahtjeva koji blokiraju filtri za blokiranje oglasa i popisi blokova hostova", "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahtjeva koje je blokirao modul AdGuard zaštita pregledavanja", "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih stranica s sadržajem za odrasle", diff --git a/client/src/__locales/hu.json b/client/src/__locales/hu.json index 18c04f4d..8dc1b000 100644 --- a/client/src/__locales/hu.json +++ b/client/src/__locales/hu.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blokkolt kártevő/adathalászat", "stats_adult": "Blokkolt felnőtt tartalom", "stats_query_domain": "Leglátogatottabb domainek", - "for_last_24_hours": "az utóbbi 24 órában", + "for_last_hours": "az utolsó {{count}} órában", + "for_last_hours_plural": "az utolsó {{count}} órában", "for_last_days": "az utóbbi {{count}} napban", "for_last_days_plural": "az utóbbi {{count}} napban", "stats_disabled": "Ezek a statisztikák ki lettek kapcsolva. Be tudja kapcsolni őket a <0>beállítások oldalon.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} órában", + "number_of_dns_query_hours_plural": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} órában", "number_of_dns_query_blocked_24_hours": "A hirdetésblokkoló szűrők és a hosztfájlok által letiltott DNS kérések száma", "number_of_dns_query_blocked_24_hours_by_sec": "Az AdGuard böngészési biztonság modulja által letiltott DNS kérések száma", "number_of_dns_query_blocked_24_hours_adult": "Blokkolt felnőtt tartalmak száma", diff --git a/client/src/__locales/id.json b/client/src/__locales/id.json index ebc6a1db..38ffba0a 100644 --- a/client/src/__locales/id.json +++ b/client/src/__locales/id.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Malware/phishing diblokir", "stats_adult": "Situs dewasa diblokir", "stats_query_domain": "Kueri domain teratas", - "for_last_24_hours": "untuk 24 jam terakhir", + "for_last_hours": "selama {{count}} jam terakhir", + "for_last_hours_plural": "selama {{count}} jam terakhir", "for_last_days": "untuk {{count}} hari terakhir", "for_last_days_plural": "selama {{count}} hari terakhir", "stats_disabled": "Statistik telah dinonaktifkan. Anda dapat mengaktifkannya dari <0>halaman setelan.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Jumlah kueri DNS diproses selama {{{count}} jam terakhir", + "number_of_dns_query_hours_plural": "Jumlah kueri DNS diproses selama {{count}} jam terakhir", "number_of_dns_query_blocked_24_hours": "Julah DNS diblokir oleh penyaring adblock dan daftar blokir hosts", "number_of_dns_query_blocked_24_hours_by_sec": "Jumlah perminataan DNS diblokir oleh modul Kemanan Penjelajahan AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Jumlah website dewasa diblokir", diff --git a/client/src/__locales/it.json b/client/src/__locales/it.json index a6252e31..4748a82a 100644 --- a/client/src/__locales/it.json +++ b/client/src/__locales/it.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Malware/phishing bloccati", "stats_adult": "Siti per adulti bloccati", "stats_query_domain": "Domini maggiormente richiesti", - "for_last_24_hours": "nelle ultime 24 ore", + "for_last_hours": "per l'ultima {{count}} ora", + "for_last_hours_plural": "per le ultime {{count}} ore", "for_last_days": "per gli ultimi {{count}} giorni", "for_last_days_plural": "per gli ultimi {{count}} giorni", "stats_disabled": "Le statistiche sono state disattivate. Puoi attivarle dalla <0>pagina delle impostazioni.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Numero di richieste DNS processate nell'ultima {{count}} ora", + "number_of_dns_query_hours_plural": "Numero di richieste DNS processate nelle ultime {{count}} ore", "number_of_dns_query_blocked_24_hours": "Numero di richieste DNS bloccate dai filtri per annunci e dagli elenchi di blocco host", "number_of_dns_query_blocked_24_hours_by_sec": "Numero di richieste DNS bloccate dal modulo sicurezza di navigazione di AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Numero di siti web per adulti bloccati", diff --git a/client/src/__locales/ja.json b/client/src/__locales/ja.json index bd0db3dd..f97b74db 100644 --- a/client/src/__locales/ja.json +++ b/client/src/__locales/ja.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "ブロックされたマルウェア／フィッシング", "stats_adult": "ブロックされたアダルトウェブサイト", "stats_query_domain": "最も問合せされたドメイン", - "for_last_24_hours": "過去24時間以内", + "for_last_hours": "過去{{count}}時間", + "for_last_hours_plural": "過去{{count}}時間", "for_last_days": "過去{{count}}日間以内", "for_last_days_plural": "過去{{count}}日間以内", "stats_disabled": "統計は無効化されています。<0>設定ページでオンにすることができます。", @@ -134,7 +135,8 @@ "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クエリの数", + "number_of_dns_query_hours": "過去{{count}}時間に処理されたDNSクエリの数", + "number_of_dns_query_hours_plural": "過去{{count}}時間に処理された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": "ブロックされたアダルトウェブサイトの数", diff --git a/client/src/__locales/ko.json b/client/src/__locales/ko.json index 53f460d4..7a6b6e5d 100644 --- a/client/src/__locales/ko.json +++ b/client/src/__locales/ko.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "차단된 멀웨어/피싱", "stats_adult": "차단된 성인 웹사이트", "stats_query_domain": "쿼리 도메인", - "for_last_24_hours": "지난 24시간 동안", + "for_last_hours": "마지막 {{count}} 시간", + "for_last_hours_plural": "마지막 {{count}} 시간의 기록", "for_last_days": "마지막 {{count}} 일", "for_last_days_plural": "마지막 {{count}} 일의 기록", "stats_disabled": "통계 기능이 꺼졌습니다. <0>설정 페이지에서 켤 수 있습니다.", @@ -134,7 +135,8 @@ "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 쿼리의 수", + "number_of_dns_query_hours": "최근 {{count}}시간 동안 처리된 DNS 쿼리의 수", + "number_of_dns_query_hours_plural": "최근 {{count}}시간 동안 처리된 DNS 쿼리의 수", "number_of_dns_query_blocked_24_hours": "광고 차단 필터 및 호스트 차단 목록에 의해 차단된 DNS 요청 수", "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard 브라우징 보안 모듈에 의해 차단된 DNS 요청 수", "number_of_dns_query_blocked_24_hours_adult": "차단된 성인 웹 사이트의 수", diff --git a/client/src/__locales/nl.json b/client/src/__locales/nl.json index e35d46cd..c243773e 100644 --- a/client/src/__locales/nl.json +++ b/client/src/__locales/nl.json @@ -119,7 +119,8 @@ "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_hours": "voor het afgelopen {{count}} uur", + "for_last_hours_plural": "voor de afgelopen {{count}} uren", "for_last_days": "sinds de laatste {{count}} dagen", "for_last_days_plural": "sinds de laatste {{count}} dagen", "stats_disabled": "Statistieken zijn uitgeschakeld. Je kunt ze inschakelen op de <0>instellingen pagina.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Het aantal DNS-verzoeken dat het afgelopen {{count}} uur is verwerkt", + "number_of_dns_query_hours_plural": "Het aantal DNS-verzoeken dat de afgelopen {{count}} uren is verwerkt", "number_of_dns_query_blocked_24_hours": "Aantal geblokkeerde DNS aanvragen door advertentie blokkering en hosts blokkeerlijsten", "number_of_dns_query_blocked_24_hours_by_sec": "Aantal geblokkeerde DNS aanvragen door AdGuard browsing beveiligingsmodule", "number_of_dns_query_blocked_24_hours_adult": "Aantal geblokkeerde 18+ websites", diff --git a/client/src/__locales/pl.json b/client/src/__locales/pl.json index a02debe5..68f5802f 100644 --- a/client/src/__locales/pl.json +++ b/client/src/__locales/pl.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Zablokowane złośliwe oprogramowanie/phishing", "stats_adult": "Zablokowane witryny dla dorosłych", "stats_query_domain": "Najczęściej wyszukiwane domeny", - "for_last_24_hours": "przez ostatnie 24 godziny", + "for_last_hours": "w ciągu ostatniej {{count}} godziny", + "for_last_hours_plural": "w ciągu ostatnich {{count}} godzin", "for_last_days": "za ostatni dzień {{count}}", "for_last_days_plural": "z ostatnich {{count}} dni", "stats_disabled": "Statystyki zostały wyłączone. Można je włączyć na <0>stronie ustawień.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Liczba przetworzonych zapytań DNS w ciągu ostatniej {{count}} godziny", + "number_of_dns_query_hours_plural": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} godzin", "number_of_dns_query_blocked_24_hours": "Liczba żądań DNS zablokowanych przez filtry blokowania reklam i listy zablokowanych hostów", "number_of_dns_query_blocked_24_hours_by_sec": "Liczba żądań DNS zablokowanych przez moduł Bezpiecznego przeglądania AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Liczba zablokowanych witryn dla dorosłych", diff --git a/client/src/__locales/pt-br.json b/client/src/__locales/pt-br.json index b94842c0..28fd4529 100644 --- a/client/src/__locales/pt-br.json +++ b/client/src/__locales/pt-br.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Bloqueado malware/phishing", "stats_adult": "Bloqueado sites adultos", "stats_query_domain": "Principais domínios consultados", - "for_last_24_hours": "nas últimas 24 horas", + "for_last_hours": "na última {{count}} hora", + "for_last_hours_plural": "nas últimas {{count}} horas", "for_last_days": "nos últimos {{count}} dias", "for_last_days_plural": "nos últimos {{count}} dias", "stats_disabled": "As estatísticas foram desativadas. Você pode ligá-las através da <0>página de configurações.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Número de consultas DNS processadas durante a última {{count}} hora", + "number_of_dns_query_hours_plural": "Número de consultas DNS processadas durante as últimas {{count}} horas", "number_of_dns_query_blocked_24_hours": "Várias solicitações DNS bloqueadas por filtros de bloqueio de anúncios e listas de bloqueio de hosts", "number_of_dns_query_blocked_24_hours_by_sec": "Várias solicitações de DNS bloqueadas pelo módulo de segurança da navegação do AdGuard", "number_of_dns_query_blocked_24_hours_adult": "O número de sites adultos bloqueados", @@ -689,7 +691,7 @@ "log_and_stats_section_label": "Registro de consultas e estatísticas", "ignore_query_log": "Ignorar este cliente no registo de consultas", "ignore_statistics": "Ignorar este cliente nas estatísticas", - "schedule_services": "Pausa o bloqueio de serviço", + "schedule_services": "Pausar bloqueio de serviço", "schedule_services_desc": "Configura o agendamento de pausa do filtro de bloqueio de serviço", "schedule_services_desc_client": "Configura o agendamento de pausa do filtro de bloqueio de serviço para este cliente", "schedule_desc": "Define períodos de inatividade para serviços bloqueados", diff --git a/client/src/__locales/pt-pt.json b/client/src/__locales/pt-pt.json index 5b37166c..c03d9b5c 100644 --- a/client/src/__locales/pt-pt.json +++ b/client/src/__locales/pt-pt.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Malware/phishing bloqueados", "stats_adult": "Sítios adultos bloqueados", "stats_query_domain": "Principais domínios consultados", - "for_last_24_hours": "nas últimas 24 horas", + "for_last_hours": "na última {{count}} hora", + "for_last_hours_plural": "nas últimas {{count}} horas", "for_last_days": "nos últimos {{count}} dias", "for_last_days_plural": "nos últimos {{count}} dias", "stats_disabled": "As estatísticas foram desativadas. Você pode ligá-las através da <0>página de definições.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Número de consultas DNS processadas durante a última {{count}} hora", + "number_of_dns_query_hours_plural": "Número de consultas DNS processadas durante as últimas {{count}} horas", "number_of_dns_query_blocked_24_hours": "Várias solicitações DNS bloqueadas por filtros de bloqueio de anúncios e listas de bloqueio de hosts", "number_of_dns_query_blocked_24_hours_by_sec": "Várias solicitações de DNS bloqueadas pelo módulo de segurança da navegação do AdGuard", "number_of_dns_query_blocked_24_hours_adult": "O número de sítios adultos bloqueados", diff --git a/client/src/__locales/ro.json b/client/src/__locales/ro.json index 16b725fb..0387e1af 100644 --- a/client/src/__locales/ro.json +++ b/client/src/__locales/ro.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Malware/phishing blocate", "stats_adult": "Site-uri cu conținut adult blocate", "stats_query_domain": "Domeniile cele mai căutate", - "for_last_24_hours": "în ultimele 24 ore", + "for_last_hours": "în ultima {{count}} oră", + "for_last_hours_plural": "în ultimele {{count}} ore", "for_last_days": "în ultima {{count}} zi", "for_last_days_plural": "pentru ultimele {{count}} zile", "stats_disabled": "Statisticile au fost dezactivate. Puteți să le porniți din <0>pagina de setări.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Numărul de interogări DNS procesate în ultima {{count}} oră", + "number_of_dns_query_hours_plural": "Numărul de interogări DNS procesate în ultimele {{count}} ore", "number_of_dns_query_blocked_24_hours": "Numărul de interogări DNS blocate de filtrele adblock și lista de blocări din hosts", "number_of_dns_query_blocked_24_hours_by_sec": "Numărul de interogări DNS blocate de modulul de securitate de navigare AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Numărul de site-uri pentru adulți blocate", diff --git a/client/src/__locales/ru.json b/client/src/__locales/ru.json index ee50530f..8a5cbc9d 100644 --- a/client/src/__locales/ru.json +++ b/client/src/__locales/ru.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Заблокированные вредоносные и фишинговые сайты", "stats_adult": "Заблокированные «взрослые» сайты", "stats_query_domain": "Часто запрашиваемые домены", - "for_last_24_hours": "за 24 часа", + "for_last_hours": "за последний {{count}} час", + "for_last_hours_plural": "за последние {{count}} часов", "for_last_days": "за последний {{count}} день", "for_last_days_plural": "за последние {{count}} дней", "stats_disabled": "Статистика отключена. Вы можете включить её на <0>странице настроек.", @@ -134,7 +135,8 @@ "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 часа", + "number_of_dns_query_hours": "Количество DNS-запросов, обработанных за последний {{count}} час", + "number_of_dns_query_hours_plural": "Количество DNS-запросов, обработанных за последние {{count}} часов", "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": "Количество заблокированных «сайтов для взрослых»", diff --git a/client/src/__locales/sk.json b/client/src/__locales/sk.json index c7d55c3b..c3800be5 100644 --- a/client/src/__locales/sk.json +++ b/client/src/__locales/sk.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blokovaný škodlivý kód/pokus o podvod", "stats_adult": "Blokovaná stránka pre dospelých", "stats_query_domain": "Najčastejšie dopytované domény", - "for_last_24_hours": "za posledných 24 hodín", + "for_last_hours": "za poslednú {{count}} hodinu", + "for_last_hours_plural": "za posledné {{count}} hodiny|za posledných {{count}} hodín", "for_last_days": "za posledný {{count}} deň", "for_last_days_plural": "za posledných {{count}} dní", "stats_disabled": "Štatistiky boli vypnuté. Môžete ich zapnúť na <0>stránke nastavení.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Počet DNS dopytov spracovaných za poslednú {{count}} hodinu", + "number_of_dns_query_hours_plural": "Počet DNS dopytov spracovaných za posledné {{count}} hodiny)|Počet DNS dopytov spracovaných za posledných {{count}} hodín", "number_of_dns_query_blocked_24_hours": "Počet DNS dopytov zablokovaných filtrami reklamy a zoznamami blokovaných hostov", "number_of_dns_query_blocked_24_hours_by_sec": "Počet DNS dopytov zablokovaných AdGuard modulom Bezpečné prehliadanie", "number_of_dns_query_blocked_24_hours_adult": "Počet zablokovaných stránok pre dospelých", diff --git a/client/src/__locales/sl.json b/client/src/__locales/sl.json index 1603bf1a..1d25aefb 100644 --- a/client/src/__locales/sl.json +++ b/client/src/__locales/sl.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Onemogočeno zlonamernih programov/lažnih predstavljanj", "stats_adult": "Onemogočeno spletnih strani za odrasle", "stats_query_domain": "Najbolj poizvedovane domene", - "for_last_24_hours": "v zadnjih 24 urah", + "for_last_hours": "za zadnjo {{count}} uro", + "for_last_hours_plural": "za zadnjih {{count}} ur", "for_last_days": "zadnjega {{count}} dne", "for_last_days_plural": "zadnjih {{count}} dni", "stats_disabled": "Statistika je onemogočena. Vklopite ga lahko na <0>strani z nastavitvami.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Število poizvedb DNS, obdelanih v zadnji {{count}} uri", + "number_of_dns_query_hours_plural": "Število poizvedb DNS, obdelanih v zadnjih {{count}} urah", "number_of_dns_query_blocked_24_hours": "Število zahtev DNS, ki so jih onemogočili filtri za zaviranje oglasov in seznami nedovoljenih, gostiteljev", "number_of_dns_query_blocked_24_hours_by_sec": "Število zahtev DNS, ki jih je blokiral AdGuard zaščitni modul brskanja", "number_of_dns_query_blocked_24_hours_adult": "Število onemogočenih spletnih strani za odrasle", diff --git a/client/src/__locales/sr-cs.json b/client/src/__locales/sr-cs.json index bcb0d237..4406104e 100644 --- a/client/src/__locales/sr-cs.json +++ b/client/src/__locales/sr-cs.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blokiraj štetan softver i fišing", "stats_adult": "Blokiraj sajtove za odrasle", "stats_query_domain": "Najčešće unošeni domeni", - "for_last_24_hours": "u poslednja 24 časa", + "for_last_hours": "u poslednjih {{count}} sat", + "for_last_hours_plural": "u poslednjih {{count}} sati", "for_last_days": "u poslednjih {{count}} dana", "for_last_days_plural": "u poslednjih {{count}} dana", "stats_disabled": "Statistika je isključena. Možete ga uključiti sa stranice <0>sa postavkama.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Broj obrađenih DNS unosa u poslednji {{count}} sat", + "number_of_dns_query_hours_plural": "Broj obrađenih DNS unosa u poslednjih {{count}} sati", "number_of_dns_query_blocked_24_hours": "Broj DNS zahteva blokiranih od filtera blokatora reklama i blok liste hostova", "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahteva blokiranih od AdGuard-ovog podprograma za bezbedno pregledanje", "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih sajtova za odrasle", diff --git a/client/src/__locales/sv.json b/client/src/__locales/sv.json index 10f8cf9b..90834a8a 100644 --- a/client/src/__locales/sv.json +++ b/client/src/__locales/sv.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Blockerad skadekod/phishing", "stats_adult": "Blockerade vuxensajter", "stats_query_domain": "Mest eftersökta domäner", - "for_last_24_hours": "under de senaste 24 timmarna", + "for_last_hours": "för den senaste {{count}} timme", + "for_last_hours_plural": "för de senaste {{count}} timmar", "for_last_days": "för den senaste {{count}} dagen", "for_last_days_plural": "för de senaste {{count}} dagarna", "stats_disabled": "Statistiken har inaktiverats. Du kan aktivera det från <0>inställningssidan.", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Ett antal DNS förfrågningar utfördes för den senaste {{count}} timme", + "number_of_dns_query_hours_plural": "Ett antal DNS förfrågningar utfördes för den senaste {{count}} timmar", "number_of_dns_query_blocked_24_hours": "Antalet DNS-förfrågningar som blockerades av annonsfilter och värdens blockeringsklistor", "number_of_dns_query_blocked_24_hours_by_sec": "Antalet DNS-förfrågningar som blockerades av AdGuards modul för surfsäkerhet", "number_of_dns_query_blocked_24_hours_adult": "Antalet vuxensajter som blockerats", diff --git a/client/src/__locales/tr.json b/client/src/__locales/tr.json index a103b0fa..64f61bed 100644 --- a/client/src/__locales/tr.json +++ b/client/src/__locales/tr.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Engellenen kötü amaçlı yazılım ve kimlik avı", "stats_adult": "Engellenen yetişkin içerikli siteler", "stats_query_domain": "Başlıca sorgulanan alan adları", - "for_last_24_hours": "son 24 saat içindekiler", + "for_last_hours": "son {{count}} saat için", + "for_last_hours_plural": "son {{count}} saat için", "for_last_days": "son {{count}} gün boyunca", "for_last_days_plural": "son {{count}} gün boyunca", "stats_disabled": "İstatistikler devre dışı bırakıldı. Bunu, <0>ayarlar sayfasından etkinleştirebilirsiniz.", @@ -134,7 +135,8 @@ "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ı", + "number_of_dns_query_hours": "Son {{count}} saat için işlenen DNS sorgularının sayısı", + "number_of_dns_query_hours_plural": "Son {{count}} saatiçin işlenen DNS sorgularının sayısı", "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve hosts engel listeleri tarafından engellenen DNS isteklerinin sayısı", "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard gezinti koruması modülü tarafından engellenen DNS isteklerinin sayısı", "number_of_dns_query_blocked_24_hours_adult": "Engellenen yetişkin içerikli sitelerin sayısı", diff --git a/client/src/__locales/uk.json b/client/src/__locales/uk.json index 31e54eae..5817278b 100644 --- a/client/src/__locales/uk.json +++ b/client/src/__locales/uk.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "Заблоковано зловмисних/шахрайських програм", "stats_adult": "Заблоковано вебсайтів для дорослих", "stats_query_domain": "Найчастіші запити доменів", - "for_last_24_hours": "за останні 24 години", + "for_last_hours": "за останню {{count}} годину", + "for_last_hours_plural": "за останні {{count}} годин", "for_last_days": "за останній {{count}} день", "for_last_days_plural": "за останні {{count}} днів", "stats_disabled": "Статистику вимкнено. Ви можете увімкнути її на <0>сторінці налаштувань.", @@ -134,7 +135,8 @@ "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 години", + "number_of_dns_query_hours": "Кількість DNS-запитів, оброблених за останню {{count}} годину", + "number_of_dns_query_hours_plural": "Кількість DNS-запитів, оброблених за останні {{count}} годин", "number_of_dns_query_blocked_24_hours": "Кількість DNS-запитів, заблокованих фільтрами і списками блокування hosts", "number_of_dns_query_blocked_24_hours_by_sec": "Кількість DNS-запитів, заблокованих модулем «Безпека перегляду» AdGuard", "number_of_dns_query_blocked_24_hours_adult": "Кількість заблокованих вебсайтів для дорослих", diff --git a/client/src/__locales/vi.json b/client/src/__locales/vi.json index f0090aa6..66d69538 100644 --- a/client/src/__locales/vi.json +++ b/client/src/__locales/vi.json @@ -119,7 +119,8 @@ "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_hours": "trong {{count}} giờ qua", + "for_last_hours_plural": "trong {{count}} giờ qua", "for_last_days": "trong {{count}} ngày qua", "for_last_days_plural": "trong {{count}} ngày qua", "stats_disabled": "Số liệu thống kê đã bị vô hiệu hóa. Bạn có thể bật nó từ <0> trang cài đặt .", @@ -134,7 +135,8 @@ "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", + "number_of_dns_query_hours": "Một số truy vấn DNS được xử lý trong {{count}} giờ qua", + "number_of_dns_query_hours_plural": "Một số truy vấn DNS được xử lý trong {{count}} 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ố trang web người lớn đã chặn", diff --git a/client/src/__locales/zh-cn.json b/client/src/__locales/zh-cn.json index ad2aebac..825ad7d2 100644 --- a/client/src/__locales/zh-cn.json +++ b/client/src/__locales/zh-cn.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "被拦截的恶意/钓鱼网站", "stats_adult": "被拦截的成人网站", "stats_query_domain": "请求域名排行", - "for_last_24_hours": "在过去 24 小时", + "for_last_hours": "最近 {{count}} 小时", + "for_last_hours_plural": "最近 {{count}} 小时", "for_last_days": "最近 {{count}} 天", "for_last_days_plural": "最近 {{count}} 天", "stats_disabled": "已禁用统计数据。您可以从<0>设置页面打开它。", @@ -134,7 +135,8 @@ "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 请求总数", + "number_of_dns_query_hours": "最近 {{count}} 小时内处理的 DNS 查询次数", + "number_of_dns_query_hours_plural": "最近 {{count}} 小时内处理的 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": "被阻止的成人网站总数", diff --git a/client/src/__locales/zh-tw.json b/client/src/__locales/zh-tw.json index 0cbd148a..5e7ccb40 100644 --- a/client/src/__locales/zh-tw.json +++ b/client/src/__locales/zh-tw.json @@ -119,7 +119,8 @@ "stats_malware_phishing": "已封鎖的惡意軟體/網路釣魚", "stats_adult": "已封鎖的成人網站", "stats_query_domain": "熱門已查詢的網域", - "for_last_24_hours": "在最近的 24 小時內", + "for_last_hours": "在過去的 {{count}} 小時內", + "for_last_hours_plural": "在過去的 {{count}} 小時內", "for_last_days": "在最近的 {{count}} 日內", "for_last_days_plural": "在最近的 {{count}} 日內", "stats_disabled": "該統計資料已被禁用。您可從<0>設定頁面中打開它。", @@ -134,7 +135,8 @@ "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 查詢之數量", + "number_of_dns_query_hours": "過去 {{count}} 小時內處理的 DNS 查詢次數", + "number_of_dns_query_hours_plural": "過去 {{count}} 小時內處理的 DNS 查詢次數", "number_of_dns_query_blocked_24_hours": "被廣告封鎖過濾器和主機封鎖清單阻擋的 DNS 請求之數量", "number_of_dns_query_blocked_24_hours_by_sec": "被 AdGuard 瀏覽安全模組封鎖的 DNS 請求之數量", "number_of_dns_query_blocked_24_hours_adult": "已封鎖的成人網站之數量", diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json index 2f6b44cc..bd174292 100644 --- a/client/src/helpers/trackers/trackers.json +++ b/client/src/helpers/trackers/trackers.json @@ -1,5 +1,5 @@ { - "timeUpdated": "2023-10-08T00:09:45.691Z", + "timeUpdated": "2023-10-15T12:13:01.838Z", "categories": { "0": "audio_video_player", "1": "comments", @@ -243,7 +243,7 @@ "name": "Australian Broadcasting Corporation", "categoryId": 8, "url": "https://www.abc.net.au/", - "companyId": "abc", + "companyId": "australian_government", "source": "AdGuard" }, "ablida": { @@ -3593,6 +3593,13 @@ "url": null, "companyId": null }, + "bom": { + "name": "Bureau of Meteorology", + "categoryId": 9, + "url": "http://bom.gov.au/", + "companyId": "australian_government", + "source": "AdGuard" + }, "bombora": { "name": "Bombora", "categoryId": 6, @@ -5943,6 +5950,20 @@ "url": "https://discordapp.com/", "companyId": null }, + "disneyplus": { + "name": "Disney+", + "categoryId": 0, + "url": "https://www.disneyplus.com/", + "companyId": "disney", + "source": "AdGuard" + }, + "disneystreaming": { + "name": "Disney Streaming", + "categoryId": 0, + "url": "https://press.disneyplus.com", + "companyId": "disney", + "source": "AdGuard" + }, "display_block": { "name": "display block", "categoryId": 4, @@ -6160,6 +6181,13 @@ "url": "http://www.drawbrid.ge/", "companyId": "drawbridge" }, + "dreame_tech": { + "name": "Dreame Technology", + "categoryId": 8, + "url": "https://www.dreame.tech/", + "companyId": "xiaomi", + "source": "AdGuard" + }, "dreamlab.pl": { "name": "DreamLab.pl", "categoryId": 4, @@ -10372,7 +10400,7 @@ "name": "Let's Encrypt", "categoryId": 5, "url": "https://letsencrypt.org/", - "companyId": "lets_encrypt", + "companyId": "isrg", "source": "AdGuard" }, "letv": { @@ -19444,6 +19472,13 @@ "companyId": "xhamster", "source": "AdGuard" }, + "xiaomi": { + "name": "Xiaomi", + "categoryId": 8, + "url": "https://www.mi.com/", + "companyId": "xiaomi", + "source": "AdGuard" + }, "xing": { "name": "Xing", "categoryId": 6, @@ -20047,8 +20082,8 @@ "2leep.com": "2leep", "33across.com": "33across", "3dstats.com": "3dstats", - "3gppnetwork.org": "3gpp", "3gpp.org": "3gpp", + "3gppnetwork.org": "3gpp", "4cdn.org": "4chan", "4finance.com": "4finance_com", "4wnet.com": "4w_marketplace", @@ -20069,7 +20104,6 @@ "aaxads.com": "aaxads.com", "abtasty.com": "ab_tasty", "d1447tq2m68ekg.cloudfront.net": "ab_tasty", - "abc.net.au": "abc", "ab.co": "abc", "abc-cdn.net.au": "abc", "abc-host.net": "abc", @@ -20077,6 +20111,7 @@ "abc-prod.net.au": "abc", "abc-stage.net.au": "abc", "abc-test.net.au": "abc", + "abc.net.au": "abc", "abcaustralia.net.au": "abc", "abcradio.net.au": "abc", "ablida.de": "ablida", @@ -20238,17 +20273,17 @@ "adgorithms.com": "adgorithms", "adgoto.com": "adgoto", "adguard.com": "adguard", - "adtidy.org": "adguard", - "agrd.io": "adguard", "adguard.app": "adguard", "adguard.info": "adguard", "adguard.io": "adguard", "adguard.org": "adguard", + "adtidy.org": "adguard", + "agrd.io": "adguard", "adguard-dns.com": "adguard_dns", "adguard-dns.io": "adguard_dns", - "adguardvpn.com": "adguard_vpn", "adguard-vpn.com": "adguard_vpn", "adguard-vpn.online": "adguard_vpn", + "adguardvpn.com": "adguard_vpn", "adhands.ru": "adhands", "adhese.be": "adhese", "adhese.com": "adhese", @@ -20264,9 +20299,9 @@ "cdn.adjs.net": "adjs", "adjug.com": "adjug", "adjust.com": "adjust", - "adjust.net.in": "adjust", "adj.st": "adjust", "adjust.io": "adjust", + "adjust.net.in": "adjust", "adjust.world": "adjust", "apptrace.com": "adjust", "adk2.com": "adk2", @@ -20616,17 +20651,17 @@ "amazon.fr": "amazon", "amazon.it": "amazon", "d3io1k5o0zdpqr.cloudfront.net": "amazon", - "amazoncrl.com": "amazon", - "aamazoncognito.com": "amazon", - "amazonbrowserapp.es": "amazon", - "amazonbrowserapp.co.uk": "amazon", - "amazon.sa": "amazon", - "amazon.nl": "amazon", - "amazon.in": "amazon", - "amazon.com.mx": "amazon", - "amazon.com.au": "amazon", - "amazon-corp.com": "amazon", "a2z.com": "amazon", + "aamazoncognito.com": "amazon", + "amazon-corp.com": "amazon", + "amazon.com.au": "amazon", + "amazon.com.mx": "amazon", + "amazon.in": "amazon", + "amazon.nl": "amazon", + "amazon.sa": "amazon", + "amazonbrowserapp.co.uk": "amazon", + "amazonbrowserapp.es": "amazon", + "amazoncrl.com": "amazon", "firetvcaptiveportal.com": "amazon", "amazon-adsystem.com": "amazon_adsystem", "serving-sys.com": "amazon_adsystem", @@ -20692,31 +20727,32 @@ "eum-appdynamics.com": "appdynamics", "jscdn.appier.net": "appier", "apple.com": "apple", - "me.com": "apple", - "apple.news": "apple", - "apple-dns.net": "apple", "aaplimg.com": "apple", - "icloud.com": "apple", - "itunes.com": "apple", - "icloud-content.com": "apple", - "mzstatic.com": "apple", - "cdn-apple.com": "apple", - "apple-mapkit.com": "apple", - "icons.axm-usercontent-apple.com": "apple", "apple-cloudkit.com": "apple", - "apzones.com": "apple", + "apple-dns.net": "apple", "apple-livephotoskit.com": "apple", + "apple-mapkit.com": "apple", + "apple.news": "apple", + "apzones.com": "apple", + "cdn-apple.com": "apple", + "icloud-content.com": "apple", + "icloud.com": "apple", + "icons.axm-usercontent-apple.com": "apple", + "itunes.com": "apple", + "me.com": "apple", + "mzstatic.com": "apple", "safebrowsing.apple": "apple", "safebrowsing.g.applimg.com": "apple", "iadsdk.apple.com": "apple_ads", "applifier.com": "applifier", "assets.applovin.com": "applovin", - "applvn.com": "applovin", "applovin.com": "applovin", + "applvn.com": "applovin", "appmetrx.com": "appmetrx", "adnxs.com": "appnexus", "adnxs.net": "appnexus", "appsflyer.com": "appsflyer", + "appsflyersdk.com": "appsflyer", "adne.tv": "apptv", "readserver.net": "apptv", "www.apture.com": "apture", @@ -20926,6 +20962,7 @@ "secure.apps.shappify.com": "bold", "boldchat.com": "boldchat", "boltdns.net": "boltdns.net", + "bom.gov.au": "bom", "ml314.com": "bombora", "bongacams.com": "bongacams.com", "bonial.com": "bonial", @@ -21170,8 +21207,8 @@ "cloud-media.fr": "cloud-media.fr", "cloudflare.com": "cloudflare", "cloudflare.net": "cloudflare", - "cloudflare-dns.com": "cloudflare", "cloudflare-dm-cmpimg.com": "cloudflare", + "cloudflare-dns.com": "cloudflare", "cloudflare-ipfs.com": "cloudflare", "cloudflare-quic.com": "cloudflare", "cloudflare-terms-of-service-abuse.com": "cloudflare", @@ -21184,8 +21221,10 @@ "cloudflareresolve.com": "cloudflare", "cloudflaressl.com": "cloudflare", "cloudflarestatus.com": "cloudflare", + "cloudflarestream.com": "cloudflare", "pacloudflare.com": "cloudflare", "sn-cloudflare.com": "cloudflare", + "videodelivery.net": "cloudflare", "cloudimg.io": "cloudimage.io", "cloudinary.com": "cloudinary", "clovenetwork.com": "clove_network", @@ -21454,6 +21493,10 @@ "directadvert.ru": "directadvert", "directrev.com": "directrev", "discordapp.com": "discord", + "disneyplus.com": "disneyplus", + "bamgrid.com": "disneystreaming", + "dssedge.com": "disneystreaming", + "dssott.com": "disneystreaming", "d81mfvml8p5ml.cloudfront.net": "display_block", "disqus.com": "disqus", "disquscdn.com": "disqus", @@ -21497,6 +21540,8 @@ "doubleverify.com": "doubleverify", "wrating.com": "dratio", "adsymptotic.com": "drawbridge", + "dreame.tech": "dreame_tech", + "dreametech.com": "dreame_tech", "dreamlab.pl": "dreamlab.pl", "drift.com": "drift", "js.driftt.com": "drift", @@ -21717,18 +21762,18 @@ "findologic.com": "findologic.com", "app-measurement.com": "firebase", "fcm.googleapis.com": "firebase", - "firebaseappcheck.googleapis.com": "firebase", - "firebaseapp.com": "firebase", "firebase.com": "firebase", - "firebasedynamiclinks.googleapis.com": "firebase", + "firebase.google.com": "firebase", + "firebase.googleapis.com": "firebase", + "firebaseapp.com": "firebase", + "firebaseappcheck.googleapis.com": "firebase", "firebasedynamiclinks-ipv4.googleapis.com": "firebase", "firebasedynamiclinks-ipv6.googleapis.com": "firebase", - "firebase.googleapis.com": "firebase", - "firebase.google.com": "firebase", + "firebasedynamiclinks.googleapis.com": "firebase", "firebaseinappmessaging.googleapis.com": "firebase", "firebaseinstallations.googleapis.com": "firebase", - "firebaselogging.googleapis.com": "firebase", "firebaselogging-pa.googleapis.com": "firebase", + "firebaselogging.googleapis.com": "firebase", "firebaseperusertopics-pa.googleapis.com": "firebase", "firebaseremoteconfig.googleapis.com": "firebase", "firebaseio.com": "firebaseio.com", @@ -21806,9 +21851,9 @@ "freegeoip.net": "freegeoip_net", "freenet.de": "freenet_de", "freent.de": "freenet_de", - "freeviewaustralia.tv": "freeview", - "freeview.com.au": "freeview", "freeview.com": "freeview", + "freeview.com.au": "freeview", + "freeviewaustralia.tv": "freeview", "fwmrm.net": "freewheel", "heimdall.fresh8.co": "fresh8", "d36mpcpuzc4ztk.cloudfront.net": "freshdesk", @@ -21958,7 +22003,6 @@ "google.ae": "google", "google.al": "google", "google.am": "google", - "googleapis.cn": "google", "google.as": "google", "google.az": "google", "google.ba": "google", @@ -21981,11 +22025,20 @@ "google.co.bw": "google", "google.co.ck": "google", "google.co.cr": "google", - "googlecode.com": "google", "google.co.il": "google", "google.co.ke": "google", "google.co.kr": "google", "google.co.ls": "google", + "google.co.mz": "google", + "google.co.nz": "google", + "google.co.tz": "google", + "google.co.ug": "google", + "google.co.uz": "google", + "google.co.ve": "google", + "google.co.vi": "google", + "google.co.za": "google", + "google.co.zm": "google", + "google.co.zw": "google", "google.com.af": "google", "google.com.ag": "google", "google.com.ai": "google", @@ -22033,20 +22086,9 @@ "google.com.uy": "google", "google.com.vc": "google", "google.com.vn": "google", - "google.co.mz": "google", - "google.co.nz": "google", - "google.co.tz": "google", - "google.co.ug": "google", - "google.co.uz": "google", - "google.co.ve": "google", - "google.co.vi": "google", - "google.co.za": "google", - "google.co.zm": "google", - "google.co.zw": "google", "google.cv": "google", "google.dj": "google", "google.dm": "google", - "googledownloads.cn": "google", "google.ee": "google", "google.fm": "google", "google.ga": "google", @@ -22088,7 +22130,6 @@ "google.net": "google", "google.nr": "google", "google.nu": "google", - "googleoptimize.com": "google", "google.org": "google", "google.pn": "google", "google.ps": "google", @@ -22112,8 +22153,12 @@ "google.us": "google", "google.vg": "google", "google.vu": "google", - "googleweblight.in": "google", "google.ws": "google", + "googleapis.cn": "google", + "googlecode.com": "google", + "googledownloads.cn": "google", + "googleoptimize.com": "google", + "googleweblight.in": "google", "googlezip.net": "google", "gstatic.cn": "google", "news.google.com": "google", @@ -22140,10 +22185,10 @@ "alt7-mtalk.google.com": "google_chat", "alt8-mtalk.google.com": "google_chat", "chat.google.com": "google_chat", - "mobile-gtalk4.l.google.com": "google_chat", "mobile-gtalk.l.google.com": "google_chat", - "mtalk4.google.com": "google_chat", + "mobile-gtalk4.l.google.com": "google_chat", "mtalk.google.com": "google_chat", + "mtalk4.google.com": "google_chat", "talk.google.com": "google_chat", "talk.l.google.com": "google_chat", "talkx.l.google.com": "google_chat", @@ -22163,10 +22208,10 @@ "mail-ads.google.com": "google_email", "fonts.googleapis.com": "google_fonts", "cloudfunctions.net": "google_hosted", - "ghs46.googlehosted.com": "google_hosted", - "ghs4.googlehosted.com": "google_hosted", - "ghs6.googlehosted.com": "google_hosted", "ghs.googlehosted.com": "google_hosted", + "ghs4.googlehosted.com": "google_hosted", + "ghs46.googlehosted.com": "google_hosted", + "ghs6.googlehosted.com": "google_hosted", "googlehosted.l.googleusercontent.com": "google_hosted", "run.app": "google_hosted", "supl.google.com": "google_location", @@ -22180,9 +22225,9 @@ "maps.google.ca": "google_maps", "maps.google.ch": "google_maps", "maps.google.co.jp": "google_maps", + "maps.google.co.uk": "google_maps", "maps.google.com": "google_maps", "maps.google.com.mx": "google_maps", - "maps.google.co.uk": "google_maps", "maps.google.es": "google_maps", "maps.google.se": "google_maps", "maps.gstatic.com": "google_maps", @@ -22190,6 +22235,8 @@ "adservice.google.ca": "google_marketing", "adservice.google.co.in": "google_marketing", "adservice.google.co.kr": "google_marketing", + "adservice.google.co.uk": "google_marketing", + "adservice.google.co.za": "google_marketing", "adservice.google.com": "google_marketing", "adservice.google.com.ar": "google_marketing", "adservice.google.com.au": "google_marketing", @@ -22203,8 +22250,6 @@ "adservice.google.com.tr": "google_marketing", "adservice.google.com.tw": "google_marketing", "adservice.google.com.vn": "google_marketing", - "adservice.google.co.uk": "google_marketing", - "adservice.google.co.za": "google_marketing", "adservice.google.de": "google_marketing", "adservice.google.dk": "google_marketing", "adservice.google.es": "google_marketing", @@ -22219,17 +22264,17 @@ "googlesyndication-cn.com": "google_marketing", "duo.google.com": "google_meet", "hangouts.clients6.google.com": "google_meet", - "hangouts.googleapis.com": "google_meet", "hangouts.google.com": "google_meet", + "hangouts.googleapis.com": "google_meet", "meet.google.com": "google_meet", "meetings.googleapis.com": "google_meet", - "stun1.l.google.com": "google_meet", "stun.l.google.com": "google_meet", + "stun1.l.google.com": "google_meet", "ggpht.com": "google_photos", "play-fe.googleapis.com": "google_play", - "play.googleapis.com": "google_play", - "play.google.com": "google_play", "play-lh.googleusercontent.com": "google_play", + "play.google.com": "google_play", + "play.googleapis.com": "google_play", "1e100cdn.net": "google_servers", "gvt1.com": "google_servers", "gvt2.com": "google_servers", @@ -22531,9 +22576,9 @@ "iprom.net": "iprom", "ipromote.com": "ipromote", "clickmanage.com": "iprospect", - "qy.net": "iqiyi", - "iqiyi.com": "iqiyi", "iq.com": "iqiyi", + "iqiyi.com": "iqiyi", + "qy.net": "iqiyi", "addelive.com": "ironsource", "afdads.com": "ironsource", "delivery47.com": "ironsource", @@ -22772,11 +22817,11 @@ "footprint.net": "level3_communications", "alphonso.tv": "lgads", "lgads.tv": "lgads", + "lg.com": "lgtv", + "lge.com": "lgtv", "lgsmartad.com": "lgtv", "lgtvcommon.com": "lgtv", "lgtvsdp.com": "lgtv", - "lge.com": "lgtv", - "lg.com": "lgtv", "licensebuttons.net": "licensebuttons.net", "lfstmedia.com": "lifestreet_media", "content-recommendation.net": "ligatus", @@ -22971,8 +23016,8 @@ "s1.mediaad.org": "mediaad", "mlnadvertising.com": "mediaglu", "fhserve.com": "mediahub", - "medialab.la": "medialab", "media-lab.ai": "medialab", + "medialab.la": "medialab", "adnet.ru": "medialand", "medialand.ru": "medialand", "medialead.de": "medialead", @@ -23352,12 +23397,12 @@ "opinary.com": "opinary", "opinionbar.com": "opinionbar", "emagazines.com": "oplytic", - "oppomobile.com": "oppo", - "heytapmobi.com": "oppo", - "heytapmobile.com": "oppo", - "heytapdl.com": "oppo", "allawnos.com": "oppo", "allawntech.com": "oppo", + "heytapdl.com": "oppo", + "heytapmobi.com": "oppo", + "heytapmobile.com": "oppo", + "oppomobile.com": "oppo", "opta.net": "opta.net", "optaim.com": "optaim", "cookielaw.org": "optanaon", @@ -23484,8 +23529,9 @@ "loveadvert.ru": "play_by_mamba", "playbuzz.com": "playbuzz.com", "pof.com": "plenty_of_fish", - "plex.tv": "plex", + "plex.bz": "plex", "plex.direct": "plex", + "plex.tv": "plex", "analytics.plex.tv": "plex_metrics", "metrics.plex.tv": "plex_metrics", "plista.com": "plista", @@ -23896,6 +23942,7 @@ "samsungsds.com": "samsungsds", "internetat.tv": "samsungtv", "samsungcloud.tv": "samsungtv", + "tizenservice.com": "samsungtv", "ilsemedia.nl": "sanoma.fi", "sanoma.fi": "sanoma.fi", "d13im3ek7neeqp.cloudfront.net": "sap_crm", @@ -24000,12 +24047,12 @@ "cdn.shopify.com": "shopify", "myshopify.com": "shopify", "shop.app": "shopify", - "shopifyapps.com": "shopify", - "shopifycdn.net": "shopify", + "shopify.co.za": "shopify", "shopify.com.au": "shopify", "shopify.com.mx": "shopify", - "shopify.co.za": "shopify", "shopify.dev": "shopify", + "shopifyapps.com": "shopify", + "shopifycdn.net": "shopify", "shopifynetwork.com": "shopify", "shopifypreview.com": "shopify", "shopifysvc.com": "shopify_stats", @@ -24042,8 +24089,8 @@ "pages04.net": "silverpop", "pages05.net": "silverpop", "similardeals.net": "similardeals.net", - "similarweb.io": "similarweb", "similarweb.com": "similarweb", + "similarweb.io": "similarweb", "d8rk54i4mohrb.cloudfront.net": "simplereach", "simplereach.com": "simplereach", "simpli.fi": "simpli.fi", @@ -24082,10 +24129,10 @@ "skypeassets.com": "skype", "skysa.com": "skysa", "skyscnr.com": "skyscnr.com", - "slack.com": "slack", - "slackb.com": "slack", "slack-edge.com": "slack", "slack-imgs.com": "slack", + "slack.com": "slack", + "slackb.com": "slack", "slashdot.org": "slashdot_widget", "sleeknotestaticcontent.sleeknote.com": "sleeknote", "resultspage.com": "sli_systems", @@ -24356,8 +24403,8 @@ "teaser.cc": "teaser.cc", "emailretargeting.com": "tedemis", "tracking.dsmmadvantage.com": "teletech", - "telstra.com.au": "telstra", "telstra.com": "telstra", + "telstra.com.au": "telstra", "tenderapp.com": "tender", "tensitionschoo.club": "tensitionschoo.club", "watch.teroti.com": "teroti", @@ -24728,9 +24775,9 @@ "tools.vpscash.nl": "vpscash", "vsassets.io": "vs", "exp-tas.com": "vscode", - "vscode-unpkg.net": "vscode", "v0cdn.net": "vscode", "vscode-cdn.net": "vscode", + "vscode-unpkg.net": "vscode", "vtracy.de": "vtracy.de", "liftoff.io": "vungle", "vungle.com": "vungle", @@ -24803,8 +24850,8 @@ "wetter.com": "wetter_com", "wettercomassets.com": "wetter_com", "whatsbroadcast.com": "whatbroadcast", - "whatsapp.net": "whatsapp", "whatsapp.com": "whatsapp", + "whatsapp.net": "whatsapp", "whisper.onelink.me": "whisper", "whisper.sh": "whisper", "amung.us": "whos.amung.us", @@ -24876,6 +24923,13 @@ "xhamsterlive.com": "xhamster", "xhamsterpremium.com": "xhamster", "xhcdn.com": "xhamster", + "huami.com": "xiaomi", + "mi-img.com": "xiaomi", + "mi.com": "xiaomi", + "miui.com": "xiaomi", + "xiaomi.com": "xiaomi", + "xiaomi.net": "xiaomi", + "xiaomiyoupin.com": "xiaomi", "xing-share.com": "xing", "xing.com": "xing", "xmediaclicks.com": "xmediaclicks", diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go index e5ec1278..2001d32a 100644 --- a/internal/filtering/servicelist.go +++ b/internal/filtering/servicelist.go @@ -256,6 +256,13 @@ var blockedServices = []blockedService{{ "||z.cn^", "||zappos^", }, +}, { + ID: "amino", + Name: "Amino", + IconSVG: []byte(""), + Rules: []string{ + "||aminoapps.com^", + }, }, { ID: "apple_streaming", Name: "Apple Streaming", @@ -337,6 +344,16 @@ var blockedServices = []blockedService{{ "||betwaysatta.com^", "||vietnambetway88.com^", }, +}, { + ID: "bigo_live", + Name: "Bigo Live", + IconSVG: []byte(""), + Rules: []string{ + "||bigo.sg^", + "||bigo.tv^", + "||bigolive.tv^", + "||bigovideo.tv^", + }, }, { ID: "bilibili", Name: "Bilibili", @@ -508,6 +525,13 @@ var blockedServices = []blockedService{{ "||deezer.com^", "||dzcdn.net^", }, +}, { + ID: "directvgo", + Name: "DirecTV Go", + IconSVG: []byte(""), + Rules: []string{ + "||directvgo.com^", + }, }, { ID: "discord", Name: "Discord", @@ -1975,6 +1999,23 @@ var blockedServices = []blockedService{{ "||sonyentertainmentnetwork.com", "||station.sony.com", }, +}, { + ID: "plenty_of_fish", + Name: "Plenty of Fish", + IconSVG: []byte(""), + Rules: []string{ + "||pof.com^", + }, +}, { + ID: "plex", + Name: "Plex", + IconSVG: []byte(""), + Rules: []string{ + "||plex.bz^", + "||plex.direct^", + "||plex.tv^", + "||plexapp.com^", + }, }, { ID: "pluto_tv", Name: "Pluto TV", @@ -2086,6 +2127,14 @@ var blockedServices = []blockedService{{ "||shopeemobile.com^", "||shp.ee^", }, +}, { + ID: "signal", + Name: "Signal", + IconSVG: []byte(""), + Rules: []string{ + "||signal.org^", + "||whispersystems.org^", + }, }, { ID: "skype", Name: "Skype", @@ -2210,6 +2259,14 @@ var blockedServices = []blockedService{{ "||tx.me^", "||usercontent.dev^", }, +}, { + ID: "temu", + Name: "Temu", + IconSVG: []byte(""), + Rules: []string{ + "||kwcdn.com^", + "||temu.com^", + }, }, { ID: "tidal", Name: "Tidal", @@ -2256,6 +2313,13 @@ var blockedServices = []blockedService{{ "||tinder.com^", "||tindersparks.com^", }, +}, { + ID: "tumblr", + Name: "Tumblr", + IconSVG: []byte(""), + Rules: []string{ + "||tumblr.com^", + }, }, { ID: "twitch", Name: "Twitch", @@ -2434,6 +2498,15 @@ var blockedServices = []blockedService{{ "||whatsapp.tv^", "||whatsappbrand.com^", }, +}, { + ID: "wizz", + Name: "Wizz", + IconSVG: []byte(""), + Rules: []string{ + "||getwizz.io^", + "||wizz.chat^", + "||wizzapp.com^", + }, }, { ID: "xboxlive", Name: "Xbox Live", @@ -2448,6 +2521,14 @@ var blockedServices = []blockedService{{ "||xboxlive.com^", "||xboxservices.com^", }, +}, { + ID: "xiaohongshu", + Name: "Xiaohongshu", + IconSVG: []byte(""), + Rules: []string{ + "||xhscdn.com^", + "||xiaohongshu.com^", + }, }, { ID: "youtube", Name: "YouTube", diff --git a/internal/tools/go.mod b/internal/tools/go.mod index f08b995b..f8b8feb5 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -8,10 +8,8 @@ require ( github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 github.com/kisielk/errcheck v1.6.3 github.com/kyoh86/looppointer v0.2.1 - github.com/securego/gosec/v2 v2.18.0 - // TODO(a.garipov): Return to latest once the release is tagged - // correctly. See uudashr/gocognit#31. - github.com/uudashr/gocognit v1.0.8-0.20230906062305-bc9ca12659bf + github.com/securego/gosec/v2 v2.18.1 + github.com/uudashr/gocognit v1.1.1 golang.org/x/tools v0.14.0 golang.org/x/vuln v1.0.1 honnef.co/go/tools v0.4.6 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index e38360f3..ef504ab1 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -33,11 +33,11 @@ github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/securego/gosec/v2 v2.18.0 h1:PEQsNSe8NjGrQ6oF3LrmMhZTm2iqYKUOYf+OWXzo+XQ= -github.com/securego/gosec/v2 v2.18.0/go.mod h1:06rgh4+5IrlRpi573DJRZ6y/tlIE+a0rFgMlJDxFIyQ= +github.com/securego/gosec/v2 v2.18.1 h1:xnnehWg7dIW8qrRPGm8ykY21zp2MueKyC99Vlcuj96I= +github.com/securego/gosec/v2 v2.18.1/go.mod h1:ZUTcKD9gAFip1lLGHWCjkoBQJyaEzePTNzjwlL2HHoE= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/uudashr/gocognit v1.0.8-0.20230906062305-bc9ca12659bf h1:LA5CHw6L5BvI0RjqvBYa9+3hXAL2rhuAJPtS5rS2a2k= -github.com/uudashr/gocognit v1.0.8-0.20230906062305-bc9ca12659bf/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= +github.com/uudashr/gocognit v1.1.1 h1:qIj6KhmcGQGBiWtaKH6ZlIyDGa6br2febZNZ6MDzqMw= +github.com/uudashr/gocognit v1.1.1/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -63,7 +63,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=