Fix i18n translation issues
Use ngettext rather than "word(s)" for plural phrases
Merge pull request #4121 from edx/sarina/fix-i18n-bugs

Fix i18n translation issues