[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Merge branch 'master' into fixing-3421-master

Conflicts:
	l10n/zh_CN.GB2312/updater.po