Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4

Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
This commit is contained in:
Julia Reynolds
2020-03-24 22:00:27 +00:00
committed by Automerger Merge Worker
6 changed files with 38 additions and 22 deletions

View File

@@ -8302,10 +8302,10 @@
<string name="manage_conversations">Manage conversations</string>
<!-- [CHAR LIMIT=100] preference category title -->
<string name="important_conversations">Important conversations</string>
<string name="important_conversations">Priority conversations</string>
<!-- [CHAR LIMIT=100] preference category title -->
<string name="all_conversations">All conversations</string>
<string name="other_conversations">Other conversations</string>
<!-- [CHAR LIMIT=100] Setting to automatically bubble all notifications from favorite conversations -->
<string name="important_bubble">Bubble important conversations</string>