From e7be676969f78f313aacbd1d7911ad1a511dcf6d Mon Sep 17 00:00:00 2001
From: Frank Allenby <frank@sensepost.com>
Date: Fri, 29 Jan 2016 10:32:11 +0200
Subject: [PATCH 1/2] Completed PLT-1592

---
 i18n/en.json     | 14 +++++++++-----
 model/version.go |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 12741fc681..0b0f726287 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1085,7 +1085,7 @@
   },
   {
     "id": "api.templates.error.link",
-    "translation": "Go back to team site"
+    "translation": "Go back to Mattermost"
   },
   {
     "id": "api.templates.error.title",
@@ -1157,7 +1157,7 @@
   },
   {
     "id": "api.templates.reset_body.info",
-    "translation": "To change your password, click \"Reset Password\" below.<br>If you did not mean to reset your password, please ignore this email and your password will remain the same."
+    "translation": "To change your password, click \"Reset Password\" below.<br>If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1437,7 +1437,7 @@
   },
   {
     "id": "api.user.reset_password.link_expired.app_error",
-    "translation": "The reset link has expired"
+    "translation": "The password reset link has expired"
   },
   {
     "id": "api.user.reset_password.method",
@@ -3325,7 +3325,11 @@
   },
   {
     "id": "web.reset_password.expired_link.app_error",
-    "translation": "The signup link has expired"
+    "translation": "The password reset link has expired"
+  },
+  {
+    "id": "web.reset_password.expired_link.app_error.link_text",
+    "translation": "Go to Password Reset page"
   },
   {
     "id": "web.reset_password.invalid_link.app_error",
@@ -3391,4 +3395,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
   }
-]
\ No newline at end of file
+]
diff --git a/model/version.go b/model/version.go
index 88334ceea9..f503ddb846 100644
--- a/model/version.go
+++ b/model/version.go
@@ -28,7 +28,7 @@ var CurrentVersion string = versions[0]
 var BuildNumber = "_BUILD_NUMBER_"
 var BuildDate = "_BUILD_DATE_"
 var BuildHash = "_BUILD_HASH_"
-var BuildEnterpriseReady = "_BUILD_ENTERPRISE_READY_"
+var BuildEnterpriseReady = "false"
 
 func SplitVersion(version string) (int64, int64, int64) {
 	parts := strings.Split(version, ".")

From ca95adc41fcef5676a15784c11a63d9f44a1e11c Mon Sep 17 00:00:00 2001
From: Frank Allenby <frank@sensepost.com>
Date: Fri, 29 Jan 2016 10:39:07 +0200
Subject: [PATCH 2/2] Revised PLT-1592

---
 i18n/en.json     | 4 ----
 model/version.go | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 0b0f726287..e93e3c2805 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3327,10 +3327,6 @@
     "id": "web.reset_password.expired_link.app_error",
     "translation": "The password reset link has expired"
   },
-  {
-    "id": "web.reset_password.expired_link.app_error.link_text",
-    "translation": "Go to Password Reset page"
-  },
   {
     "id": "web.reset_password.invalid_link.app_error",
     "translation": "The reset link does not appear to be valid"
diff --git a/model/version.go b/model/version.go
index f503ddb846..88334ceea9 100644
--- a/model/version.go
+++ b/model/version.go
@@ -28,7 +28,7 @@ var CurrentVersion string = versions[0]
 var BuildNumber = "_BUILD_NUMBER_"
 var BuildDate = "_BUILD_DATE_"
 var BuildHash = "_BUILD_HASH_"
-var BuildEnterpriseReady = "false"
+var BuildEnterpriseReady = "_BUILD_ENTERPRISE_READY_"
 
 func SplitVersion(version string) (int64, int64, int64) {
 	parts := strings.Split(version, ".")