edit translator
edited translator
fix merge
add dictionary