diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-21 21:34:40 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-30 13:29:15 +0100 |
| commit | 097811cda7f1e18d279673d1025c815e67cb598a (patch) | |
| tree | b5ce4f0dc58df267ca6981760087d659117bd671 /android | |
| parent | b200d761d3dffaafeac3254a421a24f78968f61c (diff) | |
| download | external_chromium-097811cda7f1e18d279673d1025c815e67cb598a.zip external_chromium-097811cda7f1e18d279673d1025c815e67cb598a.tar.gz external_chromium-097811cda7f1e18d279673d1025c815e67cb598a.tar.bz2 | |
Merge Chromium at r11.0.696.0: New autofill strings
Added upstream in CLs:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=71089&r2=75368&pathrev=77261
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=77166&pathrev=77261
Related frameworks/base change:
https://android-git.corp.google.com/g/#change,118057
Change-Id: I49cbc1fb3ee9279ce8f23cba01dc51e5cf41c738
Diffstat (limited to 'android')
| -rw-r--r-- | android/ui/base/l10n/l10n_util.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/android/ui/base/l10n/l10n_util.h b/android/ui/base/l10n/l10n_util.h index 2270bf6..5599042 100644 --- a/android/ui/base/l10n/l10n_util.h +++ b/android/ui/base/l10n/l10n_util.h @@ -71,9 +71,28 @@ #define IDS_AUTOFILL_EXPIRATION_DATE_RE 38 #define IDS_AUTOFILL_CARD_IGNORED_RE 39 #define IDS_AUTOFILL_FAX_RE 40 +#define IDS_AUTOFILL_COUNTRY_CODE_RE 41 +#define IDS_AUTOFILL_AREA_CODE_NOTEXT_RE 42 +#define IDS_AUTOFILL_PHONE_PREFIX_SEPARATOR_RE 43 +#define IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE 44 +// The following strings that contain 'DIALOG' are not used on Android, but are +// listed here to avoid extra ifdefs. They have not been added to the framework +// strings.xml. +#define IDS_AUTOFILL_DIALOG_PROVINCE 45 +#define IDS_AUTOFILL_DIALOG_POSTAL_CODE 46 +#define IDS_AUTOFILL_DIALOG_STATE 47 +#define IDS_AUTOFILL_DIALOG_ZIP_CODE 48 +#define IDS_AUTOFILL_DIALOG_COUNTY 49 +#define IDS_AUTOFILL_DIALOG_ISLAND 50 +#define IDS_AUTOFILL_DIALOG_DISTRICT 51 +#define IDS_AUTOFILL_DIALOG_DEPARTMENT 52 +#define IDS_AUTOFILL_DIALOG_PREFECTURE 53 +#define IDS_AUTOFILL_DIALOG_PARISH 54 +#define IDS_AUTOFILL_DIALOG_AREA 55 +#define IDS_AUTOFILL_DIALOG_EMIRATE 56 // Don't forget to update the count if you add a new message ID! // (And also update frameworks/base/core/java/android/webkit/L10nUtils.java) -#define ANDROID_L10N_IDS_MESSAGE_COUNT 41 +#define ANDROID_L10N_IDS_MESSAGE_COUNT 57 namespace l10n_util { string16 GetStringUTF16(int message_id); |