BZ:1052858 - i18n is incomplete, code changes needed

(cherry picked from commit 89cde21b76c9d71bd0a8651509d6952daef3b739)