Merge branch 'next' into next-reply

src/i18n/de.json

@@ -1224,7 +1224,7 @@
   },
   "topic_delete_warning": {
     "translation": "Möchten Sie diese Unterhaltung wirklich löschen?",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1333,5 +1333,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "Chat löschen",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }

src/i18n/en.json

@@ -1231,7 +1231,7 @@
   },
   "topic_delete_warning": {
     "translation": "Are you sure you want to delete this conversation?",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1361,5 +1361,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": false,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "Delete Conversation",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "User's Permissions",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/es.json

@@ -1224,7 +1224,7 @@
   },
   "topic_delete_warning": {
     "translation": "¿Estás seguro de que quieres eliminar esta conversación?",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1354,5 +1354,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "Eliminar chat",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }

src/i18n/ex/base-en.json

@@ -569,6 +569,10 @@
     "defaultMessage": "Authenticated",
     "description": "Title for editing default authenticated permissions"
   },
+  "permissions_user": {
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions"
+  },
   "phone_dative": {
     "defaultMessage": "phone",
     "description": "Dative case of 'phone', i.e. 'phone' in 'by phone'"
@@ -713,8 +717,12 @@
     "defaultMessage": "Are you sure you want to block this conversation?",
     "description": "Alert warning when blocking a topic."
   },
+  "topic_delete": {
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic."
+  },
   "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"
   },
   "topic_name_editing_placeholder": {

src/i18n/ko.json

@@ -1224,7 +1224,7 @@
   },
   "topic_delete_warning": {
     "translation": "이대화를삭제하시겠습니까?",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1364,5 +1364,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "채팅 삭제",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }

src/i18n/ro.json

@@ -1224,7 +1224,7 @@
   },
   "topic_delete_warning": {
     "translation": "Ești sigur că dorești să șterge această conversație?",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1354,5 +1354,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "Ștergeți Chat",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }

src/i18n/ru.json

@@ -1224,7 +1224,7 @@
   },
   "topic_delete_warning": {
     "translation": "Вы действительно хотите удалить этот чат?",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1354,5 +1354,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "Удалить чат",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }

src/i18n/zh-TW.json

@@ -1218,7 +1218,7 @@
   },
   "topic_delete_warning": {
     "translation": "您確定要刪除此對話嗎？",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1353,5 +1353,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "刪除聊天",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }

src/i18n/zh.json

@@ -1224,7 +1224,7 @@
   },
   "topic_delete_warning": {
     "translation": "您确定要删除此对话吗？",
-    "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",
     "missing": false,
     "obsolete": false
@@ -1354,5 +1354,19 @@
     "description": "Title for editing default authenticated permissions",
     "missing": true,
     "obsolete": false
+  },
+  "topic_delete": {
+    "translation": "删除聊天",
+    "defaultMessage": "Delete Conversation",
+    "description": "Alert title when deleting the topic.",
+    "missing": false,
+    "obsolete": false
+  },
+  "permissions_user": {
+    "translation": "",
+    "defaultMessage": "User's Permissions",
+    "description": "Title for editing user's permissions",
+    "missing": true,
+    "obsolete": false
   }
 }