diff options
| author | Walter Jang <wjang@google.com> | 2016-11-07 16:46:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-07 16:46:56 +0000 |
| commit | f5a9e9aa15495fbf458d311038774e6c40253450 (patch) | |
| tree | 352da7f8901b20d4c7c8cd1c9291ed9c9a9fba5a /res | |
| parent | d7864dcef870115dcf2058b9611e9786bb65241f (diff) | |
| parent | 7050d9a2430d386bde4301d0892df186fb7be15f (diff) | |
| download | android_packages_apps_ContactsCommon-f5a9e9aa15495fbf458d311038774e6c40253450.tar.gz android_packages_apps_ContactsCommon-f5a9e9aa15495fbf458d311038774e6c40253450.tar.bz2 android_packages_apps_ContactsCommon-f5a9e9aa15495fbf458d311038774e6c40253450.zip | |
resolve merge conflicts of e20a370 to mnc-dev am: 4718349e14
am: 7050d9a243
Change-Id: Iba89f60da7ac77bdd2ef684d0ead09b35872e14e
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] --> |