BZ: 1052858 - i18n is incomplete, code changes needed

(cherry picked from commit 9aa63c89c2e064a96963a2e9d3e1c0f89b2cdc8a)