From 37736289e2a9fde4cdcedd96c10fcc39edabc2b2 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 13 Feb 2024 18:30:14 +0300 Subject: [PATCH] Pull request 2151: upd-all Squashed commit of the following: commit 3115356ba147778afdda27fa69d1d49287e26ea7 Author: Ainar Garipov Date: Tue Feb 13 18:14:18 2024 +0300 all: upd deps, flts, i18n, svcs, tools --- client/src/__locales/be.json | 3 +++ client/src/__locales/cs.json | 3 +++ client/src/__locales/da.json | 3 +++ client/src/__locales/de.json | 3 +++ client/src/__locales/es.json | 3 +++ client/src/__locales/fa.json | 2 ++ client/src/__locales/fi.json | 5 ++++- client/src/__locales/fr.json | 1 + client/src/__locales/hr.json | 3 +++ client/src/__locales/hu.json | 3 +++ client/src/__locales/id.json | 5 ++++- client/src/__locales/it.json | 1 + client/src/__locales/ja.json | 3 +++ client/src/__locales/ko.json | 3 +++ client/src/__locales/nl.json | 3 +++ client/src/__locales/no.json | 1 + client/src/__locales/pl.json | 3 +++ client/src/__locales/pt-br.json | 3 +++ client/src/__locales/pt-pt.json | 3 +++ client/src/__locales/ro.json | 3 +++ client/src/__locales/ru.json | 3 +++ client/src/__locales/sk.json | 3 +++ client/src/__locales/sl.json | 3 +++ client/src/__locales/sr-cs.json | 3 +++ client/src/__locales/sv.json | 3 +++ client/src/__locales/tr.json | 3 +++ client/src/__locales/uk.json | 3 +++ client/src/__locales/vi.json | 3 +++ client/src/__locales/zh-cn.json | 3 +++ client/src/__locales/zh-tw.json | 3 +++ client/src/helpers/filters/filters.js | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- internal/filtering/servicelist.go | 8 ++++++++ internal/tools/go.mod | 4 ++-- internal/tools/go.sum | 28 +++++++++++++-------------- scripts/make/go-lint.sh | 2 +- 37 files changed, 117 insertions(+), 26 deletions(-) diff --git a/client/src/__locales/be.json b/client/src/__locales/be.json index ad13bfacd70..61af80d8844 100644 --- a/client/src/__locales/be.json +++ b/client/src/__locales/be.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream DNS-серверы абноўлены", "dns_test_ok_toast": "Паказаныя серверы DNS працуюць карэктна", "dns_test_not_ok_toast": "Сервер «{{key}}»: немагчыма выкарыстоўваць, праверце слушнасць напісання", + "dns_test_parsing_error_toast": "Раздзел {{section}}: радок {{line}}: немагчыма выкарыстоўваць, праверце слушнасць напісання", "dns_test_warning_toast": "Upstream «{{key}}» не адказвае на тэставыя запыты і можа не працаваць належным чынам", "unblock": "Адблакаваць", "block": "Заблакаваць", @@ -243,6 +244,7 @@ "allow_this_client": "Дазволіць доступ гэтаму кліенту", "block_for_this_client_only": "Заблакаваць толькі для гэтага кліента", "unblock_for_this_client_only": "Адблакаваць толькі для гэтага кліента", + "add_persistent_client": "Дадаць у захаваныя кліенты", "time_table_header": "Час", "date": "Дата", "domain_name_table_header": "Дамен", @@ -462,6 +464,7 @@ "form_add_id": "Дадаць ідэнтыфікатар", "form_client_name": "Увядзіце імя кліента", "name": "Назва", + "client_name": "Кліент {{id}}", "client_global_settings": "Выкарыстаць глабальныя налады", "client_deleted": "Кліент «{{key}}» паспяхова выдалены", "client_added": "Кліент «{{key}}» паспяхова дададзены", diff --git a/client/src/__locales/cs.json b/client/src/__locales/cs.json index a13d6a488b1..f8f64dcb65b 100644 --- a/client/src/__locales/cs.json +++ b/client/src/__locales/cs.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Odchozí servery byly úspěšně uloženy", "dns_test_ok_toast": "Specifikované DNS servery pracují správně", "dns_test_not_ok_toast": "Server \"{{key}}\": nemohl být použit, zkontrolujte, zda jste ho správně napsali", + "dns_test_parsing_error_toast": "Sekce {{section}}: řádek {{line}}: nelze použít, zkontrolujte prosím, zda jste ho správně napsali", "dns_test_warning_toast": "Upstream \"{{key}}\" neodpovídá na testovací požadavky a nemusí fungovat správně", "unblock": "Odblokovat", "block": "Blokovat", @@ -243,6 +244,7 @@ "allow_this_client": "Povolit tohoto klienta", "block_for_this_client_only": "Blokovat pouze pro tohoto klienta", "unblock_for_this_client_only": "Odblokovat pouze pro tohoto klienta", + "add_persistent_client": "Přidat jako trvalého klienta", "time_table_header": "Čas", "date": "Datum", "domain_name_table_header": "Název domény", @@ -465,6 +467,7 @@ "form_add_id": "Přidat identifikátor", "form_client_name": "Zadejte název klienta", "name": "Název", + "client_name": "Klient {{id}}", "client_global_settings": "Použít globální nastavení", "client_deleted": "Klient \"{{key}}\" byl úspěšně odstraněn", "client_added": "Klient \"{{key}}\" byl úspěšně přidán", diff --git a/client/src/__locales/da.json b/client/src/__locales/da.json index ce34569e701..272ee813363 100644 --- a/client/src/__locales/da.json +++ b/client/src/__locales/da.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream-servere er gemt", "dns_test_ok_toast": "Angivne DNS-servere fungerer korrekt", "dns_test_not_ok_toast": "Server \"{{key}}\": Kunne ikke bruges. Tjek, at du har angivet den korrekt", + "dns_test_parsing_error_toast": "Sektion {{section}}: linje {{line}}: kunne ikke anvendes. Tjek at den er angivet korrekt", "dns_test_warning_toast": "Upstream \"{{key}}\" svarer ikke på testforespørgsler og fungerer muligvis ikke korrekt", "unblock": "Afblokering", "block": "Blokering", @@ -243,6 +244,7 @@ "allow_this_client": "Tillad denne klient", "block_for_this_client_only": "Blokér kun for denne klient", "unblock_for_this_client_only": "Afblokér kun for denne klient", + "add_persistent_client": "Tilføj som vedvarende klient", "time_table_header": "Tid", "date": "Dato", "domain_name_table_header": "Domænenavn", @@ -465,6 +467,7 @@ "form_add_id": "Tilføj identifikator", "form_client_name": "Angiv klientnavn", "name": "Navn", + "client_name": "Klient {{id}}", "client_global_settings": "Brug globale indstillinger", "client_deleted": "Klient \"{{key}}\" slettet", "client_added": "Klient \"{{key}}\" tilføjet", diff --git a/client/src/__locales/de.json b/client/src/__locales/de.json index c0b1b590e98..bdf1da7d784 100644 --- a/client/src/__locales/de.json +++ b/client/src/__locales/de.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream-Server erfolgreich gespeichert", "dns_test_ok_toast": "Angegebene DNS-Server arbeiten ordnungsgemäß", "dns_test_not_ok_toast": "Server „{{key}}“: konnte nicht verwendet werden, bitte überprüfen Sie die korrekte Schreibweise", + "dns_test_parsing_error_toast": "Abschnitt {{section}}: Zeile {{line}}: konnte nicht verwendet werden, bitte überprüfen Sie, ob alles richtig geschrieben ist", "dns_test_warning_toast": "Upstream „{{key}}“ reagiert nicht auf Testanfragen und funktioniert möglicherweise nicht fehlerfrei", "unblock": "Entsperren", "block": "Sperren", @@ -243,6 +244,7 @@ "allow_this_client": "Diesen Client zulassen", "block_for_this_client_only": "Nur für diesen Client sperren", "unblock_for_this_client_only": "Nur für diesen Client freigeben", + "add_persistent_client": "Als dauerhaften Client hinzufügen", "time_table_header": "Zeit", "date": "Datum", "domain_name_table_header": "Domainname", @@ -465,6 +467,7 @@ "form_add_id": "Kennung hinzufügen", "form_client_name": "Clientnamen eingeben", "name": "Name", + "client_name": "Client {{id}}", "client_global_settings": "Allgemeine Einstellungen nutzen", "client_deleted": "Client „{{key}}“ erfolgreich entfernt", "client_added": "Client „{{key}}“ erfolgreich hinzugefügt", diff --git a/client/src/__locales/es.json b/client/src/__locales/es.json index efbd744ccb6..be20a4243ac 100644 --- a/client/src/__locales/es.json +++ b/client/src/__locales/es.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Servidores DNS de subida guardados correctamente", "dns_test_ok_toast": "Los servidores DNS especificados funcionan correctamente", "dns_test_not_ok_toast": "Servidor \"{{key}}\": no se puede utilizar, por favor revisa si lo has escrito correctamente", + "dns_test_parsing_error_toast": "No se pudo utilizar la sección {{section}}: línea {{line}}:, verifica si la escribiste correctamente", "dns_test_warning_toast": "DNS de subida \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente", "unblock": "Desbloquear", "block": "Bloquear", @@ -243,6 +244,7 @@ "allow_this_client": "Permitir a este cliente", "block_for_this_client_only": "Bloquear solo para este cliente", "unblock_for_this_client_only": "Desbloquear solo para este cliente", + "add_persistent_client": "Añadir como cliente persistente", "time_table_header": "Hora", "date": "Fecha", "domain_name_table_header": "Nombre del dominio", @@ -465,6 +467,7 @@ "form_add_id": "Añadir identificador", "form_client_name": "Ingresa el nombre del cliente", "name": "Nombre", + "client_name": "Cliente {{id}}", "client_global_settings": "Usar configuración global", "client_deleted": "Cliente \"{{key}}\" eliminado correctamente", "client_added": "Cliente \"{{key}}\" añadido correctamente", diff --git a/client/src/__locales/fa.json b/client/src/__locales/fa.json index 907b95cfdf0..a9e41b1efe0 100644 --- a/client/src/__locales/fa.json +++ b/client/src/__locales/fa.json @@ -220,6 +220,7 @@ "updated_upstream_dns_toast": "سرورهای DNS جریان ارسالی بروز رسانی شده است", "dns_test_ok_toast": "سرورهای DNS تعیین شده بدرستی کار می کنند", "dns_test_not_ok_toast": "سرور \"{{key}}\": نمیتواند مورد استفاده قرار گیرد،لطفا بررسی کنید آن را بدرستی نوشته اید", + "dns_test_parsing_error_toast": "بخش {{section}}: خط {{line}}: نمیتواند مورد استفاده قرار گیرد،لطفا بررسی کنید آن را بدرستی نوشته اید", "unblock": "رفع انسداد", "block": "مسدود کردن", "disallow_this_client": "این مشتری را رد کنید", @@ -420,6 +421,7 @@ "form_add_id": "افزودن احرازکننده", "form_client_name": "نام کلاینت را وارد کنید", "name": "نام", + "client_name": "مشتری {{id}}", "client_global_settings": "استفاده از تنظیمات سراسری", "client_deleted": "کلاینت \"{{key}}\" را با موفقیت حذف کرد", "client_added": "کلاینت \"{{key}}\" را با موفقیت اضافه کرد", diff --git a/client/src/__locales/fi.json b/client/src/__locales/fi.json index 6cecca15168..07db2ab09eb 100644 --- a/client/src/__locales/fi.json +++ b/client/src/__locales/fi.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Ylävirtapalvelimet tallennettiin", "dns_test_ok_toast": "Määritetyt DNS-palvelimet toimivat oikein", "dns_test_not_ok_toast": "Palvelin \"{{key}}\": Ei voitu käyttää, tarkista oikeinkirjoitus", + "dns_test_parsing_error_toast": "Osio {{section}}: rivi {{line}}: Ei voitu käyttää, tarkista oikeinkirjoitus", "dns_test_warning_toast": "Datavuon \"{{key}}\" ei vastaa testipyyntöihin eikä välttämättä toimi kunnolla", "unblock": "Salli", "block": "Estä", @@ -243,6 +244,7 @@ "allow_this_client": "Salli tämä päätelaite", "block_for_this_client_only": "Estä vain tältä päätelaitteelta", "unblock_for_this_client_only": "Salli vain tälle päätelaitteelle", + "add_persistent_client": "Lisää pysyvänä päätelaitteena", "time_table_header": "Aika", "date": "Päiväys", "domain_name_table_header": "Verkkotunnus", @@ -446,7 +448,7 @@ "manual_update": "Seuraa näitä ohjeita päivittääksesi manuaalisesti.", "processing_update": "Odota kun AdGuard Home päivittyy", "clients_title": "Pysyvät päätelaitteet", - "clients_desc": "Määritä pysyvät AdGuard Homeen yhdistetyt päätelaitetiedot.", + "clients_desc": "Määritä AdGuard Homeen pysyvästi yhdistettyjen päätelaitteiden tiedot.", "settings_global": "Yleinen", "settings_custom": "Mukautettu", "table_client": "Asiakas", @@ -465,6 +467,7 @@ "form_add_id": "Lisää tunniste", "form_client_name": "Syötä päätelaitteen nimi", "name": "Nimi", + "client_name": "Päätelaite {{id}}", "client_global_settings": "Käytä yleisiä asetuksia", "client_deleted": "Päätelaite \"{{key}}\" poistettiin", "client_added": "Päätelaite \"{{key}}\" lisättiin", diff --git a/client/src/__locales/fr.json b/client/src/__locales/fr.json index a7766cb911c..6479953ca7d 100644 --- a/client/src/__locales/fr.json +++ b/client/src/__locales/fr.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Serveurs en amont enregistrés", "dns_test_ok_toast": "Les serveurs DNS spécifiés fonctionnent correctement", "dns_test_not_ok_toast": "Impossible d'utiliser le serveur « {{key}} »: veuillez vérifier si le nom saisi est bien correct", + "dns_test_parsing_error_toast": "La section {{section}}: ligne {{line}}: n'a pas pu être utilisée, veuillez vérifier que vous l'avez écrite correctement", "dns_test_warning_toast": "L'amont « {{key}} » ne répond pas aux demandes de test et peut ne pas fonctionner correctement", "unblock": "Débloquer", "block": "Bloquer", diff --git a/client/src/__locales/hr.json b/client/src/__locales/hr.json index 7fe2c68a126..c29167cf33c 100644 --- a/client/src/__locales/hr.json +++ b/client/src/__locales/hr.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Uzvodni poslužitelji uspješno su spremljeni", "dns_test_ok_toast": "Odabrani DNS poslužitelji su trenutno aktivni", "dns_test_not_ok_toast": "\"{{key}}\" poslužitelja: ne može se upotrijebiti, provjerite jeste li to ispravno napisali", + "dns_test_parsing_error_toast": "Odjeljak {{section}}: redak {{line}}: nije moguće koristiti, provjerite jeste li ispravno napisali", "dns_test_warning_toast": "Upstream \"{{key}}\" ne odgovara na zahtjeve za testiranje i možda neće raditi ispravno", "unblock": "Odblokiraj", "block": "Blokiraj", @@ -243,6 +244,7 @@ "allow_this_client": "Omogući ovog klijenta", "block_for_this_client_only": "Blokiraj samo za ovog klijenta", "unblock_for_this_client_only": "Odblokiraj samo za ovog klijenta", + "add_persistent_client": "Dodaj u spremljene klijente", "time_table_header": "Vrijeme", "date": "Datum", "domain_name_table_header": "Naziv domene", @@ -462,6 +464,7 @@ "form_add_id": "Dodaj identifikator", "form_client_name": "Unesite naziv klijenta", "name": "Naziv", + "client_name": "Klijent {{id}}", "client_global_settings": "Koristi globalne postavke", "client_deleted": "Klijent \"{{key}}\" je uspješno uklonjen", "client_added": "Klijent \"{{key}}\" je uspješno dodan", diff --git a/client/src/__locales/hu.json b/client/src/__locales/hu.json index 40bf85122ef..7c94437ed54 100644 --- a/client/src/__locales/hu.json +++ b/client/src/__locales/hu.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream szerverek sikeresen mentve", "dns_test_ok_toast": "A megadott DNS-kiszolgálók megfelelően működnek", "dns_test_not_ok_toast": "Szerver \"{{key}}\": nem használható, ellenőrizze, hogy helyesen írta-e be", + "dns_test_parsing_error_toast": "Szekció {{section}}: sor {{line}}: nem használható, ellenőrizze, hogy helyesen írta-e be", "dns_test_warning_toast": "A \"{{key}}\" feltöltés nem válaszol a tesztkérelmekre, és lehet, hogy nem működik megfelelően", "unblock": "Feloldás", "block": "Blokkolás", @@ -243,6 +244,7 @@ "allow_this_client": "Engedélyezés ennek a kliensnek", "block_for_this_client_only": "Tiltás csak ennek a kliensnek", "unblock_for_this_client_only": "Feloldás csak ennek a kliensnek", + "add_persistent_client": "Hozzáadás állandó ügyfélként", "time_table_header": "Idő", "date": "Dátum", "domain_name_table_header": "Domain név", @@ -462,6 +464,7 @@ "form_add_id": "Azonosító hozzáadása", "form_client_name": "Adja meg a kliens nevét", "name": "Név", + "client_name": "Ügyfél {{id}}", "client_global_settings": "Globális beállítások használata", "client_deleted": "A(z) \"{{key}}\" kliens sikeresen el lett távolítva", "client_added": "A(z) \"{{key}}\" kliens sikeresen hozzá lett adva", diff --git a/client/src/__locales/id.json b/client/src/__locales/id.json index 960df7ee8d1..e8986dd9f16 100644 --- a/client/src/__locales/id.json +++ b/client/src/__locales/id.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Server upstream berhasil disimpan", "dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar", "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar", + "dns_test_parsing_error_toast": "Bagian {{section}}: baris {{line}}: tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar", "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik", "unblock": "Buka Blokir", "block": "Blok", @@ -243,6 +244,7 @@ "allow_this_client": "Ijinkan klien ini", "block_for_this_client_only": "Blok hanya untuk klien ini", "unblock_for_this_client_only": "Jangan diblok hanya untuk klien ini", + "add_persistent_client": "Tambahkan sebagai klien persisten", "time_table_header": "Waktu", "date": "Tanggal", "domain_name_table_header": "Nama domain", @@ -442,7 +444,7 @@ "fix": "Perbaiki", "dns_providers": "Berikut adalah <0>daftar penyedia DNS yang dikenal untuk dipilih.", "update_now": "Perbarui sekarang", - "update_failed": "Pembaruan otomatis gagal. Silahkan ikuti petunjuk ini untuk perbarui secara manual.", + "update_failed": "Pembaruan otomatis gagal. Silakan ikuti langkah-langkah berikut untuk memperbarui secara manual.", "manual_update": "Silakan mengikuti langkah berikut untuk memperbarui secara manual.", "processing_update": "Silahkan tunggu, AdGuard Home sedang diperbarui", "clients_title": "Klien yang gigih", @@ -465,6 +467,7 @@ "form_add_id": "Tambahkan pengenal", "form_client_name": "Masukkan nama klien", "name": "Nama", + "client_name": "Klien {{id}}", "client_global_settings": "Gunakan pengaturan global", "client_deleted": "Klien \"{{key}}\" berhasil dihapus", "client_added": "Klien \"{{key}}\" berhasil ditambahkan", diff --git a/client/src/__locales/it.json b/client/src/__locales/it.json index a29004af5ba..72fda5e86f5 100644 --- a/client/src/__locales/it.json +++ b/client/src/__locales/it.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "I server upstream sono stati salvati correttamente", "dns_test_ok_toast": "I server DNS specificati funzionano correttamente", "dns_test_not_ok_toast": "Server \"{{key}}\": non può essere utilizzato, assicurati di averlo digitato correttamente", + "dns_test_parsing_error_toast": "Sezione {{section}}: riga {{line}}: non può essere usata, controlla se l'hai scritta correttamente", "dns_test_warning_toast": "Upstream \"{{key}}\" non risponde alle richieste di test e potrebbe non funzionare correttamente", "unblock": "Sblocca", "block": "Blocca", diff --git a/client/src/__locales/ja.json b/client/src/__locales/ja.json index 3e0521ece96..06cbc108703 100644 --- a/client/src/__locales/ja.json +++ b/client/src/__locales/ja.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "アップストリームサーバーを保存しました。", "dns_test_ok_toast": "指定されたDNSサーバは正しく動作しています", "dns_test_not_ok_toast": "サーバ \"{{key}}\": 使用できませんでした。正しく入力されているかどうかを確認してください", + "dns_test_parsing_error_toast": "セクション {{section}}: 行 {{line}}: を使用できませんでした。正しく記述されているか確認してください", "dns_test_warning_toast": "アップストリーム\"{{key}}\"はテストリクエストに応答せず、正しく動作しない可能性があります。", "unblock": "ブロック解除", "block": "ブロック", @@ -243,6 +244,7 @@ "allow_this_client": "このクライアントを許可する", "block_for_this_client_only": "このクライアントに対してのみブロックする", "unblock_for_this_client_only": "このクライアントに対してのみブロックを解除する", + "add_persistent_client": "永続クライアントとして追加する", "time_table_header": "時刻", "date": "購入日時", "domain_name_table_header": "ドメイン名", @@ -465,6 +467,7 @@ "form_add_id": "識別子を追加する", "form_client_name": "クライアント名を入力してください", "name": "名前", + "client_name": "クライアント {{id}}", "client_global_settings": "グローバル設定を使用する", "client_deleted": "クライアント \"{{key}}\" の削除に成功しました", "client_added": "クライアント \"{{key}}\" の追加に成功しました", diff --git a/client/src/__locales/ko.json b/client/src/__locales/ko.json index 7ce4ad02cd1..bbab696a224 100644 --- a/client/src/__locales/ko.json +++ b/client/src/__locales/ko.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "업스트림 서버가 성공적으로 저장되었습니다", "dns_test_ok_toast": "지정된 DNS 서버가 올바르게 작동하고 있습니다.", "dns_test_not_ok_toast": "서버 '{{key}}': 사용할 수 없습니다, 제대로 작성했는지 확인하세요", + "dns_test_parsing_error_toast": "섹션 {{section}}: 줄 {{line}}: 사용할 수 없으며, 올바르게 작성했는지 확인하세요.", "dns_test_warning_toast": "업스트림 '{{key}}'이(가) 테스트 요청에 응답하지 않으며 제대로 작동하지 않을 수 있습니다", "unblock": "차단 해제", "block": "차단", @@ -243,6 +244,7 @@ "allow_this_client": "클라이언트 허용", "block_for_this_client_only": "이 클라이언트에 대해서만 차단", "unblock_for_this_client_only": "이 클라이언트에 대해서만 차단 해제", + "add_persistent_client": "저장된 클라이언트에 추가", "time_table_header": "시간", "date": "날짜", "domain_name_table_header": "도메인명", @@ -465,6 +467,7 @@ "form_add_id": "식별자 추가", "form_client_name": "클라이언트 이름 입력", "name": "이름", + "client_name": "클라이언트 {{id}}", "client_global_settings": "글로벌 설정 사용", "client_deleted": "클라이언트 '{{key}}'이(가) 정상적으로 삭제되었습니다", "client_added": "클라이언트 '{{key}}'이(가) 정상적으로 추가되었습니다", diff --git a/client/src/__locales/nl.json b/client/src/__locales/nl.json index 5e545f98a67..2ff6c7527aa 100644 --- a/client/src/__locales/nl.json +++ b/client/src/__locales/nl.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen", "dns_test_ok_toast": "Opgegeven DNS-servers werken correct", "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven", + "dns_test_parsing_error_toast": "Sectie {{section}}: regel {{line}}: kan niet worden gebruikt. Controleer of je het correct hebt geschreven", "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed", "unblock": "Deblokkeren", "block": "Blokkeren", @@ -243,6 +244,7 @@ "allow_this_client": "Toepassing/systeem toelaten", "block_for_this_client_only": "Alleen voor deze cliënt blokkeren", "unblock_for_this_client_only": "Alleen voor deze cliënt deblokkeren", + "add_persistent_client": "Toevoegen als permanente client", "time_table_header": "Tijd", "date": "Datum", "domain_name_table_header": "Domein naam", @@ -465,6 +467,7 @@ "form_add_id": "ID toevoegen", "form_client_name": "Vul gebruikersnaam in", "name": "Naam", + "client_name": "Client {{id}}", "client_global_settings": "Gebruik globale instelling", "client_deleted": "Gebruiker \"{{key}}\" met succes verwijderd", "client_added": "Gebruiker \"{{key}}\" met succes toegevoegd", diff --git a/client/src/__locales/no.json b/client/src/__locales/no.json index 0d9a5d39111..8708e4d8da7 100644 --- a/client/src/__locales/no.json +++ b/client/src/__locales/no.json @@ -212,6 +212,7 @@ "updated_upstream_dns_toast": "Oppdaterte oppstrøms-DNS-tjenerne", "dns_test_ok_toast": "De spesifiserte DNS-tjenerne fungerer riktig", "dns_test_not_ok_toast": "Tjeneren «{{key}}» kunne ikke brukes, vennligst dobbeltsjekk at du har skrevet den riktig", + "dns_test_parsing_error_toast": "Seksjon {{section}}: linje {{line}}: kunne ikke brukes, vennligst sjekk at du har skrevet det riktig", "unblock": "Tillat", "block": "Blokker", "disallow_this_client": "Ikke tillat denne klienten", diff --git a/client/src/__locales/pl.json b/client/src/__locales/pl.json index d657eb06c69..e02d771e577 100644 --- a/client/src/__locales/pl.json +++ b/client/src/__locales/pl.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Serwery nadrzędne zostały pomyślnie zapisane", "dns_test_ok_toast": "Określone serwery DNS działają poprawnie", "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie może być użyte, sprawdź, czy zapisano go poprawnie", + "dns_test_parsing_error_toast": "Sekcja {{section}}: linia {{line}}: nie może być użyte, sprawdź, czy zapisano go poprawnie", "dns_test_warning_toast": "Upstream \"{{key}}\" nie odpowiada na zapytania testowe i może nie działać prawidłowo", "unblock": "Odblokuj", "block": "Zablokuj", @@ -243,6 +244,7 @@ "allow_this_client": "Pozwól temu klientowi", "block_for_this_client_only": "Zablokuj tylko tego klienta", "unblock_for_this_client_only": "Odblokuj tylko tego klienta", + "add_persistent_client": "Dodaj do zapisanych klientów", "time_table_header": "Czas", "date": "Data", "domain_name_table_header": "Nazwa domeny", @@ -462,6 +464,7 @@ "form_add_id": "Dodaj identyfikator", "form_client_name": "Wpisz nazwę klienta", "name": "Nazwa", + "client_name": "Klient {{id}}", "client_global_settings": "Użyj ustawień globalnych", "client_deleted": "Klient \"{{key}}\" został pomyślnie usunięty", "client_added": "Klient \"{{key}}\" został pomyślnie dodany", diff --git a/client/src/__locales/pt-br.json b/client/src/__locales/pt-br.json index 5541d5a3626..caf1be0a126 100644 --- a/client/src/__locales/pt-br.json +++ b/client/src/__locales/pt-br.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Servidores DNS primário salvos com sucesso", "dns_test_ok_toast": "Os servidores DNS especificados estão funcionando corretamente", "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se você escreveu corretamente", + "dns_test_parsing_error_toast": "A seção {{section}}: linha {{line}}: não pôde ser usada. Verifique se foi escrita corretamente", "dns_test_warning_toast": "Servidor DNS primário \"{{key}}\" não responde aos Solicitações de teste e pode não funcionar corretamente", "unblock": "Desbloquear", "block": "Bloquear", @@ -243,6 +244,7 @@ "allow_this_client": "Permitir este cliente", "block_for_this_client_only": "Bloquear apenas para este cliente", "unblock_for_this_client_only": "Desbloquear apenas para este cliente", + "add_persistent_client": "Adicionar como cliente persistente", "time_table_header": "Data", "date": "Data", "domain_name_table_header": "Nome de domínio", @@ -465,6 +467,7 @@ "form_add_id": "Adicionar identificador", "form_client_name": "Digite o nome do cliente", "name": "Nome", + "client_name": "Cliente {{id}}", "client_global_settings": "Usar configurações global", "client_deleted": "Cliente \"{{key}}\" excluído com sucesso", "client_added": "Cliente \"{{key}}\" adicionado com sucesso", diff --git a/client/src/__locales/pt-pt.json b/client/src/__locales/pt-pt.json index 138143cdfba..fe5d1263cef 100644 --- a/client/src/__locales/pt-pt.json +++ b/client/src/__locales/pt-pt.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Servidores DNS primário guardados com sucesso", "dns_test_ok_toast": "Os servidores DNS especificados estão a funcionar corretamente", "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se o escreveu corretamente", + "dns_test_parsing_error_toast": "A seção {{section}}: linha {{line}}: não pôde ser usada. Verifique se foi escrita corretamente", "dns_test_warning_toast": "Servidor DNS primário \"{{key}}\" não responde aos solicitações de teste e pode não funcionar corretamente", "unblock": "Desbloquear", "block": "Bloquear", @@ -243,6 +244,7 @@ "allow_this_client": "Permitir este cliente", "block_for_this_client_only": "Bloquear apenas para este cliente", "unblock_for_this_client_only": "Desbloquear apenas para este cliente", + "add_persistent_client": "Adicionar como cliente persistente", "time_table_header": "Data", "date": "Data", "domain_name_table_header": "Nome do domínio", @@ -465,6 +467,7 @@ "form_add_id": "Adicionar identificador", "form_client_name": "Insira o nome do cliente", "name": "Nome", + "client_name": "Cliente {{id}}", "client_global_settings": "Usar definições globais", "client_deleted": "Cliente \"{{key}}\" excluído com sucesso", "client_added": "Cliente \"{{key}}\" adicionado com sucesso", diff --git a/client/src/__locales/ro.json b/client/src/__locales/ro.json index 03331064377..7ec981a7786 100644 --- a/client/src/__locales/ro.json +++ b/client/src/__locales/ro.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Serverele din amonte au fost salvate cu succes", "dns_test_ok_toast": "Serverele DNS specificate funcționează corect", "dns_test_not_ok_toast": "Serverul \"{{key}}\": nu a putut fi utilizat, verificați dacă l-ați scris corect", + "dns_test_parsing_error_toast": "Secțiune {{section}}: linie {{line}}: nu a putut fi folosit, vă rugăm să verificați dacă l-ați scris corect", "dns_test_warning_toast": "„{{key}}” în amonte nu răspunde la solicitările de testare și s-ar putea să nu funcționeze corect", "unblock": "Deblocați", "block": "Blocați", @@ -243,6 +244,7 @@ "allow_this_client": "Permiteți acest client", "block_for_this_client_only": "Blocați numai pentru acest client", "unblock_for_this_client_only": "Deblocați numai pentru acest client", + "add_persistent_client": "Adăugați ca client persistent", "time_table_header": "Ora", "date": "Data", "domain_name_table_header": "Nume domeniu", @@ -462,6 +464,7 @@ "form_add_id": "Adăugați identificator", "form_client_name": "Introduceți nume client", "name": "Nume", + "client_name": "Client {{id}}", "client_global_settings": "Folosiți setări globale", "client_deleted": "Clientul \"{{key}}\" a fost șters cu succes", "client_added": "Clientul \"{{key}}\" a fost adăugat cu succes", diff --git a/client/src/__locales/ru.json b/client/src/__locales/ru.json index 9e4be5360e2..ba9dee82ebf 100644 --- a/client/src/__locales/ru.json +++ b/client/src/__locales/ru.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "DNS-серверы успешно обновлены", "dns_test_ok_toast": "Указанные серверы DNS работают корректно", "dns_test_not_ok_toast": "Сервер «{{key}}»: невозможно использовать, проверьте правильность написания", + "dns_test_parsing_error_toast": "Раздел {{section}}: строка {{line}}: невозможно использовать, проверьте правильность написания", "dns_test_warning_toast": "Upstream «{{key}}» не отвечает на тестовые запросы и может работать некорректно", "unblock": "Разблокировать", "block": "Заблокировать", @@ -243,6 +244,7 @@ "allow_this_client": "Разрешить доступ клиенту", "block_for_this_client_only": "Заблокировать только для этого клиента", "unblock_for_this_client_only": "Разблокировать только для этого клиента", + "add_persistent_client": "Добавить в сохранённые клиенты", "time_table_header": "Время", "date": "Дата", "domain_name_table_header": "Домен", @@ -465,6 +467,7 @@ "form_add_id": "Добавить идентификатор", "form_client_name": "Введите имя клиента", "name": "Имя", + "client_name": "Клиент {{id}}", "client_global_settings": "Использовать глобальные настройки", "client_deleted": "Клиент «{{key}}» успешно удалён", "client_added": "Клиент «{{key}}» успешно добавлен", diff --git a/client/src/__locales/sk.json b/client/src/__locales/sk.json index fb573726420..be043bfee08 100644 --- a/client/src/__locales/sk.json +++ b/client/src/__locales/sk.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream servery boli úspešne uložené", "dns_test_ok_toast": "Špecifikované DNS servery pracujú korektne", "dns_test_not_ok_toast": "Server \"{{key}}\": nemohol byť použitý, skontrolujte, či ste ho správne napísali", + "dns_test_parsing_error_toast": "Sekcia {{section}}: riadok {{line}}: nepodarilo sa použiť, skontrolujte, či ste ho napísali správne", "dns_test_warning_toast": "Upstream \"{{key}}\" neodpovedá na testovacie dopyty a nemusí fungovať správne", "unblock": "Odblokovať", "block": "Blokovať", @@ -243,6 +244,7 @@ "allow_this_client": "Povoliť tohto klienta", "block_for_this_client_only": "Blokovať len pre tohto klienta", "unblock_for_this_client_only": "Odblokovať len pre tohto klienta", + "add_persistent_client": "Pridať ako trvalého klienta", "time_table_header": "Čas", "date": "Dátum", "domain_name_table_header": "Meno domény", @@ -465,6 +467,7 @@ "form_add_id": "Pridajte identifikátor", "form_client_name": "Zadajte meno klienta", "name": "Meno", + "client_name": "Klient {{id}}", "client_global_settings": "Použiť globálne nastavenia", "client_deleted": "\"{{key}}\" klienta bol úspešne vymazaný", "client_added": "\"{{key}}\" klienta bol úspešne pridaný", diff --git a/client/src/__locales/sl.json b/client/src/__locales/sl.json index 4621e04be3a..99be87c67cb 100644 --- a/client/src/__locales/sl.json +++ b/client/src/__locales/sl.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Gorvodni trežniki so uspešno shranjeni", "dns_test_ok_toast": "Navedeni strežniki DNS delujejo pravilno", "dns_test_not_ok_toast": "Ni mogoče uporabiti: strežnika \"{{key}}\". Preverite, ali ste ga pravilno napisali", + "dns_test_parsing_error_toast": "Razdelek {{section}}: vrstica {{line}}: ni bilo mogoče uporabiti, preverite, ali ste ga pravilno zapisali", "dns_test_warning_toast": "Upstream \"{{key}}\" se ne odziva na testne zahteve in morda ne deluje pravilno", "unblock": "Omogoči", "block": "Onemogoči", @@ -243,6 +244,7 @@ "allow_this_client": "Dovoli tega odjemalca", "block_for_this_client_only": "Onemogoči samo za tega odjemalca", "unblock_for_this_client_only": "Omogoči samo za tega odjemalca", + "add_persistent_client": "Dodaj kot vztrajnega odjemalca", "time_table_header": "Čas", "date": "Datum", "domain_name_table_header": "Ime domene", @@ -465,6 +467,7 @@ "form_add_id": "Dodaj identifikatorja", "form_client_name": "Vnesite ime odjemalca", "name": "Ime", + "client_name": "Odjemalec {{id}}", "client_global_settings": "Uporabi splošne nastavitve", "client_deleted": "Odjemalec \"{{key}}\" je bil uspešno izbrisan", "client_added": "Odjemalec \"{{key}}\" je bil uspešno dodan", diff --git a/client/src/__locales/sr-cs.json b/client/src/__locales/sr-cs.json index 583822e78d3..312451be580 100644 --- a/client/src/__locales/sr-cs.json +++ b/client/src/__locales/sr-cs.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Upstream serveri su uspešno sačuvani", "dns_test_ok_toast": "Dati DNS serveri rade ispravno", "dns_test_not_ok_toast": "Server \"{{key}}\": se ne može koristiti. Proverite da li ste ga ispravno uneli", + "dns_test_parsing_error_toast": "Odeljak {{section}}: linija {{line}}: ne može se koristiti, molimo proverite da li ste ga ispravno napisali", "dns_test_warning_toast": "Apstrim \"{{key}}\" ne odgovara na zahteve za testiranje i možda neće raditi kako treba", "unblock": "Odblokiraj", "block": "Blokiraj", @@ -243,6 +244,7 @@ "allow_this_client": "Dozvoli ovaj klijent", "block_for_this_client_only": "Blokiraj samo za ovaj klijent", "unblock_for_this_client_only": "Odblokiraj samo za ovaj klijent", + "add_persistent_client": "Dodati u sačuvane klijente", "time_table_header": "Vreme", "date": "Datum", "domain_name_table_header": "Ime domena", @@ -462,6 +464,7 @@ "form_add_id": "Dodaj identifikator", "form_client_name": "Unesite ime klijenta", "name": "Ime", + "client_name": "Klijent {{id}}", "client_global_settings": "Koristi globalne postavke", "client_deleted": "Klijent \"{{key}}\" uspešno izbrisan", "client_added": "Klijent \"{{key}}\" uspešno dodat", diff --git a/client/src/__locales/sv.json b/client/src/__locales/sv.json index a1a11a6f18c..8d5dbb5d1aa 100644 --- a/client/src/__locales/sv.json +++ b/client/src/__locales/sv.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Sparade uppströms dns-servrar", "dns_test_ok_toast": "Angivna DNS servrar fungerar korrekt", "dns_test_not_ok_toast": "Server \"{{key}}\": kunde inte användas. Var snäll och kolla att du skrivit in rätt", + "dns_test_parsing_error_toast": "Avsnitt {{section}}: rad {{line}}: kunde inte användas, kontrollera att du har skrivit det korrekt", "dns_test_warning_toast": "Uppströms \"{{key}}\" svarar inte på testförfrågningar och kanske inte fungerar korrekt", "unblock": "Avblockera", "block": "Blockera", @@ -243,6 +244,7 @@ "allow_this_client": "Tillåt den här klienten", "block_for_this_client_only": "Blockera endast för denna klient", "unblock_for_this_client_only": "Avblockera endast för denna klient", + "add_persistent_client": "Lägg till som beständig klient", "time_table_header": "Tid", "date": "Datum", "domain_name_table_header": "Domännamn", @@ -461,6 +463,7 @@ "form_add_id": "Lägg till identifierare", "form_client_name": "Skriv in klientnamn", "name": "Namn", + "client_name": "Klient {{id}}", "client_global_settings": "Använda globala inställningar", "client_deleted": "Klient \"{{key}}\" har raderats", "client_added": "Klient \"{{key}}\" har lagts till", diff --git a/client/src/__locales/tr.json b/client/src/__locales/tr.json index b3ce3ba6bca..e43cb20edec 100644 --- a/client/src/__locales/tr.json +++ b/client/src/__locales/tr.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Üst sunucular başarıyla kaydedildi", "dns_test_ok_toast": "Belirtilen DNS sunucuları düzgün çalışıyor", "dns_test_not_ok_toast": "Sunucu \"{{key}}\": kullanılamıyor, lütfen doğru yazdığınızdan emin olun", + "dns_test_parsing_error_toast": "{{section}} bölümü: {{line}}. satır: kullanılamadı, lütfen doğru yazdığınızı kontrol edin", "dns_test_warning_toast": "Üst kaynak \"{{key}}\", test isteklerine yanıt vermiyor ve düzgün çalışmayabilir", "unblock": "Engeli kaldır", "block": "Engelle", @@ -243,6 +244,7 @@ "allow_this_client": "Bu istemciye izin ver", "block_for_this_client_only": "Yalnızca bu istemci için engelle", "unblock_for_this_client_only": "Yalnızca bu istemci için engellemeyi kaldır", + "add_persistent_client": "Kalıcı istemci olarak ekle", "time_table_header": "Saat", "date": "Tarih", "domain_name_table_header": "Alan adı", @@ -465,6 +467,7 @@ "form_add_id": "Tanımlayıcı ekle", "form_client_name": "İstemci ismi girin", "name": "Adı", + "client_name": "İstemci {{id}}", "client_global_settings": "Genel ayarları kullan", "client_deleted": "\"{{key}}\" istemcisi başarıyla silindi", "client_added": "\"{{key}}\" istemcisi başarıyla eklendi", diff --git a/client/src/__locales/uk.json b/client/src/__locales/uk.json index dbec359c556..87300a2f81c 100644 --- a/client/src/__locales/uk.json +++ b/client/src/__locales/uk.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "DNS-сервери успішно збережено", "dns_test_ok_toast": "Вказані DNS сервери працюють правильно", "dns_test_not_ok_toast": "Сервер «{{key}}»: неможливо використати. Перевірте правильність введення", + "dns_test_parsing_error_toast": "Розділ {{section}}: рядок {{line}}: неможливо використати. Перевірте правильність введення", "dns_test_warning_toast": "Upstream «{{key}}» не відповідає на тестові запити та може працювати не правильно", "unblock": "Дозволити", "block": "Заборонити", @@ -243,6 +244,7 @@ "allow_this_client": "Дозволити цей клієнт", "block_for_this_client_only": "Заборонити тільки цей клієнт", "unblock_for_this_client_only": "Дозволити тільки цей клієнт", + "add_persistent_client": "Додати в збережені клієнти", "time_table_header": "Час", "date": "Дата", "domain_name_table_header": "Назва домену", @@ -465,6 +467,7 @@ "form_add_id": "Додати ідентифікатор", "form_client_name": "Введіть ім'я клієнта", "name": "Ім'я", + "client_name": "Клієнт {{id}}", "client_global_settings": "Використати загальні налаштування", "client_deleted": "Клієнта «{{key}}» успішно видалено", "client_added": "Клієнта «{{key}}» успішно додано", diff --git a/client/src/__locales/vi.json b/client/src/__locales/vi.json index fb68549f371..4736281a5ba 100644 --- a/client/src/__locales/vi.json +++ b/client/src/__locales/vi.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "Các máy chủ thượng nguồn đã được lưu thành công", "dns_test_ok_toast": "Máy chủ DNS có thể sử dụng", "dns_test_not_ok_toast": "Máy chủ \"{{key}}\"': không thể sử dụng, vui lòng kiểm tra lại", + "dns_test_parsing_error_toast": "Phần {{section}}: dòng {{line}}: không thể sử dụng được, vui lòng kiểm tra xem bạn đã viết đúng chưa", "dns_test_warning_toast": "Ngược lại \"{{key}}\" không phản hồi các yêu cầu kiểm tra và có thể không hoạt động bình thường", "unblock": "Bỏ chặn", "block": "Chặn", @@ -243,6 +244,7 @@ "allow_this_client": "Cho phép ứng dụng khách này", "block_for_this_client_only": "Chỉ chặn ứng dụng khách này", "unblock_for_this_client_only": "Chỉ hủy chặn ứng dụng khách này", + "add_persistent_client": "Thêm làm ứng dụng khách liên tục", "time_table_header": "Thời gian", "date": "Ngày", "domain_name_table_header": "Tên miền", @@ -462,6 +464,7 @@ "form_add_id": "Thêm định danh", "form_client_name": "Nhập tên máy khách", "name": "Tên", + "client_name": "Khách hàng {{id}}", "client_global_settings": "Sử dụng cài đặt toàn cầu", "client_deleted": "Máy khách \"{{key}}\" đã xóa thành công", "client_added": "Máy khách \"{{key}}\" đã thêm thành công", diff --git a/client/src/__locales/zh-cn.json b/client/src/__locales/zh-cn.json index dda8a01781f..d93d0731ac0 100644 --- a/client/src/__locales/zh-cn.json +++ b/client/src/__locales/zh-cn.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "上游服务器保存成功", "dns_test_ok_toast": "指定的 DNS 服务器现已正常运行", "dns_test_not_ok_toast": "服务器 \"{{key}}\"：无法使用，请检查你输入的是否正确", + "dns_test_parsing_error_toast": "第 {{section}} 节：第 {{line}} 行：无法使用，请检查您输入的是否正确", "dns_test_warning_toast": "上游 “{{key}}” 不响应测试请求，可能无法正常工作", "unblock": "放行", "block": "拦截", @@ -243,6 +244,7 @@ "allow_this_client": "允许这个客户端", "block_for_this_client_only": "仅对此客户端拦截", "unblock_for_this_client_only": "仅解除对此客户端的拦截", + "add_persistent_client": "添加为持久客户端", "time_table_header": "时间", "date": "日期", "domain_name_table_header": "域名", @@ -465,6 +467,7 @@ "form_add_id": "添加标识符", "form_client_name": "输入客户端名称", "name": "名称", + "client_name": "客户端 {{id}}", "client_global_settings": "使用全局设置", "client_deleted": "客户端 \"{{key}}\" 删除成功", "client_added": "客户端 \"{{key}}\" 添加成功", diff --git a/client/src/__locales/zh-tw.json b/client/src/__locales/zh-tw.json index ddaa6244f0d..953a893a4ae 100644 --- a/client/src/__locales/zh-tw.json +++ b/client/src/__locales/zh-tw.json @@ -236,6 +236,7 @@ "updated_upstream_dns_toast": "上游的伺服器被成功地儲存", "dns_test_ok_toast": "已明確指定的 DNS 伺服器正在正確地運作", "dns_test_not_ok_toast": "伺服器 \"{{key}}\"：無法被使用，請檢查您已正確地填寫它", + "dns_test_parsing_error_toast": "第 {{section}} 節：第 {{line}} 行：無法使用，請檢查您輸入的是否正確", "dns_test_warning_toast": "上游 “{{key}}” 不回應測試請求，可能無法正常工作", "unblock": "解除封鎖", "block": "封鎖", @@ -243,6 +244,7 @@ "allow_this_client": "允許此用戶端", "block_for_this_client_only": "僅對此用戶端封鎖", "unblock_for_this_client_only": "僅對此用戶端解除封鎖", + "add_persistent_client": "新增為永久性客戶端", "time_table_header": "時間", "date": "日期", "domain_name_table_header": "域名", @@ -465,6 +467,7 @@ "form_add_id": "新增識別碼", "form_client_name": "輸入用戶端名稱", "name": "名稱", + "client_name": "客戶端 {{id}}", "client_global_settings": "使用全域的設定", "client_deleted": "用戶端 \"{{key}}\" 被成功地刪除", "client_added": "用戶端 \"{{key}}\" 被成功地加入", diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js index b7e4a06a428..e07bf8406aa 100644 --- a/client/src/helpers/filters/filters.js +++ b/client/src/helpers/filters/filters.js @@ -209,7 +209,7 @@ export default { "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_47.txt" }, "hagezi_multinormal": { - "name": "HaGeZi Multi NORMAL", + "name": "HaGeZi's Normal Blocklist", "categoryId": "general", "homepage": "https://github.com/hagezi/dns-blocklists", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_34.txt" diff --git a/go.mod b/go.mod index ab79dd17d5a..3173d8e5583 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21.7 require ( github.com/AdguardTeam/dnsproxy v0.65.0 github.com/AdguardTeam/golibs v0.20.1 - github.com/AdguardTeam/urlfilter v0.17.3 + github.com/AdguardTeam/urlfilter v0.18.0 github.com/NYTimes/gziphandler v1.1.1 github.com/ameshkov/dnscrypt/v2 v2.2.7 github.com/bluele/gcache v0.0.2 @@ -61,6 +61,6 @@ require ( golang.org/x/mod v0.15.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.18.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 7493be2d845..d26c55b7bb0 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/AdguardTeam/dnsproxy v0.65.0 h1:mqJjVSkqoqPwThY3tTvnLHQ/AYBYrfWmK2ER9 github.com/AdguardTeam/dnsproxy v0.65.0/go.mod h1:AGYMLPk2zX+I3NIUYS12KUI296mkCyfoMF/luy2uqdk= github.com/AdguardTeam/golibs v0.20.1 h1:ol8qLjWGZhU9paMMwN+OLWVTUigGsXa29iVTyd62VKY= github.com/AdguardTeam/golibs v0.20.1/go.mod h1:bgcMgRviCKyU6mkrX+RtT/OsKPFzyppelfRsksMG3KU= -github.com/AdguardTeam/urlfilter v0.17.3 h1:fg/ObbnO0Cv6aw0tW6N/ETDMhhNvmcUUOZ7HlmKC3rw= -github.com/AdguardTeam/urlfilter v0.17.3/go.mod h1:Jru7jFfeH2CoDf150uDs+rRYcZBzHHBz05r9REyDKyE= +github.com/AdguardTeam/urlfilter v0.18.0 h1:ZZzwODC/ADpjJSODxySrrUnt/fvOCfGFaCW6j+wsGfQ= +github.com/AdguardTeam/urlfilter v0.18.0/go.mod h1:IXxBwedLiZA2viyHkaFxY/8mjub0li2PXRg8a3d9Z1s= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= @@ -170,8 +170,8 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go index f691104ed98..615ea312a13 100644 --- a/internal/filtering/servicelist.go +++ b/internal/filtering/servicelist.go @@ -1927,6 +1927,14 @@ var blockedServices = []blockedService{{ "||minecraftservices.com^", "||mojang.com^", }, +}, { + ID: "nebula", + Name: "Nebula", + IconSVG: []byte(""), + Rules: []string{ + "||nebula.app^", + "||nebula.tv^", + }, }, { ID: "netflix", Name: "Netflix", diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 9dd018ed457..50a029e2e76 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -8,9 +8,9 @@ require ( github.com/gordonklaus/ineffassign v0.1.0 github.com/kisielk/errcheck v1.7.0 github.com/kyoh86/looppointer v0.2.1 - github.com/securego/gosec/v2 v2.18.2 + github.com/securego/gosec/v2 v2.19.0 github.com/uudashr/gocognit v1.1.2 - golang.org/x/tools v0.17.0 + golang.org/x/tools v0.18.0 golang.org/x/vuln v1.0.4 honnef.co/go/tools v0.4.6 mvdan.cc/gofumpt v0.6.0 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 450eea75eec..e3681a57d69 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -8,8 +8,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g= @@ -38,16 +38,16 @@ github.com/kyoh86/looppointer v0.2.1 h1:Jx9fnkBj/JrIryBLMTYNTj9rvc2SrPS98Dg0w7fx github.com/kyoh86/looppointer v0.2.1/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw= github.com/kyoh86/nolint v0.0.1 h1:GjNxDEkVn2wAxKHtP7iNTrRxytRZ1wXxLV5j4XzGfRU= github.com/kyoh86/nolint v0.0.1/go.mod h1:1ZiZZ7qqrZ9dZegU96phwVcdQOMKIqRzFJL3ewq9gtI= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA= -github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= +github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= +github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= +github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/securego/gosec/v2 v2.18.2 h1:DkDt3wCiOtAHf1XkiXZBhQ6m6mK/b9T/wD257R3/c+I= -github.com/securego/gosec/v2 v2.18.2/go.mod h1:xUuqSF6i0So56Y2wwohWAmB07EdBkUN6crbLlHwbyJs= +github.com/securego/gosec/v2 v2.19.0 h1:gl5xMkOI0/E6Hxx0XCY2XujA3V7SNSefA8sC+3f1gnk= +github.com/securego/gosec/v2 v2.19.0/go.mod h1:hOkDcHz9J/XIgIlPDXalxjeVYsHxoWUc5zJSHxcB8YM= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= @@ -76,8 +76,8 @@ 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.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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= @@ -100,15 +100,15 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/vuln v1.0.4 h1:SP0mPeg2PmGCu03V+61EcQiOjmpri2XijexKdzv8Z1I= golang.org/x/vuln v1.0.4/go.mod h1:NbJdUQhX8jY++FtuhrXs2Eyx0yePo9pF7nPlIjo9aaQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh index 3ce644efeb4..83790fce527 100644 --- a/scripts/make/go-lint.sh +++ b/scripts/make/go-lint.sh @@ -59,7 +59,7 @@ set -f -u # schemas, which use package reflect. If your project needs more exceptions, # add and document them. # -# TODO(a.garipov): Add goilbs/log. +# TODO(a.garipov): Add golibs/log. # # TODO(a.garipov): Add deprecated package golang.org/x/exp/maps once all # projects switch to Go 1.22.