From 2a34ac8f5e203456a10cd3a168ff92c64f3911c7 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Mon, 5 Oct 2015 23:05:08 +0300
Subject: [PATCH] Update license, phrases

---
 LICENSE                          |  8 ++++-
 OsmAnd/res/values-ru/phrases.xml | 55 ++++++++++++++++++++++++++++++++
 OsmAnd/res/values/phrases.xml    | 54 +++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index bb7daaffb6..70adfe40b0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -136,4 +136,10 @@
 	- Praha: «Prag Metro Logo» (wikinight2) - Eigenes Werk (own work), created with inkscape, based on PDF http://www.zdanice.cz/clanky/letak_Haje_.pdf. Licensed under Public Domain via Commons from site - https://commons.wikimedia.org/wiki/File:Prag_Metro_Logo.svg#/media/File:Prag_Metro_Logo.svg
 	- Tehran: "Tehran Metro Logo" by Tehran Urban and Suburban Railway Organization - http://metro.tehran.ir/. Licensed under Public Domain via Wikipedia - https://en.wikipedia.org/wiki/File:Tehran_Metro_Logo.svg#/media/File:Tehran_Metro_Logo.svg
 	- Athens: "Logo of the Athens Metro Operating Company (AMEL)" by Marianian - Own work, based on personal observations of publicity and signage.. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Logo_of_the_Athens_Metro_Operating_Company_(AMEL).svg#/media/File:Logo_of_the_Athens_Metro_Operating_Company_(AMEL).svg
-	- Nagoya: "Nagoya Municipal Subway Logo" by ASDFGHJ - 名古屋市交通局. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Nagoya_Municipal_Subway_Logo.svg#/media/File:Nagoya_Municipal_Subway_Logo.svg
\ No newline at end of file
+	- Nagoya: "Nagoya Municipal Subway Logo" by ASDFGHJ - 名古屋市交通局. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Nagoya_Municipal_Subway_Logo.svg#/media/File:Nagoya_Municipal_Subway_Logo.svg
+	- Catania: "Logo metropolitana di Catania" by Friedrichstrasse - Own work. Licensed under CC BY-SA 3.0 via Commons - https://commons.wikimedia.org/wiki/File:Logo_metropolitana_di_Catania.svg#/media/File:Logo_metropolitana_di_Catania.svg
+	- Manila: "Lrtalogo" by Cda stitch - Own work. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Lrtalogo.svg#/media/File:Lrtalogo.svg
+	- Rio de Janeiro: "Metrorioicon" by Metrô Rio - http://www.metrorio.com.br/. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Metrorioicon.png#/media/File:Metrorioicon.png
+	- Montreal: "Montreal Metro" by STM - http://www.stm.info/en-bref/pictometro.htm. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Montreal_Metro.svg#/media/File:Montreal_Metro.svg
+	- Toronto: "TTC" by Source. Licensed under Fair use via Wikipedia - https://en.wikipedia.org/wiki/File:TTC.svg#/media/File:TTC.svg
+	- Bangkok: "MRT (Bangkok) logo" by Bangkok_Metro_logo.png: Paul_012.Original uploader was Paul 012 at en.wikipediaderivative work: Nevetsjc (talk)Revision traced from http://si0.twimg.com/profile_images/975897559/logo.jpg - Bangkok_Metro_logo.png. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:MRT_(Bangkok)_logo.svg#/media/File:MRT_(Bangkok)_logo.svg
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index c281f99577..a010ff1881 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1545,4 +1545,59 @@
 
 	<string name="poi_inscription">Надпись</string>
 
+	<string name="poi_historic_quarry">Исторический карьер</string>
+
+	<string name="poi_resource_aggregate">Заполнители бетона</string>
+	<string name="poi_resource_antimony">Сурьма</string>
+	<string name="poi_resource_asbestos">Асбест</string>
+	<string name="poi_resource_barite">Барит</string>
+	<string name="poi_resource_basalt">Базальт</string>
+	<string name="poi_resource_bauxite">Бокситы</string>
+	<string name="poi_resource_beryl">Берил</string>
+	<string name="poi_resource_bismuth">Висмут</string>
+	<string name="poi_resource_cereal">Зерновые культуры</string>
+	<string name="poi_resource_chromite">Хромиты, хромовая руда</string>
+	<string name="poi_resource_clay">Глина</string>
+	<string name="poi_resource_coal">Уголь</string>
+	<string name="poi_resource_copper">Медь</string>
+	<string name="poi_resource_diamond">Алмазы</string>
+	<string name="poi_resource_dimension_stone">Строительный камень</string>
+	<string name="poi_resource_dolomite">Доломит</string>
+	<string name="poi_resource_gas">Природный газ</string>
+	<string name="poi_resource_gold">Золото</string>
+	<string name="poi_resource_graphite">Графит</string>
+	<string name="poi_resource_gravel">Гравий</string>
+	<string name="poi_resource_gypsum">Гипс</string>
+	<string name="poi_resource_iron_ore">Железная руда</string>
+	<string name="poi_resource_lead">Свинец</string>
+	<string name="poi_resource_lignite">Бурый уголь</string>
+	<string name="poi_resource_limestone">Известняк</string>
+	<string name="poi_resource_marble">Мрамор</string>
+	<string name="poi_resource_mercury">Ртуть</string>
+	<string name="poi_resource_mica">Слюда</string>
+	<string name="poi_resource_mineral_oil">Минеральное масло</string>
+	<string name="poi_resource_nickel">Никель</string>
+	<string name="poi_resource_oil">Нефть/масло</string>
+	<string name="poi_resource_opal">Опал</string>
+	<string name="poi_resource_peat">Торф</string>
+	<string name="poi_resource_platinum">Платина</string>
+	<string name="poi_resource_radium">Радий</string>
+	<string name="poi_resource_ruby">Рубин</string>
+	<string name="poi_resource_rutile">Рутил</string>
+	<string name="poi_resource_salt">Соль</string>
+	<string name="poi_resource_sand">Песок</string>
+	<string name="poi_resource_sandstone">Песчаник</string>
+	<string name="poi_resource_silica">Кремнезём, кварц</string>
+	<string name="poi_resource_silver">Серебро</string>
+	<string name="poi_resource_slate_iron_ore_copper">Сланец;железная руда;медь</string>
+	<string name="poi_resource_slate">Сланец</string>
+	<string name="poi_resource_stone">Камень (ресурс)</string>
+	<string name="poi_resource_tin">Олово</string>
+	<string name="poi_resource_tuff">Вулканический туф</string>
+	<string name="poi_resource_uranium">Уран</string>
+	<string name="poi_resource_vanadium">Ванадий</string>
+	<string name="poi_resource_water">Вода (ресурс)</string>
+	<string name="poi_resource_zinc">Цинк</string>
+	<string name="poi_resource_zircon">Циркон</string>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index e3caa0492e..cf934bbf7d 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1695,5 +1695,59 @@
 	<string name="poi_memorial_obelisk">Obelisk</string>
 
 	<string name="poi_inscription">Inscription</string>
+	<string name="poi_historic_quarry">Historic quarry</string>
+
+	<string name="poi_resource_aggregate">Aggregate</string>
+	<string name="poi_resource_antimony">Antimony</string>
+	<string name="poi_resource_asbestos">Asbestos</string>
+	<string name="poi_resource_barite">Barite</string>
+	<string name="poi_resource_basalt">Basalt</string>
+	<string name="poi_resource_bauxite">Bauxite</string>
+	<string name="poi_resource_beryl">Beryl</string>
+	<string name="poi_resource_bismuth">Bismuth</string>
+	<string name="poi_resource_cereal">Cereal</string>
+	<string name="poi_resource_chromite">Chromite</string>
+	<string name="poi_resource_clay">Clay</string>
+	<string name="poi_resource_coal">Coal</string>
+	<string name="poi_resource_copper">Copper</string>
+	<string name="poi_resource_diamond">Diamond</string>
+	<string name="poi_resource_dimension_stone">Dimension stone</string>
+	<string name="poi_resource_dolomite">Dolomite</string>
+	<string name="poi_resource_gas">Gas</string>
+	<string name="poi_resource_gold">Gold</string>
+	<string name="poi_resource_graphite">Graphite</string>
+	<string name="poi_resource_gravel">Gravel</string>
+	<string name="poi_resource_gypsum">Gypsum</string>
+	<string name="poi_resource_iron_ore">Iron ore</string>
+	<string name="poi_resource_lead">Lead</string>
+	<string name="poi_resource_lignite">Lignite</string>
+	<string name="poi_resource_limestone">Limestone</string>
+	<string name="poi_resource_marble">Marble</string>
+	<string name="poi_resource_mercury">Mercury</string>
+	<string name="poi_resource_mica">Mica</string>
+	<string name="poi_resource_mineral_oil">Mineral oil</string>
+	<string name="poi_resource_nickel">Nickel</string>
+	<string name="poi_resource_oil">Oil</string>
+	<string name="poi_resource_opal">Opal</string>
+	<string name="poi_resource_peat">Peat</string>
+	<string name="poi_resource_platinum">Platinum</string>
+	<string name="poi_resource_radium">Radium</string>
+	<string name="poi_resource_ruby">Ruby</string>
+	<string name="poi_resource_rutile">Rutile</string>
+	<string name="poi_resource_salt">Salt</string>
+	<string name="poi_resource_sand">Sand</string>
+	<string name="poi_resource_sandstone">Sandstone</string>
+	<string name="poi_resource_silica">Silica</string>
+	<string name="poi_resource_silver">Silver</string>
+	<string name="poi_resource_slate_iron_ore_copper">Slate;iron ore;copper</string>
+	<string name="poi_resource_slate">Slate</string>
+	<string name="poi_resource_stone">Stone</string>
+	<string name="poi_resource_tin">Tin</string>
+	<string name="poi_resource_tuff">Tuff</string>
+	<string name="poi_resource_uranium">Uranium</string>
+	<string name="poi_resource_vanadium">Vanadium</string>
+	<string name="poi_resource_water">Water</string>
+	<string name="poi_resource_zinc">Zinc</string>
+	<string name="poi_resource_zircon">Zircon</string>
 
 </resources>