diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-04 14:50:30 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-04 14:50:30 -0500 |
| commit | ec51c31c325b3dc648a261f0e8634b6d70d7ba73 (patch) | |
| tree | 1369b8d2bc406d54770d7ccf52b1e6a8bfedfc05 /web/static/i18n/en.json | |
| parent | 44c19ee443831e0e94b5738ecb21a64ce7643247 (diff) | |
| parent | 21318b7505babaebbb5174c62b75595b2936ebe0 (diff) | |
| download | chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.tar.gz chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.tar.bz2 chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.zip | |
Merge pull request #2064 from hmhealey/plt882
PLT-882 Ephemeral Messages and Out-Of-Channel mentions
Diffstat (limited to 'web/static/i18n/en.json')
| -rw-r--r-- | web/static/i18n/en.json | 4 |
1 files changed, 2 insertions, 2 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 +} |