From c0c152885d335b86c55ef1836930f5044585a1cc Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 2 Aug 2023 15:58:05 +0300 Subject: [PATCH] Pull request 1950: upd-all Squashed commit of the following: commit 6e17dd9bf96fd684bd2ff28285ff9ef6534641e9 Author: Ainar Garipov Date: Wed Aug 2 14:59:19 2023 +0300 all: upd i18n, svcs, trackers --- client/src/__locales/hr.json | 2 +- client/src/__locales/hu.json | 2 +- client/src/__locales/ro.json | 2 +- client/src/__locales/sk.json | 2 +- client/src/__locales/th.json | 2 + client/src/__locales/uk.json | 2 +- client/src/__locales/vi.json | 2 +- client/src/__locales/zh-tw.json | 4 +- client/src/helpers/trackers/trackers.json | 126 +++++++++++++++------- internal/filtering/servicelist.go | 54 +++++++++- 10 files changed, 148 insertions(+), 50 deletions(-) diff --git a/client/src/__locales/hr.json b/client/src/__locales/hr.json index 32e029d5..feb50c0b 100644 --- a/client/src/__locales/hr.json +++ b/client/src/__locales/hr.json @@ -444,7 +444,7 @@ "client_confirm_delete": "Jeste li sigurni da želite ukloniti \"{{key}}\" klijenta?", "list_confirm_delete": "Jeste li sigurni da želite ukloniti ovaj popis?", "auto_clients_title": "Runtime klijenti", - "auto_clients_desc": "Podaci na klijentu koji koriste AdGuard Home, ali se ne mijenjaju u postavkama", + "auto_clients_desc": "Informacije o IP adresama uređaja koji koriste ili bi mogli koristiti AdGuard Home. Ove informacije prikupljaju se iz nekoliko izvora, uključujući datoteke hostova, obrnuti DNS itd.", "access_title": "Postavke pristupa", "access_desc": "Ovdje možete konfigurirati pravila pristupa za AdGuard Home DNS poslužitelj", "access_allowed_title": "Dopušteni klijenti", diff --git a/client/src/__locales/hu.json b/client/src/__locales/hu.json index 6ddc9443..37e5cdfe 100644 --- a/client/src/__locales/hu.json +++ b/client/src/__locales/hu.json @@ -444,7 +444,7 @@ "client_confirm_delete": "Biztosan törölni szeretné a(z) \"{{key}}\" klienst?", "list_confirm_delete": "Biztosan törölni kívánja ezt a listát?", "auto_clients_title": "Futási idejű kliensek", - "auto_clients_desc": "Ezek az eszközök nem szerepelnek a fenntartott kliensek listáján, de használják az AdGuard Home-ot", + "auto_clients_desc": "Az AdGuard Home-ot használó vagy esetleg használó eszközök IP-címeire vonatkozó információk. Ezeket az információkat több forrásból gyűjtik, beleértve a hosts fájlokat, a fordított DNS-t stb.", "access_title": "Hozzáférési beállítások", "access_desc": "Itt konfigurálhatja az AdGuard Home DNS-kiszolgáló hozzáférési szabályait", "access_allowed_title": "Engedélyezett kliensek", diff --git a/client/src/__locales/ro.json b/client/src/__locales/ro.json index 955dd822..411cf75b 100644 --- a/client/src/__locales/ro.json +++ b/client/src/__locales/ro.json @@ -444,7 +444,7 @@ "client_confirm_delete": "Sunteți sigur că doriți să ștergeți clientul \"{{key}}\"?", "list_confirm_delete": "Sigur doriți să ștergeți această listă?", "auto_clients_title": "Clienți runtime", - "auto_clients_desc": "Dispozitivele care nu se află pe lista de clienți Persistent care pot utiliza în continuare AdGuard Home", + "auto_clients_desc": "Informații despre adresele IP ale dispozitivelor care utilizează sau pot utiliza AdGuard Home. Aceste informații sunt colectate din mai multe surse, inclusiv din fișiere hosts, DNS inversat etc.", "access_title": "Setări de acces", "access_desc": "Aici puteți configura regulile de acces pentru serverul DNS AdGuard Home", "access_allowed_title": "Clienți autorizați", diff --git a/client/src/__locales/sk.json b/client/src/__locales/sk.json index 740a8e8f..47e78933 100644 --- a/client/src/__locales/sk.json +++ b/client/src/__locales/sk.json @@ -444,7 +444,7 @@ "client_confirm_delete": "Naozaj chcete vymazať \"{{key}}\" klienta?", "list_confirm_delete": "Naozaj chcete vymazať tento zoznam?", "auto_clients_title": "Runtime klienti", - "auto_clients_desc": "Zariadenia, ktoré nie sú na zozname trvalých klientov, ktorí môžu stále používať AdGuard Home", + "auto_clients_desc": "Informácie o IP adresách zariadení, ktoré používajú alebo môžu používať AdGuard Home. Tieto informácie sa získavajú z viacerých zdrojov vrátane súborov hosts, reverzného DNS atď.", "access_title": "Nastavenia prístupu", "access_desc": "Tu môžete konfigurovať pravidlá prístupu pre server DNS AdGuard Home.", "access_allowed_title": "Povolení klienti", diff --git a/client/src/__locales/th.json b/client/src/__locales/th.json index c7ccb39b..9751530a 100644 --- a/client/src/__locales/th.json +++ b/client/src/__locales/th.json @@ -172,6 +172,7 @@ "dnscrypt": "DNSCrypt", "dns_over_https": "DNS-over-HTTPS", "dns_over_tls": "DNS-over-TLS", + "dns_over_quic": "DNS-over-QUIC", "form_enter_rate_limit": "ป้อนขีดจำกัดอัตรา", "rate_limit": "จำกัดอัตรา", "edns_enable": "เปิดใช้งานซับเน็ตไคลเอ็นต์ EDNS", @@ -392,6 +393,7 @@ "show_processed_responses": "การประมวลผล", "blocked_adult_websites": "ถูกปิดกั้นโดยการควบคุมของผู้ปกครอง", "safe_search": "ค้นหาอย่างปลอดภัย", + "blocklist": "บัญชีดำ", "filter_category_other": "อื่น ๆ", "parental_control": "ควบคุมโดยผู้ปกครอง" } diff --git a/client/src/__locales/uk.json b/client/src/__locales/uk.json index 104e2476..8cb111d0 100644 --- a/client/src/__locales/uk.json +++ b/client/src/__locales/uk.json @@ -444,7 +444,7 @@ "client_confirm_delete": "Ви впевнені, що хочете видалити клієнта «{{key}}»?", "list_confirm_delete": "Ви впевнені, що хочете видалити цей список?", "auto_clients_title": "Runtime-клієнти", - "auto_clients_desc": "Клієнти, які використовують AdGuard Home, незалежно від того, чи збережені вони в списку постійних", + "auto_clients_desc": "Інформація про IP-адреси пристроїв, які використовують або можуть використовувати AdGuard Home. Ця інформація збирається з кількох джерел, зокрема з файлів hosts, зворотного DNS тощо.", "access_title": "Налаштування доступу", "access_desc": "Тут ви можете налаштувати правила доступу для DNS-сервера AdGuard Home", "access_allowed_title": "Дозволені клієнти", diff --git a/client/src/__locales/vi.json b/client/src/__locales/vi.json index 44f8451e..52ffccec 100644 --- a/client/src/__locales/vi.json +++ b/client/src/__locales/vi.json @@ -444,7 +444,7 @@ "client_confirm_delete": "Bạn có chắc chắn muốn xóa máy khách \"{{key}}\" không?", "list_confirm_delete": "Bạn có muốn xóa bộ lọc này?", "auto_clients_title": "Máy khách (thời gian chạy)", - "auto_clients_desc": "Các thiết bị không có trong danh sách khách hàng ổn định vẫn có thể sử dụng AdGuard Home", + "auto_clients_desc": "Thông tin về địa chỉ IP của thiết bị đang sử dụng hoặc có thể sử dụng AdGuard Home. Thông tin này được thu thập từ nhiều nguồn, bao gồm tệp máy chủ, DNS ngược, v.v.", "access_title": "Cài đặt truy cập", "access_desc": "Tại đây bạn có thể định cấu hình quy tắc truy cập cho máy chủ AdGuard Home DNS", "access_allowed_title": "Máy chủ được phép", diff --git a/client/src/__locales/zh-tw.json b/client/src/__locales/zh-tw.json index e31ed29c..0d6419e1 100644 --- a/client/src/__locales/zh-tw.json +++ b/client/src/__locales/zh-tw.json @@ -138,9 +138,9 @@ "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域", "filters_block_toggle_hint": "您可在過濾器設定中設置封鎖規則。", "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務", - "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查該網域是否被瀏覽安全網路服務封鎖。它將使用友好的隱私查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到該伺服器。", + "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查該網域是否被瀏覽安全網路服務封鎖。它將使用對隱私友好的查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到該伺服器。", "use_adguard_parental": "使用 AdGuard 家長控制之網路服務", - "use_adguard_parental_hint": "AdGuard Home 將檢查網域是否包含成人資料。它使用如同瀏覽安全網路服務一樣之友好的隱私應用程式介面（API）。", + "use_adguard_parental_hint": "AdGuard Home 將檢查網域是否包含成人資料。它使用如同瀏覽安全網路服務一樣之對隱私友好的應用程式介面（API）。", "enforce_safe_search": "使用安全搜尋", "enforce_save_search_hint": "AdGuard Home 將在下列的搜尋引擎：Google、YouTube、Bing、DuckDuckGo、Yandex 和 Pixabay 中強制執行安全搜尋。", "no_servers_specified": "無已明確指定的伺服器", diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json index 2b26213e..e061c1d4 100644 --- a/client/src/helpers/trackers/trackers.json +++ b/client/src/helpers/trackers/trackers.json @@ -1,5 +1,5 @@ { - "timeUpdated": "2023-07-15T00:10:47.501Z", + "timeUpdated": "2023-08-01T00:10:42.759Z", "categories": { "0": "audio_video_player", "1": "comments", @@ -42,7 +42,8 @@ "name": "1822direkt.de", "categoryId": 8, "url": "https://www.1822direkt.de/", - "companyId": null + "companyId": "1822direkt", + "source": "AdGuard" }, "1dmp.io": { "name": "1DMP", @@ -69,16 +70,18 @@ "companyId": "dentsu_aegis_network" }, "1und1": { - "name": "1&1 Internet", + "name": "1&1 IONOS", "categoryId": 8, - "url": null, - "companyId": null + "url": "http://www.ionos.com/", + "companyId": "1und1", + "source": "AdGuard" }, "24-ads.com": { - "name": "24-ADS GmbH", + "name": "24-ADS", "categoryId": 4, "url": "http://www.24-ads.com/", - "companyId": null + "companyId": "24-ads.com", + "source": "AdGuard" }, "24_7": { "name": "[24]7", @@ -93,10 +96,11 @@ "companyId": "24log" }, "24smi": { - "name": "24СМИ", + "name": "24SMI", "categoryId": 8, "url": "https://24smi.org/", - "companyId": null + "companyId": "24smi", + "source": "AdGuard" }, "2leep": { "name": "2leep", @@ -127,13 +131,15 @@ "name": "4Chan", "categoryId": 8, "url": "https://www.4chan.org/", - "companyId": null + "companyId": "4chan", + "source": "AdGuard" }, "4finance_com": { - "name": "4finance.com", + "name": "4finance", "categoryId": 2, - "url": "http://4finance.com/", - "companyId": null + "url": "https://4finance.com/", + "companyId": "4finance", + "source": "AdGuard" }, "4w_marketplace": { "name": "4w Marketplace", @@ -179,10 +185,11 @@ "source": "AdGuard" }, "7tv.de": { - "name": "7tv.de", + "name": "7tv.app", "categoryId": 0, - "url": "https://www.7tv.de/", - "companyId": null + "url": "https://www.7tv.app/", + "companyId": "7tv", + "source": "AdGuard" }, "888media": { "name": "888media", @@ -2554,7 +2561,7 @@ "name": "Microsoft App Center", "categoryId": 5, "url": "https://appcenter.ms/", - "companyId": null, + "companyId": "microsoft", "source": "AdGuard" }, "appcues": { @@ -3925,7 +3932,7 @@ "name": "Button", "categoryId": 4, "url": "https://www.usebutton.com/", - "companyId": null, + "companyId": "button", "source": "AdGuard" }, "buysellads": { @@ -5276,7 +5283,7 @@ "name": "Crashlytics", "categoryId": 101, "url": "https://crashlytics.com/", - "companyId": null, + "companyId": "google", "source": "AdGuard" }, "crazy_egg": { @@ -6427,6 +6434,13 @@ "url": "http://www.amazon.com/", "companyId": "amazon_associates" }, + "electronic_arts": { + "name": "Electronic Arts", + "categoryId": 2, + "url": "https://www.ea.com/", + "companyId": "electronic_arts", + "source": "AdGuard" + }, "element": { "name": "Element", "categoryId": 7, @@ -7014,6 +7028,13 @@ "url": null, "companyId": null }, + "farlight_pte_ltd": { + "name": "Farlight Pte Ltd.", + "categoryId": 8, + "url": "https://farlightgames.com/", + "companyId": "farlight", + "source": "AdGuard" + }, "fastly_insights": { "name": "Fastly Insights", "categoryId": 6, @@ -8655,7 +8676,7 @@ "name": "HockeyApp", "categoryId": 101, "url": "https://hockeyapp.net/", - "companyId": null, + "companyId": "microsoft", "source": "AdGuard" }, "hoholikik.club": { @@ -16729,6 +16750,13 @@ "url": "http://www.sundaysky.com/", "companyId": "sundaysky" }, + "supercell": { + "name": "Supercell", + "categoryId": 2, + "url": "https://supercell.com/", + "companyId": "supercell", + "source": "AdGuard" + }, "supercounters": { "name": "SuperCounters", "categoryId": 6, @@ -19318,10 +19346,11 @@ "companyId": "xapads" }, "xen-media.com": { - "name": "xen-media.com", + "name": "Xen Media", "categoryId": 11, - "url": null, - "companyId": null + "url": "https://www.xenmedia.net/", + "companyId": "xenmedia", + "source": "AdGuard" }, "xfreeservice.com": { "name": "xfreeservice.com", @@ -19332,8 +19361,9 @@ "xhamster": { "name": "xHamster", "categoryId": 3, - "url": null, - "companyId": null + "url": "https://xhamster.com/", + "companyId": "xhamster", + "source": "AdGuard" }, "xing": { "name": "Xing", @@ -19348,10 +19378,11 @@ "companyId": "exoclick" }, "xnxx_cdn": { - "name": "xnxx CDN", + "name": "XNXX", "categoryId": 9, "url": "https://www.xnxx.com", - "companyId": null + "companyId": "xnxx", + "source": "AdGuard" }, "xplosion": { "name": "xplosion", @@ -19366,16 +19397,18 @@ "companyId": "matomy_media" }, "xvideos_com": { - "name": "xvideos.com", + "name": "Xvideos", "categoryId": 8, - "url": null, - "companyId": null + "url": "https://www.xvideos.com", + "companyId": "xvideos", + "source": "AdGuard" }, "xxxlshop.de": { - "name": "xxxlshop.de", + "name": "XXXLutz", "categoryId": 8, - "url": "https://www.xxxlshop.de/", - "companyId": null + "url": "https://www.xxxlutz.de/", + "companyId": "xxxlutz", + "source": "AdGuard" }, "xxxlutz": { "name": "XXXLutz", @@ -19387,7 +19420,8 @@ "name": "Yabbi", "categoryId": 4, "url": "https://yabbi.me/", - "companyId": null + "companyId": "yabbi", + "source": "AdGuard" }, "yabuka": { "name": "Yabuka", @@ -19649,10 +19683,11 @@ "companyId": "yomedia" }, "yoochoose.net": { - "name": "YOOCHOOSE", + "name": "Ibexa Personalizaton Software", "categoryId": 4, - "url": "https://yoochoose.com/", - "companyId": null + "url": "https://yoochoose.net/", + "companyId": "ibexa", + "source": "AdGuard" }, "yotpo": { "name": "Yotpo", @@ -19687,8 +19722,9 @@ "youporn": { "name": "YouPorn", "categoryId": 3, - "url": null, - "companyId": null + "url": "https://www.youporn.com/", + "companyId": "youporn", + "source": "AdGuard" }, "youtube": { "name": "YouTube", @@ -19826,7 +19862,8 @@ "name": "ZeusClicks", "categoryId": 4, "url": "http://zeusclicks.com/", - "companyId": null + "companyId": "zeusclicks", + "source": "AdGuard" }, "ziff_davis": { "name": "Ziff Davis", @@ -19844,7 +19881,8 @@ "name": "Zimbio", "categoryId": 8, "url": "http://www.zimbio.com/", - "companyId": null + "companyId": "livinglymedia", + "source": "AdGuard" }, "zippyshare_widget": { "name": "Zippyshare Widget", @@ -21450,6 +21488,9 @@ "ekomi.de": "ekomi", "elasticad.net": "elastic_ad", "elasticbeanstalk.com": "elastic_beanstalk", + "cloudcell.com": "electronic_arts", + "ea.com": "electronic_arts", + "eamobile.com": "electronic_arts", "element.io": "element", "riot.im": "element", "elicitapp.com": "elicit", @@ -21570,6 +21611,7 @@ "thefancy.com": "fancy_widget", "d1q7pknmpq2wkm.cloudfront.net": "fanplayr", "fap.to": "fap.to", + "farlightgames.com": "farlight_pte_ltd", "fastly-insights.com": "fastly_insights", "fastly.net": "fastlylb.net", "fastlylb.net": "fastlylb.net", @@ -24146,6 +24188,8 @@ "sumo.com": "sumome", "sumome.com": "sumome", "sundaysky.com": "sundaysky", + "supercell.com": "supercell", + "supercellsupport.com": "supercell", "supercounters.com": "supercounters", "superfastcdn.com": "superfastcdn.com", "socdm.com": "supership", diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go index 305baa52..246b2bc3 100644 --- a/internal/filtering/servicelist.go +++ b/internal/filtering/servicelist.go @@ -253,6 +253,30 @@ var blockedServices = []blockedService{{ "||z.cn^", "||zappos^", }, +}, { + ID: "apple_streaming", + Name: "Apple Streaming", + IconSVG: []byte(""), + Rules: []string{ + "||applemusic.apple^", + "||hls-svod-aoc-ve.itunes.g.aaplimg.com^", + "||itun.es^", + "||itunes.apple.com^", + "||itunes.ca^", + "||itunes.co.th^", + "||itunes.co^", + "||itunes.com^", + "||itunes.es^", + "||itunes.g.aaplimg.com^", + "||itunes.hk^", + "||itunes.mx^", + "||itunes.org^", + "||itunes.us^", + "||music.apple.com^", + "||tv.apple.com^", + "||tv.g.apple.com^", + "||tv.v.aaplimg.com^", + }, }, { ID: "battle_net", Name: "Battle.net", @@ -327,6 +351,34 @@ var blockedServices = []blockedService{{ "||bnet.cn^", "||lizzard.com^", }, +}, { + ID: "claro", + Name: "Claro", + IconSVG: []byte(""), + Rules: []string{ + "||claro.com.ar^", + "||claro.com.br^", + "||claro.com.co^", + "||claro.com.do^", + "||claro.com.ec^", + "||claro.com.gt^", + "||claro.com.hn^", + "||claro.com.ni^", + "||claro.com.pa^", + "||claro.com.pe^", + "||claro.com.py^", + "||claro.com.sv^", + "||claro.com.uy^", + "||claro.com^", + "||claro.cr^", + "||claro.net.br^", + "||claro.net.co^", + "||clarochile.cl^", + "||claromusica.com^", + "||claropr.com^", + "||clarovideo.com^", + "||usclaro.com^", + }, }, { ID: "cloudflare", Name: "CloudFlare", @@ -1505,6 +1557,7 @@ var blockedServices = []blockedService{{ "||aus.social^", "||awscommunity.social^", "||climatejustice.social^", + "||cupoftea.social^", "||cyberplace.social^", "||defcon.social^", "||det.social^", @@ -1595,7 +1648,6 @@ var blockedServices = []blockedService{{ "||toot.io^", "||toot.wales^", "||troet.cafe^", - "||twingyeo.kr^", "||union.place^", "||universeodon.com^", "||urbanists.social^",