| Index: chrome/app/generated_resources.grd
|
| ===================================================================
|
| --- chrome/app/generated_resources.grd (revision 191716)
|
| +++ chrome/app/generated_resources.grd (working copy)
|
| @@ -9319,54 +9319,58 @@
|
| </message>
|
| </if>
|
|
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_HEADING" desc="Heading in the error page above the actual suggestions">
|
| - Here are some suggestions:
|
| + <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_DISABLE_EXTENSION" 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 <ph name="BEGIN_LINK"><a jsvalues="href:reloadUrl"></ph>reload<ph name="END_LINK"></a><ex></a></ex></ph> this webpage.
|
| + <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>
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_HOMEPAGE" desc="When a page fails to load, sometimes we provide a suggesting of trying just the hostname of the site.">
|
| - Go to the home page of the site:
|
| + <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY" desc="When a page fails to load, sometimes we suggest checking the network connections. This contains details below the suggestion.">
|
| + Check any cables and reboot any routers, modems, or other network
|
| + devices you may be using.
|
| </message>
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION" desc="When a page fails to load, sometimes we suggest checking the network connection.">
|
| - Check your Internet connection. Restart any router, modem, or other
|
| - network devices you may be using.
|
| + <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" desc="When a page fails to load, sometimes we suggest checking the DNS configuration.">
|
| - Check your DNS settings. Contact your network administrator if you're
|
| - not sure what this means.
|
| + <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_FIREWALL_CONFIG" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall.">
|
| - Add
|
| - <ph name="PRODUCT_NAME"><span jscontent="productName"></span><ex>Google Chrome</ex></ph>
|
| - as a permitted program in your firewall's or antivirus software's settings. If it is
|
| - already a permitted program, try deleting it from the list of permitted programs
|
| - and adding it again.
|
| + <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="pp_ifdef('android') or pp_ifdef('ios')">
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server.">
|
| - If you use a proxy server, 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>
|
| + <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.
|
| </message>
|
| </if>
|
| <if expr="not pp_ifdef('android') and not pp_ifdef('ios')">
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server.">
|
| - If you use a proxy server, check your proxy settings or contact your
|
| - network administrator to make sure the proxy server is working. If you
|
| - don't believe you should be using a proxy server, adjust your proxy
|
| - settings:
|
| + <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
|
| + be using a proxy server:
|
| <ph name="PLATFORM_TEXT">$1<ex>Goto the wrench menu and choose Fix It.</ex></ph>
|
| </message>
|
| </if>
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_LEARNMORE" desc="When a webpage fails to load, we provide a link to the help center to learn more about the failure.">
|
| - <ph name="BEGIN_LINK"><a jsvalues="href:learnMoreUrl"></ph>Learn more<ph name="END_LINK"></a><ex></a></ex></ph> about this problem.
|
| + <message name="IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY" desc="When a webpage fails to load, we provide a link to the help center to learn more about the failure.">
|
| + <ph name="BEGIN_LINK"><a jsvalues="href:learnMoreUrl"></ph>Learn more<ph name="END_LINK">
|
| + </a><ex></a></ex>
|
| + </ph> about this problem.
|
| </message>
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES" desc="When a webpage fails to load, sometimes we suggest to the user to view the current policies.">
|
| + <message name="IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_HEADER" desc="When a webpage fails to load, sometimes we suggest to the user to view the current policies. This is a header above some instructions.">
|
| + Check your administrator's policies.
|
| + </message>
|
| + <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" desc="When a webpage fails to load, sometimes we suggest to the user to contact his system administrator.">
|
| + <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>
|
|
|
|
|