i18n core refactoring: scope check added
Merge branch 'i18n-core-scopes' into 0.2