BZ:1043833 - Translation issues

(cherry picked from commit 003dcd38bc0e1b832b357d80427b1299616bcb25)