edit translator
fix merge
chagne to translator
fix merge