Add singular and plural form for some validation messages