From 8bb6a2ac3980adae2db2c186fa503cd4b4188d32 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@konecty.com>
Date: Thu, 20 Aug 2015 15:37:05 -0300
Subject: [PATCH] Translations

---
 client/views/app/sideNav/directMessagesFlex.html | 2 +-
 i18n/en.i18n.json                                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/views/app/sideNav/directMessagesFlex.html b/client/views/app/sideNav/directMessagesFlex.html
index beb03ad88f7..ebaca7cf4eb 100644
--- a/client/views/app/sideNav/directMessagesFlex.html
+++ b/client/views/app/sideNav/directMessagesFlex.html
@@ -13,7 +13,7 @@
 			</div>
 			{{#if error}}
 				<div class="input-error">
-					<strong>Ops!</strong>
+					<strong>{{_ "Oops!"}}</strong>
 					{{#each error}}
 						<p>{{_ "The_field_is_required" error}}</p>
 					{{/each}}
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 353f55bfe7a..183f8f26219 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -62,6 +62,7 @@
   "Create_new_private_group" : "Create a new private group",
   "Create_new_public_channel" : "Create a new public channel",
   "Created_at" : "Created at",
+  "Delete_User_Warning": "Deleting a user will delete all messages from that user as well. This cannot be undone.",
   "Deleted" : "Deleted!",
   "Direct_Messages" : "Direct Messages",
   "Drop_to_upload_file" : "Drop to upload file",
@@ -222,6 +223,7 @@
   "User_added_by" : "User <em>__user_added__</em> added by <em>__user_by__</em>.",
   "User_has_been_activated" : "User has been activated",
   "User_has_been_deactivated" : "User has been deactivated",
+  "User_has_been_deleted" : "User has been deleted",
   "User_is_no_longer_an_admin" : "User is no longer an admin",
   "User_is_now_an_admin" : "User is now an admin",
   "User_joined_channel" : "Has joined the channel.",