BZ:1043833 - Translation issues

(cherry picked from commit f8babeff19b12df63e0d9e923b7552a858ed8bc3)