From 4edc4e965698f9b496bcfe7a36e79f70ee21fdfd Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sat, 10 Oct 2015 22:35:26 +0300
Subject: [PATCH] Update phrases

---
 LICENSE                          |  1 +
 OsmAnd/res/values-ru/phrases.xml | 44 +++++++++++++++++++++++++++++---
 OsmAnd/res/values/phrases.xml    | 43 ++++++++++++++++++++++++++++---
 3 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/LICENSE b/LICENSE
index 2f27406444..69307e38c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -43,6 +43,7 @@
 
     * Map icons are taken from sjjb and some are drawn and distributed under Public Domain (except icons8)
         - https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg
+	- some icons are from http://osm-icons.org/wiki/Icons (CC-0 by Markus59, CC BY-SA 2.0)
 
     * Integration with Qt library in (https://github.com/osmandapp/Osmand-core/) - dynamic linking
         - LGPL (http://www.qt.io/qt-licensing-terms/)
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index c32d86fb56..1627f71209 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1136,10 +1136,12 @@
 	<string name="poi_breakwater">Волнорез</string>
 	<string name="poi_groyne">Мол</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">Приют для животных</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>
 
@@ -1802,4 +1804,38 @@
 
 	<string name="poi_monument_yes">Монументальный объект</string>
 
+	<string name="poi_industrial_oil">Тип: нефтяная промышленность</string>
+	<string name="poi_industrial_wellsite">Тип: буровая площадка</string>
+	<string name="poi_industrial_factory">Тип: фабрика</string>
+	<string name="poi_industrial_gas">Тип: газовая промышленность</string>
+	<string name="poi_industrial_timber">Тип: лесоматериалы</string>
+	<string name="poi_industrial_refinery">Тип: очистительный завод</string>
+	<string name="poi_industrial_warehouse">Тип: склад</string>
+	<string name="poi_industrial_auto_wrecker">Тип: утилизация машин</string>
+	<string name="poi_industrial_agriculture">Тип: сельскохозяйственная промышленность</string>
+	<string name="poi_industrial_brewery">Тип: пивоварня</string>
+	<string name="poi_industrial_brickyard">Тип: кирпичный завод</string>
+	<string name="poi_industrial_intermodal_freight_terminal">Тип: интермодальный грузовой терминал</string>
+	<string name="poi_industrial_sawmill">Тип: лесопилка</string>
+	<string name="poi_industrial_water_purification">Тип: очистка воды</string>
+	<string name="poi_industrial_port">Тип: порт</string>
+	<string name="poi_industrial_depot">Тип: депо</string>
+
+	<string name="poi_note">Заметка</string>
+	<string name="poi_watering_place">Водопой</string>
+	<string name="poi_animal_boarding">Временное содержание животных</string>
+	<string name="poi_animal_boarding_dog">Тип приюта: для собак</string>
+	<string name="poi_animal_boarding_cat">Тип приюта: для кошек</string>
+	<string name="poi_animal_boarding_dog_cat">Тип приюта: для собак и кошек</string>
+	<string name="poi_animal_boarding_horse">Тип приюта: для лошадей</string>
+
+	<string name="poi_historic_aircraft">Исторический самолёт</string>
+
+	<string name="poi_honey">Мёд</string>
+
+	<string name="poi_elevator_yes">С лифтом</string>
+	<string name="poi_elevator_no">Без лифта</string>
+
+	<string name="poi_technical_monument">Технический памятник</string>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 994ad685ff..8eb396cec9 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1215,10 +1215,11 @@
 	<string name="poi_enforcement_access">Enforcement: access</string>
 	<string name="poi_enforcement_toll">Enforcement: toll</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_animal_shelter">Animal shelter</string>
+	<string name="poi_animal_shelter_dog">Shelter type: dog</string>
+	<string name="poi_animal_shelter_cat">Shelter type: cat</string>
+	<string name="poi_animal_shelter_dog_cat">Shelter type: dog, cat</string>
+	<string name="poi_animal_shelter_bird">Shelter type: bird</string>
 
 	<string name="poi_seats">Seats</string>
 	<string name="poi_backrest_yes">Backrest: yes</string>
@@ -1953,4 +1954,38 @@
 
 	<string name="poi_monument_yes">Monumental object</string>
 
+	<string name="poi_industrial_oil">Type: oil industry</string>
+	<string name="poi_industrial_wellsite">Type: wellsite</string>
+	<string name="poi_industrial_factory">Type: factory</string>
+	<string name="poi_industrial_gas">Type: gas industry</string>
+	<string name="poi_industrial_timber">Type: timber</string>
+	<string name="poi_industrial_refinery">Type: refinery</string>
+	<string name="poi_industrial_warehouse">Type: warehouse</string>
+	<string name="poi_industrial_auto_wrecker">Type: auto wrecker</string>
+	<string name="poi_industrial_agriculture">Type: agriculture</string>
+	<string name="poi_industrial_brewery">Type: brewery</string>
+	<string name="poi_industrial_brickyard">Type: brickyard</string>
+	<string name="poi_industrial_intermodal_freight_terminal">Type: intermodal freight terminal</string>
+	<string name="poi_industrial_sawmill">Type: sawmill</string>
+	<string name="poi_industrial_water_purification">Type: water purification</string>
+	<string name="poi_industrial_port">Type: port</string>
+	<string name="poi_industrial_depot">Type: depot</string>
+
+	<string name="poi_note">Note</string>
+	<string name="poi_watering_place">Watering place</string>
+	<string name="poi_animal_boarding">Animal boarding</string>
+	<string name="poi_animal_boarding_dog">Boarding type: dog</string>
+	<string name="poi_animal_boarding_cat">Boarding type: cat</string>
+	<string name="poi_animal_boarding_dog_cat">Boarding type: dog, cat</string>
+	<string name="poi_animal_boarding_horse">Boarding type: horse</string>
+
+	<string name="poi_historic_aircraft">Historic aircraft</string>
+
+	<string name="poi_honey">Honey store</string>
+
+	<string name="poi_elevator_yes">With elevator</string>
+	<string name="poi_elevator_no">Without elevator</string>
+
+	<string name="poi_technical_monument">Technical monument</string>
+
 </resources>