Fixed stupid merge
Fixed and added locales