diff options
| author | Nancy Chen <nancychen@google.com> | 2015-11-11 01:14:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-11 01:14:47 +0000 |
| commit | f43c5792be6a9df8201bb6fb545988a1bda529ef (patch) | |
| tree | 8c57ec5ed3a277123e900e9d1d2fa90e22be5992 /InCallUI/res | |
| parent | 5e5835d7427f4a0f4381d7f7cda58d25265325f4 (diff) | |
| parent | 32f7b406d7ba204649c9c73b3466d725ba9e91f5 (diff) | |
Merge "Account for multiple open times for business contacts." into ub-contactsdialer-a-dev am: c3e0717a4b
am: 839ce5427c
* commit '839ce5427c6440d41925b0833db9497f5833c1c2':
Account for multiple open times for business contacts.
Diffstat (limited to 'InCallUI/res')
| -rw-r--r-- | InCallUI/res/values/strings.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 2f8ef8a41..54d68c9d2 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -479,8 +479,14 @@ <string name="distance_metric_away"><xliff:g id="distance">%.1f</xliff:g> km away</string> <!-- A shortened way to display a business address. Formatted [street address], [city/locality]. --> <string name="display_address"><xliff:g id="street_address">%1$s</xliff:g>, <xliff:g id="locality">%2$s</xliff:g></string> - <!-- Used to indicate the opening hours for a location as a time span. e.g. "11 am - 9 pm" [CHAR LIMIT=NONE] --> - <string name="opening_hours"><xliff:g id="open_time">%1$s</xliff:g> - <xliff:g id="close_time">%2$s</xliff:g></string> + <!-- Used to indicate hours of operation for a location as a time span. e.g. "11 am - 9 pm" [CHAR LIMIT=NONE] --> + <string name="open_time_span"><xliff:g id="open_time">%1$s</xliff:g> - <xliff:g id="close_time">%2$s</xliff:g></string> + <!-- Used to indicate a series of opening hours for a location. + This first argument may be one or more time spans. e.g. "11 am - 9 pm, 9 pm - 11 pm" + The second argument is an additional time span. e.g. "11 pm - 1 am" + The string is used to build a list of opening hours. + [CHAR LIMIT=NONE] --> + <string name="opening_hours"><xliff:g id="earlier_times">%1$s</xliff:g>, <xliff:g id="later_time">%2$s</xliff:g></string> <!-- Displayed when a place is open. --> <string name="open_now">Open now</string> <!-- Displayed when a place is closed. --> |