From 5d0798ed24b6ac5d06f0b0403f0e0bb0a19c9870 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 6 Feb 2019 15:16:54 +0000
Subject: [PATCH] Tweak field labels on reset password

---
 src/components/structures/auth/ForgotPassword.js | 6 +++---
 src/i18n/strings/en_EN.json                      | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index e49d4a9d78..56f43b9ffa 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -238,19 +238,19 @@ module.exports = React.createClass({
                                 name="reset_email" // define a name so browser's password autofill gets less confused
                                 value={this.state.email}
                                 onChange={this.onInputChanged.bind(this, "email")}
-                                placeholder={_t('Email address')} autoFocus />
+                                placeholder={_t('Email')} autoFocus />
                         </div>
                         <div className="mx_AuthBody_fieldRow">
                             <input className="mx_Login_field" ref="pass" type="password"
                                 name="reset_password"
                                 value={this.state.password}
                                 onChange={this.onInputChanged.bind(this, "password")}
-                                placeholder={_t('New password')} />
+                                placeholder={_t('Password')} />
                             <input className="mx_Login_field" ref="pass" type="password"
                                 name="reset_password_confirm"
                                 value={this.state.password2}
                                 onChange={this.onInputChanged.bind(this, "password2")}
-                                placeholder={_t('Confirm your new password')} />
+                                placeholder={_t('Confirm')} />
                         </div>
                         <input className="mx_Login_submit" type="submit" value={_t('Send Reset Email')} />
                     </form>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9e5b32f24c..02c29778bb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1380,8 +1380,6 @@
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device",
     "Return to login screen": "Return to login screen",
     "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
-    "New password": "New password",
-    "Confirm your new password": "Confirm your new password",
     "Send Reset Email": "Send Reset Email",
     "Sign in instead": "Sign in instead",
     "Set a new password": "Set a new password",