diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-04 19:28:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-04 19:28:30 +0000 |
| commit | 4a0bf0749203eaa4509bedc55efbcc9a191a0b42 (patch) | |
| tree | 6b417757830b1c4603ba28250c111693cb4d0b7c /java/com/android/dialer/calllogutils | |
| parent | dd18cb13307866ec723992b327d1f6061b326313 (diff) | |
| parent | 2cc1bfc10ab390d44c2fe7280cae787655ca8fcc (diff) | |
Merge changes I481fbbc7,I57e48b5d,Ieb52489b,I2763ddd9
* changes:
Translation tweaks.
Migrated context menu to be a PopupMenu instead.
Add column for call mapping id to AnnotatedCallLog database.
Don't force open keyboard when RTT is active.
Diffstat (limited to 'java/com/android/dialer/calllogutils')
| -rw-r--r-- | java/com/android/dialer/calllogutils/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml index 1c1f31446..e476bdd6c 100644 --- a/java/com/android/dialer/calllogutils/res/values/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values/strings.xml @@ -66,28 +66,28 @@ 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> + <xliff:g id="minutes">%1$d</xliff:g> <xliff:g id="minutes_translation">%2$s</xliff:g> <xliff:g id="seconds">%3$d</xliff:g> <xliff:g id="seconds_translation">%4$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> + <xliff:g id="seconds">%1$d</xliff:g> <xliff:g id="seconds_translation">%2$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>\' + <xliff:g id="minutes_special_character">%1$s</xliff:g>\'<xliff:g id="minutes_translation">%2$s</xliff:g>\' <xliff:g id="seconds_special_character">%3$s</xliff:g>\'<xliff:g id="seconds_translation">%4$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>\' + <xliff:g id="seconds_special_character">%1$s</xliff:g>\'<xliff:g id="seconds_translation">%2$s</xliff:g>\' </string> <!-- A full string for seconds (time). [CHAR LIMIT=NONE] --> |