merge devel

2021-08-13 17:29:42 -07:00
parent 9a2e0519d3 4399428fdf
commit d741f6ec92
24 changed files with 203 additions and 48 deletions
@@ -52,7 +52,7 @@ const messages = defineMessages({
  },
  topic_delete_warning: {
    id: 'topic_delete_warning',
-    defaultMessage: 'Are you sure you want to delete this conversation?',
+    defaultMessage: 'Are you sure you want to delete this conversation? It cannot be undone.',
    description: 'Alert warning when deleting entire topic'
  },
  delete_messages_warning: {