added toBeTranslated attribute
Merge branch 'master' into beta