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

This commit is contained in:
Tom Hughes 2019-02-06 18:21:50 +00:00
commit 77dcaef44c

View file

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