Merge pull request #2018 from fallenby/PLT-1592

PLT-1592 String changes to make password reset expiry experience more obvious and forgiving

i18n/en.json

@@ -1081,7 +1081,7 @@
   },
   {
     "id": "api.templates.error.link",
-    "translation": "Go back to team site"
+    "translation": "Go back to Mattermost"
   },
   {
     "id": "api.templates.error.title",
@@ -1153,7 +1153,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",
@@ -1433,7 +1433,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",
@@ -3321,7 +3321,7 @@
   },
   {
     "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.invalid_link.app_error",