BZ:1043833 - Translation issues

(cherry picked from commit caa730c234e6a61520dce8e30db7504b2164836e)