BZ:1043833 - Translation issues

Redo the translations changes that can't be cherry-picked.