Index: components/error_page_strings.grdp |
diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp |
index 8a66053b9b395d0e4ba1c6386a4636b91c7ec5e6..b70a2009ed5072f0199495cd6cb55c432e760ab6 100644 |
--- a/components/error_page_strings.grdp |
+++ b/components/error_page_strings.grdp |
@@ -67,9 +67,6 @@ |
<message name="IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_BODY" desc="When a page fails to load, sometimes we suggest reloading a page. In the case that reloading the page requires resubmitting data to a website, this is displayed below a short header."> |
Press the reload button to resubmit the data needed to load the page. |
</message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_DISABLE_EXTENSION_HEADER" desc="When a page fails to load, we provide a suggestion that the user try disabling an extension that's blocking it."> |
- Disable your extensions and then reload this webpage |
- </message> |
<message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER" desc="When a page fails to load, sometimes we suggest checking the network connections. This is a header above some details."> |
Check your Internet connection |
</message> |
@@ -122,12 +119,6 @@ |
<message name="IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_BODY" desc="When a webpage fails to load, sometimes we suggest to the user to view the current policies. These are instructions below a header."> |
Visit <strong>chrome://policy</strong> to see the list of blacklisted URLs and other policies enforced by your system administrator. |
</message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMINISTRATOR_BODY" desc="When a webpage fails to load, sometimes we suggest to the user to contact his system administrator."> |
- Contact your system administrator for more information. |
- </message> |
- <message name="IDS_ERRORPAGES_SUGGESTION_GOOGLE_SEARCH" desc="When a page fails to load, sometimes we suggest a specific Google search. This appears just above a text input control."> |
- Search on Google |
- </message> |
<message name="IDS_ERRORPAGES_TITLE_NOT_AVAILABLE" desc="Title of the error page when we can't connect to a site."> |
<ph name="SITE">$1<ex>google.com</ex></ph> is not available |
</message> |
@@ -202,7 +193,7 @@ |
<ph name="HOST_NAME"><strong jscontent="hostName"></strong><ex>www.whatever.com</ex></ph> refused to connect. |
</message> |
<message name="IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED" desc="Summary in the error page when a dns look up fails. The 'abbr' tag is HTML mark up used to indicate that 'DNS address' is an abbreviation."> |
- <ph name="HOST_NAME"><strong jscontent="hostName"></strong><ex>www.whatever.com</ex></ph>’s server <ph name="BEGIN_ABBR"><abbr jsvalues="title:dnsDefinition">DNS address</abbr></ph> could not be found. |
+ <ph name="HOST_NAME"><strong jscontent="hostName"></strong><ex>www.whatever.com</ex></ph>’s server <ph name="BEGIN_ABBR"><abbr jsvalues="title:dnsDefinition"></ph>DNS address<ph name="END_ABBR"></abbr></ph> could not be found. |
mmenke
2016/02/12 17:25:54
I'm just going to assume this is right.
edwardjung
2016/02/15 15:53:49
This was a correction to the current format where
|
</message> |
<message name="IDS_ERRORPAGES_SUMMARY_DNS_DEFINITION" desc="Definition of DNS that appears when hovering over the abbreviation"> |
DNS is the network service that translates a website’s name to its Internet address. |
@@ -500,6 +491,70 @@ |
This webpage requires data that you entered earlier in order to be properly displayed. You can send this data again, but by doing so you will repeat any action this page previously performed. |
</message> |
+ <!-- Suggestions summary list messages. --> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_LIST_HEADER" desc="Message that prefixes a list of suggestions to try when encountering a network error."> |
+ Try: |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_RELOAD_SUMMARY" desc="The message displayed in a list of suggestions following a network error, suggesting the user should try reload the page."> |
+ Reloading the page |
+ </message> |
+ <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."> |
+ Checking the connection |
+ </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."> |
+ <ph name="BEGIN_LINK"><a href="javascript:toggleHelpBox()"></ph>Checking the proxy address and the firewall<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."> |
+ <ph name="BEGIN_LINK"><a href="#buttons" onclick="javascript:toggleHelpBox()"></ph>Checking the firewall and antivirus configuration<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </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."> |
+ <ph name="BEGIN_LINK"><a href="#buttons" onclick="javascript:toggleHelpBox()"></ph>Checking the proxy address, firewall, and DNS configuration<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CLEAR_COOKIES_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting the user should We also provide a link to the help center to learn more about the failure."> |
+ <ph name="BEGIN_LINK"><a jsvalues="href:learnMoreUrl"></ph>Clearing your cookies<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ <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."> |
+ Contacting the system admin |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMIN_SUMMARY_WITH_PREFIX" desc="Stand alone suggestion following a network error suggesting to the user to contact his system administrator."> |
+ Try contacting the system admin. |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CABLES_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting to check the network cables or router."> |
+ Checking the network cable or router |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_RESET_HARDWARE_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting to the reset the modem or router."> |
+ Resetting the modem or router |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_WIFI_SUMMARY" desc="The message displayed in a list of suggestions following a network error suggesting to the user to reconnect to Wi-Fi."> |
+ Reconnecting to Wi-Fi |
+ </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."> |
+ <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> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_DIAGNOSE_CONNECTION_SUMMARY" desc="The message displayed asking the user to check their network connection using the diagnostics tool."> |
+ Fix your connection using the <ph name="BEGIN_LINK"><a href="#buttons" onclick="javascript:diagnoseErrors()"></ph>diagnostics app<ph name="END_LINK"></a><ex></a></ex></ph> |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_COMPLETE_SETUP_SUMMARY" desc="The message displayed asking the user to sign out and complete their device setup."> |
+ Sign out and complete setup |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_DISABLE_EXTENSION_SUMMARY" desc="When a page fails to load, we provide a suggestion that the user try disabling the extension that's blocking it."> |
+ Disabling your extensions |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_GOOGLE_SEARCH" desc="When a page fails to load, sometimes we suggest a specific Google search."> |
+ Search Google for <ph name="LINK"><a jsvalues="href:searchUrl;.jstdata:$this" onmousedown="linkClicked(this.jstdata)" jscontent="searchTerms"><ex>Example search terms</ex></a></ph> |
+ </message> |
+ <if expr="is_ios or is_android"> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_TURN_OFF_AIRPLANE" desc="When a page fails to load and the device is offline, we provide a suggestion that the user try turning off airplane mode."> |
+ Turning off airplane mode |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_TURN_ON_DATA" desc="When a page fails to load and the device is offline, we provide a suggestion that the user try turning on their mobile data or Wi-Fi."> |
+ Turning on mobile data or Wi-Fi |
+ </message> |
+ <message name="IDS_ERRORPAGES_SUGGESTION_CHECKING_SIGNAL" desc="When a page fails to load and the device is offline, we provide a suggestion that the user check their mobile signal."> |
+ Checking the signal in your area |
+ </message> |
+ </if> |
+ |
<!-- iOS specific error page messages --> |
<if expr="is_ios"> |
<message name="IDS_ERRORPAGES_HEADING_DOWNLOAD_FILE_TYPE_ERROR" desc="A one-line title for error message to tell user that the requested type of file cannot be downloaded. [Length: 20em]"> |