Update strings.xml
Update strings.xml
Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development

Conflicts:
	res/values-eu/strings.xml
Merge branch 'beriain-development' into development