Merge branch 'master' of ssh://github.com/osmandapp/Osmand into settings_improvements

2019-10-17 16:18:33 +03:00 · 2019-10-17 16:18:33 +03:00 · 1cff077495
commit 1cff077495
parent 390fd268c4 0c6db2fc4f
17 changed files with 2 additions and 0 deletions
--- a/OsmAnd/res/drawable-hdpi/ic_action_openstreetmap_logo.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_openstreetmap_logo.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_utv.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_utv.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_width_limit.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_width_limit.png
--- a/OsmAnd/res/drawable-hdpi/ic_sdcard.png
+++ b/OsmAnd/res/drawable-hdpi/ic_sdcard.png
--- a/OsmAnd/res/drawable-hdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-hdpi/map_action_utv.png
--- a/OsmAnd/res/drawable-large-hdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-large-hdpi/map_action_utv.png
--- a/OsmAnd/res/drawable-large-xhdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-large-xhdpi/map_action_utv.png
--- a/OsmAnd/res/drawable-large/map_action_utv.png
+++ b/OsmAnd/res/drawable-large/map_action_utv.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_width_limit.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_width_limit.png
--- a/OsmAnd/res/drawable-mdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-mdpi/map_action_utv.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_width_limit.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_width_limit.png
--- a/OsmAnd/res/drawable-xhdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-xhdpi/map_action_utv.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_width_limit.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_width_limit.png
--- a/OsmAnd/res/drawable-xxhdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-xxhdpi/map_action_utv.png
--- a/OsmAnd/res/drawable-xxxhdpi/ic_action_width_limit.png
+++ b/OsmAnd/res/drawable-xxxhdpi/ic_action_width_limit.png
--- a/OsmAnd/res/drawable-xxxhdpi/map_action_utv.png
+++ b/OsmAnd/res/drawable-xxxhdpi/map_action_utv.png
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -4110,4 +4110,6 @@

 	<string name="poi_charge">Charge</string>

+	<string name="poi_pet_grooming">Pet grooming</string>
+
 </resources>