Index: components/error_page_strings.grdp |
diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp |
index 255bea18d23dcf5ad92af3d09d12c366222b2480..8001b3a5550f0173cd3bd41db8809ed3ed27728a 100644 |
--- a/components/error_page_strings.grdp |
+++ b/components/error_page_strings.grdp |
@@ -68,30 +68,23 @@ |
Check any cables and reboot any routers, modems, or other network |
devices you may be using. |
</message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER" desc="When a page fails to load, sometimes we suggest checking the DNS configuration. This is a header above above some details."> |
- Check your DNS settings |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_BODY" desc="When a page fails to load, sometimes we suggest checking the DNS configuration. This contains details below the suggestion."> |
- Contact your network administrator if you're not sure what this means. |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_HEADER" desc="When a page fails to load, sometimes we suggest disabling predicting network actions. This is a header above some details."> |
- Try disabling network prediction |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_BODY" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This contains details below the suggestion."> |
- If it is already listed as a program allowed to access the network, try |
- removing it from the list and adding it again. |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server. This is a header above some details."> |
- If you use a proxy server... |
- </message> |
- <if expr="is_android or is_ios"> |
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server. These are instructions below a header."> |
- Check your proxy settings or contact your network administrator to |
- make sure the proxy server is working. |
- <ph name="PLATFORM_TEXT">$1<ex>Goto the wrench menu and choose Fix It.</ex></ph> |
+ <if expr="not is_ios or not is_android"> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER" desc="When a page fails to load, sometimes we suggest checking the DNS configuration. This is a header above above some details."> |
+ Check your DNS settings |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_BODY" desc="When a page fails to load, sometimes we suggest checking the DNS configuration. This contains details below the suggestion."> |
+ Contact your network administrator if you're not sure what this means. |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_HEADER" desc="When a page fails to load, sometimes we suggest disabling predicting network actions. This is a header above some details."> |
+ Try disabling network prediction |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_BODY" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This contains details below the suggestion."> |
+ If it is already listed as a program allowed to access the network, try |
+ removing it from the list and adding it again. |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server. This is a header above some details."> |
+ If you use a proxy server... |
</message> |
- </if> |
- <if expr="not is_android and not is_ios"> |
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server. These are instructions below a header."> |
Check your proxy settings or contact your network administrator to |
make sure the proxy server is working. If you don't believe you should |
@@ -492,18 +485,20 @@ |
<message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_SUMMARY" desc="The message displayed in a list of suggestions following a network error, suggesting the user should try checking their connnection. The suggestions list is prefixed with 'Try:'."> |
Checking the connection |
</message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_DNS_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should try checking their proxy, firewall and DNS configuration. The suggestions list is prefixed with 'Try:'."> |
- <ph name="BEGIN_LINK"><a href="#buttons" onclick="javascript:toggleHelpBox()"></ph>Checking the proxy, firewall, and DNS configuration<ph name="END_LINK"></a><ex></a></ex></ph> |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_FIREWALL_ANTIVIRUS_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should try checking their firewall and anti-virus configuration. The suggestions list is prefixed with 'Try:'."> |
- <ph name="BEGIN_LINK"><a href="#buttons" onclick="javascript:toggleHelpBox()"></ph>Checking firewall and antivirus configurations<ph name="END_LINK"></a><ex></a></ex></ph> |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should try checking their proxy and firewall configuration. The suggestions list is prefixed with 'Try:'."> |
- <ph name="BEGIN_LINK"><a href="javascript:toggleHelpBox()"></ph>Checking the proxy and the firewall<ph name="END_LINK"></a><ex></a></ex></ph> |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_ADDRESS_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting to check the proxy address. The suggestions list is prefixed with 'Try:'."> |
- <ph name="BEGIN_LINK"><a href="#buttons" onclick="javascript:toggleHelpBox()"></ph>Checking the proxy address<ph name="END_LINK"></a><ex></a></ex></ph> |
- </message> |
+ <if expr="not is_ios or not is_android"> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_DNS_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should try checking their proxy, firewall and DNS configuration. The suggestions list is prefixed with 'Try:'."> |
+ <ph name="BEGIN_LINK"><a href="#buttons" onclick="toggleHelpBox()"></ph>Checking the proxy, firewall, and DNS configuration<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_FIREWALL_ANTIVIRUS_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should try checking their firewall and anti-virus configuration. The suggestions list is prefixed with 'Try:'."> |
+ <ph name="BEGIN_LINK"><a href="#buttons" onclick="toggleHelpBox()"></ph>Checking firewall and antivirus configurations<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should try checking their proxy and firewall configuration. The suggestions list is prefixed with 'Try:'."> |
+ <ph name="BEGIN_LINK"><a href="#buttons" onclick="toggleHelpBox()"></ph>Checking the proxy and the firewall<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_ADDRESS_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting to check the proxy address. The suggestions list is prefixed with 'Try:'."> |
+ <ph name="BEGIN_LINK"><a href="#buttons" onclick="toggleHelpBox()"></ph>Checking the proxy address<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ </if> |
<message name="IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMIN_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting to the user to contact his system administrator. The suggestions list is prefixed with 'Try:'."> |
Contacting the system admin |
</message> |