diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index c01fbae317..b5a78ed796 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -727,7 +727,7 @@
 	<!-- Description in preferences -->
 	<string name="enable_show_on_lock_screen_description">Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы праграмы.</string>
 	<!-- OpenStreetMap text on splash screen -->
-	<string name="splash_subtitle">Дадзеныя карты з OpenStreetMap</string>
+	<string name="splash_subtitle">Даныя карты з OpenStreetMap</string>
 	<!-- Telegram group url for the "?" About page -->
 	<string name="telegram_url">https://t.me/OrganicMapsRu</string>
 	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index cf9bb76fa8..228d2b5e51 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -389,7 +389,7 @@
 	<string name="p2p_from_here">Ruta desde</string>
 	<string name="p2p_to_here">Ruta hacia</string>
 	<string name="p2p_only_from_current">La navegación solo está disponible desde su ubicación actual.</string>
-	<string name="p2p_reroute_from_current">¿Quiere que planeemos un ruta desde su ubicación actual?</string>
+	<string name="p2p_reroute_from_current">¿Quiere que planeemos una ruta desde su ubicación actual?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Siguiente</string>
 	<!-- Tab title in the Edit Opening Hours time picker -->
@@ -614,7 +614,7 @@
 	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Configuraciones de seguimiento</string>
 	<string name="crash_reports">Informe de incidentes</string>
-	<string name="crash_reports_description">Puede que utilicemos sus datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después dw que reinicie la aplicación.</string>
+	<string name="crash_reports_description">Puede que utilicemos sus datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después de que reinicie la aplicación.</string>
 	<string name="privacy_policy">Política de privacidad</string>
 	<string name="terms_of_use">Condiciones de uso</string>
 	<string name="button_layer_traffic">Tráfico</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index d511baa3be..25caffee05 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -91,7 +91,7 @@
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Tallenna kartat kohteeseen</string>
 	<!-- Detailed description of Maps Storage settings button -->
-	<string name="maps_storage_summary">Valitse karttojen latauskohde</string>
+	<string name="maps_storage_summary">Valitse karttojen latauskohde.</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
 	<string name="maps_storage_downloaded">Ladatut kartat</string>
 	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -129,7 +129,7 @@
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! -->
 	<string name="shopping">Ostokset</string>
 	<!-- Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @secondhand! -->
-	<string name="secondhand">Käytetty</string>
+	<string name="secondhand">Käytetyt tavarat</string>
 	<!-- Search category for places to stay; any changes should be duplicated in categories.txt @hotel! -->
 	<string name="hotel">Hotelli</string>
 	<!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @tourism! -->
@@ -639,7 +639,7 @@
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Karttojen lataaminen</string>
 	<string name="power_managment_title">Virransäästötila</string>
-	<string name="power_managment_description">Kun olet valinnut automaattisen tilan, sovellus alkaa sammuttamaan virtaa vieviä ominaisuuksia riippuen kulloisestakin akun latauksesta</string>
+	<string name="power_managment_description">Kun olet valinnut automaattisen tilan, sovellus alkaa sammuttamaan virtaa vieviä ominaisuuksia riippuen kulloisestakin akun latauksesta.</string>
 	<string name="power_managment_setting_never">Ei koskaan</string>
 	<string name="power_managment_setting_auto">Automaattinen</string>
 	<string name="power_managment_setting_manual_max">Täysi virransäästö</string>
@@ -736,7 +736,7 @@
 	<!-- A preference title; keep short! -->
 	<string name="enable_show_on_lock_screen">Näytä lukitusnäytöllä</string>
 	<!-- Description in preferences -->
-	<string name="enable_show_on_lock_screen_description">Kun käytössä, sovellus toimii lukitusnäytöllä vaikka laita olisi lukittuna.</string>
+	<string name="enable_show_on_lock_screen_description">Kun käytössä, sovellus toimii lukitusnäytöllä vaikka laite olisi lukittuna.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">OpenStreetMapin karttatiedot</string>
 
@@ -752,10 +752,11 @@
 	<string name="type.aerialway.mixed_lift">Köysirata</string>
 	<string name="type.aerialway.station">Köysirata-asema</string>
 	<string name="type.aeroway.aerodrome">Lentokenttä</string>
-	<string name="type.aeroway.aerodrome.international">Lentokenttä</string>
+	<string name="type.aeroway.aerodrome.international">Kansainvälinen lentokenttä</string>
 	<string name="type.aeroway.gate">Portti</string>
 	<string name="type.aeroway.helipad">Helikopterialusta</string>
 	<string name="type.aeroway.runway">Kiitorata</string>
+	<string name="type.aeroway.taxiway">Rullaustie</string>
 	<string name="type.aeroway.terminal">Terminaali</string>
 	<string name="type.amenity">Infrastruktuurikohteet</string>
 	<string name="type.amenity.arts_centre">Taidekeskus</string>
@@ -803,7 +804,7 @@
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">Hautausmaa</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
-	<string name="type.amenity.grave_yard.christian">Hautausmaa</string>
+	<string name="type.amenity.grave_yard.christian">Kristillinen hautausmaa</string>
 	<string name="type.amenity.hospital">Sairaala</string>
 	<string name="type.amenity.hunting_stand">Metsästyspaikka</string>
 	<string name="type.amenity.ice_cream">Jäätelökioski</string>
@@ -836,13 +837,13 @@
 	<string name="type.amenity.payment_terminal">Maksupääte</string>
 	<string name="type.amenity.pharmacy">Apteekki</string>
 	<string name="type.amenity.place_of_worship">Uskonnollinen kohde</string>
-	<string name="type.amenity.place_of_worship.buddhist">Temppeli</string>
+	<string name="type.amenity.place_of_worship.buddhist">Buddhalainen temppeli</string>
 	<string name="type.amenity.place_of_worship.christian">Kirkko</string>
-	<string name="type.amenity.place_of_worship.hindu">Temppeli</string>
+	<string name="type.amenity.place_of_worship.hindu">Hindutemppeli</string>
 	<string name="type.amenity.place_of_worship.jewish">Synagoga</string>
 	<string name="type.amenity.place_of_worship.muslim">Moskeija</string>
-	<string name="type.amenity.place_of_worship.shinto">Pyhäkkö</string>
-	<string name="type.amenity.place_of_worship.taoist">Temppeli</string>
+	<string name="type.amenity.place_of_worship.shinto">Šintopyhäkkö</string>
+	<string name="type.amenity.place_of_worship.taoist">Taolainen temppeli</string>
 	<string name="type.amenity.police">Poliisi</string>
 	<string name="type.amenity.post_box">Postilaatikko</string>
 	<string name="type.amenity.post_office">Postitoimisto</string>
@@ -855,13 +856,18 @@
 	<string name="type.amenity.recycling">Kierrätysjäteastia</string>
 	<string name="type.amenity.recycling.container">Kierrätysjäteastia</string>
 	<string name="type.recycling.batteries">Paristot</string>
-	<string name="type.recycling.clothes">Vanhat vaatteet</string>
+	<string name="type.recycling.clothes">Vaatteet</string>
 	<string name="type.recycling.glass_bottles">Lasipullot</string>
-	<string name="type.recycling.paper">Paperi- ja kartonkijäte</string>
-	<string name="type.recycling.plastic">Muovijäte</string>
+	<string name="type.recycling.paper">Paperi</string>
+	<string name="type.recycling.plastic">Muovi</string>
 	<string name="type.recycling.plastic_bottles">Muovipullot</string>
 	<string name="type.recycling.scrap_metal">Metalliromu</string>
-	<string name="type.recycling.small_appliances">Kodinkonejäte</string>
+	<string name="type.recycling.small_appliances">SER</string>
+	<string name="type.recycling.cardboard">Pahvi</string>
+	<string name="type.recycling.cans">Tölkit</string>
+	<string name="type.recycling.shoes">Kengät</string>
+	<string name="type.recycling.green_waste">Biojäte</string>
+	<string name="type.recycling.cartons">Kartonki</string>
 	<string name="type.amenity.restaurant">Ravintola</string>
 	<string name="type.amenity.school">Koulu</string>
 	<string name="type.amenity.shelter">Katos</string>
@@ -881,12 +887,14 @@
 	<string name="type.amenity.vending_machine.newspapers">Sanomalehtiautomaatti</string>
 	<string name="type.amenity.vending_machine.parking_tickets">Pysäköintimaksuautomaatti</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Julkisen liikenteen lippuautomaatti</string>
-	<string name="type.amenity.vending_machine.sweets">Karkkiautomaatti</string>
+	<string name="type.amenity.vending_machine.sweets">Makeisautomaatti</string>
+	<string name="type.amenity.parcel_locker">Pakettilokero</string>
 	<string name="type.amenity.vending_machine.fuel">Bensa-automaatti</string>
 	<string name="type.amenity.veterinary">Eläinlääkäri</string>
-	<string name="type.amenity.waste_basket">Roska-astia</string>
+	<string name="type.amenity.waste_basket">Roskakori</string>
 	<string name="type.amenity.waste_disposal">Roska</string>
 	<string name="type.amenity.water_point">Vesipiste</string>
+	<string name="type.barrier">Este</string>
 	<string name="type.barrier.block">Este</string>
 	<string name="type.barrier.bollard">Tolppa</string>
 	<string name="type.barrier.border_control">Rajavalvonta</string>
@@ -900,6 +908,7 @@
 	<string name="type.barrier.hedge">Pensasaita</string>
 	<string name="type.barrier.kissing_gate">Portti</string>
 	<string name="type.barrier.lift_gate">Nostopuomi</string>
+	<string name="type.barrier.retaining_wall">Tukimuuri</string>
 	<string name="type.barrier.stile">Portaat</string>
 	<string name="type.barrier.turnstile">Kääntöportti</string>
 	<string name="type.barrier.swing_gate">Kääntöpuomi</string>
@@ -923,6 +932,7 @@
 	<string name="type.boundary.administrative.municipality">Kunnanraja</string>
 	<string name="type.boundary.administrative.nation">Valtakunnanraja</string>
 	<string name="type.boundary.administrative.state">Osavaltion raja</string>
+	<string name="type.boundary.administrative.suburb">Esikaupunki</string>
 	<string name="type.boundary.national_park">Kansallispuisto</string>
 	<string name="type.boundary.protected_area">Suojeltu alue</string>
 	<string name="type.boundary.protected_area.1">Suojeltu alue</string>
@@ -950,7 +960,7 @@
 	<string name="type.craft.gardener">Puutarhuri</string>
 	<string name="type.craft.handicraft">Käsityö</string>
 	<!-- Heating, Ventilation, and Air Conditioning -->
-	<string name="type.craft.hvac">Ilmastointilaite</string>
+	<string name="type.craft.hvac">LVI</string>
 	<string name="type.craft.key_cutter">Avaimen leikkaaminen</string>
 	<string name="type.craft.locksmith">Lukkoseppä</string>
 	<string name="type.craft.metal_construction">Metallimies</string>
@@ -975,7 +985,8 @@
 	<string name="type.cuisine.beef_bowl">Naudanlihakulho</string>
 	<string name="type.cuisine.brazilian">Brasilialainen keittiö</string>
 	<string name="type.cuisine.breakfast">Aamiainen</string>
-	<string name="type.cuisine.burger">Hampurilainen</string>
+	<string name="type.cuisine.bubble_tea">Kuplatee</string>
+	<string name="type.cuisine.burger">Hampurilaiset</string>
 	<string name="type.cuisine.buschenschank">Viinitaverna</string>
 	<string name="type.cuisine.cake">Kakku</string>
 	<string name="type.cuisine.caribbean">Karibialainen keittiö</string>
@@ -1010,22 +1021,22 @@
 	<string name="type.cuisine.italian_pizza">Italialainen, pizza</string>
 	<string name="type.cuisine.japanese">Japanilainen keittiö</string>
 	<string name="type.cuisine.kebab">Kebab</string>
-	<string name="type.cuisine.korean">Korealainen</string>
+	<string name="type.cuisine.korean">Korealainen keittiö</string>
 	<string name="type.cuisine.lao">Laosilainen keittiö</string>
 	<string name="type.cuisine.lebanese">Libanonilainen keittiö</string>
 	<string name="type.cuisine.local">Paikallinen keittiö</string>
 	<string name="type.cuisine.malagasy">Madagaskarilainen keittiö</string>
 	<string name="type.cuisine.malaysian">Malesialainen keittiö</string>
-	<string name="type.cuisine.mediterranean">Välimeren keittiö keittiö</string>
+	<string name="type.cuisine.mediterranean">Välimeren keittiö</string>
 	<string name="type.cuisine.mexican">Meksikolainen keittiö</string>
 	<string name="type.cuisine.moroccan">Marokkolainen keittiö</string>
-	<string name="type.cuisine.noodles">Nuudeli</string>
+	<string name="type.cuisine.noodles">Nuudelit</string>
 	<string name="type.cuisine.oriental">Itämainen keittiö</string>
 	<string name="type.cuisine.pancake">Lettu</string>
 	<string name="type.cuisine.pasta">Pasta</string>
 	<string name="type.cuisine.persian">Persialainen keittiö</string>
 	<string name="type.cuisine.peruvian">Perulainen keittiö</string>
-	<string name="type.cuisine.pizza">Pitsa</string>
+	<string name="type.cuisine.pizza">Pizza</string>
 	<string name="type.cuisine.polish">Puolalainen keittiö</string>
 	<string name="type.cuisine.portuguese">Portugalilainen keittiö</string>
 	<string name="type.cuisine.ramen">Ramen</string>
@@ -1043,9 +1054,10 @@
 	<string name="type.cuisine.tea">Tee</string>
 	<string name="type.cuisine.thai">Thaimaalainen keittiö</string>
 	<string name="type.cuisine.turkish">Turkkilainen keittiö</string>
-	<string name="type.cuisine.vegan">Vegaani keittiö</string>
-	<string name="type.cuisine.vegetarian">Kasvis keittiö</string>
+	<string name="type.cuisine.vegan">Vegaanikeittiö</string>
+	<string name="type.cuisine.vegetarian">Kasviskeittiö</string>
 	<string name="type.cuisine.vietnamese">Vietnamilainen keittiö</string>
+	<string name="type.emergency">Hätätila</string>
 	<string name="type.emergency.defibrillator">Defibrillaattori</string>
 	<string name="type.emergency.fire_hydrant">Paloposti</string>
 	<string name="type.emergency.phone">Hätäpuhelin</string>
@@ -1053,7 +1065,7 @@
 	<string name="type.entrance">Sisäänkäynti</string>
 	<!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
 	<string name="type.entrance.main">Pääsisäänkäynti</string>
-	<string name="type.entrance.exit">Poistu</string>
+	<string name="type.entrance.exit">Ulos</string>
 	<string name="type.healthcare.laboratory">Lääketieteellinen laboratorio</string>
 	<string name="type.healthcare.physiotherapist">Fysioterapeutti</string>
 	<string name="type.healthcare.alternative">Vaihtoehtoinen lääketiede</string>
@@ -1066,77 +1078,83 @@
 	<string name="type.healthcare.speech_therapist">Logopedia</string>
 
 	<!-- SECTION: Types: Roads -->
+	<string name="type.highway">Valtatie</string>
+	<string name="type.highway.bridleway">Ratsastustie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.bridleway.bridge">Silta</string>
+	<string name="type.highway.bridleway.permissive">Ratsastustie</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">Tunneli</string>
-	<string name="type.highway.busway">Oma bussitie</string>
+	<string name="type.highway.busway">Busseille varattu tie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.busway.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.busway.tunnel">Tunneli</string>
 	<string name="type.highway.bus_stop">Bussipysäkki</string>
 	<string name="type.highway.construction">Rakenteilla oleva tie</string>
+	<string name="type.highway.cycleway">Pyörätie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.cycleway.bridge">Silta</string>
+	<string name="type.highway.cycleway.permissive">Pyörätie</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.cycleway.tunnel">Tunneli</string>
+	<string name="type.highway.elevator">Hissi</string>
 	<string name="type.highway.footway">Polku</string>
 	<string name="type.highway.footway.alpine_hiking">Polku</string>
-	<string name="type.highway.footway.area">Polku</string>
+	<string name="type.highway.footway.area">Jalankulkualue</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.footway.bridge">Silta</string>
-	<string name="type.highway.footway.demanding_alpine_hiking">Polku</string>
-	<string name="type.highway.footway.demanding_mountain_hiking">Polku</string>
-	<string name="type.highway.footway.difficult_alpine_hiking">Polku</string>
-	<string name="type.highway.footway.hiking">Polku</string>
-	<string name="type.highway.footway.mountain_hiking">Polku</string>
+	<string name="type.highway.footway.bridge">Jalankulkusilta</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Vaativa alppivaellus</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Vaativa vuoristovaellus</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Vaikea alppivaellus</string>
+	<string name="type.highway.footway.hiking">Vaellus</string>
+	<string name="type.highway.footway.mountain_hiking">Vuoristovaellus</string>
 	<string name="type.highway.footway.permissive">Polku</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.footway.tunnel">Tunneli</string>
+	<string name="type.highway.footway.tunnel">Jalankulkutunneli</string>
 	<string name="type.highway.ford">Kahluupaikka</string>
-	<string name="type.highway.living_street">Katu</string>
+	<string name="type.highway.living_street">Asuinkatu</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.living_street.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Tunneli</string>
-	<string name="type.highway.motorway">Katu</string>
+	<string name="type.highway.motorway">Moottoritie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.motorway.bridge">Silta</string>
+	<string name="type.highway.motorway.bridge">Moottoritiesilta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.motorway.tunnel">Tunneli</string>
+	<string name="type.highway.motorway.tunnel">Moottoritietunneli</string>
 	<string name="type.highway.motorway_junction">Poistumistie</string>
-	<string name="type.highway.motorway_link">Katu</string>
+	<string name="type.highway.motorway_link">Mottoritieramppi</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway_link.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunneli</string>
 	<string name="type.highway.path">Polku</string>
-	<string name="type.highway.path.alpine_hiking">Polku</string>
-	<string name="type.highway.path.bicycle">Polku</string>
+	<string name="type.highway.path.alpine_hiking">Alppivaellus</string>
+	<string name="type.highway.path.bicycle">Pyörä- ja jalkatie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Silta</string>
-	<string name="type.highway.path.demanding_alpine_hiking">Polku</string>
-	<string name="type.highway.path.demanding_mountain_hiking">Polku</string>
-	<string name="type.highway.path.difficult_alpine_hiking">Polku</string>
-	<string name="type.highway.path.hiking">Polku</string>
-	<string name="type.highway.path.horse">Polku</string>
-	<string name="type.highway.path.mountain_hiking">Polku</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Vaativa alppivaellus</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Vaativa vuoristovaellus</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Vaikea alppivaellus</string>
+	<string name="type.highway.path.hiking">Vaellus</string>
+	<string name="type.highway.path.horse">Ratsastuspolku</string>
+	<string name="type.highway.path.mountain_hiking">Vuoristovaellus</string>
 	<string name="type.highway.path.permissive">Polku</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunneli</string>
-	<string name="type.highway.pedestrian">Katu</string>
-	<string name="type.highway.pedestrian.area">Katu</string>
+	<string name="type.highway.pedestrian">Jalankulkutie</string>
+	<string name="type.highway.pedestrian.area">Jalankulkualue</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.pedestrian.bridge">Silta</string>
+	<string name="type.highway.pedestrian.bridge">Jalankulkusilta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.pedestrian.tunnel">Tunneli</string>
-	<string name="type.highway.primary">Katu</string>
+	<string name="type.highway.pedestrian.tunnel">Jalankulkutunneli</string>
+	<string name="type.highway.primary">Pääkatu</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary.tunnel">Tunneli</string>
-	<string name="type.highway.primary_link">Katu</string>
+	<string name="type.highway.primary_link">Pääkatu</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary_link.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1166,16 +1184,17 @@
 	<string name="type.highway.secondary_link.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary_link.tunnel">Tunneli</string>
-	<string name="type.highway.service">Katu</string>
-	<string name="type.highway.service.area">Katu</string>
+	<string name="type.highway.service">Huoltotie</string>
+	<string name="type.highway.service.area">Huoltotie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.service.bridge">Silta</string>
-	<string name="type.highway.service.driveway">Katu</string>
-	<string name="type.highway.service.parking_aisle">Katu</string>
+	<string name="type.highway.service.driveway">Ajotie</string>
+	<string name="type.highway.service.parking_aisle">Pysäköintikäytävä</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.service.tunnel">Tunneli</string>
+	<string name="type.highway.service.tunnel">Huoltotunneli</string>
+	<string name="type.highway.services">Palvelualue</string>
 	<string name="type.highway.speed_camera">Nopeusvalvontakamera</string>
-	<string name="type.highway.steps">Polku</string>
+	<string name="type.highway.steps">Portaat</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.steps.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1204,12 +1223,12 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunneli</string>
 	<string name="type.highway.traffic_signals">Liikennevalot</string>
-	<string name="type.highway.trunk">Katu</string>
+	<string name="type.highway.trunk">Päätie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk.tunnel">Tunneli</string>
-	<string name="type.highway.trunk_link">Katu</string>
+	<string name="type.highway.trunk_link">Päätien ramppi</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk_link.bridge">Silta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1222,18 +1241,18 @@
 	<string name="type.highway.unclassified.tunnel">Tunneli</string>
 	<string name="type.area_highway.cycleway">Pyörätie</string>
 	<string name="type.area_highway.footway">Kävelytie</string>
-	<string name="type.area_highway.living_street">Katu</string>
+	<string name="type.area_highway.living_street">Asuinkatu</string>
 	<string name="type.area_highway.motorway">Moottoritie</string>
 	<string name="type.area_highway.path">Polku</string>
 	<string name="type.area_highway.pedestrian">Kävelykatu</string>
-	<string name="type.area_highway.primary">Katu</string>
+	<string name="type.area_highway.primary">Pääkatu</string>
 	<string name="type.area_highway.residential">Katu</string>
 	<string name="type.area_highway.secondary">Katu</string>
-	<string name="type.area_highway.service">Katu</string>
+	<string name="type.area_highway.service">Huoltotie</string>
 	<string name="type.area_highway.tertiary">Katu</string>
 	<string name="type.area_highway.steps">Portaat</string>
 	<string name="type.area_highway.track">Katu</string>
-	<string name="type.area_highway.trunk">Katu</string>
+	<string name="type.area_highway.trunk">Päätie</string>
 	<string name="type.area_highway.unclassified">Katu</string>
 
 	<!-- SECTION: Types: Historic -->
@@ -1242,8 +1261,8 @@
 	<string name="type.historic.battlefield">Taistelukenttä</string>
 	<string name="type.historic.boundary_stone">Rajamerkki</string>
 	<string name="type.historic.castle">Linna</string>
-	<string name="type.historic.castle.castrum">Castra</string>
-	<string name="type.historic.castle.defensive">Linna</string>
+	<string name="type.historic.castle.castrum">Roomalaisleiri</string>
+	<string name="type.historic.castle.defensive">Linnake</string>
 	<string name="type.historic.castle.fortified_church">Linnoitettu kirkko</string>
 	<string name="type.historic.castle.fortress">Linnoitus</string>
 	<string name="type.historic.castle.hillfort">Linnavuori</string>
@@ -1251,40 +1270,64 @@
 	<string name="type.historic.castle.manor">Kartano</string>
 	<string name="type.historic.castle.palace">Palatsi</string>
 	<string name="type.historic.castle.shiro">Japanilainen linna</string>
-	<string name="type.historic.castle.stately">Linna</string>
+	<string name="type.historic.castle.stately">Arvokas linna</string>
 	<string name="type.historic.city_gate">Kaupungin portti</string>
 	<string name="type.historic.citywalls">Kaupungin muuri</string>
-	<string name="type.historic.fort">Fort</string>
-	<string name="type.historic.gallows">Sappeja</string>
+	<string name="type.historic.fort">Linnake</string>
+	<string name="type.historic.gallows">Hirsipuu</string>
 	<string name="type.historic.memorial">Muistomerkki</string>
 	<string name="type.historic.memorial.cross">Muistoristi</string>
-	<string name="type.historic.memorial.plaque">Muistomerkki</string>
-	<string name="type.historic.memorial.sculpture">Muistomerkki</string>
-	<string name="type.historic.memorial.statue">Muistomerkki</string>
+	<string name="type.historic.memorial.plaque">Muistolaatta</string>
+	<string name="type.historic.memorial.sculpture">Veistos</string>
+	<string name="type.historic.memorial.statue">Patsas</string>
 	<string name="type.historic.memorial.stolperstein">Kompastuskivet</string>
 	<string name="type.historic.memorial.war_memorial">Sotamuistomerkki</string>
 	<string name="type.historic.monument">Monumentti</string>
 	<string name="type.historic.pillory">Häpeäpaalu</string>
 	<string name="type.historic.ruins">Rauniot</string>
-	<string name="type.historic.ship">Nähtävyydet</string>
-	<string name="type.historic.tomb">Nähtävyydet</string>
+	<string name="type.historic.ship">Alus</string>
+	<string name="type.historic.tomb">Hautakammio</string>
 	<string name="type.historic.wayside_cross">Tienvarren risti</string>
 	<string name="type.historic.wayside_shrine">Tienvarren pyhäkkö</string>
+	<string name="type.junction">Risteys</string>
+	<string name="type.junction.circular">Liikenneympyrä</string>
+	<string name="type.junction.roundabout">Liikenneympyrä</string>
+	<string name="type.landuse">Maankäyttö</string>
+	<string name="type.landuse.allotments">Siirtolapuutarha</string>
 	<string name="type.landuse.basin">Vesisäiliö</string>
+	<string name="type.landuse.brownfield">Tuhoalue</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Hautausmaa</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
-	<string name="type.landuse.cemetery.christian">Hautausmaa</string>
+	<string name="type.landuse.cemetery.christian">Kristillinen hautausmaa</string>
 	<string name="type.landuse.churchyard">Kirkon piha</string>
+	<string name="type.landuse.commercial">Kaupallinen alue</string>
+	<string name="type.landuse.construction">Rakennustyömaa</string>
+	<string name="type.landuse.education">Koulutuslaitos</string>
+	<string name="type.landuse.farm">Maatila</string>
 	<string name="type.landuse.farmland">Maatalousmaa</string>
+	<string name="type.landuse.farmyard">Maatila</string>
+	<string name="type.landuse.field">Kenttä</string>
 	<string name="type.landuse.forest">Metsä</string>
-	<string name="type.landuse.forest.coniferous">Metsä</string>
-	<string name="type.landuse.forest.deciduous">Metsä</string>
-	<string name="type.landuse.forest.mixed">Metsä</string>
+	<string name="type.landuse.forest.coniferous">Havumetsä</string>
+	<string name="type.landuse.forest.deciduous">Lehtimetsä</string>
+	<string name="type.landuse.forest.mixed">Sekametsä</string>
+	<string name="type.landuse.garages">Autotallit</string>
 	<string name="type.landuse.grass">Ruohikko</string>
+	<string name="type.landuse.greenfield">Vihreä kenttä</string>
+	<string name="type.landuse.greenhouse_horticulture">Kasvihuone</string>
+	<string name="type.landuse.industrial">Teollisuusalue</string>
 	<string name="type.landuse.landfill">Kaatopaikka</string>
+	<string name="type.landuse.meadow">Niitty</string>
+	<string name="type.landuse.military">Sotilasalue</string>
+	<string name="type.landuse.orchard">Hedelmätarha</string>
+	<string name="type.landuse.quarry">Louhos</string>
 	<string name="type.landuse.railway">Rautatierakennukset</string>
-	<string name="type.landuse.reservoir">Vesi</string>
+	<string name="type.landuse.recreation_ground">Virkistysalue</string>
+	<string name="type.landuse.reservoir">Vesiallas</string>
+	<string name="type.landuse.residential">Asuinalue</string>
+	<string name="type.landuse.retail">Kauppa-alue</string>
+	<string name="type.landuse.salt_pond">Suolalampi</string>
 	<string name="type.leisure.dog_park">Koirien ulkoilupaikka</string>
 	<string name="type.leisure.fitness_centre">Kuntosali</string>
 	<string name="type.leisure.fitness_station">Kuntokeskus</string>
@@ -1739,7 +1782,7 @@
 	<string name="type.shop.pet_grooming">Lemmikkieläinten hoito</string>
 	<string name="type.shop.photo">Valokuvakauppa</string>
 	<string name="type.shop.seafood">Kalakauppias</string>
-	<string name="type.shop.second_hand">Second Hand Store</string>
+	<string name="type.shop.second_hand">Käytetyn tavaran liike</string>
 	<string name="type.shop.shoes">Kenkäkauppa</string>
 	<string name="type.shop.sports">Urheilukauppa</string>
 	<string name="type.shop.stationery">Kirjoitustarvikekauppa</string>
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index bf502712ec..323ca110bb 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -544,7 +544,7 @@
 
 "p2p_only_from_current" = "La navegación solo está disponible desde su ubicación actual.";
 
-"p2p_reroute_from_current" = "¿Quiere que planeemos un ruta desde su ubicación actual?";
+"p2p_reroute_from_current" = "¿Quiere que planeemos una ruta desde su ubicación actual?";
 
 "editor_time_add" = "Añadir horario";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 465e44936f..ddef3b9f63 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -544,7 +544,7 @@
 
 "p2p_only_from_current" = "La navegación solo está disponible desde su ubicación actual.";
 
-"p2p_reroute_from_current" = "¿Quiere que planeemos un ruta desde su ubicación actual?";
+"p2p_reroute_from_current" = "¿Quiere que planeemos una ruta desde su ubicación actual?";
 
 "editor_time_add" = "Añadir horario";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 7c08626a8c..a99567a790 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -111,7 +111,7 @@
 "shopping" = "Ostokset";
 
 /* Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @secondhand! */
-"secondhand" = "Käytetty";
+"secondhand" = "Käytetyt tavarat";
 
 /* Search category for places to stay; any changes should be duplicated in categories.txt @hotel! */
 "hotel" = "Hotelli";
@@ -1007,7 +1007,7 @@
 
 "power_managment_title" = "Virransäästötila";
 
-"power_managment_description" = "Kun olet valinnut automaattisen tilan, sovellus alkaa sammuttamaan virtaa vieviä ominaisuuksia riippuen kulloisestakin akun latauksesta";
+"power_managment_description" = "Kun olet valinnut automaattisen tilan, sovellus alkaa sammuttamaan virtaa vieviä ominaisuuksia riippuen kulloisestakin akun latauksesta.";
 
 "power_managment_setting_never" = "Ei koskaan";
 
@@ -1273,7 +1273,7 @@
 
 "type.aeroway.aerodrome" = "Lentokenttä";
 
-"type.aeroway.aerodrome.international" = "Lentokenttä";
+"type.aeroway.aerodrome.international" = "Kansainvälinen lentokenttä";
 
 "type.aeroway.apron" = "Apron";
 
@@ -1283,7 +1283,7 @@
 
 "type.aeroway.runway" = "Kiitorata";
 
-"type.aeroway.taxiway" = "Taxiway";
+"type.aeroway.taxiway" = "Rullaustie";
 
 "type.aeroway.terminal" = "Terminaali";
 
@@ -1381,7 +1381,7 @@
 "type.amenity.grave_yard" = "Hautausmaa";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.amenity.grave_yard.christian" = "Hautausmaa";
+"type.amenity.grave_yard.christian" = "Kristillinen hautausmaa";
 
 "type.amenity.hospital" = "Sairaala";
 
@@ -1447,19 +1447,19 @@
 
 "type.amenity.place_of_worship" = "Uskonnollinen kohde";
 
-"type.amenity.place_of_worship.buddhist" = "Temppeli";
+"type.amenity.place_of_worship.buddhist" = "Buddhalainen temppeli";
 
 "type.amenity.place_of_worship.christian" = "Kirkko";
 
-"type.amenity.place_of_worship.hindu" = "Temppeli";
+"type.amenity.place_of_worship.hindu" = "Hindutemppeli";
 
 "type.amenity.place_of_worship.jewish" = "Synagoga";
 
 "type.amenity.place_of_worship.muslim" = "Moskeija";
 
-"type.amenity.place_of_worship.shinto" = "Pyhäkkö";
+"type.amenity.place_of_worship.shinto" = "Šintopyhäkkö";
 
-"type.amenity.place_of_worship.taoist" = "Temppeli";
+"type.amenity.place_of_worship.taoist" = "Taolainen temppeli";
 
 "type.amenity.police" = "Poliisi";
 
@@ -1484,29 +1484,29 @@
 
 "type.recycling.batteries" = "Paristot";
 
-"type.recycling.clothes" = "Vanhat vaatteet";
+"type.recycling.clothes" = "Vaatteet";
 
 "type.recycling.glass_bottles" = "Lasipullot";
 
-"type.recycling.paper" = "Paperi- ja kartonkijäte";
+"type.recycling.paper" = "Paperi";
 
-"type.recycling.plastic" = "Muovijäte";
+"type.recycling.plastic" = "Muovi";
 
 "type.recycling.plastic_bottles" = "Muovipullot";
 
 "type.recycling.scrap_metal" = "Metalliromu";
 
-"type.recycling.small_appliances" = "Kodinkonejäte";
+"type.recycling.small_appliances" = "SER";
 
-"type.recycling.cardboard" = "Cardboard";
+"type.recycling.cardboard" = "Pahvi";
 
-"type.recycling.cans" = "Cans";
+"type.recycling.cans" = "Tölkit";
 
-"type.recycling.shoes" = "Shoes";
+"type.recycling.shoes" = "Kengät";
 
-"type.recycling.green_waste" = "Green/Organic Waste";
+"type.recycling.green_waste" = "Biojäte";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Kartonki";
 
 "type.amenity.restaurant" = "Ravintola";
 
@@ -1548,17 +1548,17 @@
 
 "type.amenity.vending_machine.public_transport_tickets" = "Julkisen liikenteen lippuautomaatti";
 
-"type.amenity.vending_machine.sweets" = "Karkkiautomaatti";
+"type.amenity.vending_machine.sweets" = "Makeisautomaatti";
 
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
 
-"type.amenity.parcel_locker" = "Parcel Locker";
+"type.amenity.parcel_locker" = "Pakettilokero";
 
 "type.amenity.vending_machine.fuel" = "Bensa-automaatti";
 
 "type.amenity.veterinary" = "Eläinlääkäri";
 
-"type.amenity.waste_basket" = "Roska-astia";
+"type.amenity.waste_basket" = "Roskakori";
 
 "type.amenity.waste_disposal" = "Roska";
 
@@ -1566,7 +1566,7 @@
 
 "type.amenity.water_point" = "Vesipiste";
 
-"type.barrier" = "Barrier";
+"type.barrier" = "Este";
 
 "type.barrier.block" = "Este";
 
@@ -1594,7 +1594,7 @@
 
 "type.barrier.lift_gate" = "Nostopuomi";
 
-"type.barrier.retaining_wall" = "Retaining Wall";
+"type.barrier.retaining_wall" = "Tukimuuri";
 
 "type.barrier.stile" = "Portaat";
 
@@ -1644,7 +1644,7 @@
 
 "type.boundary.administrative.state" = "Osavaltion raja";
 
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+"type.boundary.administrative.suburb" = "Esikaupunki";
 
 "type.boundary.national_park" = "Kansallispuisto";
 
@@ -1699,7 +1699,7 @@
 "type.craft.handicraft" = "Käsityö";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "Ilmastointilaite";
+"type.craft.hvac" = "LVI";
 
 "type.craft.key_cutter" = "Avaimen leikkaaminen";
 
@@ -1749,9 +1749,9 @@
 
 "type.cuisine.breakfast" = "Aamiainen";
 
-"type.cuisine.bubble_tea" = "Bubble Tea";
+"type.cuisine.bubble_tea" = "Kuplatee";
 
-"type.cuisine.burger" = "Hampurilainen";
+"type.cuisine.burger" = "Hampurilaiset";
 
 "type.cuisine.buschenschank" = "Viinitaverna";
 
@@ -1823,7 +1823,7 @@
 
 "type.cuisine.kebab" = "Kebab";
 
-"type.cuisine.korean" = "Korealainen";
+"type.cuisine.korean" = "Korealainen keittiö";
 
 "type.cuisine.lao" = "Laosilainen keittiö";
 
@@ -1835,13 +1835,13 @@
 
 "type.cuisine.malaysian" = "Malesialainen keittiö";
 
-"type.cuisine.mediterranean" = "Välimeren keittiö keittiö";
+"type.cuisine.mediterranean" = "Välimeren keittiö";
 
 "type.cuisine.mexican" = "Meksikolainen keittiö";
 
 "type.cuisine.moroccan" = "Marokkolainen keittiö";
 
-"type.cuisine.noodles" = "Nuudeli";
+"type.cuisine.noodles" = "Nuudelit";
 
 "type.cuisine.oriental" = "Itämainen keittiö";
 
@@ -1853,7 +1853,7 @@
 
 "type.cuisine.peruvian" = "Perulainen keittiö";
 
-"type.cuisine.pizza" = "Pitsa";
+"type.cuisine.pizza" = "Pizza";
 
 "type.cuisine.polish" = "Puolalainen keittiö";
 
@@ -1889,13 +1889,13 @@
 
 "type.cuisine.turkish" = "Turkkilainen keittiö";
 
-"type.cuisine.vegan" = "Vegaani keittiö";
+"type.cuisine.vegan" = "Vegaanikeittiö";
 
-"type.cuisine.vegetarian" = "Kasvis keittiö";
+"type.cuisine.vegetarian" = "Kasviskeittiö";
 
 "type.cuisine.vietnamese" = "Vietnamilainen keittiö";
 
-"type.emergency" = "Emergency";
+"type.emergency" = "Hätätila";
 
 "type.emergency.defibrillator" = "Defibrillaattori";
 
@@ -1909,7 +1909,7 @@
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Pääsisäänkäynti";
 
-"type.entrance.exit" = "Poistu";
+"type.entrance.exit" = "Ulos";
 
 "type.healthcare.laboratory" = "Lääketieteellinen laboratorio";
 
@@ -1934,19 +1934,19 @@
 
 /********** Types: Roads **********/
 
-"type.highway" = "Highway";
+"type.highway" = "Valtatie";
 
-"type.highway.bridleway" = "Bridle Path";
+"type.highway.bridleway" = "Ratsastustie";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Silta";
 
-"type.highway.bridleway.permissive" = "Bridle Path";
+"type.highway.bridleway.permissive" = "Ratsastustie";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunneli";
 
-"type.highway.busway" = "Oma bussitie";
+"type.highway.busway" = "Busseille varattu tie";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.busway.bridge" = "Silta";
@@ -1958,45 +1958,45 @@
 
 "type.highway.construction" = "Rakenteilla oleva tie";
 
-"type.highway.cycleway" = "Cycle Path";
+"type.highway.cycleway" = "Pyörätie";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.cycleway.bridge" = "Silta";
 
-"type.highway.cycleway.permissive" = "Cycle Path";
+"type.highway.cycleway.permissive" = "Pyörätie";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "Tunneli";
 
-"type.highway.elevator" = "Elevator";
+"type.highway.elevator" = "Hissi";
 
 "type.highway.footway" = "Polku";
 
 "type.highway.footway.alpine_hiking" = "Polku";
 
-"type.highway.footway.area" = "Polku";
+"type.highway.footway.area" = "Jalankulkualue";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.footway.bridge" = "Silta";
+"type.highway.footway.bridge" = "Jalankulkusilta";
 
-"type.highway.footway.demanding_alpine_hiking" = "Polku";
+"type.highway.footway.demanding_alpine_hiking" = "Vaativa alppivaellus";
 
-"type.highway.footway.demanding_mountain_hiking" = "Polku";
+"type.highway.footway.demanding_mountain_hiking" = "Vaativa vuoristovaellus";
 
-"type.highway.footway.difficult_alpine_hiking" = "Polku";
+"type.highway.footway.difficult_alpine_hiking" = "Vaikea alppivaellus";
 
-"type.highway.footway.hiking" = "Polku";
+"type.highway.footway.hiking" = "Vaellus";
 
-"type.highway.footway.mountain_hiking" = "Polku";
+"type.highway.footway.mountain_hiking" = "Vuoristovaellus";
 
 "type.highway.footway.permissive" = "Polku";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.footway.tunnel" = "Tunneli";
+"type.highway.footway.tunnel" = "Jalankulkutunneli";
 
 "type.highway.ford" = "Kahluupaikka";
 
-"type.highway.living_street" = "Katu";
+"type.highway.living_street" = "Asuinkatu";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.living_street.bridge" = "Silta";
@@ -2004,17 +2004,17 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Tunneli";
 
-"type.highway.motorway" = "Katu";
+"type.highway.motorway" = "Moottoritie";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.motorway.bridge" = "Silta";
+"type.highway.motorway.bridge" = "Moottoritiesilta";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.motorway.tunnel" = "Tunneli";
+"type.highway.motorway.tunnel" = "Moottoritietunneli";
 
 "type.highway.motorway_junction" = "Poistumistie";
 
-"type.highway.motorway_link" = "Katu";
+"type.highway.motorway_link" = "Mottoritieramppi";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Silta";
@@ -2024,41 +2024,41 @@
 
 "type.highway.path" = "Polku";
 
-"type.highway.path.alpine_hiking" = "Polku";
+"type.highway.path.alpine_hiking" = "Alppivaellus";
 
-"type.highway.path.bicycle" = "Polku";
+"type.highway.path.bicycle" = "Pyörä- ja jalkatie";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Silta";
 
-"type.highway.path.demanding_alpine_hiking" = "Polku";
+"type.highway.path.demanding_alpine_hiking" = "Vaativa alppivaellus";
 
-"type.highway.path.demanding_mountain_hiking" = "Polku";
+"type.highway.path.demanding_mountain_hiking" = "Vaativa vuoristovaellus";
 
-"type.highway.path.difficult_alpine_hiking" = "Polku";
+"type.highway.path.difficult_alpine_hiking" = "Vaikea alppivaellus";
 
-"type.highway.path.hiking" = "Polku";
+"type.highway.path.hiking" = "Vaellus";
 
-"type.highway.path.horse" = "Polku";
+"type.highway.path.horse" = "Ratsastuspolku";
 
-"type.highway.path.mountain_hiking" = "Polku";
+"type.highway.path.mountain_hiking" = "Vuoristovaellus";
 
 "type.highway.path.permissive" = "Polku";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunneli";
 
-"type.highway.pedestrian" = "Katu";
+"type.highway.pedestrian" = "Jalankulkutie";
 
-"type.highway.pedestrian.area" = "Katu";
+"type.highway.pedestrian.area" = "Jalankulkualue";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.pedestrian.bridge" = "Silta";
+"type.highway.pedestrian.bridge" = "Jalankulkusilta";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.pedestrian.tunnel" = "Tunneli";
+"type.highway.pedestrian.tunnel" = "Jalankulkutunneli";
 
-"type.highway.primary" = "Katu";
+"type.highway.primary" = "Pääkatu";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary.bridge" = "Silta";
@@ -2066,7 +2066,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Tunneli";
 
-"type.highway.primary_link" = "Katu";
+"type.highway.primary_link" = "Pääkatu";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary_link.bridge" = "Silta";
@@ -2115,25 +2115,25 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Tunneli";
 
-"type.highway.service" = "Katu";
+"type.highway.service" = "Huoltotie";
 
-"type.highway.service.area" = "Katu";
+"type.highway.service.area" = "Huoltotie";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.service.bridge" = "Silta";
 
-"type.highway.service.driveway" = "Katu";
+"type.highway.service.driveway" = "Ajotie";
 
-"type.highway.service.parking_aisle" = "Katu";
+"type.highway.service.parking_aisle" = "Pysäköintikäytävä";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.service.tunnel" = "Tunneli";
+"type.highway.service.tunnel" = "Huoltotunneli";
 
-"type.highway.services" = "Service Area";
+"type.highway.services" = "Palvelualue";
 
 "type.highway.speed_camera" = "Nopeusvalvontakamera";
 
-"type.highway.steps" = "Polku";
+"type.highway.steps" = "Portaat";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.steps.bridge" = "Silta";
@@ -2183,7 +2183,7 @@
 
 "type.highway.traffic_signals" = "Liikennevalot";
 
-"type.highway.trunk" = "Katu";
+"type.highway.trunk" = "Päätie";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk.bridge" = "Silta";
@@ -2191,7 +2191,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk.tunnel" = "Tunneli";
 
-"type.highway.trunk_link" = "Katu";
+"type.highway.trunk_link" = "Päätien ramppi";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk_link.bridge" = "Silta";
@@ -2213,7 +2213,7 @@
 
 "type.area_highway.footway" = "Kävelytie";
 
-"type.area_highway.living_street" = "Katu";
+"type.area_highway.living_street" = "Asuinkatu";
 
 "type.area_highway.motorway" = "Moottoritie";
 
@@ -2221,13 +2221,13 @@
 
 "type.area_highway.pedestrian" = "Kävelykatu";
 
-"type.area_highway.primary" = "Katu";
+"type.area_highway.primary" = "Pääkatu";
 
 "type.area_highway.residential" = "Katu";
 
 "type.area_highway.secondary" = "Katu";
 
-"type.area_highway.service" = "Katu";
+"type.area_highway.service" = "Huoltotie";
 
 "type.area_highway.tertiary" = "Katu";
 
@@ -2235,7 +2235,7 @@
 
 "type.area_highway.track" = "Katu";
 
-"type.area_highway.trunk" = "Katu";
+"type.area_highway.trunk" = "Päätie";
 
 "type.area_highway.unclassified" = "Katu";
 
@@ -2256,9 +2256,9 @@
 
 "type.historic.castle" = "Linna";
 
-"type.historic.castle.castrum" = "Castra";
+"type.historic.castle.castrum" = "Roomalaisleiri";
 
-"type.historic.castle.defensive" = "Linna";
+"type.historic.castle.defensive" = "Linnake";
 
 "type.historic.castle.fortified_church" = "Linnoitettu kirkko";
 
@@ -2274,25 +2274,25 @@
 
 "type.historic.castle.shiro" = "Japanilainen linna";
 
-"type.historic.castle.stately" = "Linna";
+"type.historic.castle.stately" = "Arvokas linna";
 
 "type.historic.city_gate" = "Kaupungin portti";
 
 "type.historic.citywalls" = "Kaupungin muuri";
 
-"type.historic.fort" = "Fort";
+"type.historic.fort" = "Linnake";
 
-"type.historic.gallows" = "Sappeja";
+"type.historic.gallows" = "Hirsipuu";
 
 "type.historic.memorial" = "Muistomerkki";
 
 "type.historic.memorial.cross" = "Muistoristi";
 
-"type.historic.memorial.plaque" = "Muistomerkki";
+"type.historic.memorial.plaque" = "Muistolaatta";
 
-"type.historic.memorial.sculpture" = "Muistomerkki";
+"type.historic.memorial.sculpture" = "Veistos";
 
-"type.historic.memorial.statue" = "Muistomerkki";
+"type.historic.memorial.statue" = "Patsas";
 
 "type.historic.memorial.stolperstein" = "Kompastuskivet";
 
@@ -2304,9 +2304,9 @@
 
 "type.historic.ruins" = "Rauniot";
 
-"type.historic.ship" = "Nähtävyydet";
+"type.historic.ship" = "Alus";
 
-"type.historic.tomb" = "Nähtävyydet";
+"type.historic.tomb" = "Hautakammio";
 
 "type.historic.wayside_cross" = "Tienvarren risti";
 
@@ -2342,81 +2342,81 @@
 
 "type.internet_access.wlan" = "Internet";
 
-"type.junction" = "Junction";
+"type.junction" = "Risteys";
 
-"type.junction.circular" = "Roundabout";
+"type.junction.circular" = "Liikenneympyrä";
 
-"type.junction.roundabout" = "Roundabout";
+"type.junction.roundabout" = "Liikenneympyrä";
 
-"type.landuse" = "Landuse";
+"type.landuse" = "Maankäyttö";
 
-"type.landuse.allotments" = "Allotments";
+"type.landuse.allotments" = "Siirtolapuutarha";
 
 "type.landuse.basin" = "Vesisäiliö";
 
-"type.landuse.brownfield" = "Brownfield";
+"type.landuse.brownfield" = "Tuhoalue";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Hautausmaa";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.landuse.cemetery.christian" = "Hautausmaa";
+"type.landuse.cemetery.christian" = "Kristillinen hautausmaa";
 
 "type.landuse.churchyard" = "Kirkon piha";
 
-"type.landuse.commercial" = "Commercial Area";
+"type.landuse.commercial" = "Kaupallinen alue";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Rakennustyömaa";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Koulutuslaitos";
 
-"type.landuse.farm" = "Farm";
+"type.landuse.farm" = "Maatila";
 
 "type.landuse.farmland" = "Maatalousmaa";
 
-"type.landuse.farmyard" = "Farmyard";
+"type.landuse.farmyard" = "Maatila";
 
-"type.landuse.field" = "Field";
+"type.landuse.field" = "Kenttä";
 
 "type.landuse.forest" = "Metsä";
 
-"type.landuse.forest.coniferous" = "Metsä";
+"type.landuse.forest.coniferous" = "Havumetsä";
 
-"type.landuse.forest.deciduous" = "Metsä";
+"type.landuse.forest.deciduous" = "Lehtimetsä";
 
-"type.landuse.forest.mixed" = "Metsä";
+"type.landuse.forest.mixed" = "Sekametsä";
 
-"type.landuse.garages" = "Garages";
+"type.landuse.garages" = "Autotallit";
 
 "type.landuse.grass" = "Ruohikko";
 
-"type.landuse.greenfield" = "Greenfield";
+"type.landuse.greenfield" = "Vihreä kenttä";
 
-"type.landuse.greenhouse_horticulture" = "Greenhouse";
+"type.landuse.greenhouse_horticulture" = "Kasvihuone";
 
-"type.landuse.industrial" = "Industrial Area";
+"type.landuse.industrial" = "Teollisuusalue";
 
 "type.landuse.landfill" = "Kaatopaikka";
 
-"type.landuse.meadow" = "Meadow";
+"type.landuse.meadow" = "Niitty";
 
-"type.landuse.military" = "Military Area";
+"type.landuse.military" = "Sotilasalue";
 
-"type.landuse.orchard" = "Orchard";
+"type.landuse.orchard" = "Hedelmätarha";
 
-"type.landuse.quarry" = "Quarry";
+"type.landuse.quarry" = "Louhos";
 
 "type.landuse.railway" = "Rautatierakennukset";
 
-"type.landuse.recreation_ground" = "Recreation Ground";
+"type.landuse.recreation_ground" = "Virkistysalue";
 
-"type.landuse.reservoir" = "Vesi";
+"type.landuse.reservoir" = "Vesiallas";
 
-"type.landuse.residential" = "Residential Area";
+"type.landuse.residential" = "Asuinalue";
 
-"type.landuse.retail" = "Retail Area";
+"type.landuse.retail" = "Kauppa-alue";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Suolalampi";
 
 "type.landuse.village_green" = "Land";
 
@@ -3479,7 +3479,7 @@
 
 "type.shop.seafood" = "Kalakauppias";
 
-"type.shop.second_hand" = "Second Hand Store";
+"type.shop.second_hand" = "Käytetyn tavaran liike";
 
 "type.shop.shoes" = "Kenkäkauppa";