diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-03-03 23:51:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-03 23:51:57 +0000 |
| commit | e95ce440a7dd7277fbc4eb78c3d74b85fd55af2f (patch) | |
| tree | eee92466d63a0e32600efe30c1d66252b41b1a93 /res/values | |
| parent | c07a9bb309fc51aba7fe0813e5a8221b4d081693 (diff) | |
| parent | d3946cae17273ed1c2fceb507990882e3f828ba9 (diff) | |
| download | packages_apps_Contacts-e95ce440a7dd7277fbc4eb78c3d74b85fd55af2f.tar.gz packages_apps_Contacts-e95ce440a7dd7277fbc4eb78c3d74b85fd55af2f.tar.bz2 packages_apps_Contacts-e95ce440a7dd7277fbc4eb78c3d74b85fd55af2f.zip | |
Merge "Batch join contacts"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ed8d6ae60..787828ac9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -148,7 +148,7 @@ <string name="splitConfirmation">This contact will be separated into multiple contacts.</string> <!-- Menu item that joins an aggregate with another aggregate --> - <string name="menu_joinAggregate">Join</string> + <string name="menu_joinAggregate">Merge</string> <!-- Heading of the Join Contact screen --> <string name="titleJoinContactDataWith">Join contacts</string> @@ -180,10 +180,16 @@ <!-- Warning dialog contents after users selects to delete a contact with ReadOnly and Writable sources. --> <string name="readOnlyContactDeleteConfirmation">This contact contains information from multiple accounts. Information from read-only accounts will be hidden in your contacts lists, not deleted.</string> + <!-- Warning dialog. Shown if user selects a single contact to merge. [CHAR LIMIT=NONE] --> + <string name="batch_merge_single_contact_warning">You need at least two contacts selected to perform a merge.</string> + + <!-- Confirmation dialog. Shown after user selects to merge contacts. [CHAR LIMIT=NONE] --> + <string name="batch_merge_confirmation">The selected contacts will be merged into a single contact.</string> + <!-- Confirmation dialog. Shown after user selects to delete writable contacts. [CHAR LIMIT=NONE] --> <string name="batch_delete_confirmation">The selected contacts will be deleted.</string> - <!-- Confirmation dialog. Shown after user selects to delete readonly contacts. [CHAR LIMIT=NONE] --> + <!-- Confirmation dialog. Shown after user selects to delete readonly contacts. [CHAR LIMIT=NONE] --> <string name="batch_delete_read_only_contact_confirmation">Information from read-only accounts will be hidden in your contacts lists, not deleted.</string> <!-- Confirmation dialog. Shown after user selects to delete contacts from multiple accounts. [CHAR LIMIT=NONE] --> |