From a72ce1cfae8b726ffdc329ef004c02e64a5b4be1 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 31 Mar 2021 13:29:29 +0300 Subject: [PATCH] Pull request: client: imp en locale, grammar Merge in DNS/adguard-home from imp-i18n to master Squashed commit of the following: commit 49f565db4e7167ed404413b6eaa75b0ab38c79d4 Merge: f60989f0 1d07afb3 Author: Ainar Garipov Date: Wed Mar 31 13:04:18 2021 +0300 Merge branch 'master' into imp-i18n commit f60989f069fd7c52d00e41e4aaad2e824d2d2e2e Author: Ainar Garipov Date: Wed Mar 31 13:04:03 2021 +0300 client: imp wording commit 6909bb89f7af74c8245ecd81dc255b2890202cca Author: Ainar Garipov Date: Tue Mar 30 18:33:42 2021 +0300 client: imp en locale, grammar --- client/src/__locales/en.json | 60 ++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json index 5b98108b..cc944120 100644 --- a/client/src/__locales/en.json +++ b/client/src/__locales/en.json @@ -1,15 +1,15 @@ { "client_settings": "Client settings", - "example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)", - "example_upstream_comment": "You can specify the comment", - "upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers", + "example_upstream_reserved": "You can specify a DNS upstream <0>for the specific domain(s)", + "example_upstream_comment": "You can specify a comment", + "upstream_parallel": "Use parallel queries to speed up resolving by querying all upstream servers simultaneously.", "parallel_requests": "Parallel requests", "load_balancing": "Load-balancing", - "load_balancing_desc": "Query one server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server will be used more often.", + "load_balancing_desc": "Query one upstream server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server is used more often.", "bootstrap_dns": "Bootstrap DNS servers", "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.", "check_dhcp_servers": "Check for DHCP servers", - "save_config": "Save config", + "save_config": "Save configuration", "enabled_dhcp": "DHCP server enabled", "disabled_dhcp": "DHCP server disabled", "unavailable_dhcp": "DHCP is unavailable", @@ -18,12 +18,12 @@ "dhcp_description": "If your router does not provide DHCP settings, you can use AdGuard's own built-in DHCP server.", "dhcp_enable": "Enable DHCP server", "dhcp_disable": "Disable DHCP server", - "dhcp_not_found": "It is safe to enable the built-in DHCP server - we didn't find any active DHCP servers on the network. However, we encourage you to re-check it manually as our automatic test currently doesn't give 100% guarantee.", + "dhcp_not_found": "It is safe to enable the built-in DHCP server because AdGuard Home didn't find any active DHCP servers on the network. However, you should re-check that manually as the automatic probing doesn't currently provide a 100% guarantee.", "dhcp_found": "An active DHCP server is found on the network. It is not safe to enable the built-in DHCP server.", "dhcp_leases": "DHCP leases", "dhcp_static_leases": "DHCP static leases", "dhcp_leases_not_found": "No DHCP leases found", - "dhcp_config_saved": "DHCP config successfully saved", + "dhcp_config_saved": "DHCP configuration successfully saved", "dhcp_ipv4_settings": "DHCP IPv4 Settings", "dhcp_ipv6_settings": "DHCP IPv6 Settings", "form_error_required": "Required field", @@ -49,16 +49,16 @@ "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!", - "dhcp_error": "We could not determine whether there is another DHCP server in the network.", - "dhcp_static_ip_error": "In order to use DHCP server a static IP address must be set. We failed to determine if this network interface is configured using static IP address. Please set a static IP address manually.", - "dhcp_dynamic_ip_found": "Your system uses dynamic IP address configuration for interface <0>{{interfaceName}}. In order to use DHCP server a static IP address must be set. Your current IP address is <0>{{ipAddress}}. We will automatically set this IP address as static if you press Enable DHCP button.", + "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network, as this may break the Internet connectivity for devices on the network!", + "dhcp_error": "AdGuard Home could not determine if there is another active DHCP server on the network.", + "dhcp_static_ip_error": "In order to use DHCP server a static IP address must be set. AdGuard Home failed to determine if this network interface is configured using a static IP address. Please set a static IP address manually.", + "dhcp_dynamic_ip_found": "Your system uses dynamic IP address configuration for interface <0>{{interfaceName}}. In order to use DHCP server, a static IP address must be set. Your current IP address is <0>{{ipAddress}}. AdGuard Home will automatically set this IP address as static if you press the \"Enable DHCP\" button.", "dhcp_lease_added": "Static lease \"{{key}}\" successfully added", "dhcp_lease_deleted": "Static lease \"{{key}}\" successfully deleted", "dhcp_new_static_lease": "New static lease", "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?", + "dhcp_reset": "Are you sure you want to reset the DHCP configuration?", "country": "Country", "city": "City", "delete_confirm": "Are you sure you want to delete \"{{key}}\"?", @@ -105,14 +105,14 @@ "top_clients": "Top clients", "no_clients_found": "No clients found", "general_statistics": "General statistics", - "number_of_dns_query_days": "A number of DNS queries processed for the last {{count}} day", - "number_of_dns_query_days_plural": "A number of DNS queries processed for the last {{count}} days", - "number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", - "number_of_dns_query_blocked_24_hours": "A number of DNS requests blocked by adblock filters and hosts blocklists", - "number_of_dns_query_blocked_24_hours_by_sec": "A number of DNS requests blocked by the AdGuard browsing security module", - "number_of_dns_query_blocked_24_hours_adult": "A number of adult websites blocked", + "number_of_dns_query_days": "The number of DNS queries processed for the last {{count}} day", + "number_of_dns_query_days_plural": "The number of DNS queries processed for the last {{count}} days", + "number_of_dns_query_24_hours": "The number of DNS queries processed for the last 24 hours", + "number_of_dns_query_blocked_24_hours": "The number of DNS requests blocked by adblock filters and hosts blocklists", + "number_of_dns_query_blocked_24_hours_by_sec": "The number of DNS requests blocked by the AdGuard browsing security module", + "number_of_dns_query_blocked_24_hours_adult": "The number of adult websites blocked", "enforced_save_search": "Enforced safe search", - "number_of_dns_query_to_safe_search": "A number of DNS requests to search engines for which Safe Search was enforced", + "number_of_dns_query_to_safe_search": "The number of DNS requests to search engines for which Safe Search was enforced", "average_processing_time": "Average processing time", "average_processing_time_hint": "Average time in milliseconds on processing a DNS request", "block_domain_use_filters_and_hosts": "Block domains using filters and hosts files", @@ -263,7 +263,7 @@ "rate_limit": "Rate limit", "edns_enable": "Enable EDNS Client Subnet", "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.", - "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)", + "rate_limit_desc": "The number of requests per second allowed per client. Setting it to 0 means no limit.", "blocking_ipv4_desc": "IP address to be returned for a blocked A request", "blocking_ipv6_desc": "IP address to be returned for a blocked AAAA request", "blocking_mode_default": "Default: Respond with zero IP address (0.0.0.0 for A; :: for AAAA) when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule", @@ -286,7 +286,7 @@ "install_settings_listen": "Listen interface", "install_settings_port": "Port", "install_settings_interface_link": "Your AdGuard Home admin web interface will be available on the following addresses:", - "form_error_port": "Enter valid port value", + "form_error_port": "Enter valid port number", "install_settings_dns": "DNS server", "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server on the following addresses:", "install_settings_all_interfaces": "All interfaces", @@ -308,7 +308,7 @@ "install_devices_router_list_1": "Open the preferences for your router. Usually, you can access it from your browser via a URL (like http://192.168.0.1/ or http://192.168.1.1/). You may be asked to enter the password. If you don't remember it, you can often reset the password by pressing a button on the router itself. Some routers require a specific application, which in that case should be already installed on your computer/phone.", "install_devices_router_list_2": "Find the DHCP/DNS settings. Look for the DNS letters next to a field which allows two or three sets of numbers, each broken into four groups of one to three digits.", "install_devices_router_list_3": "Enter your AdGuard Home server addresses there.", - "install_devices_router_list_4": "You can't set a custom DNS server on some types of routers. In this case it may help if you set up AdGuard Home as a <0>DHCP server. Otherwise, you should search for the manual on how to customize DNS servers for your particular router model.", + "install_devices_router_list_4": "On some router types, a custom DNS server cannot be set up. In that case, setting up AdGuard Home as a <0>DHCP server may help. Otherwise, you should check the router manual on how to customize DNS servers on your specific router model.", "install_devices_windows_list_1": "Open Control Panel through Start menu or Windows search.", "install_devices_windows_list_2": "Go to Network and Internet category and then to Network and Sharing Center.", "install_devices_windows_list_3": "On the left side of the screen find Change adapter settings and click on it.", @@ -334,7 +334,7 @@ "install_saved": "Saved successfully", "encryption_title": "Encryption", "encryption_desc": "Encryption (HTTPS/TLS) support for both DNS and admin web interface", - "encryption_config_saved": "Encryption config saved", + "encryption_config_saved": "Encryption configuration saved", "encryption_server": "Server name", "encryption_server_enter": "Enter your domain name", "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", @@ -365,9 +365,9 @@ "encryption_reset": "Are you sure you want to reset encryption settings?", "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings.", "topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings.", - "form_error_port_range": "Enter port value in the range of 80-65535", + "form_error_port_range": "Enter port number in the range of 80-65535", "form_error_port_unsafe": "This is an unsafe port", - "form_error_equal": "Shouldn't be equal", + "form_error_equal": "Must not be equal", "form_error_password": "Password mismatched", "reset_settings": "Reset settings", "update_announcement": "AdGuard Home {{version}} is now available! <0>Click here for more info.", @@ -416,7 +416,7 @@ "access_disallowed_title": "Disallowed clients", "access_disallowed_desc": "A list of CIDR or IP addresses. If configured, AdGuard Home will drop requests from these IP addresses.", "access_blocked_title": "Disallowed domains", - "access_blocked_desc": "Don't confuse this with filters. AdGuard Home will drop DNS queries with these domains in query's question. Here you can specify the exact domain names, wildcards and urlfilter-rules, e.g. 'example.org', '*.example.org' or '||example.org^'.", + "access_blocked_desc": "Don't confuse this with filters. AdGuard Home will drop DNS queries with these domains in queries' questions. Here you can specify the exact domain names, wildcards and URL filter rules, e.g. \"example.org\", \"*.example.org\" or \"||example.org^\".", "access_settings_saved": "Access settings successfully saved", "updates_checked": "Updates successfully checked", "updates_version_equal": "AdGuard Home is up-to-date", @@ -519,7 +519,7 @@ "disable_ipv6": "Disable IPv6", "disable_ipv6_desc": "If this feature is enabled, all DNS queries for IPv6 addresses (type AAAA) will be dropped.", "fastest_addr": "Fastest IP address", - "fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This will slow down the DNS queries as we have to wait for responses from all DNS servers, but improve the overall connectivity.", + "fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This slows down DNS queries as AdGuard Home has to wait for responses from all DNS servers, but improves the overall connectivity.", "autofix_warning_text": "If you click \"Fix\", AdGuard Home will configure your system to use AdGuard Home DNS server.", "autofix_warning_list": "It will perform these tasks: <0>Deactivate system DNSStubListener <0>Set DNS server address to 127.0.0.1 <0>Replace symbolic link target of /etc/resolv.conf with /run/systemd/resolve/resolv.conf <0>Stop DNSStubListener (reload systemd-resolved service)", "autofix_warning_result": "As a result all DNS requests from your system will be processed by AdGuard Home by default.", @@ -549,7 +549,7 @@ "set_static_ip": "Set a static IP address", "install_static_ok": "Good news! The static IP address is already configured", "install_static_error": "AdGuard Home cannot configure it automatically for this network interface. Please look for an instruction on how to do this manually.", - "install_static_configure": "We have detected that a dynamic IP address is used — <0>{{ip}}. Do you want to use it as your static address?", + "install_static_configure": "AdGuard Home has detected that the dynamic IP address <0>{{ip}} is used. Do you want it to be set as your static address?", "confirm_static_ip": "AdGuard Home will configure {{ip}} to be your static IP address. Do you want to proceed?", "list_updated": "{{count}} list updated", "list_updated_plural": "{{count}} lists updated", @@ -587,11 +587,11 @@ "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains", "filter_category_regional_desc": "Lists that focus on regional ads and tracking servers", "filter_category_other_desc": "Other blocklists", - "setup_config_to_enable_dhcp_server": "Setup config to enable DHCP server", + "setup_config_to_enable_dhcp_server": "Setup configuration to enable DHCP server", "original_response": "Original response", "click_to_view_queries": "Click to view queries", "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction on how to resolve this.", "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.", "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.", "experimental": "Experimental" -} \ No newline at end of file +}