diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 19:22:01 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 19:22:01 +0000 |
| commit | 9bc27ae5fd8594aff8e46abf187d81f246c14800 (patch) | |
| tree | 9331250334c53f15c3b823377e2bd04a5b921c5c /chrome/app/generated_resources.grd | |
| parent | bf76e90117db943f58a53bd53e7fd044cd1152ee (diff) | |
| download | chromium_src-9bc27ae5fd8594aff8e46abf187d81f246c14800.zip chromium_src-9bc27ae5fd8594aff8e46abf187d81f246c14800.tar.gz chromium_src-9bc27ae5fd8594aff8e46abf187d81f246c14800.tar.bz2 | |
Revert 195569 "retry 195316 "Remove "Use billing for shipping" c..."
Breaks compile on Linux and Linux ChromiumOS.
> retry 195316 "Remove "Use billing for shipping" checkbox in fav..."
>
> this time, don't break Mac.
>
> BUG=225093
> TBR=sky@chromium.org,isherman@chromium.org,aruslan@chromium.org,sail@chromium.org
>
> Review URL: https://codereview.chromium.org/13879013
TBR=estade@chromium.org
Review URL: https://codereview.chromium.org/14146008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
| -rw-r--r-- | chrome/app/generated_resources.grd | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 3cbb1d4..00a71f2 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -10687,8 +10687,8 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" <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 @@ -10704,36 +10704,18 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" <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."> |