Merge pull request #2064 from hmhealey/plt882

PLT-882 Ephemeral Messages and Out-Of-Channel mentions

2 files changed, 4 insertions, 4 deletions

diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index a160aa58f..8753b87b2 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -566,7 +566,6 @@
   "create_post.comment": "Comment",
   "create_post.post": "Post",
   "create_post.write": "Write a message...",
-  "create_post.deleteMsg": "(message deleted)",
   "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>Enter</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
   "delete_channel.channel": "channel",
   "delete_channel.group": "group",
@@ -772,6 +771,7 @@
   "members_popover.title": "Members",
   "post_attachment.collapse": "▲ collapse text",
   "post_attachment.more": "▼ read more",
+  "post_body.deleted": "(message deleted)",
   "post_body.plusOne": " plus 1 other file",
   "post_body.plusMore": " plus {count} other files",
   "post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
@@ -1257,4 +1257,4 @@
   "intro_messages.beginning": "Beginning of {name}",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.setHeader": "Set a Header"
-}
\ No newline at end of file
+}
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 0a780c442..1ef28eb17 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -585,7 +585,6 @@
   "create_comment.file": "Subiendo archivo",
   "create_comment.files": "Subiendo archivos",
   "create_post.comment": "Comentario",
-  "create_post.deleteMsg": "(mensaje eliminado)",
   "create_post.post": "Mensaje",
   "create_post.tutorialTip": "<h4>Enviar Mensajes</h4> <p>Escribe aquí para redactar un mensaje y presiona <strong>Retorno</strong> para enviarlo.</p><p>Pincha el botón de <strong>Adjuntar</strong> para subir una imagen o archivo.</p>",
   "create_post.write": "Escribe un mensaje...",
@@ -805,6 +804,7 @@
   "post_attachment.collapse": "▲ colapsar texto",
   "post_attachment.more": "▼ leer más",
   "post_body.commentedOn": "Comentó el mensaje de {name}{apostrophe}: ",
+  "post_body.deleted": "(mensaje eliminado)",
   "post_body.plusMore": " más {count} otros archivos",
   "post_body.plusOne": " más 1 archivo",
   "post_body.retry": "Reintentar",
@@ -1216,4 +1216,4 @@
   "view_image_popover.download": "Descargar",
   "view_image_popover.file": "Archivo {count} de {total}",
   "view_image_popover.publicLink": "Obtener Enlace Público"
-}
\ No newline at end of file
+}