manual merge of devel changes

2021-08-20 20:55:51 -07:00
parent 9508797ab9
commit ea816859b6
17 changed files with 187 additions and 101 deletions
@@ -521,6 +521,10 @@
    "defaultMessage": "Password",
    "description": "Placeholder/prompt for entering password"
  },
+  "password_reset_email_sent": {
+    "defaultMessage": "An email has been sent to {email}. Follow the directions in the email to reset your password.",
+    "description": "Notification that the email with password reset instructions has been sent"
+  },
  "password_unchanged_prompt": {
    "defaultMessage": "Unchanged",
    "description": "Message in editor while password is unchanged"