Network errors, hide suggestions less relevant on mobile platforms

components/components_google_chrome_strings.grd

 <?xml version="1.0" encoding="utf-8"?>
 
 <grit latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/components_google_chrome_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
     <output filename="components_google_chrome_strings_am.pak" type="data_package" lang="am" />
     <output filename="components_google_chrome_strings_ar.pak" type="data_package" lang="ar" />
@@ skipping 115 matching lines @@
     <file path="strings/components_google_chrome_strings_th.xtb" lang="th" />
     <file path="strings/components_google_chrome_strings_tr.xtb" lang="tr" />
     <file path="strings/components_google_chrome_strings_uk.xtb" lang="uk" />
     <file path="strings/components_google_chrome_strings_vi.xtb" lang="vi" />
     <file path="strings/components_google_chrome_strings_zh-CN.xtb" lang="zh-CN" />
     <file path="strings/components_google_chrome_strings_zh-TW.xtb" lang="zh-TW" />
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
       <!-- Network Error Pages -->
-      <if expr="not is_android">
+      <if expr="not is_android and not is_ios">
         <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 for non Android devices.">
           Go to
           the Chrome 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>
           and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent="noNetworkPredictionTitle"&gt;&lt;/span&gt;<ex>Use a prediction service to load pages more quickly</ex></ph>.&quot;
           If this does not resolve the issue, we recommend selecting this option
           again for improved performance.
         </message>
-      </if>
-      <if expr="is_android">
-        <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 for Android devices.  Note that on devices without mobile network (3G) capability, the setting is a checkbox, while on other devices, it is a list of three items.  The words _disable_ and _re-enabling_ can be used for both cases.">
-          Go to the Chrome menu &gt; Settings &gt; (Advanced) Privacy
-          and disable &quot;Prefetch page resources.&quot;
-          If this does not resolve the issue, we recommend re-enabling this option
-          again for improved performance.
+        <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 Chrome to access the network in your firewall or antivirus

[jochen (gone - plz use gerrit), 2016/03/15 20:30:42]

why do we have chrome/chromium checked into strings instead of $PRODUCT_NAME or
whatever the grd macro is called?

[mmenke, 2016/03/15 20:34:00]

Nouns inflect in various languages, so can't just swap them in.  Using
IDS_PRODUCT_NAME is an anti-pattern that can't be internationalized.

+          settings.
         </message>
       </if>
-      <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 Chrome to access the network in your firewall or antivirus
-        settings.
-      </message>
       <message name="IDS_ERRORPAGES_SUMMARY_BLOCKED_ENROLLMENT_CHECK_PENDING" desc="Summary in the error page when the user tries to browse before the forced enrollment check has finished.">
         Chrome OS hasn’t completed its initial setup.
       </message>
       <if expr="is_macosx">
         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
           Go to
           Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
           and deselect any proxies that have been selected.
         </message>
       </if>
-      <if expr="is_android or is_ios">
-        <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
-        </message>
-      </if>
       <if expr="not chromeos and is_posix and not is_macosx and not is_android and not is_ios">
         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
           Go to
           the Chrome 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>
           and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
@@ skipping 40 matching lines @@
       <message name="IDS_PAGE_INFO_INTERNAL_PAGE" desc="Message to display in the page info bubble when the page you are on is a chrome:// page or about:something.">
         You are viewing a secure Google Chrome page.
       </message>
 
       <message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
         Chrome didn't shut down correctly.
       </message>
     </messages>
   </release>
 </grit>