diff --git a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
index f2a1db5d9..778614bd1 100644
--- a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
@@ -24,7 +24,7 @@ Sartu komunitatean eta lagundu maparik onena aplikatzen
 • Lineaz kanpoko Wikipedia artikuluak
 • Metroaren garraio geruza eta jarraibideak
 • Arrastoen grabazioa
-• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
 • Gauean erabiltzeko modu iluna
 • Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
 
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 8886b95fb..3468263f0 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -912,4 +912,6 @@
     <string name="open_now">Otevřeno</string>
     <string name="closed_now">Zavřeno</string>
     <string name="at">v %s</string>
+    <string name="osm_note_toast">Poznámka bude odeslána do OpenStreetMap</string>
+    <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
 </resources>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index c3edacf93..9f6e12cce 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -600,11 +600,11 @@
     <string name="placepage_add_stop">Añadir parada</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Inicia sesión en OpenStreetMap para cargar automáticamente todas tus ediciones de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
-    <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
-    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébelo ó escríbanos a support@comaps.app</string>
+    <string name="dialog_error_storage_title">Error de acceso al almacenamiento</string>
+    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
     <string name="core_entrance">Entrada</string>
-    <string name="error_enter_correct_name">Por favor, introduzca el nombre correcto</string>
+    <string name="error_enter_correct_name">Por favor, introduce un nombre válido</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Ocultar todo</string>
@@ -648,7 +648,7 @@
     <string name="layers_title">Estilos y capas del mapa</string>
     <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
-    <string name="bookmarks_empty_list_message">Para agregar un marcador, toque un lugar en el mapa y después toque el icono de la estrella</string>
+    <string name="bookmarks_empty_list_message">Para agregar un marcador, toca un lugar en el mapa y después toca el icono de la estrella</string>
     <string name="category_desc_more">…más</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
@@ -731,10 +731,10 @@
     <string name="mountains">Montañas</string>
     <string name="animals">Animales</string>
     <string name="hotels">Hoteles</string>
-    <string name="buildings">Edificios</string>
+    <string name="buildings">Edificaciones</string>
     <string name="money">Dinero</string>
     <string name="shops">Tiendas</string>
-    <string name="parkings">Estacionamiento</string>
+    <string name="parkings">Aparcamiento</string>
     <string name="fuel_places">Gasolineras</string>
     <string name="medicine">Medicina</string>
     <string name="search_in_the_list">Buscar en la lista</string>
@@ -770,7 +770,7 @@
     <!-- A preference title; keep short! -->
     <string name="enable_show_on_lock_screen">Mostrar en la pantalla de bloqueo</string>
     <!-- Description in preferences -->
-    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tiene que desbloquear el dispositivo para ejecutar la aplicación.</string>
+    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tienes que desbloquear el dispositivo para ejecutar la aplicación.</string>
     <!-- Current language of the map! -->
     <string name="change_map_locale">Idioma del mapa</string>
     <!-- OpenStreetMap text on splash screen -->
@@ -784,27 +784,27 @@
     <!-- App Tip #00 -->
     <string name="app_tip_00">¡Gracias por utilizar nuestros mapas creados por la comunidad!</string>
     <!-- App tip #01 -->
-    <string name="app_tip_01">¡Con sus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
+    <string name="app_tip_01">¡Con tus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">¿Le gusta nuestra aplicación? ¡Por favor done para apoyar su desarrollo! ¿Todavía no le gusta? ¡Díganos por qué y lo arreglaremos!</string>
+    <string name="app_tip_02">¿Te gusta nuestra aplicación? ¡Por favor dona para apoyar su desarrollo! ¿Todavía no te gusta? ¡Dinos por qué y lo arreglaremos!</string>
     <!-- App tip #03 -->
     <string name="app_tip_03">Si conoce a algún desarrollador o desarrolladora de software, le puede pedir que implemente alguna funcionalidad que usted necesite.</string>
     <!-- App tip #04 -->
-    <string name="app_tip_04">Toque en cualquier lugar del mapa para seleccionar cualquier elemento. Mantenga pulsado para ocultar y volver a mostrar la interfaz.</string>
+    <string name="app_tip_04">Toca en cualquier lugar del mapa para seleccionar cualquier elemento. Manten pulsado para ocultar y volver a mostrar la interfaz.</string>
     <!-- App tip #05 -->
-    <string name="app_tip_05">¿Sabía que su ubicación actual en el mapa se puede seleccionar?</string>
+    <string name="app_tip_05">¿Sabías que tu ubicación actual en el mapa se puede seleccionar?</string>
     <!-- App tip #06 -->
-    <string name="app_tip_06">Puede ayudar a traducir nuestra aplicación a su idioma.</string>
+    <string name="app_tip_06">Puedes ayudar a traducir nuestra aplicación a tu idioma.</string>
     <!-- App tip #07 -->
     <string name="app_tip_07">Nuestra aplicación está desarrollada por unos pocos entusiastas y la comunidad.</string>
     <!-- App tip #08 -->
-    <string name="app_tip_08">Puede arreglar y mejorar fácilmente los datos del mapa.</string>
+    <string name="app_tip_08">Puedes arreglar y mejorar fácilmente los datos del mapa.</string>
     <!-- App tip #09 -->
-    <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar que le encantarán.</string>
+    <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar, que te encantarán.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ahora usa CoMaps en la pantalla del teléfono</string>
+    <string name="car_used_on_the_phone_screen">Ahora estás usando CoMaps en la pantalla del teléfono</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ahora usa CoMaps en la pantalla del coche</string>
+    <string name="car_used_on_the_car_screen">Ahora estás usando CoMaps en la pantalla del coche</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Se ha conectado a Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -812,9 +812,9 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">A la pantalla del coche</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, compruebe la notificación en el teléfono.</string>
+    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, comprueba la notificación en el teléfono.</string>
     <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Esta aplicación necesita su permiso</string>
+    <string name="aa_request_permission_notification">Esta aplicación necesita tu permiso</string>
     <!-- The text in the activity for location permission request. -->
     <string name="aa_request_permission_activity_text">CoMaps en Android Auto necesita permiso de ubicación para funcionar eficazmente</string>
     <!-- Grant Permissions button. -->
@@ -825,7 +825,7 @@
     <string name="browser_not_available">El navegador web no está disponible</string>
     <string name="volume">Volumen</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exportar todos los marcadores y trayectos</string>
+    <string name="bookmarks_export">Exportar todos los marcadores y trazas</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Configuración de síntesis de voz del sistema</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
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 d211e9332..6dfc8b8dc 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -322,19 +322,19 @@
     <string name="type.cuisine.noodles">Fideos</string>
     <string name="type.cuisine.oriental">Oriental</string>
     <string name="type.cuisine.pancake">Tortitas</string>
-    <string name="type.cuisine.pasta">Pastas</string>
+    <string name="type.cuisine.pasta">Pasta</string>
     <string name="type.cuisine.persian">Persa</string>
     <string name="type.cuisine.peruvian">Peruana</string>
     <string name="type.cuisine.pizza">Pizzas</string>
     <string name="type.cuisine.polish">Polaca</string>
     <string name="type.cuisine.portuguese">Portuguesa</string>
     <string name="type.cuisine.ramen">Ramen</string>
-    <string name="type.cuisine.regional">Cocina regional</string>
+    <string name="type.cuisine.regional">Regional</string>
     <string name="type.cuisine.russian">Rusa</string>
     <string name="type.cuisine.sandwich">Sándwiches</string>
     <string name="type.cuisine.sausage">Salchichas</string>
     <string name="type.cuisine.savory_pancakes">Tortitas saladas</string>
-    <string name="type.cuisine.seafood">Mariscos</string>
+    <string name="type.cuisine.seafood">del mar</string>
     <string name="type.cuisine.soba">Soba</string>
     <string name="type.cuisine.spanish">Española</string>
     <string name="type.cuisine.steak_house">Asador</string>
@@ -373,10 +373,10 @@
     <string name="type.healthcare.speech_therapist">Logopedia</string>
     <!-- SECTION: Types: Roads -->
     <string name="type.highway">Carretera</string>
-    <string name="type.highway.bridleway">Camino de caballos</string>
+    <string name="type.highway.bridleway">Camino ecuestre</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.bridleway.bridge">Puente</string>
-    <string name="type.highway.bridleway.permissive">Camino de caballos</string>
+    <string name="type.highway.bridleway.permissive">Camino ecuestre</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.bridleway.tunnel">Túnel</string>
     <string name="type.highway.busway">Carretera exclusiva para autobuses</string>
@@ -384,7 +384,7 @@
     <string name="type.highway.busway.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.busway.tunnel">Túnel</string>
-    <string name="type.highway.bus_stop">Parada de autobús</string>
+    <string name="type.highway.bus_stop">Parada de bus</string>
     <string name="type.highway.construction">Vía en construcción</string>
     <string name="type.highway.cycleway">Ciclovía</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -440,7 +440,7 @@
     <!-- 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 de carretera principal</string>
+    <string name="type.highway.primary.tunnel">Túnel</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>
@@ -788,18 +788,18 @@
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
     <string name="type.power.generator.wind">Generador de viento</string>
-    <string name="type.power.generator.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.generator.hydro">Planta de energía hidroeléctrica</string>
+    <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
     <string name="type.power.line.underground">Línea eléctrica subterránea</string>
-    <string name="type.power.minor_line">Línea eléctrica de baja tensión</string>
-    <string name="type.power.plant">Planta de energía</string>
+    <string name="type.power.minor_line">Línea eléctrica menor</string>
+    <string name="type.power.plant">Planta eléctrica</string>
     <string name="type.power.plant.coal">Central eléctrica de carbón</string>
-    <string name="type.power.plant.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.plant.hydro">Planta de energía hidroeléctrica</string>
+    <string name="type.power.plant.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.plant.hydro">Planta hidroeléctrica</string>
     <string name="type.power.plant.solar">Planta de energía solar</string>
     <string name="type.power.plant.wind">Planta eólica</string>
-    <string name="type.power.substation">Subestación eléctrica</string>
+    <string name="type.power.substation">Subestación</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Torre eléctrica</string>
     <string name="type.public_transport">Transporte público</string>
@@ -813,9 +813,9 @@
     <string name="type.railway.halt">Punto de parada</string>
     <string name="type.railway.level_crossing">Cruce a nivel</string>
     <string name="type.railway.light_rail">Tren ligero</string>
-    <string name="type.railway.monorail">Monorraíl</string>
+    <string name="type.railway.monorail">Monorriel</string>
     <string name="type.railway.narrow_gauge">Vía férrea estrecha</string>
-    <string name="type.railway.platform">Plataforma de vía férrea</string>
+    <string name="type.railway.platform">Plataforma ferroviaria</string>
     <string name="type.railway.rail">Ferrocarril</string>
     <string name="type.railway.rail.highspeed">Ferrocarril de alta velocidad</string>
     <string name="type.railway.rail.tourism">Ferrocarril turístico</string>
@@ -1362,8 +1362,8 @@
     <string name="type.railway.funicular.bridge">Puente de funicular</string>
     <string name="type.railway.funicular.tunnel">Túnel de funicular</string>
     <string name="type.railway.light_rail.tunnel">Túnel de tren ligero</string>
-    <string name="type.railway.monorail.bridge">Puente de monorraíl</string>
-    <string name="type.railway.monorail.tunnel">Túnel de monorraíl</string>
+    <string name="type.railway.monorail.bridge">Puente de monorriel</string>
+    <string name="type.railway.monorail.tunnel">Túnel de monorriel</string>
     <string name="type.railway.narrow_gauge.bridge">Puente de vía férrea estrecha</string>
     <string name="type.railway.preserved">Raíl conservado</string>
     <string name="type.fee.yes">$</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 2802b53e2..8c6e280d4 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -916,4 +916,6 @@
     <string name="open_now">Hetkel avatud</string>
     <string name="at">kell %s</string>
     <string name="closed_now">Praegu suletud</string>
+    <string name="osm_note_toast">Märge salvestatakse OpenStreetMapi andmebaasi</string>
+    <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
 </resources>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 37b5c46ff..40dee4c28 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -74,7 +74,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Markagailuak</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Markagailuak eta ibilbideak</string>
+    <string name="bookmarks_and_tracks">Markagailuak eta arrastoak</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Nire tokiak</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -203,7 +203,7 @@
     <!-- Confirmation for OpenStreetMap log out. -->
     <string name="osm_log_out_confirmation">Ziur zure OpenStreetMap kontutik saioa amaitu nahi duzula?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Arrasto</string>
+    <string name="tracks_title">Arrastoak</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Luzera</string>
     <string name="share_my_location">Partekatu nire kokapena</string>
@@ -559,7 +559,7 @@
     <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero.</string>
     <string name="navigation_stop_button">Gelditu</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Ibilbidea grabatzea</string>
+    <string name="track_recording">Arrastoa grabatzea</string>
     <!-- For the first routing -->
     <string name="accept">Onartu</string>
     <!-- For the first routing -->
@@ -613,7 +613,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Sortu zerrenda berria</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Inportatu markagailuak eta ibilbideak</string>
+    <string name="bookmarks_import">Inportatu markagailuak eta arrastoak</string>
     <string name="bookmarks_error_message_share_general">Ezin izan da partekatu aplikazioaren errore baten ondorioz</string>
     <string name="bookmarks_error_title_share_empty">Partekatzeak huts egin du</string>
     <string name="bookmarks_error_message_share_empty">Ezin da partekatu zerrenda hutsik</string>
@@ -631,8 +631,8 @@
     </plurals>
     <string name="restore">Berreskuratu</string>
     <plurals name="tracks">
-        <item quantity="one">%d arrasto</item>
-        <item quantity="other">%d arrastos</item>
+        <item quantity="one">arrasto %d</item>
+        <item quantity="other">%d arrasto</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Pribatutasuna</string>
@@ -816,7 +816,7 @@
     <string name="browser_not_available">Web arakatzailea ez dago erabilgarri</string>
     <string name="volume">Bolumena</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Esportatu Laster-marka eta Pista guztiak</string>
+    <string name="bookmarks_export">Esportatu markagailu eta arrasto guztiak</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Sistemaren ahots-sintesiaren ezarpenak</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -840,17 +840,17 @@
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Nabigazio zehatzena lortzeko, telefonoaren bateriaren ezarpenetan energia aurrezteko modua desgaitzea gomendatzen dugu.</string>
     <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Ibilbidearen grabaketa</string>
+    <string name="start_track_recording">Grabatu arrastoa</string>
     <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Gelditu ibilbidearen grabaketa</string>
+    <string name="stop_track_recording">Gelditu arrastoaren grabaketa</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="stop_without_saving">Gelditu gorde gabe</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Jarraitu grabatzen</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Ibilbidearen grabaketa markagailuetan eta ibilbideetan gorde nahi duzu?</string>
+    <string name="track_recording_alert_title">Markagailu eta arrastoetan gorde nahi duzu?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Ibilbidea hutsik dago; ez dago ezer gordetzeko</string>
+    <string name="track_recording_toast_nothing_to_save">Arrastoa hutsik dago; ez dago ezer gordetzeko</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Ezin da karpeta hautatzeko elkarrizketa-koadroa erakutsi zure gailuan ez dagoelako aplikazio egokirik instalatuta. Instalatu fitxategi-kudeatzaile aplikazio bat eta saiatu berriro.</string>
     <string name="choose_color">Aukeratu kolorea</string>
@@ -909,7 +909,7 @@
     <string name="backup_interval_every_week">Astero</string>
     <string name="backup_interval_manual_only">Itzalita (eskuz bakarrik)</string>
     <string name="pref_backup_title">Markagailu eta arrastoen babeskopia</string>
-    <string name="pref_backup_summary">Egin babeskopia zure gailuan automatikoki</string>
+    <string name="pref_backup_summary">Automatikoki egin babeskopia zure gailuan</string>
     <string name="pref_backup_now_summary_folder_unavailable">Babeskopiaren karpeta ez dago eskuragarri</string>
     <string name="dialog_report_error_missing_folder">Babeskopiarako hautatutako kokapena ez dago eskuragarri edo ezin da idatzi. Hautatu beste kokapen bat.</string>
     <string name="pref_backup_now_summary_progress">Babeskopia egiten…</string>
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index d2c035ab9..9f28603a0 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -484,12 +484,12 @@
     <string name="type.highway.tertiary_link.bridge">Zubia</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary_link.tunnel">Tunel</string>
-    <string name="type.highway.track">Kalea</string>
-    <string name="type.highway.track.area">Kalea</string>
+    <string name="type.highway.track">Arrastoa</string>
+    <string name="type.highway.track.area">Arrastoa</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.track.bridge">Zubia</string>
-    <string name="type.highway.track.grade1">Kalea</string>
-    <string name="type.highway.track.no.access">Kalea</string>
+    <string name="type.highway.track.grade1">Arrastoa</string>
+    <string name="type.highway.track.no.access">Arrastoa</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.track.tunnel">Tunel</string>
     <string name="type.highway.traffic_signals">Semaforoak</string>
@@ -521,7 +521,7 @@
     <string name="type.area_highway.service">Kalea</string>
     <string name="type.area_highway.tertiary">Kalea</string>
     <string name="type.area_highway.steps">Bidea</string>
-    <string name="type.area_highway.track">Kalea</string>
+    <string name="type.area_highway.track">Arrastoa</string>
     <string name="type.area_highway.trunk">Kalea</string>
     <string name="type.area_highway.unclassified">Kalea</string>
     <!-- SECTION: Types: Historic -->
@@ -749,7 +749,7 @@
     <string name="type.railway.rail.utility">Erabilgarritasun trena</string>
     <string name="type.railway.rail.spur">Trenbide-spur</string>
     <!-- Short service tracks: siding, yard, crossover. -->
-    <string name="type.railway.rail.service">Trenbide laguntzailea</string>
+    <string name="type.railway.rail.service">Zerbitzuko trenbidea</string>
     <string name="type.railway.rail.bridge">Trenbide zubia</string>
     <string name="type.railway.rail.highspeed.bridge">Trenbide zubia</string>
     <string name="type.railway.rail.tourism.bridge">Trenbide zubia</string>
@@ -1274,8 +1274,8 @@
     <string name="type.landuse.military">Militar-gunea</string>
     <string name="type.leisure.recreation_ground">Parkea</string>
     <string name="type.leisure.slipway">Arrapala</string>
-    <string name="type.leisure.track">Pista</string>
-    <string name="type.leisure.track.area">Pista</string>
+    <string name="type.leisure.track">Arrastoa</string>
+    <string name="type.leisure.track.area">Arrastoa</string>
     <string name="type.landuse.plant_nursery">Landare haztegia</string>
     <string name="type.leisure.firepit">Su-ontzi</string>
     <string name="type.man_made.breakwater">Dike</string>
diff --git a/android/app/src/main/res/values-fa/types_strings.xml b/android/app/src/main/res/values-fa/types_strings.xml
index 0ee28830c..8a6d6262d 100644
--- a/android/app/src/main/res/values-fa/types_strings.xml
+++ b/android/app/src/main/res/values-fa/types_strings.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.even">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.odd">آدرس/بلاک</string>
+    <string name="type.addr_interpolation">نشانی/بست</string>
+    <string name="type.addr_interpolation.even">نشانی/بست</string>
+    <string name="type.addr_interpolation.odd">نشانی/بست</string>
     <string name="type.aeroway.aerodrome">فرودگاه</string>
-    <string name="type.aeroway.aerodrome.international">فرودگاه</string>
-    <string name="type.aeroway.helipad">پد فرود بالگرد</string>
-    <string name="type.amenity">زیر ساخت</string>
-    <string name="type.amenity.arts_centre">مرکز هنری</string>
+    <string name="type.aeroway.aerodrome.international">فرودگاه فرامرزی</string>
+    <string name="type.aeroway.helipad">بالگَردنشین</string>
+    <string name="type.amenity">امکانات آسایشی</string>
+    <string name="type.amenity.arts_centre">کانون هنری</string>
     <string name="type.amenity.atm">خودپرداز</string>
     <string name="type.amenity.bank">بانک</string>
-    <string name="type.amenity.bar">میکده</string>
-    <string name="type.amenity.bbq">منقل کباب</string>
-    <string name="type.amenity.bench">سَکو</string>
-    <string name="type.amenity.bicycle_parking">پارکینگ دوچرخه</string>
-    <string name="type.amenity.bicycle_rental">مکان اجاره دوچرخه</string>
+    <string name="type.amenity.bar">می‌کده</string>
+    <string name="type.amenity.bbq">اَدیشت کباب</string>
+    <string name="type.amenity.bench">نیمکت</string>
+    <string name="type.amenity.bicycle_parking">ایستگاه دوچرخه</string>
+    <string name="type.amenity.bicycle_rental">جایگاه کرایه دوچرخه</string>
     <string name="type.amenity.bicycle_repair_station">ایستگاه تعمیر دوچرخه</string>
     <string name="type.amenity.biergarten">غذا</string>
     <string name="type.amenity.brothel">فاحشه خانه</string>
@@ -1092,8 +1092,13 @@
     <string name="type.leisure.sports_hall">سالن ورزشی</string>
     <string name="type.man_made.silo">سیلو</string>
     <string name="type.man_made.storage_tank">مخازن سیال</string>
-    <string name="type.aerialway.cable_car">ماشین کابلی</string>
-    <string name="type.aerialway.station">ایستگاه راه هوایی</string>
-    <string name="type.aeroway">­زیرساخت هوا و فضا</string>
+    <string name="type.aerialway.cable_car">خودردو کابلی</string>
+    <string name="type.aerialway.station">ایستگاه راه‌هوایی</string>
+    <string name="type.aeroway">زیرساخت مرز‌هوایی</string>
     <string name="type.aerialway">راه هوایی</string>
+    <string name="type.amenity.bicycle_parking.covered">ایستگاه پوشیده‌ی دوچرخه</string>
+    <string name="type.aeroway.apron">پیشگاه</string>
+    <string name="type.aeroway.gate">دروازه</string>
+    <string name="type.aeroway.taxiway">رج وزیگ</string>
+    <string name="type.aeroway.terminal">پایانه</string>
 </resources>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index ca6b88007..3bac1bc67 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -921,4 +921,6 @@
     <string name="open_now">Auki nyt</string>
     <string name="closed_now">Suljettu nyt</string>
     <string name="at">kello %s</string>
+    <string name="osm_note_toast">Huomio lähetetään OpenStreetMap:iin</string>
+    <string name="osm_note_hint">Vaihtoehtoisesti voit jättää huomion OpenStreetMap yhteisölle, jotta joku muu voi lisätä tai korjata paikan tiedot.</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index b31787436..29a947afe 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -4,10 +4,10 @@
     <!-- Button text (should be short) -->
     <string name="back">Terug</string>
     <!-- Button text (should be short) -->
-    <string name="cancel">Annuleer</string>
+    <string name="cancel">Annuleren</string>
     <!-- Button which deletes downloaded country -->
-    <string name="delete">Verwijder</string>
-    <string name="download_maps">Download kaarten</string>
+    <string name="delete">Verwijderen</string>
+    <string name="download_maps">Kaarten downloaden</string>
     <!-- Settings/Downloader - info for country when download fails -->
     <string name="download_has_failed">Downloaden is mislukt, tik om het opnieuw te proberen.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
@@ -21,21 +21,21 @@
     <!-- Update maps later button text -->
     <string name="later">Later</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
-    <string name="search">Zoek</string>
+    <string name="search">Zoeken</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Zoek op de kaart</string>
+    <string name="search_map">Zoeken op de kaart</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Beperkte nauwkeurigheid</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld bij Instellingen</string>
     <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Toon op de kaart</string>
+    <string name="zoom_to_country">Weergeven op de kaart</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">Downloaden is mislukt</string>
     <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">Probeer opnieuw</string>
+    <string name="try_again">Opnieuw proberen</string>
     <string name="about_menu_title">Over CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Open project, gemaakt door de community</string>
@@ -46,29 +46,29 @@
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, snel en compact</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiën.</string>
+    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiering.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Locatie-instellingen</string>
-    <string name="close">Sluit</string>
-    <string name="unsupported_phone">Een hardware geaccellereerde OpenGL is nodig. Jammer genoeg wordt uw apparaat niet ondersteund.</string>
-    <string name="download">Download</string>
+    <string name="close">Sluiten</string>
+    <string name="unsupported_phone">De app vereist hardwareversnelde OpenGL. Helaas wordt dit apparaat niet ondersteund.</string>
+    <string name="download">Downloaden</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="disconnect_usb_cable">Verwijder de USB-kabel of plaats een geheugenkaart om CoMaps te gebruiken</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
-    <string name="download_resources">Voordat u start, laten we de algemene wereldkaart naar uw apparaat downloaden. \nDeze neemt %s in beslag.</string>
+    <string name="download_resources">Laten we, voor de eerste start, de algemene wereldkaart downloaden. \nDeze gebruikt %s aan opslag.</string>
     <string name="download_resources_continue">Ga naar de kaart</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) aan het downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
     <string name="download_country_ask">%1$s downloaden? (%2$s)</string>
-    <string name="update_country_ask">%1$s updaten? (%2$s)</string>
+    <string name="update_country_ask">%1$s bijwerken? (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
-    <string name="pause">Pauzeer</string>
+    <string name="pause">Pauzeren</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
-    <string name="continue_button">Ga verder</string>
+    <string name="continue_button">Doorgaan</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
     <string name="download_country_failed">%s download is mislukt</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Voeg nieuwe groep toe</string>
+    <string name="add_new_set">Nieuwe groep toevoegen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Naam van bladwijzergroep</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -88,19 +88,19 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Kaarten opslaan in</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecteer de map waar kaarten naar gedownload worden</string>
+    <string name="maps_storage_summary">Selecteer de map om kaarten naar te downloaden</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-    <string name="maps_storage_downloaded">Kaarten</string>
+    <string name="maps_storage_downloaded">Gedownloade kaarten</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Intern persoonlijk geheugen</string>
+    <string name="maps_storage_internal">Interne persoonlijke opslag</string>
     <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Intern gedeeld geheugen</string>
+    <string name="maps_storage_shared">Interne gedeelde opslag</string>
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">SD-kaart</string>
     <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Extern gedeeld geheugen</string>
+    <string name="maps_storage_external">Externe gedeelde opslag</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
-    <string name="maps_storage_free_size">%1$s beschikbaar van %2$s</string>
+    <string name="maps_storage_free_size">%1$s van %2$s beschikbaar</string>
     <!-- Question dialog for transferring maps from one storage to another -->
     <string name="move_maps">Kaarten verplaatsen?</string>
     <!-- Error moving map files from one storage to another -->
@@ -162,20 +162,20 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Bladwijzers van CoMaps zijn met u gedeeld</string>
+    <string name="share_bookmarks_email_subject">CoMaps bladwijzers zijn met u gedeeld</string>
     <string name="share_bookmarks_email_body">Hallo! \n \nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Bladwijzers worden geladen</string>
+    <string name="load_kmz_title">Bladwijzers laden</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bladwijzers succesvol geüpload! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
+    <string name="load_kmz_successful">Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bladwijzers uploaden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
+    <string name="load_kmz_failed">Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Bestand openen mislukt %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
-    <string name="edit">Wijzig</string>
+    <string name="edit">Bewerken</string>
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Je locatie is nog niet vastgesteld</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
@@ -191,7 +191,7 @@
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hoi, \n \nMomenteel ben ik hier: %1$s. Klik op deze %2$s link of deze %3$s link om de plaats op de kaart te zien. \n \nBedankt.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
-    <string name="share">Deel</string>
+    <string name="share">Delen</string>
     <!-- Share by email button text, also used in editor and About. -->
     <string name="email">E-mail</string>
     <!-- Text for message when used successfully copied something -->
@@ -206,7 +206,7 @@
     <string name="tracks_title">Tracks</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Lengte</string>
-    <string name="share_my_location">Deel mijn locatie</string>
+    <string name="share_my_location">Mijn locatie delen</string>
     <!-- Settings general group in settings screen -->
     <string name="prefs_group_general">Algemene instellingen</string>
     <!-- Settings information group in settings screen -->
@@ -237,14 +237,14 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Gesproken taal</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Test gesproken aanwijzingen</string>
+    <string name="pref_tts_test_voice_title">Gesproken aanwijzingen testen</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Niet beschikbaar</string>
     <string name="pref_map_auto_zoom">Automatisch zoomen</string>
     <string name="placepage_distance">Afstand</string>
-    <string name="search_show_on_map">Bekijk op de kaart</string>
+    <string name="search_show_on_map">Weergeven op kaart</string>
     <!-- Text in menu -->
     <string name="website">Website</string>
     <!-- Text in About menu, opens CoMaps news website -->
@@ -258,7 +258,7 @@
     <!-- Button in the main Help dialog -->
     <string name="faq">Vragen en antwoorden</string>
     <!-- Button in the main menu -->
-    <string name="donate">Doneer</string>
+    <string name="donate">Doneren</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Steun het project</string>
     <!-- Button in the main Help dialog -->
@@ -272,30 +272,30 @@
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
     <string name="long_tap_toast">Tik nogmaals lang op de kaart om de interface te zien</string>
     <!-- Update all button text -->
-    <string name="downloader_update_all_button">Update alles</string>
+    <string name="downloader_update_all_button">Alles bijwerken</string>
     <!-- Cancel all button text -->
-    <string name="downloader_cancel_all">Annuleer alles</string>
+    <string name="downloader_cancel_all">Alles annuleren</string>
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Gedownload</string>
     <!-- Country queued for download -->
     <string name="downloader_queued">In de wachtrij</string>
-    <string name="downloader_near_me_subtitle">Bij mij in de buurt</string>
+    <string name="downloader_near_me_subtitle">In de buurt</string>
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">Kaarten</string>
-    <string name="downloader_download_all_button">Download alles</string>
-    <string name="downloader_downloading">Aan het downloaden:</string>
+    <string name="downloader_download_all_button">Alles downloaden</string>
+    <string name="downloader_downloading">Downloaden:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
     <string name="downloader_delete_map_while_routing_dialog">Stop de navigatie om de kaart te verwijderen</string>
     <!-- PointsInDifferentMWM -->
-    <string name="routing_failed_cross_mwm_building">Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
+    <string name="routing_failed_cross_mwm_building">Alleen routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
     <!-- Context menu item for downloader. -->
-    <string name="downloader_download_map">Download de kaart</string>
+    <string name="downloader_download_map">Kaart downloaden</string>
     <!-- Item status in downloader. -->
-    <string name="downloader_retry">Probeer opnieuw</string>
+    <string name="downloader_retry">Opnieuw</string>
     <!-- Item in context menu. -->
-    <string name="downloader_delete_map">Verwijder kaart</string>
+    <string name="downloader_delete_map">Kaart verwijderen</string>
     <!-- Item in context menu. -->
-    <string name="downloader_update_map">Update kaart</string>
+    <string name="downloader_update_map">Kaart bijwerken</string>
     <!-- Preference title -->
     <string name="google_play_services">Google Fused-locatieservices</string>
     <!-- Preference text -->
@@ -305,12 +305,12 @@
     <!-- Text for routing error dialog -->
     <string name="routing_download_maps_along">Download kaarten op de route</string>
     <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar uw bestemming gedownload en bijgewerkt zijn.</string>
+    <string name="routing_requires_all_map">Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar de bestemming gedownload en bijgewerkt zijn.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">Niet genoeg ruimte</string>
     <!-- location service disabled -->
-    <string name="enable_location_services">Schakel locatiediensten in</string>
-    <string name="save">Bewaar</string>
+    <string name="enable_location_services">Locatiediensten inschakelen</string>
+    <string name="save">Opslaan</string>
     <string name="create">aanmaken</string>
     <!-- red color -->
     <string name="red">Rood</string>
@@ -358,15 +358,15 @@
     <string name="dialog_routing_location_unknown_turn_on">De huidige gps-coördinaten kunnen niet worden gevonden. Schakel locatiediensten in om de route te berekenen.</string>
     <string name="dialog_routing_unable_locate_route">Route vinden mislukt</string>
     <string name="dialog_routing_cant_build_route">Route samenstellen mislukt</string>
-    <string name="dialog_routing_change_start_or_end">Kies een ander startpunt of een andere bestemming.</string>
-    <string name="dialog_routing_change_start">Kies ander startpunt</string>
+    <string name="dialog_routing_change_start_or_end">Pas het startpunt of de bestemming aan.</string>
+    <string name="dialog_routing_change_start">Startpunt aanpassen</string>
     <string name="dialog_routing_start_not_determined">Route samenstellen mislukt. Startpunt kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_start">Kies een startpunt dat dichter bij een weg ligt.</string>
-    <string name="dialog_routing_change_end">Kies andere bestemming</string>
+    <string name="dialog_routing_change_end">Bestemming aanpassen</string>
     <string name="dialog_routing_end_not_determined">Route samenstellen mislukt. Bestemming kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_end">Kies een bestemming die dichter bij een weg ligt</string>
     <string name="dialog_routing_change_intermediate">Kan de tussenstop niet vinden</string>
-    <string name="dialog_routing_intermediate_not_determined">Gelieve uw tussenstop aan te passen</string>
+    <string name="dialog_routing_intermediate_not_determined">Pas de tussenstop aan</string>
     <string name="dialog_routing_system_error">Systeemfout</string>
     <string name="dialog_routing_application_error">Route samenstellen mislukt door een applicatiefout</string>
     <string name="dialog_routing_try_again">Probeer het opnieuw</string>
@@ -377,21 +377,21 @@
     <string name="search_without_internet_advertisement">Om te beginnen met zoeken en om routebeschrijvingen te kunnen maken, moet u de kaart downloaden. U heeft vervolgens geen internetverbinding meer nodig.</string>
     <string name="search_select_map">Selecteer de kaart</string>
     <!-- «Show» context menu -->
-    <string name="show">Toon</string>
+    <string name="show">Tonen</string>
     <!-- «Hide» context menu -->
-    <string name="hide">Verberg</string>
+    <string name="hide">Verbergen</string>
     <string name="categories">Categorieën</string>
     <string name="history">Geschiedenis</string>
-    <string name="search_not_found">Sorry, geen resultaten gevonden</string>
+    <string name="search_not_found">Geen resultaten gevonden</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen.</string>
     <string name="search_history_title">Zoekgeschiedenis</string>
-    <string name="search_history_text">Snel toegang tot recente zoekopdrachten</string>
-    <string name="clear_search">Wis zoekgeschiedenis</string>
+    <string name="search_history_text">Recente zoekopdrachten</string>
+    <string name="clear_search">Zoekgeschiedenis wissen</string>
     <string name="p2p_your_location">Uw locatie</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Van</string>
-    <string name="p2p_to_here">Route naar</string>
+    <string name="p2p_to_here">Naar</string>
     <string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie</string>
     <string name="p2p_reroute_from_current">Wilt u een route plannen vanaf uw huidige locatie?</string>
     <!-- Edit open hours/set time and minutes dialog -->
@@ -400,10 +400,10 @@
     <string name="editor_time_from">Van</string>
     <!-- Tab title in the Edit Opening Hours time picker -->
     <string name="editor_time_to">Tot</string>
-    <string name="editor_time_add">Voeg schema toe</string>
-    <string name="editor_time_delete">Verwijder schema</string>
+    <string name="editor_time_add">Schema toevoegen</string>
+    <string name="editor_time_delete">Schema verwijderen</string>
     <!-- Text for allday switch. -->
-    <string name="editor_time_allday">Elke dag (24 uur)</string>
+    <string name="editor_time_allday">Hele dag (24 uur)</string>
     <string name="editor_time_open">Open</string>
     <string name="editor_time_close">Gesloten</string>
     <string name="editor_time_add_closed">Sluitingstijden toevoegen</string>
@@ -416,12 +416,12 @@
     <string name="editor_add_select_location">Locatie selecteren</string>
     <string name="editor_report_problem_desription_1">Beschrijf het probleem gedetailleerd, zodat de OpenStreetMap-community de fout kan oplossen.</string>
     <string name="editor_report_problem_desription_2">Of doe het zelf op https://www.openstreetmap.org/</string>
-    <string name="editor_report_problem_send_button">Verzend</string>
+    <string name="editor_report_problem_send_button">Verzenden</string>
     <string name="editor_report_problem_title">Probleem</string>
     <string name="editor_report_problem_no_place_title">De plaats bestaat niet</string>
-    <string name="editor_report_problem_under_construction_title">Gesloten voor onderhoud</string>
+    <string name="editor_report_problem_under_construction_title">Gesloten i.v.m. onderhoud</string>
     <string name="editor_report_problem_duplicate_place_title">Dubbele plaats</string>
-    <string name="autodownload">Download kaarten automatisch</string>
+    <string name="autodownload">Kaarten automatisch downloaden</string>
     <!-- Place Page opening hours text -->
     <string name="daily">Dagelijks</string>
     <string name="twentyfour_seven">24/7</string>
@@ -431,7 +431,7 @@
     <string name="opens_in">Opent over %s</string>
     <string name="closes_in">Sluit over %s</string>
     <string name="closed">Gesloten</string>
-    <string name="edit_opening_hours">Bewerk openingstijden</string>
+    <string name="edit_opening_hours">Openingstijden bewerken</string>
     <string name="no_osm_account">Geen account bij OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Registreer bij OpenStreetMap</string>
     <string name="login">Log in</string>
@@ -441,8 +441,8 @@
     <string name="password">Wachtwoord</string>
     <string name="forgot_password">Wachtwoord vergeten?</string>
     <string name="logout">Log uit</string>
-    <string name="edit_place">Bewerk de locatie</string>
-    <string name="add_language">Voeg een taal toe</string>
+    <string name="edit_place">Locatie bewerken</string>
+    <string name="add_language">Taal toevoegen</string>
     <string name="street">Straat</string>
     <!-- Editable House Number text field (in address block). -->
     <string name="house_number">Huisnummer</string>
@@ -450,9 +450,9 @@
     <string name="social_media">Sociale media</string>
     <string name="building">Gebouw</string>
     <!-- Text field to enter non-existing street name, below list of known streets around -->
-    <string name="add_street">Voeg een straat toe</string>
+    <string name="add_street">Een straat toevoegen</string>
     <!-- Error to display when a new street name is not entered in the New street dialog -->
-    <string name="empty_street_name_error">Voer een straatnaam in a.u.b.</string>
+    <string name="empty_street_name_error">Voer een straatnaam in</string>
     <string name="choose_language">Kies een taal</string>
     <string name="choose_street">Kies een straat</string>
     <string name="postal_code">Postcode</string>
@@ -460,14 +460,14 @@
     <string name="select_cuisine">Selecteer keuken</string>
     <!-- login text field -->
     <string name="email_or_username">E-mailadres of gebruikersnaam</string>
-    <string name="editor_add_phone">Voeg telefoonnummer toe</string>
+    <string name="editor_add_phone">Telefoonnummer toevoegen</string>
     <string name="level">Verdieping</string>
     <string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd</string>
-    <string name="downloader_update_maps">Update kaarten</string>
+    <string name="downloader_update_maps">Kaarten bijwerken</string>
     <string name="downloader_mwm_migration_dialog">Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen.</string>
-    <string name="downloader_search_field_hint">Vind een kaart</string>
+    <string name="downloader_search_field_hint">Kaart zoeken</string>
     <string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet</string>
-    <string name="downloader_no_space_title">Niet genoeg ruimte</string>
+    <string name="downloader_no_space_title">Onvoldoende ruimte</string>
     <string name="downloader_no_space_message">Verwijder overbodige gegevens</string>
     <string name="editor_login_error_dialog">Inlogfout</string>
     <string name="editor_profile_changes">Gecontroleerde wijzigingen</string>
@@ -480,16 +480,16 @@
     <string name="editor_edit_place_category_title">Categorie</string>
     <string name="detailed_problem_description">Gedetailleerde probleemomschrijving</string>
     <string name="editor_report_problem_other_title">Een ander probleem</string>
-    <string name="placepage_add_business_button">Voeg een organisatie toe</string>
+    <string name="placepage_add_business_button">Bedrijf toevoegen</string>
     <string name="message_invalid_feature_position">Hier kan geen object worden geplaatst</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %s. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in CoMaps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld. \nSluit u aan bij de gemeenschap en help mee om een betere kaart voor iedereen te maken!</string>
-    <string name="login_to_make_edits_visible">Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
+    <string name="login_to_make_edits_visible">Maak een OpenStreetMap-account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d van %2$d</string>
-    <string name="download_over_mobile_header">Downloaden via een mobiele gegevensverbinding?</string>
+    <string name="download_over_mobile_header">Downloaden via mobiele internetverbinding?</string>
     <string name="download_over_mobile_message">Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn</string>
     <string name="error_enter_correct_house_number">Voer een geldig huisnummer in</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
@@ -522,15 +522,15 @@
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
     <!-- abbreviation for mile(s) -->
-    <string name="mi">mijl</string>
+    <string name="mi">mi</string>
     <!-- A unit of measure -->
-    <string name="ft">voet</string>
+    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">u</string>
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Meer</string>
-    <string name="placepage_edit_bookmark_button">Bewerk bladwijzer</string>
+    <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
     <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
     <string name="editor_comment_hint">Reactie…</string>
     <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
@@ -862,7 +862,7 @@
     <string name="github">GitHub</string>
     <string name="gb">GB</string>
     <string name="telegram">Telegram</string>
-    <string name="matrix">Matrix</string>
+    <string name="matrix">[Matrix]</string>
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="twitter">X (Twitter)</string>
@@ -919,4 +919,7 @@
     <string name="open_now">Nu open</string>
     <string name="closed_now">Nu gesloten</string>
     <string name="at">om %s</string>
+    <string name="dialog_report_error_with_logs">Stuur ons een foutenrapport:\n - stel \"Logboek inschakelen\" in bij de Instellingen\n - reproduceer het probleem\n - druk in het scherm \"Over &amp; Hulp\" op de knop \"Meld een fout\" en verzend via e-mail of chat\n - logboek uitschakelen</string>
+    <string name="osm_note_toast">Opmerking wordt verzonden naar OpenStreetMap</string>
+    <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 2ac212575..c6d5e3289 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -909,4 +909,6 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
+    <string name="osm_note_toast">Nota será enviada para o OpenStreetMap</string>
+    <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
 </resources>
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index 41a3b7713..e0a6bf4c5 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -1386,4 +1386,5 @@
     <string name="type.man_made.crane">Кран</string>
     <string name="type.landuse.religious">Церковный двор</string>
     <string name="type.railway.station.subway.qingdao">Станция метро</string>
+    <string name="type.amenity.ranger_station">Пост лесников</string>
 </resources>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index c7d741369..ef7c9feb1 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Sil</string>
     <string name="download_maps">Harita İndir</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">İndirme başarısız. Yeniden denemek için dokun.</string>
+    <string name="download_has_failed">İndirme başarısız olmuştur, yeniden denemek için dokunun.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">İndiriliyor…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -90,7 +90,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Haritaları şuraya kaydet:</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Haritaların indirileceği yeri seç.</string>
+    <string name="maps_storage_summary">Haritaların indirileceği klasörü seçin</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Haritalar</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -681,7 +681,7 @@
     <string name="unable_to_calc_alert_title">Rota hesaplanamıyor</string>
     <string name="unable_to_calc_alert_subtitle">Rota bulunamadı. Bunun nedeni, belirlediğiniz seçenekler ya da eksik OpenStreetMap verisi olabilir. Lütfen rota seçeneklerinizi değiştirin ve yeniden deneyin.</string>
     <string name="define_to_avoid_btn">Kaçınılması gereken yolları tanımlayın</string>
-    <string name="change_driving_options_btn">Sürüş seçenekleri etkinleştirildi</string>
+    <string name="change_driving_options_btn">Yönlendirme seçenekleri etkin</string>
     <string name="toll_road">Paralı yol</string>
     <string name="unpaved_road">Asfaltsız yol</string>
     <string name="ferry_crossing">Vapur geçişi</string>
diff --git a/data/countries-strings/et.json/localize.json b/data/countries-strings/et.json/localize.json
index 82ccdb8c4..769239cc1 100644
--- a/data/countries-strings/et.json/localize.json
+++ b/data/countries-strings/et.json/localize.json
@@ -1923,19 +1923,19 @@
 "Japan_Tohoku_Iwate Description":"Morioka, Hachimantai, Ninohe",
 "Japan_Tohoku_Miyagi Description":"Sendai, Higashimatsushima, Tome",
 "Japan_Tohoku_Yamagata Description":"Nanyo, Higashine, Obanazawa",
-"Jersey Description":"Saint Helier, St. Saviour, St. John",
+"Jersey Description":"Saint Helier, Saint Saviour, Saint John",
 "Jerusalem Description":"Jerusalemm, 'Anata, Al-Walaja",
-"Jordan Description":"Amman, Zarqa, Irbid",
+"Jordan Description":"Amman, Az-Zarqā’, Irbid",
 "Kazakhstan_North Description":"Astana, Karagandõ, Pavlodar",
 "Kazakhstan_South Description":"Almatõ, Šõmkent, Aktöbe",
 "Kenya Description":"Nairobi, Kisumu, Kitale",
 "Kingdom of Lesotho Description":"Maseru, Butha-Buthe, Mohale's Hoek",
 "Kiribati Description":"Betio, Kabuna, Bairiki",
-"Kuwait Description":"Kuwait City, Al Ahmadi, Jahra",
+"Kuwait Description":"Al-Kuwayt, Al-Aḩmadi, Al-Jahrā’",
 "Kyrgyzstan Description":"Biškek, Oš, Balõktšõ",
-"Laos Description":"Vientiane, Pakxan, Oudomxay",
+"Laos Description":"Vientiane, Pakxé, Oudomxay",
 "Latvia Description":"Riia, Daugavpils, Liepāja",
-"Lebanon Description":"Beirut, Zahle, Sidon",
+"Lebanon Description":"Beirut, Zaḩlah, Siidon",
 "Liberia Description":"Monrovia, Sanniquellie, Fish Town City",
 "Libya Description":"Tripoli, Benghazi, Misrata",
 "Liechtenstein Description":"Vaduz, Schaan, Triesen",
diff --git a/data/countries-strings/fi.json/localize.json b/data/countries-strings/fi.json/localize.json
index bb2d53ede..f6842793c 100644
--- a/data/countries-strings/fi.json/localize.json
+++ b/data/countries-strings/fi.json/localize.json
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda, Lobito, Namibe",
 "Anguilla Description":"The Valley, George Hill, Stoney Ground",
-"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo Station, Chilean research station “Villa Las Estrellas”, Rocky Cove",
 "Antigua and Barbuda Description":"St. John’s",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -1514,7 +1514,7 @@
 "China_Chongqing Description":"Chongqing, Changshou, Kai",
 "China_Fujian Description":"Longyan, Sanming, Shaowu",
 "China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan",
-"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén",
+"China_Guangdong Description":"Guangzhou, Shenzhen, Jiangmen",
 "China_Guangxi Description":"Guigang, Dongxing, Wuzhou",
 "China_Guizhou Description":"Guiyang, Liupanshui, Weining",
 "China_Hebei Description":"Peking",
@@ -1582,7 +1582,7 @@
 "Egypt Description":"Kairo",
 "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate",
 "Equatorial Guinea Description":"Malabo, Mongomo, Bata",
-"Eritrea Description":"ኣስመራ, Keren, Omhajer",
+"Eritrea Description":"Asmara, Keren, Omhajer",
 "Estonia_East Description":"Tartto",
 "Estonia_West Description":"Tallinna",
 "Ethiopia Description":"Addis Abeba",
@@ -1781,7 +1781,7 @@
 "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru",
 "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields",
 "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur",
-"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center",
+"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti",
 "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior",
 "India_Maharashtra Description":"Mumbai, Pune, Nagpur",
 "India_Manipur Description":"Imphal, Imphal, Jiribam",
@@ -1817,7 +1817,7 @@
 "Isle of Man Description":"Douglas, Onchan",
 "Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut",
 "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto",
-"Italy_Aosta Valley Description":"Quart, Aosta, Aosta",
+"Italy_Aosta Valley Description":"Quart, Aosta",
 "Italy_Apulia Description":"Taranto",
 "Italy_Basilicata Description":"Potenza, Matera, Melfi",
 "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza",
@@ -1839,21 +1839,21 @@
 "Italy_Liguria Description":"Genoa, La Spezia, La Spezia",
 "Italy_Lombardy_Bergamo Description":"Bergamo, Tagliuno, Treviglio",
 "Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane",
-"Italy_Lombardy_Como Description":"Como, Como, Cantù",
-"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco",
+"Italy_Lombardy_Como Description":"Como, Cantù",
+"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco",
 "Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte",
 "Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo",
-"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara",
+"Italy_Lombardy_Mantua Description":"Mantua, Suzzara",
 "Italy_Lombardy_Milan Description":"Milano",
 "Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno",
 "Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella",
-"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno",
+"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno",
 "Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate",
 "Italy_Marche Description":"Ancona, Pesaro",
 "Italy_Molise Description":"Campobasso, Termoli, Isernia",
 "Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure",
 "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato",
-"Italy_Piemont_Biella Description":"Biella, Biella, Cossato",
+"Italy_Piemont_Biella Description":"Biella, Cossato",
 "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo",
 "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate",
 "Italy_Piemont_Torino Description":"Torino",
@@ -1975,9 +1975,9 @@
 "Nagorno-Karabakh Description":"Khankendi, Shusha, Lachin",
 "Namibia Description":"Windhoek, Opuwo, Eenhana",
 "Nauru Description":"Yaren, Buada, Orro",
-"Nepal_Kathmandu Description":"Kathmandu, Kathmandu, Patan",
+"Nepal_Kathmandu Description":"Kathmandu, Patan",
 "Nepal_Madhyamanchal Description":"Bharatpur, Birganj",
-"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar",
+"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bazar",
 "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City",
 "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen",
 "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten",
@@ -2079,8 +2079,8 @@
 "Russia_Astrakhan Oblast Description":"Astrahan",
 "Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat",
 "Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin",
-"Russia_Bryansk Oblast Description":"Brjansk",
-"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида",
+"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klintsy",
+"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida",
 "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali",
 "Russia_Chelyabinsk Oblast Description":"Tšeljabinsk",
 "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek",
@@ -2088,7 +2088,7 @@
 "Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak",
 "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk",
 "Russia_Ivanovo Oblast Description":"Ivanovo",
-"Russia_Jewish Autonomous Oblast Description":"Birobidžan",
+"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Obluchye, Nikolayevka",
 "Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan",
 "Russia_Kaliningrad Oblast Description":"Kaliningrad, Sovetsk, Chernyakhovsk",
 "Russia_Kaluga Oblast Description":"Obninsk",
@@ -2102,9 +2102,9 @@
 "Russia_Kostroma Oblast Description":"Kostroma",
 "Russia_Krasnodar Krai Description":"Krasnodar",
 "Russia_Krasnodar Krai_Adygeya Description":"Sotši, Gelendžik",
-"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский",
+"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy",
 "Russia_Krasnoyarsk Krai_South Description":"Krasnoyarsk, Achinsk, Kansk",
-"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши",
+"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargashi",
 "Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov",
 "Russia_Leningradskaya Oblast_Karelsky Description":"Viipuri, Seuloskoi, Sierattala",
 "Russia_Leningradskaya Oblast_Southeast Description":"Hatsina, Tihvinä",
@@ -2120,7 +2120,7 @@
 "Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok, Beslan",
 "Russia_Novgorod Oblast Description":"Veliki Novgorod",
 "Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim",
-"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль",
+"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul",
 "Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk",
 "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk",
 "Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy",
@@ -2140,7 +2140,7 @@
 "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk",
 "Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran",
 "Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo",
-"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl",
+"Russia_Smolensk Oblast Description":"Smolensk, Vyazma, Roslavl",
 "Russia_Stavropol Krai Description":"Stavropol, Pyatigorsk, Kislovodsk",
 "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Yekaterinburg, Kamensk-Uralsky, Pervouralsk",
 "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk",
@@ -2300,7 +2300,7 @@
 "US_Alabama_Montgomery Description":"Creola, Centreville, Valley",
 "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright",
 "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low",
-"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa",
+"US_Arizona_Phoenix Description":"Phoenix, Mesa",
 "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee",
 "US_Arkansas_North Description":"Ward, Cabot, Des Arc",
 "US_Arkansas_South Description":"Stamps, Rockport",
@@ -2330,7 +2330,7 @@
 "US_Georgia_Macon Description":"Grovetown, Perry, Byron",
 "US_Georgia_North Description":"Emerson, Jefferson, Cartersville",
 "US_Georgia_South Description":"De Soto, Santa Claus, Pearson",
-"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José",
+"US_Guam Description":"Dededo Flea Market, Tumon Golf Driving Range, San José",
 "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului",
 "US_Idaho_North Description":"Huetter, Peck, Hayden",
 "US_Idaho_South Description":"Arco, Middleton, Greenleaf",
@@ -2470,13 +2470,13 @@
 "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno",
 "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka",
 "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets",
-"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Ворошиловка, Zhmerynka",
+"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Voroshylivka, Zhmerynka",
 "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk",
 "Ukraine_Zakarpattia Oblast Description":"Uzhhorod, Mukacheve, Khust",
 "Ukraine_Zaporizhia Oblast Description":"Zaporizhzhia, Melitopol, Berdiansk",
 "Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten",
 "United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman",
-"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted",
+"United States Virgin Islands Description":"Frederiksted, Christiansted",
 "Uruguay Description":"Montevideo, Ciudad de la Costa, Salto",
 "Uzbekistan Description":"Taškent",
 "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal",
 "Vietnam Description":"Hanoi",
 "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai",
-"Yemen Description":"Sana'a, Sanʿaʾ, Aden",
+"Yemen Description":"Sana'a, Aden",
 "Zambia Description":"Lusaka, Kitwe, Ndola",
 "Zimbabwe Description":"Harare, Hwange, Masvingo",
 "United States of America Short":"Yhdysvallat",
diff --git a/data/countries-strings/nl.json/localize.json b/data/countries-strings/nl.json/localize.json
index 6106263e6..aad117a59 100644
--- a/data/countries-strings/nl.json/localize.json
+++ b/data/countries-strings/nl.json/localize.json
@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Kathmandu",
-"Nepal_Madhyamanchal":"Centrale regio",
-"Nepal_Purwanchal":"oostelijke regio",
+"Nepal_Madhyamanchal":"Centrale ontwikkelingsregio",
+"Nepal_Purwanchal":"Oostelijke ontwikkelingsregio",
 "Nigeria_North":"Nigeria — Noord",
 "Nigeria_South":"Nigeria — Zuid",
 "Norway_Hordaland":"Hordaland",
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 84934038e..2df15d30d 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -764,7 +764,7 @@
 /* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
 "alert_reauth_link_text_ios" = "aquí";
 "core_entrance" = "Entrada";
-"error_enter_correct_name" = "Por favor, introduzca el nombre correcto";
+"error_enter_correct_name" = "Por favor, introduce un nombre válido";
 "bookmark_lists" = "Listas";
 
 /* Do not display all bookmark lists on the map */
@@ -903,10 +903,10 @@
 "mountains" = "Montañas";
 "animals" = "Animales";
 "hotels" = "Hoteles";
-"buildings" = "Edificios";
+"buildings" = "Edificaciones";
 "money" = "Dinero";
 "shops" = "Tiendas";
-"parkings" = "Estacionamiento";
+"parkings" = "Aparcamiento";
 "fuel_places" = "Gasolineras";
 "medicine" = "Medicina";
 "search_in_the_list" = "Buscar en la lista";
@@ -963,37 +963,37 @@
 "app_tip_00" = "¡Gracias por utilizar nuestros mapas creados por la comunidad!";
 
 /* App tip #01 */
-"app_tip_01" = "¡Con sus donaciones y apoyo, podemos crear los mejores mapas del mundo!";
+"app_tip_01" = "¡Con tus donaciones y apoyo, podemos crear los mejores mapas del mundo!";
 
 /* App tip #02 */
-"app_tip_02" = "¿Le gusta nuestra aplicación? ¡Por favor done para apoyar su desarrollo! ¿Todavía no le gusta? ¡Díganos por qué y lo arreglaremos!";
+"app_tip_02" = "¿Te gusta nuestra aplicación? ¡Por favor dona para apoyar su desarrollo! ¿Todavía no te gusta? ¡Dinos por qué y lo arreglaremos!";
 
 /* App tip #03 */
 "app_tip_03" = "Si conoce a algún desarrollador o desarrolladora de software, le puede pedir que implemente alguna funcionalidad que usted necesite.";
 
 /* App tip #04 */
-"app_tip_04" = "Toque en cualquier lugar del mapa para seleccionar cualquier elemento. Mantenga pulsado para ocultar y volver a mostrar la interfaz.";
+"app_tip_04" = "Toca en cualquier lugar del mapa para seleccionar cualquier elemento. Manten pulsado para ocultar y volver a mostrar la interfaz.";
 
 /* App tip #05 */
-"app_tip_05" = "¿Sabía que su ubicación actual en el mapa se puede seleccionar?";
+"app_tip_05" = "¿Sabías que tu ubicación actual en el mapa se puede seleccionar?";
 
 /* App tip #06 */
-"app_tip_06" = "Puede ayudar a traducir nuestra aplicación a su idioma.";
+"app_tip_06" = "Puedes ayudar a traducir nuestra aplicación a tu idioma.";
 
 /* App tip #07 */
 "app_tip_07" = "Nuestra aplicación está desarrollada por unos pocos entusiastas y la comunidad.";
 
 /* App tip #08 */
-"app_tip_08" = "Puede arreglar y mejorar fácilmente los datos del mapa.";
+"app_tip_08" = "Puedes arreglar y mejorar fácilmente los datos del mapa.";
 
 /* App tip #09 */
-"app_tip_09" = "Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar que le encantarán.";
+"app_tip_09" = "Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar, que te encantarán.";
 
 /* Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen */
-"car_used_on_the_phone_screen" = "Ahora usa CoMaps en la pantalla del teléfono";
+"car_used_on_the_phone_screen" = "Ahora estás usando CoMaps en la pantalla del teléfono";
 
 /* Text on the phone placeholder screen that maps are displayed on the car screen */
-"car_used_on_the_car_screen" = "Ahora usa CoMaps en la pantalla del coche";
+"car_used_on_the_car_screen" = "Ahora estás usando CoMaps en la pantalla del coche";
 
 /* Displayed on the phone screen. Button to display maps on the phone screen instead of a car */
 "car_continue_on_the_phone" = "Pasar al teléfono";
@@ -1005,7 +1005,7 @@
 "button_layer_outdoor" = "Senderismo";
 
 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Exportar todos los marcadores y trayectos";
+"bookmarks_export" = "Exportar todos los marcadores y trazas";
 
 /* Text for the editing the Track's color button. */
 "change_color" = "Cambiar color";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 975c5dc0e..dcca85771 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -329,19 +329,19 @@
 "type.cuisine.noodles" = "Fideos";
 "type.cuisine.oriental" = "Oriental";
 "type.cuisine.pancake" = "Tortitas";
-"type.cuisine.pasta" = "Pastas";
+"type.cuisine.pasta" = "Pasta";
 "type.cuisine.persian" = "Persa";
 "type.cuisine.peruvian" = "Peruana";
 "type.cuisine.pizza" = "Pizzas";
 "type.cuisine.polish" = "Polaca";
 "type.cuisine.portuguese" = "Portuguesa";
 "type.cuisine.ramen" = "Ramen";
-"type.cuisine.regional" = "Cocina regional";
+"type.cuisine.regional" = "Regional";
 "type.cuisine.russian" = "Rusa";
 "type.cuisine.sandwich" = "Sándwiches";
 "type.cuisine.sausage" = "Salchichas";
 "type.cuisine.savory_pancakes" = "Tortitas saladas";
-"type.cuisine.seafood" = "Mariscos";
+"type.cuisine.seafood" = "del mar";
 "type.cuisine.soba" = "Soba";
 "type.cuisine.spanish" = "Española";
 "type.cuisine.steak_house" = "Asador";
@@ -384,11 +384,11 @@
 "type.healthcare.sample_collection" = "Muestreo";
 "type.healthcare.speech_therapist" = "Logopedia";
 "type.highway" = "Carretera";
-"type.highway.bridleway" = "Camino de caballos";
+"type.highway.bridleway" = "Camino ecuestre";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Puente";
-"type.highway.bridleway.permissive" = "Camino de caballos";
+"type.highway.bridleway.permissive" = "Camino ecuestre";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Túnel";
@@ -399,7 +399,7 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.busway.tunnel" = "Túnel";
-"type.highway.bus_stop" = "Parada de autobús";
+"type.highway.bus_stop" = "Parada de bus";
 "type.highway.construction" = "Vía en construcción";
 "type.highway.cycleway" = "Ciclovía";
 
@@ -473,7 +473,7 @@
 "type.highway.primary.bridge" = "Puente";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.primary.tunnel" = "Túnel de carretera principal";
+"type.highway.primary.tunnel" = "Túnel";
 "type.highway.primary_link" = "Enlace de carretera principal";
 
 /* These translations are used for all type.highway.*.bridge. */
@@ -863,18 +863,18 @@
 "type.power.generator" = "Generador";
 "type.power.generator.solar" = "Generador solar";
 "type.power.generator.wind" = "Generador de viento";
-"type.power.generator.gas" = "Planta de energía de turbina de gas";
-"type.power.generator.hydro" = "Planta de energía hidroeléctrica";
+"type.power.generator.gas" = "Planta termoeléctrica de gas";
+"type.power.generator.hydro" = "Planta hidroeléctrica";
 "type.power.line" = "Línea eléctrica";
 "type.power.line.underground" = "Línea eléctrica subterránea";
-"type.power.minor_line" = "Línea eléctrica de baja tensión";
-"type.power.plant" = "Planta de energía";
+"type.power.minor_line" = "Línea eléctrica menor";
+"type.power.plant" = "Planta eléctrica";
 "type.power.plant.coal" = "Central eléctrica de carbón";
-"type.power.plant.gas" = "Planta de energía de turbina de gas";
-"type.power.plant.hydro" = "Planta de energía hidroeléctrica";
+"type.power.plant.gas" = "Planta termoeléctrica de gas";
+"type.power.plant.hydro" = "Planta hidroeléctrica";
 "type.power.plant.solar" = "Planta de energía solar";
 "type.power.plant.wind" = "Planta eólica";
-"type.power.substation" = "Subestación eléctrica";
+"type.power.substation" = "Subestación";
 
 /* A tower or pylon carrying high voltage electricity cables. */
 "type.power.tower" = "Torre eléctrica";
@@ -901,13 +901,13 @@
 "type.railway.light_rail" = "Tren ligero";
 "type.railway.light_rail.bridge" = "Puente de tren ligero";
 "type.railway.light_rail.tunnel" = "Túnel de tren ligero";
-"type.railway.monorail" = "Monorraíl";
-"type.railway.monorail.bridge" = "Puente de monorraíl";
-"type.railway.monorail.tunnel" = "Túnel de monorraíl";
+"type.railway.monorail" = "Monorriel";
+"type.railway.monorail.bridge" = "Puente de monorriel";
+"type.railway.monorail.tunnel" = "Túnel de monorriel";
 "type.railway.narrow_gauge" = "Vía férrea estrecha";
 "type.railway.narrow_gauge.bridge" = "Puente de vía férrea estrecha";
 "type.railway.narrow_gauge.tunnel" = "Túnel de vía férrea estrecha";
-"type.railway.platform" = "Plataforma de vía férrea";
+"type.railway.platform" = "Plataforma ferroviaria";
 "type.railway.preserved" = "Raíl conservado";
 "type.railway.preserved.bridge" = "Puente ferroviario conservado";
 "type.railway.preserved.tunnel" = "Túnel ferroviario conservado";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
index a572605bb..21bee9a61 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
@@ -3,13 +3,13 @@
 "search" = "Bilatu";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Markagailuak eta ibilbideak";
+"bookmarks_and_tracks" = "Markagailuak eta arrastoak";
 
 /* Used in home screen quick actions. */
 "route" = "Ibilbidea";
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Beharrezkoa da inguruneko egungo kokapena definitzea aplikazioaren funtzionaltasunaz guztiz gozatzeko. Ibilbidea jarraitu eta duela gutxi egindako bidea gordetzeko aukeretan erabiltzen da.";
+"NSLocationAlwaysUsageDescription" = "Beharrezkoa da inguruneko egungo kokapena definitzea aplikazioaren funtzionaltasunaz guztiz gozatzeko. Ibilbidea jarraitu eta duela gutxi egindako arrastoa gordetzeko aukeretan erabiltzen da.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "Uneko kokapenaren definizioa ibilbidea jarraitu eta duela gutxi egindako bidea gordetzeko aukeretan erabiltzen da.";
+"NSLocationWhenInUseUsageDescription" = "Uneko kokapenaren definizioa ibilbidea jarraitu eta duela gutxi egindako arrastoa gordetzeko aukeretan erabiltzen da.";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 2439d348a..af9bb3243 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -69,7 +69,7 @@
 "bookmarks" = "Markagailuak";
 
 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
-"bookmarks_and_tracks" = "Markagailuak eta ibilbideak";
+"bookmarks_and_tracks" = "Markagailuak eta arrastoak";
 
 /* Default bookmark list name */
 "core_my_places" = "Nire tokiak";
@@ -195,7 +195,7 @@
 "version: %@ (%@)\nmap data: %@" = "Bertsioa: %@ (%@)\nMaparen datuak: %@";
 
 /* Title for tracks category in bookmarks manager */
-"tracks_title" = "Arrasto";
+"tracks_title" = "Arrastoak";
 
 /* Length of track in cell that describes route */
 "length" = "Luzera";
@@ -770,7 +770,7 @@
 "bookmarks_create_new_group" = "Sortu zerrenda berria";
 
 /* Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files */
-"bookmarks_import" = "Inportatu markagailuak eta ibilbideak";
+"bookmarks_import" = "Inportatu markagailuak eta arrastoak";
 "downloader_hide_screen" = "Ezkutatu pantaila";
 "downloader_percent" = "%@ (%@/%@)";
 "downloader_process" = "%@ deskargatzen…";
@@ -942,7 +942,7 @@
 "placepage_delete_track_button" = "Ezabatu arrastoa";
 
 /* The track deletion confirmaion alert message. */
-"placepage_delete_track_confirmation_alert_message" = "Ziur pista hau ezabatu nahi duzula?";
+"placepage_delete_track_confirmation_alert_message" = "Ziur arrasto hau ezabatu nahi duzula?";
 
 /* Placeholder for track name input on track edit screen */
 "placepage_track_name_hint" = "Arrastoaren izena";
@@ -1002,7 +1002,7 @@
 "button_layer_outdoor" = "Landa-eremua";
 
 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Esportatu Laster-marka eta Pista guztiak";
+"bookmarks_export" = "Esportatu markagailu eta arrasto guztiak";
 
 /* Text for the editing the Track's color button. */
 "change_color" = "Kolorea aldatu";
@@ -1024,7 +1024,7 @@
 "enable_icloud_synchronization_title" = "Gaitu iCloud sinkronizazioa";
 
 /* Message for the "Enable iCloud Syncronization" alert. */
-"enable_icloud_synchronization_message" = "iCloud sinkronizazioa garatzen ari den ezaugarri esperimental bat da. Ziurtatu zure laster-marka eta ibilbide guztien babeskopia egin duzula.";
+"enable_icloud_synchronization_message" = "iCloud sinkronizazioa garatzen ari den ezaugarri esperimental bat da. Ziurtatu zure markagailu eta arrasto guztien babeskopia egin duzula.";
 
 /* Title for the "iCloud Is Disabled" alert. */
 "icloud_disabled_title" = "iCloud desgaituta dago";
@@ -1075,10 +1075,10 @@
 "recover_all" = "Guztia berreskuratu";
 
 /* Prompt to start recording a track. */
-"start_track_recording" = "Ibilbidearen grabaketa";
+"start_track_recording" = "Grabatu arrastoa";
 
 /* Prompt for stopping a track recording. */
-"stop_track_recording" = "Gelditu ibilbidearen grabaketa";
+"stop_track_recording" = "Gelditu arrastoaren grabaketa";
 
 /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */
 "stop_without_saving" = "Gelditu gorde gabe";
@@ -1087,10 +1087,10 @@
 "continue_recording" = "Jarraitu grabatzen";
 
 /* Title for the alert when saving a track recording. */
-"track_recording_alert_title" = "Ibilbidearen grabaketa markagailuetan eta ibilbideetan gorde nahi duzu?";
+"track_recording_alert_title" = "Markagailu eta arrastoetan gorde nahi duzu?";
 
 /* Message for the toast when saving the track recording is finished but nothing to save. */
-"track_recording_toast_nothing_to_save" = "Ibilbidea hutsik dago; ez dago ezer gordetzeko";
+"track_recording_toast_nothing_to_save" = "Arrastoa hutsik dago; ez dago ezer gordetzeko";
 "edit_track" = "Editatu arrastoa";
 "osm_profile_view_notes" = "Oharrak ikusi";
 "osm_profile_view_edit_history" = "Aldaketen historia ikusi";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index 3005c4ab5..a9bbcd5f8 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -548,13 +548,13 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Tunel";
-"type.highway.track" = "Kalea";
-"type.highway.track.area" = "Kalea";
+"type.highway.track" = "Arrastoa";
+"type.highway.track.area" = "Arrastoa";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.track.bridge" = "Zubia";
-"type.highway.track.grade1" = "Kalea";
-"type.highway.track.no.access" = "Kalea";
+"type.highway.track.grade1" = "Arrastoa";
+"type.highway.track.no.access" = "Arrastoa";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
@@ -593,7 +593,7 @@
 "type.area_highway.service" = "Kalea";
 "type.area_highway.tertiary" = "Kalea";
 "type.area_highway.steps" = "Bidea";
-"type.area_highway.track" = "Kalea";
+"type.area_highway.track" = "Arrastoa";
 "type.area_highway.trunk" = "Kalea";
 "type.area_highway.unclassified" = "Kalea";
 "type.historic" = "Objektu historikoa";
@@ -718,8 +718,8 @@
 "type.leisure.stadium" = "Estadioa";
 "type.leisure.swimming_pool" = "Igerilekua";
 "type.leisure.swimming_pool.private" = "Igerilekua";
-"type.leisure.track" = "Pista";
-"type.leisure.track.area" = "Pista";
+"type.leisure.track" = "Arrastoa";
+"type.leisure.track.area" = "Arrastoa";
 "type.leisure.water_park" = "Ur-parkea";
 "type.leisure.beach_resort" = "Hondartzako oporleku";
 "type.man_made" = "Artifiziala";
@@ -924,7 +924,7 @@
 "type.railway.rail.spur" = "Trenbide-spur";
 
 /* Short service tracks: siding, yard, crossover. */
-"type.railway.rail.service" = "Trenbide laguntzailea";
+"type.railway.rail.service" = "Zerbitzuko trenbidea";
 "type.railway.rail.bridge" = "Trenbide zubia";
 "type.railway.rail.highspeed.bridge" = "Trenbide zubia";
 "type.railway.rail.tourism.bridge" = "Trenbide zubia";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index 920a1e7f3..ea2b693f9 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -1,31 +1,31 @@
-"type.addr_interpolation" = "آدرس/بلاک";
-"type.addr_interpolation.even" = "آدرس/بلاک";
-"type.addr_interpolation.odd" = "آدرس/بلاک";
+"type.addr_interpolation" = "نشانی/بست";
+"type.addr_interpolation.even" = "نشانی/بست";
+"type.addr_interpolation.odd" = "نشانی/بست";
 "type.aerialway" = "راه هوایی";
-"type.aerialway.cable_car" = "ماشین کابلی";
+"type.aerialway.cable_car" = "خودردو کابلی";
 "type.aerialway.chair_lift" = "Chair Lift";
 "type.aerialway.drag_lift" = "Drag Lift";
 "type.aerialway.gondola" = "Gondola";
 "type.aerialway.mixed_lift" = "Mixed Lift";
-"type.aerialway.station" = "ایستگاه راه هوایی";
-"type.aeroway" = "­زیرساخت هوا و فضا";
+"type.aerialway.station" = "ایستگاه راه‌هوایی";
+"type.aeroway" = "زیرساخت مرز‌هوایی";
 "type.aeroway.aerodrome" = "فرودگاه";
-"type.aeroway.aerodrome.international" = "فرودگاه";
-"type.aeroway.apron" = "Apron";
-"type.aeroway.gate" = "Gate";
-"type.aeroway.helipad" = "پد فرود بالگرد";
+"type.aeroway.aerodrome.international" = "فرودگاه فرامرزی";
+"type.aeroway.apron" = "پیشگاه";
+"type.aeroway.gate" = "دروازه";
+"type.aeroway.helipad" = "بالگَردنشین";
 "type.aeroway.runway" = "Runway";
-"type.aeroway.taxiway" = "Taxiway";
-"type.aeroway.terminal" = "Terminal";
-"type.amenity" = "زیر ساخت";
-"type.amenity.arts_centre" = "مرکز هنری";
+"type.aeroway.taxiway" = "رج وزیگ";
+"type.aeroway.terminal" = "پایانه";
+"type.amenity" = "امکانات آسایشی";
+"type.amenity.arts_centre" = "کانون هنری";
 "type.amenity.atm" = "خودپرداز";
 "type.amenity.bank" = "بانک";
-"type.amenity.bar" = "میکده";
-"type.amenity.bbq" = "منقل کباب";
-"type.amenity.bench" = "سَکو";
-"type.amenity.bicycle_parking" = "پارکینگ دوچرخه";
-"type.amenity.bicycle_rental" = "مکان اجاره دوچرخه";
+"type.amenity.bar" = "می‌کده";
+"type.amenity.bbq" = "اَدیشت کباب";
+"type.amenity.bench" = "نیمکت";
+"type.amenity.bicycle_parking" = "ایستگاه دوچرخه";
+"type.amenity.bicycle_rental" = "جایگاه کرایه دوچرخه";
 "type.amenity.bicycle_repair_station" = "ایستگاه تعمیر دوچرخه";
 "type.amenity.biergarten" = "غذا";
 "type.amenity.brothel" = "فاحشه خانه";
@@ -1479,5 +1479,5 @@
 "type.leisure.escape_game" = "Escape Room";
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.bicycle_parking.covered" = "ایستگاه پوشیده‌ی دوچرخه";
 "type.post_office.post_partner" = "Post Partner";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
index 1d0351200..f47bbdff2 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 
 /* Used in home screen quick actions. */
-"search" = "Zoek";
+"search" = "Zoeken";
 
 /* Used in home screen quick actions. */
 "bookmarks_and_tracks" = "Bladwijzers en tracks";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index aa98187f3..4606b6efe 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1,13 +1,13 @@
 
 /* Button text (should be short) */
-"cancel" = "Annuleer";
+"cancel" = "Annuleren";
 
 /* Button which interrupts country download */
 "cancel_download" = "Downloaden annuleren";
 
 /* Button which deletes downloaded country */
-"delete" = "Verwijder";
-"download_maps" = "Download kaarten";
+"delete" = "Verwijderen";
+"download_maps" = "Kaarten downloaden";
 
 /* Settings/Downloader - info for country which started downloading */
 "downloading" = "Downloaden…";
@@ -28,13 +28,13 @@
 "later" = "Later";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
-"search" = "Zoek";
+"search" = "Zoeken";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
 "use_cellular_data" = "Ja";
 
 /* View and button titles for accessibility */
-"zoom_to_country" = "Toon op de kaart";
+"zoom_to_country" = "Weergeven op de kaart";
 
 /* Button text for the button at the center of the screen when the country is not downloaded and the size should not be shown */
 "country_status_download_without_size" = "Download kaart";
@@ -53,14 +53,14 @@
 
 /* Text in About screen */
 "about_proposition_3" = "Transparant en zonder winstoogmerk";
-"close" = "Sluit";
-"download" = "Download";
+"close" = "Sluiten";
+"download" = "Downloaden";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_button" = "Ga verder";
+"continue_button" = "Doorgaan";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Voeg nieuwe groep toe";
+"add_new_set" = "Nieuwe groep toevoegen";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Naam van bladwijzergroep";
@@ -157,16 +157,16 @@
 "share_bookmarks_email_body" = "Hallo!\n\nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/\n\nGeniet van het reizen met CoMaps!";
 
 /* message title of loading file */
-"load_kmz_title" = "Bladwijzers worden geladen";
+"load_kmz_title" = "Bladwijzers laden";
 
 /* Kmz file successful loading */
-"load_kmz_successful" = "Bladwijzers succesvol geüpload! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.";
+"load_kmz_successful" = "Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.";
 
 /* Kml file loading failed */
-"load_kmz_failed" = "Bladwijzers uploaden is mislukt. Het bestand is mogelijk beschadigd of defect.";
+"load_kmz_failed" = "Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.";
 
 /* resource for context menu */
-"edit" = "Wijzig";
+"edit" = "Bewerken";
 
 /* Warning message when doing search around current position */
 "unknown_current_position" = "Je locatie is nog niet vastgesteld";
@@ -202,7 +202,7 @@
 
 /* Length of track in cell that describes route */
 "length" = "Lengte";
-"share_my_location" = "Deel mijn locatie";
+"share_my_location" = "Mijn locatie delen";
 "prefs_group_route" = "Navigatie";
 "pref_zoom_title" = "Zoomknoppen";
 "pref_left_button_type" = "Left Main Button";
@@ -253,13 +253,13 @@
 "pref_tts_language_title" = "Gesproken taal";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Test gesproken aanwijzingen";
+"pref_tts_test_voice_title" = "Gesproken aanwijzingen testen";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Andere";
 "pref_map_auto_zoom" = "Automatisch zoomen";
 "placepage_distance" = "Afstand";
-"search_show_on_map" = "Bekijk op de kaart";
+"search_show_on_map" = "Weergeven op kaart";
 
 /* Text in menu */
 "website" = "Website";
@@ -313,7 +313,7 @@
 "faq" = "Vragen en antwoorden";
 
 /* Button in the main menu */
-"donate" = "Doneer";
+"donate" = "Doneren";
 
 /* Button in the main Help dialog */
 "copyright" = "Auteursrechten";
@@ -343,7 +343,7 @@
 "long_tap_toast" = "Tik nogmaals lang op de kaart om de interface te zien";
 
 /* Update all button text */
-"downloader_update_all_button" = "Update alles";
+"downloader_update_all_button" = "Alles bijwerken";
 
 /* Downloaded maps list header */
 "downloader_downloaded_subtitle" = "Gedownload";
@@ -353,12 +353,12 @@
 
 /* Country queued for download */
 "downloader_queued" = "In de wachtrij";
-"downloader_near_me_subtitle" = "Bij mij in de buurt";
+"downloader_near_me_subtitle" = "In de buurt";
 
 /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */
 "downloader_status_maps" = "Kaarten";
-"downloader_download_all_button" = "Download alles";
-"downloader_downloading" = "Aan het downloaden:";
+"downloader_download_all_button" = "Alles downloaden";
+"downloader_downloading" = "Downloaden:";
 "downloader_search_results" = "Gevonden";
 
 /* Status of outdated country in the list */
@@ -371,26 +371,26 @@
 "downloader_delete_map_while_routing_dialog" = "Stop de navigatie om de kaart te verwijderen.";
 
 /* PointsInDifferentMWM */
-"routing_failed_cross_mwm_building" = "Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden.";
+"routing_failed_cross_mwm_building" = "Alleen routes die volledig in één kaart passen, kunnen gecreëerd worden.";
 
 /* Context menu item for downloader. */
-"downloader_download_map" = "Download de kaart";
+"downloader_download_map" = "Kaart downloaden";
 
 /* Item status in downloader. */
-"downloader_retry" = "Probeer opnieuw";
+"downloader_retry" = "Opnieuw";
 
 /* Item in context menu. */
-"downloader_delete_map" = "Verwijder kaart";
+"downloader_delete_map" = "Kaart verwijderen";
 
 /* Text for routing error dialog */
 "routing_download_maps_along" = "Download kaarten op de route";
 
 /* Text for routing error dialog */
-"routing_requires_all_map" = "Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar uw bestemming gedownload en bijgewerkt zijn.";
+"routing_requires_all_map" = "Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar de bestemming gedownload en bijgewerkt zijn.";
 
 /* bookmark button text */
 "bookmark" = "markeer";
-"save" = "Bewaar";
+"save" = "Opslaan";
 "create" = "aanmaken";
 
 /* red color */
@@ -454,11 +454,11 @@
 "dialog_routing_download_files" = "Download de vereiste bestanden";
 "dialog_routing_download_and_update_all" = "Download de kaart en route-informatie voor het ingestelde traject en werk deze bij om de route te berekenen.";
 "dialog_routing_unable_locate_route" = "Route vinden mislukt";
-"dialog_routing_change_start_or_end" = "Kies een ander startpunt of een andere bestemming.";
-"dialog_routing_change_start" = "Kies ander startpunt";
+"dialog_routing_change_start_or_end" = "Pas het startpunt of de bestemming aan.";
+"dialog_routing_change_start" = "Startpunt aanpassen";
 "dialog_routing_start_not_determined" = "Route samenstellen mislukt. Startpunt kan niet worden gevonden.";
 "dialog_routing_select_closer_start" = "Kies een startpunt dat dichter bij een weg ligt.";
-"dialog_routing_change_end" = "Kies andere bestemming";
+"dialog_routing_change_end" = "Bestemming aanpassen";
 "dialog_routing_end_not_determined" = "Route samenstellen mislukt. Bestemming kan niet worden gevonden.";
 "dialog_routing_select_closer_end" = "Kies een bestemming die dichter bij een weg ligt.";
 "dialog_routing_change_intermediate" = "Kan de tussenstop niet vinden.";
@@ -470,10 +470,10 @@
 "dialog_routing_download_cross_route" = "Download de kaart om een betere route samen te stellen die de grenzen van deze kaart overschrijdt.";
 
 /* «Show» context menu */
-"show" = "Toon";
+"show" = "Tonen";
 
 /* «Hide» context menu */
-"hide" = "Verberg";
+"hide" = "Verbergen";
 
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Routeberekening mislukt";
@@ -491,7 +491,7 @@
 "search_not_found_query" = "Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen.";
 "search_history_title" = "Zoekgeschiedenis";
 "search_history_text" = "Snel toegang tot recente zoekopdrachten.";
-"clear_search" = "Wis zoekgeschiedenis";
+"clear_search" = "Zoekgeschiedenis wissen";
 
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
@@ -501,14 +501,14 @@
 "p2p_your_location" = "Uw locatie";
 "p2p_start" = "Start";
 "p2p_from_here" = "Van";
-"p2p_to_here" = "Route naar";
+"p2p_to_here" = "Naar";
 "p2p_only_from_current" = "Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie.";
 "p2p_reroute_from_current" = "Wilt u een route plannen vanaf uw huidige locatie?";
-"editor_time_add" = "Voeg schema toe";
-"editor_time_delete" = "Verwijder schema";
+"editor_time_add" = "Schema toevoegen";
+"editor_time_delete" = "Schema verwijderen";
 
 /* Text for allday switch. */
-"editor_time_allday" = "Elke dag (24 uur)";
+"editor_time_allday" = "Hele dag (24 uur)";
 "editor_time_open" = "Open";
 "editor_time_close" = "Gesloten";
 "editor_time_add_closed" = "Sluitingstijden toevoegen";
@@ -520,8 +520,8 @@
 "editor_add_select_location" = "Locatie selecteren";
 "editor_done_dialog_1" = "Je hebt de wereldkaart gewijzigd. Verberg dit niet! Vertel het je vrienden en bewerk haar samen.";
 "share_with_friends" = "Deel met je vrienden";
-"editor_report_problem_send_button" = "Verzend";
-"autodownload" = "Download kaarten automatisch";
+"editor_report_problem_send_button" = "Verzenden";
+"autodownload" = "Kaarten automatisch downloaden";
 
 /* Place Page opening hours text */
 "closed_now" = "Nu gesloten";
@@ -565,16 +565,16 @@
 /* Information text: "Last upload 11.01.2016" */
 "last_upload" = "Laatste upload";
 "thank_you" = "Dank je wel";
-"edit_place" = "Bewerk de locatie";
+"edit_place" = "Locatie bewerken";
 "place_name" = "Locatienaam";
-"add_language" = "Voeg een taal toe";
+"add_language" = "Taal toevoegen";
 
 /* Editable House Number text field (in address block). */
 "house_number" = "Huisnummer";
 "details" = "Details";
 
 /* Text field to enter non-existing street name, below list of known streets around */
-"add_street" = "Voeg een straat toe";
+"add_street" = "Een straat toevoegen";
 "choose_language" = "Kies een taal";
 "choose_street" = "Kies een straat";
 "postal_code" = "Postcode";
@@ -587,11 +587,11 @@
 "level" = "Verdieping";
 "please_note" = "Opgelet";
 "downloader_delete_map_dialog" = "Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd.";
-"downloader_update_maps" = "Update kaarten";
-"downloader_search_field_hint" = "Vind een kaart";
+"downloader_update_maps" = "Kaarten bijwerken";
+"downloader_search_field_hint" = "Kaart zoeken";
 "migration_download_error_dialog" = "Downloadfout";
 "common_check_internet_connection_dialog" = "Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet.";
-"downloader_no_space_title" = "Niet genoeg ruimte";
+"downloader_no_space_title" = "Onvoldoende ruimte";
 "downloader_no_space_message" = "Verwijder overbodige gegevens";
 "editor_profile_changes" = "Gecontroleerde wijzigingen";
 "editor_focus_map_on_location" = "Sleep de kaart om het kruis op de locatie van de plaats of het bedrijf te plaatsen.";
@@ -615,7 +615,7 @@
 
 /* Downloaded 10 **of** 20 <- it is that "of" */
 "downloader_of" = "%1$d van %2$d";
-"download_over_mobile_header" = "Downloaden via een mobiele gegevensverbinding?";
+"download_over_mobile_header" = "Downloaden via mobiele internetverbinding?";
 "download_over_mobile_message" = "Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn.";
 "error_enter_correct_house_number" = "Voer een geldig huisnummer in";
 "editor_storey_number" = "Aantal verdiepingen (max. %d)";
@@ -665,10 +665,10 @@
 "kilometers_per_hour" = "km/h";
 
 /* abbreviation for mile(s) */
-"mi" = "mijl";
+"mi" = "mi";
 
 /* A unit of measure */
-"ft" = "voet";
+"ft" = "ft";
 "miles_per_hour" = "mph";
 "hour" = "u";
 "minute" = "min";
@@ -676,7 +676,7 @@
 "placepage_more_button" = "Meer";
 "book_button" = "Boek";
 "placepage_call_button" = "Bel";
-"placepage_edit_bookmark_button" = "Bewerk bladwijzer";
+"placepage_edit_bookmark_button" = "Bladwijzer bewerken";
 "placepage_bookmark_name_hint" = "Bladwijzernaam";
 "placepage_personal_notes_hint" = "Persoonlijke aantekeningen (tekst of html)";
 "placepage_delete_bookmark_button" = "Verwijder bladwijzer";
@@ -1099,5 +1099,5 @@
 "osm_profile_view_notes" = "Opmerkingen bekijken";
 "pref_mapappearance_title" = "Kaart uiterlijk";
 "pref_maplanguage_title" = "Kaarttaal";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"transliteration_title_disabled_summary" = "Uitgeschakeld wanneer altijd de lokale taal voor de kaart wordt gebruikt";
 "pref_maplanguage_local" = "Lokale Taal";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index 75df7e20f..ed94fd1d9 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -1480,4 +1480,4 @@
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
-"type.amenity.ranger_station" = "Ranger Station";
+"type.amenity.ranger_station" = "Пост лесников";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index da01fe6db..de5dfddcb 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -834,7 +834,7 @@
 "unable_to_calc_alert_title" = "Rota hesaplanamıyor";
 "unable_to_calc_alert_subtitle" = "Rota bulunamadı. Bunun nedeni, belirlediğiniz seçenekler ya da eksik OpenStreetMap verisi olabilir. Lütfen rota seçeneklerinizi değiştirin ve yeniden deneyin.";
 "define_to_avoid_btn" = "Kaçınılması gereken yolları tanımlayın";
-"change_driving_options_btn" = "Sürüş seçenekleri etkinleştirildi";
+"change_driving_options_btn" = "Yönlendirme seçenekleri etkin";
 "toll_road" = "Paralı yol";
 "unpaved_road" = "Asfaltsız yol";
 "ferry_crossing" = "Vapur geçişi";
diff --git a/iphone/metadata/fr-FR/keywords.txt b/iphone/metadata/fr-FR/keywords.txt
index 66d886edb..4cb73ff9a 100644
--- a/iphone/metadata/fr-FR/keywords.txt
+++ b/iphone/metadata/fr-FR/keywords.txt
@@ -1 +1 @@
-cartes,cartes routières ouvertes,osm,voyage,randonnée,vélo,conduite,hors ligne,confidentialité,GPS
+cartes routières, osm, voyage, randonnée, vélo, conduite, hors ligne, confidentialité, GPS
diff --git a/iphone/metadata/fr-FR/subtitle.txt b/iphone/metadata/fr-FR/subtitle.txt
index e5b62c7b7..d7cda6c98 100644
--- a/iphone/metadata/fr-FR/subtitle.txt
+++ b/iphone/metadata/fr-FR/subtitle.txt
@@ -1 +1 @@
-Naviguer sans suivi
+Naviguez avec confidentialité