Merge from translate.androplus.org and moved not-translatable strings
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-zh-rCN/strings.xml