manual merge of devel changes

This commit is contained in:
or-else
2021-08-20 20:55:51 -07:00
parent 9508797ab9
commit ea816859b6
17 changed files with 187 additions and 101 deletions
+7
View File
@@ -1368,5 +1368,12 @@
"description": "Title for editing user's permissions",
"missing": true,
"obsolete": false
},
"password_reset_email_sent": {
"translation": "Se ha enviado un correo electrónico a {email}. Siga las instrucciones del correo electrónico para restablecer su contraseña.",
"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
}
}