manual merge of devel changes

src/i18n/de.json

@@ -1347,5 +1347,12 @@
     "description": "Title for editing user's permissions",
     "missing": true,
     "obsolete": false
+  },
+  "password_reset_email_sent": {
+    "translation": "Eine E-Mail wurde an {email} gesendet. Folgen Sie den Anweisungen in der E-Mail, um Ihr Passwort zurückzusetzen.",
+    "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
   }
 }

src/i18n/en.json

@@ -1368,5 +1368,12 @@
     "description": "Title for editing user's permissions",
     "missing": false,
     "obsolete": false
+  },
+  "password_reset_email_sent": {
+    "translation": "An email has been sent to {email}. Follow the directions in the email to reset your password.",
+    "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
   }
 }

src/i18n/es.json

@@ -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
   }
 }

src/i18n/ex/base-en.json

@@ -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"

src/i18n/ko.json

@@ -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
   }
 }

src/i18n/ro.json

@@ -1368,5 +1368,12 @@
     "description": "Title for editing user's permissions",
     "missing": true,
     "obsolete": false
+  },
+  "password_reset_email_sent": {
+    "translation": "Un e-mail a fost trimis către {email}. Urmați instrucțiunile din e-mail pentru a vă reseta parola.",
+    "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
   }
 }

src/i18n/ru.json

@@ -1368,5 +1368,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
   }
 }

src/i18n/zh-TW.json

@@ -1367,5 +1367,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
   }
 }

src/i18n/zh.json

@@ -1368,5 +1368,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
   }
 }