BZ:1043833 - Translation issues

(cherry picked from commit bd289fd76bb72003294e88d7ef137649cfae2e28)