diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 856e87d33a..7325d1f027 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -969,12 +969,12 @@
 	<string name="type.highway.living_street.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Tunnel</string>
-	<string name="type.highway.motorway">Via</string>
+	<string name="type.highway.motorway">Autostrada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<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">Via</string>
+	<string name="type.highway.motorway_link">Autostrada</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. -->
@@ -1088,7 +1088,7 @@
 	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.footway">Sentiero</string>
 	<string name="type.area_highway.living_street">Via</string>
-	<string name="type.area_highway.motorway">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>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index cb9213e89c..17cd053b6b 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -733,10 +733,12 @@
 	<string name="type.aeroway.helipad">Heliplatform</string>
 	<string name="type.aeroway.runway">Startbaan</string>
 	<string name="type.aeroway.taxiway">Taxibaan</string>
-	<string name="type.amenity">Infrastructuur objecten</string>
+	<string name="type.amenity">Voorzieningen</string>
 	<string name="type.amenity.arts_centre">Kunstcentrum</string>
 	<string name="type.amenity.atm">Geldautomaat</string>
-	<string name="type.amenity.bbq">Picnicplaats</string>
+	<string name="type.amenity.bank">Bank</string>
+	<string name="type.amenity.bar">Bar</string>
+	<string name="type.amenity.bbq">Barbecueplaats</string>
 	<string name="type.amenity.bench">Zitbank</string>
 	<string name="type.amenity.bicycle_parking">Fietsenstalling</string>
 	<string name="type.amenity.bicycle_rental">Fietsverhuur</string>
@@ -745,16 +747,17 @@
 	<string name="type.amenity.brothel">Bordeel</string>
 	<string name="type.amenity.bureau_de_change">Wisselkantoor</string>
 	<string name="type.amenity.bus_station">Busstation</string>
-	<string name="type.amenity.cafe">Tearoom</string>
+	<string name="type.amenity.cafe">Café</string>
 	<string name="type.amenity.car_rental">Autoverhuur</string>
 	<string name="type.amenity.car_sharing">Autodelen</string>
-	<string name="type.amenity.car_wash">Car wash</string>
+	<string name="type.amenity.car_wash">Car Wash</string>
+	<string name="type.amenity.casino">Casino</string>
 	<string name="type.amenity.charging_station">Oplaadstation</string>
 	<string name="type.amenity.childcare">Crèche</string>
 	<string name="type.amenity.cinema">Bioscoop</string>
 	<string name="type.amenity.clinic">Kliniek</string>
 	<string name="type.amenity.college">Hogeschool</string>
-	<string name="type.amenity.community_centre">Wijkcentrum</string>
+	<string name="type.amenity.community_centre">Gemeenschapscentrum</string>
 	<string name="type.amenity.courthouse">Rechtbank</string>
 	<string name="type.amenity.dentist">Tandarts</string>
 	<string name="type.amenity.doctors">Huisartsenpost</string>
@@ -767,34 +770,34 @@
 	<string name="type.amenity.fountain">Fontein</string>
 	<string name="type.amenity.fuel">Tankstation</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">Begraafplaats</string>
+	<string name="type.amenity.grave_yard">Kerkhof</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">Begraafplaats</string>
+	<string name="type.amenity.grave_yard.christian">Christelijk kerkhof</string>
 	<string name="type.amenity.hospital">Ziekenhuis</string>
 	<string name="type.amenity.hunting_stand">Jaagplek</string>
-	<string name="type.amenity.ice_cream">Ijsstand</string>
-	<string name="type.amenity.internet_cafe">Internetcafe</string>
+	<string name="type.amenity.ice_cream">IJssalon</string>
+	<string name="type.amenity.internet_cafe">Internetcafé</string>
 	<string name="type.amenity.kindergarten">Kleuterschool</string>
 	<string name="type.amenity.library">Bibliotheek</string>
 	<string name="type.amenity.marketplace">Markt</string>
 	<string name="type.amenity.motorcycle_parking">Parking Motorfietsen</string>
-	<string name="type.amenity.nightclub">Discotheek</string>
+	<string name="type.amenity.nightclub">Nachtclub</string>
 	<string name="type.amenity.nursing_home">Bejaardentehuis</string>
 	<string name="type.amenity.parking">Parkeerplaats</string>
-	<string name="type.amenity.parking.fee">Parkeerplaats</string>
+	<string name="type.amenity.parking.fee">Betaald parkeren</string>
 	<string name="type.amenity.parking.multi.storey">Parkeerplaats</string>
-	<string name="type.amenity.parking.no.access">Parkeerplaats</string>
+	<string name="type.amenity.parking.no.access">Privé parkeerplaats</string>
 	<string name="type.amenity.parking.park_and_ride">Parkeerplaats</string>
 	<string name="type.amenity.parking.permissive">Parkeerplaats</string>
-	<string name="type.amenity.parking.private">Parkeerplaats</string>
-	<string name="type.amenity.parking.underground">Parkeerplaats</string>
+	<string name="type.amenity.parking.private">Privé parkeerplaats</string>
+	<string name="type.amenity.parking.underground">Ondergrondse parkeerplaats</string>
 	<string name="type.amenity.parking_entrance.private">Parkeeringang</string>
 	<string name="type.amenity.parking_entrance.permissive">Parkeeringang</string>
 	<string name="type.amenity.parking_entrance">Parkeeringang</string>
-	<string name="type.amenity.parking_space">Parkeerplaats</string>
-	<string name="type.amenity.parking_space.permissive">Parkeerplaats</string>
-	<string name="type.amenity.parking_space.private">Parkeerplaats</string>
-	<string name="type.amenity.parking_space.underground">Parkeerplaats</string>
+	<string name="type.amenity.parking_space">Parkeerplek</string>
+	<string name="type.amenity.parking_space.permissive">Parkeerplek</string>
+	<string name="type.amenity.parking_space.private">Privé parkeerplek</string>
+	<string name="type.amenity.parking_space.underground">Ondergrondse parkeerplek</string>
 	<string name="type.amenity.parking_space.disabled">Invalide parkeerplaats</string>
 	<string name="type.amenity.payment_terminal">Betaalautomaat</string>
 	<string name="type.amenity.pharmacy">Apotheek</string>
@@ -826,15 +829,19 @@
 	<string name="type.recycling.scrap_metal">Schroot</string>
 	<string name="type.recycling.small_appliances">Elektronisch afval</string>
 	<string name="type.recycling.cardboard">Karton</string>
-	<string name="type.recycling.cans">Blik</string>
+	<string name="type.recycling.cans">Blikafval</string>
 	<string name="type.recycling.shoes">Schoenen</string>
 	<string name="type.recycling.green_waste">GFT afval</string>
+	<string name="type.recycling.cartons">Drankverpakkingen</string>
+	<string name="type.amenity.restaurant">Restaurant</string>
 	<string name="type.amenity.sanitary_dump_station">Caravantoilet cassette-leegpunt</string>
+	<string name="type.amenity.school">School</string>
 	<string name="type.amenity.shelter">Beschutting</string>
 	<string name="type.amenity.shower">Douche</string>
+	<string name="type.amenity.taxi">Taxi</string>
 	<string name="type.amenity.telephone">Telefoon</string>
 	<string name="type.amenity.theatre">Theater</string>
-	<string name="type.amenity.toilets">WC</string>
+	<string name="type.amenity.toilets">Toiletten</string>
 	<string name="type.amenity.townhall">Gemeentehuis</string>
 	<string name="type.amenity.university">Universiteit</string>
 	<string name="type.amenity.vending_machine">Automaat</string>
@@ -844,7 +851,7 @@
 	<string name="type.amenity.vending_machine.drinks">Drankautomaat</string>
 	<string name="type.amenity.vending_machine.food">Etenswarenautomaat</string>
 	<string name="type.amenity.vending_machine.newspapers">Krantenautomaat</string>
-	<string name="type.amenity.vending_machine.parking_tickets">Betaalautomaat parkeergarage</string>
+	<string name="type.amenity.vending_machine.parking_tickets">Betaalautomaat parkeerplaats</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Kaartjesautomaat voor openbaar vervoer</string>
 	<string name="type.amenity.vending_machine.sweets">Snoepautomaat</string>
 	<string name="type.amenity.vending_machine.excrement_bags">Hondenpoepzakjesdispenser</string>
@@ -852,7 +859,7 @@
 	<string name="type.amenity.vending_machine.fuel">Tankautomaat</string>
 	<string name="type.amenity.veterinary">Dierenarts</string>
 	<string name="type.amenity.waste_basket">Vuilnisbak</string>
-	<string name="type.amenity.waste_disposal">Uitschot</string>
+	<string name="type.amenity.waste_disposal">Vuilcontainer</string>
 	<string name="type.amenity.waste_transfer_station">Overslagstation voor afval</string>
 	<string name="type.amenity.water_point">Waterpunt</string>
 	<string name="type.barrier">Barrière</string>
@@ -895,8 +902,9 @@
 	<string name="type.boundary.national_park">Nationaal park</string>
 	<string name="type.building">Gebouw</string>
 	<string name="type.building.address">Gebouw</string>
+	<string name="type.building.garage">Garage</string>
 	<string name="type.building.has_parts">Gebouw</string>
-	<string name="type.building.train_station">Station</string>
+	<string name="type.building.train_station">Treinstation</string>
 	<string name="type.building.warehouse">Magazijn</string>
 	<string name="type.cemetery.grave">Graf</string>
 	<string name="type.craft">Ambacht</string>
@@ -1012,11 +1020,11 @@
 	<string name="type.healthcare.laboratory">Medisch laboratorium</string>
 
 	<!-- SECTION: Types: Roads -->
-	<string name="type.highway">Snelweg</string>
+	<string name="type.highway">Straat</string>
 	<string name="type.highway.bridleway">Ruiterpad</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.bridleway.bridge">Brug</string>
-	<string name="type.highway.bridleway.permissive">Pad toegankelijk voor ruiters</string>
+	<string name="type.highway.bridleway.permissive">Ruiterpad</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Bushalte</string>
@@ -1024,36 +1032,36 @@
 	<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.permissive">Weg toegestaan voor fietsers</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.elevator">Lift</string>
-	<string name="type.highway.footway">Pad</string>
+	<string name="type.highway.footway">Voetpad</string>
 	<string name="type.highway.footway.alpine_hiking">Pad</string>
-	<string name="type.highway.footway.area">Pad</string>
+	<string name="type.highway.footway.area">Voetpad</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.mountain_hiking">Pad</string>
-	<string name="type.highway.footway.permissive">Pad</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. -->
-	<string name="type.highway.footway.tunnel">Tunnel</string>
+	<string name="type.highway.footway.tunnel">Voetgangerstunnel</string>
 	<string name="type.highway.ford">Voorde</string>
 	<string name="type.highway.living_street">Straat</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.living_street.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Tunnel</string>
-	<string name="type.highway.motorway">Straat</string>
+	<string name="type.highway.motorway">Snelweg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.motorway.bridge">Brug</string>
+	<string name="type.highway.motorway.bridge">Snelwegbrug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.motorway.tunnel">Tunnel</string>
+	<string name="type.highway.motorway.tunnel">Snelwegtunnel</string>
 	<string name="type.highway.motorway_junction">Afrit</string>
-	<string name="type.highway.motorway_link">Straat</string>
+	<string name="type.highway.motorway_link">Snelweg</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. -->
@@ -1068,22 +1076,22 @@
 	<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.mountain_hiking">Pad</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. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
-	<string name="type.highway.pedestrian">Straat</string>
-	<string name="type.highway.pedestrian.area">Straat</string>
+	<string name="type.highway.pedestrian">Voetgangersgebied</string>
+	<string name="type.highway.pedestrian.area">Voetgangersgebied</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.pedestrian.bridge">Brug</string>
+	<string name="type.highway.pedestrian.bridge">Voetgangersbrug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
-	<string name="type.highway.primary">Straat</string>
+	<string name="type.highway.pedestrian.tunnel">Voetgangerstunnel</string>
+	<string name="type.highway.primary">Hoofdweg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary.tunnel">Tunnel</string>
-	<string name="type.highway.primary_link">Straat</string>
+	<string name="type.highway.primary_link">Hoofdweg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary_link.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1101,12 +1109,12 @@
 	<string name="type.highway.road.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.road.tunnel">Tunnel</string>
-	<string name="type.highway.secondary">Straat</string>
+	<string name="type.highway.secondary">Secundaire weg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary.tunnel">Tunnel</string>
-	<string name="type.highway.secondary_link">Straat</string>
+	<string name="type.highway.secondary_link">Secundaire weg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary_link.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1121,17 +1129,17 @@
 	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.services">Servicegebied</string>
 	<string name="type.highway.speed_camera">Flitspaal</string>
-	<string name="type.highway.steps">Pad</string>
+	<string name="type.highway.steps">Trap</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.steps.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.steps.tunnel">Tunnel</string>
-	<string name="type.highway.tertiary">Straat</string>
+	<string name="type.highway.tertiary">Tertiaire weg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.tertiary.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary.tunnel">Tunnel</string>
-	<string name="type.highway.tertiary_link">Straat</string>
+	<string name="type.highway.tertiary_link">Tertiaire weg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.tertiary_link.bridge">Brug</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1167,29 +1175,29 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.cycleway">Fietspad</string>
-	<string name="type.area_highway.footway">Pad</string>
+	<string name="type.area_highway.footway">Voetpad</string>
 	<string name="type.area_highway.living_street">Straat</string>
-	<string name="type.area_highway.motorway">Straat</string>
+	<string name="type.area_highway.motorway">Snelweg</string>
 	<string name="type.area_highway.path">Pad</string>
-	<string name="type.area_highway.pedestrian">Straat</string>
-	<string name="type.area_highway.primary">Straat</string>
+	<string name="type.area_highway.pedestrian">Voetgangersgebied</string>
+	<string name="type.area_highway.primary">Hoofdweg</string>
 	<string name="type.area_highway.residential">Straat</string>
-	<string name="type.area_highway.secondary">Straat</string>
+	<string name="type.area_highway.secondary">Secundaire weg</string>
 	<string name="type.area_highway.service">Straat</string>
-	<string name="type.area_highway.tertiary">Straat</string>
-	<string name="type.area_highway.steps">Pad</string>
+	<string name="type.area_highway.tertiary">Tertiaire weg</string>
+	<string name="type.area_highway.steps">Trap</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>
 
 	<!-- SECTION: Types: Historic -->
-	<string name="type.historic">Historisch</string>
+	<string name="type.historic">Historisch object</string>
 	<string name="type.historic.archaeological_site">Archeologische site</string>
 	<string name="type.historic.battlefield">Slagveld</string>
 	<string name="type.historic.boundary_stone">Grenssteen</string>
-	<string name="type.historic.castle">Burcht</string>
+	<string name="type.historic.castle">Kasteel</string>
 	<string name="type.historic.castle.castrum">Castra</string>
-	<string name="type.historic.castle.defensive">Burcht</string>
+	<string name="type.historic.castle.defensive">Kasteel</string>
 	<string name="type.historic.castle.fortified_church">Weerkerk</string>
 	<string name="type.historic.castle.fortress">Vesting</string>
 	<string name="type.historic.castle.hillfort">Heuvelfort</string>
@@ -1197,18 +1205,22 @@
 	<string name="type.historic.castle.manor">Manoir</string>
 	<string name="type.historic.castle.palace">Paleis</string>
 	<string name="type.historic.castle.shiro">Japans kasteel</string>
-	<string name="type.historic.castle.stately">Kasteel</string>
+	<string name="type.historic.castle.stately">Landhuis</string>
 	<string name="type.historic.city_gate">Stadspoort</string>
 	<string name="type.historic.citywalls">Stadsmuur</string>
+	<string name="type.historic.fort">Fort</string>
 	<string name="type.historic.memorial">Gedenkteken</string>
-	<string name="type.historic.memorial.plaque">Gedenkteken</string>
-	<string name="type.historic.memorial.sculpture">Gedenkteken</string>
-	<string name="type.historic.memorial.statue">Gedenkteken</string>
+	<string name="type.historic.memorial.plaque">Plaquette</string>
+	<string name="type.historic.memorial.sculpture">Beeldhouwwerk</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">Toerisme</string>
-	<string name="type.historic.tomb">Toerisme</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.internet_access">Internet</string>
+	<string name="type.internet_access.wlan">Draadloos internet</string>
 	<string name="type.junction">Kruispunt</string>
 	<string name="type.junction.roundabout">Rotonde</string>
 	<string name="type.landuse">Landgebruik</string>
@@ -1217,7 +1229,7 @@
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">Begraafplaats</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">Begraafplaats</string>
+	<string name="type.landuse.cemetery.christian">Christelijke begraafplaats</string>
 	<string name="type.landuse.churchyard">Kerkhof</string>
 	<string name="type.landuse.commercial">Commercieel gebied</string>
 	<string name="type.landuse.construction">Bouwplaats</string>
@@ -1227,14 +1239,16 @@
 	<string name="type.landuse.farmyard">Boerenerf</string>
 	<string name="type.landuse.field">Veld</string>
 	<string name="type.landuse.forest">Bos</string>
-	<string name="type.landuse.forest.coniferous">Bos</string>
-	<string name="type.landuse.forest.deciduous">Bos</string>
-	<string name="type.landuse.forest.mixed">Bos</string>
+	<string name="type.landuse.forest.coniferous">Naaldbos</string>
+	<string name="type.landuse.forest.deciduous">Loofbos</string>
+	<string name="type.landuse.forest.mixed">Gemengd bos</string>
+	<string name="type.landuse.garages">Garages</string>
 	<string name="type.landuse.grass">Gazon</string>
 	<string name="type.landuse.greenhouse_horticulture">Kassen</string>
 	<string name="type.landuse.industrial">Industrieterrein</string>
 	<string name="type.landuse.landfill">Stortplaats</string>
 	<string name="type.landuse.meadow">Weiland</string>
+	<string name="type.landuse.military">Militair terrein</string>
 	<string name="type.landuse.orchard">Boomgaard</string>
 	<string name="type.landuse.quarry">Steengroeve</string>
 	<string name="type.landuse.railway">Spoorwegfaciliteiten</string>
@@ -1246,7 +1260,7 @@
 	<string name="type.landuse.vineyard">Wijngaard</string>
 	<string name="type.leisure">Ontspanning</string>
 	<string name="type.leisure.common">Openbare grond</string>
-	<string name="type.leisure.dog_park">Plaats voor hondenuitlaten</string>
+	<string name="type.leisure.dog_park">Hondenuitlaatplek</string>
 	<string name="type.leisure.fitness_centre">Fitnesscentrum</string>
 	<string name="type.leisure.fitness_station">Fitness-Station</string>
 	<string name="type.leisure.garden">Tuin</string>
@@ -1256,9 +1270,9 @@
 	<string name="type.leisure.marina">Jachthaven</string>
 	<string name="type.leisure.nature_reserve">Natuurreservaat</string>
 	<string name="type.leisure.park">Park</string>
-	<string name="type.leisure.park.no.access">Park</string>
+	<string name="type.leisure.park.no.access">Ontoegankelijk park</string>
 	<string name="type.leisure.park.permissive">Park</string>
-	<string name="type.leisure.park.private">Park</string>
+	<string name="type.leisure.park.private">Privé park</string>
 	<string name="type.leisure.picnic_table">Picknicktafel</string>
 	<string name="type.leisure.pitch">Sportveld</string>
 	<string name="type.leisure.playground">Speeltuin</string>
@@ -1270,7 +1284,7 @@
 	<string name="type.sport.yoga">Yogastudio</string>
 	<string name="type.leisure.stadium">Stadion</string>
 	<string name="type.leisure.swimming_pool">Zwembad</string>
-	<string name="type.leisure.swimming_pool.private">Zwembad</string>
+	<string name="type.leisure.swimming_pool.private">Privé zwembad</string>
 	<string name="type.leisure.track">Parcours</string>
 	<string name="type.leisure.water_park">Waterpark</string>
 	<string name="type.leisure.beach_resort">Strandresort</string>
@@ -1282,21 +1296,24 @@
 	<string name="type.man_made.survey_point">Meetpunt</string>
 	<string name="type.man_made.flagpole">Vlaggenpaal</string>
 	<string name="type.man_made.lighthouse">Vuurtoren</string>
+	<string name="type.man_made.mast">Mast</string>
 	<string name="type.man_made.pier">Pier</string>
 	<string name="type.man_made.pipeline">Pijpleiding</string>
 	<string name="type.man_made.pipeline.overground">Bovengrondse pijpleiding</string>
+	<string name="type.man_made.silo">Silo</string>
 	<string name="type.man_made.storage_tank">Opslagtank</string>
 	<string name="type.man_made.surveillance">Bewakingscamera</string>
 	<string name="type.man_made.tower">Toren</string>
 	<string name="type.man_made.wastewater_plant">Waterzuiveringsinstallatie</string>
 	<string name="type.man_made.water_tap">Waterkraan</string>
 	<string name="type.man_made.water_tower">Watertoren</string>
-	<string name="type.man_made.water_well">Waterbron</string>
+	<string name="type.man_made.water_well">Waterput</string>
 	<string name="type.man_made.windmill">Windmolen</string>
 	<string name="type.man_made.works">Fabriek</string>
 	<string name="type.military">Militair</string>
+	<string name="type.military.bunker">Bunker</string>
 	<string name="type.mountain_pass">Bergpas</string>
-	<string name="type.natural">Natuurlijk</string>
+	<string name="type.natural">Natuur</string>
 	<string name="type.natural.bare_rock">Kale steen</string>
 	<string name="type.natural.bay">Baai</string>
 	<string name="type.natural.beach">Strand</string>
@@ -1364,7 +1381,7 @@
 	<string name="type.place.county">Graafschap</string>
 	<string name="type.place.farm">Boerderij</string>
 	<string name="type.place.hamlet">Gehucht</string>
-	<string name="type.place.island">Eilandje</string>
+	<string name="type.place.island">Eiland</string>
 	<string name="type.place.islet">Eilandje</string>
 	<string name="type.place.isolated_dwelling">Geïsoleerde woning</string>
 	<string name="type.place.locality">Plaats</string>
@@ -1375,17 +1392,23 @@
 	<string name="type.place.square">Plein</string>
 	<string name="type.place.state">Deelstaat</string>
 	<string name="type.place.state.USA">Deelstaat</string>
-	<string name="type.place.suburb">Buitenwijken</string>
+	<string name="type.place.suburb">Buitenwijk</string>
 	<string name="type.place.town">Stad</string>
 	<string name="type.place.village">Dorp</string>
 	<string name="type.power">Electriciteit</string>
 	<string name="type.power.line">Hoogspanningsleiding</string>
 	<string name="type.power.line.underground">Ondergrondse hoogspanningsleiding</string>
-	<string name="type.power.minor_line">Laag/middelspanningsleiding</string>
+	<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.tower">Elektriciteitspaal</string>
+	<string name="type.power.tower">Elektriciteitsmast</string>
+	<string name="type.psurface">Wegdek</string>
+	<string name="type.psurface.paved_bad">Verhard</string>
+	<string name="type.psurface.paved_good">Verhard</string>
+	<string name="type.psurface.unpaved_bad">Onverhard</string>
+	<string name="type.psurface.unpaved_good">Onverhard</string>
 	<string name="type.public_transport">Openbaar vervoer</string>
+	<string name="type.public_transport.platform">Platform</string>
 	<string name="type.railway">Spoorweg</string>
 	<string name="type.railway.abandoned">Voormalig treinspoor</string>
 	<string name="type.railway.abandoned.bridge">Voormalige spoorbrug</string>
@@ -1407,7 +1430,7 @@
 	<string name="type.railway.narrow_gauge">Smalspoorbaan</string>
 	<string name="type.railway.narrow_gauge.bridge">Smalspoorbrug</string>
 	<string name="type.railway.narrow_gauge.tunnel">Smalspoortunnel</string>
-	<string name="type.railway.platform">Spoor</string>
+	<string name="type.railway.platform">Perron</string>
 	<string name="type.railway.preserved">Museumspoorbaan</string>
 	<string name="type.railway.preserved.bridge">Museumspoorbaanbrug</string>
 	<string name="type.railway.preserved.tunnel">Museumspoorbaantunnel</string>
@@ -1424,7 +1447,7 @@
 	<string name="type.railway.station">Station</string>
 	<string name="type.railway.station.light_rail">Station</string>
 	<string name="type.railway.station.monorail">Station</string>
-	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway">Metrostation</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
@@ -1474,21 +1497,21 @@
 	<string name="type.shop.car_repair.tyres">Bandenreparatie</string>
 	<string name="type.shop.caravan">Caravan en camper verkoper</string>
 	<string name="type.shop.chemist">Drogisterij</string>
-	<string name="type.shop.chocolate">Winkel</string>
+	<string name="type.shop.chocolate">Chocolaterie</string>
 	<string name="type.shop.clothes">Kledingwinkel</string>
-	<string name="type.shop.coffee">Winkel</string>
+	<string name="type.shop.coffee">Koffiewinkel</string>
 	<string name="type.shop.computer">Computerwinkel</string>
-	<string name="type.shop.confectionery">Banketbakker</string>
+	<string name="type.shop.confectionery">Snoepwinkel</string>
 	<string name="type.shop.convenience">Buurtwinkel</string>
 	<string name="type.shop.copyshop">Kopieerwinkel</string>
 	<string name="type.shop.cosmetics">Schoonheidsmiddelen</string>
 	<string name="type.shop.deli">Delicatessenwinkel</string>
 	<string name="type.shop.department_store">Warenhuis</string>
-	<string name="type.shop.doityourself">Ijzerhandel</string>
+	<string name="type.shop.doityourself">IJzerhandel</string>
 	<string name="type.shop.dry_cleaning">Droogkuis</string>
 	<string name="type.shop.electronics">Elektronicazaak</string>
 	<string name="type.shop.erotic">Erotiekwinkel</string>
-	<string name="type.shop.fabric">Winkel</string>
+	<string name="type.shop.fabric">Stoffenwinkel</string>
 	<string name="type.shop.farm">Boerderijwinkel</string>
 	<string name="type.shop.florist">Bloemist</string>
 	<string name="type.shop.funeral_directors">Begrafenisondernemer</string>
@@ -1496,25 +1519,25 @@
 	<string name="type.shop.garden_centre">Tuincentrum</string>
 	<string name="type.shop.gift">Cadeauwinkel</string>
 	<string name="type.shop.greengrocer">Groentenwinkel</string>
-	<string name="type.shop.grocery">Boodschap</string>
+	<string name="type.shop.grocery">Boodschappen</string>
 	<string name="type.shop.hairdresser">Kapper</string>
-	<string name="type.shop.hardware">Ijzerwaren</string>
+	<string name="type.shop.hardware">IJzerwaren</string>
 	<string name="type.shop.health_food">Natuurvoedingswinkel</string>
 	<string name="type.shop.houseware">Huishoudelijke winkel</string>
 	<string name="type.shop.jewelry">Juwelier</string>
 	<string name="type.shop.kitchen">Keukenwinkel</string>
 	<string name="type.shop.laundry">Wasserette</string>
-	<string name="type.shop.mall">Het winkelcentrum</string>
+	<string name="type.shop.mall">Winkelcentrum</string>
 	<string name="type.shop.massage">Massagesalon</string>
 	<string name="type.shop.mobile_phone">Mobiele telefoonwinkel</string>
 	<string name="type.shop.money_lender">Winkel</string>
 	<string name="type.shop.motorcycle">Motorzaak</string>
-	<string name="type.shop.music">Winkel</string>
-	<string name="type.shop.musical_instrument">Winkel</string>
+	<string name="type.shop.music">Muziekwinkel</string>
+	<string name="type.shop.musical_instrument">Muziekinstrumentenwinkel</string>
 	<string name="type.shop.newsagent">Kiosk</string>
 	<string name="type.shop.optician">Opticien</string>
 	<string name="type.shop.outdoor">Outdooruitrusting</string>
-	<string name="type.shop.pastry">Gebakje</string>
+	<string name="type.shop.pastry">Banketbakker</string>
 	<string name="type.shop.pawnbroker">Pandjesbaas</string>
 	<string name="type.shop.pet">Dierenwinkel</string>
 	<string name="type.shop.photo">Fotowinkel</string>
@@ -1525,7 +1548,7 @@
 	<string name="type.shop.stationery">Kantoorboekhandel</string>
 	<string name="type.shop.supermarket">Supermarkt</string>
 	<string name="type.shop.tattoo">Tattoosalon</string>
-	<string name="type.shop.tea">Winkel</string>
+	<string name="type.shop.tea">Theewinkel</string>
 	<string name="type.shop.ticket">Kaartjesverkoop</string>
 	<string name="type.shop.toys">Speelgoedwinkel</string>
 	<string name="type.shop.travel_agency">Reisagentschap</string>
@@ -1533,8 +1556,8 @@
 	<string name="type.shop.variety_store">Bazaar</string>
 	<string name="type.shop.video">Videowinkel</string>
 	<string name="type.shop.video_games">Winkel voor videogames</string>
-	<string name="type.shop.wine">Wijn</string>
-	<string name="type.shop.antiques">Antiek</string>
+	<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.bag">Tassenwinkel</string>
@@ -1549,20 +1572,20 @@
 	<string name="type.shop.lottery">Loten</string>
 	<string name="type.shop.medical_supply">Medische benodigdheden</string>
 	<string name="type.shop.nutrition_supplements">Voedingssupplementen</string>
-	<string name="type.shop.paint">Verven</string>
+	<string name="type.shop.paint">Verfwinkel</string>
 	<string name="type.shop.perfumery">Parfumerie</string>
 	<string name="type.shop.sewing">Naaibenodigdheden</string>
 	<string name="type.shop.storage_rental">Opslag verhuur</string>
-	<string name="type.shop.tobacco">Tabak</string>
+	<string name="type.shop.tobacco">Tabakszaak</string>
 	<string name="type.shop.trade">Handelsbenodigdheden</string>
-	<string name="type.shop.watches">Horloges</string>
-	<string name="type.shop.wholesale">Groothandel winkel</string>
+	<string name="type.shop.watches">Horlogezaak</string>
+	<string name="type.shop.wholesale">Groothandel</string>
 	<string name="type.sport">Sport</string>
-	<string name="type.sport.american_football">Amerikaans voetbal</string>
+	<string name="type.sport.american_football">American football</string>
 	<string name="type.sport.archery">Boogschieten</string>
 	<string name="type.sport.athletics">Atletiek</string>
 	<string name="type.sport.australian_football">Australian football</string>
-	<string name="type.sport.baseball">Basketbal</string>
+	<string name="type.sport.baseball">Honkbal</string>
 	<string name="type.sport.basketball">Basketbal</string>
 	<string name="type.sport.beachvolleyball">Beachvolleybal</string>
 	<string name="type.sport.bowls">Bowls</string>
@@ -1582,14 +1605,14 @@
 	<string name="type.sport.soccer">Voetbal</string>
 	<string name="type.sport.swimming">Zwemmen</string>
 	<string name="type.sport.table_tennis">Tafeltennis</string>
-	<string name="type.sport.tennis">Tennisveld</string>
+	<string name="type.sport.tennis">Tennis</string>
 	<string name="type.sport.volleyball">Volleyball</string>
 	<string name="type.sport.10pin">Bowlen</string>
 	<string name="type.sport.9pin">Bowlen</string>
 	<string name="type.sport.padel">Padel</string>
 	<string name="type.sport.futsal">Futsal</string>
-	<string name="type.sport.ice_hockey">Ijshockey</string>
-	<string name="type.sport.field_hockey">Veld hockey</string>
+	<string name="type.sport.ice_hockey">IJshockey</string>
+	<string name="type.sport.field_hockey">Veldhockey</string>
 	<string name="type.sport.badminton">Badminton</string>
 	<string name="type.sport.pelota">Baskische peloton</string>
 	<string name="type.tourism">Tourisme</string>
@@ -1597,24 +1620,27 @@
 	<string name="type.tourism.apartment">Appartementen</string>
 	<string name="type.tourism.artwork">Kunstwerk</string>
 	<string name="type.tourism.artwork.architecture">Kunstwerk</string>
-	<string name="type.tourism.artwork.painting">Kunstwerk</string>
-	<string name="type.tourism.artwork.sculpture">Kunstwerk</string>
-	<string name="type.tourism.artwork.statue">Kunstwerk</string>
+	<string name="type.tourism.artwork.painting">Schilderij</string>
+	<string name="type.tourism.artwork.sculpture">Beeldhouwwerk</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.specified">Attractie</string>
+	<string name="type.tourism.camp_site">Kampeerterrein</string>
 	<string name="type.tourism.caravan_site">Caravan site</string>
-	<string name="type.tourism.gallery">Toerisme</string>
+	<string name="type.tourism.gallery">Galerij</string>
 	<string name="type.tourism.guest_house">Gasthuis</string>
+	<string name="type.tourism.hotel">Hotel</string>
 	<string name="type.tourism.information">Toeristische informatie</string>
 	<string name="type.tourism.information.board">Informatiebord</string>
 	<string name="type.tourism.information.guidepost">Wegwijzer</string>
 	<string name="type.tourism.information.map">Toeristische kaart</string>
 	<string name="type.tourism.information.office">Toeristische informatie</string>
+	<string name="type.tourism.museum">Museum</string>
 	<string name="type.tourism.picnic_site">Picnicplaats</string>
 	<string name="type.tourism.resort">Complex</string>
-	<string name="type.tourism.theme_park">Toerisme</string>
-	<string name="type.tourism.viewpoint">Uitzicht</string>
+	<string name="type.tourism.theme_park">Attractiepark</string>
+	<string name="type.tourism.viewpoint">Uitkijkpunt</string>
 	<string name="type.tourism.wilderness_hut">Wildernishut</string>
 	<string name="type.tourism.zoo">Dierentuin</string>
 	<string name="type.traffic_calming">Snelheidsmatigende maatregel</string>
@@ -1623,22 +1649,23 @@
 	<string name="type.waterway">Waterweg</string>
 	<string name="type.waterway.canal">Kanaal</string>
 	<string name="type.waterway.canal.tunnel">Kanaal</string>
+	<string name="type.waterway.dam">Dam</string>
 	<string name="type.waterway.ditch">Sloot</string>
-	<string name="type.waterway.ditch.tunnel">Sloot tunnel</string>
+	<string name="type.waterway.ditch.tunnel">Duiker</string>
 	<string name="type.waterway.dock">Dok</string>
 	<string name="type.waterway.drain">Afvoer</string>
 	<string name="type.waterway.drain.tunnel">Afvoer tunnel</string>
-	<string name="type.waterway.lock_gate">Gesloten poort</string>
+	<string name="type.waterway.lock_gate">Sluisdeur</string>
 	<string name="type.waterway.river">Rivier</string>
 	<string name="type.waterway.river.tunnel">Rivier</string>
 	<string name="type.waterway.riverbank">Rivier</string>
-	<string name="type.waterway.stream">Rivier</string>
+	<string name="type.waterway.stream">Beek</string>
 	<string name="type.waterway.stream.ephemeral">Rivier</string>
-	<string name="type.waterway.stream.intermittent">Rivier</string>
-	<string name="type.waterway.stream.tunnel">Rivier</string>
-	<string name="type.waterway.waterfall">Watervallen</string>
+	<string name="type.waterway.stream.intermittent">Beek</string>
+	<string name="type.waterway.stream.tunnel">Beek</string>
+	<string name="type.waterway.waterfall">Waterval</string>
 	<string name="type.waterway.weir">Stuw</string>
-	<string name="type.wheelchair">RolstoelS</string>
+	<string name="type.wheelchair">Rolstoel</string>
 	<string name="type.wheelchair.limited">Gedeeltelijk uitgerust voor gehandicapten</string>
 	<string name="type.wheelchair.no">Niet uitgerust voor gehandicapten</string>
 	<string name="type.wheelchair.yes">Uitgerust voor gehandicapten</string>
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 24943f770a..f0ea2b996f 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -8498,7 +8498,6 @@
 
   [type.highway.bridleway.permissive]
     ref = type.highway.bridleway
-    nl = Ruiterpad
     pl = Droga dla koni ograniczona
     pt-BR = Caminho para cavaleiros permissivo
 
@@ -8604,7 +8603,6 @@
 
   [type.highway.cycleway.permissive]
     ref = type.highway.cycleway
-    nl = Fietspad
     pl = Droga rowerowa ograniczona
     pt-BR = Caminho para ciclistas permissivo
 
@@ -9057,7 +9055,6 @@
     ref = type.highway.pedestrian
     en = Pedestrian Zone
     mr = पादचारी झोन
-    nl = Voetgangersgebied
     ru = Пешеходная зона
     tr = Yaya Alanı
     uk = Пішохідна зона
@@ -15739,28 +15736,28 @@
 
   [type.psurface]
     en = psurface
-    ru = Поверхность
     nl = Wegdek
+    ru = Поверхность
 
   [type.psurface.paved_bad]
     en = psurface-paved_bad
-    ru = Плохая асфальтированная
     nl = Verhard
+    ru = Плохая асфальтированная
 
   [type.psurface.paved_good]
     en = psurface-paved_good
-    ru = Хорошая асфальтированная
     nl = Verhard
+    ru = Хорошая асфальтированная
 
   [type.psurface.unpaved_bad]
     en = psurface-unpaved_bad
-    ru = Плохая неасфальтированная
     nl = Onverhard
+    ru = Плохая неасфальтированная
 
   [type.psurface.unpaved_good]
     en = psurface-unpaved_good
-    ru = Хорошая неасфальтированная
     nl = Onverhard
+    ru = Хорошая неасфальтированная
 
   [type.public_transport]
     en = Public Transport
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index ffbc570251..69f9e4d895 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1374,9 +1374,9 @@
 
 "type.amenity.parking.underground" = "Aparcamiento";
 
-"type.amenity.parking_entrance.private" = "Parking entrance";
+"type.amenity.parking_entrance.private" = "Entrada al aparcamiento";
 
-"type.amenity.parking_entrance.permissive" = "Parking entrance";
+"type.amenity.parking_entrance.permissive" = "Entrada al aparcamiento";
 
 "type.amenity.parking_entrance" = "Entrada al aparcamiento";
 
@@ -1557,7 +1557,7 @@
 
 "type.boundary.administrative.11" = "Frontera administrativa";
 
-"type.boundary.administrative.2" = "National Border";
+"type.boundary.administrative.2" = "Frontera de país";
 
 "type.boundary.administrative.3" = "Frontera administrativa";
 
@@ -1861,22 +1861,22 @@
 
 "type.highway.footway" = "Camino";
 
-"type.highway.footway.alpine_hiking" = "Path";
+"type.highway.footway.alpine_hiking" = "Camino";
 
 "type.highway.footway.area" = "Camino";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Puente";
 
-"type.highway.footway.demanding_alpine_hiking" = "Path";
+"type.highway.footway.demanding_alpine_hiking" = "Camino";
 
-"type.highway.footway.demanding_mountain_hiking" = "Path";
+"type.highway.footway.demanding_mountain_hiking" = "Camino";
 
-"type.highway.footway.difficult_alpine_hiking" = "Path";
+"type.highway.footway.difficult_alpine_hiking" = "Camino";
 
-"type.highway.footway.hiking" = "Path";
+"type.highway.footway.hiking" = "Camino";
 
-"type.highway.footway.mountain_hiking" = "Path";
+"type.highway.footway.mountain_hiking" = "Camino";
 
 "type.highway.footway.permissive" = "Camino";
 
@@ -2626,7 +2626,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular";
 
-"type.railway.halt" = "Train Station";
+"type.railway.halt" = "Estación de tren";
 
 "type.railway.level_crossing" = "Cruce de ferrocarril";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index fc55b18d93..24f44d97ce 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1893,7 +1893,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Tunnel";
 
-"type.highway.motorway" = "Via";
+"type.highway.motorway" = "Autostrada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway.bridge" = "Ponte";
@@ -1903,7 +1903,7 @@
 
 "type.highway.motorway_junction" = "Road Exit";
 
-"type.highway.motorway_link" = "Via";
+"type.highway.motorway_link" = "Autostrada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Ponte";
@@ -2101,7 +2101,7 @@
 
 "type.area_highway.living_street" = "Via";
 
-"type.area_highway.motorway" = "Via";
+"type.area_highway.motorway" = "Autostrada";
 
 "type.area_highway.path" = "Sentiero";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 53188b2b0a..26c2844adb 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1258,7 +1258,7 @@
 
 "type.aeroway.terminal" = "Terminal";
 
-"type.amenity" = "Infrastructuur objecten";
+"type.amenity" = "Voorzieningen";
 
 "type.amenity.arts_centre" = "Kunstcentrum";
 
@@ -1268,7 +1268,7 @@
 
 "type.amenity.bar" = "Bar";
 
-"type.amenity.bbq" = "Picnicplaats";
+"type.amenity.bbq" = "Barbecueplaats";
 
 "type.amenity.bench" = "Zitbank";
 
@@ -1286,13 +1286,13 @@
 
 "type.amenity.bus_station" = "Busstation";
 
-"type.amenity.cafe" = "Tearoom";
+"type.amenity.cafe" = "Café";
 
 "type.amenity.car_rental" = "Autoverhuur";
 
 "type.amenity.car_sharing" = "Autodelen";
 
-"type.amenity.car_wash" = "Car wash";
+"type.amenity.car_wash" = "Car Wash";
 
 "type.amenity.casino" = "Casino";
 
@@ -1306,7 +1306,7 @@
 
 "type.amenity.college" = "Hogeschool";
 
-"type.amenity.community_centre" = "Wijkcentrum";
+"type.amenity.community_centre" = "Gemeenschapscentrum";
 
 "type.amenity.courthouse" = "Rechtbank";
 
@@ -1333,18 +1333,18 @@
 "type.amenity.fuel" = "Tankstation";
 
 /* 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" = "Begraafplaats";
+"type.amenity.grave_yard" = "Kerkhof";
 
 /* 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" = "Begraafplaats";
+"type.amenity.grave_yard.christian" = "Christelijk kerkhof";
 
 "type.amenity.hospital" = "Ziekenhuis";
 
 "type.amenity.hunting_stand" = "Jaagplek";
 
-"type.amenity.ice_cream" = "Ijsstand";
+"type.amenity.ice_cream" = "IJssalon";
 
-"type.amenity.internet_cafe" = "Internetcafe";
+"type.amenity.internet_cafe" = "Internetcafé";
 
 "type.amenity.kindergarten" = "Kleuterschool";
 
@@ -1354,25 +1354,25 @@
 
 "type.amenity.motorcycle_parking" = "Parking Motorfietsen";
 
-"type.amenity.nightclub" = "Discotheek";
+"type.amenity.nightclub" = "Nachtclub";
 
 "type.amenity.nursing_home" = "Bejaardentehuis";
 
 "type.amenity.parking" = "Parkeerplaats";
 
-"type.amenity.parking.fee" = "Parkeerplaats";
+"type.amenity.parking.fee" = "Betaald parkeren";
 
 "type.amenity.parking.multi.storey" = "Parkeerplaats";
 
-"type.amenity.parking.no.access" = "Parkeerplaats";
+"type.amenity.parking.no.access" = "Privé parkeerplaats";
 
 "type.amenity.parking.park_and_ride" = "Parkeerplaats";
 
 "type.amenity.parking.permissive" = "Parkeerplaats";
 
-"type.amenity.parking.private" = "Parkeerplaats";
+"type.amenity.parking.private" = "Privé parkeerplaats";
 
-"type.amenity.parking.underground" = "Parkeerplaats";
+"type.amenity.parking.underground" = "Ondergrondse parkeerplaats";
 
 "type.amenity.parking_entrance.private" = "Parkeeringang";
 
@@ -1380,13 +1380,13 @@
 
 "type.amenity.parking_entrance" = "Parkeeringang";
 
-"type.amenity.parking_space" = "Parkeerplaats";
+"type.amenity.parking_space" = "Parkeerplek";
 
-"type.amenity.parking_space.permissive" = "Parkeerplaats";
+"type.amenity.parking_space.permissive" = "Parkeerplek";
 
-"type.amenity.parking_space.private" = "Parkeerplaats";
+"type.amenity.parking_space.private" = "Privé parkeerplek";
 
-"type.amenity.parking_space.underground" = "Parkeerplaats";
+"type.amenity.parking_space.underground" = "Ondergrondse parkeerplek";
 
 "type.amenity.parking_space.disabled" = "Invalide parkeerplaats";
 
@@ -1449,13 +1449,13 @@
 
 "type.recycling.cardboard" = "Karton";
 
-"type.recycling.cans" = "Blik";
+"type.recycling.cans" = "Blikafval";
 
 "type.recycling.shoes" = "Schoenen";
 
 "type.recycling.green_waste" = "GFT afval";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Drankverpakkingen";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1473,7 +1473,7 @@
 
 "type.amenity.theatre" = "Theater";
 
-"type.amenity.toilets" = "WC";
+"type.amenity.toilets" = "Toiletten";
 
 "type.amenity.townhall" = "Gemeentehuis";
 
@@ -1493,7 +1493,7 @@
 
 "type.amenity.vending_machine.newspapers" = "Krantenautomaat";
 
-"type.amenity.vending_machine.parking_tickets" = "Betaalautomaat parkeergarage";
+"type.amenity.vending_machine.parking_tickets" = "Betaalautomaat parkeerplaats";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Kaartjesautomaat voor openbaar vervoer";
 
@@ -1509,7 +1509,7 @@
 
 "type.amenity.waste_basket" = "Vuilnisbak";
 
-"type.amenity.waste_disposal" = "Uitschot";
+"type.amenity.waste_disposal" = "Vuilcontainer";
 
 "type.amenity.waste_transfer_station" = "Overslagstation voor afval";
 
@@ -1599,7 +1599,7 @@
 
 "type.building.has_parts" = "Gebouw";
 
-"type.building.train_station" = "Station";
+"type.building.train_station" = "Treinstation";
 
 "type.building.warehouse" = "Magazijn";
 
@@ -1831,14 +1831,14 @@
 
 /********** Types: Roads **********/
 
-"type.highway" = "Snelweg";
+"type.highway" = "Straat";
 
 "type.highway.bridleway" = "Ruiterpad";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Brug";
 
-"type.highway.bridleway.permissive" = "Pad toegankelijk voor ruiters";
+"type.highway.bridleway.permissive" = "Ruiterpad";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
@@ -1852,18 +1852,18 @@
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.cycleway.bridge" = "Brug";
 
-"type.highway.cycleway.permissive" = "Weg toegestaan voor fietsers";
+"type.highway.cycleway.permissive" = "Fietspad";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Lift";
 
-"type.highway.footway" = "Pad";
+"type.highway.footway" = "Voetpad";
 
 "type.highway.footway.alpine_hiking" = "Pad";
 
-"type.highway.footway.area" = "Pad";
+"type.highway.footway.area" = "Voetpad";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Brug";
@@ -1876,12 +1876,12 @@
 
 "type.highway.footway.hiking" = "Pad";
 
-"type.highway.footway.mountain_hiking" = "Pad";
+"type.highway.footway.mountain_hiking" = "Bergpad";
 
-"type.highway.footway.permissive" = "Pad";
+"type.highway.footway.permissive" = "Voetpad";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.footway.tunnel" = "Tunnel";
+"type.highway.footway.tunnel" = "Voetgangerstunnel";
 
 "type.highway.ford" = "Voorde";
 
@@ -1893,17 +1893,17 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Tunnel";
 
-"type.highway.motorway" = "Straat";
+"type.highway.motorway" = "Snelweg";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.motorway.bridge" = "Brug";
+"type.highway.motorway.bridge" = "Snelwegbrug";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.motorway.tunnel" = "Tunnel";
+"type.highway.motorway.tunnel" = "Snelwegtunnel";
 
 "type.highway.motorway_junction" = "Afrit";
 
-"type.highway.motorway_link" = "Straat";
+"type.highway.motorway_link" = "Snelweg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Brug";
@@ -1930,24 +1930,24 @@
 
 "type.highway.path.horse" = "Pad";
 
-"type.highway.path.mountain_hiking" = "Pad";
+"type.highway.path.mountain_hiking" = "Bergpad";
 
 "type.highway.path.permissive" = "Pad";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
-"type.highway.pedestrian" = "Straat";
+"type.highway.pedestrian" = "Voetgangersgebied";
 
-"type.highway.pedestrian.area" = "Straat";
+"type.highway.pedestrian.area" = "Voetgangersgebied";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.pedestrian.bridge" = "Brug";
+"type.highway.pedestrian.bridge" = "Voetgangersbrug";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.pedestrian.tunnel" = "Tunnel";
+"type.highway.pedestrian.tunnel" = "Voetgangerstunnel";
 
-"type.highway.primary" = "Straat";
+"type.highway.primary" = "Hoofdweg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary.bridge" = "Brug";
@@ -1955,7 +1955,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Tunnel";
 
-"type.highway.primary_link" = "Straat";
+"type.highway.primary_link" = "Hoofdweg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary_link.bridge" = "Brug";
@@ -1985,7 +1985,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Tunnel";
 
-"type.highway.secondary" = "Straat";
+"type.highway.secondary" = "Secundaire weg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Brug";
@@ -1993,7 +1993,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Tunnel";
 
-"type.highway.secondary_link" = "Straat";
+"type.highway.secondary_link" = "Secundaire weg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary_link.bridge" = "Brug";
@@ -2019,7 +2019,7 @@
 
 "type.highway.speed_camera" = "Flitspaal";
 
-"type.highway.steps" = "Pad";
+"type.highway.steps" = "Trap";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.steps.bridge" = "Brug";
@@ -2027,7 +2027,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Tunnel";
 
-"type.highway.tertiary" = "Straat";
+"type.highway.tertiary" = "Tertiaire weg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary.bridge" = "Brug";
@@ -2035,7 +2035,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Tunnel";
 
-"type.highway.tertiary_link" = "Straat";
+"type.highway.tertiary_link" = "Tertiaire weg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary_link.bridge" = "Brug";
@@ -2097,27 +2097,27 @@
 
 "type.area_highway.cycleway" = "Fietspad";
 
-"type.area_highway.footway" = "Pad";
+"type.area_highway.footway" = "Voetpad";
 
 "type.area_highway.living_street" = "Straat";
 
-"type.area_highway.motorway" = "Straat";
+"type.area_highway.motorway" = "Snelweg";
 
 "type.area_highway.path" = "Pad";
 
-"type.area_highway.pedestrian" = "Straat";
+"type.area_highway.pedestrian" = "Voetgangersgebied";
 
-"type.area_highway.primary" = "Straat";
+"type.area_highway.primary" = "Hoofdweg";
 
 "type.area_highway.residential" = "Straat";
 
-"type.area_highway.secondary" = "Straat";
+"type.area_highway.secondary" = "Secundaire weg";
 
 "type.area_highway.service" = "Straat";
 
-"type.area_highway.tertiary" = "Straat";
+"type.area_highway.tertiary" = "Tertiaire weg";
 
-"type.area_highway.steps" = "Pad";
+"type.area_highway.steps" = "Trap";
 
 "type.area_highway.track" = "Straat";
 
@@ -2132,7 +2132,7 @@
 
 /********** Types: Historic **********/
 
-"type.historic" = "Historisch";
+"type.historic" = "Historisch object";
 
 "type.historic.archaeological_site" = "Archeologische site";
 
@@ -2140,11 +2140,11 @@
 
 "type.historic.boundary_stone" = "Grenssteen";
 
-"type.historic.castle" = "Burcht";
+"type.historic.castle" = "Kasteel";
 
 "type.historic.castle.castrum" = "Castra";
 
-"type.historic.castle.defensive" = "Burcht";
+"type.historic.castle.defensive" = "Kasteel";
 
 "type.historic.castle.fortified_church" = "Weerkerk";
 
@@ -2160,7 +2160,7 @@
 
 "type.historic.castle.shiro" = "Japans kasteel";
 
-"type.historic.castle.stately" = "Kasteel";
+"type.historic.castle.stately" = "Landhuis";
 
 "type.historic.city_gate" = "Stadspoort";
 
@@ -2170,19 +2170,19 @@
 
 "type.historic.memorial" = "Gedenkteken";
 
-"type.historic.memorial.plaque" = "Gedenkteken";
+"type.historic.memorial.plaque" = "Plaquette";
 
-"type.historic.memorial.sculpture" = "Gedenkteken";
+"type.historic.memorial.sculpture" = "Beeldhouwwerk";
 
-"type.historic.memorial.statue" = "Gedenkteken";
+"type.historic.memorial.statue" = "Standbeeld";
 
 "type.historic.monument" = "Monument";
 
 "type.historic.ruins" = "Ruïne";
 
-"type.historic.ship" = "Toerisme";
+"type.historic.ship" = "Historisch schip";
 
-"type.historic.tomb" = "Toerisme";
+"type.historic.tomb" = "Graftombe";
 
 "type.historic.wayside_cross" = "Kruis";
 
@@ -2216,7 +2216,7 @@
 
 "type.internet_access" = "Internet";
 
-"type.internet_access.wlan" = "Internet";
+"type.internet_access.wlan" = "Draadloos internet";
 
 "type.junction" = "Kruispunt";
 
@@ -2234,7 +2234,7 @@
 "type.landuse.cemetery" = "Begraafplaats";
 
 /* 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" = "Begraafplaats";
+"type.landuse.cemetery.christian" = "Christelijke begraafplaats";
 
 "type.landuse.churchyard" = "Kerkhof";
 
@@ -2254,11 +2254,11 @@
 
 "type.landuse.forest" = "Bos";
 
-"type.landuse.forest.coniferous" = "Bos";
+"type.landuse.forest.coniferous" = "Naaldbos";
 
-"type.landuse.forest.deciduous" = "Bos";
+"type.landuse.forest.deciduous" = "Loofbos";
 
-"type.landuse.forest.mixed" = "Bos";
+"type.landuse.forest.mixed" = "Gemengd bos";
 
 "type.landuse.garages" = "Garages";
 
@@ -2274,7 +2274,7 @@
 
 "type.landuse.meadow" = "Weiland";
 
-"type.landuse.military" = "Military Area";
+"type.landuse.military" = "Militair terrein";
 
 "type.landuse.orchard" = "Boomgaard";
 
@@ -2300,7 +2300,7 @@
 
 "type.leisure.common" = "Openbare grond";
 
-"type.leisure.dog_park" = "Plaats voor hondenuitlaten";
+"type.leisure.dog_park" = "Hondenuitlaatplek";
 
 "type.leisure.fitness_centre" = "Fitnesscentrum";
 
@@ -2320,11 +2320,11 @@
 
 "type.leisure.park" = "Park";
 
-"type.leisure.park.no.access" = "Park";
+"type.leisure.park.no.access" = "Ontoegankelijk park";
 
 "type.leisure.park.permissive" = "Park";
 
-"type.leisure.park.private" = "Park";
+"type.leisure.park.private" = "Privé park";
 
 "type.leisure.picnic_table" = "Picknicktafel";
 
@@ -2348,7 +2348,7 @@
 
 "type.leisure.swimming_pool" = "Zwembad";
 
-"type.leisure.swimming_pool.private" = "Zwembad";
+"type.leisure.swimming_pool.private" = "Privé zwembad";
 
 "type.leisure.track" = "Parcours";
 
@@ -2394,7 +2394,7 @@
 
 "type.man_made.water_tower" = "Watertoren";
 
-"type.man_made.water_well" = "Waterbron";
+"type.man_made.water_well" = "Waterput";
 
 "type.man_made.windmill" = "Windmolen";
 
@@ -2410,7 +2410,7 @@
 
 "type.mountain_pass" = "Bergpas";
 
-"type.natural" = "Natuurlijk";
+"type.natural" = "Natuur";
 
 "type.natural.bare_rock" = "Kale steen";
 
@@ -2546,7 +2546,7 @@
 
 "type.place.hamlet" = "Gehucht";
 
-"type.place.island" = "Eilandje";
+"type.place.island" = "Eiland";
 
 "type.place.islet" = "Eilandje";
 
@@ -2568,7 +2568,7 @@
 
 "type.place.state.USA" = "Deelstaat";
 
-"type.place.suburb" = "Buitenwijken";
+"type.place.suburb" = "Buitenwijk";
 
 "type.place.town" = "Stad";
 
@@ -2582,7 +2582,7 @@
 
 "type.power.line.underground" = "Ondergrondse hoogspanningsleiding";
 
-"type.power.minor_line" = "Laag/middelspanningsleiding";
+"type.power.minor_line" = "Laag-/middelspanningsleiding";
 
 "type.power.pole" = "Elektriciteitspaal";
 
@@ -2590,17 +2590,17 @@
 
 "type.power.substation" = "Substation";
 
-"type.power.tower" = "Elektriciteitspaal";
+"type.power.tower" = "Elektriciteitsmast";
 
-"type.psurface" = "psurface";
+"type.psurface" = "Wegdek";
 
-"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_bad" = "Verhard";
 
-"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.paved_good" = "Verhard";
 
-"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_bad" = "Onverhard";
 
-"type.psurface.unpaved_good" = "psurface-unpaved_good";
+"type.psurface.unpaved_good" = "Onverhard";
 
 "type.public_transport" = "Openbaar vervoer";
 
@@ -2648,7 +2648,7 @@
 
 "type.railway.narrow_gauge.tunnel" = "Smalspoortunnel";
 
-"type.railway.platform" = "Spoor";
+"type.railway.platform" = "Perron";
 
 "type.railway.preserved" = "Museumspoorbaan";
 
@@ -2684,7 +2684,7 @@
 
 "type.railway.station.monorail" = "Station";
 
-"type.railway.station.subway" = "Metro";
+"type.railway.station.subway" = "Metrostation";
 
 "type.railway.station.subway.barcelona" = "Metro";
 
@@ -2788,15 +2788,15 @@
 
 "type.shop.chemist" = "Drogisterij";
 
-"type.shop.chocolate" = "Winkel";
+"type.shop.chocolate" = "Chocolaterie";
 
 "type.shop.clothes" = "Kledingwinkel";
 
-"type.shop.coffee" = "Winkel";
+"type.shop.coffee" = "Koffiewinkel";
 
 "type.shop.computer" = "Computerwinkel";
 
-"type.shop.confectionery" = "Banketbakker";
+"type.shop.confectionery" = "Snoepwinkel";
 
 "type.shop.convenience" = "Buurtwinkel";
 
@@ -2808,7 +2808,7 @@
 
 "type.shop.department_store" = "Warenhuis";
 
-"type.shop.doityourself" = "Ijzerhandel";
+"type.shop.doityourself" = "IJzerhandel";
 
 "type.shop.dry_cleaning" = "Droogkuis";
 
@@ -2816,7 +2816,7 @@
 
 "type.shop.erotic" = "Erotiekwinkel";
 
-"type.shop.fabric" = "Winkel";
+"type.shop.fabric" = "Stoffenwinkel";
 
 "type.shop.farm" = "Boerderijwinkel";
 
@@ -2832,11 +2832,11 @@
 
 "type.shop.greengrocer" = "Groentenwinkel";
 
-"type.shop.grocery" = "Boodschap";
+"type.shop.grocery" = "Boodschappen";
 
 "type.shop.hairdresser" = "Kapper";
 
-"type.shop.hardware" = "Ijzerwaren";
+"type.shop.hardware" = "IJzerwaren";
 
 "type.shop.health_food" = "Natuurvoedingswinkel";
 
@@ -2850,7 +2850,7 @@
 
 "type.shop.laundry" = "Wasserette";
 
-"type.shop.mall" = "Het winkelcentrum";
+"type.shop.mall" = "Winkelcentrum";
 
 "type.shop.massage" = "Massagesalon";
 
@@ -2860,9 +2860,9 @@
 
 "type.shop.motorcycle" = "Motorzaak";
 
-"type.shop.music" = "Winkel";
+"type.shop.music" = "Muziekwinkel";
 
-"type.shop.musical_instrument" = "Winkel";
+"type.shop.musical_instrument" = "Muziekinstrumentenwinkel";
 
 "type.shop.newsagent" = "Kiosk";
 
@@ -2870,7 +2870,7 @@
 
 "type.shop.outdoor" = "Outdooruitrusting";
 
-"type.shop.pastry" = "Gebakje";
+"type.shop.pastry" = "Banketbakker";
 
 "type.shop.pawnbroker" = "Pandjesbaas";
 
@@ -2892,7 +2892,7 @@
 
 "type.shop.tattoo" = "Tattoosalon";
 
-"type.shop.tea" = "Winkel";
+"type.shop.tea" = "Theewinkel";
 
 "type.shop.ticket" = "Kaartjesverkoop";
 
@@ -2908,9 +2908,9 @@
 
 "type.shop.video_games" = "Winkel voor videogames";
 
-"type.shop.wine" = "Wijn";
+"type.shop.wine" = "Wijnhandel";
 
-"type.shop.antiques" = "Antiek";
+"type.shop.antiques" = "Antiekhandel";
 
 "type.shop.art" = "Kunstwinkel";
 
@@ -2940,7 +2940,7 @@
 
 "type.shop.nutrition_supplements" = "Voedingssupplementen";
 
-"type.shop.paint" = "Verven";
+"type.shop.paint" = "Verfwinkel";
 
 "type.shop.perfumery" = "Parfumerie";
 
@@ -2948,17 +2948,17 @@
 
 "type.shop.storage_rental" = "Opslag verhuur";
 
-"type.shop.tobacco" = "Tabak";
+"type.shop.tobacco" = "Tabakszaak";
 
 "type.shop.trade" = "Handelsbenodigdheden";
 
-"type.shop.watches" = "Horloges";
+"type.shop.watches" = "Horlogezaak";
 
-"type.shop.wholesale" = "Groothandel winkel";
+"type.shop.wholesale" = "Groothandel";
 
 "type.sport" = "Sport";
 
-"type.sport.american_football" = "Amerikaans voetbal";
+"type.sport.american_football" = "American football";
 
 "type.sport.archery" = "Boogschieten";
 
@@ -2966,7 +2966,7 @@
 
 "type.sport.australian_football" = "Australian football";
 
-"type.sport.baseball" = "Basketbal";
+"type.sport.baseball" = "Honkbal";
 
 "type.sport.basketball" = "Basketbal";
 
@@ -3005,7 +3005,7 @@
 
 "type.sport.table_tennis" = "Tafeltennis";
 
-"type.sport.tennis" = "Tennisveld";
+"type.sport.tennis" = "Tennis";
 
 "type.sport.volleyball" = "Volleyball";
 
@@ -3017,9 +3017,9 @@
 
 "type.sport.futsal" = "Futsal";
 
-"type.sport.ice_hockey" = "Ijshockey";
+"type.sport.ice_hockey" = "IJshockey";
 
-"type.sport.field_hockey" = "Veld hockey";
+"type.sport.field_hockey" = "Veldhockey";
 
 "type.sport.badminton" = "Badminton";
 
@@ -3035,11 +3035,11 @@
 
 "type.tourism.artwork.architecture" = "Kunstwerk";
 
-"type.tourism.artwork.painting" = "Kunstwerk";
+"type.tourism.artwork.painting" = "Schilderij";
 
-"type.tourism.artwork.sculpture" = "Kunstwerk";
+"type.tourism.artwork.sculpture" = "Beeldhouwwerk";
 
-"type.tourism.artwork.statue" = "Kunstwerk";
+"type.tourism.artwork.statue" = "Standbeeld";
 
 "type.tourism.attraction" = "Attractie";
 
@@ -3047,13 +3047,13 @@
 
 "type.tourism.attraction.specified" = "Attractie";
 
-"type.tourism.camp_site" = "Camping";
+"type.tourism.camp_site" = "Kampeerterrein";
 
 "type.tourism.caravan_site" = "Caravan site";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Toerisme";
+"type.tourism.gallery" = "Galerij";
 
 "type.tourism.guest_house" = "Gasthuis";
 
@@ -3079,9 +3079,9 @@
 
 "type.tourism.resort" = "Complex";
 
-"type.tourism.theme_park" = "Toerisme";
+"type.tourism.theme_park" = "Attractiepark";
 
-"type.tourism.viewpoint" = "Uitzicht";
+"type.tourism.viewpoint" = "Uitkijkpunt";
 
 "type.tourism.wilderness_hut" = "Wildernishut";
 
@@ -3103,7 +3103,7 @@
 
 "type.waterway.ditch" = "Sloot";
 
-"type.waterway.ditch.tunnel" = "Sloot tunnel";
+"type.waterway.ditch.tunnel" = "Duiker";
 
 "type.waterway.dock" = "Dok";
 
@@ -3111,7 +3111,7 @@
 
 "type.waterway.drain.tunnel" = "Afvoer tunnel";
 
-"type.waterway.lock_gate" = "Gesloten poort";
+"type.waterway.lock_gate" = "Sluisdeur";
 
 "type.waterway.river" = "Rivier";
 
@@ -3119,19 +3119,19 @@
 
 "type.waterway.riverbank" = "Rivier";
 
-"type.waterway.stream" = "Rivier";
+"type.waterway.stream" = "Beek";
 
 "type.waterway.stream.ephemeral" = "Rivier";
 
-"type.waterway.stream.intermittent" = "Rivier";
+"type.waterway.stream.intermittent" = "Beek";
 
-"type.waterway.stream.tunnel" = "Rivier";
+"type.waterway.stream.tunnel" = "Beek";
 
-"type.waterway.waterfall" = "Watervallen";
+"type.waterway.waterfall" = "Waterval";
 
 "type.waterway.weir" = "Stuw";
 
-"type.wheelchair" = "RolstoelS";
+"type.wheelchair" = "Rolstoel";
 
 "type.wheelchair.limited" = "Gedeeltelijk uitgerust voor gehandicapten";