BZ: 1043833 - Translation issues

(cherry picked from commit 8c0e659305518781a4cba6f115c958b835c98cce)