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
@@ -1378,5 +1378,12 @@
    "description": "Title for editing user's permissions",
    "missing": true,
    "obsolete": false
+  },
+  "password_reset_email_sent": {
+    "translation": "이메일이 {email}(으)로 전송되었습니다. 이메일의 지침에 따라 비밀번호를 재설정하세요.",
+    "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",
+    "missing": false,
+    "obsolete": false
  }
 }