BZ:1043833 - Translation issues

(cherry picked from commit 4360ef3ef286f28058643a095bc668b7754c5d90)