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

OsmAnd/res/values-be/phrases.xml

@@ -772,4 +772,5 @@
 	<string name="poi_wilderness_hut">Лясная хаціна</string>
 
 	<string name="poi_payment_terminal">Плацёжны тэрмінал</string>
+	<string name="poi_piste">Лыжная траса</string>
 	</resources>

OsmAnd/res/values-bg/phrases.xml

@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="poi_shop">Магазин</string>
+		<string name="poi_shop_food">Магазин за хранителни стоки</string>
+	<string name="poi_emergency">Спешна помощ</string>
+	<string name="poi_transportation">Транспорт</string>
+		<string name="poi_road_obstacle">Препятствие на пътя</string>
+		<string name="poi_filling_station">Бензиностанция</string>
+		<string name="poi_personal_transport">Личен транспорт</string>
+		<string name="poi_public_transport">Обществен транспорт</string>
+		<string name="poi_air_transport">Въздушен транспорт</string>
+		<string name="poi_water_transport">Воден транспорт</string>
+		<string name="poi_bicycle_transport">Велосипед</string>
+		<string name="poi_aerialway_transport">Въжени линии</string>
+	<string name="poi_man_made">Изкуствени</string>
+		<string name="poi_transport_construction">Транспортно строителство</string>
+		<string name="poi_water_supply">Водоснабдяване</string>
+		<string name="poi_power">Енергия</string>
+		<string name="poi_communication">Комуникации</string>
+		<string name="poi_trash_disposal">Отпадъци</string>
+		<string name="poi_landuse">Земеползване</string>
+	<string name="poi_education">Образование</string>
+	<string name="poi_administrative">Административни</string>
+	<string name="poi_healthcare">Здравеопазване</string>
+	<string name="poi_office">Офис</string>
+	<string name="poi_sport">Спорт</string>
+	<string name="poi_tourism">Туризъм</string>
+		<string name="poi_sightseeing">Забележителности</string>
+		<string name="poi_accomodation">Настаняване</string>
+		<string name="poi_internet_access">Достъп до интернет</string>
+	<string name="poi_entertainment">Отдих</string>
+		<string name="poi_club">Клуб</string>
+	<string name="poi_sustenance">Храна</string>
+	<string name="poi_cafe_and_restaurant">Кафе и ресторант</string>
+	<string name="poi_service">Сервиз</string>
+		<string name="poi_craft">Занаяти</string>
+	<string name="poi_finance">Финанси</string>
+	<string name="poi_natural">Природа</string>
+	<string name="poi_seamark">Морски</string>
+	<string name="poi_military">Военни</string>
+	<string name="poi_osmwiki">Уикипедия</string>
+	<string name="poi_user_defined_other">Дефинирани от потребителя</string>
+	
+	<string name="poi_palaeontological_site">Палеонтология</string>
+
+	<string name="poi_bakery">Пекарна</string>
+	<string name="poi_alcohol">Магазин за алкохол</string>
+	<string name="poi_convenience">Бакалия</string>
+	<string name="poi_mall">Мол</string>
+	<string name="poi_beverages">Магазин за напитки</string>
+	<string name="poi_butcher">Пазар за месо</string>
+	<string name="poi_deli">Деликатеси</string>
+	<string name="poi_farm">Магазин на ферма</string>
+	<string name="poi_greengrocer">Плодове и зеленчуци</string>
+	</resources>

OsmAnd/res/values-es/phrases.xml

@@ -44,7 +44,7 @@
 
 	<string name="poi_bakery">Panadería</string>
 	<string name="poi_alcohol">Licorería</string>
-	<string name="poi_convenience">Tienda de comestibles</string>
+	<string name="poi_convenience">Tienda</string>
 	<string name="poi_mall">Centro comercial</string>
 	<string name="poi_beverages">Tienda de bebidas</string>
 	<string name="poi_butcher">Carnicería</string>
@@ -465,9 +465,9 @@
 	<string name="poi_aerialway_magic_carpet">Cinta transportadora</string>
 
 	<string name="poi_standpipe">Boca de incendios</string>
-	<string name="poi_water_works">Aguador</string>
+	<string name="poi_water_works">Depuradora de agua</string>
 	<string name="poi_boatyard">Astillero</string>
-	<string name="poi_wastewater_plant">Depuradora</string>
+	<string name="poi_wastewater_plant">Depuradora aguas residuales</string>
 	<string name="poi_waterway_turning_point">Punto de giro fluvial</string>
 	<string name="poi_weir">Aliviadero</string>
 	<string name="poi_dam">Presa</string>
@@ -706,7 +706,7 @@
 	<string name="poi_ridge">Cresta</string>
 	<string name="poi_anchorage">Anclaje</string>
 	<string name="poi_beacon_special_purpose">Faro de propósito especial</string>
-	<string name="poi_seamark_building">Edificio balizado</string>
+	<string name="poi_seamark_building">Edificio náutico notable</string>
 	<string name="poi_quarter">Distrito</string>
 	<string name="poi_attraction_summer_toboggan">Tobogán de verano</string>
 	<string name="poi_internet_access_terminal">Acceso a Internet: terminal</string>
@@ -733,26 +733,26 @@
 	<string name="poi_saddle">Guarnicionero</string>
 	<string name="poi_cape">Cabo</string>
 	<string name="poi_anchor_berth">Fondeadero</string>
-	<string name="poi_seamark_bridge">Puente balizado</string>
+	<string name="poi_seamark_bridge">Puente náutico notable</string>
 	<string name="poi_buoy_isolated_danger">Boya, peligro aislado</string>
 	<string name="poi_daymark">Señal diurna</string>
 	<string name="poi_landmark">Punto de referencia</string>
-	<string name="poi_seamark_light">Luz, náutica</string>
-	<string name="poi_seamark_light_minor">Luz menor, náutica</string>
-	<string name="poi_seamark_light_float">Luz flotante, náutica</string>
-	<string name="poi_seamark_light_vessel">Luz de barco, náutica</string>
-	<string name="poi_seamark_light_major">Luz mayor, náutica</string>
+	<string name="poi_seamark_light">Luz náutica</string>
+	<string name="poi_seamark_light_minor">Luz náutica menor</string>
+	<string name="poi_seamark_light_float">Luz náutica flotante</string>
+	<string name="poi_seamark_light_vessel">Luz náutica de embarcaciones</string>
+	<string name="poi_seamark_light_major">Luz náutica mayor</string>
 	<string name="poi_mooring">Anclaje</string>
-	<string name="poi_notice">Panel, náutica</string>
+	<string name="poi_notice">Aviso náutico</string>
 	<string name="poi_pile">Pilote</string>
-	<string name="poi_radar_transponder">Traspondedor de radar, náutica</string>
-	<string name="poi_radio_station">Estación de radio, náutica</string>
-	<string name="poi_signal_station_traffic">Estación de señales, tráfico</string>
-	<string name="poi_signal_station_warning">Estación de señales, advertencia</string>
+	<string name="poi_radar_transponder">Trasponder de radar náutico</string>
+	<string name="poi_radio_station">Estación de radio náutica</string>
+	<string name="poi_signal_station_traffic">Estación de señales de tráfico</string>
+	<string name="poi_signal_station_warning">Estación de señales de advertencia</string>
 	<string name="poi_small_craft_facility">Instalaciones para pequeñas embarcaciones</string>
-	<string name="poi_topmark">Tope, náutica</string>
-	<string name="poi_seamark_rock">Rocas, náutica</string>
-	<string name="poi_seamark_wreck">Pecio, náutica</string>
+	<string name="poi_topmark">Tope náutico</string>
+	<string name="poi_seamark_rock">Roca náutica</string>
+	<string name="poi_seamark_wreck">Restos náuticos</string>
 
 	<string name="poi_military_landuse">Zona militar</string>
 	<string name="poi_military_airfield">Aeródromo militar</string>

OsmAnd/res/values-zh-rTW/phrases.xml

@@ -127,4 +127,10 @@
 	<string name="poi_vacuum_cleaner">真空吸塵器商店</string>
 	<string name="poi_variety_store">雜貨店</string>
 	<string name="poi_video">影碟店</string>
+	<string name="poi_window_blind">窗簾店</string>
+	<string name="poi_department_store">百貨公司</string>
+	<string name="poi_electronics">3C產品商店</string>
+	<string name="poi_car">汽車展售店</string>
+	<string name="poi_car_parts">汽車零件</string>
+	<string name="poi_cosmetics">化妝品</string>
 	</resources>