summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-01-29 08:42:25 -0500
committerChristopher Speller <crspeller@gmail.com>2016-01-29 08:42:25 -0500
commitc4386652bae12c14fa704fabad066ddc07d27527 (patch)
treee583f952a325d5c366e041b1689cee5765330f37 /i18n/en.json
parent2942b91de49b73afb9fb4ffc239dda0028b1b673 (diff)
parentca95adc41fcef5676a15784c11a63d9f44a1e11c (diff)
downloadchat-c4386652bae12c14fa704fabad066ddc07d27527.tar.gz
chat-c4386652bae12c14fa704fabad066ddc07d27527.tar.bz2
chat-c4386652bae12c14fa704fabad066ddc07d27527.zip
Merge pull request #2018 from fallenby/PLT-1592
PLT-1592 String changes to make password reset expiry experience more obvious and forgiving
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json
index fafc29de7..ef432f499 100644
--- a/i18n/en.json
+++ b/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",