Re: #1784 - copied / manual merge of front-end translation changes