summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2015-10-02 23:47:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-02 23:47:06 +0000
commit1695b1ac3682c6a7dd6d1ff898673237a6a37512 (patch)
tree6cdb2ec059ab34ae89522ab791efe6eec0e17c36 /res
parentff019958adab468ed943eac04df2985eb8642d04 (diff)
parentd9833cd25c5d2698699d82b0d0fc163db653810e (diff)
am d9833cd2: Merge "Modifying voicemail call log date and time format" into ub-contactsdialer-a-dev
* commit 'd9833cd25c5d2698699d82b0d0fc163db653810e': Modifying voicemail call log date and time format
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c1fb8722..b2621cd9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -433,6 +433,15 @@
<!-- A nicely formatted call duration displayed when viewing call details. For example "42 min 28 sec" -->
<string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%s</xliff:g> min <xliff:g id="seconds" example="28">%s</xliff:g> sec</string>
+ <!-- The string 'Today'. This value is used in the voicemailCallLogDateTimeFormat rather than an
+ explicit date string, e.g. Jul 25, 2014, in the event that a voicemail was created on the
+ current day -->
+ <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+
+ <!-- A format string used for displaying the date and time for a voicemail call log. For example: Jul 25, 2014 at 2:49 PM
+ The date will be replaced by 'Today' for voicemails created on the current day. For example: Today at 2:49 PM -->
+ <string name="voicemailCallLogDateTimeFormat"><xliff:g id="date" example="Jul 25, 2014">%1$s</xliff:g> at <xliff:g id="time" example="2:49 PM">%2$s</xliff:g></string>
+
<!-- Dialog message which is shown when the user tries to make a phone call
to prohibited phone numbers [CHAR LIMIT=NONE] -->
<string name="dialog_phone_call_prohibited_message" msgid="4313552620858880999">Can\'t call this number</string>