i18n of selector
Merged changes with upstream