Fix OsMo

Conflicts:
	OsmAnd/res/values/strings.xml
Fix osmo

Conflicts:
	OsmAnd/res/values/strings.xml