Add singular and plural form for some validation messages

Original PR is here https://github.com/rails/rails/pull/10081