Resolve conflict

client/src/__locales/en.json

@@ -39,6 +39,7 @@
     "dhcp_interface_select": "Select DHCP interface",
     "dhcp_hardware_address": "Hardware address",
     "dhcp_ip_addresses": "IP addresses",
+    "ip": "IP",
     "dhcp_table_hostname": "Hostname",
     "dhcp_table_expires": "Expires",
     "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network. Otherwise, it can break the Internet for connected devices!",
@@ -51,17 +52,27 @@
     "dhcp_static_leases_not_found": "No DHCP static leases found",
     "dhcp_add_static_lease": "Add static lease",
     "dhcp_reset": "Are you sure you want to reset DHCP config?",
+    "country": "Country",
+    "city": "City",
     "delete_confirm": "Are you sure you want to delete \"{{key}}\"?",
     "form_enter_hostname": "Enter hostname",
     "error_details": "Error details",
+    "response_details": "Response details",
+    "request_details": "Request details",
+    "client_details": "Client details",
+    "details": "Details",
     "back": "Back",
     "dashboard": "Dashboard",
     "settings": "Settings",
     "filters": "Filters",
+    "filter": "Filter",
     "query_log": "Query Log",
+    "compact": "Compact",
+    "nothing_found": "Nothing found",
     "faq": "FAQ",
     "version": "Version",
-    "address": "address",
+    "address": "Address",
+    "protocol": "Protocol",
     "on": "ON",
     "off": "OFF",
     "copyright": "Copyright",
@@ -134,8 +145,10 @@
     "rules_count_table_header": "Rules count",
     "last_time_updated_table_header": "Last time updated",
     "actions_table_header": "Actions",
+    "request_table_header": "Request",
     "edit_table_action": "Edit",
     "delete_table_action": "Delete",
+    "elapsed": "Elapsed",
     "filters_and_hosts_hint": "AdGuard Home understands basic adblock rules and hosts files syntax.",
     "no_blocklist_added": "No blocklists added",
     "no_whitelist_added": "No allowlists added",
@@ -172,12 +185,15 @@
     "updated_upstream_dns_toast": "Updated the upstream DNS servers",
     "dns_test_ok_toast": "Specified DNS servers are working correctly",
     "dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly",
-    "unblock_btn": "Unblock",
-    "block_btn": "Block",
+    "unblock": "Unblock",
+    "block": "Block",
     "time_table_header": "Time",
+    "date": "Date",
     "domain_name_table_header": "Domain name",
+    "domain_or_client": "Domain or client",
     "type_table_header": "Type",
     "response_table_header": "Response",
+    "response_code": "Response code",
     "client_table_header": "Client",
     "empty_response_status": "Empty",
     "show_all_filter_type": "Show all",
@@ -196,6 +212,7 @@
     "query_log_filtered": "Filtered by {{filter}}",
     "query_log_confirm_clear": "Are you sure you want to clear the entire query log?",
     "query_log_cleared": "The query log has been successfully cleared",
+    "query_log_updated": "The query log has been successfully updated",
     "query_log_clear": "Clear query logs",
     "query_log_retention": "Query logs retention",
     "query_log_enable": "Enable log",
@@ -215,6 +232,9 @@
     "custom_ip": "Custom IP",
     "blocking_ipv4": "Blocking IPv4",
     "blocking_ipv6": "Blocking IPv6",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
+    "plain_dns": "Plain DNS",
     "form_enter_rate_limit": "Enter rate limit",
     "rate_limit": "Rate limit",
     "edns_enable": "Enable EDNS Client Subnet",
@@ -227,12 +247,14 @@
     "blocking_mode_null_ip": "Null IP: Respond with zero IP address (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Custom IP: Respond with a manually set IP address",
     "upstream_dns_client_desc": "If you keep this field empty, AdGuard Home will use the servers configured in the <0>DNS settings</0>.",
+    "tracker_source": "Tracker source",
     "source_label": "Source",
     "found_in_known_domain_db": "Found in the known domains database.",
     "category_label": "Category",
     "rule_label": "Rule",
     "list_label": "List",
     "unknown_filter": "Unknown filter {{filterId}}",
+    "known_tracker": "Known tracker",
     "install_welcome_title": "Welcome to AdGuard Home!",
     "install_welcome_desc": "AdGuard Home is a network-wide ad-and-tracker blocking DNS server. Its purpose is to let you control your entire network and all your devices, and it does not require using a client-side program.",
     "install_settings_title": "Admin Web Interface",
@@ -350,6 +372,7 @@
     "form_enter_id": "Enter identifier",
     "form_add_id": "Add identifier",
     "form_client_name": "Enter client name",
+    "name": "Name",
     "client_global_settings": "Use global settings",
     "client_deleted": "Client \"{{key}}\" successfully deleted",
     "client_added": "Client \"{{key}}\" successfully added",
@@ -449,6 +472,7 @@
     "location": "Location",
     "orgname": "Organization name",
     "netname": "Network name",
+    "network": "Network",
     "descr": "Description",
     "whois": "Whois",
     "filtering_rules_learn_more": "<0>Learn more</0> about creating your own hosts lists.",
@@ -494,6 +518,21 @@
     "list_updated_plural": "{{count}} lists updated",
     "dnssec_enable": "Enable DNSSEC",
     "dnssec_enable_desc": "Set DNSSEC flag in the outcoming DNS queries and check the result (DNSSEC-enabled resolver is required)",
+    "validated_with_dnssec": "Validated with DNSSEC",
+    "show_all_responses": "All responses",
+    "show_blocked_responses": "Blocked",
+    "show_whitelisted_responses": "Whitelisted",
+    "show_processed_responses": "Processed",
+    "blocked_safebrowsing": "Blocked by Safebrowsing",
+    "blocked_adult_websites": "Blocked Adult Websites",
+    "blocked_threats": "Blocked Threats",
+    "allowed": "Allowed",
+    "filtered": "Filtered",
+    "rewritten": "Rewritten",
+    "safe_search": "Safe search",
+    "blocklist": "Blocklist",
+    "milliseconds_abbreviation": "ms",
+    "dnssec_enable_desc": "Set DNSSEC flag in the outcoming DNS queries and check the result (DNSSEC-enabled resolver is required)",
     "cache_size": "Cache size",
     "cache_size_desc": "DNS cache size (in bytes)",
     "cache_ttl_min_override": "Override minimum TTL",