diff --git a/android/app/src/fdroid/play/listings/es-ES/short-description.txt b/android/app/src/fdroid/play/listings/es-ES/short-description.txt
index f45617084..7efd0a405 100644
--- a/android/app/src/fdroid/play/listings/es-ES/short-description.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/short-description.txt
@@ -1 +1 @@
-Navegación de mapa fácil - Descubre más en tu camino - Creado por la comunidad
+Navegación sencilla - Descubre más en tu camino - Creado por la comunidad
diff --git a/android/app/src/google/play/listings/es-ES/short-description.txt b/android/app/src/google/play/listings/es-ES/short-description.txt
index f45617084..7efd0a405 100644
--- a/android/app/src/google/play/listings/es-ES/short-description.txt
+++ b/android/app/src/google/play/listings/es-ES/short-description.txt
@@ -1 +1 @@
-Navegación de mapa fácil - Descubre más en tu camino - Creado por la comunidad
+Navegación sencilla - Descubre más en tu camino - Creado por la comunidad
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 484140e1a..e57fb41c4 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -38,7 +38,7 @@
     <!-- Text in About screen -->
     <string name="about_headline">Proyecto abierto impulsado por la comunidad</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Fácil de utilizar y completo</string>
+    <string name="about_proposition_1">• Fácil de utilizar y depurado</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Enfocado en la privacidad y sin anuncios</string>
     <!-- Text in About screen -->
@@ -103,7 +103,7 @@
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
     <string name="category_eat">Dónde comer</string>
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
-    <string name="category_food">Productos de alimentación</string>
+    <string name="category_food">Tienda de comestibles</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
     <string name="category_transport">Transporte</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Donar</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Hazte voluntari@ y mejora CoMaps</string>
+    <string name="how_to_support_us">Apoya el proyecto</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Derechos de autor</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -489,7 +489,7 @@
     <string name="editor_about_osm">Sus ediciones se cargan en la base de datos pública <a href="https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap">OpenStreetMap</a>. Por favor, no añada información personal o protegida por derechos de autor.</string>
     <string name="editor_more_about_osm">Más acerca de OpenStreetMap</string>
     <string name="editor_osm_history">Tu historial de ediciones</string>
-    <string name="editor_osm_notes">Tus notas de del mapa</string>
+    <string name="editor_osm_notes">Tus notas del mapa</string>
     <string name="editor_operator">Operador</string>
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operador: %s</string>
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index 9f207a536..686316235 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -278,18 +278,18 @@
     <string name="editor_example_values">Valuri tal-Eżempju</string>
     <string name="editor_correct_mistake">Irranġa żball</string>
     <string name="editor_add_select_location">Agħżel il-Post</string>
-    <string name="editor_report_problem_desription_1">Jekk jogħġbok iddeskrivi l-problema fid-dettall sabiex il-komunita OpenStreetMap tkun tista ’tirranġaha.</string>
+    <string name="editor_report_problem_desription_1">Jekk jogħġbok iddeskrivi l-problema fid-dettall sabiex il-komunita` OpenStreetMap tkun tista’ tirranġaha.</string>
     <string name="editor_report_problem_title">Kwistjoni</string>
     <string name="editor_report_problem_no_place_title">Dan il-post ma jeżistix</string>
     <string name="editor_report_problem_under_construction_title">Magħluq għall-manutenzjoni</string>
     <string name="editor_report_problem_duplicate_place_title">Post Duplikat</string>
-    <string name="autodownload">Mapep Jitniżżlu Awtomatikament</string>
+    <string name="autodownload">Mapep jitniżżlu awtomatikament</string>
     <string name="daily">Kuljum</string>
     <string name="closes_in">Jagħlaq f’ %s</string>
     <string name="opens_in">Jiftaħ f’ %s</string>
     <string name="closed">Magħluq</string>
     <string name="edit_opening_hours">Editja s-sigħat tan-negozju</string>
-    <string name="no_osm_account">M’ għandekx kont ta’ OpenStreetMap?</string>
+    <string name="no_osm_account">M’għandekx kont ta’ OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Irreġistra f’ OpenStreetMap</string>
     <string name="not_signed_in">Mhux imdaħħal</string>
     <string name="login">Illoggja</string>
@@ -457,7 +457,7 @@
     <string name="downloader_delete_map">Ħassar il-Mappa</string>
     <string name="downloader_update_map">Aġġorna l-Mappa</string>
     <string name="downloader_download_all_button">Niżżel kollox</string>
-    <string name="editor_report_problem_desription_2">Jew agħmilha int stess f’ https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_desription_2">Jew agħmilha int stess hawn https://www.openstreetmap.org/</string>
     <string name="dialog_routing_download_cross_route">Niżżel mapep addizzjonali biex toħloq rotta aħjar li taqsam il-konfini ta ’din il-mappa.</string>
     <string name="routing_not_enough_space">Mhux biżżejjed spazju</string>
     <string name="logout">Oħroġ</string>
@@ -639,4 +639,6 @@
     <string name="saved">Salvat</string>
     <string name="about_headline">Proġett miftuħ u imsaħħaħ mill-komunità</string>
     <string name="google_play_services">Servizz ta\' Lokazzjoni Google Fused</string>
+    <string name="hours_confirmed_time_ago">Ikkonfermat %s</string>
+    <string name="existence_confirmed_time_ago">Ikkonfermata l-eżistenza %s</string>
 </resources>
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 f9e05fcd0..5e4d21af6 100644
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -79,7 +79,7 @@
     <string name="type.amenity.hunting_stand">Puesto de caza</string>
     <string name="type.amenity.ice_cream">Heladería</string>
     <string name="type.amenity.internet_cafe">Cibercafé</string>
-    <string name="type.amenity.kindergarten">Escuela infantil</string>
+    <string name="type.amenity.kindergarten">Guardería</string>
     <string name="type.amenity.library">Biblioteca</string>
     <string name="type.amenity.loading_dock">Muelle de carga</string>
     <string name="type.amenity.marketplace">Mercado</string>
@@ -424,8 +424,8 @@
     <string name="type.highway.path.difficult">Sendero difícil o poco visible</string>
     <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
     <string name="type.highway.path.expert">Sendero muy difícil o indistinguible</string>
-    <string name="type.highway.path.bicycle">Camino para bicicletas</string>
-    <string name="type.highway.footway.bicycle">Camino para bicicletas</string>
+    <string name="type.highway.path.bicycle">Camino para bicicletas y peatones</string>
+    <string name="type.highway.footway.bicycle">Camino para bicicletas y peatones</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.path.bridge">Puente</string>
     <string name="type.highway.path.horse">Sendero ecuestre</string>
@@ -435,7 +435,6 @@
     <string name="type.highway.pedestrian.area">Zona peatonal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Puente peatonal</string>
-
     <string name="type.highway.pedestrian.square">Plaza</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Túnel peatonal</string>
@@ -1396,4 +1395,7 @@
     <string name="type.leisure.escape_game">Sala de Escape</string>
     <string name="type.amenity.animal_shelter">Refugio de animales</string>
     <string name="type.barrier.wicket_gate">Portillo</string>
+    <string name="type.office.security">Oficina de Seguridad Privada</string>
+    <string name="type.building.guardhouse">Garita de Seguridad</string>
+    <string name="type.power.portal">Torre de Alta Tensión</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-tr/types_strings.xml b/android/sdk/src/main/res/values-tr/types_strings.xml
index df386cd3c..21d4b3470 100644
--- a/android/sdk/src/main/res/values-tr/types_strings.xml
+++ b/android/sdk/src/main/res/values-tr/types_strings.xml
@@ -10,7 +10,7 @@
     <string name="type.aerialway.drag_lift">Kayak Teleferiği</string>
     <string name="type.aerialway.gondola">Telekabin</string>
     <string name="type.aerialway.mixed_lift">Karışık Teleferik</string>
-    <string name="type.aerialway.station">Havayolu İstasyonu</string>
+    <string name="type.aerialway.station">Teleferik İstasyonu</string>
     <string name="type.aeroway">Hava Sahası Altyapısı</string>
     <string name="type.aeroway.aerodrome">Havaalanı</string>
     <string name="type.aeroway.aerodrome.international">Uluslararası Havalimanı</string>
@@ -427,7 +427,6 @@
     <string name="type.highway.pedestrian.area">Yaya Alanı</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Yaya Köprüsü</string>
-
     <string name="type.highway.pedestrian.square">Meydan</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Yaya Tüneli</string>
diff --git a/data/categories-strings/tr.json/localize.json b/data/categories-strings/tr.json/localize.json
index 286fdc0f9..6a978e607 100644
--- a/data/categories-strings/tr.json/localize.json
+++ b/data/categories-strings/tr.json/localize.json
@@ -376,7 +376,7 @@
 "tourism-chalet|@category_hotel": "Tatil Kulübesi",
 "tourism-information-board": "Bilgi Panosu",
 "tourism-information-map": "Turist Haritası",
-"aerialway-station": "Teleferik İstasyonu|Havayolu İstasyonu",
+"aerialway-station": "Teleferik İstasyonu|Teleferik Durağı",
 "aeroway-helipad": "Helikopter pisti",
 "barrier-border_control": "Sınır kontrolü|Gümrük",
 "leisure-water_park|@category_tourism|@category_children": "Su parkı|3Aquapark|Akuapark",
@@ -489,4 +489,4 @@
 "shop-carpet|@shop": "Halıcı",
 "shop-pasta|@shop": "Makarna",
 "amenity-luggage_locker": "Bagaj Dolabı"
-}
\ No newline at end of file
+}
diff --git a/data/countries-strings/fa.json/localize.json b/data/countries-strings/fa.json/localize.json
index ef5d49fec..a198b1b14 100644
--- a/data/countries-strings/fa.json/localize.json
+++ b/data/countries-strings/fa.json/localize.json
@@ -8,5 +8,172 @@
 "Algeria_Coast":"الجزایر — اپاختر",
 "Andorra":"آندورا",
 "Angola":"آنگولا",
-"Anguilla":"آنگویلا"
+"Anguilla":"آنگویلا",
+"Arizona":"آریزونا",
+"Antarctica":"رَپیهویندران",
+"Antigua and Barbuda":"آنتیگوآ اود باربودا",
+"Argentina":"آرژانتین",
+"Argentina_Buenos Aires_North":"استان بوینوس آیرس — اپاختر",
+"Argentina_Buenos Aires_South":"استان بوینوس آیرس — اواخشتر",
+"Argentina_Cuyo":"کویو",
+"Argentina_Mesopotamia":"میان‌رودان",
+"Argentina_Northwest":"آرژانتین اپاختر‌خاور",
+"Argentina_Pampas":"پامپاس",
+"Argentina_Patagonia":"پاتاگونیا",
+"Armenia":"ارمنستان",
+"Australia":"استرالیا",
+"Australia_Melbourne":"ملبورن",
+"Australia_New South Wales":"ولز اواخشتری نو",
+"Australia_Northern Territory":"سرزمین اپاختری",
+"Australia_Queensland":"کوینزلند",
+"Australia_South Australia":"اواخشتر استرالیا",
+"Australia_Tasmania":"تاسمانی",
+"Australia_Victoria":"ویکتوریا",
+"Australia_Western Australia":"استرالیای خاوری",
+"Austria":"اتریش",
+"Austria_Burgenland":"بورگنلند",
+"Austria_Carinthia":"کرنتِن",
+"Austria_Lower Austria_West":"اتریش اِرتَر — خاور",
+"Austria_Lower Austria_Wien":"وین اود اتریش اِرتَر — باختر",
+"Austria_Salzburg":"سالزبورگ",
+"Austria_Styria":"اشتایرمارک",
+"Austria_Tyrol":"تیرول",
+"Austria_Upper Austria":"اتریش اُل‌تر",
+"Austria_Vorarlberg":"فورآرلبرگ",
+"Azerbaijan":"آذربایجان",
+"Azerbaijan Region":"آذربایجان",
+"Bahrain":"میش‌ماهیگ",
+"Bangladesh":"بنگلادش",
+"Barbados":"باربادوس",
+"Belarus":"بلاروس",
+"Belarus_Brest Region":"پایگوس بریست",
+"Belarus_Homiel Region":"پایگوس گومل",
+"Belarus_Hrodna Region":"پایگوس گرودنو",
+"Belarus_Maglieu Region":"پایگوس موگیلِو",
+"Belarus_Minsk Region":"پایگوس مینسک",
+"Belarus_Vitebsk Region":"پایگوس ویتبسک",
+"Belgium":"بلژیک",
+"Belgium_Antwerp":"استان آنتورپ",
+"Belgium_East Flanders":"استان فلاندر باختری",
+"Belgium_Flemish Brabant":"استان برابانت فلاندر",
+"Belgium_Hainaut":"استان انو",
+"Belgium_Liege":"استان لیژ",
+"Belgium_Limburg":"استان لیمبورگ",
+"Belgium_Luxembourg":"استان لوکزامبورگ",
+"Belgium_Namur":"استان نامور",
+"Belgium_Walloon Brabant":"استان برابانت والونی",
+"Belgium_West Flanders":"استان فلاندر خاوری",
+"Belize":"بلیز",
+"Benin":"بنین",
+"Bermuda":"برمودا",
+"Bhutan":"بوتان",
+"Bolivia":"بولیوی",
+"Bolivia_North":"بولیوی – اپاختر",
+"Bolivia_South":"بولیوی – اواخشتر",
+"Bosnia and Herzegovina":"بوسنی اود هرزگوین",
+"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"کوست برچکو",
+"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"فدراسیون بوسنی اود هرزگوین",
+"Bosnia and Herzegovina_Republic of Srpska":"جمهوری صربسکا",
+"Botswana":"بوتسوانا",
+"Brazil":"برزیل",
+"Brazil_Bahia":"باهیا",
+"Brazil_Goias":"گوییاس",
+"Brazil_Mato Grosso":"ماتو گروسو",
+"Brazil_Mato Grosso Do Sul":"ماتو گروسو دو سول",
+"Brazil_North Region":"پایگوس اپاختری، برزیل",
+"Brazil_Northeast Region":"پایگوس اپاختر باختری",
+"Brazil_Paraiba":"پاراییبا",
+"Brazil_Parana":"پارانا",
+"Brazil_Rio Grande do Norte":"ریوگرانده دو نورتی",
+"Brazil_Santa Catarina":"سانتا کاتارینا",
+"Brazil_Southeast Region_Rio de Janeiro":"ریو دو ژانیرو",
+"Brazil_Southeast Region_Sao Paulo_Campinas":"ساوپاولو — کمپیناس",
+"Brazil_Southeast Region_Sao Paulo_City":"ساوپاولو — سانتوس",
+"Brazil_South Region":"اواخشتر برزیل",
+"Brazil_Southeast Region_Espirito Santo":"اسپیریتو سانتو",
+"Brazil_Southeast Region_Minas Gerais_Contagem":"میناس گرایس — کنتاگم",
+"Brazil_Southeast Region_Minas Gerais_North":"میناس گرایس — اپاختر",
+"Brazil_Southeast Region_Sao Paulo_West":"ساوپاولو — ریبرآ پرتو",
+"British Indian Ocean Territory":"اقلیم زراهی هندی بریتانیایی",
+"British Virgin Islands":"گزیرگ‌های دوشیزه‌ی بریتانیایی",
+"Brunei":"برونای",
+"Bulgaria":"بلغارستان",
+"Burkina Faso":"بورکینافاسو",
+"Burundi":"بوروندی",
+"California":"کالیفرنیا",
+"Cambodia":"کامبوج",
+"Cameroon":"کامرون",
+"Cameroon_Central":"کامرون — ناوند",
+"Cameroon_West":"کامرون — خاور",
+"Campo de Hielo Sur":"میدان یخچالی پاتاگونیای اواخشتری",
+"Canada":"کانادا",
+"Canada_Alberta":"آلبرتا",
+"Canada_Alberta_Edmonton":"ادمونتون",
+"Canada_Alberta_North":"آلبرتا — اپاحتر",
+"Canada_Alberta_South":"آلبرتا — اواخشتر",
+"Canada_British Columbia":"کلمبیا‌ی بریتانیایی",
+"Canada_British Columbia_Central":"کلمبیا‌ی بریتانیایی — ناوند",
+"Canada_British Columbia_Far_North":"کلمبیا‌ی بریتانیایی — باختر",
+"Canada_British Columbia_Islands":"گزیرگ ونکوور",
+"Canada_British Columbia_North":"کلمبیا‌ی بریتانیایی — خاور",
+"Canada_British Columbia_Northeast":"کلمبیا‌ی بریتانیایی — اپاختر",
+"Canada_British Columbia_Southeast":"کِلونا",
+"Canada_British Columbia_Vancouver":"ونکوور",
+"Canada_Labrador":"لابرادور",
+"Canada_Labrador_North":"لابرادور — اپاختر",
+"Canada_Labrador_South":"لابرادور — اواخشتر",
+"Canada_Labrador_West":"لابرادور — خاور",
+"Canada_Manitoba":"مانیتوبا",
+"Canada_Manitoba_Northeast":"مانیتوبا — اپاختر",
+"Canada_Manitoba_Northwest":"مانیتوبا — خاور",
+"Canada_Manitoba_South":"برندون",
+"Canada_Manitoba_Winnipeg":"وینیپگ",
+"Canada_New Brunswick":"برانزویک نو",
+"Canada_Newfoundland":"نیوفاوندلند",
+"Canada_Newfoundland_East":"نیوفاوندلند — باختر",
+"Canada_Newfoundland_North":"نیوفاوندلند — اپاختر",
+"Canada_Newfoundland_South":"نیوفاوندلند — اواخشتر",
+"Canada_Newfoundland_West":"نیوفاوندلند — خاور",
+"Canada_Northwest Territories":"بوم اپاختر‌خاوری",
+"Canada_Northwest Territories_East":"بوم اپاختر‌خاوری — باختر",
+"Canada_Northwest Territories_North":"بوم اپاختر‌خاوری — اپاختر",
+"Canada_Northwest Territories_Yellowknife":"یلونایف",
+"Canada_Nova Scotia":"نوا اسکوشیا",
+"Canada_Nova Scotia_Halifax":"هالیفاکس",
+"Canada_Nova Scotia_Sydney":"سیدنی",
+"Canada_Nunavut":"نوناووت",
+"Canada_Nunavut_North":"نوناووت — اپاختر",
+"Canada_Nunavut_South":"نوناووت — اواخشتر",
+"Canada_Ontario":"آنتاریو",
+"Canada_Ontario_Bame":"بَری",
+"Canada_Ontario_Kingston":"کینگزتون",
+"Canada_Ontario_London":"لندن",
+"Canada_Ontario_Northeastern_Central":"تیمینس",
+"Canada_Ontario_Northeastern_North":"موس فکتوری",
+"Canada_Ontario_Northeastern_S":"سادبری مهتر",
+"Canada_Ontario_Northeastern_SE":"نورت بَی",
+"Canada_Ontario_Northeastern_SW":"سو سَینت مری",
+"Canada_Ontario_Northeastern_Wawa":"واوا",
+"Canada_Ontario_Northern":"تاندر بَی",
+"Canada_Ontario_Northwestern":"آنتاریو — اپاختر",
+"Canada_Ontario_Toronto":"تورنتو",
+"Canada_Prince Edward Island":"گزیرگ شاهزاده ادوارد",
+"Canada_Quebec":"کِبِک",
+"Canada_Quebec_Quebec":"شهر کِبِک",
+"Canada_Quebek_Far North":"کِبِک — اپاختر",
+"Canada_Quebek_Montreal":"مونترال",
+"Canada_Quebek_North":"ست-ایل",
+"Canada_Quebek_Southeast_Rimouski":"ریموسکی",
+"Canada_Quebek_Southeast_Saguenay":"سَگِنه",
+"Canada_Quebek_West_Chibougamau":"شیبوگامو",
+"Canada_Quebek_West_Rouyn-Noranda":"روین-نوراندا",
+"Canada_Saskatchewan":"ساسکاچوان",
+"Canada_Saskatchewan_North":"ساسکاچوان — اپاختر",
+"Canada_Saskatchewan_South":"ساسکاچوان — اواخشتر",
+"Canada_Yukon":"یوکان",
+"Canada_Yukon_North":"یوکان — اپاختر",
+"Canada_Yukon_Whitehorse":"وایت‌هورس",
+"Cape Verde":"دماغه‌ی سبز",
+"Caribees":"آنتیل کهتر",
+"Caribisch Nederland":"آروبا، کوراساو اود کاراییب هلند"
 }
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index edfbc7cc4..6eff9af99 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -90,7 +90,7 @@
 "category_eat" = "Dónde comer";
 
 /* Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! */
-"category_food" = "Productos de alimentación";
+"category_food" = "Tienda de comestibles";
 
 /* Search category for public transport; any changes should be duplicated in categories.txt @category_transport! */
 "category_transport" = "Transporte";
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Informar o corregir datos de mapa incorrectos";
 
 /* Button in the About screen */
-"volunteer" = "Voluntariado";
+"volunteer" = "Hazte voluntario y mejora CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Conecta con nosotros";
@@ -1096,4 +1096,4 @@
 "transliteration_title_disabled_summary" = "Deshabilitado cuando siempre se usa el idioma local para el mapa";
 "pref_maplanguage_local" = "Idioma local";
 "existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"hours_confirmed_time_ago" = "Confirmado %@";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 8a2ec647e..f2012d6b0 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -78,7 +78,7 @@
 "type.amenity.hunting_stand" = "Puesto de caza";
 "type.amenity.ice_cream" = "Heladería";
 "type.amenity.internet_cafe" = "Cibercafé";
-"type.amenity.kindergarten" = "Escuela infantil";
+"type.amenity.kindergarten" = "Guardería";
 "type.amenity.library" = "Biblioteca";
 "type.amenity.loading_dock" = "Muelle de carga";
 "type.amenity.marketplace" = "Mercado";
@@ -451,8 +451,8 @@
 
 /* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
 "type.highway.path.expert" = "Sendero muy difícil o indistinguible";
-"type.highway.path.bicycle" = "Camino para bicicletas";
-"type.highway.footway.bicycle" = "Camino para bicicletas";
+"type.highway.path.bicycle" = "Camino para bicicletas y peatones";
+"type.highway.footway.bicycle" = "Camino para bicicletas y peatones";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Puente";
@@ -465,7 +465,6 @@
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.pedestrian.bridge" = "Puente peatonal";
-
 "type.highway.pedestrian.square" = "Plaza";
 
 /* These translations are used for all type.highway.*.tunnel. */
@@ -1486,6 +1485,6 @@
 "type.amenity.bicycle_parking.covered" = "Parking de bici cubierto";
 "type.amenity.animal_shelter" = "Refugio de animales";
 "type.barrier.wicket_gate" = "Portillo";
-"type.office.security" = "Security Guards Office";
-"type.power.portal" = "Power Portal";
-"type.building.guardhouse" = "Security Booth";
+"type.office.security" = "Oficina de Seguridad Privada";
+"type.power.portal" = "Torre de Alta Tensión";
+"type.building.guardhouse" = "Garita de Seguridad";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
index 74244a24f..a556f37a8 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -515,7 +515,7 @@
 "editor_done_dialog_1" = "Biddilt il-mappa tad-dinja! Iżżommhiex għalik innifsek; għid lil sħabek u editjawha flimkien.";
 "share_with_friends" = "Ixxerja mal-ħbieb";
 "editor_report_problem_send_button" = "Ibgħat";
-"autodownload" = "Mapep Jitniżżlu Awtomatikament";
+"autodownload" = "Mapep jitniżżlu awtomatikament";
 
 /* Place Page opening hours text */
 "closed_now" = "Magħluq issa";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index 8f0986f80..9dce8b8d2 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -7,7 +7,7 @@
 "type.aerialway.drag_lift" = "Kayak Teleferiği";
 "type.aerialway.gondola" = "Telekabin";
 "type.aerialway.mixed_lift" = "Karışık Teleferik";
-"type.aerialway.station" = "Havayolu İstasyonu";
+"type.aerialway.station" = "Teleferik İstasyonu";
 "type.aeroway" = "Hava Sahası Altyapısı";
 "type.aeroway.aerodrome" = "Havaalanı";
 "type.aeroway.aerodrome.international" = "Uluslararası Havalimanı";
@@ -465,7 +465,6 @@
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.pedestrian.bridge" = "Yaya Köprüsü";
-
 "type.highway.pedestrian.square" = "Meydan";
 
 /* These translations are used for all type.highway.*.tunnel. */