diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index 2d9e0ca991..1303ea570e 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -292,17 +292,17 @@
 	<string name="poi_fire_hydrant_pressure">Ur-hargunearen presioa</string>
 	<string name="poi_fire_hydrant_count">Ur-hargune kopurua</string>
 	<string name="poi_fire_hydrant_flow_capacity">Ur-hargunearen emaria</string>
-	<string name="poi_fire_hydrant_position_sidewalk">Ur-hargunearen posizioa: espaloia</string>
-	<string name="poi_fire_hydrant_position_green">Ur-hargunearen posizioa: bedartza</string>
-	<string name="poi_fire_hydrant_position_lane">Ur-hargunearen posizioa: erreia</string>
-	<string name="poi_fire_hydrant_position_parking_lot">Ur-hargunearen posizioa: aparkalekua</string>
-	<string name="poi_fire_hydrant_position_street">Ur-hargunearen posizioa: kalea</string>
-	<string name="poi_fire_hydrant_position_underground">Ur-hargunearen posizioa: lurrazpian</string>
+	<string name="poi_fire_hydrant_position_sidewalk">Espaloia</string>
+	<string name="poi_fire_hydrant_position_green">Belartza</string>
+	<string name="poi_fire_hydrant_position_lane">Erreia</string>
+	<string name="poi_fire_hydrant_position_parking_lot">Aparkalekua</string>
+	<string name="poi_fire_hydrant_position_street">Kalea</string>
+	<string name="poi_fire_hydrant_position_underground">Lurrazpikoa</string>
 	<string name="poi_fire_hydrant_style_wsh">Ur-hargune mota: wsh</string>
-	<string name="poi_fire_hydrant_style_water_source_main">Ur-hargunearen jatorria: nagusia</string>
-	<string name="poi_fire_hydrant_style_water_source_pond">Ur-hargunearen jatorria: urmaela</string>
-	<string name="poi_fire_hydrant_style_water_source_stream">Ur-hargunearen jatorria: erreka</string>
-	<string name="poi_fire_hydrant_style_water_source_cistern">Ur-hargunearen jatorria: zisterna</string>
+	<string name="poi_fire_hydrant_style_water_source_main">Nagusia</string>
+	<string name="poi_fire_hydrant_style_water_source_pond">Urmaela</string>
+	<string name="poi_fire_hydrant_style_water_source_stream">Erreka</string>
+	<string name="poi_fire_hydrant_style_water_source_cistern">Zisterna</string>
 	<string name="poi_fire_extinguisher">Su-itzalgailua</string>
 	<string name="poi_ambulance_station">Anbulantzia geltokia</string>
 	<string name="poi_ford">Ibia</string>
@@ -598,7 +598,7 @@
 	<string name="poi_beachvolleyball">Hondartza boleibola</string>
 	<string name="poi_bmx">BMX</string>
 	<string name="poi_boules">Petanka</string>
-	<string name="poi_bowls">Boulingrin</string>
+	<string name="poi_bowls">Bolera</string>
 	<string name="poi_canadian_football">Futbol kanadarra</string>
 	<string name="poi_canoe">Kanoa</string>
 	<string name="poi_chess">Xakea</string>
@@ -656,11 +656,11 @@
 	<string name="poi_stars_1">1 (Turista)</string>
 	<string name="poi_stars_1s">1S (Turista gorena)</string>
 	<string name="poi_stars_2">2 (Estandarra)</string>
-	<string name="poi_stars_2s">Itzarrak: 2S (Estandar gorena)</string>
+	<string name="poi_stars_2s">2S (Estandar gorena)</string>
 	<string name="poi_stars_3">3 (Erosotasuna)</string>
 	<string name="poi_stars_3s">3S (Erosotasun gorena)</string>
 	<string name="poi_stars_4">4 (Lehen klasea)</string>
-	<string name="poi_stars_4s">Izarrak: 4S (Lehen klase gorena)</string>
+	<string name="poi_stars_4s">4S (Lehen klase gorena)</string>
 	<string name="poi_stars_5">5 (Luxuzkoa)</string>
 	<string name="poi_stars_5s">5S (Luxuzkoa gorena)</string>
 	<string name="poi_stars_6">Izarrak: 6</string>
@@ -777,9 +777,9 @@
 
 	<string name="poi_min_age">Gutxieneko adina</string>
 
-	<string name="poi_organic_yes">Janari organikoa: bai</string>
-	<string name="poi_organic_no">Janari organikoa: ez</string>
-	<string name="poi_organic_only">Soilik janari organikoa</string>
+	<string name="poi_organic_yes">Bai</string>
+	<string name="poi_organic_no">Ez</string>
+	<string name="poi_organic_only">Bakarrik</string>
 
 	<string name="poi_traffic_mirror">Trafikorako ispilua</string>
 
@@ -789,14 +789,14 @@
 	<string name="poi_diplomatic_permanent_mission">Behin betiko misioa</string>
 	<string name="poi_diplomatic_delegation">Delegazioa</string>
 	<string name="poi_diplomatic_ambassadors_residence">Enbaxadorearen egoitza</string>
-	<string name="poi_payment_coins_yes">Txanponak onartzen dira</string>
+	<string name="poi_payment_coins_yes">Txanponak</string>
 	<string name="poi_payment_coins_no">Ez dira txanponak onartzen</string>
 	<string name="poi_payment_terminal">Ordainketa terminala</string>
-	<string name="poi_payment_coins_0.5">0,5$eko txanponak onartzen dira</string>
-	<string name="poi_payment_coins_50c12">50c, 1€, eta 2€ko txanponak onartzen dira</string>
-	<string name="poi_payment_telephone_cards_yes">Telefono txartelak onartzen dira</string>
+	<string name="poi_payment_coins_0.5">0,5$-eko txanponak</string>
+	<string name="poi_payment_coins_50c12">50c, 1€, eta 2€-ko txanponak</string>
+	<string name="poi_payment_telephone_cards_yes">Telefono txartelak</string>
 	<string name="poi_payment_telephone_cards_no">Ez dira telefono txartelak onartzen</string>
-	<string name="poi_payment_credit_cards_yes">Kreditu txartelak onartzen dira</string>
+	<string name="poi_payment_credit_cards_yes">Kreditu txartelak</string>
 	<string name="poi_payment_credit_cards_no">Ez dira kreditu txartelak onartzen</string>
 	<string name="poi_payment_notes_yes">Billeteak</string>
 	<string name="poi_payment_notes_no">Ez dira billeteak onartzen</string>
@@ -842,20 +842,20 @@
 	<string name="poi_cypress">Altzifrea</string>
 	<string name="poi_bench_yes">Bai</string>
 	<string name="poi_bench_no">Eserleku gabe</string>
-	<string name="poi_shelter_type_public_transport">Aterpe mota: Garraio publikoa</string>
-	<string name="poi_shelter_type_picnic_shelter">Aterpe mota: Picnic aterpea</string>
-	<string name="poi_shelter_type_weather_shelter">Aterpe mota: Eguraldirako aterpea</string>
-	<string name="poi_shelter_type_basic_hut">Aterpe mota: oinarrizko txabola</string>
-	<string name="poi_shelter_type_building">Aterpe mota: eraikina</string>
-	<string name="poi_shelter_type_wildlife_hide">Aterpe mota: Basabizitza parada</string>
-	<string name="poi_shelter_type_rock_shelter">Aterpe mota: Arkaitzezko aterpea</string>
-	<string name="poi_shelter_type_sun_shelter">Aterpe mota: eguzkitarako aterpea</string>
+	<string name="poi_shelter_type_public_transport">Garraio publikoa</string>
+	<string name="poi_shelter_type_picnic_shelter"></string>
+	<string name="poi_shelter_type_weather_shelter"></string>
+	<string name="poi_shelter_type_basic_hut">Oinarrizko txabola</string>
+	<string name="poi_shelter_type_building">Eraikina</string>
+	<string name="poi_shelter_type_wildlife_hide">Basabizitza parada</string>
+	<string name="poi_shelter_type_rock_shelter">Arkaitzezko aterpea</string>
+	<string name="poi_shelter_type_sun_shelter">Eguzkitarako aterpea</string>
 	<string name="poi_shelter_type_tent">Aterpe mota: Denda</string>
 	<string name="poi_shelter_type_abandoned">Aterpe mota: utzitakoa</string>
 
-	<string name="poi_internet_access_type_wlan">Internet sarbide mota: wlan</string>
-	<string name="poi_internet_access_type_terminal">Internet sarbide mota: terminala</string>
-	<string name="poi_internet_access_type_wired">Internet sarbide mota: kableatuta</string>
+	<string name="poi_internet_access_type_wlan">Wi-Fi</string>
+	<string name="poi_internet_access_type_terminal">Terminala</string>
+	<string name="poi_internet_access_type_wired">Kable bidez</string>
 	<string name="poi_internet_access_type_public">Internet sarbide mota: publikoa</string>
 	<string name="poi_internet_access_type_service">Internet sarbide mota: zerbitzua</string>
 	<string name="poi_internet_access_type_no">Internet sarbideik ez</string>
@@ -890,10 +890,10 @@
 	<string name="poi_beach">Hondartza</string>
 	<string name="poi_sand">Hondarra</string>
 
-	<string name="poi_beach_sand">Hondartza mota: hondarra</string>
+	<string name="poi_beach_sand">Hondarra</string>
 	<string name="poi_beach_resort">Hondartzako opor-lekua</string>
-	<string name="poi_beach_shingle">Hondartza mota: harri-koskorrak</string>
-	<string name="poi_beach_rocky">Hondartza mota: arrokak</string>
+	<string name="poi_beach_shingle">Harri-koskorrak</string>
+	<string name="poi_beach_rocky">Arrokak</string>
 
 	<string name="poi_entrance_main">Sarrera nagusia</string>
 	<string name="poi_entrance">Sarrera</string>
@@ -917,7 +917,7 @@
 	<string name="poi_start_date">Hasiera data</string>
 	<string name="poi_wheelchair_yes">Bai</string>
 	<string name="poi_wheelchair_no">Ez</string>
-	<string name="poi_wheelchair_limited">Gurpil-aulkia: mugatua</string>
+	<string name="poi_wheelchair_limited">Mugatua</string>
 	<string name="poi_wholesale">Handizkako salmenta</string>
 
 	<string name="poi_access_private">Sarbide pribatua</string>
@@ -936,11 +936,11 @@
 	<string name="poi_content_biomass">Edukia: biomasa</string>
 	<string name="poi_content_beer">Edukia: garagardoa</string>
 	<string name="poi_content_salt">Edukia: gatza</string>
-	<string name="poi_nudism_yes">Nudismoa: onartua</string>
-	<string name="poi_nudism_no">Nudismoa: debekatua</string>
-	<string name="poi_nudism_obligatory">Nudismoa: derrigorrezkoa</string>
-	<string name="poi_nudism_customary">Nudismoa: ohikoa</string>
-	<string name="poi_nudism_permissive">Nudismoa: permisiboa</string>
+	<string name="poi_nudism_yes">Onartua</string>
+	<string name="poi_nudism_no">Debekatua</string>
+	<string name="poi_nudism_obligatory">Derrigorrezkoa</string>
+	<string name="poi_nudism_customary">Ohikoa</string>
+	<string name="poi_nudism_permissive">Permisiboa</string>
 
 	<string name="poi_trade_building_supplies">Eraikuntzarako gaiak</string>
 	<string name="poi_grass">Belarra</string>
@@ -948,9 +948,9 @@
 	<string name="poi_level">Maila</string>
 	<string name="poi_rtsa_scale">RTSA eskala</string>
 
-	<string name="poi_piste_difficulty_easy">Pistaren zailtasuna: erraza</string>
-	<string name="poi_piste_difficulty_intermediate">Pistaren zailtasuna: tartekoa</string>
-	<string name="poi_piste_difficulty_advanced">Pistaren zailtasuna: aurreratua</string>
+	<string name="poi_piste_difficulty_easy">Erraza</string>
+	<string name="poi_piste_difficulty_intermediate">Tartekoa</string>
+	<string name="poi_piste_difficulty_advanced">Aurreratua</string>
 	<string name="poi_piste_difficulty_novice">Hasberria</string>
 	<string name="poi_piste_difficulty_expert">Aditua</string>
 	<string name="poi_piste_difficulty_freeride">Pistatik kanpo</string>
@@ -970,8 +970,8 @@
 	<string name="poi_craft_dressmaker">Jostuna</string>
 	<string name="poi_craft_electrician">Argiketaria</string>
 	<string name="poi_smoking_area">Erretzaileen area</string>
-	<string name="poi_smoking_no">Ezin da erre</string>
-	<string name="poi_smoking_outside">Erretzea kanpoan besterik ez da baimentzen</string>
+	<string name="poi_smoking_no">Ezin da</string>
+	<string name="poi_smoking_outside">Kanpoan besterik ez</string>
 	<string name="poi_smoking_yes">Baimenduta</string>
 	<string name="poi_smoking_separated">Aparteko gela batean</string>
 	<string name="poi_smoking_isolated">Isolatutako gela batean</string>
@@ -1021,7 +1021,7 @@
 	<string name="poi_barbecue">Barbakoa</string>
 
 	<string name="poi_craft_agricultural_engines">Nekazaritzarako motorrak</string>
-	<string name="poi_toilets_yes">Komunak ditu</string>
+	<string name="poi_toilets_yes">Bai</string>
 	<string name="poi_toilets_no">Ez du komunik</string>
 	<string name="poi_toilets_wheelchair_yes">Gurpildun aulkiekin komunera sartzea dago: bai</string>
 	<string name="poi_toilets_wheelchair_no">Gurpildun aulkiekin komunera sartzea dago: ez</string>
@@ -1058,7 +1058,7 @@
 	<string name="poi_squash">Squash</string>
 	<string name="poi_additional_type">Gehigarria</string>
 <string name="poi_payment_type">Ordaintzeko modua</string>
-	<string name="poi_fuel_type">Mota</string>
+	<string name="poi_fuel_type">Erregai mota</string>
 	<string name="poi_fuel_1_25">1:25 erregaia</string>
 	<string name="poi_fuel_e10">E10</string>
 	<string name="poi_fuel_e20">E20</string>
@@ -1106,15 +1106,15 @@
 	<string name="poi_payment_v_pay_no">V PAY txartelak ez dira onartzen</string>
 	<string name="poi_payment_cibus_yes">Cibus</string>
 	<string name="poi_payment_cibus_no">Cibus txartelak ez dira onartzen</string>
-	<string name="poi_payment_wire_transfer_yes">Transferentzia elektronikoak onartzen dira</string>
+	<string name="poi_payment_wire_transfer_yes">Transferentzia elektronikoak</string>
 	<string name="poi_payment_wire_transfer_no">Transferentzia elektronikoak ez dira onartzen</string>
-	<string name="poi_payment_ep_cash_yes">Txanpon-txartela onartzen da (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_yes">Diru-txartela (Geldkarte)</string>
 	<string name="poi_payment_ep_cash_no">Txanpon-txartelik ez da onartzen (Geldkarte)</string>
-	<string name="poi_payment_ep_proton_yes">Proton txartelak onartzen dira</string>
+	<string name="poi_payment_ep_proton_yes">Proton</string>
 	<string name="poi_payment_ep_proton_no">Proton txartelak ez dira onartzen</string>
-	<string name="poi_payment_ep_avant_yes">"AvantCard  onartzen da"</string>
+	<string name="poi_payment_ep_avant_yes">AvantCard</string>
 	<string name="poi_payment_ep_avant_no">AvantCard ez da onartzen</string>
-	<string name="poi_payment_ep_mep_yes">MEP onartzen da</string>
+	<string name="poi_payment_ep_mep_yes">MEP</string>
 	<string name="poi_payment_ep_mep_no">MEP ez da onartzen</string>
 	<string name="poi_toboggan">Txirrista</string>
 	<string name="poi_rune_stone">Erruna-harria</string>
@@ -1234,9 +1234,9 @@
 
 	<string name="poi_aerialway_heating_yes">Bai</string>
 	<string name="poi_aerialway_heating_no">Berogailurik gabe</string>
-	<string name="poi_aerialway_bicycle_yes">Bizikletak: onartuta</string>
+	<string name="poi_aerialway_bicycle_yes">Onartuta</string>
 	<string name="poi_aerialway_bicycle_no">Bizikletak: ez dira onartzen</string>
-	<string name="poi_aerialway_bicycle_summer">Bizikletak: udan besterik ez dira onartzen</string>
+	<string name="poi_aerialway_bicycle_summer">Udan besterik ez</string>
 	<string name="poi_aerialway_access_entry">Sarrera besterik ez</string>
 	<string name="poi_aerialway_access_exit">Irteera besterik ez</string>
 	<string name="poi_aerialway_access_both">Sarrera eta irteera</string>
@@ -1248,10 +1248,10 @@
 	<string name="poi_trade_wood">Zurgintzarako gaiak</string>
 	<string name="poi_trade_agricultural_supplies">Nekazaritzarako gaiak</string>
 	<string name="poi_population">Biztanleria</string>
-	<string name="poi_parking_underground">Mota: lurrazpikoa</string>
+	<string name="poi_parking_underground">Lurrazpikoa</string>
 	<string name="poi_bicycle_parking_anchors">Aingurak</string>
 	<string name="poi_bicycle_parking_stands">Euskarriak</string>
-	<string name="poi_fuel_avia_type">Mota</string>
+	<string name="poi_fuel_avia_type">Erregai mota (avia)</string>
 	<string name="poi_payment_fuel_type">Erregai txartelak</string>
 	<string name="poi_internet_access_type">Internet sarbide mota</string>
 	<string name="poi_vending_type">Makina automatiko mota</string>
@@ -1265,7 +1265,7 @@
 	<string name="poi_traffic_signals_sound">Soinua</string>
 	<string name="poi_highway_crossing_type">Mota</string>
 	<string name="poi_service_car">Zerbitzua</string>
-	<string name="poi_brushless">Ikatzik gabekoa</string>
+	<string name="poi_brushless"></string>
 	<string name="poi_self_service">Autozerbitzua</string>
 	<string name="poi_automated">Automatizatua</string>
 	<string name="poi_parking_type">Mota</string>
@@ -1280,7 +1280,7 @@
 	<string name="poi_animal_training_type">Mota</string>
 	<string name="poi_embassy_type">Mota</string>
 	<string name="poi_city_capital">Hiriburua</string>
-	<string name="poi_pharmacy_dispensing">Farmazia</string>
+	<string name="poi_pharmacy_dispensing"></string>
 	<string name="poi_healthcare_alternative_types">Espezialitatea</string>
 	<string name="poi_free_flying_characteristics">Karakteristikoa</string>
 	<string name="poi_archaeological_site_type">Mota</string>
@@ -1376,9 +1376,9 @@
 	<string name="poi_capacity_disabled_yes">Bai</string>
 	<string name="poi_drive_in_yes">Bai</string>
 	<string name="poi_drive_through_yes">Bai</string>
-	<string name="poi_takeaway_yes">Bai</string>
-	<string name="poi_delivery_yes">Bai</string>
-	<string name="poi_outdoor_seating_yes">Bai</string>
+	<string name="poi_takeaway_yes">Eramateko</string>
+	<string name="poi_delivery_yes">Etxera bidalketa</string>
+	<string name="poi_outdoor_seating_yes">Eserlekuak kanpoan: bai</string>
 	<string name="poi_cocktails_yes">Bai</string>
 
 	<string name="poi_self_service_yes">Bai</string>
@@ -1388,7 +1388,7 @@
 	<string name="poi_drinking_water_no">Ez</string>
 	<string name="poi_traffic_signals_sound_no">Ez</string>
 	<string name="poi_piste_grooming_no">Ez</string>
-	<string name="poi_washing_machine_yes">Garbigailua: bai</string>
+	<string name="poi_washing_machine_yes">Bai</string>
 	<string name="poi_washing_machine_no">Garbigailua: ez</string>
 	<string name="poi_shower_yes">Dutxa: bai</string>
 	<string name="poi_shower_no">Dutxa: ez</string>
@@ -1437,19 +1437,19 @@
 	<string name="poi_water_characteristic">Uraren ezaugarriak</string>
 	<string name="poi_payment_sms_yes">SMS bidezko ordainketak</string>
 	<string name="poi_payment_sms_no">Ez dira SMS bidezko ordainketak onartzen</string>
-	<string name="poi_social_facility_for_senior">Gizarte talde xehea: adinekoak</string>
-	<string name="poi_social_facility_for_child">Gizarte talde xehea: haurrak</string>
-	<string name="poi_social_facility_for_orphan">Gizarte talde xehea: umezurtzak</string>
-	<string name="poi_social_facility_for_disabled">Gizarte talde xehea: ezgaituak</string>
-	<string name="poi_social_facility_for_mental_health">Gizarte talde xehea: arazo mentalak dituzten gaixoak</string>
-	<string name="poi_social_facility_for_juvenile">Gizarte talde xehea: gazteak</string>
-	<string name="poi_social_facility_for_homeless">Gizarte talde xehea: etxegabeak</string>
-	<string name="poi_social_facility_for_migrant">Gizarte talde xehea: etorkinak</string>
-	<string name="poi_social_facility_for_underprivileged">Gizarte talde xehea: txiroak</string>
-	<string name="poi_social_facility_for_drug_addicted">Gizarte talde xehea: drogamenpekoak</string>
-	<string name="poi_social_facility_for_unemployed">Gizarte talde xehea: langabeak</string>
-	<string name="poi_social_facility_for_diseased">Gizarte talde xehea: gaixoak</string>
-	<string name="poi_social_facility_for_child_juvenile">Gizarte talde xehea: haurrak;gazteak</string>
+	<string name="poi_social_facility_for_senior">Adinekoak</string>
+	<string name="poi_social_facility_for_child">Haurrak</string>
+	<string name="poi_social_facility_for_orphan">Umezurtzak</string>
+	<string name="poi_social_facility_for_disabled">Ezgaituak</string>
+	<string name="poi_social_facility_for_mental_health">Arazo mentalak dituzten gaixoak</string>
+	<string name="poi_social_facility_for_juvenile">Gazteak</string>
+	<string name="poi_social_facility_for_homeless">Etxegabeak</string>
+	<string name="poi_social_facility_for_migrant">Etorkinak</string>
+	<string name="poi_social_facility_for_underprivileged">Txiroak</string>
+	<string name="poi_social_facility_for_drug_addicted">Drogamenpekoak</string>
+	<string name="poi_social_facility_for_unemployed">Langabeak</string>
+	<string name="poi_social_facility_for_diseased">Gaixoak</string>
+	<string name="poi_social_facility_for_child_juvenile">Haurrak;gazteak</string>
 
 	<string name="poi_additional_atm_yes">Kutxazain automatikoa: bai</string>
 	<string name="poi_atm_no">Kutxazain automatikoa: ez</string>
@@ -1586,7 +1586,7 @@
 	<string name="poi_vacuum_cleaner_filter">Xurgagailua</string>
 
 <string name="poi_aerialway_platter">Erretilu igogailua</string>
-	<string name="poi_aerialway_mixed_lift">Igogailu nahasia</string>
+	<string name="poi_aerialway_mixed_lift">Igogailu mistoa</string>
 	<string name="poi_aerialway_drag_lift">Teleaulki</string>
 	<string name="poi_beauty_salon_nails">Manikura</string>
 	<string name="poi_massage">Masaje zentroa</string>
@@ -2282,4 +2282,8 @@
 	<string name="poi_health_specialty_speech_therapy_yes">Hizketaren terapia</string>
 	<string name="poi_health_specialty_depth_psychology_yes">Psikoanalisia</string>
 	<string name="poi_aquaculture_shrimp">Akuikultura: ganbak</string>
+	<string name="poi_water_supply_type">Ur hornidura mota</string>
+	<string name="poi_water_place_access">Ur iturrira sarbidea</string>
+	<string name="poi_buoy_installation">Instalazio buia</string>
+	<string name="poi_radio_station">Itsas irrati estazioa</string>
 	</resources>