summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorFrank Allenby <frank@sensepost.com>2016-01-29 10:32:11 +0200
committerFrank Allenby <frank@sensepost.com>2016-01-29 10:32:11 +0200
commite7be676969f78f313aacbd1d7911ad1a511dcf6d (patch)
treeba13a3456636eb29a203f723b97935ddc8f58339 /i18n
parentfa6daad64d474e99f3a2964784585a748350c25a (diff)
downloadchat-e7be676969f78f313aacbd1d7911ad1a511dcf6d.tar.gz
chat-e7be676969f78f313aacbd1d7911ad1a511dcf6d.tar.bz2
chat-e7be676969f78f313aacbd1d7911ad1a511dcf6d.zip
Completed PLT-1592
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json14
1 files changed, 9 insertions, 5 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 12741fc68..0b0f72628 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
+]