diff --git a/android/app/src/main/res/values-el/types_strings.xml b/android/app/src/main/res/values-el/types_strings.xml
index dd6ebc0c2..d32dce0b1 100644
--- a/android/app/src/main/res/values-el/types_strings.xml
+++ b/android/app/src/main/res/values-el/types_strings.xml
@@ -142,7 +142,7 @@
     <string name="type.amenity.shelter.basic_hut">καταφύγιο bivouac</string>
     <string name="type.amenity.public_bath">Δημόσιο Λουτρό</string>
     <string name="type.amenity.shower">Ντους</string>
-    <string name="type.amenity.stripclub">Stripclub</string>
+    <string name="type.amenity.stripclub">Στριπτιζάδικο</string>
     <string name="type.amenity.taxi">Ταξί</string>
     <string name="type.amenity.telephone">Τηλέφωνο</string>
     <string name="type.amenity.theatre">Θέατρο</string>
@@ -1014,7 +1014,7 @@
     <string name="type.shop.laundry">Άπλυτα</string>
     <string name="type.shop.mall">Εμπορικό κέντρο</string>
     <string name="type.shop.massage">Αίθουσα μασάζ</string>
-    <string name="type.shop.mobile_phone">Κινητή Τηλεφωνία</string>
+    <string name="type.shop.mobile_phone">Κατάστημα κινητής τηλεφωνίας</string>
     <string name="type.shop.money_lender">Δανειστής χρημάτων</string>
     <string name="type.shop.motorcycle">Κατάστημα μοτοσυκλετών</string>
     <string name="type.shop.motorcycle_repair">Επισκευή μοτοσυκλετών</string>
@@ -1183,7 +1183,7 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
     <string name="type.emergency.emergency_ward_entrance">Είσοδος θαλάμου έκτακτης ανάγκης</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Dojo</string>
+    <string name="type.amenity.dojo">Ντότζο</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Αθλητική αίθουσα</string>
     <string name="type.piste_type.downhill.advanced">Προχωρημένη πίστα κατάβασης σκι</string>
@@ -1254,4 +1254,10 @@
     <string name="type.railway.subway.tunnel">Σήραγγα γραμμής μετρό</string>
     <string name="type.man_made.crane">Γερανός</string>
     <string name="type.railway.station.subway.qingdao">Σταθμός μετρό</string>
+    <string name="type.junction.circular">Κυκλικός κόμβος</string>
+    <string name="type.tourism">Τουρισμός</string>
+    <string name="type.attraction.big_wheel">Τροχός</string>
+    <string name="type.attraction.bumper_car">Συγκρουόμενα</string>
+    <string name="type.landuse">Χρήσης γης</string>
+    <string name="type.junction.roundabout">Κυκλικός κόμβος</string>
 </resources>
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index 49583ba82..d211e9332 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -515,12 +515,12 @@
     <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">Carretera sin clasificar</string>
-    <string name="type.highway.unclassified.area">Carretera sin clasificar</string>
+    <string name="type.highway.unclassified">Carretera menor</string>
+    <string name="type.highway.unclassified.area">Carretera menor</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 de carretera sin clasificar</string>
+    <string name="type.highway.unclassified.tunnel">Túnel</string>
     <string name="type.area_highway.cycleway">Ciclovía</string>
     <string name="type.area_highway.footway">Senda</string>
     <string name="type.area_highway.living_street">Calle de prioridad peatonal</string>
@@ -535,10 +535,10 @@
     <string name="type.area_highway.steps">Escaleras</string>
     <string name="type.area_highway.track">Pista</string>
     <string name="type.area_highway.trunk">Vía troncal</string>
-    <string name="type.area_highway.unclassified">Carretera sin clasificar</string>
+    <string name="type.area_highway.unclassified">Carretera menor</string>
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Objeto histórico</string>
-    <string name="type.historic.aircraft">Avión histórico</string>
+    <string name="type.historic.aircraft">Aeronave histórica</string>
     <string name="type.historic.anchor">Ancla histórica</string>
     <string name="type.historic.archaeological_site">Yacimiento arqueológico</string>
     <string name="type.historic.battlefield">Campo de batalla</string>
diff --git a/data/countries-strings/es.json/localize.json b/data/countries-strings/es.json/localize.json
index d6924c428..0dada1ca0 100644
--- a/data/countries-strings/es.json/localize.json
+++ b/data/countries-strings/es.json/localize.json
@@ -2150,36 +2150,36 @@
 "Russia_Tula Oblast Description":"Novomoskovsk",
 "Russia_Tuva Description":"Kyzyl, Kaa-Khem, Ak-Dovurak",
 "Russia_Tver Oblast Description":"Tver, Rzhev, Vysnij Volocek",
-"Russia_Tyumen Oblast Description":"Tiumén",
-"Russia_Udmurt Republic Description":"Izhevsk",
-"Russia_Ulyanovsk Oblast Description":"Uliánovsk",
-"Russia_Vladimir Oblast Description":"Vladímir",
-"Russia_Volgograd Oblast Description":"Volgogrado, Kamyshin",
-"Russia_Vologda Oblast Description":"Vólogda",
-"Russia_Voronezh Oblast Description":"Vorónezh",
-"Russia_Yamalo-Nenets Autonomous Okrug Description":"Salejard",
-"Russia_Yaroslavl Oblast Description":"Rýbinsk, Pereslavl-Zaleski",
-"Russia_Yugra_Khanty Description":"Janti-Mansisk",
+"Russia_Tyumen Oblast Description":"Tiumén, Tobolsk, Ishim",
+"Russia_Udmurt Republic Description":"Izhevsk, Sarapul, Votkinsk",
+"Russia_Ulyanovsk Oblast Description":"Uliánovsk, Dimitrovgrad, Inza",
+"Russia_Vladimir Oblast Description":"Vladímir, Kovrov, Múrom",
+"Russia_Volgograd Oblast Description":"Volgogrado, Volzhski, Kamyshin",
+"Russia_Vologda Oblast Description":"Vólogda, Cherepovéts, Sókol",
+"Russia_Voronezh Oblast Description":"Vorónezh, Borisoglebsk, Rósosh",
+"Russia_Yamalo-Nenets Autonomous Okrug Description":"Novi Urengói, Noyabrsk, Salejard",
+"Russia_Yaroslavl Oblast Description":"Yaroslavl, Rýbinsk, Pereslavl-Zaleski",
+"Russia_Yugra_Khanty Description":"Janti-Mansisk, Niagan, Uray",
 "Russia_Yugra_Surgut Description":"Surgut, Nizhnevartovsk, Nefteyugansk",
 "Russia_Zabaykalsky Krai Description":"Chita, Krasnokamensk, Borzya",
 "Rwanda Description":"Kigali, Gisenyi, Huye",
-"Sahrawi Arab Democratic Republic Description":"La Güera",
+"Sahrawi Arab Democratic Republic Description":"La Güera, Tifariti, Mijik",
 "Saint Barthelemy Description":"Gustavia",
 "Saint Helena Ascension and Tristan da Cunha Description":"Jamestown, Half Tree Hollow, Georgetown",
 "Saint Kitts and Nevis Description":"Basseterre, Charlestown, Newcastle",
 "Saint Lucia Description":"Castries, Castries, Soufriere",
 "Saint Martin Description":"Philipsburg, Cul-de-Sac, Cole Bay",
 "Saint Vincent and the Grenadines Description":"Kingstown, Clifton, Ashton",
-"Samoa Description":"Āpia, Sālelologa, Asau",
-"San Marino Description":"San Marino",
-"Sao Tome and Principe Description":"Santo Tomé",
+"Samoa Description":"Apia, Salelologa, Asau",
+"San Marino Description":"Ciudad de San Marino, Serravalle, Borgo Maggiore",
+"Sao Tome and Principe Description":"Santo Tomé, Neves, San Juan de los Angolares",
 "Saudi Arabia_North Description":"Yeda, La Meca, Medina",
-"Saudi Arabia_South Description":"Riyad",
+"Saudi Arabia_South Description":"Riyad, Hofuf, Dammam",
 "Senegal Description":"Dakar, Pikine, Fatick",
-"Serbia Description":"Belgrado",
+"Serbia Description":"Belgrado, Novi Sad, Nis",
 "Seychelles Description":"Victoria, Port Launay, Bel Ombre",
 "Sierra Leone Description":"Freetown, Bo, Kambia",
-"Singapore Description":"Singapur",
+"Singapore Description":"Singapur, Ladang, Rocky Hill",
 "Slovakia_Region of Banska Bystrica Description":"Banská Bystrica, Zvolen, Lučenec",
 "Slovakia_Region of Bratislava Description":"Bratislava, Petržalka, Ružinov",
 "Slovakia_Region of Kosice Description":"Košice, gelnica, Michalovce",
@@ -2189,23 +2189,23 @@
 "Slovakia_Region of Trnava Description":"Trnava, Trnava, Piešťany",
 "Slovakia_Region of Zilina Description":"Žilina, Martin, Liptovský Mikuláš",
 "Slovenia_East Description":"Maribor, Dobova, Kisovec",
-"Slovenia_West Description":"Liubliana",
+"Slovenia_West Description":"Liubliana, Jagodje, Naklo",
 "Solomon Islands Description":"Buala, Lata, Honiara",
-"Somalia Description":"Mogadiscio",
-"South Africa_Eastern Cape Description":"Port Elizabeth, Grahamstown, Mthatha",
+"Somalia Description":"Mogadiscio, Baardheere, Baidoa",
+"South Africa_Eastern Cape Description":"Puerto Elizabeth, Gqeberha, Makhanda, Mthatha",
 "South Africa_Free State Description":"Botshabelo, Thaba Nchu, Welkom",
-"South Africa_Gauteng Description":"Johannesburg, Pretoria, Soweto",
+"South Africa_Gauteng Description":"Johannesburgo, Pretoria, Soweto",
 "South Africa_KwaZulu-Natal Description":"Durban, Ladysmith, Pietermaritzburg",
 "South Africa_Limpopo Description":"Mokopane, Louis Trichardt, Polokwane",
 "South Africa_Mpumalanga Description":"Emalahleni, Nelspruit, Secunda",
 "South Africa_North West Description":"Mafikeng, Rustenburg, Klerksdorp",
 "South Africa_Northern Cape Description":"Upington, Kimberley, Pofadder",
-"South Africa_Western Cape Description":"Ciudad del Cabo",
+"South Africa_Western Cape Description":"Ciudad del Cabo, Mitchells Plain, Khayelitsha",
 "South Georgia and the South Sandwich Islands Description":"Husvik, King Edward Point, Grytviken",
-"South Korea_North Description":"Seúl, Daejeon",
-"South Korea_South Description":"Busan, Daegu",
+"South Korea_North Description":"Seúl, Incheon, Daejeon",
+"South Korea_South Description":"Busan, Daegu, Changwon",
 "South Ossetia Description":"Tskhinval, Khumisarta, Chitiani",
-"South Sudan Description":"Yuba",
+"South Sudan Description":"Yuba, Yambio, Leer",
 "Spain_Andalusia_Granada Description":"Granada, Almería, Jaén",
 "Spain_Andalusia_Sevilla Description":"Málaga, Sevilla, Córdoba, Huelva, Cádiz",
 "Spain_Aragon Description":"Zaragoza, Teruel, Huesca",
@@ -2231,7 +2231,7 @@
 "Spain_Principado de Asturias Description":"Oviedo, Gijón, Avilés",
 "Spain_Region de Murcia Description":"Murcia, Cartagena, Lorca",
 "Spain_Valencian Community Description":"Valencia, Alicante, Castellón de la Plana",
-"Sri Lanka Description":"Colombo",
+"Sri Lanka Description":"Colombo, Kandy, Rambukkana",
 "Sudan_East Description":"Port Sudan, Kassala, El Hawata",
 "Sudan_West Description":"Jartum",
 "Suriname Description":"Paramaribo, Groningen, Brokopondo",
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
index b71cd5455..743a056fc 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -161,7 +161,7 @@
 "type.amenity.shelter.lean_to" = "Στεγασμένο καταφύγιο";
 "type.amenity.public_bath" = "Δημόσιο Λουτρό";
 "type.amenity.shower" = "Ντους";
-"type.amenity.stripclub" = "Stripclub";
+"type.amenity.stripclub" = "Στριπτιζάδικο";
 "type.amenity.taxi" = "Ταξί";
 "type.amenity.telephone" = "Τηλέφωνο";
 "type.amenity.theatre" = "Θέατρο";
@@ -645,9 +645,9 @@
 "type.internet_access" = "Ίντερνετ";
 "type.internet_access.wlan" = "Ίντερνετ";
 "type.junction" = "Junction";
-"type.junction.circular" = "Roundabout";
-"type.junction.roundabout" = "Roundabout";
-"type.landuse" = "Landuse";
+"type.junction.circular" = "Κυκλικός κόμβος";
+"type.junction.roundabout" = "Κυκλικός κόμβος";
+"type.landuse" = "Χρήσης γης";
 "type.landuse.allotments" = "Allotments";
 "type.landuse.basin" = "Μια λεκάνη νερού";
 "type.landuse.brownfield" = "Brownfield";
@@ -1242,7 +1242,7 @@
 "type.shop.laundry" = "Άπλυτα";
 "type.shop.mall" = "Εμπορικό κέντρο";
 "type.shop.massage" = "Αίθουσα μασάζ";
-"type.shop.mobile_phone" = "Κινητή Τηλεφωνία";
+"type.shop.mobile_phone" = "Κατάστημα κινητής τηλεφωνίας";
 "type.shop.money_lender" = "Δανειστής χρημάτων";
 "type.shop.motorcycle" = "Κατάστημα μοτοσυκλετών";
 "type.shop.motorcycle_repair" = "Επισκευή μοτοσυκλετών";
@@ -1340,7 +1340,7 @@
 "type.sport.field_hockey" = "Χόκεϊ επί χόρτου";
 "type.sport.badminton" = "Αντιπτέριση";
 "type.sport.pelota" = "Βασκική πελότα";
-"type.tourism" = "Tourism";
+"type.tourism" = "Τουρισμός";
 "type.tourism.aquarium" = "Ενυδρείο";
 
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
@@ -1354,8 +1354,8 @@
 "type.tourism.attraction" = "Αξιοθέατα";
 "type.attraction.amusement_ride" = "Βόλτα ψυχαγωγίας";
 "type.attraction.animal" = "Περίφραξη ζώων";
-"type.attraction.bumper_car" = "Bumper Car";
-"type.attraction.big_wheel" = "Big Wheel";
+"type.attraction.bumper_car" = "Συγκρουόμενα";
+"type.attraction.big_wheel" = "Τροχός";
 "type.attraction.carousel" = "Στροβιλοδρόμιο";
 "type.attraction.historic" = "Ιστορικό αξιοθέατο";
 "type.attraction.maze" = "Λαβύρινθος";
@@ -1456,7 +1456,7 @@
 "type.emergency.emergency_ward_entrance" = "Είσοδος θαλάμου έκτακτης ανάγκης";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo */
-"type.amenity.dojo" = "Dojo";
+"type.amenity.dojo" = "Ντότζο";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Αθλητική αίθουσα";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 433b1d86c..975c5dc0e 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -573,14 +573,14 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk_link.tunnel" = "Túnel";
-"type.highway.unclassified" = "Carretera sin clasificar";
-"type.highway.unclassified.area" = "Carretera sin clasificar";
+"type.highway.unclassified" = "Carretera menor";
+"type.highway.unclassified.area" = "Carretera menor";
 
 /* 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 de carretera sin clasificar";
+"type.highway.unclassified.tunnel" = "Túnel";
 "type.area_highway.cycleway" = "Ciclovía";
 "type.area_highway.footway" = "Senda";
 "type.area_highway.living_street" = "Calle de prioridad peatonal";
@@ -595,9 +595,9 @@
 "type.area_highway.steps" = "Escaleras";
 "type.area_highway.track" = "Pista";
 "type.area_highway.trunk" = "Vía troncal";
-"type.area_highway.unclassified" = "Carretera sin clasificar";
+"type.area_highway.unclassified" = "Carretera menor";
 "type.historic" = "Objeto histórico";
-"type.historic.aircraft" = "Avión histórico";
+"type.historic.aircraft" = "Aeronave histórica";
 "type.historic.anchor" = "Ancla histórica";
 "type.historic.archaeological_site" = "Yacimiento arqueológico";
 "type.historic.battlefield" = "Campo de batalla";