Goodbye Chronus, it was nice knowing you (2 of 2)

Change-Id: I200fd25a5f21bb19d04fb3fa5e94155e491b228f

Conflicts:

	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-lt/strings.xml
	res/values-nl/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml