BZ:1052858 - i18n is incomplete, code changes needed

(cherry picked from commit f7042cbc165476dc9e45dada454913b686631c63)