diff options
| author | Walter Jang <wjang@google.com> | 2016-11-07 16:51:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-07 16:51:56 +0000 |
| commit | 9f523b4c20d5f69ae570ed33f1fba2dfbd8a8a70 (patch) | |
| tree | 9921b4a19275cea59dba22f7bf2a711fca3ad275 /res | |
| parent | 9ee7b1f6eec12939eb47847e5600c9c114d6a889 (diff) | |
| parent | f5a9e9aa15495fbf458d311038774e6c40253450 (diff) | |
| download | android_packages_apps_ContactsCommon-9f523b4c20d5f69ae570ed33f1fba2dfbd8a8a70.tar.gz android_packages_apps_ContactsCommon-9f523b4c20d5f69ae570ed33f1fba2dfbd8a8a70.tar.bz2 android_packages_apps_ContactsCommon-9f523b4c20d5f69ae570ed33f1fba2dfbd8a8a70.zip | |
resolve merge conflicts of e20a370 to mnc-dev am: 4718349e14 am: 7050d9a243
am: f5a9e9aa15
Change-Id: Ia8c57dd0f638554f186b623f7c99c9ac3c100677
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index fab8e973..95199fe0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -431,6 +431,9 @@ a ren't members of any other group. [CHAR LIMIT=25] --> <!-- Action string for selecting a .vcf file to import contacts from [CHAR LIMIT=30] --> <string name="import_from_vcf_file" product="default">Import from .vcf file</string> + <!-- Dialog message asking the user for confirmation before starting to import contacts from a .vcf file. [CHAR LIMIT=NONE] --> + <string name="import_from_vcf_file_confirmation_message" product="default">Import contacts from vCard?</string> + <!-- Message shown in a Dialog confirming a user's cancel request toward existing vCard import. The argument is file name for the vCard import the user wants to cancel. [CHAR LIMIT=128] --> |