better strings

Conflicts:

	res/xml/settings_headers.xml