Merge branch 'devel' into features

2021-08-15 09:47:38 +03:00
parent 1e08211d17 4399428fdf
commit 8af1727c3d
27 changed files with 1143 additions and 1570 deletions
@@ -59,7 +59,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: {