Settings : network traffic

Conflicts:
	res/values/cm_strings.xml