diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index f83b6621ca..1079320f0b 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -270,6 +270,7 @@
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<!-- Duplicates [address] in strings.txt -->
 	<string name="type.building.address">Dirección</string>
+	<string name="type.cuisine.mexican">Cocina mexicana</string>
 	<string name="type.entrance.exit">Salida</string>
 
 	<!-- SECTION: Types: Roads -->
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 4c75bf773e..b0c2ba7a81 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -546,7 +546,7 @@
 	<string name="editor_share_to_all_dialog_title">¿Quiere enviarlo a todos los usuarios?</string>
 	<!-- Dialog before publishing the modifications to the public map. -->
 	<string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato personal.</string>
-	<string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
+	<string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto con usted si tienen alguna pregunta.</string>
 	<string name="navigation_stop_button">detener</string>
 	<!-- For the first routing -->
 	<string name="accept">Aceptar</string>
@@ -896,7 +896,7 @@
 	<string name="type.amenity.parking.no.access">Aparcamiento privado</string>
 	<string name="type.amenity.parking.permissive">Aparcamiento privado</string>
 	<string name="type.amenity.parking.private">Aparcamiento privado</string>
-	<string name="type.amenity.parking.park_and_ride">Aparcamiento</string>
+	<string name="type.amenity.parking.park_and_ride">Aparcamiento disuasorio</string>
 	<string name="type.amenity.parking.underground">Aparcamiento subterráneo</string>
 	<string name="type.amenity.parking.underground.fee">Aparcamiento subterráneo</string>
 	<string name="type.amenity.parking.underground.private">Aparcamiento subterráneo privado</string>
@@ -917,15 +917,15 @@
 	<string name="type.amenity.payment_terminal">Terminal de pago</string>
 	<string name="type.amenity.pharmacy">Farmacia</string>
 	<string name="type.amenity.place_of_worship">Lugar de culto</string>
-	<string name="type.amenity.place_of_worship.buddhist">Templo</string>
+	<string name="type.amenity.place_of_worship.buddhist">Templo budista</string>
 	<string name="type.amenity.place_of_worship.christian">Iglesia</string>
 	<string name="type.amenity.place_of_worship.christian.mormon">Iglesia de Jesucristo de los Santos de los Últimos Días</string>
 	<string name="type.amenity.place_of_worship.christian.jehovahs_witness">Salón del Reino de los Testigos de Jehová</string>
-	<string name="type.amenity.place_of_worship.hindu">Templo</string>
+	<string name="type.amenity.place_of_worship.hindu">Templo hindú</string>
 	<string name="type.amenity.place_of_worship.jewish">Sinagoga</string>
 	<string name="type.amenity.place_of_worship.muslim">Mezquita</string>
-	<string name="type.amenity.place_of_worship.shinto">Ermita</string>
-	<string name="type.amenity.place_of_worship.taoist">Templo</string>
+	<string name="type.amenity.place_of_worship.shinto">Santuario sintoísta</string>
+	<string name="type.amenity.place_of_worship.taoist">Templo taoísta</string>
 	<string name="type.amenity.police">Policía</string>
 	<string name="type.amenity.post_box">Buzón de correos</string>
 	<string name="type.amenity.post_office">Oficina de correos</string>
@@ -997,12 +997,12 @@
 	<string name="type.barrier.fence">Valla</string>
 	<string name="type.barrier.gate">Puerta</string>
 	<string name="type.barrier.hedge">Seto</string>
-	<string name="type.barrier.kissing_gate">Puerta</string>
+	<string name="type.barrier.kissing_gate">Puerta peatonal</string>
 	<string name="type.barrier.lift_gate">Barrera</string>
 	<string name="type.barrier.retaining_wall">Muro de contención</string>
 	<string name="type.barrier.stile">Escalón</string>
 	<string name="type.barrier.turnstile">Torniquete</string>
-	<string name="type.barrier.swing_gate">Barrera</string>
+	<string name="type.barrier.swing_gate">Barrera batiente</string>
 	<string name="type.barrier.toll_booth">Cabina de peaje</string>
 	<string name="type.barrier.wall">Muro</string>
 	<string name="type.boundary">Frontera</string>
@@ -1125,7 +1125,7 @@
 	<string name="type.cuisine.malagasy">Cocina malgache</string>
 	<string name="type.cuisine.malaysian">Cocina malaya</string>
 	<string name="type.cuisine.mediterranean">Cocina mediterránea</string>
-	<string name="type.cuisine.mexican">Cocina mexicana</string>
+	<string name="type.cuisine.mexican">Cocina mejicana</string>
 	<string name="type.cuisine.moroccan">Cocina marroquí</string>
 	<string name="type.cuisine.noodles">Tallarines</string>
 	<string name="type.cuisine.oriental">Cocina oriental</string>
@@ -1163,7 +1163,7 @@
 	<string name="type.entrance">Entrada</string>
 	<!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
 	<string name="type.entrance.main">Entrada principal</string>
-	<string name="type.entrance.exit">Salir</string>
+	<string name="type.entrance.exit">Salida</string>
 	<string name="type.fee.no">Gratis</string>
 	<string name="type.healthcare.laboratory">Laboratorio médico</string>
 	<string name="type.healthcare.physiotherapist">Fisioterapeuta</string>
@@ -1209,37 +1209,37 @@
 	<string name="type.highway.footway.demanding_mountain_hiking">Camino</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Camino</string>
 	<string name="type.highway.footway.hiking">Sendero</string>
-	<string name="type.highway.footway.mountain_hiking">Camino</string>
+	<string name="type.highway.footway.mountain_hiking">Sendero de montaña</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Túnel peatonal</string>
 	<string name="type.highway.ford">Vado</string>
-	<string name="type.highway.living_street">Calle</string>
+	<string name="type.highway.living_street">Calle de prioridad peatonal</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.living_street.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Túnel</string>
-	<string name="type.highway.motorway">Calle</string>
+	<string name="type.highway.motorway">Autopista</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.motorway.bridge">Puente</string>
+	<string name="type.highway.motorway.bridge">Puente de autopista</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.motorway.tunnel">Túnel</string>
+	<string name="type.highway.motorway.tunnel">Túnel de autopista</string>
 	<string name="type.highway.motorway_junction">Salida</string>
-	<string name="type.highway.motorway_link">Calle</string>
+	<string name="type.highway.motorway_link">Enlace de autopista</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway_link.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Camino</string>
-	<string name="type.highway.path.alpine_hiking">Camino</string>
-	<string name="type.highway.path.bicycle">Camino</string>
+	<string name="type.highway.path.alpine_hiking">Senderismo alpino</string>
+	<string name="type.highway.path.bicycle">Camino para bicicletas</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Puente</string>
-	<string name="type.highway.path.demanding_alpine_hiking">Camino</string>
-	<string name="type.highway.path.demanding_mountain_hiking">Camino</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Senderismo alpino exigente</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Senderismo de montaña exigente</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Camino</string>
-	<string name="type.highway.path.hiking">Camino</string>
-	<string name="type.highway.path.horse">Camino</string>
-	<string name="type.highway.path.mountain_hiking">Camino</string>
+	<string name="type.highway.path.hiking">Sendero</string>
+	<string name="type.highway.path.horse">Sendero de herradura</string>
+	<string name="type.highway.path.mountain_hiking">Sendero de montaña</string>
 	<string name="type.highway.path.permissive">Camino</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Túnel</string>
@@ -1249,49 +1249,49 @@
 	<string name="type.highway.pedestrian.bridge">Puente peatonal</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.pedestrian.tunnel">Túnel peatonal</string>
-	<string name="type.highway.primary">Calle</string>
+	<string name="type.highway.primary">Carretera principal</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.primary.tunnel">Túnel</string>
-	<string name="type.highway.primary_link">Calle</string>
+	<string name="type.highway.primary.tunnel">Túnel de carretera principal</string>
+	<string name="type.highway.primary_link">Enlace de carretera principal</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary_link.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary_link.tunnel">Túnel</string>
 	<string name="type.highway.raceway">Circuito</string>
-	<string name="type.highway.residential">Calle</string>
-	<string name="type.highway.residential.area">Calle</string>
+	<string name="type.highway.residential">Calle residencial</string>
+	<string name="type.highway.residential.area">Calle residencial</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.residential.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.residential.tunnel">Túnel</string>
+	<string name="type.highway.residential.tunnel">Túnel de calle residencial</string>
 	<string name="type.highway.rest_area">Área de descanso</string>
-	<string name="type.highway.road">Calle</string>
+	<string name="type.highway.road">Carretera</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.road.bridge">Puente</string>
 	<!-- A bridge structure outline. -->
 	<string name="type.man_made.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.road.tunnel">Túnel</string>
-	<string name="type.highway.secondary">Calle</string>
+	<string name="type.highway.secondary">Carretera secundaria</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.secondary.tunnel">Túnel</string>
-	<string name="type.highway.secondary_link">Calle</string>
+	<string name="type.highway.secondary.tunnel">Túnel de carretera secundaria</string>
+	<string name="type.highway.secondary_link">Enlace de carretera secundaria</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary_link.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary_link.tunnel">Túnel</string>
-	<string name="type.highway.service">Calle</string>
-	<string name="type.highway.service.area">Calle</string>
+	<string name="type.highway.service">Vía de servicio</string>
+	<string name="type.highway.service.area">Vía de servicio</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.service.bridge">Puente</string>
-	<string name="type.highway.service.driveway">Calle</string>
-	<string name="type.highway.service.parking_aisle">Calle</string>
+	<string name="type.highway.service.bridge">Puente de carretera de servicio</string>
+	<string name="type.highway.service.driveway">Vía de servicio</string>
+	<string name="type.highway.service.parking_aisle">Pasillo de estacionamiento</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.service.tunnel">Túnel</string>
+	<string name="type.highway.service.tunnel">Túnel de vía de servicio</string>
 	<string name="type.highway.services">Área de servicio</string>
 	<string name="type.highway.speed_camera">Radar de velocidad</string>
 	<string name="type.highway.steps">Escaleras</string>
@@ -1299,12 +1299,12 @@
 	<string name="type.highway.steps.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.steps.tunnel">Túnel</string>
-	<string name="type.highway.tertiary">Calle</string>
+	<string name="type.highway.tertiary">Carretera terciaria</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.tertiary.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary.tunnel">Túnel</string>
-	<string name="type.highway.tertiary_link">Calle</string>
+	<string name="type.highway.tertiary_link">Enlace de carretera terciaria</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.tertiary_link.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1323,37 +1323,37 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Túnel</string>
 	<string name="type.highway.traffic_signals">Semáforos</string>
-	<string name="type.highway.trunk">Calle</string>
+	<string name="type.highway.trunk">Vía rápida</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk.tunnel">Túnel</string>
-	<string name="type.highway.trunk_link">Calle</string>
+	<string name="type.highway.trunk_link">Enlace de vía rápida</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk_link.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk_link.tunnel">Túnel</string>
-	<string name="type.highway.unclassified">Calle</string>
-	<string name="type.highway.unclassified.area">Calle</string>
+	<string name="type.highway.unclassified">Carretera sin clasificar</string>
+	<string name="type.highway.unclassified.area">Carretera sin clasificar</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.unclassified.bridge">Puente</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.unclassified.tunnel">Túnel</string>
+	<string name="type.highway.unclassified.tunnel">Túnel de carretera sin clasificar</string>
 	<string name="type.area_highway.cycleway">Ciclovía</string>
 	<string name="type.area_highway.footway">Camino</string>
-	<string name="type.area_highway.living_street">Calle</string>
-	<string name="type.area_highway.motorway">Calle</string>
+	<string name="type.area_highway.living_street">Calle de prioridad peatonal</string>
+	<string name="type.area_highway.motorway">Autopista</string>
 	<string name="type.area_highway.path">Camino</string>
 	<string name="type.area_highway.pedestrian">Calle peatonal</string>
-	<string name="type.area_highway.primary">Calle</string>
-	<string name="type.area_highway.residential">Calle</string>
-	<string name="type.area_highway.secondary">Calle</string>
-	<string name="type.area_highway.service">Calle</string>
-	<string name="type.area_highway.tertiary">Calle</string>
+	<string name="type.area_highway.primary">Carretera principal</string>
+	<string name="type.area_highway.residential">Calle residencial</string>
+	<string name="type.area_highway.secondary">Carretera secundaria</string>
+	<string name="type.area_highway.service">Vía de servicio</string>
+	<string name="type.area_highway.tertiary">Carretera terciaria</string>
 	<string name="type.area_highway.steps">Escaleras</string>
 	<string name="type.area_highway.track">Pista</string>
-	<string name="type.area_highway.trunk">Calle</string>
-	<string name="type.area_highway.unclassified">Calle</string>
+	<string name="type.area_highway.trunk">Vía rápida</string>
+	<string name="type.area_highway.unclassified">Carretera sin clasificar</string>
 
 	<!-- SECTION: Types: Historic -->
 	<string name="type.historic">Objeto histórico</string>
@@ -1365,7 +1365,7 @@
 	<string name="type.historic.cannon">Cañón</string>
 	<string name="type.historic.castle">Castillo</string>
 	<string name="type.historic.castle.castrum">Castrum</string>
-	<string name="type.historic.castle.defensive">Castillo</string>
+	<string name="type.historic.castle.defensive">Castillo defensivo</string>
 	<string name="type.historic.castle.fortified_church">Iglesia fortificada</string>
 	<string name="type.historic.castle.fortress">Fortaleza</string>
 	<string name="type.historic.castle.hillfort">Castro</string>
@@ -1399,10 +1399,13 @@
 	<string name="type.historic.wreck">Naufragio</string>
 	<string name="type.internet_access">Internet</string>
 	<string name="type.internet_access.wlan">Internet</string>
+	<string name="type.junction">Cruce</string>
 	<string name="type.junction.circular">Rotonda</string>
 	<string name="type.junction.roundabout">Rotonda</string>
 	<string name="type.landuse">Uso del suelo</string>
+	<string name="type.landuse.allotments">Huerto urbano</string>
 	<string name="type.landuse.basin">Cuenca</string>
+	<string name="type.landuse.brownfield">Solar abandonado</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">Cementerio</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. -->
@@ -1432,19 +1435,22 @@
 	<string name="type.landuse.quarry">Cantera</string>
 	<string name="type.landuse.railway">Instalaciones ferroviarias</string>
 	<string name="type.landuse.recreation_ground">Área recreativa</string>
-	<string name="type.landuse.reservoir">Cuenca</string>
+	<string name="type.landuse.reservoir">Embalse</string>
 	<string name="type.landuse.residential">Zona residencial</string>
 	<string name="type.landuse.retail">Zona comercial</string>
-	<string name="type.landuse.salt_pond">Estanque</string>
+	<string name="type.landuse.salt_pond">Salina</string>
+	<string name="type.landuse.village_green">Espacio verde</string>
 	<string name="type.landuse.vineyard">Viñedo</string>
 	<string name="type.leisure">Ocio</string>
+	<string name="type.leisure.common">Zona pública</string>
 	<string name="type.leisure.dog_park">Parque para perros</string>
 	<string name="type.leisure.fitness_centre">Centro de fitness</string>
-	<string name="type.leisure.fitness_station">Gimnasio</string>
+	<string name="type.leisure.fitness_station">Parque de fitness</string>
 	<string name="type.leisure.dance">Salón de baile</string>
 	<string name="type.leisure.garden">Jardín</string>
 	<string name="type.leisure.garden.residential">Jardín residencial</string>
 	<string name="type.leisure.golf_course">Campo de golf</string>
+	<string name="type.leisure.hackerspace">Espacio para hackers</string>
 	<string name="type.leisure.ice_rink">Pisa de patinaje</string>
 	<string name="type.leisure.marina">Marina</string>
 	<string name="type.leisure.nature_reserve">Reserva natural</string>
@@ -1458,6 +1464,7 @@
 	<string name="type.leisure.playground">Patio de recreo</string>
 	<string name="type.leisure.recreation_ground">Zona recreativa</string>
 	<string name="type.leisure.sauna">Sauna</string>
+	<string name="type.leisure.slipway">Rampa de barcos</string>
 	<string name="type.leisure.sports_centre">Polideportivo</string>
 	<string name="type.sport.climbing">Centro de escalada</string>
 	<string name="type.sport.yoga">Centro de yoga</string>
@@ -1468,8 +1475,11 @@
 	<string name="type.leisure.track.area">Pista deportiva</string>
 	<string name="type.leisure.water_park">Parque acuático</string>
 	<string name="type.leisure.beach_resort">Resort de playa</string>
+	<string name="type.man_made">Construcción artificial</string>
 	<string name="type.man_made.breakwater">Rompeolas</string>
+	<string name="type.man_made.cairn">Mojón</string>
 	<string name="type.man_made.chimney">Chimenea de fábrica</string>
+	<string name="type.man_made.cutline">Línea de corte forestal</string>
 	<string name="type.man_made.survey_point">Punto geodésico</string>
 	<string name="type.man_made.flagpole">Mástil de bandera</string>
 	<string name="type.man_made.lighthouse">Faro</string>
@@ -1504,7 +1514,7 @@
 	<string name="type.man_made.embankment">Terraplén</string>
 	<string name="type.natural.coastline">Costa</string>
 	<string name="type.natural.desert">Desierto</string>
-	<string name="type.natural.geyser">Geiser</string>
+	<string name="type.natural.geyser">Géiser</string>
 	<string name="type.natural.glacier">Glaciar</string>
 	<string name="type.natural.grassland">Herbazal</string>
 	<string name="type.natural.heath">Brezal</string>
@@ -1519,7 +1529,7 @@
 	<string name="type.natural.meadow">Prado</string>
 	<string name="type.natural.orchard">Huerto frutal</string>
 	<string name="type.natural.peak">Cima</string>
-	<string name="type.natural.saddle">Silla de montaña</string>
+	<string name="type.natural.saddle">Collado</string>
 	<string name="type.natural.rock">Roca</string>
 	<string name="type.natural.scrub">Matorrales</string>
 	<string name="type.natural.spring">Manantial</string>
@@ -1531,6 +1541,7 @@
 	<string name="type.natural.wetland">Terreno pantanoso</string>
 	<string name="type.natural.wetland.bog">Turbera</string>
 	<string name="type.natural.wetland.marsh">Ciénaga</string>
+	<string name="type.noexit">Sin salida</string>
 	<string name="type.office">Oficina</string>
 	<string name="type.office.company">Oficina</string>
 	<string name="type.office.estate_agent">Agente inmobiliario</string>
@@ -1538,7 +1549,7 @@
 	<string name="type.office.insurance">Oficina de seguros</string>
 	<string name="type.office.lawyer">Despacho de abogados</string>
 	<string name="type.office.ngo">Sede de ONG</string>
-	<string name="type.office.telecommunication">Operadora de telefonía móvil</string>
+	<string name="type.office.telecommunication">Operadora de telefonía</string>
 	<string name="type.organic.only">Orgánico</string>
 	<string name="type.organic.yes">Orgánico</string>
 	<string name="type.place.city">Ciudad</string>
@@ -1555,7 +1566,7 @@
 	<string name="type.place.city.capital.9">Ciudad</string>
 	<string name="type.place.continent">Continente</string>
 	<string name="type.place.country">País</string>
-	<string name="type.place.county">Municipio</string>
+	<string name="type.place.county">Condado</string>
 	<string name="type.place.farm">Granja</string>
 	<string name="type.place.hamlet">Aldea</string>
 	<string name="type.place.island">Isla</string>
@@ -1600,6 +1611,7 @@
 	<string name="type.railway.funicular">Funicular</string>
 	<string name="type.railway.halt">Punto de parada</string>
 	<string name="type.railway.level_crossing">Cruce de ferrocarril</string>
+	<string name="type.railway.light_rail">Tren ligero</string>
 	<string name="type.railway.monorail">Tren de monorraíl</string>
 	<string name="type.railway.narrow_gauge">Vía férrea de ancho estrecho</string>
 	<string name="type.railway.platform">Plataforma de vía férrea</string>
@@ -1749,6 +1761,8 @@
 	<string name="type.railway.station.subway.yerevan">Metro</string>
 	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway">Línea de metro</string>
+	<string name="type.railway.subway.bridge">Puente de metro</string>
+	<string name="type.railway.subway.tunnel">Túnel de metro</string>
 	<string name="type.railway.subway_entrance">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.adana">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.algiers">Entrada al metro</string>
@@ -1862,6 +1876,8 @@
 	<string name="type.railway.subway_entrance.yerevan">Entrada al metro</string>
 	<string name="type.railway.subway_entrance.yokohama">Entrada al metro</string>
 	<string name="type.railway.tram">Línea de tranvía</string>
+	<string name="type.railway.tram.bridge">Puente de tranvía</string>
+	<string name="type.railway.tram.tunnel">Túnel de tranvía</string>
 	<string name="type.railway.tram_stop">Parada de tranvía</string>
 	<string name="type.route">Ruta</string>
 	<string name="type.route.ferry">Ruta de ferry</string>
@@ -1894,7 +1910,7 @@
 	<string name="type.shop.curtain">Cortinas</string>
 	<string name="type.shop.deli">Tienda de delicatessen</string>
 	<string name="type.shop.department_store">Grandes almacenes</string>
-	<string name="type.shop.doityourself">Ferretería</string>
+	<string name="type.shop.doityourself">Tienda de bricolaje</string>
 	<string name="type.shop.dry_cleaning">Tintorería</string>
 	<string name="type.shop.electronics">Electrónica</string>
 	<string name="type.shop.erotic">Sex Shop</string>
@@ -1910,8 +1926,9 @@
 	<string name="type.shop.greengrocer">Frutería</string>
 	<string name="type.shop.grocery">Tienda de comestibles</string>
 	<string name="type.shop.hairdresser">Peluquería</string>
+	<string name="type.shop.hardware">Ferretería</string>
 	<string name="type.shop.health_food">Tienda de comida saludable</string>
-	<string name="type.shop.herbalist">Tienda de hierbas</string>
+	<string name="type.shop.herbalist">Herbolario</string>
 	<string name="type.shop.hifi">Audio de alta fidelidad</string>
 	<string name="type.shop.houseware">Tienda de artículos para el hogar</string>
 	<string name="type.shop.jewelry">Joyería</string>
@@ -1963,7 +1980,7 @@
 	<string name="type.shop.bed">Tienda de camas</string>
 	<string name="type.shop.boutique">Boutique</string>
 	<string name="type.shop.charity">Tienda de caridad</string>
-	<string name="type.shop.cheese">Tienda de queso</string>
+	<string name="type.shop.cheese">Tienda de quesos</string>
 	<string name="type.shop.craft">Artes y manualidades</string>
 	<string name="type.shop.dairy">Productos lácteos</string>
 	<string name="type.shop.electrical">Tienda de electricidad</string>
@@ -2025,7 +2042,7 @@
 	<string name="type.tourism.artwork.sculpture">Obras de arte</string>
 	<string name="type.tourism.artwork.statue">Obras de arte</string>
 	<string name="type.tourism.attraction">Atracción turística</string>
-	<string name="type.tourism.attraction.animal">Atracción turística</string>
+	<string name="type.tourism.attraction.animal">Recinto de animales</string>
 	<string name="type.tourism.attraction.specified">Atracción turística</string>
 	<string name="type.tourism.camp_site">Camping</string>
 	<string name="type.tourism.caravan_site">Zona de caravanas</string>
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 8df1b3747d..ec6c838f83 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -854,7 +854,7 @@
 /* Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato personal.";
 
-"editor_share_to_all_dialog_message_2" = "Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.";
+"editor_share_to_all_dialog_message_2" = "Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto con usted si tienen alguna pregunta.";
 
 "navigation_stop_button" = "detener";
 
@@ -1476,7 +1476,7 @@
 
 "type.amenity.place_of_worship" = "Lugar de culto";
 
-"type.amenity.place_of_worship.buddhist" = "Templo";
+"type.amenity.place_of_worship.buddhist" = "Templo budista";
 
 "type.amenity.place_of_worship.christian" = "Iglesia";
 
@@ -1484,15 +1484,15 @@
 
 "type.amenity.place_of_worship.christian.jehovahs_witness" = "Salón del Reino de los Testigos de Jehová";
 
-"type.amenity.place_of_worship.hindu" = "Templo";
+"type.amenity.place_of_worship.hindu" = "Templo hindú";
 
 "type.amenity.place_of_worship.jewish" = "Sinagoga";
 
 "type.amenity.place_of_worship.muslim" = "Mezquita";
 
-"type.amenity.place_of_worship.shinto" = "Ermita";
+"type.amenity.place_of_worship.shinto" = "Santuario sintoísta";
 
-"type.amenity.place_of_worship.taoist" = "Templo";
+"type.amenity.place_of_worship.taoist" = "Templo taoísta";
 
 "type.amenity.police" = "Policía";
 
@@ -1645,7 +1645,7 @@
 
 "type.barrier.turnstile" = "Torniquete";
 
-"type.barrier.swing_gate" = "Barrera";
+"type.barrier.swing_gate" = "Barrera batiente";
 
 "type.barrier.toll_booth" = "Cabina de peaje";
 
@@ -2049,14 +2049,14 @@
 
 "type.highway.footway.hiking" = "Sendero";
 
-"type.highway.footway.mountain_hiking" = "Camino";
+"type.highway.footway.mountain_hiking" = "Sendero de montaña";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Túnel";
 
 "type.highway.ford" = "Vado";
 
-"type.highway.living_street" = "Calle";
+"type.highway.living_street" = "Calle de prioridad peatonal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.living_street.bridge" = "Puente";
@@ -2064,7 +2064,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Túnel";
 
-"type.highway.motorway" = "Calle";
+"type.highway.motorway" = "Autopista";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway.bridge" = "Puente";
@@ -2074,7 +2074,7 @@
 
 "type.highway.motorway_junction" = "Salida";
 
-"type.highway.motorway_link" = "Calle";
+"type.highway.motorway_link" = "Autopista";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Puente";
@@ -2118,7 +2118,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Túnel";
 
-"type.highway.primary" = "Calle";
+"type.highway.primary" = "Carretera principal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary.bridge" = "Puente";
@@ -2126,7 +2126,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Túnel";
 
-"type.highway.primary_link" = "Calle";
+"type.highway.primary_link" = "Carretera principal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary_link.bridge" = "Puente";
@@ -2136,9 +2136,9 @@
 
 "type.highway.raceway" = "Circuito";
 
-"type.highway.residential" = "Calle";
+"type.highway.residential" = "Calle residencial";
 
-"type.highway.residential.area" = "Calle";
+"type.highway.residential.area" = "Calle residencial";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Puente";
@@ -2148,7 +2148,7 @@
 
 "type.highway.rest_area" = "Área de descanso";
 
-"type.highway.road" = "Calle";
+"type.highway.road" = "Carretera";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.road.bridge" = "Puente";
@@ -2159,7 +2159,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Túnel";
 
-"type.highway.secondary" = "Calle";
+"type.highway.secondary" = "Carretera secundaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Puente";
@@ -2167,7 +2167,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Túnel";
 
-"type.highway.secondary_link" = "Calle";
+"type.highway.secondary_link" = "Carretera secundaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary_link.bridge" = "Puente";
@@ -2175,16 +2175,16 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Túnel";
 
-"type.highway.service" = "Calle";
+"type.highway.service" = "Vía de servicio";
 
-"type.highway.service.area" = "Calle";
+"type.highway.service.area" = "Vía de servicio";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.service.bridge" = "Puente";
 
-"type.highway.service.driveway" = "Calle";
+"type.highway.service.driveway" = "Vía de servicio";
 
-"type.highway.service.parking_aisle" = "Calle";
+"type.highway.service.parking_aisle" = "Vía de servicio";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.service.tunnel" = "Túnel";
@@ -2201,7 +2201,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Túnel";
 
-"type.highway.tertiary" = "Calle";
+"type.highway.tertiary" = "Carretera terciaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary.bridge" = "Puente";
@@ -2209,7 +2209,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Túnel";
 
-"type.highway.tertiary_link" = "Calle";
+"type.highway.tertiary_link" = "Carretera terciaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary_link.bridge" = "Puente";
@@ -2243,7 +2243,7 @@
 
 "type.highway.traffic_signals" = "Semáforos";
 
-"type.highway.trunk" = "Calle";
+"type.highway.trunk" = "Vía rápida";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk.bridge" = "Puente";
@@ -2251,7 +2251,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk.tunnel" = "Túnel";
 
-"type.highway.trunk_link" = "Calle";
+"type.highway.trunk_link" = "Vía rápida";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk_link.bridge" = "Puente";
@@ -2259,9 +2259,9 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk_link.tunnel" = "Túnel";
 
-"type.highway.unclassified" = "Calle";
+"type.highway.unclassified" = "Carretera sin clasificar";
 
-"type.highway.unclassified.area" = "Calle";
+"type.highway.unclassified.area" = "Carretera sin clasificar";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.unclassified.bridge" = "Puente";
@@ -2273,31 +2273,31 @@
 
 "type.area_highway.footway" = "Camino";
 
-"type.area_highway.living_street" = "Calle";
+"type.area_highway.living_street" = "Calle de prioridad peatonal";
 
-"type.area_highway.motorway" = "Calle";
+"type.area_highway.motorway" = "Autopista";
 
 "type.area_highway.path" = "Camino";
 
 "type.area_highway.pedestrian" = "Calle peatonal";
 
-"type.area_highway.primary" = "Calle";
+"type.area_highway.primary" = "Carretera principal";
 
-"type.area_highway.residential" = "Calle";
+"type.area_highway.residential" = "Calle residencial";
 
-"type.area_highway.secondary" = "Calle";
+"type.area_highway.secondary" = "Carretera secundaria";
 
-"type.area_highway.service" = "Calle";
+"type.area_highway.service" = "Vía de servicio";
 
-"type.area_highway.tertiary" = "Calle";
+"type.area_highway.tertiary" = "Carretera terciaria";
 
 "type.area_highway.steps" = "Escaleras";
 
 "type.area_highway.track" = "Pista";
 
-"type.area_highway.trunk" = "Calle";
+"type.area_highway.trunk" = "Vía rápida";
 
-"type.area_highway.unclassified" = "Calle";
+"type.area_highway.unclassified" = "Carretera sin clasificar";
 
 "type.highway.world_level" = "highway-world_level";
 
@@ -2324,7 +2324,7 @@
 
 "type.historic.castle.castrum" = "Castrum";
 
-"type.historic.castle.defensive" = "Castillo";
+"type.historic.castle.defensive" = "Castillo defensivo";
 
 "type.historic.castle.fortified_church" = "Iglesia fortificada";
 
@@ -2418,7 +2418,7 @@
 
 "type.internet_access.wlan" = "Internet";
 
-"type.junction" = "Junction";
+"type.junction" = "Cruce";
 
 "type.junction.circular" = "Rotonda";
 
@@ -2426,11 +2426,11 @@
 
 "type.landuse" = "Uso del suelo";
 
-"type.landuse.allotments" = "Allotments";
+"type.landuse.allotments" = "Huerto urbano";
 
 "type.landuse.basin" = "Cuenca";
 
-"type.landuse.brownfield" = "Brownfield";
+"type.landuse.brownfield" = "Solar abandonado";
 
 /* 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" = "Cementerio";
@@ -2488,27 +2488,27 @@
 
 "type.landuse.recreation_ground" = "Área recreativa";
 
-"type.landuse.reservoir" = "Cuenca";
+"type.landuse.reservoir" = "Embalse";
 
 "type.landuse.residential" = "Zona residencial";
 
 "type.landuse.retail" = "Zona comercial";
 
-"type.landuse.salt_pond" = "Estanque";
+"type.landuse.salt_pond" = "Salina";
 
-"type.landuse.village_green" = "Land";
+"type.landuse.village_green" = "Espacio verde";
 
 "type.landuse.vineyard" = "Viñedo";
 
 "type.leisure" = "Ocio";
 
-"type.leisure.common" = "Public Land";
+"type.leisure.common" = "Zona pública";
 
 "type.leisure.dog_park" = "Lugar para pasear al perro";
 
 "type.leisure.fitness_centre" = "Centro de fitness";
 
-"type.leisure.fitness_station" = "Gimnasio";
+"type.leisure.fitness_station" = "Parque de fitness";
 
 "type.leisure.dance" = "Salón de baile";
 
@@ -2546,7 +2546,7 @@
 
 "type.leisure.sauna" = "Sauna";
 
-"type.leisure.slipway" = "Slipway";
+"type.leisure.slipway" = "Rampa de barcos";
 
 "type.leisure.sports_centre" = "Polideportivo";
 
@@ -2568,15 +2568,15 @@
 
 "type.leisure.beach_resort" = "Resort de playa";
 
-"type.man_made" = "Man Made";
+"type.man_made" = "Construcción artificial";
 
 "type.man_made.breakwater" = "Rompeolas";
 
-"type.man_made.cairn" = "Cairn";
+"type.man_made.cairn" = "Mojón";
 
 "type.man_made.chimney" = "Chimenea de fábrica";
 
-"type.man_made.cutline" = "Cutline";
+"type.man_made.cutline" = "Línea de corte forestal";
 
 "type.man_made.survey_point" = "Punto geodésico";
 
@@ -2680,7 +2680,7 @@
 
 "type.natural.peak" = "Cima";
 
-"type.natural.saddle" = "Silla de montaña";
+"type.natural.saddle" = "Collado";
 
 "type.natural.rock" = "Roca";
 
@@ -2704,7 +2704,7 @@
 
 "type.natural.wetland.marsh" = "Ciénaga";
 
-"type.noexit" = "Dead End";
+"type.noexit" = "Sin salida";
 
 "type.office" = "Oficina";
 
@@ -2720,7 +2720,7 @@
 
 "type.office.ngo" = "Sede de ONG";
 
-"type.office.telecommunication" = "Operadora de telefonía móvil";
+"type.office.telecommunication" = "Operadora de telefonía";
 
 "type.organic.only" = "Orgánico";
 
@@ -2754,7 +2754,7 @@
 
 "type.place.country" = "País";
 
-"type.place.county" = "Municipio";
+"type.place.county" = "Condado";
 
 "type.place.farm" = "Granja";
 
@@ -2862,7 +2862,7 @@
 
 "type.railway.level_crossing" = "Cruce de ferrocarril";
 
-"type.railway.light_rail" = "Light Rail";
+"type.railway.light_rail" = "Tren ligero";
 
 "type.railway.light_rail.bridge" = "Light Rail Bridge";
 
@@ -3177,9 +3177,9 @@
 
 "type.railway.subway" = "Línea de metro";
 
-"type.railway.subway.bridge" = "Subway Line Bridge";
+"type.railway.subway.bridge" = "Puente de metro";
 
-"type.railway.subway.tunnel" = "Subway Line Tunnel";
+"type.railway.subway.tunnel" = "Túnel de metro";
 
 "type.railway.subway_entrance" = "Entrada de metro";
 
@@ -3407,9 +3407,9 @@
 
 "type.railway.tram" = "Línea de tranvía";
 
-"type.railway.tram.bridge" = "Tram Line Bridge";
+"type.railway.tram.bridge" = "Puente de tranvía";
 
-"type.railway.tram.tunnel" = "Tram Line Tunnel";
+"type.railway.tram.tunnel" = "Túnel de tranvía";
 
 "type.railway.tram_stop" = "Parada de tranvía";
 
@@ -3477,7 +3477,7 @@
 
 "type.shop.department_store" = "Grandes almacenes";
 
-"type.shop.doityourself" = "Ferretería";
+"type.shop.doityourself" = "Tienda de bricolaje";
 
 "type.shop.dry_cleaning" = "Tintorería";
 
@@ -3509,11 +3509,11 @@
 
 "type.shop.hairdresser" = "Peluquería";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Ferretería";
 
 "type.shop.health_food" = "Tienda de comida saludable";
 
-"type.shop.herbalist" = "Tienda de hierbas";
+"type.shop.herbalist" = "Herbolario";
 
 "type.shop.hifi" = "Audio de alta fidelidad";
 
@@ -3616,7 +3616,7 @@
 
 "type.shop.charity" = "Tienda de caridad";
 
-"type.shop.cheese" = "Tienda de queso";
+"type.shop.cheese" = "Tienda de quesos";
 
 "type.shop.craft" = "Artes y manualidades";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 9da5bf05f2..808de7d628 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -854,7 +854,7 @@
 /* Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato personal.";
 
-"editor_share_to_all_dialog_message_2" = "Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.";
+"editor_share_to_all_dialog_message_2" = "Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto con usted si tienen alguna pregunta.";
 
 "navigation_stop_button" = "detener";
 
@@ -1437,7 +1437,7 @@
 
 "type.amenity.parking.private" = "Aparcamiento privado";
 
-"type.amenity.parking.park_and_ride" = "Aparcamiento";
+"type.amenity.parking.park_and_ride" = "Aparcamiento disuasorio";
 
 "type.amenity.parking.underground" = "Aparcamiento subterráneo";
 
@@ -1479,7 +1479,7 @@
 
 "type.amenity.place_of_worship" = "Lugar de culto";
 
-"type.amenity.place_of_worship.buddhist" = "Templo";
+"type.amenity.place_of_worship.buddhist" = "Templo budista";
 
 "type.amenity.place_of_worship.christian" = "Iglesia";
 
@@ -1487,15 +1487,15 @@
 
 "type.amenity.place_of_worship.christian.jehovahs_witness" = "Salón del Reino de los Testigos de Jehová";
 
-"type.amenity.place_of_worship.hindu" = "Templo";
+"type.amenity.place_of_worship.hindu" = "Templo hindú";
 
 "type.amenity.place_of_worship.jewish" = "Sinagoga";
 
 "type.amenity.place_of_worship.muslim" = "Mezquita";
 
-"type.amenity.place_of_worship.shinto" = "Ermita";
+"type.amenity.place_of_worship.shinto" = "Santuario sintoísta";
 
-"type.amenity.place_of_worship.taoist" = "Templo";
+"type.amenity.place_of_worship.taoist" = "Templo taoísta";
 
 "type.amenity.police" = "Policía";
 
@@ -1638,7 +1638,7 @@
 
 "type.barrier.hedge" = "Seto";
 
-"type.barrier.kissing_gate" = "Puerta";
+"type.barrier.kissing_gate" = "Puerta peatonal";
 
 "type.barrier.lift_gate" = "Barrera";
 
@@ -1648,7 +1648,7 @@
 
 "type.barrier.turnstile" = "Torniquete";
 
-"type.barrier.swing_gate" = "Barrera";
+"type.barrier.swing_gate" = "Barrera batiente";
 
 "type.barrier.toll_booth" = "Cabina de peaje";
 
@@ -1892,7 +1892,7 @@
 
 "type.cuisine.mediterranean" = "Cocina mediterránea";
 
-"type.cuisine.mexican" = "Cocina mexicana";
+"type.cuisine.mexican" = "Cocina mejicana";
 
 "type.cuisine.moroccan" = "Cocina marroquí";
 
@@ -1966,7 +1966,7 @@
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Entrada principal";
 
-"type.entrance.exit" = "Salir";
+"type.entrance.exit" = "Salida";
 
 "type.fee.yes" = "💲";
 
@@ -2052,14 +2052,14 @@
 
 "type.highway.footway.hiking" = "Sendero";
 
-"type.highway.footway.mountain_hiking" = "Camino";
+"type.highway.footway.mountain_hiking" = "Sendero de montaña";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Túnel peatonal";
 
 "type.highway.ford" = "Vado";
 
-"type.highway.living_street" = "Calle";
+"type.highway.living_street" = "Calle de prioridad peatonal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.living_street.bridge" = "Puente";
@@ -2067,17 +2067,17 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Túnel";
 
-"type.highway.motorway" = "Calle";
+"type.highway.motorway" = "Autopista";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.motorway.bridge" = "Puente";
+"type.highway.motorway.bridge" = "Puente de autopista";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.motorway.tunnel" = "Túnel";
+"type.highway.motorway.tunnel" = "Túnel de autopista";
 
 "type.highway.motorway_junction" = "Salida";
 
-"type.highway.motorway_link" = "Calle";
+"type.highway.motorway_link" = "Enlace de autopista";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway_link.bridge" = "Puente";
@@ -2087,24 +2087,24 @@
 
 "type.highway.path" = "Camino";
 
-"type.highway.path.alpine_hiking" = "Camino";
+"type.highway.path.alpine_hiking" = "Senderismo alpino";
 
-"type.highway.path.bicycle" = "Camino";
+"type.highway.path.bicycle" = "Camino para bicicletas";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Puente";
 
-"type.highway.path.demanding_alpine_hiking" = "Camino";
+"type.highway.path.demanding_alpine_hiking" = "Senderismo alpino exigente";
 
-"type.highway.path.demanding_mountain_hiking" = "Camino";
+"type.highway.path.demanding_mountain_hiking" = "Senderismo de montaña exigente";
 
 "type.highway.path.difficult_alpine_hiking" = "Camino";
 
-"type.highway.path.hiking" = "Camino";
+"type.highway.path.hiking" = "Sendero";
 
-"type.highway.path.horse" = "Camino";
+"type.highway.path.horse" = "Sendero de herradura";
 
-"type.highway.path.mountain_hiking" = "Camino";
+"type.highway.path.mountain_hiking" = "Sendero de montaña";
 
 "type.highway.path.permissive" = "Camino";
 
@@ -2121,15 +2121,15 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Túnel peatonal";
 
-"type.highway.primary" = "Calle";
+"type.highway.primary" = "Carretera principal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary.bridge" = "Puente";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.primary.tunnel" = "Túnel";
+"type.highway.primary.tunnel" = "Túnel de carretera principal";
 
-"type.highway.primary_link" = "Calle";
+"type.highway.primary_link" = "Enlace de carretera principal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary_link.bridge" = "Puente";
@@ -2139,19 +2139,19 @@
 
 "type.highway.raceway" = "Circuito";
 
-"type.highway.residential" = "Calle";
+"type.highway.residential" = "Calle residencial";
 
-"type.highway.residential.area" = "Calle";
+"type.highway.residential.area" = "Calle residencial";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Puente";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.residential.tunnel" = "Túnel";
+"type.highway.residential.tunnel" = "Túnel de calle residencial";
 
 "type.highway.rest_area" = "Área de descanso";
 
-"type.highway.road" = "Calle";
+"type.highway.road" = "Carretera";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.road.bridge" = "Puente";
@@ -2162,15 +2162,15 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Túnel";
 
-"type.highway.secondary" = "Calle";
+"type.highway.secondary" = "Carretera secundaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Puente";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.secondary.tunnel" = "Túnel";
+"type.highway.secondary.tunnel" = "Túnel de carretera secundaria";
 
-"type.highway.secondary_link" = "Calle";
+"type.highway.secondary_link" = "Enlace de carretera secundaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary_link.bridge" = "Puente";
@@ -2178,19 +2178,19 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Túnel";
 
-"type.highway.service" = "Calle";
+"type.highway.service" = "Vía de servicio";
 
-"type.highway.service.area" = "Calle";
+"type.highway.service.area" = "Vía de servicio";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.service.bridge" = "Puente";
+"type.highway.service.bridge" = "Puente de carretera de servicio";
 
-"type.highway.service.driveway" = "Calle";
+"type.highway.service.driveway" = "Vía de servicio";
 
-"type.highway.service.parking_aisle" = "Calle";
+"type.highway.service.parking_aisle" = "Pasillo de estacionamiento";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.service.tunnel" = "Túnel";
+"type.highway.service.tunnel" = "Túnel de vía de servicio";
 
 "type.highway.services" = "Área de servicio";
 
@@ -2204,7 +2204,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Túnel";
 
-"type.highway.tertiary" = "Calle";
+"type.highway.tertiary" = "Carretera terciaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary.bridge" = "Puente";
@@ -2212,7 +2212,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Túnel";
 
-"type.highway.tertiary_link" = "Calle";
+"type.highway.tertiary_link" = "Enlace de carretera terciaria";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary_link.bridge" = "Puente";
@@ -2246,7 +2246,7 @@
 
 "type.highway.traffic_signals" = "Semáforos";
 
-"type.highway.trunk" = "Calle";
+"type.highway.trunk" = "Vía rápida";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk.bridge" = "Puente";
@@ -2254,7 +2254,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk.tunnel" = "Túnel";
 
-"type.highway.trunk_link" = "Calle";
+"type.highway.trunk_link" = "Enlace de vía rápida";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk_link.bridge" = "Puente";
@@ -2262,45 +2262,45 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk_link.tunnel" = "Túnel";
 
-"type.highway.unclassified" = "Calle";
+"type.highway.unclassified" = "Carretera sin clasificar";
 
-"type.highway.unclassified.area" = "Calle";
+"type.highway.unclassified.area" = "Carretera sin clasificar";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.unclassified.bridge" = "Puente";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.unclassified.tunnel" = "Túnel";
+"type.highway.unclassified.tunnel" = "Túnel de carretera sin clasificar";
 
 "type.area_highway.cycleway" = "Ciclovía";
 
 "type.area_highway.footway" = "Camino";
 
-"type.area_highway.living_street" = "Calle";
+"type.area_highway.living_street" = "Calle de prioridad peatonal";
 
-"type.area_highway.motorway" = "Calle";
+"type.area_highway.motorway" = "Autopista";
 
 "type.area_highway.path" = "Camino";
 
 "type.area_highway.pedestrian" = "Calle peatonal";
 
-"type.area_highway.primary" = "Calle";
+"type.area_highway.primary" = "Carretera principal";
 
-"type.area_highway.residential" = "Calle";
+"type.area_highway.residential" = "Calle residencial";
 
-"type.area_highway.secondary" = "Calle";
+"type.area_highway.secondary" = "Carretera secundaria";
 
-"type.area_highway.service" = "Calle";
+"type.area_highway.service" = "Vía de servicio";
 
-"type.area_highway.tertiary" = "Calle";
+"type.area_highway.tertiary" = "Carretera terciaria";
 
 "type.area_highway.steps" = "Escaleras";
 
 "type.area_highway.track" = "Pista";
 
-"type.area_highway.trunk" = "Calle";
+"type.area_highway.trunk" = "Vía rápida";
 
-"type.area_highway.unclassified" = "Calle";
+"type.area_highway.unclassified" = "Carretera sin clasificar";
 
 "type.highway.world_level" = "highway-world_level";
 
@@ -2327,7 +2327,7 @@
 
 "type.historic.castle.castrum" = "Castrum";
 
-"type.historic.castle.defensive" = "Castillo";
+"type.historic.castle.defensive" = "Castillo defensivo";
 
 "type.historic.castle.fortified_church" = "Iglesia fortificada";
 
@@ -2421,7 +2421,7 @@
 
 "type.internet_access.wlan" = "Internet";
 
-"type.junction" = "Junction";
+"type.junction" = "Cruce";
 
 "type.junction.circular" = "Rotonda";
 
@@ -2429,11 +2429,11 @@
 
 "type.landuse" = "Uso del suelo";
 
-"type.landuse.allotments" = "Allotments";
+"type.landuse.allotments" = "Huerto urbano";
 
 "type.landuse.basin" = "Cuenca";
 
-"type.landuse.brownfield" = "Brownfield";
+"type.landuse.brownfield" = "Solar abandonado";
 
 /* 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" = "Cementerio";
@@ -2491,27 +2491,27 @@
 
 "type.landuse.recreation_ground" = "Área recreativa";
 
-"type.landuse.reservoir" = "Cuenca";
+"type.landuse.reservoir" = "Embalse";
 
 "type.landuse.residential" = "Zona residencial";
 
 "type.landuse.retail" = "Zona comercial";
 
-"type.landuse.salt_pond" = "Estanque";
+"type.landuse.salt_pond" = "Salina";
 
-"type.landuse.village_green" = "Land";
+"type.landuse.village_green" = "Espacio verde";
 
 "type.landuse.vineyard" = "Viñedo";
 
 "type.leisure" = "Ocio";
 
-"type.leisure.common" = "Public Land";
+"type.leisure.common" = "Zona pública";
 
 "type.leisure.dog_park" = "Parque para perros";
 
 "type.leisure.fitness_centre" = "Centro de fitness";
 
-"type.leisure.fitness_station" = "Gimnasio";
+"type.leisure.fitness_station" = "Parque de fitness";
 
 "type.leisure.dance" = "Salón de baile";
 
@@ -2521,7 +2521,7 @@
 
 "type.leisure.golf_course" = "Campo de golf";
 
-"type.leisure.hackerspace" = "Hackerspace";
+"type.leisure.hackerspace" = "Espacio para hackers";
 
 "type.leisure.ice_rink" = "Pisa de patinaje";
 
@@ -2549,7 +2549,7 @@
 
 "type.leisure.sauna" = "Sauna";
 
-"type.leisure.slipway" = "Slipway";
+"type.leisure.slipway" = "Rampa de barcos";
 
 "type.leisure.sports_centre" = "Polideportivo";
 
@@ -2571,15 +2571,15 @@
 
 "type.leisure.beach_resort" = "Resort de playa";
 
-"type.man_made" = "Man Made";
+"type.man_made" = "Construcción artificial";
 
 "type.man_made.breakwater" = "Rompeolas";
 
-"type.man_made.cairn" = "Cairn";
+"type.man_made.cairn" = "Mojón";
 
 "type.man_made.chimney" = "Chimenea de fábrica";
 
-"type.man_made.cutline" = "Cutline";
+"type.man_made.cutline" = "Línea de corte forestal";
 
 "type.man_made.survey_point" = "Punto geodésico";
 
@@ -2653,7 +2653,7 @@
 
 "type.natural.desert" = "Desierto";
 
-"type.natural.geyser" = "Geiser";
+"type.natural.geyser" = "Géiser";
 
 "type.natural.glacier" = "Glaciar";
 
@@ -2683,7 +2683,7 @@
 
 "type.natural.peak" = "Cima";
 
-"type.natural.saddle" = "Silla de montaña";
+"type.natural.saddle" = "Collado";
 
 "type.natural.rock" = "Roca";
 
@@ -2707,7 +2707,7 @@
 
 "type.natural.wetland.marsh" = "Ciénaga";
 
-"type.noexit" = "Dead End";
+"type.noexit" = "Sin salida";
 
 "type.office" = "Oficina";
 
@@ -2723,7 +2723,7 @@
 
 "type.office.ngo" = "Sede de ONG";
 
-"type.office.telecommunication" = "Operadora de telefonía móvil";
+"type.office.telecommunication" = "Operadora de telefonía";
 
 "type.organic.only" = "Orgánico";
 
@@ -2757,7 +2757,7 @@
 
 "type.place.country" = "País";
 
-"type.place.county" = "Municipio";
+"type.place.county" = "Condado";
 
 "type.place.farm" = "Granja";
 
@@ -2865,7 +2865,7 @@
 
 "type.railway.level_crossing" = "Cruce de ferrocarril";
 
-"type.railway.light_rail" = "Light Rail";
+"type.railway.light_rail" = "Tren ligero";
 
 "type.railway.light_rail.bridge" = "Light Rail Bridge";
 
@@ -3180,9 +3180,9 @@
 
 "type.railway.subway" = "Línea de metro";
 
-"type.railway.subway.bridge" = "Subway Line Bridge";
+"type.railway.subway.bridge" = "Puente de metro";
 
-"type.railway.subway.tunnel" = "Subway Line Tunnel";
+"type.railway.subway.tunnel" = "Túnel de metro";
 
 "type.railway.subway_entrance" = "Entrada al metro";
 
@@ -3410,9 +3410,9 @@
 
 "type.railway.tram" = "Línea de tranvía";
 
-"type.railway.tram.bridge" = "Tram Line Bridge";
+"type.railway.tram.bridge" = "Puente de tranvía";
 
-"type.railway.tram.tunnel" = "Tram Line Tunnel";
+"type.railway.tram.tunnel" = "Túnel de tranvía";
 
 "type.railway.tram_stop" = "Parada de tranvía";
 
@@ -3480,7 +3480,7 @@
 
 "type.shop.department_store" = "Grandes almacenes";
 
-"type.shop.doityourself" = "Ferretería";
+"type.shop.doityourself" = "Tienda de bricolaje";
 
 "type.shop.dry_cleaning" = "Tintorería";
 
@@ -3512,11 +3512,11 @@
 
 "type.shop.hairdresser" = "Peluquería";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Ferretería";
 
 "type.shop.health_food" = "Tienda de comida saludable";
 
-"type.shop.herbalist" = "Tienda de hierbas";
+"type.shop.herbalist" = "Herbolario";
 
 "type.shop.hifi" = "Audio de alta fidelidad";
 
@@ -3619,7 +3619,7 @@
 
 "type.shop.charity" = "Tienda de caridad";
 
-"type.shop.cheese" = "Tienda de queso";
+"type.shop.cheese" = "Tienda de quesos";
 
 "type.shop.craft" = "Artes y manualidades";
 
@@ -3742,7 +3742,7 @@
 
 "type.tourism.attraction" = "Atracción turística";
 
-"type.tourism.attraction.animal" = "Atracción turística";
+"type.tourism.attraction.animal" = "Recinto de animales";
 
 "type.tourism.attraction.specified" = "Atracción turística";