BZ:1043833 - Translation issues

(cherry picked from commit 41a6cc4e0084ada458d9c588534699593169bed2)