From f87f5153c0c1113fffea7a091e6b08b3b48f71d8 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sun, 25 Oct 2015 23:29:02 +0300
Subject: [PATCH] Update phrases

---
 OsmAnd/res/values-ru/phrases.xml | 59 +++++++++++++++++++++++++++++-
 OsmAnd/res/values/phrases.xml    | 63 +++++++++++++++++++++++++++++---
 2 files changed, 115 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 8967e446cb..12ecd8020d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -44,7 +44,7 @@
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
 	<string name="poi_curtain">Шторы, портьеры</string>
 	<string name="poi_fabric">Ткани</string>
-	<string name="poi_bedding">Постельное бельё</string>
+<!--	<string name="poi_bedding">Постельное бельё</string>-->
 	<string name="poi_dive">Снаряжение для дайвинга</string>
 	<string name="poi_doityourself">Инструменты и стройматериалы</string>
 	<string name="poi_doors">Двери</string>
@@ -863,7 +863,7 @@
 	<string name="poi_residential">Жилой район</string>
 	<string name="poi_religious">Религиозное землепользование</string>
 
-	<string name="poi_general_tourist_attraction_yes">Достопримечательность (тип неизвестен)</string>
+<!--	<string name="poi_general_tourist_attraction_yes">Достопримечательность (тип неизвестен)</string>-->
 	<string name="poi_attraction_amusement_ride">Парк атракционов</string>
 	<string name="poi_wilderness_hut">Лесной домик</string>
 	<string name="poi_hunting_lodge">Охотничий домик</string>
@@ -2278,4 +2278,59 @@
 	<string name="poi_historic_period_classical">Исторический период: классический (период IV, 374 – 900 г. н.э.)</string>
 	<string name="poi_historic_period_imperial">Исторический период: имперский (период V, 900 – 1200 г. н.э.)</string>
 
+	<string name="poi_historic_era_paleolithic">Эра: палеолит (2.6 млн. лет до н.э. – 10000 лет до н.э.)</string>
+	<string name="poi_historic_era_mesolithic">Эра: мезолит</string>
+	<string name="poi_historic_era_neolithic">Эра: неолит</string>
+	<string name="poi_historic_era_chalcolithic">Эра: халколит (медный век) (IV—III тысячелетия до н.э.)</string>
+
+	<string name="poi_historic_stone">Исторический камень</string>
+	<string name="poi_stone_type_conciliation_cross">Тип: примирительный крест</string>
+	<string name="poi_stone_type_coat_of_arms">Тип: герб</string>
+
+	<string name="poi_material_wood">Материал: дерево</string>
+	<string name="poi_material_metal">Материал: металл</string>
+	<string name="poi_material_reinforced_concrete">Материал: железобетон</string>
+	<string name="poi_material_concrete">Материал: бетон</string>
+	<string name="poi_material_steel">Материал: сталь</string>
+	<string name="poi_material_stone">Материал: камень</string>
+	<string name="poi_material_masonry">Материал: каменная кладка</string>
+	<string name="poi_material_brick">Материал: кирпич</string>
+	<string name="poi_material_plastic">Материал: пластик</string>
+	<string name="poi_material_sandstone">Материал: песчаник</string>
+	<string name="poi_material_granite_stone">Материал: гранит</string>
+	<string name="poi_material_metal_wood">Материал: металл, дерево</string>
+	<string name="poi_material_glass">Материал: стекло</string>
+	<string name="poi_material_bronze">Материал: бронза</string>
+	<string name="poi_material_earth">Материал: земля</string>
+	<string name="poi_material_composite">Материал: составной</string>
+	<string name="poi_material_limestone">Материал: известняк</string>
+	<string name="poi_material_marble">Материал: мрамор</string>
+	<string name="poi_material_aluminium">Материал: алюминий</string>
+
+	<string name="poi_site_type_megalith">Тип: мегалит</string>
+	<string name="poi_site_type_tumulus">Тип: тумулус</string>
+	<string name="poi_site_type_fortification">Тип: укрепление</string>
+	<string name="poi_site_type_settlement">Тип: поселение</string>
+	<string name="poi_site_type_city">Тип: город</string>
+	<string name="poi_site_type_hut_circle">Тип: круг из хижин</string>
+	<string name="poi_site_type_necropolis">Тип: некрополь</string>
+	<string name="poi_site_type_petroglyph">Тип: петроглиф</string>
+	<string name="poi_site_type_earthwork">Тип: земляное укрепление</string>
+	<string name="poi_megalith_type_menhir">Тип мегалита: менгир</string>
+	<string name="poi_megalith_type_dolmen">Тип мегалита: дольмен</string>
+	<string name="poi_megalith_type_nuraghe">Тип мегалита: нураги</string>
+	<string name="poi_megalith_type_stone_circle">Тип мегалита: каменный круг</string>
+	<string name="poi_megalith_type_passage_grave">Тип мегалита: коридорная гробница</string>
+	<string name="poi_fortification_type_hill_fort">Тип укрепления: городище</string>
+	<string name="poi_fortification_type_limes">Тип укрепления: лимес</string>
+	<string name="poi_fortification_type_sconce">Тип укрепления: шанец</string>
+	<string name="poi_fortification_type_ring_ditch">Тип укрепления: рондела (кольцевая канава)</string>
+
+	<string name="poi_pa">Па (укреплённое поселение маори)</string>
+
+	<string name="poi_historic_farm">Историческая ферма</string>
+	<string name="poi_historic_railway_station">Историческая железнодорожная станция</string>
+
+	<string name="poi_tourism_yes">Туристический объект</string>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 5c78462053..38ce22ab3c 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -78,7 +78,7 @@
 	<string name="poi_baby_goods">Baby goods</string>
 	<string name="poi_bag">Bag shop</string>
 	<string name="poi_bathroom_furnishing">Bathroom furnishings</string>
-	<string name="poi_bed">Bed room furnishings</string>
+	<string name="poi_bed">Bedding store</string>
 	<string name="poi_boutique">Fashion boutique</string>
 	<string name="poi_camera">Cameras and lenses</string>
 	<string name="poi_carpet">Carpet shop</string>
@@ -92,7 +92,7 @@
 	<string name="poi_copyshop">Copy shop</string>
 	<string name="poi_curtain">Curtain shop</string>
 	<string name="poi_fabric">Drapery shop</string>
-	<string name="poi_bedding">Bedding store</string>
+<!--	<string name="poi_bedding">Bedding store</string>-->
 	<string name="poi_dive">Diving equipment</string>
 	<string name="poi_doityourself">Home improvement store</string>
 	<string name="poi_doors">Doors</string>
@@ -606,8 +606,8 @@
 	<string name="poi_theme_park">Theme park</string>
 
 	<string name="poi_attraction">Tourist attraction</string>
-	<string name="poi_tourism_attraction">Tourist attraction</string>
-	<string name="poi_general_tourist_attraction_yes">General tourist attraction</string>
+<!--	<string name="poi_tourism_attraction">Tourist attraction</string>-->
+	<string name="poi_tourism_yes">Touristic object</string>
 	<string name="poi_attraction_amusement_ride">Amusement ride</string>
 	<string name="poi_attraction_animal">Animal (attraction)</string>
 	<string name="poi_attraction_big_wheel">Ferris wheel</string>
@@ -723,7 +723,7 @@
 	<string name="poi_internet_access_no">Internet access: no</string>
 
 	<string name="poi_monastery">Monastery</string>
-	<string name="poi_historic_monastery">Historic monastery</string>
+<!--	<string name="poi_historic_monastery">Historic monastery</string>-->
 	<string name="poi_religious">Religious area</string>
 	<string name="poi_wayside_cross">Wayside cross</string>
 	<string name="poi_wayside_shrine">Wayside shrine</string>
@@ -2284,4 +2284,57 @@
 	<string name="poi_historic_period_classical">Historic period: classical (epoch IV, 374 AC – 900 AC)</string>
 	<string name="poi_historic_period_imperial">Historic period: imperial (epoch V, 900 AC – 1200 AC)</string>
 
+	<string name="poi_historic_era_paleolithic">Historic era: paleolithic (2.6 million years – 10000 BP)</string>
+	<string name="poi_historic_era_mesolithic">Historic era: mesolithic</string>
+	<string name="poi_historic_era_neolithic">Historic era: neolithic</string>
+	<string name="poi_historic_era_chalcolithic">Historic era: chalcolithic (IV-III millennium BC.)</string>
+
+	<string name="poi_historic_stone">Historic stone</string>
+	<string name="poi_stone_type_conciliation_cross">Type: conciliation cross</string>
+	<string name="poi_stone_type_coat_of_arms">Type: coat of arms</string>
+
+	<string name="poi_material_wood">Material: wood</string>
+	<string name="poi_material_metal">Material: metal</string>
+	<string name="poi_material_reinforced_concrete">Material: reinforced concrete</string>
+	<string name="poi_material_concrete">Material: concrete</string>
+	<string name="poi_material_steel">Material: steel</string>
+	<string name="poi_material_stone">Material: stone</string>
+	<string name="poi_material_masonry">Material: masonry</string>
+	<string name="poi_material_brick">Material: brick</string>
+	<string name="poi_material_plastic">Material: plastic</string>
+	<string name="poi_material_sandstone">Material: sandstone</string>
+	<string name="poi_material_granite_stone">Material: granite stone</string>
+	<string name="poi_material_metal_wood">Material: metal;wood</string>
+	<string name="poi_material_glass">Material: glass</string>
+	<string name="poi_material_bronze">Material: bronze</string>
+	<string name="poi_material_earth">Material: earth</string>
+	<string name="poi_material_composite">Material: composite</string>
+	<string name="poi_material_limestone">Material: limestone</string>
+	<string name="poi_material_marble">Material: marble</string>
+	<string name="poi_material_aluminium">Material: aluminium</string>
+
+	<string name="poi_site_type_megalith">Type: megalith</string>
+	<string name="poi_site_type_tumulus">Type: tumulus</string>
+	<string name="poi_site_type_fortification">Type: fortification</string>
+	<string name="poi_site_type_settlement">Type: settlement</string>
+	<string name="poi_site_type_city">Type: city</string>
+	<string name="poi_site_type_hut_circle">Type: hut circle</string>
+	<string name="poi_site_type_necropolis">Type: necropolis</string>
+	<string name="poi_site_type_petroglyph">Type: petroglyph</string>
+	<string name="poi_site_type_earthwork">Type: earthwork</string>
+	<string name="poi_megalith_type_menhir">Megalith type: menhir</string>
+	<string name="poi_megalith_type_dolmen">Megalith type: dolmen</string>
+	<string name="poi_megalith_type_nuraghe">Megalith type: nuraghe</string>
+	<string name="poi_megalith_type_stone_circle">Megalith type: stone circle</string>
+	<string name="poi_megalith_type_passage_grave">Megalith type: passage grave</string>
+	<string name="poi_fortification_type_hill_fort">Fortification type: hill fort</string>
+	<string name="poi_fortification_type_limes">Fortification type: limes</string>
+	<string name="poi_fortification_type_sconce">Fortification type: sconce</string>
+	<string name="poi_fortification_type_ring_ditch">Fortification type: ring ditch</string>
+
+	<string name="poi_pa">Pa (maori fortified settlement)</string>
+
+	<string name="poi_historic_farm">Historic farm</string>
+	<string name="poi_historic_railway_station">Historic railway station</string>
+
 </resources>