added i18n messages and fix warning messages