From b31fe28b8b1a0f00484a7f03ce827b377891809f Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 1 Oct 2015 15:35:42 +0300 Subject: [PATCH] Update license and phrases --- LICENSE | 4 ++++ OsmAnd/res/values-ru/phrases.xml | 2 ++ OsmAnd/res/values/phrases.xml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/LICENSE b/LICENSE index a739fdd6b9..c26d37ee1c 100644 --- a/LICENSE +++ b/LICENSE @@ -62,6 +62,10 @@ - Madrid: «MetroMadridLogo» (Przemysław Sakrajda) - own work based on (na podstawie) www.metromadrid.es. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:MetroMadridLogo.svg#/media/File:MetroMadridLogo.svg - London: «Underground» (Dream out loud) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Underground.svg#/media/File:Underground.svg - Barcelona: «Logometrobcn» (Javitomad) - own work. Under GFDL license - https://commons.wikimedia.org/wiki/File:Logometrobcn.svg#/media/File:Logometrobcn.svg + - Tokyo: "Tokyo Metro logo (full)" by Imagener - Tokyo Metro Company. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Tokyo_Metro_logo_(full).svg#/media/File:Tokyo_Metro_logo_(full).svg + - Chicago: «Логотип Chicago Transit Authority» - http://brandsoftheworld.com/, http://en.wikipedia.org/wiki/Image:Chicago_Transit_Authority_Logo.svg. Under Fair use license from site- https://ru.wikipedia.org/wiki/%D0%A4%D0%B0%D0%B9%D0%BB:%D0%9B%D0%BE%D0%B3%D0%BE%D1%82%D0%B8%D0%BF_Chicago_Transit_Authority.svg#/media/File:%D0%9B%D0%BE%D0%B3%D0%BE%D1%82%D0%B8%D0%BF_Chicago_Transit_Authority.svg + - Osaka:«Osaka Metro Logo» (Osaka_Municipal_Subway_logo_001.JPG: Tennen-Gasderivative work: () - Hand coded. Own work, based on Osaka_Municipal_Subway_logo_001.JPG. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Osaka_Metro_Logo.svg#/media/File:Osaka_Metro_Logo.svg + - Stockholm: «Stockholm metro symbol» svg graphics by (Kildor) - own work. Licensed under Public Domain via Commons from site - https://commons.wikimedia.org/wiki/File:Stockholm_metro_symbol.svg#/media/File:Stockholm_metro_symbol.svg * 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 0302d2e70e..c281f99577 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -1543,4 +1543,6 @@ Средство передвижения Обелиск + Надпись + \ No newline at end of file diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index f88363b7f0..c1b17dfad8 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1694,4 +1694,6 @@ Vehicle Obelisk + Inscription +