daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: fix #822 - Whitelist filter rules

Browse Source 
Squashed commit of the following:

commit 350c6d5fadd77145b801df8887284bf4d64fbd19
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Wed Feb 26 15:43:29 2020 +0300

    * client: update translations

commit a884dffcd59f2259e2eee2c1e5a3270819bf8962
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Mon Feb 17 17:32:10 2020 +0300

    + client: handle whitelist filters

commit a586ec5bc614ffb0e01584a1fbdc7292b4865e68
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jan 29 18:16:59 2020 +0300

    + client: add whitelist

commit a52c3de62cf2fa34be6394771fb8bb56b4ee81e3
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Feb 20 17:50:44 2020 +0300

    * change /filtering/refresh

commit 7f8f2ecccb9f7fa65318c1717dc6a7bd61afccf4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Feb 20 16:17:07 2020 +0300

    * fix race-detector issue

commit ac4b64c4a52c5b364a4b154bf18dea0fdf45647f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Jan 20 20:08:21 2020 +0300

    + whitelist filters
This commit is contained in:
Andrey Meshkov
2020-02-26 19:58:25 +03:00
parent 82aa38fce3
commit d839136fee
70 changed files with 1821 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
client/src/__locales/zh-tw.json
View File

@@ -105,6 +105,11 @@
"no_servers_specified": "無已明確指定的伺服器",
"general_settings": "一般的設定",
"dns_settings": "DNS 設定",
"dns_blocklists": "DNS 封鎖清單",
"dns_allowlists": "DNS 允許清單",
"dns_blocklists_desc": "AdGuard Home 將封鎖與封鎖清單相符的網域。",
"dns_allowlists_desc": "來自 DNS 允許清單的網域將被允許，即使它們在任何的封鎖清單中。",
"custom_filtering_rules": "自訂的過濾規則",
"encryption_settings": "加密設定",
"dhcp_settings": "動態主機設定協定（DHCP）設定",
"upstream_dns": "上游的 DNS 伺服器",
@@ -122,22 +127,22 @@
"enabled_save_search_toast": "已啟用安全搜尋",
"enabled_table_header": "已啟用",
"name_table_header": "名稱",
"filter_url_table_header": "過濾器網址",
"list_url_table_header": "列出網址",
"rules_count_table_header": "規則總數",
"last_time_updated_table_header": "最近的更新時間",
"actions_table_header": "動作",
"edit_table_action": "編輯",
"delete_table_action": "刪除",
"filters_and_hosts": "過濾器和主機封鎖清單",
"filters_and_hosts_hint": "AdGuard Home 懂得基本的廣告封鎖規則和主機檔案語法。",
"no_filters_added": "無已加入的過濾器",
"add_filter_btn": "增加過濾器",
"cancel_btn": "取消",
"enter_name_hint": "輸入名稱",
"enter_url_hint": "輸入網址",
"check_updates_btn": "檢查更新",
"new_filter_btn": "新的過濾器訂閱",
"enter_valid_filter_url": "輸入關於過濾器訂閱或主機檔案之有效的網址。",
"new_blocklist": "新的封鎖清單",
"new_allowlist": "新的允許清單",
"edit_blocklist": "編輯封鎖清單",
"edit_allowlist": "編輯允許清單",
"form_error_url_format": "無效的網址格式",
"custom_filter_rules": "自訂的過濾規則",
"custom_filter_rules_hint": "於一行上輸入一個規則。您可使用廣告封鎖規則或主機檔案語法。",
"examples_title": "範例",
@@ -153,7 +158,7 @@
"example_upstream_doh": "加密的 <0>DNS-over-HTTPS</0>",
"example_upstream_sdns": "您可使用關於 <1>DNSCrypt</1> 或 <2>DNS-over-HTTPS</2> 解析器之 <0>DNS 戳記</0>",
"example_upstream_tcp": "一般的 DNS（透過 TCP）",
"all_filters_up_to_date_toast": "所有的過濾器已是最新的",
"all_lists_up_to_date_toast": "所有的清單已是最新的",
"updated_upstream_dns_toast": "已更新上游的 DNS 伺服器",
"dns_test_ok_toast": "已明確指定的 DNS 伺服器正在正確地運作",
"dns_test_not_ok_toast": "伺服器 \"{{key}}\"：無法被使用，請檢查您已正確地填寫它",
@@ -164,7 +169,7 @@
"type_table_header": "類型",
"response_table_header": "回應",
"client_table_header": "用戶端",
"empty_response_status": "空白的",
"empty_response_status": "空無的",
"show_all_filter_type": "顯示全部",
"show_filtered_type": "顯示已過濾的",
"no_logs_found": "無已發現之記錄",
@@ -173,7 +178,6 @@
"next_btn": "下一頁",
"loading_table_status": "正在載入…",
"page_table_footer_text": "頁面",
"of_table_footer_text": "之",
"rows_table_footer_text": "列",
"updated_custom_filtering_toast": "已更新自訂的過濾規則",
"rule_removed_from_custom_filtering_toast": "規則從自訂的過濾規則中被移除",
@@ -191,6 +195,7 @@
"query_log_retention_confirm": "您確定您想要更改查詢記錄保留嗎？如果您減少該間隔值，某些資料將被丟失",
"dns_config": "DNS 伺服器配置",
"blocking_mode": "封鎖模式",
"default": "預設",
"nxdomain": "不存在的網域（NXDOMAIN）",
"null_ip": "無效的 IP",
"custom_ip": "自訂的 IP",
@@ -203,13 +208,15 @@
"rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（0：無限制的）",
"blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
"blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
"blocking_mode_desc": "<0>不存在的網域（NXDOMAIN）– 以 NXDOMAIN 碼回覆；</0> <0>無效的 IP – 以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；</0> <0>自訂的 IP - 以手動地被設定的 IP 位址回覆。</0>",
"blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以 NXDOMAIN 回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
"blocking_mode_nxdomain": "不存在的網域（NXDOMAIN）：以 NXDOMAIN 碼回覆",
"blocking_mode_null_ip": "無效的 IP：以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆",
"blocking_mode_custom_ip": "自訂的 IP：以一組手動地被設定的 IP 位址回覆",
"upstream_dns_client_desc": "如果您將該欄位留空，AdGuard Home 將使用在 <0>DNS 設定</0>中被配置的伺服器。",
"source_label": "來源",
"found_in_known_domain_db": "在已知的域名資料庫中被發現。",
"category_label": "類別",
"rule_label": "規則",
"filter_label": "過濾器",
"unknown_filter": "未知的過濾器 {{filterId}}",
"install_welcome_title": "歡迎至 AdGuard Home！",
"install_welcome_desc": "AdGuard Home 是全網路範圍廣告和追蹤器封鎖的 DNS 伺服器。它的目的為讓您控制您的整個網路和所有您的裝置，且不需要使用用戶端程式。",
@@ -308,7 +315,7 @@
"dns_providers": "這裡是一個從中選擇之<0>已知的 DNS 供應商之清單</0>。",
"update_now": "立即更新",
"update_failed": "自動更新已失敗。請<a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>遵循這些步驟</a>以手動地更新。",
"processing_update": "請等待，AdGuard Home 正被更新",
"processing_update": "請稍候，AdGuard Home 正被更新",
"clients_title": "用戶端",
"clients_desc": "配置被連線到 AdGuard Home 的裝置",
"settings_global": "全域的",
@@ -321,7 +328,7 @@
"client_edit": "編輯用戶端",
"client_identifier": "識別碼",
"ip_address": "IP 位址",
"client_identifier_desc": "用戶端可被 IP 位址、無類別網域間路由（CIDR）或媒體存取控制（MAC）位址識別。請注意，僅若 AdGuard Home 也是<0>動態主機設定協定（DHCP）伺服器</0>，使用 MAC 作為識別碼是可能的",
"client_identifier_desc": "用戶端可被 IP 位址、無類別網域間路由（CIDR）或媒體存取控制（MAC）位址識別。請注意，只要 AdGuard Home 也是<0>動態主機設定協定（DHCP）伺服器</0>，使用 MAC 作為識別碼是可能的",
"form_enter_ip": "輸入 IP",
"form_enter_mac": "輸入媒體存取控制（MAC）",
"form_enter_id": "輸入識別碼",
@@ -333,7 +340,7 @@
"client_updated": "用戶端 \"{{key}}\" 被成功地更新",
"clients_not_found": "無已發現之用戶端",
"client_confirm_delete": "您確定您想要刪除用戶端 \"{{key}}\" 嗎？",
"filter_confirm_delete": "您確定您想要刪除該過濾器嗎？",
"list_confirm_delete": "您確定您想要刪除該清單嗎？",
"auto_clients_title": "用戶端（執行時期）",
"auto_clients_desc": "使用 AdGuard Home 但未被儲存在配置中之關於用戶端的資料",
"access_title": "存取設定",
@@ -399,7 +406,8 @@
"interval_days_plural": "{{count}} 日",
"domain": "網域",
"answer": "回應",
"filter_added_successfully": "該過濾器已被成功地加入",
"filter_added_successfully": "該清單已被成功地加入",
"filter_updated": "該清單已被成功地更新",
"statistics_configuration": "統計資料配置",
"statistics_retention": "統計資料保留",
"statistics_retention_desc": "如果您減少該間隔值，某些資料將被丟失",
@@ -431,5 +439,37 @@
"try_again": "再次嘗試",
"domain_desc": "輸入您想要被改寫的域名或萬用字元（wildcard）。",
"example_rewrite_domain": "僅對於此域名改寫回應。",
"example_rewrite_wildcard": "對於所有的 <0>example.org</0> 子網域改寫回應。"
"example_rewrite_wildcard": "對於所有的 <0>example.org</0> 子網域改寫回應。",
"disable_ipv6": "禁用 IPv6",
"disable_ipv6_desc": "如果此功能被啟用，所有對於 IPv6 位址（類型 AAAA）的 DNS 查詢將被丟棄。",
"autofix_warning_text": "如果您點擊\"修復\"，AdGuard Home 將配置您的系統使用 AdGuard Home DNS 伺服器。",
"autofix_warning_result": "因此，預設下，來自您的系統之所有的 DNS 請求將被 AdGuard Home 處理。",
"tags_title": "標記",
"tags_desc": "您可選擇對應該用戶端的標記。標記可被包括在過濾規則中並允許您更準確地套用它們。<0>了解更多</0>",
"form_select_tags": "選擇用戶端標記",
"check_title": "檢查該過濾",
"check_desc": "檢查該主機名稱是否被過濾",
"check": "檢查",
"form_enter_host": "輸入主機名稱",
"filtered_custom_rules": "被自訂的過濾規則過濾",
"host_whitelisted": "該主機被列入白名單",
"check_ip": "IP 位址：{{ip}}",
"check_cname": "正規名稱（CNAME）：{{cname}}",
"check_reason": "原因：{{reason}}",
"check_rule": "規則：{{rule}}",
"check_service": "服務名稱：{{service}}",
"check_not_found": "未在您的過濾器清單中被找到",
"client_confirm_block": "您確定您想要封鎖該用戶端 \"{{ip}}\" 嗎？",
"client_confirm_unblock": "您確定您想要解除封鎖該用戶端 \"{{ip}}\" 嗎？",
"client_blocked": "用戶端 \"{{ip}}\" 被成功地封鎖",
"client_unblocked": "用戶端 \"{{ip}}\" 被成功地解除封鎖",
"static_ip": "靜態 IP 位址",
"static_ip_desc": "AdGuard Home 是一台伺服器，因此它需要一組靜態 IP 位址以正確地運作。否則，在某些時候，您的路由器可能分配一組不同的 IP 位址給此裝置。",
"set_static_ip": "設定一組靜態 IP 位址",
"install_static_ok": "好消息！該靜態 IP 位址已被配置",
"install_static_error": "AdGuard Home 無法自動地配置它供此網路介面。請尋找有關如何手動地完成這個的用法說明。",
"install_static_configure": "我們已偵測到一組動態 IP 位址被使用 — <0>{{ip}}</0>。您想要使用它作為您的靜態位址嗎？",
"confirm_static_ip": "AdGuard Home 將配置 {{ip}} 為您的靜態 IP 位址。您想要繼續嗎？",
"list_updated": "{{count}} 清單被更新",
"list_updated_plural": "{{count}} 清單被更新"
}