Merge branch 'master' of https://github.com/osmandapp/Osmand

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/)

OsmAnd/res/values-da/phrases.xml

@@ -1042,8 +1042,8 @@
 	<string name="poi_recycling_cars">Biler</string>
 	<string name="poi_recycling_bicycles">Cykler</string>
 
-	<string name="poi_drinking_water_yes">Drikkevand</string>
+	<string name="poi_drinking_water_yes">Drikkevand: ja</string>
-	<string name="poi_drinking_water_no">Ikke drikkevand</string>
+	<string name="poi_drinking_water_no">Drikkevand: nej</string>
 	<string name="poi_supervised_yes">Overvåget</string>
 	<string name="poi_supervised_no">Ikke overvåget</string>
 	<string name="poi_seasonal_yes">Sæsonbestemt</string>
@@ -1683,4 +1683,60 @@
 
 <string name="poi_events_venue">Kulturhus</string>
 
+	<string name="poi_car_wash_no">Bilvask: nej</string>
+
+	<string name="poi_maxstay">Parkering tidsfrist</string>
+
+	<string name="poi_vending_parking_tickets">Parkeringsbilletter</string>
+	<string name="poi_vending_cigarettes">Cigaretter</string>
+	<string name="poi_vending_public_transport_tickets">Billetter til offentlig transport</string>
+	<string name="poi_vending_drinks">Drinks</string>
+	<string name="poi_vending_sweets">Slik</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Pakke afhentning og post i</string>
+	<string name="poi_vending_condoms">Kondomer</string>
+	<string name="poi_vending_stamps">Frimærker</string>
+	<string name="poi_vending_bicycle_tube">Cykelslanger</string>
+	<string name="poi_vending_food">Mad</string>
+	<string name="poi_vending_drinks_food">Drinks og mad</string>
+	<string name="poi_vending_fuel">Brændstof automater</string>
+	<string name="poi_vending_parcel_pickup">Pakke afhentning</string>
+	<string name="poi_vending_parcel_mail_in">Pakke aflevering</string>
+	<string name="poi_vending_milk">Mælk</string>
+	<string name="poi_vending_elongated_coin">Aflangt mønt</string>
+	<string name="poi_vending_bread">Brød</string>
+	<string name="poi_vending_chewing_gums">Tyggegummi</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Parkeringsbilletter; billetter til offentlig transport</string>
+	<string name="poi_vending_coffee">Kaffe</string>
+	<string name="poi_vending_toll">Toll automater</string>
+	<string name="poi_vending_tickets">Billetautomat</string>
+	<string name="poi_vending_water">Vand automater</string>
+	<string name="poi_vending_telephone_vouchers">Telefon værdikuponer</string>
+	<string name="poi_vending_animal_food">Dyrefoder</string>
+	<string name="poi_vending_public_transport_plans">Offentlig køreplaner</string>
+	<string name="poi_vending_drinks_sweets">Drikkevarer og slik</string>
+	<string name="poi_vending_vouchers">Gavekort</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Stearinlys</string>
+	<string name="poi_vending_toys">Legetøj</string>
+	<string name="poi_vending_ice_cream">Is</string>
+	<string name="poi_vending_sim_cards">SIM-kort</string>
+
+	<string name="poi_branch">Branche</string>
+
+	<string name="poi_memorial_war">Krigsmindesmærke</string>
+	<string name="poi_memorial_plaque">Plak</string>
+	<string name="poi_memorial_statue">Statue</string>
+	<string name="poi_memorial_stone">Sten</string>
+	<string name="poi_memorial_stele">Stele</string>
+	<string name="poi_memorial_bust">Buste</string>
+	<string name="poi_memorial_koshinto">Koshinto</string>
+	<string name="poi_memorial_blue_plaque">Blå plak</string>
+	<string name="poi_memorial_jizo">Jizo</string>
+	<string name="poi_memorial_cross">Kors</string>
+	<string name="poi_memorial_vehicle">Køretøj</string>
+	<string name="poi_memorial_obelisk">Obelisk</string>
+
+<string name="poi_vending_excrement_bags">ekskrement poser</string>
+	<string name="poi_inscription">Inskription</string>
+
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -1022,8 +1022,8 @@
 	<string name="poi_recycling_bicycles">Bicicletas</string>
 
 	<string name="poi_shower">Duchas</string>
-	<string name="poi_drinking_water_yes">Agua potable</string>
+	<string name="poi_drinking_water_yes">Con agua potable</string>
-	<string name="poi_drinking_water_no">Agua no potable</string>
+	<string name="poi_drinking_water_no">Sin agua potable</string>
 	<string name="poi_supervised_yes">Supervisado</string>
 	<string name="poi_supervised_no">Sin supervisión</string>
 	<string name="poi_seasonal_yes">Estacional</string>
@@ -1659,4 +1659,13 @@
 	<string name="poi_diaper_no">Sin cambiador de pañales</string>
 	<string name="poi_diaper_room">Habitación para cambio de pañales</string>
 
+<string name="poi_car_wash_no">Lavado de autos: no</string>
+
+	<string name="poi_maxstay">Estadía máxima</string>
+
+	<string name="poi_vending_parking_tickets">Tickets de estacionamiento</string>
+	<string name="poi_vending_cigarettes">Cigarrillos</string>
+	<string name="poi_vending_excrement_bags">Bolsas para excremento</string>
+	<string name="poi_vending_public_transport_tickets">Tickets de transporte público</string>
+	<string name="poi_vending_drinks">Bebidas</string>
 	</resources>

OsmAnd/res/values-es/phrases.xml

@@ -1026,8 +1026,8 @@
 	<string name="poi_recycling_bicycles">Bicicletas</string>
 
 	<string name="poi_shower">Duchas</string>
-	<string name="poi_drinking_water_yes">Agua potable</string>
+	<string name="poi_drinking_water_yes">Agua potable: sí</string>
-	<string name="poi_drinking_water_no">Agua no potable</string>
+	<string name="poi_drinking_water_no">Agua potable: no</string>
 	<string name="poi_supervised_yes">Supervisado</string>
 	<string name="poi_supervised_no">Sin supervisión</string>
 	<string name="poi_seasonal_yes">Estacional</string>
@@ -1663,4 +1663,28 @@
 	<string name="poi_diaper_no">Sin cambiador de pañales</string>
 	<string name="poi_diaper_room">Habitación para cambio de pañales</string>
 
+<string name="poi_vending_cigarettes">Cigarrillos</string>
+	<string name="poi_vending_drinks">Bebidas</string>
+	<string name="poi_vending_condoms">Preservativos</string>
+	<string name="poi_vending_stamps">Sellos</string>
+	<string name="poi_vending_food">Comida</string>
+	<string name="poi_vending_drinks_food">Bebidas y comida</string>
+	<string name="poi_vending_milk">Leche</string>
+	<string name="poi_vending_bread">Pan</string>
+	<string name="poi_vending_chewing_gums">Chicles</string>
+	<string name="poi_vending_coffee">Café</string>
+	<string name="poi_vending_animal_food">Comida para animales</string>
+	<string name="poi_vending_drinks_sweets">Bebidas y dulces</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Velas</string>
+	<string name="poi_vending_toys">Juguetes</string>
+	<string name="poi_vending_ice_cream">Helado</string>
+	<string name="poi_vending_sim_cards">Tarjetas SIM</string>
+
+	<string name="poi_memorial_statue">Estatua</string>
+	<string name="poi_memorial_vehicle">Vehículo</string>
+	<string name="poi_memorial_obelisk">Obelisco</string>
+
+	<string name="poi_inscription">Inscripción</string>
+
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -1543,4 +1543,6 @@
 	<string name="poi_memorial_vehicle">Средство передвижения</string>
 	<string name="poi_memorial_obelisk">Обелиск</string>
 
+	<string name="poi_inscription">Надпись</string>
+
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -2098,4 +2098,21 @@
 <string name="shared_string_trip_recording">Registratzione biàgiu</string>
     <string name="shared_string_navigation">Nàvigu</string>
     <string name="osmand_running_in_background">Funtzionamentu in isfondu</string>
+    <string name="favorite_category_add_new">Annanghe noa</string>
+    <string name="favorite_category_select">Ischerta sa categoria</string>
+    <string name="default_speed_system_descr">Issèbera s’unidade de medida de sa lestresa</string>
+    <string name="default_speed_system">Medida de sa lestresa</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Mìglios nàuticos</string>
+    <string name="si_kmh">Chilòmetros pro ora</string>
+    <string name="si_mph">Mìglios pro ora</string>
+    <string name="si_m_s">Metros pro segundu</string>
+    <string name="si_min_km">Minutos pro chilòmetru</string>
+    <string name="si_min_m">Minutos pro mìgliu</string>
+    <string name="si_nm_h">Mìglios nàuticos pro ora (knot)</string>
+    <string name="nm_h">nmh</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
     </resources>

OsmAnd/res/values/phrases.xml

@@ -1694,4 +1694,6 @@
 	<string name="poi_memorial_vehicle">Vehicle</string>
 	<string name="poi_memorial_obelisk">Obelisk</string>
 
+	<string name="poi_inscription">Inscription</string>
+
 </resources>