diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-04 08:23:17 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-04 14:04:39 -0700 |
commit | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/dialer/calllogutils/res/values | |
parent | 8369df095a73a77b3715f8ae7ba06089cebca4ce (diff) |
Update Dialer to V10 RC16
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC16
Branch: dialer-android_release_branch/153304843.1
dialer-android/dialer-android_20170416.00/dialer-android_20170416.00_RC16
This release contains the following bug fixes since RC00:
Bug: 37324705 35304403 36067503 35304446 33203808 37280992
37346084 35766990 37481880 37424493 36470282 37347691
37519015 37168472 35805360 37545472 27704934 36515614
35766990 37577470 34739750 35801628 36788693 35264204
36708536 37628370 36904650 37314436 37642171 37530847
37637799 37666625 37548549 37648036 37636412 37323529
37630507 35919141 37198343 37548572 36178218 37640315
37663896 37720467 37275944 37710497 31634477 37744796
37348506 37744796 37568534 37672424 34872683 34873026
37681461 34873295 37748373 37526812 37618638 37663896
37536088 37727455 37165687 36651204 36900708 37323529
36902926 37256480 37328353 37432034 37436952 34093562
37720889 37321935 37780300 37781115 37755902 36588206
34258266 37290464 37698062 37618638 37473004 37432034
37918676 37870494 37722091
Test: make, on device
Change-Id: I99e1a484ccd578c1f8a13e7a6a4b4952f0791297
Diffstat (limited to 'java/com/android/dialer/calllogutils/res/values')
-rw-r--r-- | java/com/android/dialer/calllogutils/res/values/strings.xml | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml index 22bfb7b93..255990399 100644 --- a/java/com/android/dialer/calllogutils/res/values/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values/strings.xml @@ -56,6 +56,52 @@ <!-- Title for blocked call type. [CHAR LIMIT=40] --> <string name="type_blocked">Blocked call</string> + <!-- An abbreviation for minutes. For example "1m" [CHAR LIMIT=NONE] --> + <string name="call_details_minutes_abbreviation">m</string> + + <!-- An abbreviation for seconds. For example "28s" [CHAR LIMIT=NONE] --> + <string name="call_details_seconds_abbreviation">s</string> + + <!-- A string to announce a call duration. For example, in english might say 2 minutes 15 seconds. + This translation may require the variables to be rearranged for grammars different than + english. [CHAR LIMIT=NONE] --> + <string name="a11y_call_duration_format"> + <xliff:g id="minutes">%d</xliff:g> <xliff:g id="minutes_translation">%s</xliff:g> <xliff:g id="seconds">%d</xliff:g> <xliff:g id="seconds_translation">%s</xliff:g> + </string> + + <!-- A string to announce a call duration. For example, in english might say 15 seconds. + This translation may require the variables to be rearranged for grammars different than + english. [CHAR LIMIT=NONE] --> + <string name="a11y_call_duration_short_format"> + <xliff:g id="seconds">%d</xliff:g> <xliff:g id="seconds_translation">%s</xliff:g> + </string> + + <!-- A pattern to define the layout of a call duration string. for example, in english might + say 2m 15s. Translation should only rearrange the inputs. minutes_translation and + seconds_translation should remain in \'quotes\'. [CHAR LIMIT=NONE] --> + <string name="call_duration_format_pattern"> + <xliff:g id="minutes_special_character">%s</xliff:g>\'<xliff:g id="minutes_translation">%s</xliff:g>\' <xliff:g id="seconds_special_character">%s</xliff:g>\'<xliff:g id="seconds_translation">%s</xliff:g>\' + </string> + + <!-- A pattern to define the layout of a call duration string. for example, in english might + say 2m 15s. Translation should only rearrange the inputs. seconds_translation should + remain in \'quotes\'. [CHAR LIMIT=NONE] --> + <string name="call_duration_short_format_pattern"> + <xliff:g id="seconds_special_character">%s</xliff:g>\'<xliff:g id="seconds_translation">%s</xliff:g>\' + </string> + + <!-- A full string for seconds (time). [CHAR LIMIT=NONE] --> + <plurals name="a11y_seconds"> + <item quantity="one">second</item> + <item quantity="other">seconds</item> + </plurals> + + <!-- A full string for minutes (time). [CHAR LIMIT=NONE] --> + <plurals name="a11y_minutes"> + <item quantity="one">minute</item> + <item quantity="other">minutes</item> + </plurals> + <!-- Title for "answered elsewhere" call type. This will happen if a call was ringing simultaneously on multiple devices, and the user answered it on a device other than the current device. [CHAR LIMIT=60] --> @@ -81,16 +127,4 @@ <!-- String used for displaying calls to the voicemail number in the call log --> <string name="voicemail_string">Voicemail</string> - - <!-- A nicely formatted call duration displayed when viewing call details. For example "42m 28s" --> - <string name="call_details_duration_format"><xliff:g example="42" id="minutes">%d</xliff:g>m <xliff:g example="28" id="seconds">%d</xliff:g>s</string> - - <!-- A nicely formatted call duration displayed when viewing call details for duration less than 1 minute. For example "28s" --> - <string name="call_details_short_duration_format"><xliff:g example="28" id="seconds">%d</xliff:g>s</string> - - <!-- A call duration announced when viewing call details for accessibility. For example "42 minutes 28 seconds".--> - <string name="call_details_duration_format_a11y"><xliff:g example="42" id="minutes">%d</xliff:g> minutes <xliff:g example="28" id="seconds">%d</xliff:g> seconds</string> - - <!-- A call duration announced when viewing call details for accessibility. For example "28 sec" --> - <string name="call_details_short_duration_format_a11y"><xliff:g example="28" id="seconds">%d</xliff:g> seconds</string> </resources>
\ No newline at end of file |