fixed i18n locale warning
fixed merge conflict for I18N fix"