From 46ccf3fd7b464ef35d2ffcd5212eaa15810b59db Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Fri, 7 Oct 2016 10:52:10 +0300
Subject: [PATCH] Fix phrases

---
 OsmAnd/res/values-ru/phrases.xml | 41 +++++++++++++++++++-------------
 OsmAnd/res/values/phrases.xml    | 37 +++++++++++++++-------------
 2 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 262a619099..e8b80bcef3 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -353,6 +353,8 @@
 	<string name="poi_nursing_home">Дом престарелых</string>
 	<string name="poi_baby_hatch">Бэби-бокс</string>
 	<string name="poi_veterinary">Ветеринарная лечебница</string>
+
+	<string name="poi_resort_type">Тип</string>
 	<string name="poi_sanatorium">Санаторий</string>
 	<string name="poi_healthcare_alternative">Альтернативная медицина</string>
 	<string name="poi_audiologist">Отоларинголог</string>
@@ -481,7 +483,7 @@
 
 	<string name="poi_place_of_worship">Место поклонения</string>
 
-	<string name="poi_religion">Религия</string>
+	<string name="poi_religion_type">Религия</string>
 
 	<string name="poi_religion_christian">Христианство</string>
 	<string name="poi_religion_jewish">Иудаизм</string>
@@ -1070,28 +1072,30 @@
 
 	<string name="poi_monitoring_station">Станция наблюдения</string>
 
+	<string name="poi_information_type">Тип</string>
+	<string name="poi_information_contents">Содержание</string>
 	<string name="poi_information_guidepost">Указатель</string>
 	<string name="poi_information_board">Информационный щит</string>
 	<string name="poi_information_map">Карта</string>
 	<string name="poi_information_office">Информационный офис</string>
 	<string name="poi_information_trail_blaze">Метка пути</string>
-	<string name="poi_information_terminal">Информационный терминал</string>
+	<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_wildlife">Информация: о дикой природе</string>
-	<string name="poi_information_history">Информация: историческая</string>
+	<string name="poi_information_nature">Природа</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_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_tourism_attraction">Достопримечательность</string>
 
@@ -2134,9 +2138,12 @@
 	<string name="poi_tents_no">Установка палаток запрещена</string>
 	<string name="poi_openfire_yes">Разведение открытого огня разрешено</string>
 	<string name="poi_openfire_no">Разведение открытого огня запрещено</string>
-	<string name="poi_backcountry_yes">Место для лагеря на природе без удобств</string>
+	<string name="poi_backcountry">Место для лагеря на природе без удобств</string>
+	<string name="poi_backcountry_yes">Да</string>
 	<string name="poi_backcountry_no">Место для лагеря на природе без удобств: нет</string>
-	<string name="poi_scout_yes">Лагерь скаутов</string>
+
+	<string name="poi_scout_camp">Лагерь скаутов</string>
+	<string name="poi_scout_yes">Да</string>
 	<string name="poi_scout_no">Лагерь скаутов: нет</string>
 	<string name="poi_group_only_yes">Доступно только для групп: да</string>
 	<string name="poi_group_only_no">Доступно только для групп: нет</string>
@@ -3016,13 +3023,15 @@
 	<string name="poi_display_digital_yes">Цифровой дисплей</string>
 	<string name="poi_display_sundial_yes">Солнечные часы</string>
 
-	<string name="poi_barometer_yes">Барометр: есть</string>
+	<string name="poi_clock_option">Дополнительно</string>
+
+	<string name="poi_barometer_yes">Барометр</string>
 	<string name="poi_barometer_no">Барометр: отсутствует</string>
-	<string name="poi_thermometer_yes">Термометр: есть</string>
+	<string name="poi_thermometer_yes">Термометр:</string>
 	<string name="poi_thermometer_no">Термометр: отсутствует</string>
-	<string name="poi_hygrometer_yes">Гигрометр: есть</string>
+	<string name="poi_hygrometer_yes">Гигрометр</string>
 	<string name="poi_hygrometer_no">Гигрометр: отсутствует</string>
-	<string name="poi_date_yes">Дата: есть</string>
+	<string name="poi_date_yes">Дата</string>
 	<string name="poi_date_no">Дата: нет</string>
 
 	<string name="poi_support_pole">Опора: столб</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 6350592e71..3423f94f80 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -40,8 +40,14 @@
 	<string name="poi_free_flying_characteristics">Characteristic</string>
 	<string name="poi_archaeological_site_type">Type</string>
 	<string name="poi_star_rating">Star rating</string>
-	<string name="poi_religion">Religion</string>
+	<string name="poi_religion_type">Religion</string>
 	<string name="poi_denomination">Denomination</string>
+	<string name="poi_information_type">Type</string>
+	<string name="poi_information_contents">Contents</string>
+	<string name="poi_clock_option">Additional</string>
+	<string name="poi_scout_camp">Scout camp</string>
+	<string name="poi_backcountry">Backcountry</string>
+	<string name="poi_resort_type">Type</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -1308,27 +1314,26 @@
 	<string name="poi_cuisine">Cuisine</string>
 
 	<string name="poi_information_guidepost">Guidepost</string>
-	<string name="poi_information_board">Information board</string>
+	<string name="poi_information_board">Board</string>
 	<string name="poi_information_map">Map</string>
-	<string name="poi_information_office">Information office</string>
+	<string name="poi_information_office">Office</string>
 	<string name="poi_information_trail_blaze">Trail blaze</string>
-	<string name="poi_information_terminal">Information terminal</string>
+	<string name="poi_information_terminal">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 marker: nature</string>
-	<string name="poi_information_wildlife">Information marker: wildlife</string>
-	<string name="poi_information_history">Information marker: history</string>
+	<string name="poi_information_nature">Nature</string>
+	<string name="poi_information_history">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">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_board_type_plants">Plants</string>
+	<string name="poi_board_type_geology">Geology</string>
+	<string name="poi_board_type_public_transport">Public transport</string>
+	<string name="poi_board_type_technology">Technology</string>
+	<string name="poi_board_type_astronomy">Astronomy</string>
 
 	<string name="poi_commercial">Commercial landuse</string>
 	<string name="poi_retail">Retail landuse</string>
@@ -3005,13 +3010,13 @@
 	<string name="poi_display_digital_yes">Digital display</string>
 	<string name="poi_display_sundial_yes">Sundial</string>
 
-	<string name="poi_barometer_yes">Barometer: yes</string>
+	<string name="poi_barometer_yes">Barometer</string>
 	<string name="poi_barometer_no">Barometer: no</string>
-	<string name="poi_thermometer_yes">Thermometer: yes</string>
+	<string name="poi_thermometer_yes">Thermometer</string>
 	<string name="poi_thermometer_no">Thermometer: no</string>
-	<string name="poi_hygrometer_yes">Hygrometer: yes</string>
+	<string name="poi_hygrometer_yes">Hygrometer</string>
 	<string name="poi_hygrometer_no">Hygrometer: no</string>
-	<string name="poi_date_yes">Date display: yes</string>
+	<string name="poi_date_yes">Date display</string>
 	<string name="poi_date_no">Date display: no</string>
 
 	<string name="poi_support_pole">Support: pole</string>