add some item for v0.12
fixed conflict
update locales table
update for v0.11.1