diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 94ecc21bd..fb38d1c97 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -909,4 +909,8 @@
         <item quantity="other">%d min</item>
     </plurals>
     <string name="list_description_empty">Modificar la lista para añadir una descripción</string>
+    <string name="editor_business_vacant_button">Negocio vacante</string>
+    <string name="editor_mark_business_vacant_title">Marcar negocio como vacante</string>
+    <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index 54def8454..d938baabe 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -518,8 +518,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
     <string name="navigation_stop_button">Apturēt</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Maršruta reģistrēšana</string>
diff --git a/android/sdk/src/main/res/values-es/types_strings.xml b/android/sdk/src/main/res/values-es/types_strings.xml
index 986fc4782..b1370a8c1 100644
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -1454,4 +1454,49 @@
     <string name="type.social_facility.soup_kitchen">Comedor social</string>
     <string name="type.amenity.food_sharing">Alimentos compartidos</string>
     <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.amenity.sailing_school">Escuela de vela</string>
+    <string name="type.amenity.flight_school">Escuela de aviación</string>
+    <string name="type.amenity.prep_school">Escuela de tutoría</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marca cardinal</string>
+    <string name="type.beacon.isolated_danger">Marca de peligro aislado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.beacon.lateral.starboard">Marca lateral</string>
+    <string name="type.beacon.safe_water">Marca de aguas navegables</string>
+    <string name="type.beacon.special_purpose">Marca especial</string>
+    <string name="type.buoy.cardinal.east">Boya cardinal</string>
+    <string name="type.buoy.cardinal.north">Boya cardinal</string>
+    <string name="type.buoy.cardinal.south">Boya cardinal</string>
+    <string name="type.buoy.cardinal.west">Boya cardinal</string>
+    <string name="type.buoy.isolated_danger">Boya de peligro aislado</string>
+    <string name="type.buoy.lateral.port">Boya lateral</string>
+    <string name="type.buoy.lateral.starboard">Boya lateral</string>
+    <string name="type.buoy.safe_water">Boya de aguas navegables</string>
+    <string name="type.buoy.special_purpose">Boya de uso especial</string>
+    <string name="type.spherical_buoy.cardinal.east">Boya cardinal especial</string>
+    <string name="type.spherical_buoy.cardinal.north">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.south">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.west">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.isolated_danger">Boya esférica de peligro aislado</string>
+    <string name="type.spherical_buoy.lateral.port">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boya esférica de aguas navegables</string>
+    <string name="type.spherical_buoy.special_purpose">Boya esférica de uso especial</string>
+    <string name="type.lateral.port">Babor</string>
+    <string name="type.lateral.starboard">Estribor</string>
+    <string name="type.cardinal.east">Este</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sur</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garaje</string>
+    <string name="type.entrance.service">Entrada de servicio</string>
+    <string name="type.entrance.entry">Entrada (únicamente)</string>
+    <string name="type.entrance.emergency">Salida de emergencia</string>
+    <string name="type.natural.sand">Arena</string>
+    <string name="type.natural.tree">Árbol</string>
+    <string name="type.shop.beauty.day_spa">Spa</string>
+    <string name="type.xmas.tree">Árbol de Navidad</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-lv/types_strings.xml b/android/sdk/src/main/res/values-lv/types_strings.xml
index afdf2f0d2..95e363162 100644
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -163,4 +163,23 @@
     <string name="type.emergency.assembly_point">Ārkārtas tikšanās punkts</string>
     <string name="type.shop.beauty.day_spa">Dienas spa</string>
     <string name="type.shop.massage">Masāžas salons</string>
+    <string name="type.natural.sand">Smiltis</string>
+    <string name="type.natural.geyser">Geizers</string>
+    <string name="type.natural.glacier">Ledājs</string>
+    <string name="type.natural.grassland">Pļava</string>
+    <string name="type.natural.heath">Tīrelis</string>
+    <string name="type.natural.hot_spring">Karstais avots</string>
+    <string name="type.natural.water.lake">Ezers</string>
+    <string name="type.natural.tree">Koks</string>
+    <string name="type.natural.tree_row">Koku rinda</string>
+    <string name="type.natural.vineyard">Vīnogu dārzs</string>
+    <string name="type.natural.volcano">Vulkāns</string>
+    <string name="type.natural.water">Ūdens</string>
+    <string name="type.natural.wetland">Mitrājs</string>
+    <string name="type.natural.wetland.bog">Muklājs</string>
+    <string name="type.natural.wetland.marsh">Dumbrājs</string>
+    <string name="type.natural.wetland.saltmarsh">Sāļūdens dumbrājs</string>
+    <string name="type.xmas.tree">Ziemassvētku egle</string>
+    <string name="type.entrance.emergency">Ārkārtas izeja</string>
+    <string name="type.lateral.port">Osta</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 5d81fb1a3..ecba766fe 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -1544,3 +1544,48 @@
 "type.social_facility.soup_kitchen" = "Comedor social";
 "type.amenity.give_box" = "Give Box";
 "type.leisure.indoor_play" = "Centro de actividades en interior";
+"type.natural.sand" = "Arena";
+"type.amenity.sailing_school" = "Escuela de vela";
+"type.amenity.flight_school" = "Escuela de aviación";
+"type.amenity.prep_school" = "Escuela de tutoría";
+"type.beacon.cardinal.east" = "Marca cardinal";
+"type.beacon.cardinal.north" = "Marca cardinal";
+"type.beacon.cardinal.south" = "Marca cardinal";
+"type.beacon.cardinal.west" = "Marca cardinal";
+"type.beacon.isolated_danger" = "Marca de peligro aislado";
+"type.beacon.lateral.port" = "Marca lateral";
+"type.beacon.lateral.starboard" = "Marca lateral";
+"type.beacon.safe_water" = "Marca de aguas navegables";
+"type.beacon.special_purpose" = "Marca especial";
+"type.buoy.cardinal.east" = "Boya cardinal";
+"type.buoy.cardinal.north" = "Boya cardinal";
+"type.buoy.cardinal.south" = "Boya cardinal";
+"type.buoy.cardinal.west" = "Boya cardinal";
+"type.buoy.isolated_danger" = "Boya de peligro aislado";
+"type.buoy.lateral.port" = "Boya lateral";
+"type.buoy.lateral.starboard" = "Boya lateral";
+"type.buoy.safe_water" = "Boya de aguas navegables";
+"type.buoy.special_purpose" = "Boya de uso especial";
+"type.spherical_buoy.cardinal.east" = "Boya cardinal especial";
+"type.spherical_buoy.cardinal.north" = "Boya esférica cardinal";
+"type.spherical_buoy.cardinal.south" = "Boya esférica cardinal";
+"type.spherical_buoy.cardinal.west" = "Boya esférica cardinal";
+"type.spherical_buoy.isolated_danger" = "Boya esférica de peligro aislado";
+"type.spherical_buoy.lateral.port" = "Boya esférica lateral";
+"type.spherical_buoy.lateral.starboard" = "Boya esférica lateral";
+"type.spherical_buoy.safe_water" = "Boya esférica de aguas navegables";
+"type.spherical_buoy.special_purpose" = "Boya esférica de uso especial";
+"type.lateral.port" = "Babor";
+"type.lateral.starboard" = "Estribor";
+"type.cardinal.east" = "Este";
+"type.cardinal.north" = "Norte";
+"type.cardinal.south" = "Sur";
+"type.cardinal.west" = "Oeste";
+"type.entrance.house" = "Entrada de casa";
+"type.entrance.garage" = "Entrada de garaje";
+"type.entrance.service" = "Entrada de servicio";
+"type.entrance.entry" = "Entrada (únicamente)";
+"type.entrance.emergency" = "Salida de emergencia";
+"type.natural.tree" = "Árbol";
+"type.shop.beauty.day_spa" = "Spa";
+"type.xmas.tree" = "Árbol de Navidad";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
index a99a224ea..8e4c6462b 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -694,8 +694,8 @@
 "editor_share_to_all_dialog_title" = "Vai vēlaties to nosūtīt visiem lietotājiem?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Pārliecinieties, ka neievadījāt nekādus privātus vai personīgus datus.";
-"editor_share_to_all_dialog_message_2" = "„OpenStreetMap“ redaktori pārskatīs veiktās izmaiņas un jautājumu gadījumā ar jums sazināsies.";
+"editor_share_to_all_dialog_message_1" = "Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.";
 "navigation_stop_button" = "Apturēt";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
index 4ecc69895..3ea2e907f 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
@@ -784,12 +784,12 @@
 "type.man_made.embankment" = "Embankment";
 "type.natural.coastline" = "Coastline";
 "type.natural.desert" = "Desert";
-"type.natural.geyser" = "Geyser";
-"type.natural.glacier" = "Glacier";
-"type.natural.grassland" = "Grassland";
-"type.natural.heath" = "Heath";
-"type.natural.hot_spring" = "Hot Spring";
-"type.natural.water.lake" = "Lake";
+"type.natural.geyser" = "Geizers";
+"type.natural.glacier" = "Ledājs";
+"type.natural.grassland" = "Pļava";
+"type.natural.heath" = "Tīrelis";
+"type.natural.hot_spring" = "Karstais avots";
+"type.natural.water.lake" = "Ezers";
 "type.natural.water.lock" = "Lock Chamber";
 "type.natural.water.pond" = "Pond";
 "type.natural.water.reservoir" = "Reservoir";
@@ -805,13 +805,13 @@
 "type.natural.spring" = "Natural Spring";
 "type.natural.spring.drinking_water_no" = "Natural Spring";
 "type.natural.strait" = "Strait";
-"type.natural.tree_row" = "Tree Row";
-"type.natural.vineyard" = "Vineyard";
-"type.natural.volcano" = "Volcano";
-"type.natural.water" = "Water";
-"type.natural.wetland" = "Wetland";
-"type.natural.wetland.bog" = "Bog";
-"type.natural.wetland.marsh" = "Marsh";
+"type.natural.tree_row" = "Koku rinda";
+"type.natural.vineyard" = "Vīnogu dārzs";
+"type.natural.volcano" = "Vulkāns";
+"type.natural.water" = "Ūdens";
+"type.natural.wetland" = "Mitrājs";
+"type.natural.wetland.bog" = "Muklājs";
+"type.natural.wetland.marsh" = "Dumbrājs";
 "type.noexit" = "Dead End";
 "type.office" = "Office";
 "type.office.company" = "Company Office";
@@ -1468,7 +1468,7 @@
 "type.highway.ladder" = "Kāpnes";
 "type.natural.wetland.swamp" = "Purvs";
 "type.man_made.crane" = "Crane";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
+"type.natural.wetland.saltmarsh" = "Sāļūdens dumbrājs";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.barrier.guard_rail" = "Guard Rail";
 "type.amenity.studio" = "Studija";
@@ -1539,3 +1539,8 @@
 "type.emergency.access_point" = "Ārkārtas glābšanas punkts";
 "type.emergency.life_ring" = "Glābšanas boja";
 "type.shop.beauty.day_spa" = "Dienas spa";
+"type.natural.sand" = "Smiltis";
+"type.natural.tree" = "Koks";
+"type.xmas.tree" = "Ziemassvētku egle";
+"type.entrance.emergency" = "Ārkārtas izeja";
+"type.lateral.port" = "Osta";