Chinese
Merge commit '3f5f4db90ae03ec4edba30b54c5ded7d03ffafe9'

Conflicts:
	vdialer.js