New network error pages: Update format of suggestions.

chrome/app/chromium_strings.grd

 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This file contains definitions of strings that are distribution specific.
 These strings will not be translated and only english versions will
 be available for now. -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/chromium_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
@@ skipping 872 matching lines @@
       </message>
 
       <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
         Chromium Autofill settings
       </message>
       <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox that controls whether info the user types into the autofill dialog is saved by chrome.">
         Save details in Chromium
       </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">&lt;strong&gt;</ph>
         the Chromium menu &gt;
         <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
         &gt;
         <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
-        <ph name="END_BOLD">&lt;/strong&gt;</ph>
         and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent="noNetworkPredictionTitle"&gt;&lt;/span&gt;<ex>Predict network actions to improve page load performance</ex></ph>.&quot;
         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">&lt;strong&gt;</ph>
           Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
-          <ph name="END_BOLD">&lt;/strong&gt;</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">&lt;strong&gt;</ph>
           the Chromium menu &gt;
           <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
           &gt;
-          <ph name="INTERNET_TITLE">&lt;span jscontent="internetTitle"&gt;&lt;/span&gt;<ex>Internet</ex></ph>
+          <ph name="INTERNET_GROUP">&lt;span jscontent="internetGroup"&gt;&lt;/span&gt;<ex>Internet connections</ex></ph>
           &gt;
-          &quot;<ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt;&lt;/span&gt;<ex>Options...</ex></ph>&quot;
-          <ph name="END_BOLD">&lt;/strong&gt;</ph>
-          (for the current Network). If the
-          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
-          &quot;<ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>&quot;
-          <ph name="END_BOLD">&lt;/strong&gt;</ph>button (in the
-          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
-          <ph name="NETWORK_TAB">&lt;span jscontent="networkTab"&gt;&lt;/span&gt;<ex>Network</ex></ph>
-          <ph name="END_BOLD">&lt;/strong&gt;</ph>
-          tab) is present, click on that and make sure your configuration
-          is set to &quot;Direct&quot;.
-        </message>
-      </if>
-      <if expr="pp_ifdef('android') or pp_ifdef('ios')">
-        <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
+          Select the current network twice

[ericroman, 2013/04/06 00:22:08]

What does selecting twice mean?

[mmenke, 2013/04/08 15:35:47]

Should be "click twice".  Decided to move this change to  another CL, for
sanity's sake.

+          >
+          <ph name="PROXY_TAB">&lt;span jscontent="proxyTab"&gt;&lt;/span&gt;<ex>Proxy</ex></ph>
+          and make sure
+          &quot;<ph name="DIRECT_LABEL">&lt;span jscontent="directConnection"&gt;&lt;/span&gt;<ex>Direct Internet connection</ex></ph>.&quot;
+          is selected.
         </message>
       </if>
       <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">&lt;strong&gt;</ph>
           the Chromium menu &gt;
           <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
           &gt;
           <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
           &gt;
           <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
-          <ph name="END_BOLD">&lt;/strong&gt;</ph>
           and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
         </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">&lt;strong&gt;</ph>
           the Chromium menu &gt;
           <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
           &gt;
           <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
           &gt;
           <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
           &gt;
           LAN Settings
-          <ph name="END_BOLD">&lt;/strong&gt;</ph>
           and deselect the &quot;Use a proxy server for your LAN&quot; checkbox.
         </message>
       </if>
 
       <!-- Chrome OS keyboard overlay-->
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu.">
           Show the Chromium menu
         </message>
       </if>
@@ skipping 11 matching lines @@
 
       <!-- Chrome OS OOBE Terms of Service screen-->
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
           <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read and accept the following Terms of Service before using this device. These terms do not expand, modify or limit the Chromium OS Terms.
         </message>
       </if>
     </messages>
   </release>
 </grit>