Merge "String updates" into rvc-dev

This commit is contained in:
Mady Mellor
2020-03-23 15:43:29 +00:00
committed by Android (Google) Code Review

View File

@@ -8152,11 +8152,11 @@
<!-- Description for the toggle shown on the app-level bubbles page [CHAR LIMIT=NONE] -->
<string name="bubbles_app_toggle_summary">Allow <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> to show some notifications as bubbles</string>
<!-- Title of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=NONE] -->
<string name="bubbles_feature_disabled_dialog_title">Turn on bubbles</string>
<string name="bubbles_feature_disabled_dialog_title">Turn on bubbles for device?</string>
<!-- Description of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=NONE] -->
<string name="bubbles_feature_disabled_dialog_text">To turn on bubbles for this app, first you need to turn them on for your device. This affects other apps in which you previously turned on bubbles.</string>
<string name="bubbles_feature_disabled_dialog_text">Turning on bubbles for this app will also turn on bubbles for your device.\n\nThis affects other apps or conversations that are allowed to bubble.</string>
<!-- Button of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=60]-->
<string name="bubbles_feature_disabled_button_approve">Turn on for device</string>
<string name="bubbles_feature_disabled_button_approve">Turn on</string>
<!-- Button to cancel out of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=60] -->
<string name="bubbles_feature_disabled_button_cancel">Cancel</string>
@@ -8175,8 +8175,8 @@
<string name="bubble_app_setting_none">Nothing can bubble</string>
<!-- Bubble app settings: Title above a list of conversations that have been selected to bubble [CHAR LIMIT=60]-->
<string name="bubble_app_setting_selected_conversation_title">Conversations</string>
<!-- Bubble app settings: Title above a list of conversations that have been excluded from bubbling [CHAR LIMIT=60] -->
<string name="bubble_app_setting_excluded_conversation_title">Excluded</string>
<!-- Bubble app settings: Title above a list of conversations that have been excluded from bubbling [CHAR LIMIT=100] -->
<string name="bubble_app_setting_excluded_conversation_title">All conversations can bubble except</string>
<!-- Configure notifications: title for swipe direction [CHAR LIMIT=60] -->
<string name="swipe_direction_title">Swipe actions</string>