diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-19 14:13:38 -0700 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-19 14:21:02 -0700 |
| commit | 18b5190d6ed37be04d153a5d6f205076b38ac479 (patch) | |
| tree | 0db44951b76aef656233b5627ad8ef6b3793b415 /res | |
| parent | 41f026d52e0277e21236787b10f76129a8bc6fa4 (diff) | |
| download | packages_apps_Contacts-18b5190d6ed37be04d153a5d6f205076b38ac479.tar.gz packages_apps_Contacts-18b5190d6ed37be04d153a5d6f205076b38ac479.tar.bz2 packages_apps_Contacts-18b5190d6ed37be04d153a5d6f205076b38ac479.zip | |
Add Cancel capability toward vCard import procedure.
Bug: 2801638
Change-Id: Ia563fa4aed48ad01a6fbb29b350a35c46b7085a3
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/ids.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/res/values/ids.xml b/res/values/ids.xml index 77673e324..b1ed87feb 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -20,7 +20,7 @@ <item type="id" name="dialog_sync_add"/> <item type="id" name="dialog_import_export"/> - <!-- For ImportVCardActivity --> + <!-- For vcard.ImportVCardActivity --> <item type="id" name="dialog_searching_vcard"/> <item type="id" name="dialog_sdcard_not_found"/> <item type="id" name="dialog_vcard_not_found"/> @@ -31,6 +31,9 @@ <item type="id" name="dialog_io_exception"/> <item type="id" name="dialog_error_with_message"/> + <!-- For vcard.CancelImportActivity --> + <item type="id" name="dialog_cancel_import_confirmation"/> + <!-- For ContactDeletionInteraction --> <item type="id" name="dialog_delete_contact_confirmation"/> diff --git a/res/values/strings.xml b/res/values/strings.xml index 43e64896d..ecfe5c85a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -768,9 +768,12 @@ <!-- The title shown when reading vCard is canceled (probably by a user) --> <string name="reading_vcard_canceled_title">Reading vCard data was canceled</string> - <!-- The title shown when reading vCard is canceled (probably by a user) --> + <!-- The title shown when reading vCard finished --> <string name="importing_vcard_finished_title">Finished importing vCard</string> + <!-- The title shown when importing vCard is canceled (probably by a user) --> + <string name="importing_vcard_canceled_title">Reading vCard data was canceled</string> + <!-- The message shown when vCard importer started running. --> <string name="vcard_importer_start_message">vCard importer started.</string> @@ -847,6 +850,14 @@ <!-- Message in progress bar while exporting contact list to a file "(current number) of (total number) contacts" The order of "current number" and "total number" cannot be changed (like "total: (total number), current: (current number)")--> <string name="exporting_contact_list_progress"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> contacts</string> + <!-- Title shown in a Dialog confirming a user's cancel request toward existing vCard import. --> + <string name="cancel_import_confirmation_title">Canceling import vCard</string> + + <!-- Message shown in a Dialog confirming a user's cancel request toward existing vCard import. + The argument is the Uri for the vCard import the user wants to cancel. + --> + <string name="cancel_import_confirmation_message">Are you sure to cancel importing vCard?</string> + <!-- The string used to describe Contacts as a searchable item within system search settings. --> <string name="search_settings_description">Names of your contacts</string> |