Fix : clock & date strings

Conflicts:
	res/values/cm_strings.xml