Merge remote-tracking branch 'upstream/pull/2135'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a81172de2269096fc8d0efc201ae660b6fe339f5..577efd1743eaea53b8e412a6aeb17c6c3dcc9dc2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,10 @@ en:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: does not appear to be a valid e-mail address
+        email_address_not_routable: is not routable
     # Translates all the model names, which is used in error handling on the web site
     models:
       acl: "Access Control List"