edit transl
merge + trans fix