merge activity
add chinese translation