diff --git a/OsmAnd/res/drawable-hdpi/bg_contextmenu_shadow_dark.9.png b/OsmAnd/res/drawable-hdpi/bg_contextmenu_shadow_dark.9.png
new file mode 100644
index 0000000000..6773eeecd4
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/bg_contextmenu_shadow_dark.9.png differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_contextmenu_shadow_light.9.png b/OsmAnd/res/drawable-hdpi/bg_contextmenu_shadow_light.9.png
new file mode 100644
index 0000000000..a906b6cd33
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/bg_contextmenu_shadow_light.9.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_folder.png b/OsmAnd/res/drawable-hdpi/ic_action_folder.png
new file mode 100644
index 0000000000..e6dd61dfa9
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_folder.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-hdpi/ic_action_folder_stroke.png
new file mode 100644
index 0000000000..313d96d692
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_folder_stroke.png differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_contextmenu_shadow_dark.9.png b/OsmAnd/res/drawable-mdpi/bg_contextmenu_shadow_dark.9.png
new file mode 100644
index 0000000000..cbe1898a3f
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/bg_contextmenu_shadow_dark.9.png differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_contextmenu_shadow_light.9.png b/OsmAnd/res/drawable-mdpi/bg_contextmenu_shadow_light.9.png
new file mode 100644
index 0000000000..52fcb58f71
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/bg_contextmenu_shadow_light.9.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_folder.png b/OsmAnd/res/drawable-mdpi/ic_action_folder.png
new file mode 100644
index 0000000000..50acda356e
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_folder.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-mdpi/ic_action_folder_stroke.png
new file mode 100644
index 0000000000..5bb047ad45
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_folder_stroke.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_shadow_dark.9.png b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_shadow_dark.9.png
new file mode 100644
index 0000000000..64e64a0d63
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_shadow_dark.9.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_shadow_light.9.png b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_shadow_light.9.png
new file mode 100644
index 0000000000..ba6496a879
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_shadow_light.9.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_folder.png b/OsmAnd/res/drawable-xhdpi/ic_action_folder.png
new file mode 100644
index 0000000000..3858aa783f
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_folder.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-xhdpi/ic_action_folder_stroke.png
new file mode 100644
index 0000000000..36b88b029a
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_folder_stroke.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_shadow_dark.9.png b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_shadow_dark.9.png
new file mode 100644
index 0000000000..05f3015f99
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_shadow_dark.9.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_shadow_light.9.png b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_shadow_light.9.png
new file mode 100644
index 0000000000..8a3ab89a0c
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_shadow_light.9.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_folder.png b/OsmAnd/res/drawable-xxhdpi/ic_action_folder.png
new file mode 100644
index 0000000000..0c6aee590f
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_folder.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-xxhdpi/ic_action_folder_stroke.png
new file mode 100644
index 0000000000..de47921be5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_folder_stroke.png differ
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 969d9f63d2..99f9a95ab9 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -931,13 +931,13 @@
 	<string name="poi_service_times">Service-tider</string>
 	<string name="poi_brand">Varemærke</string>
 
-	<string name="poi_enforcement_traffic_signals">Trafiksignaler</string>
-	<string name="poi_enforcement_maxspeed">Hastighedskontrol</string>
-	<string name="poi_enforcement_maxheight">Højdekontrol</string>
-	<string name="poi_enforcement_mindistance">Afstandskontrol</string>
-	<string name="poi_enforcement_check">Trafikontrol</string>
-	<string name="poi_enforcement_access">Adgangskontrol</string>
-	<string name="poi_enforcement_toll">Vejafgiftskontrol</string>
+	<string name="poi_enforcement_traffic_signals">Overvågning: stoplys</string>
+	<string name="poi_enforcement_maxspeed">Overvågning: hastighedskontrol</string>
+	<string name="poi_enforcement_maxheight">Overvågning: højdekontrol</string>
+	<string name="poi_enforcement_mindistance">Overvågning: afstandskontrol</string>
+	<string name="poi_enforcement_check">Overvågning: trafikkontrol</string>
+	<string name="poi_enforcement_access">Overvågning: adgangskontrol</string>
+	<string name="poi_enforcement_toll">Overvågning: vejafgiftskontrol</string>
 
 <string name="poi_country">Landlig</string>
 	<string name="poi_fee_yes">Gebyr</string>
@@ -956,7 +956,7 @@
 	<string name="poi_access_no">Ingen adgang</string>
 	<string name="poi_access_destination">Adgang destination</string>
 	<string name="poi_access_permissive">Adgang tolerant</string>
-	<string name="poi_access_customers">Adgang for kunde</string>
+	<string name="poi_access_customers">Kundenadgang</string>
 	<string name="poi_access_delivery">Adgang for levering</string>
 	<string name="poi_access_agricultural">Adgang for landbrug</string>
 
@@ -1055,14 +1055,14 @@
 	<string name="poi_seasonal_autumn">Efterår</string>
 	<string name="poi_seasonal_winter">Vinter</string>
 
-	<string name="poi_crossing_traffic_signals">Med trafiksignaler</string>
+	<string name="poi_crossing_traffic_signals">Med stoplys</string>
 	<string name="poi_crossing_uncontrolled">Ikke kontrolleret</string>
 	<string name="poi_crossing_unmarked">Ikke markeret</string>
 
 	<string name="poi_mill_pond">Mølledam</string>
 	<string name="poi_twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
-	<string name="poi_youtube">Youtube</string>
+	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
@@ -1155,22 +1155,22 @@
 	<string name="poi_start_date">Startdato</string>
 	<string name="poi_wheelchair">Kørestol</string>
 
-	<string name="poi_content_silage">Ensilage (indhold)</string>
-	<string name="poi_content_water">Vand (indhold)</string>
-	<string name="poi_content_slurry">Gylle (indhold)</string>
-	<string name="poi_content_oil">Olie (indhold)</string>
-	<string name="poi_content_fuel">Brændstof (indhold)</string>
-	<string name="poi_content_manure">Gødning (indhold)</string>
-	<string name="poi_content_wine">Vin (indhold)</string>
-	<string name="poi_content_sewage">Spildevand (indhold)</string>
-	<string name="poi_content_gas">Gas (indhold)</string>
-	<string name="poi_content_biomass">Biomasse (indhold)</string>
-	<string name="poi_content_wastewater">Afløbsvand (indhold)</string>
-	<string name="poi_content_crop">Afgrøde (indhold)</string>
-	<string name="poi_content_fodder">Foder (indhold)</string>
-	<string name="poi_content_beer">Øl (indhold)</string>
-	<string name="poi_content_salt">Salt (indhold)</string>
-	<string name="poi_content_grain">Korn (indhold)</string>
+	<string name="poi_content_silage">Indhold: ensilage</string>
+	<string name="poi_content_water">Indhold: vand</string>
+	<string name="poi_content_slurry">Indhold: gylle</string>
+	<string name="poi_content_oil">Indhold: olie</string>
+	<string name="poi_content_fuel">Indhold: brændstof</string>
+	<string name="poi_content_manure">Indhold: gødning</string>
+	<string name="poi_content_wine">Indhold: vin</string>
+	<string name="poi_content_sewage">Indhold: spildevand</string>
+	<string name="poi_content_gas">Indhold: gas</string>
+	<string name="poi_content_biomass">Indhold: biomasse</string>
+	<string name="poi_content_wastewater">Indhold: afløbsvand</string>
+	<string name="poi_content_crop">Indhold: afgrøde</string>
+	<string name="poi_content_fodder">Indhold: foder</string>
+	<string name="poi_content_beer">Indhold: øl</string>
+	<string name="poi_content_salt">Indhold: salt</string>
+	<string name="poi_content_grain">Indhold: korn</string>
 
 	<string name="poi_bunker_silo">Plansilo</string>
 	<string name="poi_brownfield">Nedlagt industrigrund</string>
@@ -1293,40 +1293,40 @@
 	<string name="poi_information_terminal">Informationsstander</string>
 	<string name="poi_information_route_marker">Ruteskilte</string>
 	<string name="poi_information_hikingmap">Vandrekort</string>
-	<string name="poi_information_nature">Information om natur</string>
-	<string name="poi_information_wildlife">Information om dyreliv</string>
-	<string name="poi_information_history">Information om historie</string>
+	<string name="poi_information_nature">Information om: natur</string>
+	<string name="poi_information_wildlife">Information om: dyreliv</string>
+	<string name="poi_information_history">Information om: historie</string>
 	<string name="poi_information_sign">Skilt</string>
 	<string name="poi_information_audioguide">Audioguide</string>
 	<string name="poi_information_bicyclemap">Cykelkort</string>
 	<string name="poi_information_tactile_model">Taktilmodel</string>
 	<string name="poi_information_tactile_map">Taktilkort</string>
-	<string name="poi_board_type_plants">Information om planter</string>
-	<string name="poi_board_type_geology">Information om geologi</string>
-	<string name="poi_board_type_public_transport">Information om offentlig transport</string>
-	<string name="poi_board_type_technology">Information om teknologi</string>
-	<string name="poi_board_type_astronomy">Information om astronomi</string>
+	<string name="poi_board_type_plants">Information om: planter</string>
+	<string name="poi_board_type_geology">Information om: geologi</string>
+	<string name="poi_board_type_public_transport">Information om: offentlig transport</string>
+	<string name="poi_board_type_technology">Information om: teknologi</string>
+	<string name="poi_board_type_astronomy">Information om: astronomi</string>
 
 <string name="poi_information_trail_blaze">Stiafmærkning</string>
-	<string name="poi_board_type_notice">Advarseltavle</string>
+	<string name="poi_board_type_notice">Opslagstavle</string>
 	<string name="poi_commercial">Forretningsområde</string>
 	<string name="poi_retail">Detailhandelsområde</string>
 
 	<string name="poi_fireplace_yes">Ildsted</string>
 	<string name="poi_fireplace_no">Intet ildsted</string>
 
-	<string name="poi_covered_yes">Med læ</string>
-	<string name="poi_covered_no">Uden læ</string>
+	<string name="poi_covered_yes">Overdækket</string>
+	<string name="poi_covered_no">Ikke overdækket</string>
 
 	<string name="poi_smoking_no">Rygning forbudt</string>
 	<string name="poi_smoking_outside">Rygning er kun tilladt udendørs</string>
 	<string name="poi_smoking_yes">Rygning tilladt</string>
-	<string name="poi_smoking_separated">Rygning er tilladt i et særskilt rum uden effektiv adskillelse</string>
-	<string name="poi_smoking_isolated">Rygning er tilladt i et separat rum med effektiv adskillelse</string>
+	<string name="poi_smoking_separated">Rygning tilladt i et adskilt lokale</string>
+	<string name="poi_smoking_isolated">Rygning tilladt i et isoleret rum</string>
 	<string name="poi_smoking_dedicated">Dedikeret til rygere</string>
 
-	<string name="poi_toll_no">Betaling af afgifter opkræves ikke</string>
-	<string name="poi_toll_yes">Betaling af afgifter opkræves</string>
+	<string name="poi_toll_no">Ingen vejafgift</string>
+	<string name="poi_toll_yes">Vejafgift</string>
 	<string name="poi_tactile_paving_yes">Med taktilbelægning</string>
 	<string name="poi_tactile_paving_no">Uden taktilbelægning</string>
 	<string name="poi_traffic_signals_sound_yes">Med lydsignal</string>
@@ -1334,7 +1334,7 @@
 	<string name="poi_traffic_signals_sound_walk">Med lydsignal når det er tilladt at gå</string>
 
 <string name="poi_ford_stepping_stones">Trædestensbro</string>
-	<string name="poi_toll_hgv_yes">Betaling af afgifter opkræves for tunge lastvogne</string>
+	<string name="poi_toll_hgv_yes">HGV vejafgift</string>
 	<string name="poi_rescue_station">Redningsstation</string>
 
 <string name="poi_bicycle_parking_anchors">Ankre</string>
@@ -1344,7 +1344,7 @@
 	<string name="poi_paediatrics">Pædiatri</string>
 
 	<string name="poi_mini_roundabout">Mini-rundkørsel</string>
-	<string name="poi_railway_crossing">Jernbane fodgængerovergang</string>
+	<string name="poi_railway_crossing">Jernbaneoverskæring</string>
 	<string name="poi_railway_level_crossing">Jernbaneoverskæring</string>
 	<string name="poi_bird_hide">Fugletårn</string>
 	<string name="poi_horse_riding">Ridning</string>
@@ -1366,7 +1366,7 @@
 <string name="poi_leisure_common">Fælles rekreativt område</string>
 	<string name="poi_level">Niveau</string>
 
-<string name="poi_rtsa_scale">Vanskeligt bjergpas</string>
+<string name="poi_rtsa_scale">RTSA skala</string>
 
 <string name="poi_pump">Pumpe</string>
 
@@ -1384,45 +1384,63 @@
 	<string name="poi_piste_grooming_no">Pistepreparering: ingen</string>
 	<string name="poi_piste_grooming_mogul">Pistepreparering: pukkelpist</string>
 
-<string name="poi_garden_type_residential">Havetype: bolig</string>
+<string name="poi_garden_type_residential">Havetype: beboelse</string>
 	<string name="poi_garden_type_community">Havetype: offentlig</string>
 	<string name="poi_garden_type_private">Havetype: privat</string>
 	<string name="poi_garden_type_botanical">Havetype: botanisk</string>
 
-	<string name="poi_garden_style_french">Havestil: fransk</string>
-	<string name="poi_garden_style_english">Havestil: engelsk</string>
-	<string name="poi_garden_style_japanese">Havestil: japansk</string>
+	<string name="poi_garden_style_french">Havestil: Fransk</string>
+	<string name="poi_garden_style_english">Havestil: Eengelsk</string>
+	<string name="poi_garden_style_japanese">Havestil: Japansk</string>
 
 <string name="poi_garden_style_kitchen">Havestil: køkken</string>
 	<string name="poi_garden_style_rosarium">Havestil: rosen</string>
 	<string name="poi_capacity">Kapacitet</string>
-	<string name="poi_capacity_disabled_yes">Dedikerede pladser til handicappede</string>
-	<string name="poi_capacity_disabled_no">Ingen dedikerede pladser til handicappede</string>
-	<string name="poi_capacity_disabled">Dedikerede pladser til handicappede</string>
-	<string name="poi_capacity_women_yes">Dedikerede pladser til kvinder</string>
-	<string name="poi_capacity_women_no">Ingen dedikerede pladser til kvinder</string>
-	<string name="poi_capacity_women">Dedikerede pladser til kvinder</string>
-	<string name="poi_capacity_pupils">Dedikerede pladser til elever</string>
-	<string name="poi_capacity_teachers">Dedikerede pladser til lærere</string>
-	<string name="poi_capacity_parent_yes">Dedikerede pladser til forældre</string>
-	<string name="poi_capacity_parent_no">Ingen dedikerede pladser til forældre</string>
-	<string name="poi_capacity_parent">Dedikerede pladser til forældre</string>
+	<string name="poi_capacity_disabled_yes">Pladser forbeholdt handicappede</string>
+	<string name="poi_capacity_disabled_no">Ingen pladser forbeholdt handicappede</string>
+	<string name="poi_capacity_disabled">Pladser forbeholdt handicappede</string>
+	<string name="poi_capacity_women_yes">Pladser forbeholdt kvinder</string>
+	<string name="poi_capacity_women_no">Ingen pladser forbeholdt kvinder</string>
+	<string name="poi_capacity_women">Pladser forbeholdt kvinder</string>
+	<string name="poi_capacity_pupils">Dedikerede pladser til studerende</string>
+	<string name="poi_capacity_teachers">Pladser forbeholdt lærere</string>
+	<string name="poi_capacity_parent_yes">Pladser forbeholdt forældre</string>
+	<string name="poi_capacity_parent_no">Ingen pladser forbeholdt forældre</string>
+	<string name="poi_capacity_parent">Pladser forbeholdt forældre</string>
 
-	<string name="poi_aerialway_occupancy">Hytte/stol/bil kapacitet</string>
+	<string name="poi_aerialway_occupancy">Kabine/stol/vogn kapacitet</string>
 	<string name="poi_aerialway_capacity">Kapacitet pr. time</string>
 	<string name="poi_aerialway_duration">Gennemsnitlige rejsetid, minutter</string>
 	<string name="poi_aerialway_bubble_yes">Boble</string>
 	<string name="poi_aerialway_bubble_no">Ingen boble</string>
-	<string name="poi_aerialway_heating_yes">Opvarmning</string>
-	<string name="poi_aerialway_heating_no">Ingen opvarmning</string>
+	<string name="poi_aerialway_heating_yes">Opvarmet</string>
+	<string name="poi_aerialway_heating_no">Ikke opvarmet</string>
 	<string name="poi_aerialway_bicycle_yes">Cykel: tilladt</string>
 	<string name="poi_aerialway_bicycle_no">Cykel: ikke tilladt</string>
-	<string name="poi_aerialway_bicycle_summer">Cykel: tilladt kun om sommeren</string>
+	<string name="poi_aerialway_bicycle_summer">Cykel: kun tilladt om sommeren</string>
 	<string name="poi_aerialway_access_entry">Kun indgang</string>
 	<string name="poi_aerialway_access_exit">Kun udgang</string>
 	<string name="poi_aerialway_access_both">Ind- og udgang</string>
-	<string name="poi_aerialway_summer_access_entry">Sommer adgang: kun indgang</string>
-	<string name="poi_aerialway_summer_access_exit">Sommer adgang: kun udgang</string>
-	<string name="poi_aerialway_summer_access_both">Sommer adgang: ind- og udgang</string>
+	<string name="poi_aerialway_summer_access_entry">Sommeradgang: kun indgang</string>
+	<string name="poi_aerialway_summer_access_exit">Sommeradgang: kun udgang</string>
+	<string name="poi_aerialway_summer_access_both">Sommeradgang: ind- og udgang</string>
+
+<string name="poi_wheelchair_no">Kørestol: ikke tilladt</string>
+	<string name="poi_wheelchair_limited">Kørestol: begrænset</string>
+	<string name="poi_stars_1">Stjerner: 1 (Turist)</string>
+	<string name="poi_stars_1s">Stjerner: 1S (Superior Turist)</string>
+	<string name="poi_stars_2">Stjerner: 2 (Standard)</string>
+	<string name="poi_stars_2s">Stjerner: 2S (Superior Standard)</string>
+	<string name="poi_stars_3">Stjerner: 3 (Komfort)</string>
+	<string name="poi_stars_3s">Stjerner: 3S (Superior Komfort)</string>
+	<string name="poi_stars_4">Stjerner: 4 (Førsteklasse)</string>
+	<string name="poi_stars_4s">Stjerner: 4S (Superior Førsteklasse)</string>
+	<string name="poi_stars_5">Stjerner: 5 (Luksus)</string>
+	<string name="poi_stars_5s">Stjerner: 5S (Superior Luksus)</string>
+	<string name="poi_stars_6">Stjerner: 6</string>
+	<string name="poi_stars_7">Stjerner: 7</string>
+	<string name="poi_rooms">Værelser</string>
+
+	<string name="poi_love_hotel">Kærlighedshotel</string>
 
 </resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 6093cc6964..951b415135 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -892,15 +892,15 @@
 
 	<string name="poi_tourism_attraction">Atracción turística</string>
 	<string name="poi_cutline">Cortafuegos forestal</string>
-	<string name="poi_icn_ref">Red de nodos ciclista internacional</string>
-	<string name="poi_ncn_ref">Red de nodos ciclista nacional</string>
-	<string name="poi_rcn_ref">Red de nodos ciclista regional</string>
-	<string name="poi_lcn_ref">Red de nodos ciclista local</string>
+	<string name="poi_icn_ref">Red de ruta ciclista internacional</string>
+	<string name="poi_ncn_ref">Red de ruta ciclista nacional</string>
+	<string name="poi_rcn_ref">Red de ruta ciclista regional</string>
+	<string name="poi_lcn_ref">Red de ruta ciclista local</string>
 
-	<string name="poi_iwn_ref">Red internacional de senderismo</string>
-	<string name="poi_nwn_ref">Red nacional de senderismo</string>
-	<string name="poi_rwn_ref">Red regional de senderismo</string>
-	<string name="poi_lwn_ref">Red local de senderismo</string>
+	<string name="poi_iwn_ref">Red de ruta internacional de senderismo</string>
+	<string name="poi_nwn_ref">Red de ruta nacional de senderismo</string>
+	<string name="poi_rwn_ref">Red de ruta regional de senderismo</string>
+	<string name="poi_lwn_ref">Red de ruta local de senderismo</string>
 
 	<string name="poi_opening_hours">Horario de atención</string>
 	<string name="poi_collection_times">Horario de recolección</string>
@@ -939,7 +939,7 @@
 	<string name="poi_access_no">Sin acceso</string>
 	<string name="poi_access_destination">Acceso a destino</string>
 	<string name="poi_access_permissive">Acceso permisivo</string>
-	<string name="poi_access_customers">Acceso de clientes</string>
+	<string name="poi_access_customers">Acceso a clientes</string>
 	<string name="poi_access_agricultural">Acceso agrícola</string>
 
 	<string name="poi_access_delivery">Acceso para entregas</string>
@@ -951,7 +951,7 @@
 	<string name="poi_fax">Fax</string>
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_mobile">Celular</string>
-	<string name="poi_animal_shelter_dog">Refugio para perros</string>
+	<string name="poi_animal_shelter_dog">Refugio canino</string>
 	<string name="poi_animal_shelter_cat">Refugio para gatos</string>
 	<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
 	<string name="poi_animal_shelter_bird">Refugio para aves</string>
@@ -1044,7 +1044,7 @@
 	<string name="poi_mill_pond">Laguna de molino</string>
 	<string name="poi_twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
-	<string name="poi_youtube">Youtube</string>
+	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
@@ -1137,24 +1137,24 @@
 	<string name="poi_start_date">Fecha de inicio</string>
 	<string name="poi_wheelchair">Silla de rueda</string>
 
-	<string name="poi_content_silage">Ensilado (contenido)</string>
-	<string name="poi_content_water">Agua (contenido)</string>
-	<string name="poi_content_oil">Petróleo (contenido)</string>
-	<string name="poi_content_fuel">Combustible (contenido)</string>
-	<string name="poi_content_manure">Estiércol (contenido)</string>
-	<string name="poi_content_wine">Vino (contenido)</string>
-	<string name="poi_content_sewage">Agua residual (contenido)</string>
-	<string name="poi_content_gas">Gas (contenido)</string>
-	<string name="poi_content_biomass">Biomasa (contenido)</string>
-	<string name="poi_content_wastewater">Agua residual (contenido)</string>
-	<string name="poi_content_crop">Cultivo (contenido)</string>
-	<string name="poi_content_fodder">Forraje (contenido)</string>
-	<string name="poi_content_beer">Cerveza (contenido)</string>
-	<string name="poi_content_salt">Sal (contenido)</string>
-	<string name="poi_content_grain">Cereal (contenido)</string>
+	<string name="poi_content_silage">Contenido: ensilaje</string>
+	<string name="poi_content_water">Contenido: agua</string>
+	<string name="poi_content_oil">Contenido: petróleo</string>
+	<string name="poi_content_fuel">Contenido: combustible</string>
+	<string name="poi_content_manure">Contenido: estiércol</string>
+	<string name="poi_content_wine">Contenido: vino</string>
+	<string name="poi_content_sewage">Contenido: aguas negras</string>
+	<string name="poi_content_gas">Contenido: gas</string>
+	<string name="poi_content_biomass">Contenido: biomasa</string>
+	<string name="poi_content_wastewater">Contenido: aguas residuales</string>
+	<string name="poi_content_crop">Contenido: cultivo</string>
+	<string name="poi_content_fodder">Contenido: forraje</string>
+	<string name="poi_content_beer">Contenido: cerveza</string>
+	<string name="poi_content_salt">Contenido: sal</string>
+	<string name="poi_content_grain">Contenido: granos</string>
 
 	<string name="poi_bunker_silo">Silo bunker</string>
-	<string name="poi_content_slurry">Mezcla (contenido)</string>
+	<string name="poi_content_slurry">Contenido: mezcla</string>
 	<string name="poi_brownfield">Suelo abandonado urbanizable</string>
 	<string name="poi_greenfield">Suelo urbanizable</string>
 	<string name="poi_wholesale">Venta mayorista</string>
@@ -1273,48 +1273,48 @@
 	<string name="poi_information_terminal">Terminal de información</string>
 	<string name="poi_information_route_marker">Marcador de ruta</string>
 	<string name="poi_information_hikingmap">Mapa de senderismo</string>
-	<string name="poi_information_nature">Información sobre la naturaleza</string>
-	<string name="poi_information_wildlife">Información sobre la vida silvestre</string>
-	<string name="poi_information_history">Información histórica</string>
+	<string name="poi_information_nature">Información: naturaleza</string>
+	<string name="poi_information_wildlife">Información: vida salvaje</string>
+	<string name="poi_information_history">Información: historia</string>
 	<string name="poi_information_sign">Señal</string>
 	<string name="poi_information_audioguide">Audio-guía</string>
 	<string name="poi_information_bicyclemap">Mapa ciclista</string>
 	<string name="poi_information_tactile_model">Modelo táctil</string>
 	<string name="poi_information_tactile_map">Mapa táctil</string>
-	<string name="poi_board_type_notice">Tablero con aviso</string>
-	<string name="poi_board_type_plants">Información sobre plantas</string>
-	<string name="poi_board_type_geology">Información geológica</string>
-	<string name="poi_board_type_public_transport">Información sobre el transporte público</string>
-	<string name="poi_board_type_technology">Información tecnológica</string>
-	<string name="poi_board_type_astronomy">Información astronómica</string>
+	<string name="poi_board_type_notice">Tablón con anuncio</string>
+	<string name="poi_board_type_plants">Información: plantas</string>
+	<string name="poi_board_type_geology">Información: geología</string>
+	<string name="poi_board_type_public_transport">Información: transporte público</string>
+	<string name="poi_board_type_technology">Información: tecnología</string>
+	<string name="poi_board_type_astronomy">Información: astronomía</string>
 
 	<string name="poi_commercial">Área de oficinas</string>
 	<string name="poi_fireplace_yes">Chimenea</string>
 	<string name="poi_fireplace_no">Sin chimenea</string>
 
-	<string name="poi_covered_yes">Con refugio</string>
-	<string name="poi_covered_no">Sin refugio</string>
+	<string name="poi_covered_yes">Cubierto</string>
+	<string name="poi_covered_no">Sin cobertura</string>
 
 	<string name="poi_smoking_no">No fumar</string>
-	<string name="poi_smoking_outside">Permitido fumar en el exterior</string>
+	<string name="poi_smoking_outside">Permitido fumar afuera</string>
 	<string name="poi_smoking_yes">Permitido fumar</string>
-	<string name="poi_smoking_separated">Permitido fumar en habitación separada y sin separación efectiva</string>
-	<string name="poi_smoking_isolated">Permitido fumar en una sala aislada físicamente</string>
+	<string name="poi_smoking_separated">Permitido fumar en habitación separada</string>
+	<string name="poi_smoking_isolated">Permitido fumar en habitación aislada</string>
 	<string name="poi_smoking_dedicated">Solo fumadores</string>
 
-	<string name="poi_toll_no">Peaje sin tarifa</string>
-	<string name="poi_toll_yes">Peaje tarifado</string>
+	<string name="poi_toll_no">Sin Peaje</string>
+	<string name="poi_toll_yes">Peaje</string>
 	<string name="poi_tactile_paving_yes">Con pavimento táctil</string>
 	<string name="poi_tactile_paving_no">Sin pavimento táctil</string>
 	<string name="poi_traffic_signals_sound_yes">Sonoro</string>
 	<string name="poi_traffic_signals_sound_no">Sin sonido</string>
-	<string name="poi_traffic_signals_sound_walk">Sonoro sólo cuando se permite caminar</string>
+	<string name="poi_traffic_signals_sound_walk">Sonoro cuando se permite caminar</string>
 
 <string name="poi_retail">Área comercial</string>
 
 	<string name="poi_ford_stepping_stones">Puente de piedras</string>
 	<string name="poi_information_board">Tablero de información</string>
-	<string name="poi_toll_hgv_yes">Peaje tarifado para vehículos pesados</string>
+	<string name="poi_toll_hgv_yes">Peaje para camiones</string>
 	<string name="poi_information_trail_blaze">Marcador del camino</string>
 	<string name="poi_rescue_station">Estación de rescate</string>
 
@@ -1345,7 +1345,7 @@
 <string name="poi_leisure_common">Área de ocio común</string>
 	<string name="poi_heath">Brezal</string>
 	<string name="poi_windfall">Fruto caído</string>
-	<string name="poi_rtsa_scale">Dificultad del paso de montaña</string>
+	<string name="poi_rtsa_scale">Escala RTSA</string>
 
 <string name="poi_pump">Bomba</string>
 
@@ -1363,4 +1363,63 @@
 	<string name="poi_piste_grooming_no">Sin preparación de la pista</string>
 	<string name="poi_piste_grooming_mogul">Pista de entrenamiento: magnate</string>
 
+<string name="poi_garden_type_residential">Jardín residencial</string>
+	<string name="poi_garden_type_community">Jardín comunitario</string>
+	<string name="poi_garden_type_private">Jardín privado</string>
+	<string name="poi_garden_type_botanical">Jardín botánico</string>
+
+	<string name="poi_garden_style_kitchen">Jardín huerta</string>
+	<string name="poi_garden_style_rosarium">Jardín rosedal</string>
+	<string name="poi_garden_style_french">Jardín francés</string>
+	<string name="poi_garden_style_english">Jardín inglés</string>
+	<string name="poi_garden_style_japanese">Jardín japonés</string>
+
+	<string name="poi_capacity">Capacidad</string>
+	<string name="poi_capacity_disabled_yes">Lugar reservado para discapacitados</string>
+	<string name="poi_capacity_disabled_no">Sin lugar reservado para discapacitados</string>
+	<string name="poi_capacity_disabled">Lugares para discapacitados</string>
+	<string name="poi_capacity_women_yes">Lugares reservados para mujeres</string>
+	<string name="poi_capacity_women_no">Sin lugar dedicado para mujeres</string>
+	<string name="poi_capacity_women">Lugares reservados para mujeres</string>
+	<string name="poi_capacity_pupils">Lugares reservados para estudiantes</string>
+	<string name="poi_capacity_teachers">Lugares reservados para profesores</string>
+	<string name="poi_capacity_parent_yes">Lugares reservados para padres</string>
+	<string name="poi_capacity_parent_no">Sin lugares reservados para padres</string>
+	<string name="poi_capacity_parent">Lugares reservados para padres</string>
+
+	<string name="poi_aerialway_occupancy">Capacidad de cabina/silla/coche</string>
+	<string name="poi_aerialway_capacity">Capacidad por hora</string>
+	<string name="poi_aerialway_duration">Tiempo de viaje promedio, minutos</string>
+	<string name="poi_aerialway_bubble_yes">Burbuja</string>
+	<string name="poi_aerialway_bubble_no">Sin burbuja</string>
+	<string name="poi_aerialway_heating_yes">Calefaccionado</string>
+	<string name="poi_aerialway_heating_no">Sin colefacción</string>
+	<string name="poi_aerialway_bicycle_yes">Bicicletas permitidas</string>
+	<string name="poi_aerialway_bicycle_no">Bicicletas no permitidas</string>
+	<string name="poi_aerialway_bicycle_summer">Bicicletas permitidas sólo en verano</string>
+	<string name="poi_aerialway_access_entry">Sólo entrada</string>
+	<string name="poi_aerialway_access_exit">Sólo salida</string>
+	<string name="poi_aerialway_access_both">Entrada y salida</string>
+	<string name="poi_aerialway_summer_access_entry">Sólo acceso de entrada en verano</string>
+	<string name="poi_aerialway_summer_access_exit">Sólo acceso de salida en verano</string>
+	<string name="poi_aerialway_summer_access_both">Acesso de entrada y salida en verano</string>
+
+<string name="poi_wheelchair_no">Silla de ruedas: no permitido</string>
+	<string name="poi_wheelchair_limited">Silla de ruedas: limitado</string>
+	<string name="poi_stars_1">Estrellas: 1 (Turista)</string>
+	<string name="poi_stars_1s">Estrellas: 1S (Turista Superior)</string>
+	<string name="poi_stars_2">Estrellas: 2 (Estándar)</string>
+	<string name="poi_stars_2s">Estrellas: 2S (Estándar Superior)</string>
+	<string name="poi_stars_3">Estrellas: 3 (Confortable)</string>
+	<string name="poi_stars_3s">Estrellas: 3S (Confortable Superior)</string>
+	<string name="poi_stars_4">Estrellas: 4 (Primera Clase)</string>
+	<string name="poi_stars_4s">Estrellas: 4S (Primera Clase Superior)</string>
+	<string name="poi_stars_5">Estrellas: 5 (Lujurioso)</string>
+	<string name="poi_stars_5s">Estrellas: 5S (Lujurioso Superior)</string>
+	<string name="poi_stars_6">Estrellas: 6</string>
+	<string name="poi_stars_7">Estrellas: 7</string>
+	<string name="poi_rooms">Habitaciones</string>
+
+	<string name="poi_love_hotel">Telo</string>
+
 </resources>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 6bd1fff680..e8dec1161a 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -890,7 +890,7 @@
 	<string name="poi_tourism_attraction">Atracción turística</string>
 	<string name="poi_cutline">Cortafuegos forestal</string>
 	<string name="poi_tree">Árbol</string>
-	<string name="poi_icn_ref">Red de nodos ciclista internacional</string>
+	<string name="poi_icn_ref">Red de ruta ciclista internacional</string>
 	<string name="poi_opening_hours">Horario de atención</string>
 	<string name="poi_collection_times">Horario de recolección</string>
 	<string name="poi_description">Descripción</string>
@@ -914,14 +914,14 @@
 
 <string name="poi_kissing_gate">Portilla en V</string>
 	<string name="poi_sally_port">Portón de muralla</string>
-	<string name="poi_ncn_ref">Red de nodos ciclista nacional</string>
-	<string name="poi_rcn_ref">Red de nodos ciclista regional</string>
-	<string name="poi_lcn_ref">Red de nodos ciclista local</string>
+	<string name="poi_ncn_ref">Red de ruta ciclista nacional</string>
+	<string name="poi_rcn_ref">Red de ruta ciclista regional</string>
+	<string name="poi_lcn_ref">Red de ruta ciclista local</string>
 
-	<string name="poi_iwn_ref">Red internacional de senderismo</string>
-	<string name="poi_nwn_ref">Red nacional de senderismo</string>
-	<string name="poi_rwn_ref">Red regional de senderismo</string>
-	<string name="poi_lwn_ref">Red local de senderismo</string>
+	<string name="poi_iwn_ref">Ruta internacional de senderismo</string>
+	<string name="poi_nwn_ref">Ruta nacional de senderismo</string>
+	<string name="poi_rwn_ref">Ruta regional de senderismo</string>
+	<string name="poi_lwn_ref">Red de ruta local de senderismo</string>
 
 	<string name="poi_enforcement_access">Control de acceso</string>
 	<string name="poi_country">País</string>
@@ -954,13 +954,13 @@
 	<string name="poi_fax">Fax</string>
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_mobile">Móvil</string>
-	<string name="poi_animal_shelter_dog">Refugio para perros</string>
+	<string name="poi_animal_shelter_dog">Refugio canino</string>
 	<string name="poi_animal_shelter_cat">Refugio para gatos</string>
 	<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
 	<string name="poi_animal_shelter_bird">Refugio para aves</string>
 
-<string name="poi_recycling_centre">Centro de reciclaje</string>
-	<string name="poi_recycling_container">Contenedor</string>
+<string name="poi_recycling_centre">Tipo: Centro de reciclaje</string>
+	<string name="poi_recycling_container">Tipo: contenedor</string>
 	<string name="poi_recycling_glass">Vidrio</string>
 	<string name="poi_recycling_paper">Papel</string>
 	<string name="poi_recycling_clothes">Ropa</string>
@@ -1047,7 +1047,7 @@
 	<string name="poi_mill_pond">Lago de molino</string>
 	<string name="poi_twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
-	<string name="poi_youtube">Youtube</string>
+	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
@@ -1141,22 +1141,22 @@
 	<string name="poi_start_date">Fecha de inicio</string>
 	<string name="poi_wheelchair">Silla de rueda</string>
 
-	<string name="poi_content_silage">Ensilado (contenido)</string>
-	<string name="poi_content_water">Agua (contenido)</string>
-	<string name="poi_content_slurry">Mezcla (contenido)</string>
-	<string name="poi_content_oil">Aceite (contenido)</string>
-	<string name="poi_content_fuel">Combustible (contenido)</string>
-	<string name="poi_content_manure">Estiércol (contenido)</string>
-	<string name="poi_content_wine">Vino (contenido)</string>
-	<string name="poi_content_sewage">Aguas residuales (contenido)</string>
-	<string name="poi_content_gas">Gas (contenido)</string>
-	<string name="poi_content_biomass">Biomasa (contenido)</string>
-	<string name="poi_content_wastewater">Agua residual (contenido)</string>
-	<string name="poi_content_crop">Cultivo (contenido)</string>
-	<string name="poi_content_fodder">Forraje (contenido)</string>
-	<string name="poi_content_beer">Cerveza (contenido)</string>
-	<string name="poi_content_salt">Sal (contenido)</string>
-	<string name="poi_content_grain">Cereal (contenido)</string>
+	<string name="poi_content_silage">Contenido: ensilaje</string>
+	<string name="poi_content_water">Contenido: agua</string>
+	<string name="poi_content_slurry">Contenido: mezcla</string>
+	<string name="poi_content_oil">Contenido: aceite</string>
+	<string name="poi_content_fuel">Contenido: combustible</string>
+	<string name="poi_content_manure">Contenido: estiércol</string>
+	<string name="poi_content_wine">Contenido: vino</string>
+	<string name="poi_content_sewage">Contenido: aguas negras</string>
+	<string name="poi_content_gas">Contenido: gas</string>
+	<string name="poi_content_biomass">Contenido: biomasa</string>
+	<string name="poi_content_wastewater">Contenido: aguas residuales</string>
+	<string name="poi_content_crop">Contenido: cultivo</string>
+	<string name="poi_content_fodder">Contenido: forraje</string>
+	<string name="poi_content_beer">Contenido: cerveza</string>
+	<string name="poi_content_salt">Contenido: sal</string>
+	<string name="poi_content_grain">Contenido: granos</string>
 
 	<string name="poi_brownfield">Terreno abandonado</string>
 	<string name="poi_greenfield">Suelo urbanizable</string>
@@ -1222,7 +1222,7 @@
 	<string name="poi_cooling_tower">Torre de enfriamiento</string>
 	<string name="poi_lighting_tower">Torre de iluminación</string>
 	<string name="poi_height">Altura</string>
-	<string name="poi_ele">Altura sobre el nivel del mar</string>
+	<string name="poi_ele">Elevación sobre el nivel del mar</string>
 	<string name="poi_urban">Urbano</string>
 	<string name="poi_rural">Rural</string>
 
@@ -1277,20 +1277,20 @@
 	<string name="poi_information_terminal">Terminal de información</string>
 	<string name="poi_information_route_marker">Marcador de ruta</string>
 	<string name="poi_information_hikingmap">Mapa de senderismo</string>
-	<string name="poi_information_nature">Información sobre la naturaleza</string>
-	<string name="poi_information_wildlife">Información sobre la vida salvaje</string>
-	<string name="poi_information_history">Información histórica</string>
+	<string name="poi_information_nature">Información: naturaleza</string>
+	<string name="poi_information_wildlife">Información: vida salvaje</string>
+	<string name="poi_information_history">Información: historia</string>
 	<string name="poi_information_sign">Señal</string>
 	<string name="poi_information_audioguide">Audioguía</string>
 	<string name="poi_information_bicyclemap">Mapa ciclista</string>
 	<string name="poi_information_tactile_model">Modelo táctil</string>
 	<string name="poi_information_tactile_map">Mapa táctil</string>
-	<string name="poi_board_type_notice">Tablero con aviso</string>
-	<string name="poi_board_type_plants">Información sobre las plantas</string>
-	<string name="poi_board_type_geology">Información geológica</string>
-	<string name="poi_board_type_public_transport">Información sobre el transporte público</string>
-	<string name="poi_board_type_technology">Información tecnológica</string>
-	<string name="poi_board_type_astronomy">Información astronómica</string>
+	<string name="poi_board_type_notice">Tablón de anuncios</string>
+	<string name="poi_board_type_plants">Información: plantas</string>
+	<string name="poi_board_type_geology">Información: geología</string>
+	<string name="poi_board_type_public_transport">Información: transporte público</string>
+	<string name="poi_board_type_technology">Información: tecnología</string>
+	<string name="poi_board_type_astronomy">Información: astronomía</string>
 
 	<string name="poi_commercial">Área de oficinas</string>
 	<string name="poi_retail">Área comercial</string>
@@ -1298,26 +1298,26 @@
 	<string name="poi_fireplace_yes">Chimenea</string>
 	<string name="poi_fireplace_no">Sin chimenea</string>
 
-	<string name="poi_covered_yes">Con refugio</string>
-	<string name="poi_covered_no">Sin refugio</string>
+	<string name="poi_covered_yes">Cobierto</string>
+	<string name="poi_covered_no">No cubierto</string>
 
 	<string name="poi_smoking_no">No fumar</string>
-	<string name="poi_smoking_outside">Sólo se permite fumar afuera</string>
+	<string name="poi_smoking_outside">Sólo permitido fumar afuera</string>
 	<string name="poi_smoking_yes">Permitido fumar</string>
-	<string name="poi_smoking_separated">Permitido fumar en una sala independiente sin la efectiva separación</string>
-	<string name="poi_smoking_isolated">Permitido fumar en una sala independiente con separación efectiva</string>
+	<string name="poi_smoking_separated">Permitido fumar en sala separada</string>
+	<string name="poi_smoking_isolated">Permitido fumar en sala aislada</string>
 	<string name="poi_smoking_dedicated">Solo fumadores</string>
 
-	<string name="poi_toll_no">Peaje sin tarifa</string>
-	<string name="poi_toll_yes">Peaje tarifado</string>
+	<string name="poi_toll_no">Sin peaje</string>
+	<string name="poi_toll_yes">Peaje</string>
 	<string name="poi_tactile_paving_yes">Con pavimento táctil</string>
 	<string name="poi_tactile_paving_no">Sin pavimento táctil</string>
 	<string name="poi_traffic_signals_sound_yes">Sonoro</string>
 	<string name="poi_traffic_signals_sound_no">Sin sonido</string>
-	<string name="poi_traffic_signals_sound_walk">Sonoro sólo cuando se permite caminar</string>
+	<string name="poi_traffic_signals_sound_walk">Sonoro cuando se permite caminar</string>
 
 <string name="poi_information_guidepost">Poste indicador</string>
-	<string name="poi_toll_hgv_yes">Peaje tarifado para vehículos pesados</string>
+	<string name="poi_toll_hgv_yes">Peaje para camiones</string>
 	<string name="poi_information_trail_blaze">Marca de camino</string>
 	<string name="poi_doors">Puertas</string>
 	<string name="poi_bicycle_parking_anchors">Anclas</string>
@@ -1349,7 +1349,7 @@
 	<string name="poi_heath">Brezal</string>
 	<string name="poi_logging">Inicio de sesión</string>
 	<string name="poi_windfall">Fruto caído</string>
-	<string name="poi_rtsa_scale">Dificultad del paso de montaña</string>
+	<string name="poi_rtsa_scale">Escala RTSA</string>
 
 <string name="poi_pump">Bomba</string>
 
@@ -1367,4 +1367,63 @@
 	<string name="poi_piste_grooming_no">Sin pista de entrenamiento</string>
 	<string name="poi_piste_grooming_mogul">Pista de entrenamiento: magnate</string>
 
+<string name="poi_garden_type_residential">Jardín residencial</string>
+	<string name="poi_garden_type_community">Jardín comunitario</string>
+	<string name="poi_garden_type_private">Jardín privado</string>
+	<string name="poi_garden_type_botanical">Jardín botánico</string>
+
+	<string name="poi_garden_style_kitchen">Jardín huerta</string>
+	<string name="poi_garden_style_french">Jardín francés</string>
+	<string name="poi_garden_style_english">Jardín inglés</string>
+	<string name="poi_garden_style_japanese">Jardín japonés</string>
+
+	<string name="poi_capacity">Capacidad</string>
+	<string name="poi_capacity_disabled_yes">Lugares dedicados para discapacitados</string>
+	<string name="poi_capacity_disabled_no">Sin lugar dedicado para discapacitados</string>
+	<string name="poi_capacity_disabled">Lugares dedicados para discapacitados</string>
+	<string name="poi_capacity_women_yes">Lugares dedicados para mujeres</string>
+	<string name="poi_capacity_women_no">Sin lugar dedicado para mujeres</string>
+	<string name="poi_capacity_women">Lugares dedicados para mujeres</string>
+	<string name="poi_capacity_pupils">Lugares dedicados para estudiantes</string>
+	<string name="poi_capacity_teachers">Lugares dedicados para profesores</string>
+	<string name="poi_capacity_parent_yes">Lugares dedicados para padres</string>
+	<string name="poi_capacity_parent_no">Sin lugar dedicado para padres</string>
+	<string name="poi_capacity_parent">Lugares dedicados para padres</string>
+
+	<string name="poi_aerialway_occupancy">Capacidad de cabina/silla/coche</string>
+	<string name="poi_aerialway_capacity">Capacidad por hora</string>
+	<string name="poi_aerialway_duration">Tiempo de viaje promedio, minutos</string>
+	<string name="poi_aerialway_bubble_yes">Burbuja</string>
+	<string name="poi_aerialway_bubble_no">Sin burbuja</string>
+	<string name="poi_aerialway_heating_yes">Calefaccionado</string>
+	<string name="poi_aerialway_heating_no">Sin calefacción</string>
+	<string name="poi_aerialway_bicycle_yes">Bicicletas: permitido</string>
+	<string name="poi_aerialway_bicycle_no">Bicicletas: no permitido</string>
+	<string name="poi_aerialway_bicycle_summer">Bicicletas: permitido sólo en verano</string>
+	<string name="poi_aerialway_access_entry">Sólo entrada</string>
+	<string name="poi_aerialway_access_exit">Sólo salida</string>
+	<string name="poi_aerialway_access_both">Entrada y salida</string>
+	<string name="poi_aerialway_summer_access_entry">Acceso de verano: sólo entrada</string>
+	<string name="poi_aerialway_summer_access_exit">Acceso de verano: sólo salida</string>
+	<string name="poi_aerialway_summer_access_both">Acceso de verano: entrada y salida</string>
+
+<string name="poi_wheelchair_no">Silla de ruedas: no permitido</string>
+	<string name="poi_wheelchair_limited">Silla de ruedas: limitado</string>
+	<string name="poi_stars_1">Estrellas: 1 (Turista)</string>
+	<string name="poi_stars_1s">Estrellas: 1S (Turista Superior)</string>
+	<string name="poi_stars_2">Estrellas: 2 (Estándar)</string>
+	<string name="poi_stars_2s">Estrellas: 2S (Estándar Superior)</string>
+	<string name="poi_stars_3">Estrellas: 3 (Confortable)</string>
+	<string name="poi_stars_3s">Estrellas: 3S (Confortable Superior)</string>
+	<string name="poi_stars_4">Estrellas: 4 (Primera Clase)</string>
+	<string name="poi_stars_4s">Estrellas: 4S (Primera Clase Superior)</string>
+	<string name="poi_stars_5">Estrellas: 5 (Lujurioso)</string>
+	<string name="poi_stars_5s">Estrellas: 5S (Lujurioso Superior)</string>
+	<string name="poi_stars_6">Estrellas: 6</string>
+	<string name="poi_stars_7">Estrellas: 7</string>
+	<string name="poi_rooms">Habitaciones</string>
+
+	<string name="poi_garden_style_rosarium">Jardín rosaleda</string>
+	<string name="poi_love_hotel">Albergue transitorio</string>
+
 </resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index ee9ff395d7..617a51d714 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -86,7 +86,7 @@
   <string name="user_name_descr">Necesario para envíos a openstreetmap.org</string>
   <string name="user_password">Su clave OSM</string>
   <string name="user_password_descr">Necesario para envíos a openstreetmap.org</string>
-  <string name="osmand_service">Modo reposo</string>
+  <string name="osmand_service">Modo en segundo plano</string>
   <string name="osmand_service_descr">OsmAnd se ejecuta en segundo plano mientras la pantalla está apagada</string>
   <string name="tip_rotation_switching">Rotación del mapa</string>
   
@@ -1765,9 +1765,9 @@
     <string name="osmo_gpx_track_downloaded">Traza OsMo %1$s descargada.</string>
     <string name="keep_navigation_service">Mantener</string>
 	<string name="stop_navigation_service">Interrumpir</string>
-	<string name="enable_sleep_mode">Habilita el modo reposo del GPS</string>
+	<string name="enable_sleep_mode">Habilita el modo de fondo del GPS</string>
 	<string name="gps_wake_up_timer">Intervalo para despertar GPS</string>
-	<string name="sleep_mode_stop_dialog">¿Interrumpir el modo reposo del GPS?</string>
+	<string name="sleep_mode_stop_dialog">¿Interrumpir el modo de fondo del GPS?</string>
 	<string name="map_preferred_locale_descr">Idioma preferido para las etiquetas en el mapa (si no está disponible se cambiará a inglés o a nombres locales)</string>
     <string name="map_preferred_locale">Idioma preferido del mapa</string>
     <string name="local_map_names">Nombres locales</string>
@@ -2196,4 +2196,5 @@
 	<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
 <string name="simulate_your_location_stop_descr">Parar simulación de posición</string>
     <string name="simulate_your_location_descr">Simular utilizando grabación GPX o ruta calculada</string>
-    </resources>
+    <string name="downloads_left_template">Quedan %$1s descargas</string>
+</resources>
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 424b2f77fe..88a62a0f57 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -956,7 +956,7 @@
 	<string name="poi_animal_shelter_dog_cat">Abrigo para cães e gatos</string>
 	<string name="poi_animal_shelter_bird">Abrigo para aves</string>
 
-<string name="poi_recycling_container">Contêiner</string>
+<string name="poi_recycling_container">Tipo: contêiner</string>
 	<string name="poi_recycling_glass">Vidro</string>
 	<string name="poi_recycling_paper">Papel</string>
 	<string name="poi_recycling_clothes">Roupas</string>
@@ -1036,7 +1036,7 @@
 	<string name="poi_seasonal_autumn">Outono</string>
 	<string name="poi_seasonal_winter">Inverno</string>
 
-	<string name="poi_recycling_centre">Centro</string>
+	<string name="poi_recycling_centre">Tipo: centro de reciclagem</string>
 	<string name="poi_recycling_hardcore">Material duro</string>
 	<string name="poi_crossing_traffic_signals">Com semáforos</string>
 	<string name="poi_crossing_uncontrolled">Sem controle</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 8be03cd666..5b459e026b 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources> 
 	<string name="poi_bakery">Булочная</string>
 	<string name="poi_alcohol">Винно-водочный магазин</string>
@@ -907,6 +907,8 @@
 	<string name="poi_population">Население</string>
 	<string name="poi_start_date">Дата начала постройки</string>
 	<string name="poi_wheelchair">Доступно для инвалидных кресел</string>
+	<string name="poi_wheelchair_no">Недоступно для инвалидных кресел</string>
+	<string name="poi_wheelchair_limited">Инвалидные кресла: ограничено</string>
 	<string name="poi_wholesale">Опт</string>
 	<string name="poi_parking_underground">Подземный(ая)</string>
 	<string name="poi_parking_multi_storey">Многоэтажный(ая)</string>
@@ -1239,4 +1241,20 @@
 	<string name="poi_aerialway_summer_access_exit">Доступ летом: только выход</string>
 	<string name="poi_aerialway_summer_access_both">Доступ летом: вход и выход</string>
 
+	<string name="poi_stars_1">Число звёзд: 1 (туристский класс)</string>
+	<string name="poi_stars_1s">Число звёзд: 1S (улучшенный туристский класс)</string>
+	<string name="poi_stars_2">Число звёзд: 2 (стандартный класс)</string>
+	<string name="poi_stars_2s">Число звёзд: 2S (улучшенный стандартный класс)</string>
+	<string name="poi_stars_3">Число звёзд: 3 (комфортный класс)</string>
+	<string name="poi_stars_3s">Число звёзд: 3S (улучшенный комфортный класс)</string>
+	<string name="poi_stars_4">Число звёзд: 4 (первый класс)</string>
+	<string name="poi_stars_4s">Число звёзд: 4S (улучшенный первый класс)</string>
+	<string name="poi_stars_5">Число звёзд: 5 (категория люкс)</string>
+	<string name="poi_stars_5s">Число звёзд: 5S (категория люкс+)</string>
+	<string name="poi_stars_6">Число звёзд: 6</string>
+	<string name="poi_stars_7">Число звёзд: 7</string>
+	<string name="poi_rooms">Количество номеров</string>
+
+	<string name="poi_love_hotel">Love-отель</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index a413645861..d63e622c17 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1015,7 +1015,7 @@
   
   <string name="show_cameras">Показать камеры контроля скорости</string>
   <string name="show_traffic_warnings">Показать ограничения скорости</string>
-  <string name="avoid_toll_roads">Избегать платных дорог</string>
+  <string name="avoid_toll_roads">Платные дороги</string>
   <string name="tip_recent_changes_0_8_2_t">Изменения в 0.8.2:
 		\n\t* Улучшенная прокладка маршрута.
 		\n\t* Возможность выбора информационных элементов (виджетов), отображаемых на карте (кнопка Настройки в правом верхнему углу карты).
@@ -1281,9 +1281,9 @@
 	<string name="av_camera_pic_size">Размер фото</string>
 	<string name="av_camera_pic_size_descr">Размер изображения для встроенного приложения фотографирования</string>
     
-	<string name="speak_speed_limit">Сообщать о превышении скорости</string>
-    <string name="speak_cameras">Сообщать о камерах</string>
-	<string name="speak_traffic_warnings">Сообщать о дорожных событиях</string>
+	<string name="speak_speed_limit">Ограничение скорости</string>
+    <string name="speak_cameras">Камеры контроля скорости</string>
+	<string name="speak_traffic_warnings">Дорожные предупреждения</string>
 	
     <string name="clear_intermediate_points">Очистить промежуточные точки</string>
     <string name="keep_intermediate_points">Оставить промежуточные точки</string>
@@ -1298,10 +1298,10 @@
 	\n\t* Множество изменений интерфейса
 	\n\t* Исправление ошибок отображения дистанции, анализатора GPX, виджета планирования, выгрузки OSM, обработки путевых точек и поддержки https
     </string>
-    <string name="speak_street_names">Произносить названия улиц (TTS)</string>
-    <string name="speak_title">Озвучивание…</string>
+    <string name="speak_street_names">Названия улиц (TTS)</string>
+    <string name="speak_title">Объявлять…</string>
 	<string name="speak_descr">Настройка озвучивания названий улиц, предупреждений (лежачих полицейских, знаков \"Движение без остановки запрещено\"), камер контроля скорости, ограничений скорости</string>
-	<string name="announce_gpx_waypoints">Озвучивание маршрутных точек GPX</string>
+	<string name="announce_gpx_waypoints">Маршрутные точки GPX</string>
         
     
     
@@ -1700,8 +1700,8 @@
     <string name="waypoints">Путевые точки</string>
     <string name="targets">Пункты назначения</string>
     <string name="way_alarms">Дорожные предупреждения</string>
-    <string name="speak_favorites">Объявлять близлежащие избранные</string>
-    <string name="speak_poi">Объявлять близлежащие POI</string>
+    <string name="speak_favorites">Близлежащие избранные</string>
+    <string name="speak_poi">Близлежащие POI</string>
     <string name="index_tours">Туры</string>
     <string name="shared_string_all">Все</string>
     <string name="distance">Расстояние</string>
@@ -1801,7 +1801,7 @@
 	<string name="show_pedestrian_warnings">Показывать пешеходные переходы</string>
     <string name="traffic_warning_railways">Железнодорожный переезд</string>
 	<string name="traffic_warning_pedestrian">Пешеходный переход</string>
-	<string name="speak_pedestrian">Сообщать о пешеходных переходах</string>
+	<string name="speak_pedestrian">Пешеходные переходы</string>
     
 	<string name="navigation_over_track">Начать навигацию по треку?</string>
 	<string name="avoid_roads_msg">Вы можете выбрать альтернативный маршрут, выбрав дороги, которые стоит избегать</string>
@@ -2099,4 +2099,6 @@
 	<string name="address_unknown">Адрес неизвестен</string>
     <string name="are_you_sure">Вы уверены?</string>
 	<string name="unsaved_changes_will_be_lost">Все несохраненные изменения будут потеряны. Продолжить?</string>
-	</resources>
+	<string name="simulate_your_location_descr">Моделировать используя записанный GPX или рассчитанный маршрут</string>
+    <string name="simulate_your_location_stop_descr">Остановить моделирование</string>
+    </resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 39bb033463..c2026f884f 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2088,4 +2088,7 @@
     <string name="count_of_lines">Contu de sas lìnias</string>
 	<string name="are_you_sure">Seguru ses?</string>
 	<string name="unsaved_changes_will_be_lost">Totu sas modìficas non sarbadas s’ant a pèrdere. Sighire?</string>
+<string name="simulate_your_location_stop_descr">Firma sa simulatzione de sa positzione tua</string>
+    <string name="simulate_your_location_descr">Sìmula impreande unu GPX registradu o un’àndala calculada</string>
+    <string name="downloads_left_template">Abarrant galu %1$s iscarrigamentos</string>
 </resources>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index db2eeabaf1..137f1ff087 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -889,15 +889,15 @@
 	<string name="poi_tourism_attraction">旅遊景點</string>
 	<string name="poi_cutline">圖例</string>
 	<string name="poi_tree">樹</string>
-	<string name="poi_icn_ref">國際自行車節點網路</string>
-	<string name="poi_ncn_ref">全國自行車節點網路</string>
-	<string name="poi_rcn_ref">地區性自行車節點網路</string>
-	<string name="poi_lcn_ref">本地自行車節點網路</string>
+	<string name="poi_icn_ref">國際自行車網路路線</string>
+	<string name="poi_ncn_ref">全國自行車網路路線</string>
+	<string name="poi_rcn_ref">地區性自行車網路路線</string>
+	<string name="poi_lcn_ref">本地自行車網路路線</string>
 
-	<string name="poi_iwn_ref">國際步行節點網路</string>
-	<string name="poi_nwn_ref">全國步行節點網路</string>
-	<string name="poi_rwn_ref">地區性步行節點網路</string>
-	<string name="poi_lwn_ref">本地步行節點網路</string>
+	<string name="poi_iwn_ref">國際步行網路路線</string>
+	<string name="poi_nwn_ref">全國步行網路路線</string>
+	<string name="poi_rwn_ref">地區性步行網路路線</string>
+	<string name="poi_lwn_ref">本地步行網路路線</string>
 
 	<string name="poi_opening_hours">營業時間</string>
 	<string name="poi_collection_times">採收時間</string>
@@ -913,7 +913,7 @@
 	<string name="poi_operator">經營者</string>
 	<string name="poi_brand">品牌</string>
 
-	<string name="poi_enforcement_traffic_signals">執法：交通號誌</string>
+	<string name="poi_enforcement_traffic_signals">執法：停止號誌</string>
 	<string name="poi_enforcement_maxspeed">執法：最高速限</string>
 	<string name="poi_enforcement_maxheight">執法：最高高度</string>
 	<string name="poi_enforcement_mindistance">執法：最少間隔距離</string>
@@ -925,10 +925,10 @@
 	<string name="poi_fee_yes">費用</string>
 
 	<string name="poi_abandoned_poi">已遺棄的物件</string>
-	<string name="poi_route_hiking_iwn_poi">國際步行路線</string>
-	<string name="poi_route_hiking_nwn_poi">全國步行路線</string>
-	<string name="poi_route_hiking_rwn_poi">地區性步行路線</string>
-	<string name="poi_route_hiking_lwn_poi">當地步行路線</string>
+	<string name="poi_route_hiking_iwn_poi">國際徒步登山路線</string>
+	<string name="poi_route_hiking_nwn_poi">全國徒步登山路線</string>
+	<string name="poi_route_hiking_rwn_poi">地區性徒步登山路線</string>
+	<string name="poi_route_hiking_lwn_poi">當地徒步登山路線</string>
 	<string name="poi_route_hiking_ref_poi">徒步旅行路線參考</string>
 
 	<string name="poi_node_networks">徒步旅行/自行車網路節點</string>
@@ -950,10 +950,10 @@
 	<string name="poi_fax">傳真</string>
 	<string name="poi_facebook">臉書</string>
 	<string name="poi_mobile">行動電話</string>
-	<string name="poi_animal_shelter_dog">流浪狗庇護所</string>
-	<string name="poi_animal_shelter_cat">流浪貓庇護所</string>
-	<string name="poi_animal_shelter_dog_cat">流浪狗和貓庇護所</string>
-	<string name="poi_animal_shelter_bird">野鳥庇護所</string>
+	<string name="poi_animal_shelter_dog">流浪狗收容所</string>
+	<string name="poi_animal_shelter_cat">流浪貓收容所</string>
+	<string name="poi_animal_shelter_dog_cat">流浪狗和貓收容所</string>
+	<string name="poi_animal_shelter_bird">傷鳥收容所</string>
 
 <string name="poi_shower">淋浴</string>
 	<string name="poi_recycling_centre">類型：資源回收中心</string>
@@ -1030,7 +1030,7 @@
 	<string name="poi_seasonal_summer">夏季</string>
 	<string name="poi_seasonal_autumn">秋季</string>
 	<string name="poi_seasonal_winter">冬季</string>
-	<string name="poi_crossing_traffic_signals">偕同交通號誌</string>
+	<string name="poi_crossing_traffic_signals">有停止號誌</string>
 	<string name="poi_crossing_uncontrolled">無控制的</string>
 	<string name="poi_crossing_unmarked">無標志的</string>
 
@@ -1139,22 +1139,22 @@
 	<string name="poi_start_date">開始日期</string>
 	<string name="poi_wheelchair">輪椅</string>
 
-	<string name="poi_content_silage">青貯飼料 (內容)</string>
-	<string name="poi_content_water">水 (內容)</string>
-	<string name="poi_content_slurry">礦泥 (內容)</string>
-	<string name="poi_content_oil">油 (內容)</string>
-	<string name="poi_content_fuel">燃料 (內容)</string>
-	<string name="poi_content_manure">肥料 (內容)</string>
-	<string name="poi_content_wine">酒 (內容)</string>
-	<string name="poi_content_sewage">污水 (內容)</string>
-	<string name="poi_content_gas">瓦斯 (內容)</string>
-	<string name="poi_content_biomass">生物質 (內容)</string>
-	<string name="poi_content_wastewater">污水 (內容)</string>
-	<string name="poi_content_crop">農作物 (內容)</string>
-	<string name="poi_content_fodder">飼料 (內容)</string>
-	<string name="poi_content_beer">啤酒 (內容)</string>
-	<string name="poi_content_salt">鹽 (內容)</string>
-	<string name="poi_content_grain">榖物 (內容)</string>
+	<string name="poi_content_silage">內容：青貯飼料</string>
+	<string name="poi_content_water">內容：水</string>
+	<string name="poi_content_slurry">內容：礦泥</string>
+	<string name="poi_content_oil">內容：油</string>
+	<string name="poi_content_fuel">內容：燃料</string>
+	<string name="poi_content_manure">內容：肥料</string>
+	<string name="poi_content_wine">內容：酒</string>
+	<string name="poi_content_sewage">內容：污水</string>
+	<string name="poi_content_gas">內容：瓦斯</string>
+	<string name="poi_content_biomass">內容：生物質</string>
+	<string name="poi_content_wastewater">內容：污水</string>
+	<string name="poi_content_crop">內容：農作物</string>
+	<string name="poi_content_fodder">內容：飼料</string>
+	<string name="poi_content_beer">內容：啤酒</string>
+	<string name="poi_content_salt">內容：鹽</string>
+	<string name="poi_content_grain">內容：榖物</string>
 
 	<string name="poi_wholesale">批發商</string>
 
@@ -1276,22 +1276,22 @@
 	<string name="poi_information_terminal">資訊終端機</string>
 	<string name="poi_information_route_marker">路線標識</string>
 	<string name="poi_information_hikingmap">徒步旅行地圖</string>
-	<string name="poi_information_nature">關於自然的資訊</string>
+	<string name="poi_information_nature">資訊標誌：大自然</string>
 	<string name="poi_doors">門</string>
 	<string name="poi_bicycle_parking_anchors">錨泊點</string>
-	<string name="poi_information_wildlife">有關野生動物的資訊</string>
-	<string name="poi_information_history">關於歷史的資訊</string>
+	<string name="poi_information_wildlife">資訊標誌：野生動物</string>
+	<string name="poi_information_history">資訊標誌：歷史</string>
 	<string name="poi_information_sign">標誌</string>
 	<string name="poi_information_audioguide">導覽機</string>
 	<string name="poi_information_bicyclemap">自行車地圖</string>
 	<string name="poi_information_tactile_model">觸摸模式</string>
 	<string name="poi_information_tactile_map">觸摸地圖</string>
-	<string name="poi_board_type_notice">布告板</string>
-	<string name="poi_board_type_plants">關於植物的資訊</string>
-	<string name="poi_board_type_geology">關於地質資訊</string>
-	<string name="poi_board_type_public_transport">有關公共交通工具的資訊</string>
-	<string name="poi_board_type_technology">有關技術的資訊</string>
-	<string name="poi_board_type_astronomy">關於天文資訊</string>
+	<string name="poi_board_type_notice">布告欄</string>
+	<string name="poi_board_type_plants">資訊標誌：植物</string>
+	<string name="poi_board_type_geology">資訊標誌：地質</string>
+	<string name="poi_board_type_public_transport">資訊標誌：公共交通工具</string>
+	<string name="poi_board_type_technology">資訊標誌：術語</string>
+	<string name="poi_board_type_astronomy">資訊標誌：天文</string>
 
 	<string name="poi_commercial">商業的土地利用</string>
 	<string name="poi_retail">零售的土地利用</string>
@@ -1299,8 +1299,8 @@
 	<string name="poi_fireplace_yes">壁爐</string>
 	<string name="poi_fireplace_no">沒有壁爐</string>
 
-	<string name="poi_covered_yes">有涼亭</string>
-	<string name="poi_covered_no">無涼亭</string>
+	<string name="poi_covered_yes">有覆蓋物</string>
+	<string name="poi_covered_no">無覆蓋物</string>
 
 	<string name="poi_smoking_no">禁止吸煙</string>
 	<string name="poi_smoking_outside">只有外面允許吸煙</string>
@@ -1311,20 +1311,20 @@
 	<string name="poi_tactile_paving_no">無導盲磚</string>
 	<string name="poi_paediatrics">小兒科</string>
 
-	<string name="poi_smoking_separated">允許吸煙，在一個單獨的房間，沒有隔離</string>
-	<string name="poi_smoking_isolated">允許吸煙，在一個單獨的房間，有隔離</string>
-	<string name="poi_toll_yes">收取通行費用</string>
-	<string name="poi_toll_no">不收取通行費用</string>
-	<string name="poi_toll_hgv_yes">收取大貨車通行費用</string>
+	<string name="poi_smoking_separated">在一個單獨的房間，允許吸煙</string>
+	<string name="poi_smoking_isolated">在一個隔離的房間，允許吸煙</string>
+	<string name="poi_toll_yes">收費</string>
+	<string name="poi_toll_no">不收費</string>
+	<string name="poi_toll_hgv_yes">收大貨車費用</string>
 	<string name="poi_traffic_signals_sound_yes">有聲音</string>
 	<string name="poi_traffic_signals_sound_no">沒有聲音</string>
-	<string name="poi_traffic_signals_sound_walk">有聲音時才允許走</string>
+	<string name="poi_traffic_signals_sound_walk">當有聲响時允許行走</string>
 
 	<string name="poi_rescue_station">救護站</string>
 
 	<string name="poi_services">服務區</string>
 	<string name="poi_mini_roundabout">迷你圓環</string>
-	<string name="poi_railway_crossing">鐵路行人道</string>
+	<string name="poi_railway_crossing">鐵路平交道</string>
 	<string name="poi_railway_level_crossing">平交道</string>
 	<string name="poi_bird_hide">賞鳥屋</string>
 	<string name="poi_horse_riding">騎馬運動</string>
@@ -1345,7 +1345,7 @@
 	<string name="poi_passing_place">避讓車處</string>
 	<string name="poi_level">等級</string>
 
-<string name="poi_rtsa_scale">隘口的艱難度</string>
+<string name="poi_rtsa_scale">RTSA 的難度</string>
 
 <string name="poi_pump">泵浦</string>
 
@@ -1370,8 +1370,56 @@
 
 	<string name="poi_garden_style_kitchen">花園風格：廚房</string>
 	<string name="poi_garden_style_rosarium">花園風格：玫瑰園</string>
-	<string name="poi_garden_style_french">花園風格：法國式</string>
-	<string name="poi_garden_style_english">花園風格：英格蘭</string>
+	<string name="poi_garden_style_french">花園風格：法式</string>
+	<string name="poi_garden_style_english">花園風格：英式</string>
 	<string name="poi_garden_style_japanese">花園風格：日式</string>
 
+<string name="poi_capacity">容量</string>
+	<string name="poi_capacity_disabled_yes">身障人士專用場所</string>
+	<string name="poi_capacity_disabled_no">無身障人士專用場所</string>
+	<string name="poi_capacity_disabled">身障人士專用場所</string>
+	<string name="poi_capacity_women_yes">婦女專用場所</string>
+	<string name="poi_capacity_women_no">無婦女專用場所</string>
+	<string name="poi_capacity_women">婦女專用場所</string>
+	<string name="poi_capacity_pupils">學生專用場所</string>
+	<string name="poi_capacity_teachers">教師專用場所</string>
+	<string name="poi_capacity_parent_yes">父母專用場所</string>
+	<string name="poi_capacity_parent_no">無父母專用場所</string>
+	<string name="poi_capacity_parent">父母專用場所</string>
+
+	<string name="poi_aerialway_occupancy">座艙/席位/載客量</string>
+	<string name="poi_aerialway_capacity">每小時載客量</string>
+	<string name="poi_aerialway_duration">平均行程時間，分鐘</string>
+	<string name="poi_aerialway_bubble_yes">安全罩</string>
+	<string name="poi_aerialway_bubble_no">無安全罩</string>
+	<string name="poi_aerialway_heating_yes">暖氣</string>
+	<string name="poi_aerialway_heating_no">無暖氣</string>
+	<string name="poi_aerialway_bicycle_yes">自行車：允許</string>
+	<string name="poi_aerialway_bicycle_no">自行車：不允許</string>
+	<string name="poi_aerialway_bicycle_summer">自行車：只在夏天允許</string>
+	<string name="poi_aerialway_access_entry">入口</string>
+	<string name="poi_aerialway_access_exit">出口</string>
+	<string name="poi_aerialway_access_both">出入口</string>
+	<string name="poi_wheelchair_no">輪椅：不允許</string>
+	<string name="poi_wheelchair_limited">輪椅：有限的</string>
+	<string name="poi_aerialway_summer_access_entry">夏季通行：只能進入</string>
+	<string name="poi_aerialway_summer_access_exit">夏季通行：只能出去</string>
+	<string name="poi_aerialway_summer_access_both">夏季通行：進和出</string>
+
+	<string name="poi_stars_1">星星：1 (經濟的)</string>
+	<string name="poi_stars_1s">星星：1S (超經濟的)</string>
+	<string name="poi_stars_2">星星：2 (標準的)</string>
+	<string name="poi_stars_2s">星星：2S (超標準的)</string>
+	<string name="poi_stars_3">星星：3 (舒適的)</string>
+	<string name="poi_stars_3s">星星：3 (超舒適的)</string>
+	<string name="poi_stars_4">星星：4 (一流的)</string>
+	<string name="poi_stars_4s">星星：4 (超一流的)</string>
+	<string name="poi_stars_5">星星：5 (豪華的)</string>
+	<string name="poi_stars_5s">星星： 5S (超豪華的)</string>
+	<string name="poi_stars_6">星星： 6</string>
+	<string name="poi_stars_7">星星： 7</string>
+	<string name="poi_rooms">房間</string>
+
+	<string name="poi_love_hotel">情侶賓館</string>
+
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 713db69cc6..7c1855fa6d 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1056,19 +1056,19 @@
 
 	<string name="poi_highway_crossing">Highway crossing</string>
 
-	<string name="poi_icn_ref">International cycle node network</string>
-	<string name="poi_ncn_ref">National cycle node network</string>
-	<string name="poi_rcn_ref">Regional cycle node network</string>
-	<string name="poi_lcn_ref">Local cycle node network</string>
-	<string name="poi_iwn_ref">International walking node network</string>
-	<string name="poi_nwn_ref">National walking node network</string>
-	<string name="poi_rwn_ref">Regional walking node network</string>
-	<string name="poi_lwn_ref">Local walking node network</string>
+	<string name="poi_icn_ref">International cycling network route</string>
+	<string name="poi_ncn_ref">National cycling network route</string>
+	<string name="poi_rcn_ref">Regional cycling network route</string>
+	<string name="poi_lcn_ref">Local cycling network route</string>
+	<string name="poi_iwn_ref">International hiking network route</string>
+	<string name="poi_nwn_ref">National hiking network route</string>
+	<string name="poi_rwn_ref">Regional hiking network route</string>
+	<string name="poi_lwn_ref">Local hiking network route</string>
 
-	<string name="poi_route_hiking_iwn_poi">International walking route</string>
-	<string name="poi_route_hiking_nwn_poi">National walking route</string>
-	<string name="poi_route_hiking_rwn_poi">Regional walking route</string>
-	<string name="poi_route_hiking_lwn_poi">Local walking route</string>
+	<string name="poi_route_hiking_iwn_poi">International hiking route</string>
+	<string name="poi_route_hiking_nwn_poi">National hiking route</string>
+	<string name="poi_route_hiking_rwn_poi">Regional hiking route</string>
+	<string name="poi_route_hiking_lwn_poi">Local hiking route</string>
 	<string name="poi_route_hiking_ref_poi">Hiking route reference</string>
 
 	<string name="poi_opening_hours">Opening hours</string>
@@ -1081,7 +1081,7 @@
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
-	<string name="poi_youtube">Youtube</string>
+	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
@@ -1090,7 +1090,7 @@
 	<string name="poi_maxheight">Maximum height</string>
 	<string name="poi_maxweight">Maximum weight</string>
 	<string name="poi_height">Height</string>
-	<string name="poi_ele">Height above sea level</string>
+	<string name="poi_ele">Elevation above sea level</string>
 	<string name="poi_abandoned">Abandoned</string>
 	<string name="poi_abandoned_poi">Abandoned object</string>
 	<string name="poi_disused">Disused</string>
@@ -1109,39 +1109,41 @@
 	<string name="poi_seasonal_wet_season">Wet season</string>
 	<string name="poi_seasonal_spring">Spring</string>
 	<string name="poi_seasonal_summer">Summer</string>
-	<string name="poi_seasonal_autumn">Autumn</string>
+	<string name="poi_seasonal_autumn">Fall</string>
 	<string name="poi_seasonal_winter">Winter</string>
-	<string name="poi_crossing_traffic_signals">With traffic signals</string>
+	<string name="poi_crossing_traffic_signals">With stop lights</string>
 	<string name="poi_crossing_uncontrolled">Uncontrolled</string>
 	<string name="poi_crossing_unmarked">Unmarked</string>
 	<string name="poi_start_date">Start date</string>
 	<string name="poi_wheelchair">Wheelchair</string>
+	<string name="poi_wheelchair_no">Wheelchair: not allowed</string>
+	<string name="poi_wheelchair_limited">Wheelchair: limited</string>
 	<string name="poi_wholesale">Wholesale</string>
 
 	<string name="poi_access_private">Private access</string>
 	<string name="poi_access_no">No access</string>
 	<string name="poi_access_destination">Destination access</string>
 	<string name="poi_access_permissive">Permissive access</string>
-	<string name="poi_access_customers">Customers access</string>
+	<string name="poi_access_customers">Customer access</string>
 	<string name="poi_access_delivery">Delivery access</string>
 	<string name="poi_access_agricultural">Agricultural access</string>
 
-	<string name="poi_content_silage">Silage (content)</string>
-	<string name="poi_content_water">Water (content)</string>
-	<string name="poi_content_slurry">Slurry (content)</string>
-	<string name="poi_content_oil">Oil (content)</string>
-	<string name="poi_content_fuel">Fuel (content)</string>
-	<string name="poi_content_manure">Manure (content)</string>
-	<string name="poi_content_wine">Wine (content)</string>
-	<string name="poi_content_sewage">Sewage (content)</string>
-	<string name="poi_content_gas">Gas (content)</string>
-	<string name="poi_content_biomass">Biomass (content)</string>
-	<string name="poi_content_wastewater">Wastewater (content)</string>
-	<string name="poi_content_crop">Crop (content)</string>
-	<string name="poi_content_fodder">Fodder (content)</string>
-	<string name="poi_content_beer">Beer (content)</string>
-	<string name="poi_content_salt">Salt (content)</string>
-	<string name="poi_content_grain">Grain (content)</string>
+	<string name="poi_content_silage">Content: silage</string>
+	<string name="poi_content_water">Content: water</string>
+	<string name="poi_content_slurry">Content: slurry</string>
+	<string name="poi_content_oil">Content: oil</string>
+	<string name="poi_content_fuel">Content: fuel</string>
+	<string name="poi_content_manure">Content: manure</string>
+	<string name="poi_content_wine">Content: wine</string>
+	<string name="poi_content_sewage">Content: sewage</string>
+	<string name="poi_content_gas">Content: gas</string>
+	<string name="poi_content_biomass">Content: biomass</string>
+	<string name="poi_content_wastewater">Content: wastewater</string>
+	<string name="poi_content_crop">Content: crop</string>
+	<string name="poi_content_fodder">Content: fodder</string>
+	<string name="poi_content_beer">Content: beer</string>
+	<string name="poi_content_salt">Content: salt</string>
+	<string name="poi_content_grain">Content: grain</string>
 
 	<string name="poi_nudism_yes">Nudism: allowed</string>
 	<string name="poi_nudism_no">Nudism: prohibited</string>
@@ -1203,18 +1205,18 @@
 	<string name="poi_urban">Urban</string>
 	<string name="poi_rural">Rural</string>
 
-	<string name="poi_enforcement_traffic_signals">Enforcement:traffic signals</string>
-	<string name="poi_enforcement_maxspeed">Enforcement:maxspeed</string>
-	<string name="poi_enforcement_maxheight">Enforcement:maxheight</string>
-	<string name="poi_enforcement_mindistance">Enforcement:mindistance</string>
-	<string name="poi_enforcement_check">Enforcement:check</string>
-	<string name="poi_enforcement_access">Enforcement:access</string>
-	<string name="poi_enforcement_toll">Enforcement:toll</string>
+	<string name="poi_enforcement_traffic_signals">Enforcement: stop lights</string>
+	<string name="poi_enforcement_maxspeed">Enforcement: maxspeed</string>
+	<string name="poi_enforcement_maxheight">Enforcement: maxheight</string>
+	<string name="poi_enforcement_mindistance">Enforcement: mindistance</string>
+	<string name="poi_enforcement_check">Enforcement: check</string>
+	<string name="poi_enforcement_access">Enforcement: access</string>
+	<string name="poi_enforcement_toll">Enforcement: toll</string>
 
-	<string name="poi_animal_shelter_dog">Shelter for dogs</string>
-	<string name="poi_animal_shelter_cat">Shelter for cats</string>
-	<string name="poi_animal_shelter_dog_cat">Shelter for dogs and cats</string>
-	<string name="poi_animal_shelter_bird">Shelter for birds</string>
+	<string name="poi_animal_shelter_dog">Dog shelter</string>
+	<string name="poi_animal_shelter_cat">Cat shelter</string>
+	<string name="poi_animal_shelter_dog_cat">Dog and cat shelter</string>
+	<string name="poi_animal_shelter_bird">Bird shelter</string>
 
 	<string name="poi_seats">Seats</string>
 	<string name="poi_backrest_yes">Backrest: yes</string>
@@ -1265,20 +1267,20 @@
 	<string name="poi_information_terminal">Information terminal</string>
 	<string name="poi_information_route_marker">Route marker</string>
 	<string name="poi_information_hikingmap">Hiking map</string>
-	<string name="poi_information_nature">Information about nature</string>
-	<string name="poi_information_wildlife">Information about wild life</string>
-	<string name="poi_information_history">Information about history</string>
+	<string name="poi_information_nature">Information marker: nature</string>
+	<string name="poi_information_wildlife">Information marker: wild life</string>
+	<string name="poi_information_history">Information marker: history</string>
 	<string name="poi_information_sign">Sign</string>
 	<string name="poi_information_audioguide">Audioguide</string>
 	<string name="poi_information_bicyclemap">Bicycle map</string>
 	<string name="poi_information_tactile_model">Tactile model</string>
 	<string name="poi_information_tactile_map">Tactile map</string>
-	<string name="poi_board_type_notice">Board with notice</string>
-	<string name="poi_board_type_plants">Information about plants</string>
-	<string name="poi_board_type_geology">Information about geology</string>
-	<string name="poi_board_type_public_transport">Information about public transport</string>
-	<string name="poi_board_type_technology">Information about technology</string>
-	<string name="poi_board_type_astronomy">Information about astronomy</string>
+	<string name="poi_board_type_notice">Bulletin board</string>
+	<string name="poi_board_type_plants">Information marker: plants</string>
+	<string name="poi_board_type_geology">Information marker: geology</string>
+	<string name="poi_board_type_public_transport">Information marker: public transport</string>
+	<string name="poi_board_type_technology">Information marker: technology</string>
+	<string name="poi_board_type_astronomy">Information marker: astronomy</string>
 
 	<string name="poi_commercial">Commercial landuse</string>
 	<string name="poi_retail">Retail landuse</string>
@@ -1286,30 +1288,30 @@
 	<string name="poi_fireplace_yes">Fireplace</string>
 	<string name="poi_fireplace_no">No fireplace</string>
 
-	<string name="poi_covered_yes">With shelter</string>
-	<string name="poi_covered_no">Without shelter</string>
+	<string name="poi_covered_yes">Covered</string>
+	<string name="poi_covered_no">Not covered</string>
 
 	<string name="poi_smoking_no">No smoking</string>
-	<string name="poi_smoking_outside">Smoking is allowed outside only</string>
-	<string name="poi_smoking_yes">Smoking is allowed</string>
-	<string name="poi_smoking_separated">Smoking is allowed in a separate room without effective separation</string>
-	<string name="poi_smoking_isolated">Smoking is allowed in a separate room with effective separation</string>
+	<string name="poi_smoking_outside">Smoking allowed outside only</string>
+	<string name="poi_smoking_yes">Smoking allowed</string>
+	<string name="poi_smoking_separated">Smoking allowed in a separated room</string>
+	<string name="poi_smoking_isolated">Smoking allowed in a isolated room</string>
 	<string name="poi_smoking_dedicated">Dedicated to smokers</string>
 
-	<string name="poi_toll_yes">Payment of tolls is charged</string>
-	<string name="poi_toll_no">Payment of tolls is not charged</string>
-	<string name="poi_toll_hgv_yes">Payment of tolls is charged for HGV</string>
+	<string name="poi_toll_yes">Toll</string>
+	<string name="poi_toll_no">No toll</string>
+	<string name="poi_toll_hgv_yes">HGV toll</string>
 	<string name="poi_tactile_paving_yes">With tactile paving</string>
 	<string name="poi_tactile_paving_no">Without tactile paving</string>
 	<string name="poi_traffic_signals_sound_yes">With sound</string>
 	<string name="poi_traffic_signals_sound_no">Without sound</string>
-	<string name="poi_traffic_signals_sound_walk">With sound only when walking is allowed</string>
+	<string name="poi_traffic_signals_sound_walk">With sound when walking is allowed</string>
 
 	<string name="poi_rescue_station">Rescue station</string>
 
 	<string name="poi_services">Service area</string>
 	<string name="poi_mini_roundabout">Mini roundabout</string>
-	<string name="poi_railway_crossing">Railway pedestrian crossing</string>
+	<string name="poi_railway_crossing">Railroad crossing</string>
 	<string name="poi_railway_level_crossing">Level crossing</string>
 	<string name="poi_bird_hide">Bird hide</string>
 	<string name="poi_horse_riding">Horse riding</string>
@@ -1329,7 +1331,7 @@
 
 	<string name="poi_passing_place">Passing place</string>
 	<string name="poi_level">Level</string>
-	<string name="poi_rtsa_scale">Difficulty of mountain pass</string>
+	<string name="poi_rtsa_scale">RTSA scale</string>
 
 	<string name="poi_piste_difficulty_easy">Piste difficulty: easy</string>
 	<string name="poi_piste_difficulty_intermediate">Piste difficulty: intermediate</string>
@@ -1352,9 +1354,9 @@
 
 	<string name="poi_garden_style_kitchen">Garden style: kitchen</string>
 	<string name="poi_garden_style_rosarium">Garden style: rosarium</string>
-	<string name="poi_garden_style_french">Garden style: french</string>
-	<string name="poi_garden_style_english">Garden style: english</string>
-	<string name="poi_garden_style_japanese">Garden style: japanese</string>
+	<string name="poi_garden_style_french">Garden style: French</string>
+	<string name="poi_garden_style_english">Garden style: English</string>
+	<string name="poi_garden_style_japanese">Garden style: Japanese</string>
 
 	<string name="poi_capacity">Capacity</string>
 	<string name="poi_capacity_disabled_yes">Dedicated places for disabled</string>
@@ -1363,7 +1365,7 @@
 	<string name="poi_capacity_women_yes">Dedicated places for women</string>
 	<string name="poi_capacity_women_no">No dedicated places for women</string>
 	<string name="poi_capacity_women">Dedicated places for women</string>
-	<string name="poi_capacity_pupils">Dedicated places for pupils</string>
+	<string name="poi_capacity_pupils">Dedicated places for students</string>
 	<string name="poi_capacity_teachers">Dedicated places for teachers</string>
 	<string name="poi_capacity_parent_yes">Dedicated places for parents</string>
 	<string name="poi_capacity_parent_no">No dedicated places for parents</string>
@@ -1386,4 +1388,20 @@
 	<string name="poi_aerialway_summer_access_exit">Summer access: exit only</string>
 	<string name="poi_aerialway_summer_access_both">Summer access: entry and exit</string>
 
+	<string name="poi_stars_1">Stars: 1 (Tourist)</string>
+	<string name="poi_stars_1s">Stars: 1S (Superior Tourist)</string>
+	<string name="poi_stars_2">Stars: 2 (Standard)</string>
+	<string name="poi_stars_2s">Stars: 2S (Superior Standard)</string>
+	<string name="poi_stars_3">Stars: 3 (Comfort)</string>
+	<string name="poi_stars_3s">Stars: 3S (Superior Comfort)</string>
+	<string name="poi_stars_4">Stars: 4 (First Class)</string>
+	<string name="poi_stars_4s">Stars: 4S (Superior First Class)</string>
+	<string name="poi_stars_5">Stars: 5 (Luxury)</string>
+	<string name="poi_stars_5s">Stars: 5S (Superior Luxury)</string>
+	<string name="poi_stars_6">Stars: 6</string>
+	<string name="poi_stars_7">Stars: 7</string>
+	<string name="poi_rooms">Rooms</string>
+
+	<string name="poi_love_hotel">Love hotel</string>
+
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 6bf748db93..86098d21ff 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -226,7 +226,8 @@ public class GPXUtilities {
 			double totalSpeedSum = 0;
 			points = 0;
 			
-			double channelThres = 10;
+			double channelThresMin = 5;            // Minimum oscillation amplitude considered as noise for Up/Down analysis
+			double channelThres = channelThresMin; // Actual oscillation amplitude considered as noise, try depedency on current hdop
 			double channelBase;
 			double channelTop;
 			double channelBottom;
@@ -238,6 +239,7 @@ public class GPXUtilities {
 				channelBase = 99999;
 				channelTop = channelBase;
 				channelBottom = channelBase;
+				channelThres = channelThresMin;
 
 				metricEnd += s.metricEnd;
 				points += numberOfPoints;
@@ -271,18 +273,26 @@ public class GPXUtilities {
 					}
 
 					// Trend channel approach for elevation gain/loss, Hardy 2015-09-22
+					// Self-adjusting turnarund threshold added for testing 2015-09-25: Current rule is now: "All up/down trends of amplitude <X are ignored to smooth the noise, where X is the maximum observed hdop value of any point which contributed to the current trend (but at least 5 m as the minimum noise threshold)".
 					if (!Double.isNaN(point.ele)) {
 						// Init channel
 						if (channelBase == 99999) {
 							channelBase = point.ele;
 							channelTop = channelBase;
 							channelBottom = channelBase;
+							channelThres = channelThresMin;
 						}
 						// Channel maintenance
 						if (point.ele > channelTop) {
 							channelTop = point.ele;
+							if (!Double.isNaN(point.hdop)) {
+								channelThres = Math.max(channelThres, point.hdop);
+							}
 						} else if (point.ele < channelBottom) {
 							channelBottom = point.ele;
+							if (!Double.isNaN(point.hdop)) {
+								channelThres = Math.max(channelThres, point.hdop);
+							}
 						}
 						// Turnaround (breakout) detection
 						if ((point.ele <= (channelTop - channelThres)) && (climb == true)) {
@@ -292,6 +302,7 @@ public class GPXUtilities {
 							channelBase = channelTop;
 							channelBottom = point.ele;
 							climb = false;
+							channelThres = channelThresMin;
 						} else if ((point.ele >= (channelBottom + channelThres)) && (climb == false)) {
 							if ((channelBase - channelBottom) >= channelThres) {
 								diffElevationDown += channelBase - channelBottom;
@@ -299,6 +310,7 @@ public class GPXUtilities {
 							channelBase = channelBottom;
 							channelTop = point.ele;
 							climb = true;
+							channelThres = channelThresMin;
 						}
 						// End detection without breakout
 						if (j == (numberOfPoints -1)) {