Improve i18n for courseware page
Revert "Better i18n for credit card charge failures"

This reverts commit 619a5ea3eb239fd561af0bbd30ed10af071e3d7d.
Merge pull request #6382 from edx/zoldak/fix-master

Revert "Better i18n for credit card charge failures"
Merge pull request #6379 from edx/improve-i18n-courseware-page

Improve i18n for courseware page

Merging from an airplane! w00t
Better i18n on the password reset page