diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 8735268f03..b6d081994e 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1479,7 +1479,6 @@
 	<string name="type.railway.subway_entrance.lille">مدخل المترو</string>
 	<string name="type.railway.subway_entrance.lima">مدخل المترو</string>
 	<string name="type.railway.subway_entrance.lisboa">مدخل المترو</string>
-	<string name="type.railway.subway_entrance.lisbon">مدخل المترو</string>
 	<string name="type.railway.subway_entrance.london">مدخل المترو</string>
 	<string name="type.railway.subway_entrance.lyon">مدخل المترو</string>
 	<string name="type.railway.subway_entrance.madrid">مدخل المترو</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index 3cdf4b20f4..9d479f42c0 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -220,6 +220,9 @@
 	<string name="duration_6_hours">6 hores</string>
 	<string name="duration_12_hours">12 hores</string>
 	<string name="duration_1_day">1 dia</string>
+	<string name="search_show_on_map">Veure al mapa</string>
+	<!-- Menu button -->
+	<string name="menu">Menú</string>
 	<!-- Text in menu -->
 	<string name="website">Lloc web</string>
 	<!-- Text in About menu, opens Organic Maps news website -->
@@ -443,6 +446,7 @@
 	<string name="editor_report_problem_other_title">Un altre problema</string>
 	<string name="placepage_add_business_button">Afegeix un negoci</string>
 	<string name="message_invalid_feature_position">No s\'ha trobat cap objecte aquí</string>
+	<string name="osm_presentation">Totes les dades cartogràfiques provenen del projecte OpenStreetMap. És com la Viquipèdia per als mapes on podeu afegir o editar llocs, i estan disponibles per a milions d\'usuaris de tot el món.</string>
 	<string name="login_to_make_edits_visible">Inicieu sessió perquè altres usuaris puguin veure els canvis que heu fet</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
 	<string name="downloader_of">%1$d de %2$d</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index a48784abf2..9f6836c1fa 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1393,7 +1393,6 @@
 	<string name="type.railway.subway_entrance.lille">Vchod do podchodu</string>
 	<string name="type.railway.subway_entrance.lima">Vchod do podchodu</string>
 	<string name="type.railway.subway_entrance.lisboa">Vchod do podchodu</string>
-	<string name="type.railway.subway_entrance.lisbon">Vchod do podchodu</string>
 	<string name="type.railway.subway_entrance.london">Vchod do podchodu</string>
 	<string name="type.railway.subway_entrance.lyon">Vchod do podchodu</string>
 	<string name="type.railway.subway_entrance.madrid">Vchod do podchodu</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index b21e8e862c..98c96906b7 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1384,7 +1384,6 @@
 	<string name="type.railway.subway_entrance.lille">Indgang til undergrundsbane</string>
 	<string name="type.railway.subway_entrance.lima">Indgang til undergrundsbane</string>
 	<string name="type.railway.subway_entrance.lisboa">Indgang til undergrundsbane</string>
-	<string name="type.railway.subway_entrance.lisbon">Indgang til undergrundsbane</string>
 	<string name="type.railway.subway_entrance.london">Indgang til undergrundsbane</string>
 	<string name="type.railway.subway_entrance.lyon">Indgang til undergrundsbane</string>
 	<string name="type.railway.subway_entrance.madrid">Indgang til undergrundsbane</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 7054fe20e9..d7c933d497 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1583,7 +1583,6 @@
 	<string name="type.railway.subway_entrance.lille">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.lima">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.lisboa">U-Bahn-Eingang</string>
-	<string name="type.railway.subway_entrance.lisbon">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.london">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.lyon">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.madrid">U-Bahn-Eingang</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 4eb21e1acd..46f90e29c2 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1395,7 +1395,6 @@
 	<string name="type.railway.subway_entrance.lille">Είσοδος μετρό</string>
 	<string name="type.railway.subway_entrance.lima">Είσοδος μετρό</string>
 	<string name="type.railway.subway_entrance.lisboa">Είσοδος μετρό</string>
-	<string name="type.railway.subway_entrance.lisbon">Είσοδος μετρό</string>
 	<string name="type.railway.subway_entrance.london">Είσοδος μετρό</string>
 	<string name="type.railway.subway_entrance.lyon">Είσοδος μετρό</string>
 	<string name="type.railway.subway_entrance.madrid">Είσοδος μετρό</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index c868261e69..a406d41ce7 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -370,7 +370,6 @@
 	<string name="type.railway.subway_entrance.lille">Entrada de metro</string>
 	<string name="type.railway.subway_entrance.lima">Entrada de metro</string>
 	<string name="type.railway.subway_entrance.lisboa">Entrada de metro</string>
-	<string name="type.railway.subway_entrance.lisbon">Entrada de metro</string>
 	<string name="type.railway.subway_entrance.london">Entrada de metro</string>
 	<string name="type.railway.subway_entrance.lyon">Entrada de metro</string>
 	<string name="type.railway.subway_entrance.madrid">Entrada de metro</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 8c0ec40370..9d82d73984 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1484,7 +1484,6 @@
 	<string name="type.railway.subway_entrance.lille">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.lima">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.lisboa">Entrada al metro</string>
-	<string name="type.railway.subway_entrance.lisbon">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.london">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.lyon">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.madrid">Entrada al metro</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 88310c13cb..2826989fe6 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -1460,7 +1460,6 @@
 	<string name="type.railway.subway_entrance.lille">Metroko sarrera</string>
 	<string name="type.railway.subway_entrance.lima">Metroko sarrera</string>
 	<string name="type.railway.subway_entrance.lisboa">Metroko sarrera</string>
-	<string name="type.railway.subway_entrance.lisbon">Metroko sarrera</string>
 	<string name="type.railway.subway_entrance.london">Metroko sarrera</string>
 	<string name="type.railway.subway_entrance.lyon">Metroko sarrera</string>
 	<string name="type.railway.subway_entrance.madrid">Metroko sarrera</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index b080f5437d..d1945d0351 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1306,7 +1306,6 @@
 	<string name="type.railway.subway_entrance.lille">ورودی مترو</string>
 	<string name="type.railway.subway_entrance.lima">ورودی مترو</string>
 	<string name="type.railway.subway_entrance.lisboa">ورودی مترو</string>
-	<string name="type.railway.subway_entrance.lisbon">ورودی مترو</string>
 	<string name="type.railway.subway_entrance.london">ورودی مترو</string>
 	<string name="type.railway.subway_entrance.lyon">ورودی مترو</string>
 	<string name="type.railway.subway_entrance.madrid">ورودی مترو</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 4f0bdffa68..16cf366a0b 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -676,10 +676,19 @@
 	<string name="splash_subtitle">OpenStreetMapin karttatiedot</string>
 
 	<!-- SECTION: Types -->
+	<string name="type.aerialway">Köysirata</string>
+	<string name="type.aerialway.cable_car">Kabiinihissi</string>
+	<string name="type.aerialway.chair_lift">Tuolihissi</string>
+	<string name="type.aerialway.drag_lift">Kapulahissi</string>
+	<string name="type.aerialway.gondola">Gondolihissi</string>
+	<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.gate">Portti</string>
 	<string name="type.aeroway.helipad">Helikopterialusta</string>
+	<string name="type.aeroway.runway">Kiitorata</string>
+	<string name="type.aeroway.terminal">Terminaali</string>
 	<string name="type.amenity">Infrastruktuurikohteet</string>
 	<string name="type.amenity.arts_centre">Taidekeskus</string>
 	<string name="type.amenity.atm">Pankkiautomaatti</string>
@@ -702,6 +711,7 @@
 	<string name="type.amenity.childcare">Päivähoito</string>
 	<string name="type.amenity.cinema">Elokuvateatteri</string>
 	<string name="type.amenity.clinic">Klinikka</string>
+	<string name="type.amenity.college">Korkeakoulu</string>
 	<string name="type.amenity.community_centre">Monitoimitalo</string>
 	<string name="type.amenity.courthouse">Oikeustalo</string>
 	<string name="type.amenity.dentist">Hammaslääkäri</string>
@@ -736,11 +746,11 @@
 	<string name="type.amenity.parking.no.access">Yksityinen pysäköinti</string>
 	<string name="type.amenity.parking.permissive">Yksityinen pysäköinti</string>
 	<string name="type.amenity.parking.private">Yksityinen pysäköinti</string>
-	<string name="type.amenity.parking.park_and_ride">Parkkipaikka</string>
+	<string name="type.amenity.parking.park_and_ride">Liityntäpysäköinti</string>
 	<string name="type.amenity.parking.underground">Maanalainen pysäköinti</string>
-	<string name="type.amenity.parking_entrance.private">Pysäköinti sisäänkäynti</string>
-	<string name="type.amenity.parking_entrance.permissive">Pysäköinti sisäänkäynti</string>
-	<string name="type.amenity.parking_entrance">Pysäköinti sisäänkäynti</string>
+	<string name="type.amenity.parking_entrance.private">Pysäköinnin sisäänkäynti</string>
+	<string name="type.amenity.parking_entrance.permissive">Pysäköinnin sisäänkäynti</string>
+	<string name="type.amenity.parking_entrance">Pysäköinnin sisäänkäynti</string>
 	<string name="type.amenity.parking_space">Parkkipaikka</string>
 	<string name="type.amenity.parking_space.permissive">Parkkipaikka</string>
 	<string name="type.amenity.parking_space.private">Parkkipaikka</string>
@@ -759,6 +769,7 @@
 	<string name="type.amenity.police">Poliisi</string>
 	<string name="type.amenity.post_box">Postilaatikko</string>
 	<string name="type.amenity.post_office">Postitoimisto</string>
+	<string name="type.amenity.prison">Vankila</string>
 	<string name="type.amenity.pub">Pubi</string>
 	<string name="type.amenity.public_bookcase">Kirjahylly</string>
 
@@ -784,10 +795,17 @@
 	<string name="type.amenity.toilets">WC</string>
 	<string name="type.amenity.townhall">Kaupungintalo</string>
 	<string name="type.amenity.university">Yliopisto</string>
+	<string name="type.amenity.vending_machine">Myyntiautomaatti</string>
 	<string name="type.amenity.vending_machine.cigarettes">Savukeautomaatti</string>
+	<string name="type.amenity.vending_machine.coffee">Kahviautomaatti</string>
+	<string name="type.amenity.vending_machine.condoms">Kondomiautomaatti</string>
 	<string name="type.amenity.vending_machine.drinks">Juoma-automaatti</string>
+	<string name="type.amenity.vending_machine.food">Ruoka-automaatti</string>
+	<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.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_disposal">Roska</string>
@@ -795,20 +813,45 @@
 	<string name="type.barrier.block">Este</string>
 	<string name="type.barrier.bollard">Tolppa</string>
 	<string name="type.barrier.border_control">Rajavalvonta</string>
+	<string name="type.barrier.chain">Ketju</string>
+	<string name="type.barrier.city_wall">Kaupunginmuuri</string>
+	<string name="type.barrier.cycle_barrier">Polkupyöräeste</string>
 	<string name="type.barrier.ditch">Vallihauta</string>
 	<string name="type.barrier.entrance">Sisäänkäynti</string>
+	<string name="type.barrier.fence">Aita</string>
 	<string name="type.barrier.gate">Portti</string>
+	<string name="type.barrier.hedge">Pensasaita</string>
 	<string name="type.barrier.kissing_gate">Portti</string>
-	<string name="type.barrier.lift_gate">Puomi</string>
+	<string name="type.barrier.lift_gate">Nostopuomi</string>
 	<string name="type.barrier.stile">Portaat</string>
-	<string name="type.barrier.swing_gate">Puomi</string>
+	<string name="type.barrier.swing_gate">Kääntöpuomi</string>
 	<string name="type.barrier.toll_booth">Tietulliasema</string>
+	<string name="type.barrier.wall">Muuri</string>
+	<string name="type.boundary">Raja</string>
+	<string name="type.boundary.administrative">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.10">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.11">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.2">Valtakunnanraja</string>
+	<string name="type.boundary.administrative.3">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.4">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.5">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.6">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.7">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.8">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.9">Hallinnollinen raja</string>
+	<string name="type.boundary.administrative.city">Kaupunginraja</string>
+	<string name="type.boundary.administrative.country">Valtakunnanraja</string>
+	<string name="type.boundary.administrative.county">Maakunnanraja</string>
+	<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.national_park">Kansallispuisto</string>
 	<string name="type.building">Rakennus</string>
 	<string name="type.building.address">Rakennus</string>
 	<string name="type.building.garage">Autotalli</string>
 	<string name="type.building.has_parts">Rakennus</string>
 	<string name="type.building.train_station">Rautatieasema</string>
+	<string name="type.building.warehouse">Varasto</string>
 	<string name="type.cemetery.grave">Hauta</string>
 	<string name="type.craft">Käsityö</string>
 	<string name="type.craft.beekeeper">Mehiläishoitaja</string>
@@ -1406,7 +1449,6 @@
 	<string name="type.railway.subway_entrance.lille">Metron sisäänkäynti</string>
 	<string name="type.railway.subway_entrance.lima">Metron sisäänkäynti</string>
 	<string name="type.railway.subway_entrance.lisboa">Metron sisäänkäynti</string>
-	<string name="type.railway.subway_entrance.lisbon">Metron sisäänkäynti</string>
 	<string name="type.railway.subway_entrance.london">Metron sisäänkäynti</string>
 	<string name="type.railway.subway_entrance.lyon">Metron sisäänkäynti</string>
 	<string name="type.railway.subway_entrance.madrid">Metron sisäänkäynti</string>
@@ -1649,6 +1691,9 @@
 	<string name="type.wheelchair.limited">Osittain varustettu vammaisille</string>
 	<string name="type.wheelchair.no">Ei varustettu vammaisille</string>
 	<string name="type.wheelchair.yes">Varustettu vammaisille</string>
+	<string name="type.aerialway.platter">Sompahissi</string>
+	<string name="type.aerialway.rope_tow">Naruhissi</string>
+	<string name="type.aerialway.t.bar">Ankkurihissi</string>
 	<string name="type.piste_type.downhill">Laskettelurinne</string>
 	<string name="type.piste_type.downhill.advanced">Laskettelurinne</string>
 	<string name="type.piste_type.downhill.easy">Laskettelurinne</string>
@@ -1657,6 +1702,7 @@
 	<string name="type.piste_type.downhill.intermediate">Laskettelurinne</string>
 	<string name="type.piste_type.downhill.novice">Laskettelurinne</string>
 	<string name="type.piste_type.nordic">Latu</string>
+	<string name="type.piste_type.sled">Kelkkarata</string>
 	<string name="type.building_part">Rakennus</string>
 	<string name="type.amenity.events_venue">Tapahtumapaikka</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 116235a001..00630c91c4 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1543,7 +1543,6 @@
 	<string name="type.railway.subway_entrance.lille">Entrée du métro</string>
 	<string name="type.railway.subway_entrance.lima">Entrée du métro</string>
 	<string name="type.railway.subway_entrance.lisboa">Entrée du métro</string>
-	<string name="type.railway.subway_entrance.lisbon">Entrée du métro</string>
 	<string name="type.railway.subway_entrance.london">Entrée du métro</string>
 	<string name="type.railway.subway_entrance.lyon">Entrée du métro</string>
 	<string name="type.railway.subway_entrance.madrid">Entrée du métro</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index a0698bf099..89598f11ca 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1391,7 +1391,6 @@
 	<string name="type.railway.subway_entrance.lille">Földalatti bejárat</string>
 	<string name="type.railway.subway_entrance.lima">Földalatti bejárat</string>
 	<string name="type.railway.subway_entrance.lisboa">Földalatti bejárat</string>
-	<string name="type.railway.subway_entrance.lisbon">Földalatti bejárat</string>
 	<string name="type.railway.subway_entrance.london">Földalatti bejárat</string>
 	<string name="type.railway.subway_entrance.lyon">Földalatti bejárat</string>
 	<string name="type.railway.subway_entrance.madrid">Földalatti bejárat</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 4964cb41db..effe62e510 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -1386,7 +1386,6 @@
 	<string name="type.railway.subway_entrance.lille">Pintu masuk kereta bawah tanah</string>
 	<string name="type.railway.subway_entrance.lima">Pintu masuk kereta bawah tanah</string>
 	<string name="type.railway.subway_entrance.lisboa">Pintu masuk kereta bawah tanah</string>
-	<string name="type.railway.subway_entrance.lisbon">Pintu masuk kereta bawah tanah</string>
 	<string name="type.railway.subway_entrance.london">Pintu masuk kereta bawah tanah</string>
 	<string name="type.railway.subway_entrance.lyon">Pintu masuk kereta bawah tanah</string>
 	<string name="type.railway.subway_entrance.madrid">Pintu masuk kereta bawah tanah</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 8abe281503..b4ab441468 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -691,15 +691,25 @@
 	<string name="splash_subtitle">Dati della mappa da OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.aerialway.station">Funivia</string>
+	<string name="type.aerialway">Impianto a fune</string>
+	<string name="type.aerialway.cable_car">Teleferica</string>
+	<string name="type.aerialway.chair_lift">Seggiovia</string>
+	<string name="type.aerialway.drag_lift">Ski-lift</string>
+	<string name="type.aerialway.gondola">Cabinovia</string>
+	<string name="type.aerialway.mixed_lift">Impianto misto</string>
+	<string name="type.aerialway.station">Stazione</string>
 	<string name="type.aeroway.aerodrome">Aeroporto</string>
 	<string name="type.aeroway.aerodrome.international">Aeroporto</string>
 	<string name="type.aeroway.helipad">Piattaforma per elicotteri</string>
-	<string name="type.amenity">Opera infrastrutturale</string>
+	<string name="type.aeroway.runway">Pista</string>
+	<string name="type.aeroway.taxiway">Pista di rullaggio</string>
+	<string name="type.aeroway.terminal">Terminal</string>
+	<string name="type.amenity">Servize</string>
 	<string name="type.amenity.arts_centre">Centro artistico</string>
 	<string name="type.amenity.atm">Bancomat</string>
 	<string name="type.amenity.bank">Banca</string>
-	<string name="type.amenity.bbq">Picnic</string>
+	<string name="type.amenity.bar">Bar</string>
+	<string name="type.amenity.bbq">Grill pubblico</string>
 	<string name="type.amenity.bench">Panchina</string>
 	<string name="type.amenity.bicycle_parking">Parcheggio biciclette</string>
 	<string name="type.amenity.bicycle_rental">Noleggio biciclette</string>
@@ -713,6 +723,7 @@
 	<string name="type.amenity.casino">Casinò</string>
 	<string name="type.amenity.charging_station">Stazione di ricarica</string>
 	<string name="type.amenity.childcare">Asilo</string>
+	<string name="type.amenity.cinema">Cinema</string>
 	<string name="type.amenity.clinic">Clinica</string>
 	<string name="type.amenity.college">Collegio</string>
 	<string name="type.amenity.community_centre">Centro ricreativo</string>
@@ -727,20 +738,22 @@
 	<string name="type.amenity.fast_food">Fast food</string>
 	<string name="type.amenity.ferry_terminal">Traghetto</string>
 	<string name="type.amenity.fire_station">Scuadra antincendio</string>
+	<string name="type.amenity.food_court">Area ristorazione</string>
 	<string name="type.amenity.fountain">Fontana</string>
 	<string name="type.amenity.fuel">Stazione di rifornimento</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">Cimitero</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">Cimitero</string>
+	<string name="type.amenity.grave_yard.christian">Cimitero cristiano</string>
 	<string name="type.amenity.hospital">Ospedale</string>
 	<string name="type.amenity.hunting_stand">Torre di caccio</string>
-	<string name="type.amenity.ice_cream">Chiosco gelati</string>
+	<string name="type.amenity.ice_cream">Gelateria</string>
+	<string name="type.amenity.internet_cafe">Cybercaffè</string>
 	<string name="type.amenity.kindergarten">Scuola materna</string>
 	<string name="type.amenity.library">Biblioteca</string>
 	<string name="type.amenity.marketplace">Mercato</string>
 	<string name="type.amenity.motorcycle_parking">Parcheggio moto</string>
-	<string name="type.amenity.nightclub">Night club</string>
+	<string name="type.amenity.nightclub">Locale notturno</string>
 	<string name="type.amenity.nursing_home">Casa di riposo</string>
 	<string name="type.amenity.parking">Parcheggio</string>
 	<string name="type.amenity.parking.fee">Parcheggio a pagamento</string>
@@ -760,7 +773,7 @@
 	<string name="type.amenity.parking_space.disabled">Posto auto per disabili</string>
 	<string name="type.amenity.payment_terminal">Terminale di pagamento</string>
 	<string name="type.amenity.pharmacy">Farmacia</string>
-	<string name="type.amenity.place_of_worship">Tempio</string>
+	<string name="type.amenity.place_of_worship">Luogo di culto</string>
 	<string name="type.amenity.place_of_worship.buddhist">Tempio</string>
 	<string name="type.amenity.place_of_worship.christian">Chiesa</string>
 	<string name="type.amenity.place_of_worship.hindu">Tempio</string>
@@ -769,8 +782,9 @@
 	<string name="type.amenity.place_of_worship.shinto">Santuario</string>
 	<string name="type.amenity.place_of_worship.taoist">Tempio</string>
 	<string name="type.amenity.police">Polizia</string>
-	<string name="type.amenity.post_box">Casella</string>
+	<string name="type.amenity.post_box">Casella della posta</string>
 	<string name="type.amenity.post_office">Ufficio postale</string>
+	<string name="type.amenity.prison">Prigione</string>
 	<string name="type.amenity.public_bookcase">Libreria</string>
 
 	<!-- SECTION: Types: Recycling -->
@@ -785,16 +799,22 @@
 	<string name="type.recycling.plastic_bottles">Bottiglie di plastica</string>
 	<string name="type.recycling.scrap_metal">Rifiuti metallici</string>
 	<string name="type.recycling.small_appliances">Rifiuti di apparecchiature elettriche ed elettroniche</string>
+	<string name="type.recycling.cardboard">Cartone</string>
+	<string name="type.recycling.cans">Lattine</string>
+	<string name="type.recycling.shoes">Scarpe</string>
+	<string name="type.recycling.green_waste">Umido</string>
 	<string name="type.amenity.restaurant">Ristorante</string>
-	<string name="type.amenity.sanitary_dump_station">Camper service</string>
+	<string name="type.amenity.sanitary_dump_station">Area servizi camper</string>
 	<string name="type.amenity.school">Scuola</string>
 	<string name="type.amenity.shelter">Riparo</string>
 	<string name="type.amenity.shower">Doccia</string>
+	<string name="type.amenity.taxi">Taxi</string>
 	<string name="type.amenity.telephone">Telefono</string>
 	<string name="type.amenity.theatre">Teatro</string>
 	<string name="type.amenity.toilets">Toilette</string>
 	<string name="type.amenity.townhall">Municipio</string>
 	<string name="type.amenity.university">Università</string>
+	<string name="type.amenity.vending_machine">Macchinetta</string>
 	<string name="type.amenity.vending_machine.cigarettes">Distributore automatico di sigarette</string>
 	<string name="type.amenity.vending_machine.coffee">Distributore di caffè</string>
 	<string name="type.amenity.vending_machine.condoms">Distributore di profilattici</string>
@@ -804,27 +824,56 @@
 	<string name="type.amenity.vending_machine.parking_tickets">Parcometro</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Distributore automatico biglietti di trasporto</string>
 	<string name="type.amenity.vending_machine.sweets">Distributore di dolciumi</string>
+	<string name="type.amenity.parcel_locker">Punto di ritiro</string>
 	<string name="type.amenity.veterinary">Veterinario</string>
 	<string name="type.amenity.waste_basket">Contenitore per rifiuti</string>
 	<string name="type.amenity.waste_disposal">Spazzatura</string>
+	<string name="type.amenity.waste_transfer_station">Centro trasferimento rifiuti</string>
 	<string name="type.amenity.water_point">Distributore acqua</string>
+	<string name="type.barrier">Barriera</string>
 	<string name="type.barrier.block">Blocco</string>
 	<string name="type.barrier.bollard">Pilastro</string>
 	<string name="type.barrier.border_control">Controllo di frontiera</string>
+	<string name="type.barrier.chain">Catena</string>
+	<string name="type.barrier.city_wall">Mura Cittadine</string>
+	<string name="type.barrier.cycle_barrier">Barriera per biciclette</string>
 	<string name="type.barrier.ditch">Fossato</string>
 	<string name="type.barrier.entrance">Ingresso</string>
+	<string name="type.barrier.fence">Steccato</string>
 	<string name="type.barrier.gate">Cancello</string>
+	<string name="type.barrier.hedge">Siepe</string>
 	<string name="type.barrier.kissing_gate">Cancello</string>
 	<string name="type.barrier.lift_gate">Barriera ferroviaria</string>
 	<string name="type.barrier.stile">Scaletta per recinzioni</string>
 	<string name="type.barrier.swing_gate">Barriera ferroviaria</string>
 	<string name="type.barrier.toll_booth">Casello di pedaggio</string>
+	<string name="type.barrier.wall">Muro</string>
+	<string name="type.boundary">Confine</string>
+	<string name="type.boundary.administrative">Confine amministrativo</string>
+	<string name="type.boundary.administrative.10">Confine amministrativo</string>
+	<string name="type.boundary.administrative.11">Confine amministrativo</string>
+	<string name="type.boundary.administrative.2">Confine nazionale</string>
+	<string name="type.boundary.administrative.3">Confine amministrativo</string>
+	<string name="type.boundary.administrative.4">Confine amministrativo</string>
+	<string name="type.boundary.administrative.5">Confine amministrativo</string>
+	<string name="type.boundary.administrative.6">Confine amministrativo</string>
+	<string name="type.boundary.administrative.7">Confine amministrativo</string>
+	<string name="type.boundary.administrative.8">Confine amministrativo</string>
+	<string name="type.boundary.administrative.9">Confine amministrativo</string>
+	<string name="type.boundary.administrative.city">Confine cittadino</string>
+	<string name="type.boundary.administrative.country">Confine nazionale</string>
+	<string name="type.boundary.administrative.municipality">Confini municipale</string>
+	<string name="type.boundary.administrative.nation">Confine nazionale</string>
+	<string name="type.boundary.administrative.region">Confine regionale</string>
+	<string name="type.boundary.administrative.state">Confine statale</string>
 	<string name="type.boundary.national_park">Parco nazionale</string>
 	<string name="type.building">Edificio</string>
 	<string name="type.building.address">Edificio</string>
+	<string name="type.building.garage">Garage</string>
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Stazione ferroviaria</string>
-	<string name="type.cemetery.grave">La tomba</string>
+	<string name="type.building.warehouse">Magazzino</string>
+	<string name="type.cemetery.grave">Tomba</string>
 	<string name="type.craft">Artigianato</string>
 	<string name="type.craft.beekeeper">Apicoltore</string>
 	<string name="type.craft.blacksmith">Fabbro</string>
@@ -837,7 +886,7 @@
 	<string name="type.craft.handicraft">Artigiano</string>
 	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Impianti HVAC</string>
-	<string name="type.craft.metal_construction">Fabbro</string>
+	<string name="type.craft.metal_construction">Metalmeccanico</string>
 	<string name="type.craft.painter">Imbianchino</string>
 	<string name="type.craft.photographer">Fotografo</string>
 	<string name="type.craft.plumber">Idraulico</string>
@@ -930,6 +979,7 @@
 	<string name="type.cuisine.vegan">Cucina vegana</string>
 	<string name="type.cuisine.vegetarian">Cucina vegetariana</string>
 	<string name="type.cuisine.vietnamese">Cucina vietnamita</string>
+	<string name="type.emergency">Emergenza</string>
 	<string name="type.emergency.defibrillator">Defibrillatore</string>
 	<string name="type.emergency.fire_hydrant">Idrante</string>
 	<string name="type.emergency.phone">Telefono di emergenza</string>
@@ -937,16 +987,22 @@
 	<string name="type.healthcare.laboratory">Laboratorio Medico</string>
 
 	<!-- SECTION: Types: Roads -->
+	<string name="type.highway">Via</string>
+	<string name="type.highway.bridleway">sentiero per cavalli</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.bridleway.bridge">Ponte</string>
+	<string name="type.highway.bridleway.permissive">sentiero per cavalli</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Fermata dell\'autobus</string>
 	<string name="type.highway.construction">Strada in costruzione</string>
+	<string name="type.highway.cycleway">Pista ciclabile</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.cycleway.bridge">Ponte</string>
+	<string name="type.highway.cycleway.permissive">Pista ciclabile</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.cycleway.tunnel">Tunnel</string>
+	<string name="type.highway.elevator">Ascensore</string>
 	<string name="type.highway.footway">Sentiero</string>
 	<string name="type.highway.footway.alpine_hiking">Sentiero</string>
 	<string name="type.highway.footway.area">Sentiero</string>
@@ -971,7 +1027,7 @@
 	<string name="type.highway.motorway.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway.tunnel">Tunnel</string>
-	<string name="type.highway.motorway_link">Autostrada</string>
+	<string name="type.highway.motorway_link">Svincolo autostradale</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -990,18 +1046,18 @@
 	<string name="type.highway.path.permissive">Sentiero</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
-	<string name="type.highway.pedestrian">Via</string>
-	<string name="type.highway.pedestrian.area">Via</string>
+	<string name="type.highway.pedestrian">Strada pedonale</string>
+	<string name="type.highway.pedestrian.area">Area pedonale</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.pedestrian.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
-	<string name="type.highway.primary">Via</string>
+	<string name="type.highway.primary">Strada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary.tunnel">Tunnel</string>
-	<string name="type.highway.primary_link">Via</string>
+	<string name="type.highway.primary_link">Strada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1019,12 +1075,12 @@
 	<string name="type.highway.road.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.road.tunnel">Tunnel</string>
-	<string name="type.highway.secondary">Via</string>
+	<string name="type.highway.secondary">Strada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary.tunnel">Tunnel</string>
-	<string name="type.highway.secondary_link">Via</string>
+	<string name="type.highway.secondary_link">Strada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1038,7 +1094,7 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Autovelox</string>
-	<string name="type.highway.steps">Sentiero</string>
+	<string name="type.highway.steps">Scale</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.steps.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1067,12 +1123,12 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Semaforo</string>
-	<string name="type.highway.trunk">Via</string>
+	<string name="type.highway.trunk">Strada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk.tunnel">Tunnel</string>
-	<string name="type.highway.trunk_link">Via</string>
+	<string name="type.highway.trunk_link">Strada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1083,23 +1139,26 @@
 	<string name="type.highway.unclassified.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.unclassified.tunnel">Tunnel</string>
+	<string name="type.area_highway.cycleway">Pista ciclabile</string>
 	<string name="type.area_highway.footway">Sentiero</string>
 	<string name="type.area_highway.living_street">Via</string>
 	<string name="type.area_highway.motorway">Autostrada</string>
 	<string name="type.area_highway.path">Sentiero</string>
-	<string name="type.area_highway.pedestrian">Via</string>
-	<string name="type.area_highway.primary">Via</string>
+	<string name="type.area_highway.pedestrian">Strada pedonale</string>
+	<string name="type.area_highway.primary">Strada</string>
 	<string name="type.area_highway.residential">Via</string>
-	<string name="type.area_highway.secondary">Via</string>
+	<string name="type.area_highway.secondary">Strada</string>
 	<string name="type.area_highway.service">Via</string>
 	<string name="type.area_highway.tertiary">Via</string>
-	<string name="type.area_highway.steps">Sentiero</string>
+	<string name="type.area_highway.steps">Scale</string>
 	<string name="type.area_highway.track">Via</string>
-	<string name="type.area_highway.trunk">Via</string>
+	<string name="type.area_highway.trunk">Strada</string>
 	<string name="type.area_highway.unclassified">Via</string>
 
 	<!-- SECTION: Types: Historic -->
+	<string name="type.historic">Oggetto storico</string>
 	<string name="type.historic.archaeological_site">Sito archeologico</string>
+	<string name="type.historic.battlefield">Campo di battaglia</string>
 	<string name="type.historic.castle">Castello</string>
 	<string name="type.historic.castle.castrum">Castra</string>
 	<string name="type.historic.castle.defensive">Castello</string>
@@ -1112,30 +1171,51 @@
 	<string name="type.historic.castle.shiro">Castello giapponese</string>
 	<string name="type.historic.castle.stately">Castello</string>
 	<string name="type.historic.city_gate">Porta cittadina</string>
+	<string name="type.historic.citywalls">Mura cittadine</string>
+	<string name="type.historic.fort">Fortezza</string>
 	<string name="type.historic.memorial">Memoriale</string>
 	<string name="type.historic.memorial.plaque">Memoriale</string>
 	<string name="type.historic.memorial.sculpture">Memoriale</string>
-	<string name="type.historic.memorial.statue">Memoriale</string>
+	<string name="type.historic.memorial.statue">Statua memoriale</string>
 	<string name="type.historic.monument">Monumento</string>
 	<string name="type.historic.ruins">Rovine</string>
-	<string name="type.historic.ship">Turistico</string>
-	<string name="type.historic.tomb">Turistico</string>
+	<string name="type.historic.ship">Nave storica</string>
+	<string name="type.historic.tomb">Tomba</string>
+	<string name="type.historic.wayside_cross">Crocifisso</string>
+	<string name="type.historic.wayside_shrine">Edicola votiva</string>
+	<string name="type.junction">Incrocio</string>
+	<string name="type.junction.roundabout">Rotonda</string>
 	<string name="type.landuse.basin">Bacino d\'acqua</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">Cimitero</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">Cimitero</string>
+	<string name="type.landuse.cemetery.christian">Cimitero cristiano</string>
 	<string name="type.landuse.churchyard">Sagrato della chiesa</string>
+	<string name="type.landuse.commercial">Area commerciale</string>
+	<string name="type.landuse.construction">Cantiere</string>
 	<string name="type.landuse.education">Strutture didattiche</string>
 	<string name="type.landuse.farmland">Terreno agricolo</string>
+	<string name="type.landuse.farmyard">Fattoria</string>
 	<string name="type.landuse.forest">Foresta</string>
-	<string name="type.landuse.forest.coniferous">Foresta</string>
-	<string name="type.landuse.forest.deciduous">Foresta</string>
-	<string name="type.landuse.forest.mixed">Foresta</string>
+	<string name="type.landuse.forest.coniferous">Foresta di conifere</string>
+	<string name="type.landuse.forest.deciduous">Foresta de cidua</string>
+	<string name="type.landuse.forest.mixed">Foresta mista</string>
+	<string name="type.landuse.garages">Garage</string>
 	<string name="type.landuse.grass">Prato erboso</string>
+	<string name="type.landuse.industrial">Zona industriale</string>
 	<string name="type.landuse.landfill">Luogo di scarico</string>
+	<string name="type.landuse.meadow">Radura</string>
+	<string name="type.landuse.military">Area militare</string>
+	<string name="type.landuse.orchard">Frutteto</string>
+	<string name="type.landuse.quarry">Cava</string>
 	<string name="type.landuse.railway">Impianti ferroviari</string>
+	<string name="type.landuse.recreation_ground">Area divertimento</string>
 	<string name="type.landuse.reservoir">Bacino</string>
+	<string name="type.landuse.residential">Area residentiale</string>
+	<string name="type.landuse.retail">Area commerciale</string>
+	<string name="type.landuse.salt_pond">Salina</string>
+	<string name="type.landuse.vineyard">Vigne</string>
+	<string name="type.leisure">Tempo libero</string>
 	<string name="type.leisure.dog_park">Area sgambamento cani</string>
 	<string name="type.leisure.fitness_centre">Centro benessere</string>
 	<string name="type.leisure.fitness_station">Centro fitness</string>
@@ -1143,30 +1223,46 @@
 	<string name="type.leisure.garden">Giardino</string>
 	<string name="type.leisure.garden.residential">Giardino</string>
 	<string name="type.leisure.golf_course">Campo da golf</string>
-	<string name="type.leisure.nature_reserve">Riserva</string>
+	<string name="type.leisure.ice_rink">Pista di pattinaggio</string>
+	<string name="type.leisure.marina">Porto turistico</string>
+	<string name="type.leisure.nature_reserve">Riserva naturale</string>
 	<string name="type.leisure.park">Parco</string>
 	<string name="type.leisure.park.no.access">Parco</string>
 	<string name="type.leisure.park.permissive">Parco</string>
-	<string name="type.leisure.park.private">Parco</string>
+	<string name="type.leisure.park.private">Parco privato</string>
 	<string name="type.leisure.picnic_table">Tavolo da picnic</string>
 	<string name="type.leisure.pitch">Campo sportivo</string>
 	<string name="type.leisure.playground">Campo giochi</string>
 	<string name="type.leisure.sauna">Sauna</string>
+	<string name="type.leisure.slipway">Scivolo per navi</string>
 	<string name="type.leisure.sports_centre">Centro sportivo</string>
 	<string name="type.sport.climbing">Centro di arrampicata</string>
 	<string name="type.sport.yoga">Centro Yoga</string>
 	<string name="type.leisure.stadium">Stadio</string>
 	<string name="type.leisure.swimming_pool">Piscina</string>
-	<string name="type.leisure.swimming_pool.private">Piscina</string>
+	<string name="type.leisure.swimming_pool.private">Piscina privata</string>
+	<string name="type.leisure.track">Pista da corsa</string>
 	<string name="type.leisure.water_park">Parco acquatico</string>
+	<string name="type.man_made">Stabilimento balneare</string>
+	<string name="type.man_made.breakwater">Frangiflutti</string>
 	<string name="type.man_made.chimney">Ciminiera industriale</string>
+	<string name="type.man_made.survey_point">Punto geodetico</string>
+	<string name="type.man_made.flagpole">Alza bandiera</string>
 	<string name="type.man_made.lighthouse">Faro</string>
+	<string name="type.man_made.pier">Molo</string>
+	<string name="type.man_made.pipeline">Condotto</string>
+	<string name="type.man_made.silo">Silo</string>
+	<string name="type.man_made.storage_tank">Cisterna</string>
 	<string name="type.man_made.surveillance">Videocamera di sorveglianza</string>
 	<string name="type.man_made.tower">Torre</string>
+	<string name="type.man_made.wastewater_plant">Impianto di trattamento delle acque reflue</string>
 	<string name="type.man_made.water_tap">Rubinetto dell\'acqua</string>
 	<string name="type.man_made.water_tower">Cisterna per acqua</string>
 	<string name="type.man_made.water_well">Pozzo d\'acqua</string>
 	<string name="type.man_made.windmill">Mulino a vento</string>
+	<string name="type.man_made.works">Fabbrica</string>
+	<string name="type.military">Forze armate</string>
+	<string name="type.military.bunker">Bunker</string>
 	<string name="type.mountain_pass">Passo</string>
 	<string name="type.natural">Natura</string>
 	<string name="type.natural.bare_rock">Roccia nuda</string>
@@ -1209,6 +1305,7 @@
 	<string name="type.natural.wetland">Terreno paludoso</string>
 	<string name="type.natural.wetland.bog">Torbiera</string>
 	<string name="type.natural.wetland.marsh">Palude</string>
+	<string name="type.noexit">Strada senza uscita</string>
 	<string name="type.office">Ufficio</string>
 	<string name="type.office.company">Ufficio aziendale</string>
 	<string name="type.office.estate_agent">Agenzia immobiliare</string>
@@ -1246,129 +1343,139 @@
 	<string name="type.place.sea">Mare</string>
 	<string name="type.place.square">Piazza</string>
 	<string name="type.place.state">Provincia</string>
-	<string name="type.place.state.USA">Provincia</string>
+	<string name="type.place.state.USA">Stato</string>
 	<string name="type.place.suburb">Quartiere</string>
 	<string name="type.place.town">Città</string>
 	<string name="type.place.village">Villaggio</string>
+	<string name="type.power">Elettricità</string>
+	<string name="type.power.generator">Generatore</string>
+	<string name="type.power.line">Cavo elettrico</string>
+	<string name="type.power.minor_line">Cavo elettrico</string>
 	<string name="type.power.pole">Palo elettrico</string>
 	<string name="type.power.substation">Sottostazione elettrica</string>
-	<string name="type.power.tower">Palo elettrico</string>
+	<string name="type.power.tower">Pilone elettrico</string>
+	<string name="type.psurface">Superficie</string>
+	<string name="type.public_transport">Trasporto pubblico</string>
+	<string name="type.railway">Ferrovia</string>
+	<string name="type.railway.construction">Binari in costruzione</string>
 	<string name="type.railway.halt">Stazione ferroviaria</string>
 	<string name="type.railway.level_crossing">Passaggio a livello</string>
+	<string name="type.railway.light_rail">Metropolitana</string>
 	<string name="type.railway.monorail">Monorotaia</string>
-	<string name="type.railway.rail">Ferrovia</string>
+	<string name="type.railway.rail">Binari</string>
 	<string name="type.railway.station">Stazione ferroviaria</string>
 	<string name="type.railway.station.light_rail">Stazione ferroviaria</string>
 	<string name="type.railway.station.monorail">Stazione ferroviaria</string>
-	<string name="type.railway.station.subway">Metrò</string>
-	<string name="type.railway.station.subway.adana">Metrò</string>
-	<string name="type.railway.station.subway.algiers">Metrò</string>
-	<string name="type.railway.station.subway.almaty">Metrò</string>
-	<string name="type.railway.station.subway.amsterdam">Metrò</string>
-	<string name="type.railway.station.subway.ankara">Metrò</string>
-	<string name="type.railway.station.subway.athens">Metrò</string>
-	<string name="type.railway.station.subway.baku">Metrò</string>
-	<string name="type.railway.station.subway.bangkok">Metrò</string>
-	<string name="type.railway.station.subway.barcelona">Metrò</string>
-	<string name="type.railway.station.subway.beijing">Metrò</string>
-	<string name="type.railway.station.subway.bengalore">Metrò</string>
-	<string name="type.railway.station.subway.berlin">Metrò</string>
-	<string name="type.railway.station.subway.brasilia">Metrò</string>
-	<string name="type.railway.station.subway.brescia">Metrò</string>
-	<string name="type.railway.station.subway.brussels">Metrò</string>
-	<string name="type.railway.station.subway.bucharest">Metrò</string>
-	<string name="type.railway.station.subway.budapest">Metrò</string>
-	<string name="type.railway.station.subway.buenos_aires">Metrò</string>
-	<string name="type.railway.station.subway.bursa">Metrò</string>
-	<string name="type.railway.station.subway.cairo">Metrò</string>
-	<string name="type.railway.station.subway.caracas">Metrò</string>
-	<string name="type.railway.station.subway.catania">Metrò</string>
-	<string name="type.railway.station.subway.changchun">Metrò</string>
-	<string name="type.railway.station.subway.chengdu">Metrò</string>
-	<string name="type.railway.station.subway.chicago">Metrò</string>
-	<string name="type.railway.station.subway.chongqing">Metrò</string>
-	<string name="type.railway.station.subway.dalian">Metrò</string>
-	<string name="type.railway.station.subway.delhi">Metrò</string>
-	<string name="type.railway.station.subway.dnepro">Metrò</string>
-	<string name="type.railway.station.subway.dubai">Metrò</string>
-	<string name="type.railway.station.subway.ekb">Metrò</string>
-	<string name="type.railway.station.subway.fukuoka">Metrò</string>
-	<string name="type.railway.station.subway.glasgow">Metrò</string>
-	<string name="type.railway.station.subway.guangzhou">Metrò</string>
-	<string name="type.railway.station.subway.hamburg">Metrò</string>
-	<string name="type.railway.station.subway.helsinki">Metrò</string>
-	<string name="type.railway.station.subway.hiroshima">Metrò</string>
-	<string name="type.railway.station.subway.isfahan">Metrò</string>
-	<string name="type.railway.station.subway.istanbul">Metrò</string>
-	<string name="type.railway.station.subway.izmir">Metrò</string>
-	<string name="type.railway.station.subway.kazan">Metrò</string>
-	<string name="type.railway.station.subway.kharkiv">Metrò</string>
-	<string name="type.railway.station.subway.kiev">Metrò</string>
-	<string name="type.railway.station.subway.kobe">Metrò</string>
-	<string name="type.railway.station.subway.kolkata">Metrò</string>
-	<string name="type.railway.station.subway.kunming">Metrò</string>
-	<string name="type.railway.station.subway.kyoto">Metrò</string>
-	<string name="type.railway.station.subway.la">Metrò</string>
-	<string name="type.railway.station.subway.lausanne">Metrò</string>
-	<string name="type.railway.station.subway.lille">Metrò</string>
-	<string name="type.railway.station.subway.lima">Metrò</string>
-	<string name="type.railway.station.subway.lisboa">Metrò</string>
-	<string name="type.railway.station.subway.london">Metrò</string>
-	<string name="type.railway.station.subway.lyon">Metrò</string>
-	<string name="type.railway.station.subway.madrid">Metrò</string>
-	<string name="type.railway.station.subway.malaga">Metrò</string>
-	<string name="type.railway.station.subway.manila">Metrò</string>
-	<string name="type.railway.station.subway.maracaibo">Metrò</string>
-	<string name="type.railway.station.subway.mashhad">Metrò</string>
-	<string name="type.railway.station.subway.mecca">Metrò</string>
-	<string name="type.railway.station.subway.medellin">Metrò</string>
-	<string name="type.railway.station.subway.mexico">Metrò</string>
-	<string name="type.railway.station.subway.milan">Metrò</string>
-	<string name="type.railway.station.subway.minsk">Metrò</string>
-	<string name="type.railway.station.subway.montreal">Metrò</string>
-	<string name="type.railway.station.subway.moscow">Metrò</string>
-	<string name="type.railway.station.subway.munchen">Metrò</string>
-	<string name="type.railway.station.subway.nagoya">Metrò</string>
-	<string name="type.railway.station.subway.newyork">Metrò</string>
-	<string name="type.railway.station.subway.nnov">Metrò</string>
-	<string name="type.railway.station.subway.novosibirsk">Metrò</string>
-	<string name="type.railway.station.subway.osaka">Metrò</string>
-	<string name="type.railway.station.subway.oslo">Metrò</string>
-	<string name="type.railway.station.subway.palma">Metrò</string>
-	<string name="type.railway.station.subway.panama">Metrò</string>
-	<string name="type.railway.station.subway.paris">Metrò</string>
-	<string name="type.railway.station.subway.philadelphia">Metrò</string>
-	<string name="type.railway.station.subway.pyongyang">Metrò</string>
-	<string name="type.railway.station.subway.rennes">Metrò</string>
-	<string name="type.railway.station.subway.rio">Metrò</string>
-	<string name="type.railway.station.subway.roma">Metrò</string>
-	<string name="type.railway.station.subway.rotterdam">Metrò</string>
-	<string name="type.railway.station.subway.samara">Metrò</string>
-	<string name="type.railway.station.subway.santiago">Metrò</string>
-	<string name="type.railway.station.subway.santo_domingo">Metrò</string>
-	<string name="type.railway.station.subway.saopaulo">Metrò</string>
-	<string name="type.railway.station.subway.sapporo">Metrò</string>
-	<string name="type.railway.station.subway.sendai">Metrò</string>
-	<string name="type.railway.station.subway.sf">Metrò</string>
-	<string name="type.railway.station.subway.shanghai">Metrò</string>
-	<string name="type.railway.station.subway.shiraz">Metrò</string>
-	<string name="type.railway.station.subway.sofia">Metrò</string>
-	<string name="type.railway.station.subway.spb">Metrò</string>
-	<string name="type.railway.station.subway.stockholm">Metrò</string>
-	<string name="type.railway.station.subway.tabriz">Metrò</string>
-	<string name="type.railway.station.subway.taipei">Metrò</string>
-	<string name="type.railway.station.subway.taoyuan">Metrò</string>
-	<string name="type.railway.station.subway.tashkent">Metrò</string>
-	<string name="type.railway.station.subway.tbilisi">Metrò</string>
-	<string name="type.railway.station.subway.tianjin">Metrò</string>
-	<string name="type.railway.station.subway.tokyo">Metrò</string>
-	<string name="type.railway.station.subway.valencia">Metrò</string>
-	<string name="type.railway.station.subway.vienna">Metrò</string>
-	<string name="type.railway.station.subway.warszawa">Metrò</string>
-	<string name="type.railway.station.subway.washington">Metrò</string>
-	<string name="type.railway.station.subway.wuhan">Metrò</string>
-	<string name="type.railway.station.subway.yerevan">Metrò</string>
-	<string name="type.railway.station.subway.yokohama">Metrò</string>
+	<string name="type.railway.station.subway">Stazione della metrò</string>
+	<string name="type.railway.station.subway.adana">Stazione della metrò</string>
+	<string name="type.railway.station.subway.algiers">Stazione della metrò</string>
+	<string name="type.railway.station.subway.almaty">Stazione della metrò</string>
+	<string name="type.railway.station.subway.amsterdam">Stazione della metrò</string>
+	<string name="type.railway.station.subway.ankara">Stazione della metrò</string>
+	<string name="type.railway.station.subway.athens">Stazione della metrò</string>
+	<string name="type.railway.station.subway.baku">Stazione della metrò</string>
+	<string name="type.railway.station.subway.bangkok">Stazione della metrò</string>
+	<string name="type.railway.station.subway.barcelona">Stazione della metrò</string>
+	<string name="type.railway.station.subway.beijing">Stazione della metrò</string>
+	<string name="type.railway.station.subway.bengalore">Stazione della metrò</string>
+	<string name="type.railway.station.subway.berlin">Stazione della metrò</string>
+	<string name="type.railway.station.subway.brasilia">Stazione della metrò</string>
+	<string name="type.railway.station.subway.brescia">Stazione della metrò</string>
+	<string name="type.railway.station.subway.brussels">Stazione della metrò</string>
+	<string name="type.railway.station.subway.bucharest">Stazione della metrò</string>
+	<string name="type.railway.station.subway.budapest">Stazione della metrò</string>
+	<string name="type.railway.station.subway.buenos_aires">Stazione della metrò</string>
+	<string name="type.railway.station.subway.bursa">Stazione della metrò</string>
+	<string name="type.railway.station.subway.cairo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.caracas">Stazione della metrò</string>
+	<string name="type.railway.station.subway.catania">Stazione della metrò</string>
+	<string name="type.railway.station.subway.changchun">Stazione della metrò</string>
+	<string name="type.railway.station.subway.chengdu">Stazione della metrò</string>
+	<string name="type.railway.station.subway.chicago">Stazione della metrò</string>
+	<string name="type.railway.station.subway.chongqing">Stazione della metrò</string>
+	<string name="type.railway.station.subway.dalian">Stazione della metrò</string>
+	<string name="type.railway.station.subway.delhi">Stazione della metrò</string>
+	<string name="type.railway.station.subway.dnepro">Stazione della metrò</string>
+	<string name="type.railway.station.subway.dubai">Stazione della metrò</string>
+	<string name="type.railway.station.subway.ekb">Stazione della metrò</string>
+	<string name="type.railway.station.subway.fukuoka">Stazione della metrò</string>
+	<string name="type.railway.station.subway.glasgow">Stazione della metrò</string>
+	<string name="type.railway.station.subway.guangzhou">Stazione della metrò</string>
+	<string name="type.railway.station.subway.hamburg">Stazione della metrò</string>
+	<string name="type.railway.station.subway.helsinki">Stazione della metrò</string>
+	<string name="type.railway.station.subway.hiroshima">Stazione della metrò</string>
+	<string name="type.railway.station.subway.isfahan">Stazione della metrò</string>
+	<string name="type.railway.station.subway.istanbul">Stazione della metrò</string>
+	<string name="type.railway.station.subway.izmir">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kazan">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kharkiv">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kiev">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kobe">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kolkata">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kunming">Stazione della metrò</string>
+	<string name="type.railway.station.subway.kyoto">Stazione della metrò</string>
+	<string name="type.railway.station.subway.la">Stazione della metrò</string>
+	<string name="type.railway.station.subway.lausanne">Stazione della metrò</string>
+	<string name="type.railway.station.subway.lille">Stazione della metrò</string>
+	<string name="type.railway.station.subway.lima">Stazione della metrò</string>
+	<string name="type.railway.station.subway.lisboa">Stazione della metrò</string>
+	<string name="type.railway.station.subway.london">Stazione della metrò</string>
+	<string name="type.railway.station.subway.lyon">Stazione della metrò</string>
+	<string name="type.railway.station.subway.madrid">Stazione della metrò</string>
+	<string name="type.railway.station.subway.malaga">Stazione della metrò</string>
+	<string name="type.railway.station.subway.manila">Stazione della metrò</string>
+	<string name="type.railway.station.subway.maracaibo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.mashhad">Stazione della metrò</string>
+	<string name="type.railway.station.subway.mecca">Stazione della metrò</string>
+	<string name="type.railway.station.subway.medellin">Stazione della metrò</string>
+	<string name="type.railway.station.subway.mexico">Stazione della metrò</string>
+	<string name="type.railway.station.subway.milan">Stazione della metrò</string>
+	<string name="type.railway.station.subway.minsk">Stazione della metrò</string>
+	<string name="type.railway.station.subway.montreal">Stazione della metrò</string>
+	<string name="type.railway.station.subway.moscow">Stazione della metrò</string>
+	<string name="type.railway.station.subway.munchen">Stazione della metrò</string>
+	<string name="type.railway.station.subway.nagoya">Stazione della metrò</string>
+	<string name="type.railway.station.subway.newyork">Stazione della metrò</string>
+	<string name="type.railway.station.subway.nnov">Stazione della metrò</string>
+	<string name="type.railway.station.subway.novosibirsk">Stazione della metrò</string>
+	<string name="type.railway.station.subway.osaka">Stazione della metrò</string>
+	<string name="type.railway.station.subway.oslo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.palma">Stazione della metrò</string>
+	<string name="type.railway.station.subway.panama">Stazione della metrò</string>
+	<string name="type.railway.station.subway.paris">Stazione della metrò</string>
+	<string name="type.railway.station.subway.philadelphia">Stazione della metrò</string>
+	<string name="type.railway.station.subway.pyongyang">Stazione della metrò</string>
+	<string name="type.railway.station.subway.rennes">Stazione della metrò</string>
+	<string name="type.railway.station.subway.rio">Stazione della metrò</string>
+	<string name="type.railway.station.subway.roma">Stazione della metrò</string>
+	<string name="type.railway.station.subway.rotterdam">Stazione della metrò</string>
+	<string name="type.railway.station.subway.samara">Stazione della metrò</string>
+	<string name="type.railway.station.subway.santiago">Stazione della metrò</string>
+	<string name="type.railway.station.subway.santo_domingo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.saopaulo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.sapporo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.sendai">Stazione della metrò</string>
+	<string name="type.railway.station.subway.sf">Stazione della metrò</string>
+	<string name="type.railway.station.subway.shanghai">Stazione della metrò</string>
+	<string name="type.railway.station.subway.shiraz">Stazione della metrò</string>
+	<string name="type.railway.station.subway.sofia">Stazione della metrò</string>
+	<string name="type.railway.station.subway.spb">Stazione della metrò</string>
+	<string name="type.railway.station.subway.stockholm">Stazione della metrò</string>
+	<string name="type.railway.station.subway.tabriz">Stazione della metrò</string>
+	<string name="type.railway.station.subway.taipei">Stazione della metrò</string>
+	<string name="type.railway.station.subway.taoyuan">Stazione della metrò</string>
+	<string name="type.railway.station.subway.tashkent">Stazione della metrò</string>
+	<string name="type.railway.station.subway.tbilisi">Stazione della metrò</string>
+	<string name="type.railway.station.subway.tianjin">Stazione della metrò</string>
+	<string name="type.railway.station.subway.tokyo">Stazione della metrò</string>
+	<string name="type.railway.station.subway.valencia">Stazione della metrò</string>
+	<string name="type.railway.station.subway.vienna">Stazione della metrò</string>
+	<string name="type.railway.station.subway.warszawa">Stazione della metrò</string>
+	<string name="type.railway.station.subway.washington">Stazione della metrò</string>
+	<string name="type.railway.station.subway.wuhan">Stazione della metrò</string>
+	<string name="type.railway.station.subway.yerevan">Stazione della metrò</string>
+	<string name="type.railway.station.subway.yokohama">Stazione della metrò</string>
+	<string name="type.railway.subway">Binari della metrò</string>
 	<string name="type.railway.subway_entrance">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.adana">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.algiers">Stazione metropolitana</string>
@@ -1422,7 +1529,6 @@
 	<string name="type.railway.subway_entrance.lille">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.lima">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.lisboa">Stazione metropolitana</string>
-	<string name="type.railway.subway_entrance.lisbon">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.london">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.lyon">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.madrid">Stazione metropolitana</string>
@@ -1479,9 +1585,12 @@
 	<string name="type.railway.subway_entrance.wuhan">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.yerevan">Stazione metropolitana</string>
 	<string name="type.railway.subway_entrance.yokohama">Stazione metropolitana</string>
+	<string name="type.railway.tram">Binari del tram</string>
 	<string name="type.railway.tram_stop">Fermata del tram</string>
+	<string name="type.route">Percorso</string>
+	<string name="type.route.ferry">Traghetto</string>
 	<string name="type.shop">Negozio</string>
-	<string name="type.shop.alcohol">Enoteca</string>
+	<string name="type.shop.alcohol">Negozio di alcolici</string>
 	<string name="type.shop.bakery">Panetteria</string>
 	<string name="type.shop.beauty">Estetista</string>
 	<string name="type.shop.beverages">Bibite</string>
@@ -1494,9 +1603,9 @@
 	<string name="type.shop.car_repair">Riparazione auto</string>
 	<string name="type.shop.car_repair.tyres">Gommista</string>
 	<string name="type.shop.chemist">Negozio di detersivi</string>
-	<string name="type.shop.chocolate">Negozio</string>
+	<string name="type.shop.chocolate">Choccolateria</string>
 	<string name="type.shop.clothes">Negozio di abbigliamento</string>
-	<string name="type.shop.coffee">Negozio</string>
+	<string name="type.shop.coffee">Negozio di caffè</string>
 	<string name="type.shop.computer">Negozio di computer</string>
 	<string name="type.shop.confectionery">Pasticceria</string>
 	<string name="type.shop.convenience">Minimarket</string>
@@ -1508,7 +1617,7 @@
 	<string name="type.shop.dry_cleaning">Lavaggio a secco</string>
 	<string name="type.shop.electronics">Negozio di elettronica</string>
 	<string name="type.shop.erotic">Sexy Shop</string>
-	<string name="type.shop.fabric">Negozio</string>
+	<string name="type.shop.fabric">Merceria</string>
 	<string name="type.shop.farm">Negozio di prodotti alimentari della fattoria</string>
 	<string name="type.shop.florist">Fiorista</string>
 	<string name="type.shop.funeral_directors">Pompe funebri</string>
@@ -1518,20 +1627,20 @@
 	<string name="type.shop.greengrocer">Fruttivendolo</string>
 	<string name="type.shop.grocery">Drogheria</string>
 	<string name="type.shop.hairdresser">Parrucchiera</string>
-	<string name="type.shop.hardware">Negozio hardware</string>
+	<string name="type.shop.hardware">Ferramenta</string>
 	<string name="type.shop.health_food">Negozio di alimenti naturali</string>
 	<string name="type.shop.houseware">Negozio di casalinghi</string>
 	<string name="type.shop.jewelry">Gioielleria</string>
 	<string name="type.shop.kiosk">Chiosco</string>
 	<string name="type.shop.kitchen">Negozio di cucina</string>
 	<string name="type.shop.laundry">Lavanderia</string>
-	<string name="type.shop.mall">Il centro commerciale</string>
+	<string name="type.shop.mall">Centro commerciale</string>
 	<string name="type.shop.massage">Centro massaggi</string>
 	<string name="type.shop.mobile_phone">Negozio di telefonia mobile</string>
 	<string name="type.shop.money_lender">Negozio</string>
 	<string name="type.shop.motorcycle">Negozio di moto</string>
-	<string name="type.shop.music">Negozio</string>
-	<string name="type.shop.musical_instrument">Negozio</string>
+	<string name="type.shop.music">Negozio di Dischi</string>
+	<string name="type.shop.musical_instrument">Negozio di strumenti</string>
 	<string name="type.shop.newsagent">Edicola</string>
 	<string name="type.shop.optician">Ottico</string>
 	<string name="type.shop.outdoor">Attrezzatura sportiva</string>
@@ -1546,7 +1655,7 @@
 	<string name="type.shop.stationery">Cartoleria</string>
 	<string name="type.shop.supermarket">Supermercato</string>
 	<string name="type.shop.tattoo">Studio tatuaggi</string>
-	<string name="type.shop.tea">Negozio</string>
+	<string name="type.shop.tea">Negozio di tè</string>
 	<string name="type.shop.ticket">Biglietteria</string>
 	<string name="type.shop.toys">Negozio di giocattoli</string>
 	<string name="type.shop.travel_agency">Agenzia viaggi</string>
@@ -1554,10 +1663,10 @@
 	<string name="type.shop.variety_store">Negozio di accessori</string>
 	<string name="type.shop.video">Videoteca</string>
 	<string name="type.shop.video_games">Negozio di videogiochi</string>
-	<string name="type.shop.wine">Negozio di alcolici</string>
+	<string name="type.shop.wine">Enoteca</string>
 	<string name="type.shop.antiques">Oggetti d\'antiquariato</string>
 	<string name="type.shop.art">Negozio d\'arte</string>
-	<string name="type.shop.baby_goods">Negozio per bambini</string>
+	<string name="type.shop.baby_goods">Negozio per neonati</string>
 	<string name="type.shop.bag">Negozio di borse</string>
 	<string name="type.shop.boutique">Boutique</string>
 	<string name="type.shop.charity">Negozio di beneficenza</string>
@@ -1574,9 +1683,9 @@
 	<string name="type.shop.perfumery">Profumeria</string>
 	<string name="type.shop.sewing">Forniture per il cucito</string>
 	<string name="type.shop.storage_rental">Noleggio deposito</string>
-	<string name="type.shop.tobacco">Tabacco</string>
+	<string name="type.shop.tobacco">Tabaccheria</string>
 	<string name="type.shop.trade">Forniture commerciali</string>
-	<string name="type.shop.watches">Orologi</string>
+	<string name="type.shop.watches">Orologeria</string>
 	<string name="type.shop.wholesale">Negozio all\'ingrosso</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Football americano</string>
@@ -1613,46 +1722,62 @@
 	<string name="type.sport.field_hockey">Hockey su prato</string>
 	<string name="type.sport.badminton">Badminton</string>
 	<string name="type.sport.pelota">Palla basca</string>
-	<string name="type.tourism.alpine_hut">Hotel di montagna</string>
-	<string name="type.tourism.apartment">Residence</string>
-	<string name="type.tourism.artwork">Opere d\'arte</string>
-	<string name="type.tourism.artwork.architecture">Opere d\'arte</string>
-	<string name="type.tourism.artwork.painting">Opere d\'arte</string>
-	<string name="type.tourism.artwork.sculpture">Opere d\'arte</string>
-	<string name="type.tourism.artwork.statue">Opere d\'arte</string>
+	<string name="type.tourism">Turismo</string>
+	<string name="type.tourism.alpine_hut">Rifugio</string>
+	<string name="type.tourism.apartment">Appartamento</string>
+	<string name="type.tourism.artwork">Opera d\'arte</string>
+	<string name="type.tourism.artwork.architecture">Opera d\'arte</string>
+	<string name="type.tourism.artwork.painting">Dipinto</string>
+	<string name="type.tourism.artwork.sculpture">Scultura</string>
+	<string name="type.tourism.artwork.statue">Statua</string>
 	<string name="type.tourism.attraction">Attrattiva</string>
-	<string name="type.tourism.attraction.animal">Attrattiva</string>
+	<string name="type.tourism.attraction.animal">Recinto</string>
 	<string name="type.tourism.attraction.specified">Attrattiva</string>
 	<string name="type.tourism.camp_site">Campeggio</string>
 	<string name="type.tourism.caravan_site">Area per campeggiatori</string>
-	<string name="type.tourism.gallery">Turistico</string>
-	<string name="type.tourism.guest_house">Guest house</string>
+	<string name="type.tourism.chalet">Chalet</string>
+	<string name="type.tourism.gallery">Galleria</string>
+	<string name="type.tourism.guest_house">Casa degli Ospiti</string>
 	<string name="type.tourism.hostel">Ostello</string>
-	<string name="type.tourism.hotel">Hôtel</string>
+	<string name="type.tourism.hotel">Hotel</string>
 	<string name="type.tourism.information">Informazione</string>
 	<string name="type.tourism.information.board">Tabellone informativo</string>
 	<string name="type.tourism.information.guidepost">Guida</string>
 	<string name="type.tourism.information.map">Mappa turistica</string>
 	<string name="type.tourism.information.office">Ufficio turistico</string>
+	<string name="type.tourism.motel">Motel</string>
 	<string name="type.tourism.museum">Museo</string>
-	<string name="type.tourism.picnic_site">Picnic</string>
-	<string name="type.tourism.theme_park">Turistico</string>
-	<string name="type.tourism.viewpoint">Panorama</string>
+	<string name="type.tourism.picnic_site">Area picnic</string>
+	<string name="type.tourism.resort">Resort</string>
+	<string name="type.tourism.theme_park">Parco divertimenti</string>
+	<string name="type.tourism.viewpoint">Punto panoramico</string>
 	<string name="type.tourism.wilderness_hut">Rifugio</string>
+	<string name="type.tourism.zoo">Giardino zoologico</string>
+	<string name="type.traffic_calming">Rallentatore della velocità</string>
+	<string name="type.traffic_calming.bump">Dosso</string>
+	<string name="type.traffic_calming.hump">Dosso</string>
 	<string name="type.waterway.canal">Canale</string>
 	<string name="type.waterway.canal.tunnel">Canale</string>
+	<string name="type.waterway.dam">Diga</string>
+	<string name="type.waterway.ditch">Fosso</string>
+	<string name="type.waterway.ditch.tunnel">Fosso</string>
+	<string name="type.waterway.dock">Darsena</string>
+	<string name="type.waterway.drain">Canale di scolo</string>
+	<string name="type.waterway.drain.tunnel">Canale di scolo</string>
 	<string name="type.waterway.lock_gate">Sbarramento</string>
 	<string name="type.waterway.river">Fiume</string>
 	<string name="type.waterway.river.tunnel">Fiume</string>
 	<string name="type.waterway.riverbank">Fiume</string>
-	<string name="type.waterway.stream">Fiume</string>
-	<string name="type.waterway.stream.ephemeral">Fiume</string>
-	<string name="type.waterway.stream.intermittent">Fiume</string>
-	<string name="type.waterway.stream.tunnel">Fiume</string>
+	<string name="type.waterway.stream">Torrente</string>
+	<string name="type.waterway.stream.ephemeral">Torrente</string>
+	<string name="type.waterway.stream.intermittent">Torrente</string>
+	<string name="type.waterway.stream.tunnel">Torrente</string>
 	<string name="type.waterway.waterfall">Cascata</string>
+	<string name="type.wheelchair">Sedia a rotelle</string>
 	<string name="type.wheelchair.limited">Accessibile in parte</string>
 	<string name="type.wheelchair.no">Non accessibile ai disabili</string>
 	<string name="type.wheelchair.yes">Accessibile ai disabili</string>
+	<string name="type.piste_type.sled">Pista per slitte</string>
 	<string name="type.building_part">Edificio</string>
 	<string name="type.amenity.events_venue">Sede degli eventi</string>
 </resources>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 1f0bc4de54..c0575184f6 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1521,7 +1521,6 @@
 	<string name="type.railway.subway_entrance.lille">地下鉄入り口</string>
 	<string name="type.railway.subway_entrance.lima">地下鉄入り口</string>
 	<string name="type.railway.subway_entrance.lisboa">地下鉄入り口</string>
-	<string name="type.railway.subway_entrance.lisbon">地下鉄入り口</string>
 	<string name="type.railway.subway_entrance.london">地下鉄入り口</string>
 	<string name="type.railway.subway_entrance.lyon">地下鉄入り口</string>
 	<string name="type.railway.subway_entrance.madrid">地下鉄入り口</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 5c8c8b4b79..1462ecaff8 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1393,7 +1393,6 @@
 	<string name="type.railway.subway_entrance.lille">지하철 입구</string>
 	<string name="type.railway.subway_entrance.lima">지하철 입구</string>
 	<string name="type.railway.subway_entrance.lisboa">지하철 입구</string>
-	<string name="type.railway.subway_entrance.lisbon">지하철 입구</string>
 	<string name="type.railway.subway_entrance.london">지하철 입구</string>
 	<string name="type.railway.subway_entrance.lyon">지하철 입구</string>
 	<string name="type.railway.subway_entrance.madrid">지하철 입구</string>
diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml
index 9c3d80c4e2..d33a9b787b 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -1466,7 +1466,6 @@
 	<string name="type.railway.subway_entrance.lille">भुयारी प्रवेशद्वार</string>
 	<string name="type.railway.subway_entrance.lima">भुयारी प्रवेशद्वार</string>
 	<string name="type.railway.subway_entrance.lisboa">भुयारी प्रवेशद्वार</string>
-	<string name="type.railway.subway_entrance.lisbon">भुयारी प्रवेशद्वार</string>
 	<string name="type.railway.subway_entrance.london">भुयारी प्रवेशद्वार</string>
 	<string name="type.railway.subway_entrance.lyon">भुयारी प्रवेशद्वार</string>
 	<string name="type.railway.subway_entrance.madrid">भुयारी प्रवेशद्वार</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 661edfde8c..ad8202047d 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1387,7 +1387,6 @@
 	<string name="type.railway.subway_entrance.lille">T-bane inngang</string>
 	<string name="type.railway.subway_entrance.lima">T-bane inngang</string>
 	<string name="type.railway.subway_entrance.lisboa">T-bane inngang</string>
-	<string name="type.railway.subway_entrance.lisbon">T-bane inngang</string>
 	<string name="type.railway.subway_entrance.london">T-bane inngang</string>
 	<string name="type.railway.subway_entrance.lyon">T-bane inngang</string>
 	<string name="type.railway.subway_entrance.madrid">T-bane inngang</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index c5dc7b561e..2d9558d778 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -634,9 +634,9 @@
 	<!-- A generic "No" button in dialogs -->
 	<string name="no">Nee</string>
 	<!-- E.g. "WiFi:Yes" -->
-	<string name="yes_available">Ja</string>
+	<string name="yes_available">ja</string>
 	<!-- E.g. "WiFi:No" -->
-	<string name="no_available">Nee</string>
+	<string name="no_available">nee</string>
 	<string name="ok">Goed</string>
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sorteer…</string>
@@ -716,7 +716,7 @@
 	<string name="type.aerialway.gondola">Gondelbaan</string>
 	<string name="type.aerialway.mixed_lift">Gecombineerde kabelbaan</string>
 	<string name="type.aerialway.station">Kabelwagenstation</string>
-	<string name="type.aeroway">Luchtvaartinfrastructuurfv</string>
+	<string name="type.aeroway">Luchtvaartinfrastructuur</string>
 	<string name="type.aeroway.aerodrome">Vliegveld</string>
 	<string name="type.aeroway.aerodrome.international">Vliegveld</string>
 	<string name="type.aeroway.apron">Platform</string>
@@ -1025,20 +1025,20 @@
 	<string name="type.highway.construction">Baan in aanbouw</string>
 	<string name="type.highway.cycleway">Fietspad</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.cycleway.bridge">Brug</string>
+	<string name="type.highway.cycleway.bridge">Fietsbrug</string>
 	<string name="type.highway.cycleway.permissive">Fietspad</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.cycleway.tunnel">Tunnel</string>
+	<string name="type.highway.cycleway.tunnel">Fietstunnel</string>
 	<string name="type.highway.elevator">Lift</string>
 	<string name="type.highway.footway">Voetpad</string>
-	<string name="type.highway.footway.alpine_hiking">Pad</string>
-	<string name="type.highway.footway.area">Voetpad</string>
+	<string name="type.highway.footway.alpine_hiking">Alpine wandelpad</string>
+	<string name="type.highway.footway.area">Voetgangerszone</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.footway.bridge">Brug</string>
-	<string name="type.highway.footway.demanding_alpine_hiking">Pad</string>
-	<string name="type.highway.footway.demanding_mountain_hiking">Pad</string>
-	<string name="type.highway.footway.difficult_alpine_hiking">Pad</string>
-	<string name="type.highway.footway.hiking">Pad</string>
+	<string name="type.highway.footway.bridge">Voetgangersbrug</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Uitdagend alpine bergklimpad</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Uitdagend bergwandelpad</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Moeilijk alpine bergklimpad</string>
+	<string name="type.highway.footway.hiking">Wandelpad</string>
 	<string name="type.highway.footway.mountain_hiking">Bergpad</string>
 	<string name="type.highway.footway.permissive">Voetpad</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1055,21 +1055,21 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway.tunnel">Snelwegtunnel</string>
 	<string name="type.highway.motorway_junction">Afrit</string>
-	<string name="type.highway.motorway_link">Snelweg</string>
+	<string name="type.highway.motorway_link">Snelwegoprit</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway_link.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Pad</string>
-	<string name="type.highway.path.alpine_hiking">Pad</string>
-	<string name="type.highway.path.bicycle">Pad</string>
+	<string name="type.highway.path.alpine_hiking">Alpine wandelpad</string>
+	<string name="type.highway.path.bicycle">Fietspad</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Brug</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Pad</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Pad</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Pad</string>
-	<string name="type.highway.path.hiking">Pad</string>
-	<string name="type.highway.path.horse">Pad</string>
+	<string name="type.highway.path.hiking">Wandelpad</string>
+	<string name="type.highway.path.horse">Ruiterpad</string>
 	<string name="type.highway.path.mountain_hiking">Bergpad</string>
 	<string name="type.highway.path.permissive">Pad</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1179,7 +1179,7 @@
 	<string name="type.area_highway.secondary">Secundaire weg</string>
 	<string name="type.area_highway.service">Straat</string>
 	<string name="type.area_highway.tertiary">Tertiaire weg</string>
-	<string name="type.area_highway.steps">Trap</string>
+	<string name="type.area_highway.steps">Trappen</string>
 	<string name="type.area_highway.track">Straat</string>
 	<string name="type.area_highway.trunk">Straat</string>
 	<string name="type.area_highway.unclassified">Straat</string>
@@ -1205,14 +1205,14 @@
 	<string name="type.historic.fort">Fort</string>
 	<string name="type.historic.memorial">Gedenkteken</string>
 	<string name="type.historic.memorial.plaque">Plaquette</string>
-	<string name="type.historic.memorial.sculpture">Beeldhouwwerk</string>
+	<string name="type.historic.memorial.sculpture">Sculptuur</string>
 	<string name="type.historic.memorial.statue">Standbeeld</string>
 	<string name="type.historic.monument">Monument</string>
 	<string name="type.historic.ruins">Ruïne</string>
 	<string name="type.historic.ship">Historisch schip</string>
 	<string name="type.historic.tomb">Graftombe</string>
 	<string name="type.historic.wayside_cross">Kruis</string>
-	<string name="type.historic.wayside_shrine">Altaar</string>
+	<string name="type.historic.wayside_shrine">Kruisbeeld</string>
 	<string name="type.internet_access">Internet</string>
 	<string name="type.internet_access.wlan">Draadloos internet</string>
 	<string name="type.junction">Kruispunt</string>
@@ -1398,6 +1398,7 @@
 	<string name="type.power.minor_line">Laag-/middelspanningsleiding</string>
 	<string name="type.power.pole">Elektriciteitspaal</string>
 	<string name="type.power.station">Transformatorstation</string>
+	<string name="type.power.substation">Transformatorstation</string>
 	<string name="type.power.tower">Elektriciteitsmast</string>
 	<string name="type.psurface">Wegdek</string>
 	<string name="type.psurface.paved_bad">Verhard</string>
@@ -1433,6 +1434,7 @@
 	<string name="type.railway.preserved.tunnel">Museumspoorbaantunnel</string>
 	<string name="type.railway.rail">Spoorlijn</string>
 	<string name="type.railway.rail.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.motor_vehicle">Spoorweg</string>
 	<string name="type.railway.rail.tunnel">Spoortunnel</string>
 	<string name="type.railway.razed">Verwijderde spoorbaan</string>
 	<string name="type.railway.siding">Nevenspoor</string>
@@ -1609,7 +1611,6 @@
 	<string name="type.railway.subway_entrance.lille">Metro ingang</string>
 	<string name="type.railway.subway_entrance.lima">Metro ingang</string>
 	<string name="type.railway.subway_entrance.lisboa">Metro ingang</string>
-	<string name="type.railway.subway_entrance.lisbon">Metro ingang</string>
 	<string name="type.railway.subway_entrance.london">Metro ingang</string>
 	<string name="type.railway.subway_entrance.lyon">Metro ingang</string>
 	<string name="type.railway.subway_entrance.madrid">Metro ingang</string>
@@ -1681,6 +1682,7 @@
 	<string name="type.shop.beauty">Schoonheidssalon</string>
 	<string name="type.shop.beverages">Drank</string>
 	<string name="type.shop.bicycle">Fietsenwinkel</string>
+	<string name="type.shop.bookmaker">Boekbinder</string>
 	<string name="type.shop.books">Boekenwinkel</string>
 	<string name="type.shop.butcher">Slager</string>
 	<string name="type.shop.car">Autohandelaar</string>
@@ -1751,7 +1753,7 @@
 	<string name="type.shop.wine">Wijnhandel</string>
 	<string name="type.shop.antiques">Antiekhandel</string>
 	<string name="type.shop.art">Kunstwinkel</string>
-	<string name="type.shop.baby_goods">Kinderwinkel</string>
+	<string name="type.shop.baby_goods">Babyspullenwinkel</string>
 	<string name="type.shop.bag">Tassenwinkel</string>
 	<string name="type.shop.boutique">Boetiek</string>
 	<string name="type.shop.charity">Kringloopwinkel</string>
@@ -1813,15 +1815,17 @@
 	<string name="type.tourism.artwork">Kunstwerk</string>
 	<string name="type.tourism.artwork.architecture">Kunstwerk</string>
 	<string name="type.tourism.artwork.painting">Schilderij</string>
-	<string name="type.tourism.artwork.sculpture">Beeldhouwwerk</string>
+	<string name="type.tourism.artwork.sculpture">Kunstwerk</string>
 	<string name="type.tourism.artwork.statue">Standbeeld</string>
 	<string name="type.tourism.attraction">Attractie</string>
-	<string name="type.tourism.attraction.animal">Attractie</string>
+	<string name="type.tourism.attraction.animal">Dierenverblijf</string>
 	<string name="type.tourism.attraction.specified">Attractie</string>
 	<string name="type.tourism.camp_site">Kampeerterrein</string>
 	<string name="type.tourism.caravan_site">Caravan site</string>
+	<string name="type.tourism.chalet">Vakantiehuis</string>
 	<string name="type.tourism.gallery">Galerij</string>
 	<string name="type.tourism.guest_house">Gasthuis</string>
+	<string name="type.tourism.hostel">Herberg</string>
 	<string name="type.tourism.hotel">Hotel</string>
 	<string name="type.tourism.information">Toeristische informatie</string>
 	<string name="type.tourism.information.board">Informatiebord</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 80f1b2084d..a6592bde25 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1542,7 +1542,6 @@
 	<string name="type.railway.subway_entrance.lille">Wejście do metra</string>
 	<string name="type.railway.subway_entrance.lima">Wejście do metra</string>
 	<string name="type.railway.subway_entrance.lisboa">Wejście do metra</string>
-	<string name="type.railway.subway_entrance.lisbon">Wejście do metra</string>
 	<string name="type.railway.subway_entrance.london">Wejście do metra</string>
 	<string name="type.railway.subway_entrance.lyon">Wejście do metra</string>
 	<string name="type.railway.subway_entrance.madrid">Wejście do metra</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 6d177b1f66..d9ca8b3db6 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -788,17 +788,23 @@
 
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.amenity.recycling.centre">Centro de reciclagem</string>
-	<string name="type.amenity.recycling">Recipiente de reciclagem</string>
-	<string name="type.amenity.recycling.container">Recipiente de reciclagem</string>
+	<string name="type.amenity.recycling">Contêiner de reciclagem</string>
+	<string name="type.amenity.recycling.container">Contêiner de reciclagem</string>
 	<string name="type.recycling.batteries">Baterias</string>
 	<string name="type.recycling.clothes">Roupas velhas</string>
 	<string name="type.recycling.glass_bottles">Garrafas de vidro</string>
-	<string name="type.recycling.paper">Lixo de papel</string>
-	<string name="type.recycling.plastic">Lixo plástico</string>
+	<string name="type.recycling.paper">Papel</string>
+	<string name="type.recycling.plastic">Plástico</string>
 	<string name="type.recycling.plastic_bottles">Garrafas plásticas</string>
-	<string name="type.recycling.scrap_metal">Ferro velho</string>
-	<string name="type.recycling.small_appliances">Lixo eletrônico</string>
+	<string name="type.recycling.scrap_metal">Sucata</string>
+	<string name="type.recycling.small_appliances">Eletrônicos</string>
+	<string name="type.recycling.cardboard">Papelão</string>
+	<string name="type.recycling.cans">Latas</string>
+	<string name="type.recycling.shoes">Sapatos</string>
+	<string name="type.recycling.green_waste">Lixo verde/orgânico</string>
+	<string name="type.recycling.cartons">Caixa de bebidas</string>
 	<string name="type.amenity.restaurant">Restaurante</string>
+	<string name="type.amenity.sanitary_dump_station">Estação de despejo de esgotos</string>
 	<string name="type.amenity.school">Escola</string>
 	<string name="type.amenity.shelter">Abrigo</string>
 	<string name="type.amenity.shower">Chuveiro</string>
@@ -810,16 +816,25 @@
 	<string name="type.amenity.university">Universidade</string>
 	<string name="type.amenity.vending_machine">Máquina de venda automática</string>
 	<string name="type.amenity.vending_machine.cigarettes">Máquina de venda de cigarros</string>
+	<string name="type.amenity.vending_machine.coffee">Máquina de café</string>
+	<string name="type.amenity.vending_machine.condoms">Máquina de venda de preservativos</string>
 	<string name="type.amenity.vending_machine.drinks">Máquina de venda de bebidas</string>
-	<string name="type.amenity.vending_machine.parking_tickets">Máquina venda de tíquetes de estacionamento</string>
-	<string name="type.amenity.vending_machine.public_transport_tickets">Máquinas automáticas de venda de passagens de transporte público</string>
+	<string name="type.amenity.vending_machine.food">Máquina de venda de comidas</string>
+	<string name="type.amenity.vending_machine.newspapers">Máquina de venda de jornais</string>
+	<string name="type.amenity.vending_machine.parking_tickets">Máquina de venda de tíquetes de estacionamento</string>
+	<string name="type.amenity.vending_machine.public_transport_tickets">Máquina de venda de passagens de transporte público</string>
+	<string name="type.amenity.vending_machine.sweets">Máquina de venda de doces</string>
+	<string name="type.amenity.vending_machine.excrement_bags">Saquinhos de lixo</string>
+	<string name="type.amenity.parcel_locker">Armário de encomendas</string>
+	<string name="type.amenity.vending_machine.fuel">Bomba de combustível</string>
 	<string name="type.amenity.veterinary">Veterinário</string>
 	<string name="type.amenity.waste_basket">Cesto de lixo</string>
 	<string name="type.amenity.waste_disposal">Depósito de lixo</string>
+	<string name="type.amenity.waste_transfer_station">Estação de transferência de resíduos</string>
 	<string name="type.amenity.water_point">Ponto de água</string>
 	<string name="type.barrier">Barreira</string>
 	<string name="type.barrier.block">Bloco</string>
-	<string name="type.barrier.bollard">Pilar</string>
+	<string name="type.barrier.bollard">Pilarete</string>
 	<string name="type.barrier.border_control">Controle de fronteira</string>
 	<string name="type.barrier.city_wall">Muralha de cidade</string>
 	<string name="type.barrier.cycle_barrier">Barreira de bicicletas</string>
@@ -1473,7 +1488,6 @@
 	<string name="type.railway.subway_entrance.lille">Entrada do metrô</string>
 	<string name="type.railway.subway_entrance.lima">Entrada do metrô</string>
 	<string name="type.railway.subway_entrance.lisboa">Entrada do metrô</string>
-	<string name="type.railway.subway_entrance.lisbon">Entrada do metrô</string>
 	<string name="type.railway.subway_entrance.london">Entrada do metrô</string>
 	<string name="type.railway.subway_entrance.lyon">Entrada do metrô</string>
 	<string name="type.railway.subway_entrance.madrid">Entrada do metrô</string>
@@ -1539,9 +1553,9 @@
 	<string name="type.railway.yard.tunnel">Pátio de manobras ferroviárias</string>
 	<string name="type.route">Rota</string>
 	<string name="type.route.ferry">Rota de balsa</string>
-	<string name="type.route.shuttle_train">Rota de trem vaivem</string>
+	<string name="type.route.shuttle_train">Rota de trem vaivém</string>
 	<string name="type.shop">Loja</string>
-	<string name="type.shop.alcohol">Loja de bebidas alcoolicas</string>
+	<string name="type.shop.alcohol">Loja de bebidas alcoólicas</string>
 	<string name="type.shop.bakery">Padaria</string>
 	<string name="type.shop.beauty">Salão de beleza</string>
 	<string name="type.shop.beverages">Loja de bebidas</string>
@@ -1564,7 +1578,7 @@
 	<string name="type.shop.cosmetics">Loja de cosméticos</string>
 	<string name="type.shop.deli">Loja Delicatessen</string>
 	<string name="type.shop.department_store">Loja de departamentos</string>
-	<string name="type.shop.doityourself">Loja de ferramentas e materiais de bricolage</string>
+	<string name="type.shop.doityourself">Loja de ferramentas e materiais de bricolagem</string>
 	<string name="type.shop.dry_cleaning">Lavagem a seco</string>
 	<string name="type.shop.electronics">Loja de eletrônicos</string>
 	<string name="type.shop.erotic">Loja de artigos eróticos</string>
@@ -1595,7 +1609,7 @@
 	<string name="type.shop.newsagent">Banca de jornais</string>
 	<string name="type.shop.optician">Ótica</string>
 	<string name="type.shop.outdoor">Artigos de atividades ao ar livre</string>
-	<string name="type.shop.pastry">Pastelaria</string>
+	<string name="type.shop.pastry">Confeitaria</string>
 	<string name="type.shop.pawnbroker">Casa de penhores</string>
 	<string name="type.shop.pet">Loja de animais de estimação</string>
 	<string name="type.shop.photo">Loja de fotografia</string>
@@ -1612,7 +1626,7 @@
 	<string name="type.shop.travel_agency">Agência de viagem</string>
 	<string name="type.shop.tyres">Loja de pneus</string>
 	<string name="type.shop.variety_store">Loja 1,99</string>
-	<string name="type.shop.video">Vídeo locadora</string>
+	<string name="type.shop.video">Videolocadora</string>
 	<string name="type.shop.video_games">Loja de jogos eletrônicos</string>
 	<string name="type.shop.wine">Loja de vinhos</string>
 	<string name="type.shop.antiques">Antiguidades</string>
@@ -1622,18 +1636,18 @@
 	<string name="type.shop.boutique">Boutique</string>
 	<string name="type.shop.charity">Loja de caridade</string>
 	<string name="type.shop.cheese">Loja de queijos</string>
-	<string name="type.shop.craft">Artes e Ofícios</string>
+	<string name="type.shop.craft">Artes e ofícios</string>
 	<string name="type.shop.dairy">Lacticínios</string>
 	<string name="type.shop.electrical">Loja de materiais elétricos</string>
 	<string name="type.shop.fishing">Loja de pesca</string>
-	<string name="type.shop.interior_decoration">Decorações de Interiores</string>
+	<string name="type.shop.interior_decoration">Decoração de interiores</string>
 	<string name="type.shop.lottery">Bilhete de loteria</string>
 	<string name="type.shop.medical_supply">Suprimentos médicos</string>
 	<string name="type.shop.nutrition_supplements">Suplementos nutricionais</string>
 	<string name="type.shop.paint">Tintas</string>
 	<string name="type.shop.perfumery">Perfumaria</string>
 	<string name="type.shop.sewing">Materiais de costura</string>
-	<string name="type.shop.storage_rental">Aluguel de Armazenamento</string>
+	<string name="type.shop.storage_rental">Aluguel de armazenamento</string>
 	<string name="type.shop.tobacco">Tabaco</string>
 	<string name="type.shop.trade">Comércio de suprimentos</string>
 	<string name="type.shop.watches">Relógios</string>
@@ -1647,7 +1661,7 @@
 	<string name="type.sport.basketball">Basquetebol</string>
 	<string name="type.sport.equestrian">Esportes equestres</string>
 	<string name="type.sport.handball">Handebol</string>
-	<string name="type.sport.multi">Vários desportos</string>
+	<string name="type.sport.multi">Poliesportivo</string>
 	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Mergulho autônomo</string>
 	<string name="type.sport.swimming">Natação esportiva</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index a81f93ea9d..665f6923d0 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -807,6 +807,7 @@
 	<string name="type.amenity.vending_machine.drinks">Máquina de venda de bebidas</string>
 	<string name="type.amenity.vending_machine.parking_tickets">Máquina venda de bilhetes de estacionamento</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Máquina venda de bilhetes de transporte público</string>
+	<string name="type.amenity.parcel_locker">Cacifo</string>
 	<string name="type.amenity.veterinary">Veterinário</string>
 	<string name="type.amenity.waste_basket">Caixote do lixo</string>
 	<string name="type.amenity.waste_disposal">Contentor do lixo</string>
@@ -1557,7 +1558,6 @@
 	<string name="type.railway.subway_entrance.lille">Entrada do metro</string>
 	<string name="type.railway.subway_entrance.lima">Entrada do metro</string>
 	<string name="type.railway.subway_entrance.lisboa">Entrada do metro</string>
-	<string name="type.railway.subway_entrance.lisbon">Entrada do metro</string>
 	<string name="type.railway.subway_entrance.london">Entrada do metro</string>
 	<string name="type.railway.subway_entrance.lyon">Entrada do metro</string>
 	<string name="type.railway.subway_entrance.madrid">Entrada do metro</string>
@@ -1650,7 +1650,7 @@
 	<string name="type.shop.department_store">Grande armazém</string>
 	<string name="type.shop.doityourself">Loja de ferramentas e materiais de bricolage</string>
 	<string name="type.shop.dry_cleaning">Lavagem a seco</string>
-	<string name="type.shop.electronics">Loja de electrónica de consumo</string>
+	<string name="type.shop.electronics">Loja de eletrónica de consumo</string>
 	<string name="type.shop.erotic">Loja de artigos eróticos</string>
 	<string name="type.shop.fabric">Loja de tecidos</string>
 	<string name="type.shop.farm">Loja de comida agrícola</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index f137013c60..586418a7b5 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1412,7 +1412,6 @@
 	<string name="type.railway.subway_entrance.lille">Intrare în metro</string>
 	<string name="type.railway.subway_entrance.lima">Intrare în metro</string>
 	<string name="type.railway.subway_entrance.lisboa">Intrare în metro</string>
-	<string name="type.railway.subway_entrance.lisbon">Intrare în metro</string>
 	<string name="type.railway.subway_entrance.london">Intrare în metro</string>
 	<string name="type.railway.subway_entrance.lyon">Intrare în metro</string>
 	<string name="type.railway.subway_entrance.madrid">Intrare în metro</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 413f085d7a..3eb50cdebb 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1635,7 +1635,6 @@
 	<string name="type.railway.subway_entrance.lille">Вход в метро</string>
 	<string name="type.railway.subway_entrance.lima">Вход в метро</string>
 	<string name="type.railway.subway_entrance.lisboa">Вход в метро</string>
-	<string name="type.railway.subway_entrance.lisbon">Вход в метро</string>
 	<string name="type.railway.subway_entrance.london">Вход в метро</string>
 	<string name="type.railway.subway_entrance.lyon">Вход в метро</string>
 	<string name="type.railway.subway_entrance.madrid">Вход в метро</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 730798be64..fea2aef121 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1388,7 +1388,6 @@
 	<string name="type.railway.subway_entrance.lille">Vstup do metra</string>
 	<string name="type.railway.subway_entrance.lima">Vstup do metra</string>
 	<string name="type.railway.subway_entrance.lisboa">Vstup do metra</string>
-	<string name="type.railway.subway_entrance.lisbon">Vstup do metra</string>
 	<string name="type.railway.subway_entrance.london">Vstup do metra</string>
 	<string name="type.railway.subway_entrance.lyon">Vstup do metra</string>
 	<string name="type.railway.subway_entrance.madrid">Vstup do metra</string>
@@ -1490,7 +1489,7 @@
 	<string name="type.shop.jewelry">Klenotníctvo</string>
 	<string name="type.shop.kitchen">Kuchynský obchod</string>
 	<string name="type.shop.laundry">Práčovňa</string>
-	<string name="type.shop.mall">The Mall</string>
+	<string name="type.shop.mall">Mall</string>
 	<string name="type.shop.massage">Masážny salón</string>
 	<string name="type.shop.mobile_phone">Mobilné telefóny</string>
 	<string name="type.shop.money_lender">Obchod</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 5256195e6c..114bb9b919 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1383,7 +1383,6 @@
 	<string name="type.railway.subway_entrance.lille">Tunnelbana entré</string>
 	<string name="type.railway.subway_entrance.lima">Tunnelbana entré</string>
 	<string name="type.railway.subway_entrance.lisboa">Tunnelbana entré</string>
-	<string name="type.railway.subway_entrance.lisbon">Tunnelbana entré</string>
 	<string name="type.railway.subway_entrance.london">Tunnelbana entré</string>
 	<string name="type.railway.subway_entrance.lyon">Tunnelbana entré</string>
 	<string name="type.railway.subway_entrance.madrid">Tunnelbana entré</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 84aaa90fef..1288707882 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -523,7 +523,6 @@
 	<string name="type.railway.subway_entrance.lille">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.railway.subway_entrance.lima">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.railway.subway_entrance.lisboa">Lango la kuingilia stesheni ya reli</string>
-	<string name="type.railway.subway_entrance.lisbon">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.railway.subway_entrance.london">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.railway.subway_entrance.lyon">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.railway.subway_entrance.madrid">Lango la kuingilia stesheni ya reli</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 63aebbc928..15ea863984 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1396,7 +1396,6 @@
 	<string name="type.railway.subway_entrance.lille">ทางเข้ารถไฟใต้ดิน</string>
 	<string name="type.railway.subway_entrance.lima">ทางเข้ารถไฟใต้ดิน</string>
 	<string name="type.railway.subway_entrance.lisboa">ทางเข้ารถไฟใต้ดิน</string>
-	<string name="type.railway.subway_entrance.lisbon">ทางเข้ารถไฟใต้ดิน</string>
 	<string name="type.railway.subway_entrance.london">ทางเข้ารถไฟใต้ดิน</string>
 	<string name="type.railway.subway_entrance.lyon">ทางเข้ารถไฟใต้ดิน</string>
 	<string name="type.railway.subway_entrance.madrid">ทางเข้ารถไฟใต้ดิน</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index d6ad184b7d..e7462bd72e 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -825,7 +825,7 @@
 	<string name="type.recycling.batteries">Piller</string>
 	<string name="type.recycling.clothes">Kıyafet</string>
 	<string name="type.recycling.glass_bottles">Cam Şişeler</string>
-	<string name="type.recycling.paper">Kâğıt Atıklar</string>
+	<string name="type.recycling.paper">Kağıt Atıklar</string>
 	<string name="type.recycling.plastic">Plastik Atıklar</string>
 	<string name="type.recycling.plastic_bottles">Plastik Şişeler</string>
 	<string name="type.recycling.scrap_metal">Hurda Metaller</string>
@@ -1610,7 +1610,6 @@
 	<string name="type.railway.subway_entrance.lille">Metro Girişi</string>
 	<string name="type.railway.subway_entrance.lima">Metro Girişi</string>
 	<string name="type.railway.subway_entrance.lisboa">Metro Girişi</string>
-	<string name="type.railway.subway_entrance.lisbon">Metro Girişi</string>
 	<string name="type.railway.subway_entrance.london">Metro Girişi</string>
 	<string name="type.railway.subway_entrance.lyon">Metro Girişi</string>
 	<string name="type.railway.subway_entrance.madrid">Metro Girişi</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index c0795cce0b..4401f30757 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1595,7 +1595,6 @@
 	<string name="type.railway.subway_entrance.lille">Вхід до метро</string>
 	<string name="type.railway.subway_entrance.lima">Вхід до метро</string>
 	<string name="type.railway.subway_entrance.lisboa">Вхід до метро</string>
-	<string name="type.railway.subway_entrance.lisbon">Вхід до метро</string>
 	<string name="type.railway.subway_entrance.london">Вхід до метро</string>
 	<string name="type.railway.subway_entrance.lyon">Вхід до метро</string>
 	<string name="type.railway.subway_entrance.madrid">Вхід до метро</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index dd82fa6db8..56de6219d4 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1391,7 +1391,6 @@
 	<string name="type.railway.subway_entrance.lille">Lỗi vào Metro</string>
 	<string name="type.railway.subway_entrance.lima">Lỗi vào Metro</string>
 	<string name="type.railway.subway_entrance.lisboa">Lỗi vào Metro</string>
-	<string name="type.railway.subway_entrance.lisbon">Lỗi vào Metro</string>
 	<string name="type.railway.subway_entrance.london">Lỗi vào Metro</string>
 	<string name="type.railway.subway_entrance.lyon">Lỗi vào Metro</string>
 	<string name="type.railway.subway_entrance.madrid">Lỗi vào Metro</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 638089a9e4..9914914138 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1441,7 +1441,6 @@
 	<string name="type.railway.subway_entrance.lille">地鐵入口</string>
 	<string name="type.railway.subway_entrance.lima">地鐵入口</string>
 	<string name="type.railway.subway_entrance.lisboa">地鐵入口</string>
-	<string name="type.railway.subway_entrance.lisbon">地鐵入口</string>
 	<string name="type.railway.subway_entrance.london">地鐵入口</string>
 	<string name="type.railway.subway_entrance.lyon">地鐵入口</string>
 	<string name="type.railway.subway_entrance.madrid">地鐵入口</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 7f9a148456..b3dd03cb10 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -1525,7 +1525,6 @@
 	<string name="type.railway.subway_entrance.lille">地铁出入口</string>
 	<string name="type.railway.subway_entrance.lima">地铁出入口</string>
 	<string name="type.railway.subway_entrance.lisboa">地铁出入口</string>
-	<string name="type.railway.subway_entrance.lisbon">地铁出入口</string>
 	<string name="type.railway.subway_entrance.london">地铁出入口</string>
 	<string name="type.railway.subway_entrance.lyon">地铁出入口</string>
 	<string name="type.railway.subway_entrance.madrid">地铁出入口</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 052b12604d..9d5fa6f05e 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -742,11 +742,11 @@
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Aerialway</string>
-	<string name="type.aerialway.cable_car">Aerialway</string>
-	<string name="type.aerialway.chair_lift">Aerialway</string>
-	<string name="type.aerialway.drag_lift">Aerialway</string>
-	<string name="type.aerialway.gondola">Aerialway</string>
-	<string name="type.aerialway.mixed_lift">Aerialway</string>
+	<string name="type.aerialway.cable_car">Cable car</string>
+	<string name="type.aerialway.chair_lift">Chair lift</string>
+	<string name="type.aerialway.drag_lift">Drag lift</string>
+	<string name="type.aerialway.gondola">Gondola</string>
+	<string name="type.aerialway.mixed_lift">Mixed lift</string>
 	<string name="type.aerialway.station">Aerialway Station</string>
 	<string name="type.aeroway">Airspace Infrastructure</string>
 	<string name="type.aeroway.aerodrome">Airport</string>
@@ -859,7 +859,7 @@
 	<string name="type.recycling.cans">Cans</string>
 	<string name="type.recycling.shoes">Shoes</string>
 	<string name="type.recycling.green_waste">Green/Organic Waste</string>
-	<string name="type.recycling.cartons">Bewerage Cartons</string>
+	<string name="type.recycling.cartons">Beverage Cartons</string>
 	<string name="type.amenity.restaurant">Restaurant</string>
 	<string name="type.amenity.sanitary_dump_station">Holding Tank Dump Station</string>
 	<string name="type.amenity.school">School</string>
@@ -1354,7 +1354,7 @@
 	<string name="type.man_made.storage_tank">Storage Tank</string>
 	<string name="type.man_made.surveillance">Surveillance Camera</string>
 	<string name="type.man_made.tower">Tower</string>
-	<string name="type.man_made.wastewater_plant">Wastewater Plant</string>
+	<string name="type.man_made.wastewater_plant">Wastewater treatment plant</string>
 	<string name="type.man_made.water_tap">Water Tap</string>
 	<string name="type.man_made.water_tower">Water Tower</string>
 	<string name="type.man_made.water_well">Water Well</string>
@@ -1668,7 +1668,6 @@
 	<string name="type.railway.subway_entrance.lille">Subway Entrance</string>
 	<string name="type.railway.subway_entrance.lima">Subway Entrance</string>
 	<string name="type.railway.subway_entrance.lisboa">Subway Entrance</string>
-	<string name="type.railway.subway_entrance.lisbon">Subway Entrance</string>
 	<string name="type.railway.subway_entrance.london">Subway Entrance</string>
 	<string name="type.railway.subway_entrance.lyon">Subway Entrance</string>
 	<string name="type.railway.subway_entrance.madrid">Subway Entrance</string>
@@ -1878,7 +1877,7 @@
 	<string name="type.tourism.artwork.sculpture">Artwork</string>
 	<string name="type.tourism.artwork.statue">Artwork</string>
 	<string name="type.tourism.attraction">Attraction</string>
-	<string name="type.tourism.attraction.animal">Attraction</string>
+	<string name="type.tourism.attraction.animal">Animal enclosure</string>
 	<string name="type.tourism.attraction.specified">Attraction</string>
 	<string name="type.tourism.camp_site">Camping</string>
 	<string name="type.tourism.caravan_site">RV Park</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 4f87d17bd6..e50f021e21 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "محطة تلفريك";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "مطعم";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "برج";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "حنفية مياه";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "مدخل المترو";
 
-"type.railway.subway_entrance.lisbon" = "مدخل المترو";
-
 "type.railway.subway_entrance.london" = "مدخل المترو";
 
 "type.railway.subway_entrance.lyon" = "مدخل المترو";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 1ed84c2e6a..7d6d925bfc 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 
-"type.railway.subway_entrance.lisbon" = "Subway Entrance";
-
 "type.railway.subway_entrance.london" = "Subway Entrance";
 
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 0bef8e42e6..3de1392b03 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 
-"type.railway.subway_entrance.lisbon" = "Subway Entrance";
-
 "type.railway.subway_entrance.london" = "Subway Entrance";
 
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 24973ec945..1a8f2c91f5 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -252,11 +252,11 @@
 
 "duration_1_day" = "1 dia";
 
-"recent_track_help_text" = "This option allows you to record traveled path for a certain period and see it on the map. Please note: activation of this function causes increased battery usage. The track will be removed automatically from the map after the time interval will expire.";
+"recent_track_help_text" = "Aquesta opció et permet registrar el recorregut recorregut durant un període determinat i veure'l al mapa. Tingues en compte: l'activació d'aquesta funció provoca un augment de l'ús de la bateria. La pista s'eliminarà automàticament del mapa un cop expiri l'interval de temps.";
 
 "placepage_distance" = "Distància";
 
-"search_show_on_map" = "View on map";
+"search_show_on_map" = "Veure al mapa";
 
 /* Text in menu */
 "website" = "Lloc web";
@@ -880,7 +880,7 @@
 
 "routing_add_finish_point" = "Afegeiu la destinació per a planificar la ruta";
 
-"planning_route_manage_route" = "Manage Route";
+"planning_route_manage_route" = "Gestionar la ruta";
 
 "button_plan" = "Planifica";
 
@@ -939,7 +939,7 @@
 
 "bookmarks_restore_title" = "Voleu recuperar aquesta versió?";
 
-"error_system_message" = "An unknown error occurred";
+"error_system_message" = "S'ha produït un error desconegut";
 
 "restore" = "Restaura";
 
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 
-"type.railway.subway_entrance.lisbon" = "Subway Entrance";
-
 "type.railway.subway_entrance.london" = "Subway Entrance";
 
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 0e9155702c..d649afe9ed 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Stanice lanové dráhy";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurace";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Věž";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vodovodní kohoutek";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.lisbon" = "Vchod do podchodu";
-
 "type.railway.subway_entrance.london" = "Vchod do podchodu";
 
 "type.railway.subway_entrance.lyon" = "Vchod do podchodu";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index b7a49598b1..c389d2a365 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Kabelbanestation";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tårn";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vandhane";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.lisbon" = "Indgang til undergrundsbane";
-
 "type.railway.subway_entrance.london" = "Indgang til undergrundsbane";
 
 "type.railway.subway_entrance.lyon" = "Indgang til undergrundsbane";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index d17cdb52db..1443d43051 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "U-Bahn-Eingang";
 
-"type.railway.subway_entrance.lisbon" = "U-Bahn-Eingang";
-
 "type.railway.subway_entrance.london" = "U-Bahn-Eingang";
 
 "type.railway.subway_entrance.lyon" = "U-Bahn-Eingang";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 553fbe902f..1f5712e7ff 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Εστιατόριο";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Πύργος";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Βρύση νερού";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.lisbon" = "Είσοδος μετρό";
-
 "type.railway.subway_entrance.london" = "Είσοδος μετρό";
 
 "type.railway.subway_entrance.lyon" = "Είσοδος μετρό";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index bc3a3e5465..846fa4f83a 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 
-"type.railway.subway_entrance.lisbon" = "Subway Entrance";
-
 "type.railway.subway_entrance.london" = "Subway Entrance";
 
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index a9fac163fb..629563b3c8 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 
-"type.railway.subway_entrance.lisbon" = "Subway Entrance";
-
 "type.railway.subway_entrance.london" = "Subway Entrance";
 
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
@@ -3444,7 +3442,7 @@
 
 "type.tourism.attraction" = "Attraction";
 
-"type.tourism.attraction.animal" = "Attraction";
+"type.tourism.attraction.animal" = "Animal enclosure";
 
 "type.tourism.attraction.specified" = "Attraction";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 396a05addc..7a3fa7a9b2 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Torre";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Toma de agua";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Entrada de metro";
 
-"type.railway.subway_entrance.lisbon" = "Entrada de metro";
-
 "type.railway.subway_entrance.london" = "Entrada de metro";
 
 "type.railway.subway_entrance.lyon" = "Entrada de metro";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index a82f3f949b..4afdd931e4 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Torre";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Toma de agua";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Entrada al metro";
 
-"type.railway.subway_entrance.lisbon" = "Entrada al metro";
-
 "type.railway.subway_entrance.london" = "Entrada al metro";
 
 "type.railway.subway_entrance.lyon" = "Entrada al metro";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 185a2847bb..7db2abc906 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Dorrea";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Ura hartzea";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Metroko sarrera";
 
-"type.railway.subway_entrance.lisbon" = "Metroko sarrera";
-
 "type.railway.subway_entrance.london" = "Metroko sarrera";
 
 "type.railway.subway_entrance.lyon" = "Metroko sarrera";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 4c7b9567f8..3f97da5d16 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "غذا";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "برج";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "شیراب";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "ورودی مترو";
 
-"type.railway.subway_entrance.lisbon" = "ورودی مترو";
-
 "type.railway.subway_entrance.london" = "ورودی مترو";
 
 "type.railway.subway_entrance.lyon" = "ورودی مترو";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index d60ae1104d..97000b5772 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1223,17 +1223,17 @@
 
 /********** Types **********/
 
-"type.aerialway" = "Aerialway";
+"type.aerialway" = "Köysirata";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Kabiinihissi";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Tuolihissi";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Kapulahissi";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondolihissi";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Köysirata";
 
 "type.aerialway.station" = "Köysirata-asema";
 
@@ -1245,15 +1245,15 @@
 
 "type.aeroway.apron" = "Apron";
 
-"type.aeroway.gate" = "Gate";
+"type.aeroway.gate" = "Portti";
 
 "type.aeroway.helipad" = "Helikopterialusta";
 
-"type.aeroway.runway" = "Runway";
+"type.aeroway.runway" = "Kiitorata";
 
 "type.aeroway.taxiway" = "Taxiway";
 
-"type.aeroway.terminal" = "Terminal";
+"type.aeroway.terminal" = "Terminaali";
 
 "type.amenity" = "Infrastruktuurikohteet";
 
@@ -1301,7 +1301,7 @@
 
 "type.amenity.clinic" = "Klinikka";
 
-"type.amenity.college" = "College";
+"type.amenity.college" = "Korkeakoulu";
 
 "type.amenity.community_centre" = "Monitoimitalo";
 
@@ -1371,15 +1371,15 @@
 
 "type.amenity.parking.private" = "Yksityinen pysäköinti";
 
-"type.amenity.parking.park_and_ride" = "Parkkipaikka";
+"type.amenity.parking.park_and_ride" = "Liityntäpysäköinti";
 
 "type.amenity.parking.underground" = "Maanalainen pysäköinti";
 
-"type.amenity.parking_entrance.private" = "Pysäköinti sisäänkäynti";
+"type.amenity.parking_entrance.private" = "Pysäköinnin sisäänkäynti";
 
-"type.amenity.parking_entrance.permissive" = "Pysäköinti sisäänkäynti";
+"type.amenity.parking_entrance.permissive" = "Pysäköinnin sisäänkäynti";
 
-"type.amenity.parking_entrance" = "Pysäköinti sisäänkäynti";
+"type.amenity.parking_entrance" = "Pysäköinnin sisäänkäynti";
 
 "type.amenity.parking_space" = "Parkkipaikka";
 
@@ -1417,7 +1417,7 @@
 
 "type.amenity.post_office" = "Postitoimisto";
 
-"type.amenity.prison" = "Prison";
+"type.amenity.prison" = "Vankila";
 
 "type.amenity.pub" = "Pubi";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Ravintola";
 
@@ -1480,31 +1480,31 @@
 
 "type.amenity.university" = "Yliopisto";
 
-"type.amenity.vending_machine" = "Vending Machine";
+"type.amenity.vending_machine" = "Myyntiautomaatti";
 
 "type.amenity.vending_machine.cigarettes" = "Savukeautomaatti";
 
-"type.amenity.vending_machine.coffee" = "Coffee Dispenser";
+"type.amenity.vending_machine.coffee" = "Kahviautomaatti";
 
-"type.amenity.vending_machine.condoms" = "Condoms Dispenser";
+"type.amenity.vending_machine.condoms" = "Kondomiautomaatti";
 
 "type.amenity.vending_machine.drinks" = "Juoma-automaatti";
 
-"type.amenity.vending_machine.food" = "Food Dispenser";
+"type.amenity.vending_machine.food" = "Ruoka-automaatti";
 
-"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
+"type.amenity.vending_machine.newspapers" = "Sanomalehtiautomaatti";
 
 "type.amenity.vending_machine.parking_tickets" = "Pysäköintimaksuautomaatti";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Julkisen liikenteen lippuautomaatti";
 
-"type.amenity.vending_machine.sweets" = "Sweets Dispenser";
+"type.amenity.vending_machine.sweets" = "Karkkiautomaatti";
 
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
+"type.amenity.vending_machine.fuel" = "Bensa-automaatti";
 
 "type.amenity.veterinary" = "Eläinlääkäri";
 
@@ -1524,73 +1524,73 @@
 
 "type.barrier.border_control" = "Rajavalvonta";
 
-"type.barrier.chain" = "Chain";
+"type.barrier.chain" = "Ketju";
 
-"type.barrier.city_wall" = "City Wall";
+"type.barrier.city_wall" = "Kaupunginmuuri";
 
-"type.barrier.cycle_barrier" = "Cycle Barrier";
+"type.barrier.cycle_barrier" = "Polkupyöräeste";
 
 "type.barrier.ditch" = "Vallihauta";
 
 "type.barrier.entrance" = "Sisäänkäynti";
 
-"type.barrier.fence" = "Fence";
+"type.barrier.fence" = "Aita";
 
 "type.barrier.gate" = "Portti";
 
-"type.barrier.hedge" = "Hedge";
+"type.barrier.hedge" = "Pensasaita";
 
 "type.barrier.kissing_gate" = "Portti";
 
-"type.barrier.lift_gate" = "Puomi";
+"type.barrier.lift_gate" = "Nostopuomi";
 
 "type.barrier.retaining_wall" = "Retaining Wall";
 
 "type.barrier.stile" = "Portaat";
 
-"type.barrier.swing_gate" = "Puomi";
+"type.barrier.swing_gate" = "Kääntöpuomi";
 
 "type.barrier.toll_booth" = "Tietulliasema";
 
-"type.barrier.wall" = "Wall";
+"type.barrier.wall" = "Muuri";
 
-"type.boundary" = "Boundary";
+"type.boundary" = "Raja";
 
-"type.boundary.administrative" = "Administrative Boundary";
+"type.boundary.administrative" = "Hallinnollinen raja";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
+"type.boundary.administrative.10" = "Hallinnollinen raja";
 
-"type.boundary.administrative.11" = "Administrative Boundary";
+"type.boundary.administrative.11" = "Hallinnollinen raja";
 
-"type.boundary.administrative.2" = "National Border";
+"type.boundary.administrative.2" = "Valtakunnanraja";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+"type.boundary.administrative.3" = "Hallinnollinen raja";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
+"type.boundary.administrative.4" = "Hallinnollinen raja";
 
-"type.boundary.administrative.5" = "Administrative Boundary";
+"type.boundary.administrative.5" = "Hallinnollinen raja";
 
-"type.boundary.administrative.6" = "Administrative Boundary";
+"type.boundary.administrative.6" = "Hallinnollinen raja";
 
-"type.boundary.administrative.7" = "Administrative Boundary";
+"type.boundary.administrative.7" = "Hallinnollinen raja";
 
-"type.boundary.administrative.8" = "Administrative Boundary";
+"type.boundary.administrative.8" = "Hallinnollinen raja";
 
-"type.boundary.administrative.9" = "Administrative Boundary";
+"type.boundary.administrative.9" = "Hallinnollinen raja";
 
-"type.boundary.administrative.city" = "City Boundary";
+"type.boundary.administrative.city" = "Kaupunginraja";
 
-"type.boundary.administrative.country" = "National Border";
+"type.boundary.administrative.country" = "Valtakunnanraja";
 
-"type.boundary.administrative.county" = "County Boundary";
+"type.boundary.administrative.county" = "Maakunnanraja";
 
-"type.boundary.administrative.municipality" = "Municipality Boundary";
+"type.boundary.administrative.municipality" = "Kunnanraja";
 
-"type.boundary.administrative.nation" = "National Border";
+"type.boundary.administrative.nation" = "Valtakunnanraja";
 
 "type.boundary.administrative.region" = "Regional Boundary";
 
-"type.boundary.administrative.state" = "State Boundary";
+"type.boundary.administrative.state" = "Osavaltion raja";
 
 "type.boundary.administrative.suburb" = "Suburb Boundary";
 
@@ -1606,7 +1606,7 @@
 
 "type.building.train_station" = "Rautatieasema";
 
-"type.building.warehouse" = "Warehouse";
+"type.building.warehouse" = "Varasto";
 
 "type.cemetery.grave" = "Hauta";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Torni";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vesihana";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.lisbon" = "Metron sisäänkäynti";
-
 "type.railway.subway_entrance.london" = "Metron sisäänkäynti";
 
 "type.railway.subway_entrance.lyon" = "Metron sisäänkäynti";
@@ -3544,11 +3542,11 @@
 
 "type.aerialway.magic_carpet" = "Magic Carpet";
 
-"type.aerialway.platter" = "Platter Lift";
+"type.aerialway.platter" = "Sompahissi";
 
-"type.aerialway.rope_tow" = "Rope Tow";
+"type.aerialway.rope_tow" = "Naruhissi";
 
-"type.aerialway.t.bar" = "T-bar Lift";
+"type.aerialway.t.bar" = "Ankkurihissi";
 
 "type.piste_type" = "Piste Type";
 
@@ -3568,7 +3566,7 @@
 
 "type.piste_type.nordic" = "Latu";
 
-"type.piste_type.sled" = "Sledding Piste";
+"type.piste_type.sled" = "Kelkkarata";
 
 "type.building_part" = "Rakennus";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 2338e99f98..ce37619d03 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1233,7 +1233,7 @@
 
 "type.aerialway.gondola" = "Télécabine";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Remontées mécaniques";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Entrée du métro";
 
-"type.railway.subway_entrance.lisbon" = "Entrée du métro";
-
 "type.railway.subway_entrance.london" = "Entrée du métro";
 
 "type.railway.subway_entrance.lyon" = "Entrée du métro";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index e9bb488bdc..9da4014671 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 
-"type.railway.subway_entrance.lisbon" = "Subway Entrance";
-
 "type.railway.subway_entrance.london" = "Subway Entrance";
 
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 04ce201929..b7d07fabb7 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Felvonóállomás";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Étterem";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Torony";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vízcsap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.lisbon" = "Földalatti bejárat";
-
 "type.railway.subway_entrance.london" = "Földalatti bejárat";
 
 "type.railway.subway_entrance.lyon" = "Földalatti bejárat";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 2e97555e99..4284639137 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Stasiun kereta gantung";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restoran";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Menara";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Keran Air";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.lisbon" = "Pintu masuk kereta bawah tanah";
-
 "type.railway.subway_entrance.london" = "Pintu masuk kereta bawah tanah";
 
 "type.railway.subway_entrance.lyon" = "Pintu masuk kereta bawah tanah";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 8f7f2c0d7f..13da1108e4 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1223,19 +1223,19 @@
 
 /********** Types **********/
 
-"type.aerialway" = "Aerialway";
+"type.aerialway" = "Impianto a fune";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Teleferica";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Seggiovia";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Ski-lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Cabinovia";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Impianto misto";
 
-"type.aerialway.station" = "Funivia";
+"type.aerialway.station" = "Stazione";
 
 "type.aeroway" = "Airspace Infrastructure";
 
@@ -1249,13 +1249,13 @@
 
 "type.aeroway.helipad" = "Piattaforma per elicotteri";
 
-"type.aeroway.runway" = "Runway";
+"type.aeroway.runway" = "Pista";
 
-"type.aeroway.taxiway" = "Taxiway";
+"type.aeroway.taxiway" = "Pista di rullaggio";
 
 "type.aeroway.terminal" = "Terminal";
 
-"type.amenity" = "Opera infrastrutturale";
+"type.amenity" = "Servize";
 
 "type.amenity.arts_centre" = "Centro artistico";
 
@@ -1265,7 +1265,7 @@
 
 "type.amenity.bar" = "Bar";
 
-"type.amenity.bbq" = "Picnic";
+"type.amenity.bbq" = "Grill pubblico";
 
 "type.amenity.bench" = "Panchina";
 
@@ -1327,7 +1327,7 @@
 
 "type.amenity.fire_station" = "Scuadra antincendio";
 
-"type.amenity.food_court" = "Food Court";
+"type.amenity.food_court" = "Area ristorazione";
 
 "type.amenity.fountain" = "Fontana";
 
@@ -1337,15 +1337,15 @@
 "type.amenity.grave_yard" = "Cimitero";
 
 /* 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" = "Cimitero";
+"type.amenity.grave_yard.christian" = "Cimitero cristiano";
 
 "type.amenity.hospital" = "Ospedale";
 
 "type.amenity.hunting_stand" = "Torre di caccio";
 
-"type.amenity.ice_cream" = "Chiosco gelati";
+"type.amenity.ice_cream" = "Gelateria";
 
-"type.amenity.internet_cafe" = "Internet Cafe";
+"type.amenity.internet_cafe" = "Cybercaffè";
 
 "type.amenity.kindergarten" = "Scuola materna";
 
@@ -1355,7 +1355,7 @@
 
 "type.amenity.motorcycle_parking" = "Parcheggio moto";
 
-"type.amenity.nightclub" = "Night club";
+"type.amenity.nightclub" = "Locale notturno";
 
 "type.amenity.nursing_home" = "Casa di riposo";
 
@@ -1395,7 +1395,7 @@
 
 "type.amenity.pharmacy" = "Farmacia";
 
-"type.amenity.place_of_worship" = "Tempio";
+"type.amenity.place_of_worship" = "Luogo di culto";
 
 "type.amenity.place_of_worship.buddhist" = "Tempio";
 
@@ -1413,11 +1413,11 @@
 
 "type.amenity.police" = "Polizia";
 
-"type.amenity.post_box" = "Casella";
+"type.amenity.post_box" = "Casella della posta";
 
 "type.amenity.post_office" = "Ufficio postale";
 
-"type.amenity.prison" = "Prison";
+"type.amenity.prison" = "Prigione";
 
 "type.amenity.pub" = "Pub";
 
@@ -1448,19 +1448,19 @@
 
 "type.recycling.small_appliances" = "Rifiuti di apparecchiature elettriche ed elettroniche";
 
-"type.recycling.cardboard" = "Cardboard";
+"type.recycling.cardboard" = "Cartone";
 
-"type.recycling.cans" = "Cans";
+"type.recycling.cans" = "Lattine";
 
-"type.recycling.shoes" = "Shoes";
+"type.recycling.shoes" = "Scarpe";
 
-"type.recycling.green_waste" = "Green/Organic Waste";
+"type.recycling.green_waste" = "Umido";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Ristorante";
 
-"type.amenity.sanitary_dump_station" = "Camper service";
+"type.amenity.sanitary_dump_station" = "Area servizi camper";
 
 "type.amenity.school" = "Scuola";
 
@@ -1480,7 +1480,7 @@
 
 "type.amenity.university" = "Università";
 
-"type.amenity.vending_machine" = "Vending Machine";
+"type.amenity.vending_machine" = "Macchinetta";
 
 "type.amenity.vending_machine.cigarettes" = "Distributore automatico di sigarette";
 
@@ -1502,7 +1502,7 @@
 
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
 
-"type.amenity.parcel_locker" = "Parcel Locker";
+"type.amenity.parcel_locker" = "Punto di ritiro";
 
 "type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
@@ -1512,11 +1512,11 @@
 
 "type.amenity.waste_disposal" = "Spazzatura";
 
-"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+"type.amenity.waste_transfer_station" = "Centro trasferimento rifiuti";
 
 "type.amenity.water_point" = "Distributore acqua";
 
-"type.barrier" = "Barrier";
+"type.barrier" = "Barriera";
 
 "type.barrier.block" = "Blocco";
 
@@ -1524,21 +1524,21 @@
 
 "type.barrier.border_control" = "Controllo di frontiera";
 
-"type.barrier.chain" = "Chain";
+"type.barrier.chain" = "Catena";
 
-"type.barrier.city_wall" = "City Wall";
+"type.barrier.city_wall" = "Mura Cittadine";
 
-"type.barrier.cycle_barrier" = "Cycle Barrier";
+"type.barrier.cycle_barrier" = "Barriera per biciclette";
 
 "type.barrier.ditch" = "Fossato";
 
 "type.barrier.entrance" = "Ingresso";
 
-"type.barrier.fence" = "Fence";
+"type.barrier.fence" = "Steccato";
 
 "type.barrier.gate" = "Cancello";
 
-"type.barrier.hedge" = "Hedge";
+"type.barrier.hedge" = "Siepe";
 
 "type.barrier.kissing_gate" = "Cancello";
 
@@ -1552,45 +1552,45 @@
 
 "type.barrier.toll_booth" = "Casello di pedaggio";
 
-"type.barrier.wall" = "Wall";
+"type.barrier.wall" = "Muro";
 
-"type.boundary" = "Boundary";
+"type.boundary" = "Confine";
 
-"type.boundary.administrative" = "Administrative Boundary";
+"type.boundary.administrative" = "Confine amministrativo";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
+"type.boundary.administrative.10" = "Confine amministrativo";
 
-"type.boundary.administrative.11" = "Administrative Boundary";
+"type.boundary.administrative.11" = "Confine amministrativo";
 
-"type.boundary.administrative.2" = "National Border";
+"type.boundary.administrative.2" = "Confine nazionale";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+"type.boundary.administrative.3" = "Confine amministrativo";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
+"type.boundary.administrative.4" = "Confine amministrativo";
 
-"type.boundary.administrative.5" = "Administrative Boundary";
+"type.boundary.administrative.5" = "Confine amministrativo";
 
-"type.boundary.administrative.6" = "Administrative Boundary";
+"type.boundary.administrative.6" = "Confine amministrativo";
 
-"type.boundary.administrative.7" = "Administrative Boundary";
+"type.boundary.administrative.7" = "Confine amministrativo";
 
-"type.boundary.administrative.8" = "Administrative Boundary";
+"type.boundary.administrative.8" = "Confine amministrativo";
 
-"type.boundary.administrative.9" = "Administrative Boundary";
+"type.boundary.administrative.9" = "Confine amministrativo";
 
-"type.boundary.administrative.city" = "City Boundary";
+"type.boundary.administrative.city" = "Confine cittadino";
 
-"type.boundary.administrative.country" = "National Border";
+"type.boundary.administrative.country" = "Confine nazionale";
 
 "type.boundary.administrative.county" = "County Boundary";
 
-"type.boundary.administrative.municipality" = "Municipality Boundary";
+"type.boundary.administrative.municipality" = "Confini municipale";
 
-"type.boundary.administrative.nation" = "National Border";
+"type.boundary.administrative.nation" = "Confine nazionale";
 
-"type.boundary.administrative.region" = "Regional Boundary";
+"type.boundary.administrative.region" = "Confine regionale";
 
-"type.boundary.administrative.state" = "State Boundary";
+"type.boundary.administrative.state" = "Confine statale";
 
 "type.boundary.administrative.suburb" = "Suburb Boundary";
 
@@ -1606,9 +1606,9 @@
 
 "type.building.train_station" = "Stazione ferroviaria";
 
-"type.building.warehouse" = "Warehouse";
+"type.building.warehouse" = "Magazzino";
 
-"type.cemetery.grave" = "La tomba";
+"type.cemetery.grave" = "Tomba";
 
 "type.craft" = "Artigianato";
 
@@ -1633,7 +1633,7 @@
 /* Heating, Ventilation, and Air Conditioning */
 "type.craft.hvac" = "Impianti HVAC";
 
-"type.craft.metal_construction" = "Fabbro";
+"type.craft.metal_construction" = "Metalmeccanico";
 
 "type.craft.painter" = "Imbianchino";
 
@@ -1821,7 +1821,7 @@
 
 "type.cuisine.vietnamese" = "Cucina vietnamita";
 
-"type.emergency" = "Emergency";
+"type.emergency" = "Emergenza";
 
 "type.emergency.defibrillator" = "Defibrillatore";
 
@@ -1836,14 +1836,14 @@
 
 /********** Types: Roads **********/
 
-"type.highway" = "Highway";
+"type.highway" = "Via";
 
-"type.highway.bridleway" = "Bridle Path";
+"type.highway.bridleway" = "sentiero per cavalli";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Ponte";
 
-"type.highway.bridleway.permissive" = "Bridle Path";
+"type.highway.bridleway.permissive" = "sentiero per cavalli";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
@@ -1852,17 +1852,17 @@
 
 "type.highway.construction" = "Strada in costruzione";
 
-"type.highway.cycleway" = "Cycle Path";
+"type.highway.cycleway" = "Pista ciclabile";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.cycleway.bridge" = "Ponte";
 
-"type.highway.cycleway.permissive" = "Cycle Path";
+"type.highway.cycleway.permissive" = "Pista ciclabile";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "Tunnel";
 
-"type.highway.elevator" = "Elevator";
+"type.highway.elevator" = "Ascensore";
 
 "type.highway.footway" = "Sentiero";
 
@@ -1908,7 +1908,7 @@
 
 "type.highway.motorway_junction" = "Road Exit";
 
-"type.highway.motorway_link" = "Autostrada";
+"type.highway.motorway_link" = "Svincolo autostradale";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Ponte";
@@ -1942,9 +1942,9 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
-"type.highway.pedestrian" = "Via";
+"type.highway.pedestrian" = "Strada pedonale";
 
-"type.highway.pedestrian.area" = "Via";
+"type.highway.pedestrian.area" = "Area pedonale";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.pedestrian.bridge" = "Ponte";
@@ -1952,7 +1952,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Tunnel";
 
-"type.highway.primary" = "Via";
+"type.highway.primary" = "Strada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary.bridge" = "Ponte";
@@ -1960,7 +1960,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Tunnel";
 
-"type.highway.primary_link" = "Via";
+"type.highway.primary_link" = "Strada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary_link.bridge" = "Ponte";
@@ -1990,7 +1990,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Tunnel";
 
-"type.highway.secondary" = "Via";
+"type.highway.secondary" = "Strada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Ponte";
@@ -1998,7 +1998,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Tunnel";
 
-"type.highway.secondary_link" = "Via";
+"type.highway.secondary_link" = "Strada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary_link.bridge" = "Ponte";
@@ -2024,7 +2024,7 @@
 
 "type.highway.speed_camera" = "Autovelox";
 
-"type.highway.steps" = "Sentiero";
+"type.highway.steps" = "Scale";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.steps.bridge" = "Ponte";
@@ -2074,7 +2074,7 @@
 
 "type.highway.traffic_signals" = "Semaforo";
 
-"type.highway.trunk" = "Via";
+"type.highway.trunk" = "Strada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk.bridge" = "Ponte";
@@ -2082,7 +2082,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk.tunnel" = "Tunnel";
 
-"type.highway.trunk_link" = "Via";
+"type.highway.trunk_link" = "Strada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk_link.bridge" = "Ponte";
@@ -2100,7 +2100,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Tunnel";
 
-"type.area_highway.cycleway" = "Cycle Path";
+"type.area_highway.cycleway" = "Pista ciclabile";
 
 "type.area_highway.footway" = "Sentiero";
 
@@ -2110,23 +2110,23 @@
 
 "type.area_highway.path" = "Sentiero";
 
-"type.area_highway.pedestrian" = "Via";
+"type.area_highway.pedestrian" = "Strada pedonale";
 
-"type.area_highway.primary" = "Via";
+"type.area_highway.primary" = "Strada";
 
 "type.area_highway.residential" = "Via";
 
-"type.area_highway.secondary" = "Via";
+"type.area_highway.secondary" = "Strada";
 
 "type.area_highway.service" = "Via";
 
 "type.area_highway.tertiary" = "Via";
 
-"type.area_highway.steps" = "Sentiero";
+"type.area_highway.steps" = "Scale";
 
 "type.area_highway.track" = "Via";
 
-"type.area_highway.trunk" = "Via";
+"type.area_highway.trunk" = "Strada";
 
 "type.area_highway.unclassified" = "Via";
 
@@ -2137,11 +2137,11 @@
 
 /********** Types: Historic **********/
 
-"type.historic" = "Historic";
+"type.historic" = "Oggetto storico";
 
 "type.historic.archaeological_site" = "Sito archeologico";
 
-"type.historic.battlefield" = "Battlefield";
+"type.historic.battlefield" = "Campo di battaglia";
 
 "type.historic.boundary_stone" = "Boundary Stone";
 
@@ -2169,9 +2169,9 @@
 
 "type.historic.city_gate" = "Porta cittadina";
 
-"type.historic.citywalls" = "City Wall";
+"type.historic.citywalls" = "Mura cittadine";
 
-"type.historic.fort" = "Fort";
+"type.historic.fort" = "Fortezza";
 
 "type.historic.memorial" = "Memoriale";
 
@@ -2179,19 +2179,19 @@
 
 "type.historic.memorial.sculpture" = "Memoriale";
 
-"type.historic.memorial.statue" = "Memoriale";
+"type.historic.memorial.statue" = "Statua memoriale";
 
 "type.historic.monument" = "Monumento";
 
 "type.historic.ruins" = "Rovine";
 
-"type.historic.ship" = "Turistico";
+"type.historic.ship" = "Nave storica";
 
-"type.historic.tomb" = "Turistico";
+"type.historic.tomb" = "Tomba";
 
-"type.historic.wayside_cross" = "Christian Cross";
+"type.historic.wayside_cross" = "Crocifisso";
 
-"type.historic.wayside_shrine" = "Shrine";
+"type.historic.wayside_shrine" = "Edicola votiva";
 
 "type.hwtag" = "hwtag";
 
@@ -2223,9 +2223,9 @@
 
 "type.internet_access.wlan" = "Internet";
 
-"type.junction" = "Junction";
+"type.junction" = "Incrocio";
 
-"type.junction.roundabout" = "Roundabout";
+"type.junction.roundabout" = "Rotonda";
 
 "type.landuse" = "Landuse";
 
@@ -2239,13 +2239,13 @@
 "type.landuse.cemetery" = "Cimitero";
 
 /* 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" = "Cimitero";
+"type.landuse.cemetery.christian" = "Cimitero cristiano";
 
 "type.landuse.churchyard" = "Sagrato della chiesa";
 
-"type.landuse.commercial" = "Commercial Area";
+"type.landuse.commercial" = "Area commerciale";
 
-"type.landuse.construction" = "Construction";
+"type.landuse.construction" = "Cantiere";
 
 "type.landuse.education" = "Strutture didattiche";
 
@@ -2253,19 +2253,19 @@
 
 "type.landuse.farmland" = "Terreno agricolo";
 
-"type.landuse.farmyard" = "Farmyard";
+"type.landuse.farmyard" = "Fattoria";
 
 "type.landuse.field" = "Field";
 
 "type.landuse.forest" = "Foresta";
 
-"type.landuse.forest.coniferous" = "Foresta";
+"type.landuse.forest.coniferous" = "Foresta di conifere";
 
-"type.landuse.forest.deciduous" = "Foresta";
+"type.landuse.forest.deciduous" = "Foresta de cidua";
 
-"type.landuse.forest.mixed" = "Foresta";
+"type.landuse.forest.mixed" = "Foresta mista";
 
-"type.landuse.garages" = "Garages";
+"type.landuse.garages" = "Garage";
 
 "type.landuse.grass" = "Prato erboso";
 
@@ -2273,35 +2273,35 @@
 
 "type.landuse.greenhouse_horticulture" = "Greenhouse";
 
-"type.landuse.industrial" = "Industrial Land";
+"type.landuse.industrial" = "Zona industriale";
 
 "type.landuse.landfill" = "Luogo di scarico";
 
-"type.landuse.meadow" = "Meadow";
+"type.landuse.meadow" = "Radura";
 
-"type.landuse.military" = "Military Area";
+"type.landuse.military" = "Area militare";
 
-"type.landuse.orchard" = "Orchard";
+"type.landuse.orchard" = "Frutteto";
 
-"type.landuse.quarry" = "Quarry";
+"type.landuse.quarry" = "Cava";
 
 "type.landuse.railway" = "Impianti ferroviari";
 
-"type.landuse.recreation_ground" = "Recreation Ground";
+"type.landuse.recreation_ground" = "Area divertimento";
 
 "type.landuse.reservoir" = "Bacino";
 
-"type.landuse.residential" = "Residential Land";
+"type.landuse.residential" = "Area residentiale";
 
-"type.landuse.retail" = "Retail Land";
+"type.landuse.retail" = "Area commerciale";
 
-"type.landuse.salt_pond" = "Pond";
+"type.landuse.salt_pond" = "Salina";
 
 "type.landuse.village_green" = "Land";
 
-"type.landuse.vineyard" = "Vineyard";
+"type.landuse.vineyard" = "Vigne";
 
-"type.leisure" = "Leisure";
+"type.leisure" = "Tempo libero";
 
 "type.leisure.common" = "Public Land";
 
@@ -2319,13 +2319,13 @@
 
 "type.leisure.golf_course" = "Campo da golf";
 
-"type.leisure.ice_rink" = "Ice Rink";
+"type.leisure.ice_rink" = "Pista di pattinaggio";
 
 "type.leisure.landscape_reserve" = "Landscape Reserve";
 
-"type.leisure.marina" = "Marina";
+"type.leisure.marina" = "Porto turistico";
 
-"type.leisure.nature_reserve" = "Riserva";
+"type.leisure.nature_reserve" = "Riserva naturale";
 
 "type.leisure.park" = "Parco";
 
@@ -2333,7 +2333,7 @@
 
 "type.leisure.park.permissive" = "Parco";
 
-"type.leisure.park.private" = "Parco";
+"type.leisure.park.private" = "Parco privato";
 
 "type.leisure.picnic_table" = "Tavolo da picnic";
 
@@ -2345,7 +2345,7 @@
 
 "type.leisure.sauna" = "Sauna";
 
-"type.leisure.slipway" = "Slipway";
+"type.leisure.slipway" = "Scivolo per navi";
 
 "type.leisure.sports_centre" = "Centro sportivo";
 
@@ -2357,17 +2357,17 @@
 
 "type.leisure.swimming_pool" = "Piscina";
 
-"type.leisure.swimming_pool.private" = "Piscina";
+"type.leisure.swimming_pool.private" = "Piscina privata";
 
-"type.leisure.track" = "Track";
+"type.leisure.track" = "Pista da corsa";
 
 "type.leisure.water_park" = "Parco acquatico";
 
 "type.leisure.beach_resort" = "Beach Resort";
 
-"type.man_made" = "Man Made";
+"type.man_made" = "Stabilimento balneare";
 
-"type.man_made.breakwater" = "Breakwater";
+"type.man_made.breakwater" = "Frangiflutti";
 
 "type.man_made.cairn" = "Cairn";
 
@@ -2375,29 +2375,29 @@
 
 "type.man_made.cutline" = "Cutline";
 
-"type.man_made.survey_point" = "Survey Point";
+"type.man_made.survey_point" = "Punto geodetico";
 
-"type.man_made.flagpole" = "Flagpole";
+"type.man_made.flagpole" = "Alza bandiera";
 
 "type.man_made.lighthouse" = "Faro";
 
 "type.man_made.mast" = "Mast";
 
-"type.man_made.pier" = "Pier";
+"type.man_made.pier" = "Molo";
 
-"type.man_made.pipeline" = "Pipeline";
+"type.man_made.pipeline" = "Condotto";
 
 "type.man_made.pipeline.overground" = "Overground Pipeline";
 
 "type.man_made.silo" = "Silo";
 
-"type.man_made.storage_tank" = "Storage Tank";
+"type.man_made.storage_tank" = "Cisterna";
 
 "type.man_made.surveillance" = "Videocamera di sorveglianza";
 
 "type.man_made.tower" = "Torre";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Impianto di trattamento delle acque reflue";
 
 "type.man_made.water_tap" = "Rubinetto dell'acqua";
 
@@ -2407,13 +2407,13 @@
 
 "type.man_made.windmill" = "Mulino a vento";
 
-"type.man_made.works" = "Industrial Works";
+"type.man_made.works" = "Fabbrica";
 
 "type.mapswithme" = "mapswithme";
 
 "type.mapswithme.grid" = "mapswithme-grid";
 
-"type.military" = "Military";
+"type.military" = "Forze armate";
 
 "type.military.bunker" = "Bunker";
 
@@ -2501,7 +2501,7 @@
 
 "type.natural.wetland.marsh" = "Palude";
 
-"type.noexit" = "Dead End";
+"type.noexit" = "Strada senza uscita";
 
 "type.office" = "Ufficio";
 
@@ -2577,7 +2577,7 @@
 
 "type.place.state" = "Provincia";
 
-"type.place.state.USA" = "Provincia";
+"type.place.state.USA" = "Stato";
 
 "type.place.suburb" = "Quartiere";
 
@@ -2585,15 +2585,15 @@
 
 "type.place.village" = "Villaggio";
 
-"type.power" = "Power";
+"type.power" = "Elettricità";
 
-"type.power.generator" = "Generator";
+"type.power.generator" = "Generatore";
 
-"type.power.line" = "Power Line";
+"type.power.line" = "Cavo elettrico";
 
 "type.power.line.underground" = "Underground Power Line";
 
-"type.power.minor_line" = "Minor Power Line";
+"type.power.minor_line" = "Cavo elettrico";
 
 "type.power.pole" = "Palo elettrico";
 
@@ -2601,9 +2601,9 @@
 
 "type.power.substation" = "Sottostazione elettrica";
 
-"type.power.tower" = "Palo elettrico";
+"type.power.tower" = "Pilone elettrico";
 
-"type.psurface" = "psurface";
+"type.psurface" = "Superficie";
 
 "type.psurface.paved_bad" = "psurface-paved_bad";
 
@@ -2613,11 +2613,11 @@
 
 "type.psurface.unpaved_good" = "psurface-unpaved_good";
 
-"type.public_transport" = "Public Transport";
+"type.public_transport" = "Trasporto pubblico";
 
 "type.public_transport.platform" = "Platform";
 
-"type.railway" = "Railway";
+"type.railway" = "Ferrovia";
 
 "type.railway.abandoned" = "Abandoned railway";
 
@@ -2625,7 +2625,7 @@
 
 "type.railway.abandoned.tunnel" = "Abandoned Railway";
 
-"type.railway.construction" = "Railway's Construction";
+"type.railway.construction" = "Binari in costruzione";
 
 "type.railway.crossing" = "Railway Crossing";
 
@@ -2641,7 +2641,7 @@
 
 "type.railway.level_crossing" = "Passaggio a livello";
 
-"type.railway.light_rail" = "Light Rail";
+"type.railway.light_rail" = "Metropolitana";
 
 "type.railway.light_rail.bridge" = "Light Rail";
 
@@ -2667,7 +2667,7 @@
 
 "type.railway.preserved.tunnel" = "Preserved Rail";
 
-"type.railway.rail" = "Ferrovia";
+"type.railway.rail" = "Binari";
 
 "type.railway.rail.bridge" = "Railway";
 
@@ -2695,225 +2695,225 @@
 
 "type.railway.station.monorail" = "Stazione ferroviaria";
 
-"type.railway.station.subway" = "Metrò";
+"type.railway.station.subway" = "Stazione della metrò";
 
-"type.railway.station.subway.adana" = "Metrò";
+"type.railway.station.subway.adana" = "Stazione della metrò";
 
-"type.railway.station.subway.algiers" = "Metrò";
+"type.railway.station.subway.algiers" = "Stazione della metrò";
 
-"type.railway.station.subway.almaty" = "Metrò";
+"type.railway.station.subway.almaty" = "Stazione della metrò";
 
-"type.railway.station.subway.amsterdam" = "Metrò";
+"type.railway.station.subway.amsterdam" = "Stazione della metrò";
 
-"type.railway.station.subway.ankara" = "Metrò";
+"type.railway.station.subway.ankara" = "Stazione della metrò";
 
-"type.railway.station.subway.athens" = "Metrò";
+"type.railway.station.subway.athens" = "Stazione della metrò";
 
-"type.railway.station.subway.baku" = "Metrò";
+"type.railway.station.subway.baku" = "Stazione della metrò";
 
-"type.railway.station.subway.bangkok" = "Metrò";
+"type.railway.station.subway.bangkok" = "Stazione della metrò";
 
-"type.railway.station.subway.barcelona" = "Metrò";
+"type.railway.station.subway.barcelona" = "Stazione della metrò";
 
-"type.railway.station.subway.beijing" = "Metrò";
+"type.railway.station.subway.beijing" = "Stazione della metrò";
 
-"type.railway.station.subway.bengalore" = "Metrò";
+"type.railway.station.subway.bengalore" = "Stazione della metrò";
 
-"type.railway.station.subway.berlin" = "Metrò";
+"type.railway.station.subway.berlin" = "Stazione della metrò";
 
-"type.railway.station.subway.brasilia" = "Metrò";
+"type.railway.station.subway.brasilia" = "Stazione della metrò";
 
-"type.railway.station.subway.brescia" = "Metrò";
+"type.railway.station.subway.brescia" = "Stazione della metrò";
 
-"type.railway.station.subway.brussels" = "Metrò";
+"type.railway.station.subway.brussels" = "Stazione della metrò";
 
-"type.railway.station.subway.bucharest" = "Metrò";
+"type.railway.station.subway.bucharest" = "Stazione della metrò";
 
-"type.railway.station.subway.budapest" = "Metrò";
+"type.railway.station.subway.budapest" = "Stazione della metrò";
 
-"type.railway.station.subway.buenos_aires" = "Metrò";
+"type.railway.station.subway.buenos_aires" = "Stazione della metrò";
 
-"type.railway.station.subway.bursa" = "Metrò";
+"type.railway.station.subway.bursa" = "Stazione della metrò";
 
-"type.railway.station.subway.cairo" = "Metrò";
+"type.railway.station.subway.cairo" = "Stazione della metrò";
 
-"type.railway.station.subway.caracas" = "Metrò";
+"type.railway.station.subway.caracas" = "Stazione della metrò";
 
-"type.railway.station.subway.catania" = "Metrò";
+"type.railway.station.subway.catania" = "Stazione della metrò";
 
-"type.railway.station.subway.changchun" = "Metrò";
+"type.railway.station.subway.changchun" = "Stazione della metrò";
 
-"type.railway.station.subway.chengdu" = "Metrò";
+"type.railway.station.subway.chengdu" = "Stazione della metrò";
 
-"type.railway.station.subway.chicago" = "Metrò";
+"type.railway.station.subway.chicago" = "Stazione della metrò";
 
-"type.railway.station.subway.chongqing" = "Metrò";
+"type.railway.station.subway.chongqing" = "Stazione della metrò";
 
-"type.railway.station.subway.dalian" = "Metrò";
+"type.railway.station.subway.dalian" = "Stazione della metrò";
 
-"type.railway.station.subway.delhi" = "Metrò";
+"type.railway.station.subway.delhi" = "Stazione della metrò";
 
-"type.railway.station.subway.dnepro" = "Metrò";
+"type.railway.station.subway.dnepro" = "Stazione della metrò";
 
-"type.railway.station.subway.dubai" = "Metrò";
+"type.railway.station.subway.dubai" = "Stazione della metrò";
 
-"type.railway.station.subway.ekb" = "Metrò";
+"type.railway.station.subway.ekb" = "Stazione della metrò";
 
-"type.railway.station.subway.fukuoka" = "Metrò";
+"type.railway.station.subway.fukuoka" = "Stazione della metrò";
 
-"type.railway.station.subway.glasgow" = "Metrò";
+"type.railway.station.subway.glasgow" = "Stazione della metrò";
 
-"type.railway.station.subway.guangzhou" = "Metrò";
+"type.railway.station.subway.guangzhou" = "Stazione della metrò";
 
-"type.railway.station.subway.hamburg" = "Metrò";
+"type.railway.station.subway.hamburg" = "Stazione della metrò";
 
-"type.railway.station.subway.helsinki" = "Metrò";
+"type.railway.station.subway.helsinki" = "Stazione della metrò";
 
-"type.railway.station.subway.hiroshima" = "Metrò";
+"type.railway.station.subway.hiroshima" = "Stazione della metrò";
 
-"type.railway.station.subway.isfahan" = "Metrò";
+"type.railway.station.subway.isfahan" = "Stazione della metrò";
 
-"type.railway.station.subway.istanbul" = "Metrò";
+"type.railway.station.subway.istanbul" = "Stazione della metrò";
 
-"type.railway.station.subway.izmir" = "Metrò";
+"type.railway.station.subway.izmir" = "Stazione della metrò";
 
-"type.railway.station.subway.kazan" = "Metrò";
+"type.railway.station.subway.kazan" = "Stazione della metrò";
 
-"type.railway.station.subway.kharkiv" = "Metrò";
+"type.railway.station.subway.kharkiv" = "Stazione della metrò";
 
-"type.railway.station.subway.kiev" = "Metrò";
+"type.railway.station.subway.kiev" = "Stazione della metrò";
 
-"type.railway.station.subway.kobe" = "Metrò";
+"type.railway.station.subway.kobe" = "Stazione della metrò";
 
-"type.railway.station.subway.kolkata" = "Metrò";
+"type.railway.station.subway.kolkata" = "Stazione della metrò";
 
-"type.railway.station.subway.kunming" = "Metrò";
+"type.railway.station.subway.kunming" = "Stazione della metrò";
 
-"type.railway.station.subway.kyoto" = "Metrò";
+"type.railway.station.subway.kyoto" = "Stazione della metrò";
 
-"type.railway.station.subway.la" = "Metrò";
+"type.railway.station.subway.la" = "Stazione della metrò";
 
-"type.railway.station.subway.lausanne" = "Metrò";
+"type.railway.station.subway.lausanne" = "Stazione della metrò";
 
-"type.railway.station.subway.lille" = "Metrò";
+"type.railway.station.subway.lille" = "Stazione della metrò";
 
-"type.railway.station.subway.lima" = "Metrò";
+"type.railway.station.subway.lima" = "Stazione della metrò";
 
-"type.railway.station.subway.lisboa" = "Metrò";
+"type.railway.station.subway.lisboa" = "Stazione della metrò";
 
-"type.railway.station.subway.london" = "Metrò";
+"type.railway.station.subway.london" = "Stazione della metrò";
 
-"type.railway.station.subway.lyon" = "Metrò";
+"type.railway.station.subway.lyon" = "Stazione della metrò";
 
-"type.railway.station.subway.madrid" = "Metrò";
+"type.railway.station.subway.madrid" = "Stazione della metrò";
 
-"type.railway.station.subway.malaga" = "Metrò";
+"type.railway.station.subway.malaga" = "Stazione della metrò";
 
-"type.railway.station.subway.manila" = "Metrò";
+"type.railway.station.subway.manila" = "Stazione della metrò";
 
-"type.railway.station.subway.maracaibo" = "Metrò";
+"type.railway.station.subway.maracaibo" = "Stazione della metrò";
 
-"type.railway.station.subway.mashhad" = "Metrò";
+"type.railway.station.subway.mashhad" = "Stazione della metrò";
 
-"type.railway.station.subway.mecca" = "Metrò";
+"type.railway.station.subway.mecca" = "Stazione della metrò";
 
-"type.railway.station.subway.medellin" = "Metrò";
+"type.railway.station.subway.medellin" = "Stazione della metrò";
 
-"type.railway.station.subway.mexico" = "Metrò";
+"type.railway.station.subway.mexico" = "Stazione della metrò";
 
-"type.railway.station.subway.milan" = "Metrò";
+"type.railway.station.subway.milan" = "Stazione della metrò";
 
-"type.railway.station.subway.minsk" = "Metrò";
+"type.railway.station.subway.minsk" = "Stazione della metrò";
 
-"type.railway.station.subway.montreal" = "Metrò";
+"type.railway.station.subway.montreal" = "Stazione della metrò";
 
-"type.railway.station.subway.moscow" = "Metrò";
+"type.railway.station.subway.moscow" = "Stazione della metrò";
 
-"type.railway.station.subway.munchen" = "Metrò";
+"type.railway.station.subway.munchen" = "Stazione della metrò";
 
-"type.railway.station.subway.nagoya" = "Metrò";
+"type.railway.station.subway.nagoya" = "Stazione della metrò";
 
-"type.railway.station.subway.newyork" = "Metrò";
+"type.railway.station.subway.newyork" = "Stazione della metrò";
 
-"type.railway.station.subway.nnov" = "Metrò";
+"type.railway.station.subway.nnov" = "Stazione della metrò";
 
-"type.railway.station.subway.novosibirsk" = "Metrò";
+"type.railway.station.subway.novosibirsk" = "Stazione della metrò";
 
-"type.railway.station.subway.osaka" = "Metrò";
+"type.railway.station.subway.osaka" = "Stazione della metrò";
 
-"type.railway.station.subway.oslo" = "Metrò";
+"type.railway.station.subway.oslo" = "Stazione della metrò";
 
-"type.railway.station.subway.palma" = "Metrò";
+"type.railway.station.subway.palma" = "Stazione della metrò";
 
-"type.railway.station.subway.panama" = "Metrò";
+"type.railway.station.subway.panama" = "Stazione della metrò";
 
-"type.railway.station.subway.paris" = "Metrò";
+"type.railway.station.subway.paris" = "Stazione della metrò";
 
-"type.railway.station.subway.philadelphia" = "Metrò";
+"type.railway.station.subway.philadelphia" = "Stazione della metrò";
 
-"type.railway.station.subway.pyongyang" = "Metrò";
+"type.railway.station.subway.pyongyang" = "Stazione della metrò";
 
-"type.railway.station.subway.rennes" = "Metrò";
+"type.railway.station.subway.rennes" = "Stazione della metrò";
 
-"type.railway.station.subway.rio" = "Metrò";
+"type.railway.station.subway.rio" = "Stazione della metrò";
 
-"type.railway.station.subway.roma" = "Metrò";
+"type.railway.station.subway.roma" = "Stazione della metrò";
 
-"type.railway.station.subway.rotterdam" = "Metrò";
+"type.railway.station.subway.rotterdam" = "Stazione della metrò";
 
-"type.railway.station.subway.samara" = "Metrò";
+"type.railway.station.subway.samara" = "Stazione della metrò";
 
-"type.railway.station.subway.santiago" = "Metrò";
+"type.railway.station.subway.santiago" = "Stazione della metrò";
 
-"type.railway.station.subway.santo_domingo" = "Metrò";
+"type.railway.station.subway.santo_domingo" = "Stazione della metrò";
 
-"type.railway.station.subway.saopaulo" = "Metrò";
+"type.railway.station.subway.saopaulo" = "Stazione della metrò";
 
-"type.railway.station.subway.sapporo" = "Metrò";
+"type.railway.station.subway.sapporo" = "Stazione della metrò";
 
-"type.railway.station.subway.sendai" = "Metrò";
+"type.railway.station.subway.sendai" = "Stazione della metrò";
 
-"type.railway.station.subway.sf" = "Metrò";
+"type.railway.station.subway.sf" = "Stazione della metrò";
 
-"type.railway.station.subway.shanghai" = "Metrò";
+"type.railway.station.subway.shanghai" = "Stazione della metrò";
 
-"type.railway.station.subway.shiraz" = "Metrò";
+"type.railway.station.subway.shiraz" = "Stazione della metrò";
 
-"type.railway.station.subway.sofia" = "Metrò";
+"type.railway.station.subway.sofia" = "Stazione della metrò";
 
-"type.railway.station.subway.spb" = "Metrò";
+"type.railway.station.subway.spb" = "Stazione della metrò";
 
-"type.railway.station.subway.stockholm" = "Metrò";
+"type.railway.station.subway.stockholm" = "Stazione della metrò";
 
-"type.railway.station.subway.tabriz" = "Metrò";
+"type.railway.station.subway.tabriz" = "Stazione della metrò";
 
-"type.railway.station.subway.taipei" = "Metrò";
+"type.railway.station.subway.taipei" = "Stazione della metrò";
 
-"type.railway.station.subway.taoyuan" = "Metrò";
+"type.railway.station.subway.taoyuan" = "Stazione della metrò";
 
-"type.railway.station.subway.tashkent" = "Metrò";
+"type.railway.station.subway.tashkent" = "Stazione della metrò";
 
-"type.railway.station.subway.tbilisi" = "Metrò";
+"type.railway.station.subway.tbilisi" = "Stazione della metrò";
 
-"type.railway.station.subway.tianjin" = "Metrò";
+"type.railway.station.subway.tianjin" = "Stazione della metrò";
 
-"type.railway.station.subway.tokyo" = "Metrò";
+"type.railway.station.subway.tokyo" = "Stazione della metrò";
 
-"type.railway.station.subway.valencia" = "Metrò";
+"type.railway.station.subway.valencia" = "Stazione della metrò";
 
-"type.railway.station.subway.vienna" = "Metrò";
+"type.railway.station.subway.vienna" = "Stazione della metrò";
 
-"type.railway.station.subway.warszawa" = "Metrò";
+"type.railway.station.subway.warszawa" = "Stazione della metrò";
 
-"type.railway.station.subway.washington" = "Metrò";
+"type.railway.station.subway.washington" = "Stazione della metrò";
 
-"type.railway.station.subway.wuhan" = "Metrò";
+"type.railway.station.subway.wuhan" = "Stazione della metrò";
 
-"type.railway.station.subway.yerevan" = "Metrò";
+"type.railway.station.subway.yerevan" = "Stazione della metrò";
 
-"type.railway.station.subway.yokohama" = "Metrò";
+"type.railway.station.subway.yokohama" = "Stazione della metrò";
 
-"type.railway.subway" = "Subway Line";
+"type.railway.subway" = "Binari della metrò";
 
 "type.railway.subway.bridge" = "Subway Line";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.lisbon" = "Stazione metropolitana";
-
 "type.railway.subway_entrance.london" = "Stazione metropolitana";
 
 "type.railway.subway_entrance.lyon" = "Stazione metropolitana";
@@ -3139,7 +3137,7 @@
 
 "type.railway.subway_entrance.yokohama" = "Stazione metropolitana";
 
-"type.railway.tram" = "Tram Line";
+"type.railway.tram" = "Binari del tram";
 
 "type.railway.tram.bridge" = "Tram Line";
 
@@ -3153,15 +3151,15 @@
 
 "type.railway.yard.tunnel" = "Railway Yard";
 
-"type.route" = "route";
+"type.route" = "Percorso";
 
-"type.route.ferry" = "Ferry";
+"type.route.ferry" = "Traghetto";
 
 "type.route.shuttle_train" = "Shuttle Train";
 
 "type.shop" = "Negozio";
 
-"type.shop.alcohol" = "Enoteca";
+"type.shop.alcohol" = "Negozio di alcolici";
 
 "type.shop.bakery" = "Panetteria";
 
@@ -3189,11 +3187,11 @@
 
 "type.shop.chemist" = "Negozio di detersivi";
 
-"type.shop.chocolate" = "Negozio";
+"type.shop.chocolate" = "Choccolateria";
 
 "type.shop.clothes" = "Negozio di abbigliamento";
 
-"type.shop.coffee" = "Negozio";
+"type.shop.coffee" = "Negozio di caffè";
 
 "type.shop.computer" = "Negozio di computer";
 
@@ -3217,7 +3215,7 @@
 
 "type.shop.erotic" = "Sexy Shop";
 
-"type.shop.fabric" = "Negozio";
+"type.shop.fabric" = "Merceria";
 
 "type.shop.farm" = "Negozio di prodotti alimentari della fattoria";
 
@@ -3237,7 +3235,7 @@
 
 "type.shop.hairdresser" = "Parrucchiera";
 
-"type.shop.hardware" = "Negozio hardware";
+"type.shop.hardware" = "Ferramenta";
 
 "type.shop.health_food" = "Negozio di alimenti naturali";
 
@@ -3251,7 +3249,7 @@
 
 "type.shop.laundry" = "Lavanderia";
 
-"type.shop.mall" = "Il centro commerciale";
+"type.shop.mall" = "Centro commerciale";
 
 "type.shop.massage" = "Centro massaggi";
 
@@ -3261,9 +3259,9 @@
 
 "type.shop.motorcycle" = "Negozio di moto";
 
-"type.shop.music" = "Negozio";
+"type.shop.music" = "Negozio di Dischi";
 
-"type.shop.musical_instrument" = "Negozio";
+"type.shop.musical_instrument" = "Negozio di strumenti";
 
 "type.shop.newsagent" = "Edicola";
 
@@ -3293,7 +3291,7 @@
 
 "type.shop.tattoo" = "Studio tatuaggi";
 
-"type.shop.tea" = "Negozio";
+"type.shop.tea" = "Negozio di tè";
 
 "type.shop.ticket" = "Biglietteria";
 
@@ -3309,13 +3307,13 @@
 
 "type.shop.video_games" = "Negozio di videogiochi";
 
-"type.shop.wine" = "Negozio di alcolici";
+"type.shop.wine" = "Enoteca";
 
 "type.shop.antiques" = "Oggetti d'antiquariato";
 
 "type.shop.art" = "Negozio d'arte";
 
-"type.shop.baby_goods" = "Negozio per bambini";
+"type.shop.baby_goods" = "Negozio per neonati";
 
 "type.shop.bag" = "Negozio di borse";
 
@@ -3349,11 +3347,11 @@
 
 "type.shop.storage_rental" = "Noleggio deposito";
 
-"type.shop.tobacco" = "Tabacco";
+"type.shop.tobacco" = "Tabaccheria";
 
 "type.shop.trade" = "Forniture commerciali";
 
-"type.shop.watches" = "Orologi";
+"type.shop.watches" = "Orologeria";
 
 "type.shop.wholesale" = "Negozio all'ingrosso";
 
@@ -3426,25 +3424,25 @@
 
 "type.sport.pelota" = "Palla basca";
 
-"type.tourism" = "Tourism";
+"type.tourism" = "Turismo";
 
-"type.tourism.alpine_hut" = "Hotel di montagna";
+"type.tourism.alpine_hut" = "Rifugio";
 
-"type.tourism.apartment" = "Residence";
+"type.tourism.apartment" = "Appartamento";
 
-"type.tourism.artwork" = "Opere d'arte";
+"type.tourism.artwork" = "Opera d'arte";
 
-"type.tourism.artwork.architecture" = "Opere d'arte";
+"type.tourism.artwork.architecture" = "Opera d'arte";
 
-"type.tourism.artwork.painting" = "Opere d'arte";
+"type.tourism.artwork.painting" = "Dipinto";
 
-"type.tourism.artwork.sculpture" = "Opere d'arte";
+"type.tourism.artwork.sculpture" = "Scultura";
 
-"type.tourism.artwork.statue" = "Opere d'arte";
+"type.tourism.artwork.statue" = "Statua";
 
 "type.tourism.attraction" = "Attrattiva";
 
-"type.tourism.attraction.animal" = "Attrattiva";
+"type.tourism.attraction.animal" = "Recinto";
 
 "type.tourism.attraction.specified" = "Attrattiva";
 
@@ -3454,13 +3452,13 @@
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Turistico";
+"type.tourism.gallery" = "Galleria";
 
-"type.tourism.guest_house" = "Guest house";
+"type.tourism.guest_house" = "Casa degli Ospiti";
 
 "type.tourism.hostel" = "Ostello";
 
-"type.tourism.hotel" = "Hôtel";
+"type.tourism.hotel" = "Hotel";
 
 "type.tourism.information" = "Informazione";
 
@@ -3476,23 +3474,23 @@
 
 "type.tourism.museum" = "Museo";
 
-"type.tourism.picnic_site" = "Picnic";
+"type.tourism.picnic_site" = "Area picnic";
 
 "type.tourism.resort" = "Resort";
 
-"type.tourism.theme_park" = "Turistico";
+"type.tourism.theme_park" = "Parco divertimenti";
 
-"type.tourism.viewpoint" = "Panorama";
+"type.tourism.viewpoint" = "Punto panoramico";
 
 "type.tourism.wilderness_hut" = "Rifugio";
 
-"type.tourism.zoo" = "Zoo";
+"type.tourism.zoo" = "Giardino zoologico";
 
-"type.traffic_calming" = "Traffic Calming";
+"type.traffic_calming" = "Rallentatore della velocità";
 
-"type.traffic_calming.bump" = "Traffic Bump";
+"type.traffic_calming.bump" = "Dosso";
 
-"type.traffic_calming.hump" = "Traffic Hump";
+"type.traffic_calming.hump" = "Dosso";
 
 "type.waterway" = "Waterway";
 
@@ -3500,17 +3498,17 @@
 
 "type.waterway.canal.tunnel" = "Canale";
 
-"type.waterway.dam" = "Dam";
+"type.waterway.dam" = "Diga";
 
-"type.waterway.ditch" = "Ditch";
+"type.waterway.ditch" = "Fosso";
 
-"type.waterway.ditch.tunnel" = "Ditch";
+"type.waterway.ditch.tunnel" = "Fosso";
 
-"type.waterway.dock" = "Waterway Dock";
+"type.waterway.dock" = "Darsena";
 
-"type.waterway.drain" = "Drain";
+"type.waterway.drain" = "Canale di scolo";
 
-"type.waterway.drain.tunnel" = "Drain";
+"type.waterway.drain.tunnel" = "Canale di scolo";
 
 "type.waterway.lock_gate" = "Sbarramento";
 
@@ -3520,19 +3518,19 @@
 
 "type.waterway.riverbank" = "Fiume";
 
-"type.waterway.stream" = "Fiume";
+"type.waterway.stream" = "Torrente";
 
-"type.waterway.stream.ephemeral" = "Fiume";
+"type.waterway.stream.ephemeral" = "Torrente";
 
-"type.waterway.stream.intermittent" = "Fiume";
+"type.waterway.stream.intermittent" = "Torrente";
 
-"type.waterway.stream.tunnel" = "Fiume";
+"type.waterway.stream.tunnel" = "Torrente";
 
 "type.waterway.waterfall" = "Cascata";
 
 "type.waterway.weir" = "Weir";
 
-"type.wheelchair" = "Wheelchair";
+"type.wheelchair" = "Sedia a rotelle";
 
 "type.wheelchair.limited" = "Accessibile in parte";
 
@@ -3568,7 +3566,7 @@
 
 "type.piste_type.nordic" = "Nordic Ski Trail";
 
-"type.piste_type.sled" = "Sledding Piste";
+"type.piste_type.sled" = "Pista per slitte";
 
 "type.building_part" = "Edificio";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 8f5a66225b..7bca8cfc73 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "レストラン";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "地下鉄入り口";
 
-"type.railway.subway_entrance.lisbon" = "地下鉄入り口";
-
 "type.railway.subway_entrance.london" = "地下鉄入り口";
 
 "type.railway.subway_entrance.lyon" = "地下鉄入り口";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 0e0ee35d1f..5f15bbff87 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "케이블카 역";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "레스토랑";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "타워";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "수도꼭지";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "지하철 입구";
 
-"type.railway.subway_entrance.lisbon" = "지하철 입구";
-
 "type.railway.subway_entrance.london" = "지하철 입구";
 
 "type.railway.subway_entrance.lyon" = "지하철 입구";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 76837b10c6..861500a1b7 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.lisbon" = "भुयारी प्रवेशद्वार";
-
 "type.railway.subway_entrance.london" = "भुयारी प्रवेशद्वार";
 
 "type.railway.subway_entrance.lyon" = "भुयारी प्रवेशद्वार";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 2091a1e32e..9152065a58 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Kabelbanestasjon";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tårn";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vannkran";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "T-bane inngang";
 
-"type.railway.subway_entrance.lisbon" = "T-bane inngang";
-
 "type.railway.subway_entrance.london" = "T-bane inngang";
 
 "type.railway.subway_entrance.lyon" = "T-bane inngang";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index d65fc800b8..61f8aae62d 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1046,10 +1046,10 @@
 "no" = "Nee";
 
 /* E.g. "WiFi:Yes" */
-"yes_available" = "Ja";
+"yes_available" = "ja";
 
 /* E.g. "WiFi:No" */
-"no_available" = "Nee";
+"no_available" = "nee";
 
 "trip_finished" = "U bent aangekomen!";
 
@@ -1237,7 +1237,7 @@
 
 "type.aerialway.station" = "Kabelwagenstation";
 
-"type.aeroway" = "Luchtvaartinfrastructuurfv";
+"type.aeroway" = "Luchtvaartinfrastructuur";
 
 "type.aeroway.aerodrome" = "Vliegveld";
 
@@ -1855,31 +1855,31 @@
 "type.highway.cycleway" = "Fietspad";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.cycleway.bridge" = "Brug";
+"type.highway.cycleway.bridge" = "Fietsbrug";
 
 "type.highway.cycleway.permissive" = "Fietspad";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.cycleway.tunnel" = "Tunnel";
+"type.highway.cycleway.tunnel" = "Fietstunnel";
 
 "type.highway.elevator" = "Lift";
 
 "type.highway.footway" = "Voetpad";
 
-"type.highway.footway.alpine_hiking" = "Pad";
+"type.highway.footway.alpine_hiking" = "Alpine wandelpad";
 
-"type.highway.footway.area" = "Voetpad";
+"type.highway.footway.area" = "Voetgangerszone";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.footway.bridge" = "Brug";
+"type.highway.footway.bridge" = "Voetgangersbrug";
 
-"type.highway.footway.demanding_alpine_hiking" = "Pad";
+"type.highway.footway.demanding_alpine_hiking" = "Uitdagend alpine bergklimpad";
 
-"type.highway.footway.demanding_mountain_hiking" = "Pad";
+"type.highway.footway.demanding_mountain_hiking" = "Uitdagend bergwandelpad";
 
-"type.highway.footway.difficult_alpine_hiking" = "Pad";
+"type.highway.footway.difficult_alpine_hiking" = "Moeilijk alpine bergklimpad";
 
-"type.highway.footway.hiking" = "Pad";
+"type.highway.footway.hiking" = "Wandelpad";
 
 "type.highway.footway.mountain_hiking" = "Bergpad";
 
@@ -1908,7 +1908,7 @@
 
 "type.highway.motorway_junction" = "Afrit";
 
-"type.highway.motorway_link" = "Snelweg";
+"type.highway.motorway_link" = "Snelwegoprit";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Brug";
@@ -1918,9 +1918,9 @@
 
 "type.highway.path" = "Pad";
 
-"type.highway.path.alpine_hiking" = "Pad";
+"type.highway.path.alpine_hiking" = "Alpine wandelpad";
 
-"type.highway.path.bicycle" = "Pad";
+"type.highway.path.bicycle" = "Fietspad";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Brug";
@@ -1931,9 +1931,9 @@
 
 "type.highway.path.difficult_alpine_hiking" = "Pad";
 
-"type.highway.path.hiking" = "Pad";
+"type.highway.path.hiking" = "Wandelpad";
 
-"type.highway.path.horse" = "Pad";
+"type.highway.path.horse" = "Ruiterpad";
 
 "type.highway.path.mountain_hiking" = "Bergpad";
 
@@ -2122,7 +2122,7 @@
 
 "type.area_highway.tertiary" = "Tertiaire weg";
 
-"type.area_highway.steps" = "Trap";
+"type.area_highway.steps" = "Trappen";
 
 "type.area_highway.track" = "Straat";
 
@@ -2177,7 +2177,7 @@
 
 "type.historic.memorial.plaque" = "Plaquette";
 
-"type.historic.memorial.sculpture" = "Beeldhouwwerk";
+"type.historic.memorial.sculpture" = "Sculptuur";
 
 "type.historic.memorial.statue" = "Standbeeld";
 
@@ -2191,7 +2191,7 @@
 
 "type.historic.wayside_cross" = "Kruis";
 
-"type.historic.wayside_shrine" = "Altaar";
+"type.historic.wayside_shrine" = "Kruisbeeld";
 
 "type.hwtag" = "hwtag";
 
@@ -2599,7 +2599,7 @@
 
 "type.power.station" = "Transformatorstation";
 
-"type.power.substation" = "Substation";
+"type.power.substation" = "Transformatorstation";
 
 "type.power.tower" = "Elektriciteitsmast";
 
@@ -2671,7 +2671,7 @@
 
 "type.railway.rail.bridge" = "Treinspoorbrug";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.motor_vehicle" = "Spoorweg";
 
 "type.railway.rail.tunnel" = "Spoortunnel";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Metro ingang";
 
-"type.railway.subway_entrance.lisbon" = "Metro ingang";
-
 "type.railway.subway_entrance.london" = "Metro ingang";
 
 "type.railway.subway_entrance.lyon" = "Metro ingang";
@@ -3171,7 +3169,7 @@
 
 "type.shop.bicycle" = "Fietsenwinkel";
 
-"type.shop.bookmaker" = "Bookmaker";
+"type.shop.bookmaker" = "Boekbinder";
 
 "type.shop.books" = "Boekenwinkel";
 
@@ -3315,7 +3313,7 @@
 
 "type.shop.art" = "Kunstwinkel";
 
-"type.shop.baby_goods" = "Kinderwinkel";
+"type.shop.baby_goods" = "Babyspullenwinkel";
 
 "type.shop.bag" = "Tassenwinkel";
 
@@ -3438,13 +3436,13 @@
 
 "type.tourism.artwork.painting" = "Schilderij";
 
-"type.tourism.artwork.sculpture" = "Beeldhouwwerk";
+"type.tourism.artwork.sculpture" = "Kunstwerk";
 
 "type.tourism.artwork.statue" = "Standbeeld";
 
 "type.tourism.attraction" = "Attractie";
 
-"type.tourism.attraction.animal" = "Attractie";
+"type.tourism.attraction.animal" = "Dierenverblijf";
 
 "type.tourism.attraction.specified" = "Attractie";
 
@@ -3452,13 +3450,13 @@
 
 "type.tourism.caravan_site" = "Caravan site";
 
-"type.tourism.chalet" = "Chalet";
+"type.tourism.chalet" = "Vakantiehuis";
 
 "type.tourism.gallery" = "Galerij";
 
 "type.tourism.guest_house" = "Gasthuis";
 
-"type.tourism.hostel" = "Hostel";
+"type.tourism.hostel" = "Herberg";
 
 "type.tourism.hotel" = "Hotel";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 97242903ca..8062306a35 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restauracja";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Wejście do metra";
 
-"type.railway.subway_entrance.lisbon" = "Wejście do metra";
-
 "type.railway.subway_entrance.london" = "Wejście do metra";
 
 "type.railway.subway_entrance.lyon" = "Wejście do metra";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index e14a40baa5..50b7b86dce 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1428,9 +1428,9 @@
 
 "type.amenity.recycling.centre" = "Centro de reciclagem";
 
-"type.amenity.recycling" = "Recipiente de reciclagem";
+"type.amenity.recycling" = "Contêiner de reciclagem";
 
-"type.amenity.recycling.container" = "Recipiente de reciclagem";
+"type.amenity.recycling.container" = "Contêiner de reciclagem";
 
 "type.recycling.batteries" = "Baterias";
 
@@ -1438,29 +1438,29 @@
 
 "type.recycling.glass_bottles" = "Garrafas de vidro";
 
-"type.recycling.paper" = "Lixo de papel";
+"type.recycling.paper" = "Papel";
 
-"type.recycling.plastic" = "Lixo plástico";
+"type.recycling.plastic" = "Plástico";
 
 "type.recycling.plastic_bottles" = "Garrafas plásticas";
 
-"type.recycling.scrap_metal" = "Ferro velho";
+"type.recycling.scrap_metal" = "Sucata";
 
-"type.recycling.small_appliances" = "Lixo eletrônico";
+"type.recycling.small_appliances" = "Eletrônicos";
 
-"type.recycling.cardboard" = "Cardboard";
+"type.recycling.cardboard" = "Papelão";
 
-"type.recycling.cans" = "Cans";
+"type.recycling.cans" = "Latas";
 
-"type.recycling.shoes" = "Shoes";
+"type.recycling.shoes" = "Sapatos";
 
-"type.recycling.green_waste" = "Green/Organic Waste";
+"type.recycling.green_waste" = "Lixo verde/orgânico";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Caixa de bebidas";
 
 "type.amenity.restaurant" = "Restaurante";
 
-"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+"type.amenity.sanitary_dump_station" = "Estação de despejo de esgotos";
 
 "type.amenity.school" = "Escola";
 
@@ -1484,27 +1484,27 @@
 
 "type.amenity.vending_machine.cigarettes" = "Máquina de venda de cigarros";
 
-"type.amenity.vending_machine.coffee" = "Coffee Dispenser";
+"type.amenity.vending_machine.coffee" = "Máquina de café";
 
-"type.amenity.vending_machine.condoms" = "Condoms Dispenser";
+"type.amenity.vending_machine.condoms" = "Máquina de venda de preservativos";
 
 "type.amenity.vending_machine.drinks" = "Máquina de venda de bebidas";
 
-"type.amenity.vending_machine.food" = "Food Dispenser";
+"type.amenity.vending_machine.food" = "Máquina de venda de comidas";
 
-"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
+"type.amenity.vending_machine.newspapers" = "Máquina de venda de jornais";
 
-"type.amenity.vending_machine.parking_tickets" = "Máquina venda de tíquetes de estacionamento";
+"type.amenity.vending_machine.parking_tickets" = "Máquina de venda de tíquetes de estacionamento";
 
-"type.amenity.vending_machine.public_transport_tickets" = "Máquinas automáticas de venda de passagens de transporte público";
+"type.amenity.vending_machine.public_transport_tickets" = "Máquina de venda de passagens de transporte público";
 
-"type.amenity.vending_machine.sweets" = "Sweets Dispenser";
+"type.amenity.vending_machine.sweets" = "Máquina de venda de doces";
 
-"type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
+"type.amenity.vending_machine.excrement_bags" = "Saquinhos de lixo";
 
-"type.amenity.parcel_locker" = "Parcel Locker";
+"type.amenity.parcel_locker" = "Armário de encomendas";
 
-"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
+"type.amenity.vending_machine.fuel" = "Bomba de combustível";
 
 "type.amenity.veterinary" = "Veterinário";
 
@@ -1512,7 +1512,7 @@
 
 "type.amenity.waste_disposal" = "Depósito de lixo";
 
-"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+"type.amenity.waste_transfer_station" = "Estação de transferência de resíduos";
 
 "type.amenity.water_point" = "Ponto de água";
 
@@ -1520,7 +1520,7 @@
 
 "type.barrier.block" = "Bloco";
 
-"type.barrier.bollard" = "Pilar";
+"type.barrier.bollard" = "Pilarete";
 
 "type.barrier.border_control" = "Controle de fronteira";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Entrada do metrô";
 
-"type.railway.subway_entrance.lisbon" = "Entrada do metrô";
-
 "type.railway.subway_entrance.london" = "Entrada do metrô";
 
 "type.railway.subway_entrance.lyon" = "Entrada do metrô";
@@ -3157,11 +3155,11 @@
 
 "type.route.ferry" = "Rota de balsa";
 
-"type.route.shuttle_train" = "Rota de trem vaivem";
+"type.route.shuttle_train" = "Rota de trem vaivém";
 
 "type.shop" = "Loja";
 
-"type.shop.alcohol" = "Loja de bebidas alcoolicas";
+"type.shop.alcohol" = "Loja de bebidas alcoólicas";
 
 "type.shop.bakery" = "Padaria";
 
@@ -3209,7 +3207,7 @@
 
 "type.shop.department_store" = "Loja de departamentos";
 
-"type.shop.doityourself" = "Loja de ferramentas e materiais de bricolage";
+"type.shop.doityourself" = "Loja de ferramentas e materiais de bricolagem";
 
 "type.shop.dry_cleaning" = "Lavagem a seco";
 
@@ -3271,7 +3269,7 @@
 
 "type.shop.outdoor" = "Artigos de atividades ao ar livre";
 
-"type.shop.pastry" = "Pastelaria";
+"type.shop.pastry" = "Confeitaria";
 
 "type.shop.pawnbroker" = "Casa de penhores";
 
@@ -3305,7 +3303,7 @@
 
 "type.shop.variety_store" = "Loja 1,99";
 
-"type.shop.video" = "Vídeo locadora";
+"type.shop.video" = "Videolocadora";
 
 "type.shop.video_games" = "Loja de jogos eletrônicos";
 
@@ -3325,7 +3323,7 @@
 
 "type.shop.cheese" = "Loja de queijos";
 
-"type.shop.craft" = "Artes e Ofícios";
+"type.shop.craft" = "Artes e ofícios";
 
 "type.shop.dairy" = "Lacticínios";
 
@@ -3333,7 +3331,7 @@
 
 "type.shop.fishing" = "Loja de pesca";
 
-"type.shop.interior_decoration" = "Decorações de Interiores";
+"type.shop.interior_decoration" = "Decoração de interiores";
 
 "type.shop.lottery" = "Bilhete de loteria";
 
@@ -3347,7 +3345,7 @@
 
 "type.shop.sewing" = "Materiais de costura";
 
-"type.shop.storage_rental" = "Aluguel de Armazenamento";
+"type.shop.storage_rental" = "Aluguel de armazenamento";
 
 "type.shop.tobacco" = "Tabaco";
 
@@ -3389,7 +3387,7 @@
 
 "type.sport.handball" = "Handebol";
 
-"type.sport.multi" = "Vários desportos";
+"type.sport.multi" = "Poliesportivo";
 
 /* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Mergulho autônomo";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index ba536df100..5c27093662 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurante";
 
@@ -1502,7 +1502,7 @@
 
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
 
-"type.amenity.parcel_locker" = "Parcel Locker";
+"type.amenity.parcel_locker" = "Cacifo";
 
 "type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Entrada do metro";
 
-"type.railway.subway_entrance.lisbon" = "Entrada do metro";
-
 "type.railway.subway_entrance.london" = "Entrada do metro";
 
 "type.railway.subway_entrance.lyon" = "Entrada do metro";
@@ -3213,7 +3211,7 @@
 
 "type.shop.dry_cleaning" = "Lavagem a seco";
 
-"type.shop.electronics" = "Loja de electrónica de consumo";
+"type.shop.electronics" = "Loja de eletrónica de consumo";
 
 "type.shop.erotic" = "Loja de artigos eróticos";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index b04f314a98..c9544663d8 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Stație de teleferic";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Turn";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Robinet cu apă";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Intrare în metro";
 
-"type.railway.subway_entrance.lisbon" = "Intrare în metro";
-
 "type.railway.subway_entrance.london" = "Intrare în metro";
 
 "type.railway.subway_entrance.lyon" = "Intrare în metro";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 29f67e8b56..20fc67320b 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Вход в метро";
 
-"type.railway.subway_entrance.lisbon" = "Вход в метро";
-
 "type.railway.subway_entrance.london" = "Вход в метро";
 
 "type.railway.subway_entrance.lyon" = "Вход в метро";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 4f0b1dbdac..866f418c5b 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Lanovka";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Reštaurácia";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Veža";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vodovodný kohútik";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Vstup do metra";
 
-"type.railway.subway_entrance.lisbon" = "Vstup do metra";
-
 "type.railway.subway_entrance.london" = "Vstup do metra";
 
 "type.railway.subway_entrance.lyon" = "Vstup do metra";
@@ -3251,7 +3249,7 @@
 
 "type.shop.laundry" = "Práčovňa";
 
-"type.shop.mall" = "The Mall";
+"type.shop.mall" = "Mall";
 
 "type.shop.massage" = "Masážny salón";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 359dba00a1..b6830c7620 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Linbanestation";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurang";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Torn";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vattenkran";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.lisbon" = "Tunnelbana entré";
-
 "type.railway.subway_entrance.london" = "Tunnelbana entré";
 
 "type.railway.subway_entrance.lyon" = "Tunnelbana entré";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 0b5718f3f1..5f8494c7f4 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Aerialway Station";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.lisbon" = "Lango la kuingilia stesheni ya reli";
-
 "type.railway.subway_entrance.london" = "Lango la kuingilia stesheni ya reli";
 
 "type.railway.subway_entrance.lyon" = "Lango la kuingilia stesheni ya reli";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 38e2d13287..59c8861634 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "สถานีกระเช้าลอยฟ้า";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "ร้านอาหาร";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "หอคอย";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "ก๊อกน้ำ";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.lisbon" = "ทางเข้ารถไฟใต้ดิน";
-
 "type.railway.subway_entrance.london" = "ทางเข้ารถไฟใต้ดิน";
 
 "type.railway.subway_entrance.lyon" = "ทางเข้ารถไฟใต้ดิน";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 09373cd429..597ba7e4c6 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1438,7 +1438,7 @@
 
 "type.recycling.glass_bottles" = "Cam Şişeler";
 
-"type.recycling.paper" = "Kâğıt Atıklar";
+"type.recycling.paper" = "Kağıt Atıklar";
 
 "type.recycling.plastic" = "Plastik Atıklar";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Metro Girişi";
 
-"type.railway.subway_entrance.lisbon" = "Metro Girişi";
-
 "type.railway.subway_entrance.london" = "Metro Girişi";
 
 "type.railway.subway_entrance.lyon" = "Metro Girişi";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 28ae278a28..2dfff1c7b6 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Вхід до метро";
 
-"type.railway.subway_entrance.lisbon" = "Вхід до метро";
-
 "type.railway.subway_entrance.london" = "Вхід до метро";
 
 "type.railway.subway_entrance.lyon" = "Вхід до метро";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 387a0e3feb..2fcf5eab3f 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1225,15 +1225,15 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Aerialway";
+"type.aerialway.cable_car" = "Cable car";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
-"type.aerialway.drag_lift" = "Aerialway";
+"type.aerialway.drag_lift" = "Drag lift";
 
-"type.aerialway.gondola" = "Aerialway";
+"type.aerialway.gondola" = "Gondola";
 
-"type.aerialway.mixed_lift" = "Aerialway";
+"type.aerialway.mixed_lift" = "Mixed lift";
 
 "type.aerialway.station" = "Trạm Cáp Treo";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Quán ăn";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "Tháp";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vòi nước";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.lisbon" = "Lỗi vào Metro";
-
 "type.railway.subway_entrance.london" = "Lỗi vào Metro";
 
 "type.railway.subway_entrance.lyon" = "Lỗi vào Metro";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index b0b96617cb..71439b62d5 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "餐馆";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "地铁出入口";
 
-"type.railway.subway_entrance.lisbon" = "地铁出入口";
-
 "type.railway.subway_entrance.london" = "地铁出入口";
 
 "type.railway.subway_entrance.lyon" = "地铁出入口";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index b1eceba944..af898b3c82 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1227,7 +1227,7 @@
 
 "type.aerialway.cable_car" = "纜車";
 
-"type.aerialway.chair_lift" = "Aerialway";
+"type.aerialway.chair_lift" = "Chair lift";
 
 "type.aerialway.drag_lift" = "纜車要素";
 
@@ -1456,7 +1456,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "餐廳";
 
@@ -2397,7 +2397,7 @@
 
 "type.man_made.tower" = "塔";
 
-"type.man_made.wastewater_plant" = "Wastewater Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "水龍頭";
 
@@ -3025,8 +3025,6 @@
 
 "type.railway.subway_entrance.lisboa" = "地鐵入口";
 
-"type.railway.subway_entrance.lisbon" = "地鐵入口";
-
 "type.railway.subway_entrance.london" = "地鐵入口";
 
 "type.railway.subway_entrance.lyon" = "地鐵入口";