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

config/i18n-tasks.yml

@@ -130,6 +130,7 @@ ignore_unused:
   - 'datetime.distance_in_words_ago.*'
   - 'reports.new.categories.*' # double interpolation in reports_helper
   - 'shared.pagination.*'
+  - 'auth.providers.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

config/locales/en.yml

@@ -38,8 +38,6 @@ en:
   activerecord:
     errors:
       messages:
-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable
         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute: