Some new strings for setup.exe safeguard.

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 409 matching lines @@
       </message>
       <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chromium version is missing from registry but the installation directory exists and can not be deleted.">
         Chromium installation directory seems to be in use. Please reboot your computer and try again.
       </message>
       <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Chromium or Chromium Frame is present, thereby preventing the installation of a multi-install Chromium or Chromium Frame.">
         A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again.
       </message>
       <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Chromium or Chromium Frame is present, thereby preventing the installation of a single-install Chromium or Chromium Frame.">
         A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again.
       </message>
+      <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Chromium on a different update channel exists when installing Chromium Frame.">
+        A conflicting installation of Chromium was found on the system. Please uninstall it and try again.
+      </message>
       <!-- Options Dialog -->
       <!--TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.-->
       <message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
         Chromium may use web services to improve your browsing experience. You may optionally disable these services.
       </message>
       <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
         Chromium may use web services to improve your browsing experience.
       </message>
       <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
         Chromium is now importing Favorites/Bookmarks.
@@ skipping 88 matching lines @@
         <message name="IDS_PROFILEIMPORTER_APP_NAME" desc="The profile importer application's name.  Should contain the Chrome application name (IDS_PRODUCT_NAME). Example: Google Chrome Profile Importer.">
           Chromium Profile Importer
         </message>
         <message name="IDS_SHORT_PROFILEIMPORTER_APP_NAME" desc="The profile importer application's short name, used for the Mac's application menu, activity monitor, etc. Example: Chrome Profile Importer, not Google Chrome Profile Importer.">
           Chromium Profile Importer
         </message>
       </if>
     </messages>
   </release>
 </grit>