fixed i18n
fix for interpolation
Merge branch 'master' into version_3_0
fixes for new permission. waiting to be completed