diff options
| author | Walter Jang <wjang@google.com> | 2016-11-09 18:15:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 18:15:17 +0000 |
| commit | b17ec04fc82a2f44a552879b9bbb580472ec1d4a (patch) | |
| tree | b90e93d61e90f4cd38e60457e06da0d4ec12cf6b /res | |
| parent | 461338c16e3c38f98c92d3cd384ecc0ea45d73b9 (diff) | |
| parent | ddae59c775f3a2274aed9c89100255a379faf578 (diff) | |
| download | android_packages_apps_ContactsCommon-b17ec04fc82a2f44a552879b9bbb580472ec1d4a.tar.gz android_packages_apps_ContactsCommon-b17ec04fc82a2f44a552879b9bbb580472ec1d4a.tar.bz2 android_packages_apps_ContactsCommon-b17ec04fc82a2f44a552879b9bbb580472ec1d4a.zip | |
resolve merge conflicts of 9f523b4 to nyc-dev am: b7eecdd9a1 am: b73b7c4e45
am: ddae59c775
Change-Id: Ifcfc553dcc64635d38355ad8f6565508e652af8a
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 da9ef977..7d5d9ab3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -440,6 +440,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] --> |