BZ:1043833 - Translation issues

(cherry picked from commit 027d06288b0b41977554f0816049f27e7f6c0106)