small code cleanup
remove duplicated code from translate
fix store for auto detect option