Merge "Update DND strings - use pull-down shade" into qt-dev
am: 34fb0485fa
Change-Id: If173adf304c1ac232f34bc852df93873fd06f25b
This commit is contained in:
@@ -7587,7 +7587,7 @@
|
|||||||
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
|
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
|
||||||
<string name="zen_mode_block_effect_ambient">Don\'t wake for notifications</string>
|
<string name="zen_mode_block_effect_ambient">Don\'t wake for notifications</string>
|
||||||
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
|
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
|
||||||
<string name="zen_mode_block_effect_list">Hide from notification list</string>
|
<string name="zen_mode_block_effect_list">Hide from pull-down shade</string>
|
||||||
|
|
||||||
<!-- Do not disturb: what to block summary, none -->
|
<!-- Do not disturb: what to block summary, none -->
|
||||||
<string name="zen_mode_block_effect_summary_none">Never</string>
|
<string name="zen_mode_block_effect_summary_none">Never</string>
|
||||||
@@ -8382,13 +8382,13 @@
|
|||||||
</plurals>
|
</plurals>
|
||||||
|
|
||||||
<!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
|
<!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
|
||||||
<string name="zen_mode_messages">Allow text messages</string>
|
<string name="zen_mode_messages">Allow messages</string>
|
||||||
|
|
||||||
<!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->
|
<!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->
|
||||||
<string name="zen_mode_messages_footer">To be sure allowed messages make sound, check whether your device is set to ring, vibrate, or silent.</string>
|
<string name="zen_mode_messages_footer">To be sure allowed messages make sound, check whether your device is set to ring, vibrate, or silent.</string>
|
||||||
|
|
||||||
<!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Messages screen footer -->
|
<!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Messages screen footer -->
|
||||||
<string name="zen_mode_custom_messages_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming text messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
|
<string name="zen_mode_custom_messages_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
|
||||||
|
|
||||||
<!-- [CHAR LIMIT=40] Zen mode settings: Allow messages to bypass DND title -->
|
<!-- [CHAR LIMIT=40] Zen mode settings: Allow messages to bypass DND title -->
|
||||||
<string name="zen_mode_messages_title">SMS, MMS, and messaging apps</string>
|
<string name="zen_mode_messages_title">SMS, MMS, and messaging apps</string>
|
||||||
|
Reference in New Issue
Block a user