translation update
fixed merge error