BZ:1052858 - i18n is incomplete, code changes needed

(cherry picked from commit 47564776308d9e7ff1dbe3de45db76c194e6272c)