Revert of Credit card editor for PaymentRequest UI.

chrome/android/java/strings/android_chrome_strings.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- android_chrome_strings.grd contains strings for Chrome for Android.
 
 FAQ:
   - How do I add, change, or remove a string?
       Just update this file.
   - Translations will happen automatically??
       Yes, indeed. Just add your string before the branch point and
       make the description good.
@@ skipping 2584 matching lines @@
         No devices found.
       </message>
       <message name="IDS_USB_CHOOSER_DIALOG_CONNECT_BUTTON_TEXT" desc="The text that is shown on the connect button in the USB chooser dialog.">
         Connect
       </message>
       <message name="IDS_USB_CHOOSER_DIALOG_FOOTNOTE_TEXT" desc="This text is shown at the bottom of the USB chooser dialog with a link to part of its text.">
         Not seeing your device? <ph name="BEGIN_LINK">&lt;link&gt;</ph>Get help<ph name="END_LINK">&lt;/link&gt;</ph>
       </message>
 
       <!-- Payments -->
-      <message name="IDS_PAYMENTS_SAVE_CARD_TO_DEVICE_CHECKBOX" desc="The label for the checkbox that enables the user to save a credit card to their device, for example, on their phone.">
-        Save this card to this device
-      </message>
-      <message name="IDS_PAYMENTS_ACCEPTED_CARDS_LABEL" desc="The title for the section that displays the credit card types that the merchant accepts.">
-        Cards accepted
-      </message>
       <message name="IDS_PAYMENTS_METHOD_OF_PAYMENT_LABEL" desc="The title for the section that lets the user select the method of payment.">
         Payment
       </message>
-      <message name="IDS_PAYMENTS_SELECT_METHOD_OF_PAYMENT_PROMPT" desc="The label for the button that presents the user with the list of possible methods of payments, for example a list of their credit cards..">
-        Select payment method
-      </message>
       <message name="IDS_PAYMENTS_CONTACT_DETAILS_LABEL" desc="The title for the section that lets the user select how they can be contacted.">
         Contact info
       </message>
       <message name="IDS_PAYMENTS_SELECT_CONTACT_DETAILS_PROMPT" desc="The label for the button that presents the user with the list of possible phone numbers and email addresses where the user can be reached.">
         Select contact details
       </message>
-      <message name="IDS_PAYMENTS_ADD_CONTACT_DETAILS_LABEL" desc="The title of the dialog for user to add new contact information, such as email address or phone number.">
-        Add contact info
-      </message>
-      <message name="IDS_PAYMENTS_EDIT_CONTACT_DETAILS_LABEL" desc="The title of the dialog for user to edit their contact information, such as email address or phone number.">
-        Edit contact info
-      </message>
       <message name="IDS_PAYMENTS_SHIPPING_SUMMARY_LABEL" desc="The title for the section of shipping information.">
         Shipping
       </message>
       <message name="IDS_PAYMENTS_SHIPPING_ADDRESS_LABEL" desc="The title for the section that lets the user select the address where the product should be shipped.">
         Shipping address
       </message>
       <message name="IDS_PAYMENTS_SHIPPING_OPTION_LABEL" desc="The title for the section that lets the user select how the product should be shipped.">
         Shipping option
       </message>
       <message name="IDS_PAYMENTS_SELECT_SHIPPING_PROMPT" desc="The label for the button that presents the user with the list of possible shipping addresses and options.">
         Select shipping
       </message>
       <message name="IDS_PAYMENTS_SELECT_SHIPPING_OPTION_PROMPT" desc="The label for the button that presents the user with the list of possible shipping options.">
         Select shipping option
       </message>
       <message name="IDS_PAYMENTS_SELECT_SHIPPING_ADDRESS_PROMPT" desc="The label for the button that presents the user with the list of possible shipping addresses.">
         Select shipping address
       </message>
       <message name="IDS_PAYMENTS_ORDER_SUMMARY_LABEL" desc="The title of the section that shows the summary of the order, including names and prices of individual line items, i.e. the bill.">
         Order summary
       </message>
+      <message name="IDS_PAYMENTS_ADD_CONTACT_DETAILS_LABEL" desc="The title of the dialog for user to add new contact information, such as email address or phone number.">
+        Add contact info
+      </message>
+      <message name="IDS_PAYMENTS_EDIT_CONTACT_DETAILS_LABEL" desc="The title of the dialog for user to edit their contact information, such as email address or phone number.">
+        Edit contact info
+      </message>
+      <message name="IDS_PAYMENTS_ADD_ADDRESS_LABEL" desc="The title of the dialog for user to add a new address, such as shipping address or billing address.">
+        Add address
+      </message>
+      <message name="IDS_PAYMENTS_EDIT_ADDRESS_LABEL" desc="The title of the dialog for user to edit their address, such as shipping address or billing address.">
+        Edit address
+      </message>
       <message name="IDS_PAYMENTS_EDIT_BUTTON" desc="The label for the button that lets the user edit their payment options.">
         Edit
       </message>
+      <message name="IDS_PAYMENTS_CANCEL_BUTTON" desc="The label for the button that cancels the pending payment operation.">
+        Cancel
+      </message>
       <message name="IDS_PAYMENTS_PAY_BUTTON" desc="The label for the button that finishes the payment process.">
         Pay
       </message>
       <message name="IDS_PAYMENTS_LOADING_MESSAGE" desc="The text that informs the user that payment information is being loaded up.">
         Loading
       </message>
       <message name="IDS_PAYMENTS_PROCESSING_MESSAGE" desc="The text that informs the user that the payment is being verified and charged.">
         Processing
       </message>
       <message name="IDS_PAYMENTS_SUCCESS_MESSAGE" desc="The text that informs the user that the payment has been verified and charged.">
         Payment processed
       </message>
       <message name="IDS_PAYMENTS_ERROR_MESSAGE" desc="The text that informs the user that there is error in verifying and charging the payment.">
         There was an error processing your order.  Please check your account and try again.
       </message>
       <message name="IDS_PAYMENTS_REQUIRED_FIELD_MESSAGE" desc="The text that informs the user that '*' character indicates an input field that is required. The '*' character should not be changed.">
         * indicates required field
       </message>
-      <message name="IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE" desc="The text that informs the user that an input field is required.">
+      <message name="IDS_PAYMENTS_ADDRESS_FIELD_REQUIRED_VALIDATION_MESSAGE" desc="The text that informs the user that an address field is required.">
         Required field
       </message>
+      <message name="IDS_PAYMENTS_PHONE_REQUIRED_VALIDATION_MESSAGE" desc="The text that informs the user that phone number is required.">
+        Phone number required
+      </message>
       <message name="IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE" desc="The text that informs the user that the phone number they have entered is not valid.">
         Invalid phone number
       </message>
+      <message name="IDS_PAYMENTS_EMAIL_REQUIRED_VALIDATION_MESSAGE" desc="The text that informs the user that email address is required.">
+        Email address required
+      </message>
       <message name="IDS_PAYMENTS_EMAIL_INVALID_VALIDATION_MESSAGE" desc="The text that informs the user that the email address they have entered is not valid.">
         Invalid email address
       </message>
-      <message name="IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE" desc="The text that informs the user that the credit card number they have entered is not valid.">
-        Invalid card number
-      </message>
       <message name="IDS_PAYMENTS_ADD_CONTACT" desc="Text on a button that lets a user add new contact details, like phone number or email address.">
         Add contact info
       </message>
+      <message name="IDS_PAYMENTS_ADD_ADDRESS" desc="Text on a button that lets a user add a new shipping address.">
+        Add address
+      </message>
+      <message name="IDS_PAYMENTS_ADD_PAYMENT_INSTRUMENT" desc="Text on a button that lets a user add a new payment method, like a credit card.">
+        Add card
+      </message>
       <message name="IDS_PAYMENTS_SELECT_SHIPPING_ADDRESS_FOR_SHIPPING_METHODS" desc="Text implying that a user needs to pick a shipping address to see the shipping methods.">
         Select a shipping address to check shipping methods.
       </message>
       <message name="IDS_PAYMENTS_CHECKING_OPTION" desc="Text explaining that the option the user selected is being checked and verified.">
         Checking
       </message>
       <message name="IDS_PAYMENTS_UNSUPPORTED_SHIPPING_ADDRESS" desc="Text implying that a user needs to pick a different shipping address, because the currently selected address is not supported.">
         Unsupported shipping address. Select a different adddress.
       </message>
 
       <!-- Migration strings -->
       <message name="IDS_TAB_SWITCHER_CALLOUT_HEADER" desc="Header for the Tab Switcher callout.">
         Quickly switch tabs
       </message>
       <message name="IDS_TAB_SWITCHER_CALLOUT_BODY" desc="Indicates that clicking the tab switcher button gives you quick access to your tabs.">
         Tap this button for quick access to your tabs.
       </message>
 
       <!-- Item Chooser UI strings -->
       <message name="IDS_ITEM_CHOOSER_ITEM_NAME_WITH_ID" desc="To distinguish items with the same name, the item chooser shows the item name with id.">
         <ph name="ITEM_NAME">%1$s<ex>item_name</ex></ph> (<ph name="ITEM_ID">%2$s<ex>item id</ex></ph>)
       </message>
     </messages>
   </release>
 </grit>