BZ:1043833 - Translation issues

(cherry picked from commit fe72092076f6d9facd1b1d0b6fe6c05f8e28a800)