Revert 195316 "Remove "Use billing for shipping" checkbox in fav..."

trunk/src/chrome/app/generated_resources.grd

Index: trunk/src/chrome/app/generated_resources.grd
===================================================================
--- trunk/src/chrome/app/generated_resources.grd	(revision 195318)
+++ trunk/src/chrome/app/generated_resources.grd	(working copy)
@@ -10678,8 +10678,8 @@
       <message name="IDS_AUTOFILL_DIALOG_SECTION_SHIPPING" desc="Label for the shipping details section of the autofill dialog.">
         Shipping details
       </message>
-      <message name="IDS_AUTOFILL_DIALOG_USING_BILLING_FOR_SHIPPING" desc="Text that is shown when the billing info will also be used for shipping.">
-        Same as billing
+      <message name="IDS_AUTOFILL_DIALOG_USE_BILLING_FOR_SHIPPING" desc="Checkbox label that asks whether the billing info should also be used for shipping info.">
+        Use billing address for shipping
       </message>
       <message name="IDS_AUTOFILL_DIALOG_SUBMIT_BUTTON" desc="Button text for confirmation of user details.">
         Submit
@@ -10695,36 +10695,18 @@
       <message name="IDS_AUTOFILL_DIALOG_ADD_EMAIL_ADDRESS" desc="Menu item for adding a new email address in the autofill dialog.">
         Add email address...
       </message>
-      <message name="IDS_AUTOFILL_DIALOG_MANAGE_EMAIL_ADDRESS" desc="Menu item for directing the user to a different UI that can manage email addresses.">
-        Manage email addresses...
-      </message>
       <message name="IDS_AUTOFILL_DIALOG_ADD_CREDIT_CARD" desc="Menu item for adding a new credit card in the autofill dialog.">
         Add credit card...
       </message>
-      <message name="IDS_AUTOFILL_DIALOG_MANAGE_CREDIT_CARD" desc="Menu item for directing the user to a different UI that can manage credit cards.">
-        Manage credit cards...
-      </message>
       <message name="IDS_AUTOFILL_DIALOG_ADD_BILLING_ADDRESS" desc="Menu item for adding a new billing address in the autofill dialog.">
         Add billing address...
       </message>
-      <message name="IDS_AUTOFILL_DIALOG_MANAGE_BILLING_ADDRESS" desc="Menu item for directing the user to a different UI that can manage billing addresses.">
-        Manage billing addresses...
-      </message>
       <message name="IDS_AUTOFILL_DIALOG_ADD_BILLING_DETAILS" desc="Menu item for adding new billing details (credit card + address) in the autofill dialog.">
         Add billing details...
       </message>
-      <message name="IDS_AUTOFILL_DIALOG_MANAGE_BILLING_DETAILS" desc="Menu item for directing the user to a different UI that can manage billing details.">
-        Manage billing details...
-      </message>
       <message name="IDS_AUTOFILL_DIALOG_ADD_SHIPPING_ADDRESS" desc="Menu item for adding new shipping address in the autofill dialog.">
         Add shipping address...
       </message>
-      <message name="IDS_AUTOFILL_DIALOG_MANAGE_SHIPPING_ADDRESS" desc="Menu item for directing the user to a different UI that can manage shipping addresses.">
-        Manage shipping addresses...
-      </message>
-      <message name="IDS_AUTOFILL_DIALOG_USE_BILLING_FOR_SHIPPING" desc="Menu Item label that asks whether the billing info should also be used for shipping info.">
-        Use billing address for shipping
-      </message>
 
       <!-- Autofill dialog: legal documents -->
       <message name="IDS_AUTOFILL_DIALOG_PRIVACY_POLICY_LINK" desc="The text of an extra link that is appended to the end of whatever other legal documents need to be accepted or updated.">