Merge remote-tracking branch 'origin/master'

2015-03-27 17:40:51 +01:00 · 2015-03-27 17:40:51 +01:00 · d0ab4e2472
commit d0ab4e2472
parent 84c17bc655 7d93da07fb
25 changed files with 1 additions and 0 deletions
--- a/OsmAnd/res/drawable-hdpi/ic_action_bus2.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_bus2.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_fav2.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_fav2.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_history2.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_history2.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_home2.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_home2.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_info2.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_info2.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_marker2.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_marker2.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_bus2.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_bus2.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_fav2.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_fav2.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_history2.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_history2.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_home2.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_home2.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_info2.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_info2.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_marker2.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_marker2.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_bus2.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_bus2.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_fav2.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_fav2.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_history2.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_history2.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_home2.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_home2.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_info2.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_info2.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_marker2.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_marker2.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_home2.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_home2.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_info2.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_info2.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -103,6 +103,7 @@
 	<string name="poi_jewelry">Jewelry store</string>
 	<string name="poi_kiosk">Kiosk</string>
 	<string name="poi_kitchen">Kitchen furnishings</string>
+	<string name="poi_medical_supply">Medical supply</string>
 	<string name="poi_mobile_phone">Cell phone store</string>
 	<string name="poi_motorcycle">Motorcycle shop</string>
 	<string name="poi_musical_instrument">Musical instruments</string>