Fix variable names to give context for translators

fix other various i18n issues
Merge pull request #4156 from edx/sarina/fix-i18n-bugs

Fix variable names to give context for translators