Mac: Move prefs around in preparation for the content settings window.

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 5022 matching lines @@
         <message name="IDS_OPTIONS_COOKIES_RESTRICT_THIRD_PARTY_COOKIES" desc="In Title Case: The label of the 'Restrict third-party cookies' dropdown list item. This option accepts third-party cookies only from visited sites.">
           Accept Cookies Only from Sites I Visit
         </message>
         <message name="IDS_OPTIONS_COOKIES_BLOCK_THIRD_PARTY_COOKIES" desc="In Title Case: The label of the 'Block third-party cookies' dropdown list item. This option does not accept or send any third-party cookies.">
           Completely Block Third-Party Cookies
         </message>
         <message name="IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES" desc="In Title Case: The label of the 'Block all cookies' dropdown list item">
           Block All Cookies
         </message>
       </if>
-      <message name="IDS_OPTIONS_COOKIES_SHOWCOOKIES_WEBSITE_PERMISSIONS" desc="The label of the 'Show Cookies and Website Permissions' button. Website Permissions means you can set permissions for individual websites, such as google.com can do this, yahoo.com can do that.">
-        Show cookies and website permissions
-      </message>
       <message name="IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION" desc="The label of the 'Enable phishing and malware protection' checkbox">
         Enable phishing and malware protection
       </message>
 
       <message name="IDS_OPTIONS_SSL_GROUP_DESCRIPTION" desc="The description of the 'SSL Connections' group">
         Computer-wide SSL settings:
       </message>
       <message name="IDS_OPTIONS_SSL_USESSL2" desc="The label of the 'Use SSL 2.0' checkbox">
         Use SSL 2.0
       </message>
@@ skipping 1649 matching lines @@
       <message name="IDS_NOTIFICATION_PANEL_TITLE" desc="Text for the title of the notification panel.">
         Notifications
       </message>
     </if>
      <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing ">
        Import bookmarks now...
      </message>
     </messages>
   </release>
 </grit>