fixed for charset.
update texts.
merge