| Index: chrome/app/chromium_strings.grd
|
| ===================================================================
|
| --- chrome/app/chromium_strings.grd (revision 192546)
|
| +++ chrome/app/chromium_strings.grd (working copy)
|
| @@ -890,46 +890,40 @@
|
| </message>
|
|
|
| <!-- Network Error Pages -->
|
| - <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION" desc="When a page fails to load, sometimes we suggest disabling network prediction.">
|
| - Try disabling network prediction by following these steps:
|
| + <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY" desc="When a page fails to load, sometimes we suggest disabling predicting network actions. These are details below a header.">
|
| Go to
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| the Chromium menu >
|
| <ph name="SETTINGS_TITLE"><span jscontent="settingsTitle"></span><ex>Settings</ex></ph>
|
| >
|
| <ph name="ADVANCED_TITLE"><span jscontent="advancedTitle"></span><ex>Under the Hood</ex></ph>
|
| - <ph name="END_BOLD"></strong></ph>
|
| and deselect "<ph name="NO_PREFETCH_DESCRIPTION"><span jscontent="noNetworkPredictionTitle"></span><ex>Predict network actions to improve page load performance</ex></ph>."
|
| If this does not resolve the issue, we recommend selecting this option
|
| again for improved performance.
|
| </message>
|
| + <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
|
| + Allow Chromium to access the network in your firewall or antivirus
|
| + settings.
|
| + </message>
|
| <if expr="is_macosx and not pp_ifdef('ios')">
|
| <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
|
| Go to
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| Applications > System Preferences > Network > Advanced > Proxies
|
| - <ph name="END_BOLD"></strong></ph>
|
| and deselect any proxies that have been selected.
|
| </message>
|
| </if>
|
| <if expr="pp_ifdef('chromeos')">
|
| <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="ChromeOS instructions for disabling use of a proxy server.">
|
| Go to
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| the Chromium menu >
|
| <ph name="SETTINGS_TITLE"><span jscontent="settingsTitle"></span><ex>Settings</ex></ph>
|
| >
|
| <ph name="INTERNET_TITLE"><span jscontent="internetTitle"></span><ex>Internet</ex></ph>
|
| >
|
| "<ph name="OPTIONS_BUTTON"><span jscontent="optionsButton"></span><ex>Options...</ex></ph>"
|
| - <ph name="END_BOLD"></strong></ph>
|
| (for the current Network). If the
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| "<ph name="PROXY_BUTTON"><span jscontent="proxyButton"></span><ex>Change proxy settings...</ex></ph>"
|
| - <ph name="END_BOLD"></strong></ph>button (in the
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| + button (in the
|
| <ph name="NETWORK_TAB"><span jscontent="networkTab"></span><ex>Network</ex></ph>
|
| - <ph name="END_BOLD"></strong></ph>
|
| tab) is present, click on that and make sure your configuration
|
| is set to "Direct".
|
| </message>
|
| @@ -941,21 +935,18 @@
|
| <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')">
|
| <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
|
| Go to
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| the Chromium menu >
|
| <ph name="SETTINGS_TITLE"><span jscontent="settingsTitle"></span><ex>Settings</ex></ph>
|
| >
|
| <ph name="ADVANCED_TITLE"><span jscontent="advancedTitle"></span><ex>Under the Hood</ex></ph>
|
| >
|
| <ph name="PROXIES_TITLE"><span jscontent="proxyTitle"></span><ex>Change proxy settings...</ex></ph>
|
| - <ph name="END_BOLD"></strong></ph>
|
| and make sure your configuration is set to "no proxy" or "direct."
|
| </message>
|
| </if>
|
| <if expr="is_win">
|
| <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server.">
|
| Go to
|
| - <ph name="BEGIN_BOLD"><strong></ph>
|
| the Chromium menu >
|
| <ph name="SETTINGS_TITLE"><span jscontent="settingsTitle"></span><ex>Settings</ex></ph>
|
| >
|
| @@ -964,7 +955,6 @@
|
| <ph name="PROXIES_TITLE"><span jscontent="proxyTitle"></span><ex>Change proxy settings...</ex></ph>
|
| >
|
| LAN Settings
|
| - <ph name="END_BOLD"></strong></ph>
|
| and deselect the "Use a proxy server for your LAN" checkbox.
|
| </message>
|
| </if>
|
|
|