BZ:1052858 - i18n is incomplete, code changes needed

(cherry picked from commit 5b6b98b0f5a896c94e223d0d2b2329cdd769fa1b)