Merge r33241 to the 249 branch....

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file contains definitions of resources that will be translated for
 each locale. -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/generated_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
@@ skipping 3281 matching lines @@
       <message name="IDS_CLEAR_DATA_4WEEKS" desc="deletion period combo box: 4 weeks">
         Last 4 weeks
       </message>
       <message name="IDS_CLEAR_DATA_EVERYTHING" desc="deletion period combo box: everything">
         Everything
       </message>
       <message name="IDS_CLEAR_DATA_DELETING" desc="The progress message">
         Clearing...
       </message>
 
+      <!-- Automatic updates -->
+      <if expr="os == 'darwin'">
+        <message name="IDS_PROMOTE_INFOBAR_TEXT" desc="The text to show in the automatic update setup info bar.  Mac-only.">
+          <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> may not be able to keep itself updated.
+        </message>
+        <message name="IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON" desc="The 'Set up automatic updates' button in the automatic update setup info bar.  Mac-only.">
+          Set up automatic updates
+        </message>
+        <message name="IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON" desc="The 'Don't ask again' button in the automatic update setup info bar.  Mac-only.">
+          Don't ask again
+        </message>
+        <message name="IDS_PROMOTE_AUTHENTICATION_PROMPT" desc="The prompt displayed in the authentication dialog when setting up automatic updates for all users.  The system will add a sentence asking for an administrator's name and password.  Mac-only.">
+          <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will set up automatic updates for all users of this computer.
+        </message>
+      </if>
+
       <!-- About Chrome View -->
       <message name="IDS_ABOUT_CHROME_ACKNOWLEDGEMENTS" desc="Acknowledgements link">
         Acknowledgements
       </message>
+      <if expr="os == 'darwin'">
+        <message name="IDS_ABOUT_CHROME_PROMOTE_UPDATER" desc="The 'Set Up Automatic Updates for All Users' button in the About window.  Mac-only.">
+          Set Up Automatic Updates for All Users
+        </message>
+      </if>
       <message name="IDS_ABOUT_CHROME_UPDATE_CHECK" desc="The Check for Updates button">
         Update Now
       </message>
       <message name="IDS_UPGRADE_CHECK_STARTED" desc="Status label: About to start checking for updates">
         Checking for updates...
       </message>
       <message name="IDS_UPGRADE_STARTED" desc="Status label: About to start updating Chrome">
         Installing new version...
       </message>
       <message name="IDS_UPGRADE_AVAILABLE" desc="Status label: A new version of Chrome is available">
@@ skipping 2807 matching lines @@
       <message name="IDS_STATUSBAR_BATTERY_IS_CHARGED" desc="In the power menu button, the battery is charged message.">
         Battery is charged
       </message>
       <message name="IDS_COMPACT_NAVBAR" desc="The menu item on the app menu to toggle compact navigation bar">
         Toggle Compact Navigation Bar
       </message>
     </if>
     </messages>
   </release>
 </grit>