Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev

This commit is contained in:
Fan Zhang
2016-06-28 18:10:31 +00:00
committed by Android (Google) Code Review
3 changed files with 20 additions and 15 deletions

View File

@@ -7514,7 +7514,7 @@
<string name="support_escalation_summary">Our support team is here to address any issues</string>
<!-- Summary text for connecting to 24/7 customer support [CHAR LIMIT=NONE]-->
<string name="support_escalation_24_7_summary">Our support team is here all day, every day</string>
<string name="support_escalation_24_7_summary">Our support team is available all day, every day</string>
<!-- Summary text when customer support is closed. [CHAR LIMIT=NONE]-->
<string name="support_escalation_closed_summary">Call us during support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string>
@@ -7535,11 +7535,8 @@
<xliff:g id="language" example="English">%s</xliff:g> (<xliff:g id="phone" example="800-000-0000">%s</xliff:g>)
</string>
<!-- Title text that indicates there is not internet connection. [CHAR LIMIT=80]-->
<string name="support_offline_title">You\'re offline</string>
<!-- Summary text telling user to connect to Internet in order to request customer support. [CHAR LIMIT=NONE]-->
<string name="support_offline_summary">To reach support, first connect to Wi-Fi or data.</string>
<!-- Title text for support options when there is no internet access. [CHAR LIMIT=80]-->
<string name="support_offline_title">Call us toll-free</string>
<!-- Title text for a list of international support phone numbers. [CHAR LIMIT=60]-->
<string name="support_international_phone_title">Traveling aboard?</string>