From 692bb47fcff3836ff1404ae19417f6938cdc6d74 Mon Sep 17 00:00:00 2001
From: Prakharsvnit <prakhartripathi.4896@gmail.com>
Date: Thu, 13 Apr 2017 01:41:30 +0530
Subject: [PATCH 1/9] added error page

---
 client/routes/pageNotFound.html | 6 ++++++
 client/routes/router.js         | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 client/routes/pageNotFound.html

diff --git a/client/routes/pageNotFound.html b/client/routes/pageNotFound.html
new file mode 100644
index 000000000000..264a35332de7
--- /dev/null
+++ b/client/routes/pageNotFound.html
@@ -0,0 +1,6 @@
+<template name="_404">
+  <h1>Error:404</h1>
+  <h3>Oops, page not found</h3>
+  <p>Sorry, page you're requested is not exists or was deleted</p>
+</template>
+
diff --git a/client/routes/router.js b/client/routes/router.js
index 9d5c7e6eb9d1..d462eebbe793 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -154,3 +154,10 @@ FlowRouter.route('/register/:hash', {
 		// 	BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
 	}
 });
+
+FlowRouter.notFound = {
+  action() {
+    BlazeLayout.render('_404');
+  }
+};
+

From 9636612ff56caf584b5cb38b245ed6821345ec67 Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Thu, 13 Apr 2017 02:00:41 +0530
Subject: [PATCH 2/9] edited tabspaces

---
 client/routes/router.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/routes/router.js b/client/routes/router.js
index d462eebbe793..6e562cbd0437 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -156,8 +156,8 @@ FlowRouter.route('/register/:hash', {
 });
 
 FlowRouter.notFound = {
-  action() {
-    BlazeLayout.render('_404');
+	action() {
+	BlazeLayout.render('_404');
   }
 };
 

From 2fb397a00ac430a53e4a9bbd64bf4806b9f44bd9 Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Thu, 13 Apr 2017 02:02:55 +0530
Subject: [PATCH 3/9] Update router.js

---
 client/routes/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/routes/router.js b/client/routes/router.js
index 6e562cbd0437..4a6d9baa6c4f 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -158,6 +158,6 @@ FlowRouter.route('/register/:hash', {
 FlowRouter.notFound = {
 	action() {
 	BlazeLayout.render('_404');
-  }
+}
 };
 

From 98c09283df3776fbe5455992ad79ec62a9b68ff8 Mon Sep 17 00:00:00 2001
From: Prakharsvnit <prakhartripathi.4896@gmail.com>
Date: Fri, 14 Apr 2017 04:07:38 +0530
Subject: [PATCH 4/9] changed template's name to pageNotFound

---
 client/routes/pageNotFound.html | 2 +-
 client/routes/router.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/routes/pageNotFound.html b/client/routes/pageNotFound.html
index 264a35332de7..1f3f239c3e16 100644
--- a/client/routes/pageNotFound.html
+++ b/client/routes/pageNotFound.html
@@ -1,4 +1,4 @@
-<template name="_404">
+<template name="pageNotFound">
   <h1>Error:404</h1>
   <h3>Oops, page not found</h3>
   <p>Sorry, page you're requested is not exists or was deleted</p>
diff --git a/client/routes/router.js b/client/routes/router.js
index d462eebbe793..339daa8efd87 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -157,7 +157,7 @@ FlowRouter.route('/register/:hash', {
 
 FlowRouter.notFound = {
   action() {
-    BlazeLayout.render('_404');
+    BlazeLayout.render('pageNotFound');
   }
 };
 

From 70419658889dcc8579e74258cdceb8df8d7c83bb Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Tue, 18 Apr 2017 02:41:48 +0530
Subject: [PATCH 5/9] Update pageNotFound.html

---
 client/routes/pageNotFound.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/routes/pageNotFound.html b/client/routes/pageNotFound.html
index 1f3f239c3e16..c665c878cf86 100644
--- a/client/routes/pageNotFound.html
+++ b/client/routes/pageNotFound.html
@@ -1,6 +1,6 @@
 <template name="pageNotFound">
   <h1>Error:404</h1>
   <h3>Oops, page not found</h3>
-  <p>Sorry, page you're requested is not exists or was deleted</p>
+  <p>Sorry, page you requested does not exists or was deleted!</p>
 </template>
 

From dfc2b1f37cb8e919be5e0658e039387a70e9084e Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Tue, 18 Apr 2017 02:44:21 +0530
Subject: [PATCH 6/9] Update router.js

---
 client/routes/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/routes/router.js b/client/routes/router.js
index cb65489634b4..1803fa455b06 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -157,7 +157,7 @@ FlowRouter.route('/register/:hash', {
 
 FlowRouter.notFound = {
 	action() {
-	BlazeLayout.render('pageNotFound');
+		BlazeLayout.render('pageNotFound');
 }
 };
 

From f60e43db659e865c0d0c96e8b14a2d1f32062815 Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Tue, 18 Apr 2017 02:58:46 +0530
Subject: [PATCH 7/9] Update router.js

---
 client/routes/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/routes/router.js b/client/routes/router.js
index 1803fa455b06..c119f6c2096a 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -158,6 +158,6 @@ FlowRouter.route('/register/:hash', {
 FlowRouter.notFound = {
 	action() {
 		BlazeLayout.render('pageNotFound');
-}
+	}
 };
 

From c093a5436ac9bf8f4822a51655ddcb11f96afb5a Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Tue, 18 Apr 2017 03:11:29 +0530
Subject: [PATCH 8/9] Update en.i18n.json

---
 packages/rocketchat-i18n/i18n/en.i18n.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index a11b1467df10..275efb319f55 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -475,6 +475,7 @@
   "Enter_Normal": "Normal mode (send with Enter)",
   "Enter_to": "Enter to",
   "Error": "Error",
+  "Error_404": "Error:404",
   "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
   "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
   "error-action-not-allowed": "__action__ is not allowed",
@@ -1116,6 +1117,7 @@
   "optional": "optional",
   "Use_minor_colors": "Use minor color palette (defaults inherit major colors)",
   "or": "or",
+  "Oops_page_not_found": "Oops, page not found",
   "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code. You can also use one of your backup codes.",
   "Order": "Order",
   "OS_Arch": "OS Arch",
@@ -1396,6 +1398,7 @@
   "Snippet_Added": "Created on %s",
   "Snippet_Messages": "Snippet Messages",
   "Snippeted_a_message": "Created a snippet __snippetLink__",
+  "Sorry_page_you_requested_does_not_exists_or_was_deleted": "Sorry, page you requested does not exists or was deleted!",
   "Sound": "Sound",
   "Sound_File_mp3": "Sound File (mp3)",
   "SSL": "SSL",
@@ -1709,4 +1712,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
\ No newline at end of file
+}

From 34d1de9488cbcfdd889370593bd3bad1f60d9c86 Mon Sep 17 00:00:00 2001
From: Prakhar tripathi <prakhartripathi.4896@gmail.com>
Date: Tue, 18 Apr 2017 20:01:17 +0530
Subject: [PATCH 9/9] Update pageNotFound.html

---
 client/routes/pageNotFound.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/routes/pageNotFound.html b/client/routes/pageNotFound.html
index c665c878cf86..b0ab91242c6d 100644
--- a/client/routes/pageNotFound.html
+++ b/client/routes/pageNotFound.html
@@ -1,6 +1,5 @@
 <template name="pageNotFound">
-  <h1>Error:404</h1>
-  <h3>Oops, page not found</h3>
-  <p>Sorry, page you requested does not exists or was deleted!</p>
+  <h1>{{_ "Error_404"}}</h1>
+  <h3>{{_ "Oops_page_not_found"}}</h3>
+  <p>{{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}}</p>
 </template>
-