fix
fix
fix search
front
front
front
before pulling development branch to i18n
after correcting some translate errors
after correcting some translate errors