diff options
author | Yorke Lee <yorkelee@google.com> | 2013-11-06 10:42:41 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-06 10:42:41 -0800 |
commit | 7c38711cf5e4287cb83d2e6a8bbb218fee359a57 (patch) | |
tree | 9e152c831277acb7fb82ab922d1d30f3fdec9582 /res | |
parent | 18c56f281b94b660e6d90c2e3f3888b609865f0d (diff) | |
parent | cf3a847584228a1f2b6c59b678352a3e91306735 (diff) | |
download | android_packages_apps_ContactsCommon-7c38711cf5e4287cb83d2e6a8bbb218fee359a57.tar.gz android_packages_apps_ContactsCommon-7c38711cf5e4287cb83d2e6a8bbb218fee359a57.tar.bz2 android_packages_apps_ContactsCommon-7c38711cf5e4287cb83d2e6a8bbb218fee359a57.zip |
am cf3a8475: Merge "Move ContactLoader related code to ContactsCommon" into klp-dev
* commit 'cf3a847584228a1f2b6c59b678352a3e91306735':
Move ContactLoader related code to ContactsCommon
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 3228729c..d4bb1ff9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -720,4 +720,10 @@ a ren't members of any other group. [CHAR LIMIT=25] --> --> <string name="description_dial_phone_number">Dial phone <xliff:g id="name">%1$s</xliff:g></string> + <!-- Attribution of a contact status update, when the time of update is unknown --> + <string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string> + + <!-- Attribution of a contact status update, when the time of update is known --> + <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string> + </resources> |