Vitaliy f43b721002 Merge branch 'master' of https://github.com/osmandapp/Osmand into plugin_prefs ... # Conflicts: # OsmAnd/res/values/strings.xml		2020-01-22 09:58:48 +02:00
..
phrases.xml	Translated using Weblate (Catalan)	2019-08-13 08:09:02 +02:00
strings.xml	Merge branch 'master' of https://github.com/osmandapp/Osmand into plugin_prefs	2020-01-22 09:58:48 +02:00