Revert 120803 - [uber] Redoing the homepage selection UI

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.  The variables is_win, is_macosx, is_linux, and is_posix are available
 for making strings OS specific.  Other platform defines such as use_titlecase
 are declared in build/common.gypi.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
@@ skipping 8111 matching lines @@
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_STARTUP_GROUP_NAME" desc="In Title Case: The title of the startup group">
           On Startup
         </message>
       </if>
       <message name="IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB" desc="The label of the 'Show home page' startup option radio button">
         Open the home page
       </message>
-      <message name="IDS_OPTIONS2_STARTUP_SHOW_DEFAULT_AND_NEWTAB" desc="The label of the 'Show New Tab page' startup option radio button">
-        Open the New Tab page
-      </message>
       <message name="IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION" desc="The label of the 'Restore previously open pages' startup option radio button">
         Reopen the pages that were open last
       </message>
       <message name="IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION" desc="The label of the 'Restore the pages to where I left off' startup option radio button">
         Restore the pages to where I left off
       </message>
       <message name="IDS_OPTIONS_STARTUP_SHOW_PAGES" desc="The label of the 'Show these pages:' startup option radio button on the old settings page">
         Open the following pages:
       </message>
       <message name="IDS_OPTIONS2_STARTUP_SHOW_PAGES" desc="The label of the 'Show these pages:' startup option radio button">
@@ skipping 32 matching lines @@
         </message>
         <message name="IDS_OPTIONS_STARTUP_USE_CURRENT" desc="In sentence case: The label of the 'Use Current' button for the custom startup urls list">
           Use current pages
         </message>
         <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES" desc="In sentence case: The label of the 'Manage search engines' button">
           Manage search engines...
         </message>
       </if>
 
       <if expr="not pp_ifdef('use_titlecase')">
-        <message name="IDS_OPTIONS2_HOMEPAGE_NONE" desc="The option in the homepage selector indicating no home page">
-          None
-        </message>
-        <message name="IDS_OPTIONS2_HOMEPAGE_NTP" desc="The option in the homepage selector indicating the NTP is the home page">
-          New Tab page
-        </message>
-        <message name="IDS_OPTIONS2_HOMEPAGE_CHOOSE" desc="The option in the homepage selector for choosing a different home page">
-          Choose another...
-        </message>
         <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="The title of the home page group">
           Home page
         </message>
         <message name="IDS_OPTIONS2_HOMEPAGE_TITLE" desc="The title of the home page overlay">
           Home page
         </message>
         <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group">
           Toolbar
         </message>
         <message name="IDS_OPTIONS2_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group">
           Toolbar appearance
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
-        <message name="IDS_OPTIONS2_HOMEPAGE_NONE" desc="In Title Case: The option in the homepage selector indicating no home page">
-          None
-        </message>
-        <message name="IDS_OPTIONS2_HOMEPAGE_NTP" desc="In Title Case: The option in the homepage selector indicating the NTP is the home page">
-          New Tab Page
-        </message>
-        <message name="IDS_OPTIONS2_HOMEPAGE_CHOOSE" desc="In Title Case: The option in the homepage selector for choosing a different home page">
-          Choose Another...
-        </message>
         <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="In Title Case: The title of the home page group">
           Home Page
         </message>
         <message name="IDS_OPTIONS2_HOMEPAGE_TITLE" desc="In Title Case: The title of the home page overlay">
           Home Page
         </message>
         <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="In Title Case: The title of the toolbar group">
           Toolbar
         </message>
         <message name="IDS_OPTIONS2_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group">
           Toolbar Appearance
         </message>
       </if>
-      <message name="IDS_OPTIONS2_HOMEPAGE_DIALOG_LABEL" desc="The label for the homepage textbox in the dialog">
-        Home page:
-      </message>
-      <message name="IDS_OPTIONS2_HOMEPAGE" desc="The label for the homepage selector">
-        Home page:
-      </message>
       <message name="IDS_OPTIONS_HOMEPAGE_USE_NEWTAB" desc="The title of the 'Use the New Tab page' for the home page radio">
         Use the New Tab page
       </message>
       <message name="IDS_OPTIONS_HOMEPAGE_USE_URL" desc="The title of the 'Use this page' for the home page radio">
         Open this page:
       </message>
       <message name="IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON" desc="The label of the 'Show Home button' checkbox">
         Show Home button
       </message>
       <message name="IDS_OPTIONS_CHANGE_HOME_PAGE" desc="The text of the button that allows the user to change her home page">
         Change page
       </message>
+      <message name="IDS_OPTIONS_SHOW_HOME_BUTTON_FOR_URL" desc="The label of the 'Show Home button' checkbox">
+        Show Home button for &lt;b&gt;<ph name="HOME_PAGE_URL">$1<ex>google.com/search</ex></ph>&lt;/b&gt;.
+      </message>
+      <message name="IDS_OPTIONS_SHOW_HOME_BUTTON_FOR_NTP" desc="The label of the 'Show Home button' checkbox">
+        Show Home button for the &lt;b&gt;New Tab Page&lt;/b&gt;.
+      </message>
       <message name="IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR" desc="The label of the 'Show bookmarks bar' checkbox">
         Always show the bookmarks bar
       </message>
 
       <if expr="not pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group">
           Search
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
@@ skipping 6852 matching lines @@
     </messages>
     <structures fallback_to_english="true">
       <!-- Make sure these stay in sync with the structures in generated_resources.grd. -->
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" >
       </structure>
       <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" type="dialog" >
       </structure>
     </structures>
   </release>
 </grit>