Updated: Translation resource file identifier to 1_2_x
Merge branch '1.2.x' into develop

Conflicts:
	i18n/.tx/config