diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml
index 5227250f5c..c1e56a9944 100644
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -49,4 +49,35 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="editor_example_values">Valores d’exemplu</string>
     <string name="downloader_of">%1$d de %2$d</string>
+    <string name="elevation_profile_difficulty">Dificultá</string>
+    <string name="delete">Desaniciar</string>
+    <string name="kilometres">Quilómetros</string>
+    <string name="core_my_position">La mio posición</string>
+    <string name="search">Guetar</string>
+    <string name="search_map">Guetar nel mapa</string>
+    <string name="zoom_to_country">Amosar nel mapa</string>
+    <string name="category_parking">Aparcaderu</string>
+    <string name="placepage_distance">Distancia</string>
+    <string name="mastodon">Mastodon</string>
+    <string name="facebook">Facebook</string>
+    <string name="editor_report_problem_duplicate_place_title">Llugar duplicáu</string>
+    <string name="edit_place">Editar llugar</string>
+    <string name="add_language">Amestar una llingua</string>
+    <string name="sort">Ordenar…</string>
+    <string name="parks">Parques</string>
+    <string name="elevation_profile_time">Tiempu:</string>
+    <string name="miles">Milles</string>
+    <string name="editor_report_problem_no_place_title">Esti llugar nun esiste</string>
+    <string name="next_button">Siguiente</string>
+    <string name="self_service">Autoserviciu</string>
+    <string name="core_my_places">Los mios llugares</string>
+    <string name="parkings">Aparcaderu</string>
+    <string name="later">Más sero</string>
+    <string name="museums">Museos</string>
+    <string name="search_in_the_list">Guetar na llista</string>
+    <string name="elevation_profile_descent">Descensu</string>
+    <string name="religious_places">Llugares relixosos</string>
+    <string name="editor_edit_place_name_hint">Nome del llugar</string>
+    <string name="current_location_unknown_error_title">Desconózse l’allugamientu actual.</string>
+    <string name="elevation_profile_ascent">Ascensu</string>
 </resources>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 3618f8ce54..7519b8e018 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -403,12 +403,12 @@
     <string name="hide">Amaga</string>
     <string name="categories">Categories</string>
     <string name="history">Historial</string>
-    <string name="search_not_found">Ups! No s\'ha trobat cap resultat.</string>
+    <string name="search_not_found">No s’ha trobat cap resultat.</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Baixeu la regió on esteu cercant o proveu d\'afegir un nom de ciutat o poble proper.</string>
     <string name="search_history_title">Historial de cerca</string>
     <string name="search_history_text">Mostra les cerques recents.</string>
-    <string name="clear_search">Buida l\'historial de cerques.</string>
+    <string name="clear_search">Neteja l’historial de cerques</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Viquipèdia</string>
     <string name="p2p_your_location">La vostra ubicació</string>
@@ -587,7 +587,7 @@
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal.</string>
     <string name="editor_share_to_all_dialog_message_2">Revisarem els canvis. Si tenim cap pregunta contactem amb vós via correu electrònic.</string>
-    <string name="navigation_stop_button">Atura\'t</string>
+    <string name="navigation_stop_button">Atura</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Enregistrament de la pista</string>
     <!-- For the first routing -->
@@ -656,7 +656,7 @@
     <string name="bookmarks_error_message_list_name_already_taken">Trieu-ne un altre</string>
     <string name="please_wait">Espereu…</string>
     <string name="phone_number">Número de telèfon</string>
-    <string name="profile">Perfil d\'OpenStreetMap</string>
+    <string name="profile">Perfil de l’OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">S\'ha trobat %d fitxer. Podeu veure\'l després de la conversió.</item>
         <item quantity="other">S\'han trobat %d fitxers. Podeu veure\'ls després de la conversió.</item>
@@ -693,7 +693,7 @@
     <string name="pref_tts_speedcams_always">Sempre avisa</string>
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">No n\'avisis mai</string>
-    <string name="power_managment_title">Mode d\'estalvi d\'energia</string>
+    <string name="power_managment_title">Mode d’estalvi d’energia</string>
     <string name="power_managment_description">Si està seleccionat el mode automàtic, l\'aplicació desactivarà funcions que consumeixen energia, depenent del nivell de càrrega actual de la bateria</string>
     <string name="power_managment_setting_never">Mai</string>
     <string name="power_managment_setting_auto">Automàtic</string>
diff --git a/android/app/src/main/res/values-ca/types_strings.xml b/android/app/src/main/res/values-ca/types_strings.xml
index 6b0a2d5843..5c1b75143f 100644
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -289,7 +289,7 @@
     <!-- A regular telecommunications tower / mast. -->
     <string name="type.man_made.tower.communication">Torre de comunicacions</string>
     <!-- A deep hole drilled into the earth to extract oil or gas. -->
-    <string name="type.man_made.petroleum_well">Poço de petroli o gas</string>
+    <string name="type.man_made.petroleum_well">Pou petrolífer o de gas</string>
     <!-- A tower/mast constructed to burn off excess gas. -->
     <string name="type.man_made.flare">Flama de gas</string>
     <!-- A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. -->
@@ -500,4 +500,25 @@
     <string name="type.place.island">Illa</string>
     <string name="type.place.islet">Illot</string>
     <string name="type.public_transport">Transport públic</string>
+    <string name="type.natural.volcano">Volcà</string>
+    <string name="type.place.city.capital.10">Ciutat</string>
+    <string name="type.place.country">País</string>
+    <string name="type.place.city.capital.11">Ciutat</string>
+    <string name="type.place.county">Comtat</string>
+    <string name="type.place.ocean">Oceà</string>
+    <string name="type.place.region">Regió</string>
+    <string name="type.place.sea">Mar</string>
+    <string name="type.place.square">Plaça</string>
+    <string name="type.highway.steps">Escales</string>
+    <string name="type.man_made.water_well">Pou d’aigua</string>
+    <string name="type.man_made.water_well.drinking_water_no">Pou d’aigua</string>
+    <string name="type.cuisine.asian">Asiàtica</string>
+    <string name="type.cuisine.argentinian">Argentina</string>
+    <string name="type.cuisine.austrian">Austríaca</string>
+    <string name="type.cuisine.breakfast">Esmorzar</string>
+    <string name="type.cuisine.tea">Te</string>
+    <string name="type.cuisine.spanish">Espanyola</string>
+    <string name="type.cuisine.mexican">Mexicana</string>
+    <string name="type.cuisine.brazilian">Brasilera</string>
+    <string name="type.building.garage">Garatge</string>
 </resources>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index fa542b2202..b21c48b778 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -304,7 +304,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Aktiver venligst placeringstjenester</string>
     <string name="save">Gem</string>
-    <string name="create">skabe</string>
+    <string name="create">opret</string>
     <!-- red color -->
     <string name="red">Rød</string>
     <!-- yellow color -->
diff --git a/android/app/src/main/res/values-da/types_strings.xml b/android/app/src/main/res/values-da/types_strings.xml
index 221f485d90..34daff8d7c 100644
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1156,4 +1156,11 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Sportshal</string>
     <string name="type.aerialway.chair_lift">Stolelift</string>
+    <string name="type.building.warehouse">Varehus</string>
+    <string name="type.highway.cycleway">Cykelsti</string>
+    <string name="type.highway.cycleway.permissive">Cykelsti</string>
+    <string name="type.area_highway.cycleway">Cykelsti</string>
+    <string name="type.highway.bridleway">Ridesti</string>
+    <string name="type.highway.elevator">Elevator</string>
+    <string name="type.highway.bridleway.permissive">Ridesti</string>
 </resources>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 1be402ecca..10f9cb2435 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -115,7 +115,6 @@
     <string name="measurement_units">Μονάδες μέτρησης</string>
     <!-- Detailed description of Measurement Units settings button -->
     <string name="measurement_units_summary">Επιλέξετε ανάμεσα σε μίλια και χιλιόμετρα</string>
-
     <!-- SECTION: Search categories -->
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
     <string name="category_eat">Μέρη για φαγητό</string>
@@ -163,7 +162,6 @@
     <string name="category_water">Νερό</string>
     <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
     <string name="category_rv">Για RV</string>
-
     <!-- SECTION: Other translations -->
     <!-- Notes field in Bookmarks view -->
     <string name="description">Σημειώσεις</string>
@@ -368,7 +366,6 @@
     <string name="gray">Γκρι</string>
     <!-- blue gray color -->
     <string name="blue_gray">Γκρίζο μπλε</string>
-
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Όταν ακολουθείτε την διαδρομή, να θυμάστε:</string>
     <string name="dialog_routing_disclaimer_priority">— Οι οδικές συνθήκες, ο κώδικας οδικής κυκλοφορίας και οι σημάνσεις στο δρόμο έχουν πάντα μεγαλύτερη προτεραιότητα από τις συμβουλές πλοήγησης,</string>
@@ -398,7 +395,6 @@
     <string name="not_now">Όχι τώρα</string>
     <string name="dialog_routing_download_and_build_cross_route">Θέλετε να κατεβάσετε το χάρτη και να δημιουργήσετε μια πιο βέλτιστη διαδρομή που εκτείνεται σε περισσότερους από έναν χάρτες;</string>
     <string name="dialog_routing_download_cross_route">Κατεβάστε επιπλέον χάρτες για να δημιουργηθεί μια καλύτερη διαδρομή που διασχίζει τα όρια αυτού του χάρτη.</string>
-
     <!-- SECTION: Strings for downloading map from search -->
     <string name="search_without_internet_advertisement">Για να ξεκινήσετε την αναζήτηση και τη δημιουργία διαδρομών, κατεβάστε το χάρτη. Μετά από αυτό δεν θα χρειάζεστε πλέον σύνδεση στο Internet.</string>
     <string name="search_select_map">Επιλογή χάρτη</string>
@@ -749,7 +745,6 @@
     <string name="moreyear_ago_sorttype">Περισσότερο από ένα χρόνο πριν</string>
     <string name="near_me_sorttype">Δίπλα μου</string>
     <string name="others_sorttype">Άλλα</string>
-
     <!-- SECTION: Bookmark types used for sorting -->
     <string name="food_places">Φαγητό</string>
     <string name="tourist_places">Αξιοθέατα</string>
@@ -891,4 +886,21 @@
     <string name="uri_open_location_failed">Δεν υπάρχει εγκατεστημένη εφαρμογή που να μπορεί να ανοίξει την τοποθεσία</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Αυτόματη πλοήγηση</string>
+    <string name="wikimedia_commons">Wikimedia Commons</string>
+    <string name="twitter">X (Twitter)</string>
+    <string name="instagram">Instagram</string>
+    <string name="telegram_url">https://t.me/OrganicMapsApp</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="instagram_url">https://www.instagram.com/organicmaps.app</string>
+    <string name="facebook">Facebook</string>
+    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="github">GitHub</string>
+    <string name="mastodon">Mastodon</string>
+    <string name="editor_line_social_network">LINE</string>
+    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="level_value_generic">Όροφος: %s</string>
+    <string name="mb">MB</string>
+    <string name="mi">μι</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="openstreetmap">OpenStreetMap</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 9d333953c3..35fcd3ba9a 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -89,7 +89,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Guardar mapas en</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Seleccione el lugar donde deben descargarse los mapas</string>
+    <string name="maps_storage_summary">Seleccione el lugar donde deben descargarse los mapas.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapas descargados</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -164,7 +164,7 @@
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
     <string name="share_bookmarks_email_subject">Marcadores de Organic Maps compartidos con usted</string>
-    <string name="share_bookmarks_email_body">Hola! \nAdjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz \n¡Disfrute viajando con Organic Maps!</string>
+    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz \n\n¡Disfrute viajando con Organic Maps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Cargando marcadores</string>
     <!-- Kmz file successful loading -->
@@ -312,7 +312,7 @@
     <!-- Preference title -->
     <string name="google_play_services">Servicios de localización de Google Play</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Determina rápidamente tu ubicación aproximada mediante Bluetooth, WiFi o red móvil</string>
+    <string name="pref_use_google_play">Determina rápidamente su ubicación aproximada mediante Bluetooth, WiFi o red móvil</string>
     <!-- Preference title -->
     <string name="pref_display_kayak_title">Enlaces de hoteles de Kayak.com</string>
     <!-- Preference description -->
@@ -364,7 +364,7 @@
     <string name="dialog_routing_disclaimer_priority">— Las condiciones del camino, las reglas de tránsito y los señalamientos siempre tienen prioridad sobre las sugerencias de navegación;</string>
     <string name="dialog_routing_disclaimer_precision">— El mapa puede ser impreciso y sugerir una ruta que no siempre puede ser el mejor camino para llegar al destino;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Las rutas sugeridas deben entenderse solo como recomendaciones;</string>
-    <string name="dialog_routing_disclaimer_borders">— Actúe con cautela en las rutas con zonas fronterizas: las rutas creadas por nuestra aplicación en ocasiones pueden atravesar las fronteras de países en lugares no autorizados;</string>
+    <string name="dialog_routing_disclaimer_borders">— Actúe con cautela en las rutas con zonas fronterizas: las rutas creadas por nuestra aplicación en ocasiones pueden atravesar las fronteras de países en lugares no autorizados.</string>
     <string name="dialog_routing_disclaimer_beware">¡Manténgase alerta y a salvo durante el viaje!</string>
     <string name="dialog_routing_check_gps">Verificar la señal del GPS</string>
     <string name="dialog_routing_error_location_not_found">No se puede crear la ruta. No se pudieron identificar las coordenadas actuales del GPS.</string>
@@ -402,7 +402,7 @@
     <string name="search_not_found_query">Descargue la región en la que está buscando o pruebe a añadir el nombre de una ciudad/pueblo cercano.</string>
     <string name="search_history_title">Historial de búsquedas</string>
     <string name="search_history_text">Ver búsquedas recientes.</string>
-    <string name="clear_search">Eliminar el historial de búsqueda</string>
+    <string name="clear_search">Vaciar historial de búsquedas</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipedia</string>
     <string name="p2p_your_location">Su ubicación</string>
@@ -532,7 +532,7 @@
     <string name="editor_category_unsuitable_text">Organic Maps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añada dichas categorías directamente a <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nuestra <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guía</a> para obtener instrucciones detalladas paso a paso.</string>
     <string name="downloader_no_downloaded_maps_title">No ha descargado ningún mapa</string>
     <string name="downloader_no_downloaded_maps_message">Descargue mapas para encontrar la ubicación y navegar sin conexión.</string>
-    <string name="current_location_unknown_error_title">La ubicación actual es desconocida.</string>
+    <string name="current_location_unknown_error_title">Se desconoce la ubicación actual.</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -565,9 +565,9 @@
     <string name="editor_remove_place_button">Eliminar</string>
     <string name="editor_place_doesnt_exist">El lugar no existe</string>
     <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
-    <string name="delete_place_empty_comment_error">Indique por favor la razón para eliminar el lugar</string>
+    <string name="delete_place_empty_comment_error">Indique la razón para eliminar el lugar</string>
     <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Introduzca un número de teléfono correcto</string>
+    <string name="error_enter_correct_phone">Introduzca un número de teléfono válido</string>
     <string name="error_enter_correct_web">Introduzca una dirección web válida</string>
     <string name="error_enter_correct_email">Introduzca un correo válido</string>
     <string name="error_enter_correct_facebook_page">Introduzca una dirección web, una cuenta o un nombre de página de Facebook válidos</string>
@@ -579,7 +579,7 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">¿Quiere enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato personal.</string>
+    <string name="editor_share_to_all_dialog_message_1">Cerciórese de que no ha introducido ningún dato privado o personal.</string>
     <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto con usted si tienen alguna pregunta.</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -606,7 +606,7 @@
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Opinión general</string>
     <string name="prefs_languages_information">Utilizamos el sistema TTS para las instrucciones de voz. Muchos dispositivos de Android usan Google TTS. Puede descargar o actualizarlo desde Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Para algunos idiomas, debe instalar otro sintetizador de voz o un paquete de idioma adicional desde la tienda de aplicaciones (Google Play, Galaxy Store, App Gallery, FDroid).\nAbra los Ajustes de su dispositivo → Idioma e introducción → Voz → Opciones texto a voz.\nAquí puede administrar la configuración de síntesis de voz (por ejemplo, descargar un paquete de idioma para poder usarlo sin conexión) o seleccionar otro motor de texto a voz.</string>
+    <string name="prefs_languages_information_off">Para algunos idiomas, debe instalar otro sintetizador de voz o un paquete de idioma adicional desde la tienda de aplicaciones (Google Play, Galaxy Store, App Gallery, FDroid).\nAbra los Ajustes de su dispositivo → Idioma y entrada de texto → Voz → Opciones texto a voz.\nAquí puede administrar la configuración de síntesis de voz (por ejemplo, descargar un paquete de idioma para poder usarlo sin conexión) o seleccionar otro motor de texto a voz.</string>
     <string name="prefs_languages_information_off_link">Para obtener más información, consulte esta guía.</string>
     <string name="transliteration_title">Transliteración al alfabeto latino</string>
     <string name="learn_more">Leer más</string>
@@ -633,6 +633,7 @@
     <string name="bookmark_lists_show_all">Mostrar todo</string>
     <plurals name="bookmarks_places">
         <item quantity="one">%d marcador</item>
+        <item quantity="many">%d marcadores</item>
         <item quantity="other">%d marcadores</item>
     </plurals>
     <string name="bookmarks_create_new_group">Crear nueva lista</string>
@@ -651,6 +652,7 @@
     <string name="profile">Perfil de OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">Se encontró %d archivo. Lo verá después de la conversión.</item>
+        <item quantity="many">Se han encontrado %d archivos. Los verá después de la conversión.</item>
         <item quantity="other">Se han encontrado %d archivos. Los verá después de la conversión.</item>
     </plurals>
     <string name="restore">Restaurar</string>
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index 7e84c6f4e7..6e9f92480a 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -261,26 +261,26 @@
     <string name="type.cuisine.african">Aafrika</string>
     <string name="type.cuisine.american">Ameerika</string>
     <string name="type.cuisine.arab">Araabia</string>
-    <string name="type.cuisine.argentinian">Argentiina</string>
+    <string name="type.cuisine.argentinian">Argentina</string>
     <string name="type.cuisine.asian">Aasia</string>
     <string name="type.cuisine.austrian">Austria</string>
     <string name="type.cuisine.bagel">Rõngassaiake</string>
     <string name="type.cuisine.balkan">Balkani</string>
     <string name="type.cuisine.barbecue">Grill</string>
     <string name="type.cuisine.bavarian">Baieri</string>
-    <string name="type.cuisine.beef_bowl">Veiseliha kauss</string>
+    <string name="type.cuisine.beef_bowl">Veise-riisiroad</string>
     <string name="type.cuisine.brazilian">Brasiilia</string>
     <string name="type.cuisine.breakfast">Hommikusöök</string>
     <string name="type.cuisine.bubble_tea">Mullitee</string>
     <string name="type.cuisine.burger">Hamburger</string>
     <string name="type.cuisine.buschenschank">Austria veinikõrts (buschenschank)</string>
-    <string name="type.cuisine.cake">Kook</string>
+    <string name="type.cuisine.cake">Koogid</string>
     <string name="type.cuisine.caribbean">Kariibi</string>
-    <string name="type.cuisine.chicken">Kana</string>
+    <string name="type.cuisine.chicken">Kanaliha road</string>
     <string name="type.cuisine.chinese">Hiina</string>
     <string name="type.cuisine.coffee_shop">Kohvi</string>
-    <string name="type.cuisine.crepe">Krepp</string>
-    <string name="type.cuisine.croatian">Horvaatia</string>
+    <string name="type.cuisine.crepe">Kreperii</string>
+    <string name="type.cuisine.croatian">Horvaadi</string>
     <string name="type.cuisine.curry">Karri</string>
     <string name="type.cuisine.deli">Delikatesstoitude pood</string>
     <string name="type.cuisine.diner">Söögikoht</string>
@@ -288,10 +288,10 @@
     <string name="type.cuisine.ethiopian">Etioopia</string>
     <string name="type.cuisine.filipino">Filipiinide</string>
     <string name="type.cuisine.fine_dining">Peen restoran</string>
-    <string name="type.cuisine.fish">Kala</string>
-    <string name="type.cuisine.fish_and_chips">Kala ja krõpsud</string>
+    <string name="type.cuisine.fish">Kalaroad</string>
+    <string name="type.cuisine.fish_and_chips">Friteeritud kala ja kartulid</string>
     <string name="type.cuisine.french">Prantsuse</string>
-    <string name="type.cuisine.friture">Fritüür</string>
+    <string name="type.cuisine.friture">Friteeritud toidud</string>
     <string name="type.cuisine.georgian">Gruusia</string>
     <string name="type.cuisine.german">Saksa</string>
     <string name="type.cuisine.greek">Kreeka</string>
@@ -313,27 +313,27 @@
     <string name="type.cuisine.lebanese">Liibanoni</string>
     <string name="type.cuisine.local">Kohalik</string>
     <string name="type.cuisine.malagasy">Madagaskari</string>
-    <string name="type.cuisine.malaysian">Malaisia</string>
+    <string name="type.cuisine.malaysian">Malai</string>
     <string name="type.cuisine.mediterranean">Vahemere</string>
     <string name="type.cuisine.mexican">Mehhiko</string>
     <string name="type.cuisine.moroccan">Maroko</string>
-    <string name="type.cuisine.noodles">Nuudlid</string>
+    <string name="type.cuisine.noodles">Nuudliroad</string>
     <string name="type.cuisine.oriental">Kaug-Ida</string>
-    <string name="type.cuisine.pancake">Pannkook</string>
+    <string name="type.cuisine.pancake">Pannkoogid</string>
     <string name="type.cuisine.pasta">Pasta</string>
     <string name="type.cuisine.persian">Pärsia</string>
-    <string name="type.cuisine.peruvian">Peruuvia</string>
-    <string name="type.cuisine.pizza">Pizza</string>
+    <string name="type.cuisine.peruvian">Peruu köök</string>
+    <string name="type.cuisine.pizza">Pitsa</string>
     <string name="type.cuisine.polish">Poola</string>
     <string name="type.cuisine.portuguese">Portugali</string>
-    <string name="type.cuisine.ramen">Ramen</string>
+    <string name="type.cuisine.ramen">Jaapani ramen-nuudlid</string>
     <string name="type.cuisine.regional">Piirkondlik</string>
     <string name="type.cuisine.russian">Vene</string>
-    <string name="type.cuisine.sandwich">Võileib</string>
-    <string name="type.cuisine.sausage">Vorst</string>
+    <string name="type.cuisine.sandwich">Võileivad</string>
+    <string name="type.cuisine.sausage">Vorstid</string>
     <string name="type.cuisine.savory_pancakes">Soolased pannkoogid</string>
     <string name="type.cuisine.seafood">Mereannid</string>
-    <string name="type.cuisine.soba">Soba</string>
+    <string name="type.cuisine.soba">Jaapani soba-nuudlid</string>
     <string name="type.cuisine.spanish">Hispaania</string>
     <string name="type.cuisine.steak_house">Liharestoran</string>
     <string name="type.cuisine.sushi">Sushi</string>
@@ -341,11 +341,11 @@
     <string name="type.cuisine.tea">Tee</string>
     <string name="type.cuisine.thai">Tai</string>
     <string name="type.cuisine.turkish">Türgi</string>
-    <string name="type.cuisine.vegan">Vegan</string>
+    <string name="type.cuisine.vegan">Täistaimetoidukoht</string>
     <string name="type.cuisine.vegetarian">Taimetoit</string>
     <string name="type.cuisine.vietnamese">Vietnami</string>
-    <string name="type.emergency">Hädaabi</string>
-    <string name="type.emergency.assembly_point">Erakorraline kogunemispunkt</string>
+    <string name="type.emergency">Pääste- ja abiteenused</string>
+    <string name="type.emergency.assembly_point">Kogunemiskoht hädaolukorras</string>
     <string name="type.emergency.defibrillator">Defibrillaator</string>
     <string name="type.emergency.fire_hydrant">Tuletõrjehüdrant</string>
     <string name="type.emergency.phone">Hädaabi telefon</string>
@@ -356,28 +356,28 @@
     <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
     <string name="type.entrance">Sissepääs</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
-    <string name="type.entrance.main">Peasissekäik</string>
-    <string name="type.entrance.exit">Väljumine</string>
+    <string name="type.entrance.main">Peasissepääs</string>
+    <string name="type.entrance.exit">Väljupääs</string>
     <string name="type.fee.no">Tasuta</string>
     <string name="type.healthcare.laboratory">Meditsiinilabor</string>
     <string name="type.healthcare.physiotherapist">Füsioterapeut</string>
-    <string name="type.healthcare.alternative">Alternatiivne meditsiin</string>
-    <string name="type.healthcare.audiologist">Audioloogia</string>
-    <string name="type.healthcare.blood_donation">Vereloovutuskeskus</string>
-    <string name="type.healthcare.optometrist">Optomeetria</string>
-    <string name="type.healthcare.podiatrist">Jalaravi</string>
+    <string name="type.healthcare.alternative">Alternatiivmeditsiin</string>
+    <string name="type.healthcare.audiologist">Audioloog</string>
+    <string name="type.healthcare.blood_donation">Verekeskus</string>
+    <string name="type.healthcare.optometrist">Optometrist</string>
+    <string name="type.healthcare.podiatrist">Jalaarst</string>
     <string name="type.healthcare.psychotherapist">Psühhoteraapia</string>
-    <string name="type.healthcare.sample_collection">Proovivõtmine</string>
-    <string name="type.healthcare.speech_therapist">Logopeedia</string>
+    <string name="type.healthcare.sample_collection">Proovide kogumispunkt</string>
+    <string name="type.healthcare.speech_therapist">Logopeed</string>
     <!-- SECTION: Types: Roads -->
-    <string name="type.highway">Maantee</string>
-    <string name="type.highway.bridleway">Valjarada</string>
+    <string name="type.highway">Tee</string>
+    <string name="type.highway.bridleway">Ratsutamisrada</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.bridleway.bridge">Sild</string>
-    <string name="type.highway.bridleway.permissive">Valjarada</string>
+    <string name="type.highway.bridleway.permissive">Ratsutamisrada</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.bridleway.tunnel">Tunnel</string>
-    <string name="type.highway.busway">Spetsiaalne bussitee</string>
+    <string name="type.highway.busway">Roobastega bussirada</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.busway.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -389,7 +389,7 @@
     <string name="type.highway.cycleway.bridge">Jalgrattasild</string>
     <string name="type.highway.cycleway.permissive">Piiratud jalgrattatee</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.cycleway.tunnel">Jalgratta tunnel</string>
+    <string name="type.highway.cycleway.tunnel">Jalgrattatunnel</string>
     <string name="type.highway.elevator">Lift</string>
     <string name="type.highway.footway">Jalgrada</string>
     <string name="type.highway.footway.sidewalk">Kõnnitee</string>
@@ -400,17 +400,17 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.footway.tunnel">Jalakäijate tunnel</string>
     <string name="type.highway.ford">Koolmekoht</string>
-    <string name="type.highway.living_street">Elamupiirkonna tänav</string>
+    <string name="type.highway.living_street">Õueala tee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.living_street.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.living_street.tunnel">Tänavatunnel</string>
+    <string name="type.highway.living_street.tunnel">Elamupiirkonna tänava tunnel</string>
     <string name="type.highway.motorway">Kiirtee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.motorway.bridge">Mootorrataste sild</string>
+    <string name="type.highway.motorway.bridge">Kiirtee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.motorway.tunnel">Kiirtee tunnel</string>
-    <string name="type.highway.motorway_junction">Väljumistee</string>
+    <string name="type.highway.motorway_junction">Mahasõit kiirteelt</string>
     <string name="type.highway.motorway_link">Kiirtee kaldtee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.motorway_link.bridge">Sild</string>
@@ -425,7 +425,7 @@
     <string name="type.highway.footway.bicycle">Jalgratta- ja jalgtee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.path.bridge">Sild</string>
-    <string name="type.highway.path.horse">Valjarada</string>
+    <string name="type.highway.path.horse">Ratsutamisrada</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.path.tunnel">Tunnel</string>
     <string name="type.highway.pedestrian">Jalakäijate tänav</string>
@@ -434,24 +434,24 @@
     <string name="type.highway.pedestrian.bridge">Jalakäijate sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Jalakäijate tunnel</string>
-    <string name="type.highway.primary">Esmane tee</string>
+    <string name="type.highway.primary">Põhimaantee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.primary.bridge">Sild</string>
+    <string name="type.highway.primary.bridge">Põhimaantee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.primary.tunnel">Peatee tunnel</string>
-    <string name="type.highway.primary_link">Esmase tee kaldtee</string>
+    <string name="type.highway.primary.tunnel">Põhimaantee tunnel</string>
+    <string name="type.highway.primary_link">Põhimaantee kaldtee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.primary_link.bridge">Sild</string>
+    <string name="type.highway.primary_link.bridge">Põhimaantee ühendustee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.primary_link.tunnel">Tunnel</string>
+    <string name="type.highway.primary_link.tunnel">Põhimaantee ühendustee tunnel</string>
     <string name="type.highway.raceway">Võistlusrada</string>
-    <string name="type.highway.residential">Tänav</string>
-    <string name="type.highway.residential.area">Tänav</string>
+    <string name="type.highway.residential">Elamupiirkonna tänav</string>
+    <string name="type.highway.residential.area">Elamupiirkonna tänav</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.residential.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.residential.tunnel">Elamupirkonna tänava tunnel</string>
-    <string name="type.highway.rest_area">Puhkeala</string>
+    <string name="type.highway.rest_area">Teeäärne puhkekoht</string>
     <string name="type.highway.road">Maantee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.road.bridge">Sild</string>
@@ -459,41 +459,41 @@
     <string name="type.man_made.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.road.tunnel">Tunnel</string>
-    <string name="type.highway.secondary">Teisene tee</string>
+    <string name="type.highway.secondary">Tugimaantee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.secondary.bridge">Sild</string>
+    <string name="type.highway.secondary.bridge">Tugimaantee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary.tunnel">Tänava tunnel</string>
-    <string name="type.highway.secondary_link">Teisese tee kaldtee</string>
+    <string name="type.highway.secondary.tunnel">Tugimaantee tunnel</string>
+    <string name="type.highway.secondary_link">Tugimaantee ühendustee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.secondary_link.bridge">Sild</string>
+    <string name="type.highway.secondary_link.bridge">Tugimaantee ühendustee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary_link.tunnel">Tänava tunnel</string>
-    <string name="type.highway.service">Hooldustee</string>
-    <string name="type.highway.service.area">Hooldustee</string>
+    <string name="type.highway.secondary_link.tunnel">Tugimaantee ühendustee tunnel</string>
+    <string name="type.highway.service">Juurdepääsutee</string>
+    <string name="type.highway.service.area">Juurdepääsutee ala</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.service.bridge">Maanteesild</string>
+    <string name="type.highway.service.bridge">Juurdepääsutee sild</string>
     <string name="type.highway.service.driveway">Sissesõidutee</string>
     <string name="type.highway.service.parking_aisle">Parkla vahetee</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.service.tunnel">Tänava tunnel</string>
-    <string name="type.highway.services">Teenindusala</string>
+    <string name="type.highway.service.tunnel">Juurdepääsutee tunnel</string>
+    <string name="type.highway.services">Maantee teenindusala</string>
     <string name="type.highway.speed_camera">Kiiruskaamera</string>
     <string name="type.highway.steps">Trepp</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.steps.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.steps.tunnel">Tunnel</string>
-    <string name="type.highway.tertiary">Tänav</string>
+    <string name="type.highway.tertiary">Kohalik maantee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.tertiary.bridge">Sild</string>
+    <string name="type.highway.tertiary.bridge">Kohaliku maantee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.tertiary.tunnel">Tunnel</string>
-    <string name="type.highway.tertiary_link">Tänav</string>
+    <string name="type.highway.tertiary.tunnel">Kohaliku maantee tunnel</string>
+    <string name="type.highway.tertiary_link">Kohaliku maantee ühendustee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.tertiary_link.bridge">Sild</string>
+    <string name="type.highway.tertiary_link.bridge">Kohaliku maantee ühendustee sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.tertiary_link.tunnel">Tunnel</string>
+    <string name="type.highway.tertiary_link.tunnel">Kohaliku maantee ühendustee tunnel</string>
     <string name="type.highway.track">Rada</string>
     <string name="type.highway.track.area">Rada</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -503,12 +503,12 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.track.tunnel">Tunnel</string>
     <string name="type.highway.traffic_signals">Valgusfoor</string>
-    <string name="type.highway.trunk">Magistraaltee</string>
+    <string name="type.highway.trunk">E-tähistusega põhimaantee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.trunk.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.trunk.tunnel">Tunnel</string>
-    <string name="type.highway.trunk_link">Magistraaltee</string>
+    <string name="type.highway.trunk.tunnel">E-tähistusega põhimaantee tunnel</string>
+    <string name="type.highway.trunk_link">E-tähistusega põhimaantee ühendustee</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.trunk_link.bridge">Sild</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -520,19 +520,19 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.unclassified.tunnel">Tunnel</string>
     <string name="type.area_highway.cycleway">Jalgrattatee</string>
-    <string name="type.area_highway.footway">Käigutee</string>
-    <string name="type.area_highway.living_street">Elamupiirkonna tänav</string>
+    <string name="type.area_highway.footway">Jalgtee</string>
+    <string name="type.area_highway.living_street">Õueala tee</string>
     <string name="type.area_highway.motorway">Kiirtee</string>
     <string name="type.area_highway.path">Rada</string>
-    <string name="type.area_highway.pedestrian">Jalakäigutee</string>
-    <string name="type.area_highway.primary">Esmane tee</string>
-    <string name="type.area_highway.residential">Tänav</string>
-    <string name="type.area_highway.secondary">Teisene tee</string>
-    <string name="type.area_highway.service">Hooldustee</string>
-    <string name="type.area_highway.tertiary">Tänav</string>
+    <string name="type.area_highway.pedestrian">Jalakäijate tänav</string>
+    <string name="type.area_highway.primary">Põhimaantee</string>
+    <string name="type.area_highway.residential">Elamupiikonna tänav</string>
+    <string name="type.area_highway.secondary">Tugimaantee</string>
+    <string name="type.area_highway.service">Juurdepääsutee</string>
+    <string name="type.area_highway.tertiary">Kohalik maantee</string>
     <string name="type.area_highway.steps">Trepp</string>
     <string name="type.area_highway.track">Rada</string>
-    <string name="type.area_highway.trunk">Magistraaltee</string>
+    <string name="type.area_highway.trunk">E-tähistusega põhimaantee</string>
     <string name="type.area_highway.unclassified">Vähetähtis tee</string>
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Ajalooline objekt</string>
@@ -545,190 +545,190 @@
     <string name="type.historic.castle">Loss</string>
     <string name="type.historic.castle.castrum">Rooma kindlus</string>
     <string name="type.historic.castle.defensive">Kindlus</string>
-    <string name="type.historic.castle.fortified_church">Kindlustatud kirik</string>
+    <string name="type.historic.castle.fortified_church">Kindluskirik</string>
     <string name="type.historic.castle.fortress">Kindlus</string>
-    <string name="type.historic.castle.hillfort">Linnus</string>
+    <string name="type.historic.castle.hillfort">Maalinn</string>
     <string name="type.historic.castle.kremlin">Kreml</string>
     <string name="type.historic.castle.manor">Mõisahoone</string>
     <string name="type.historic.castle.palace">Palee</string>
-    <string name="type.historic.castle.shiro">Jaapani loss</string>
-    <string name="type.historic.castle.stately">Loss</string>
+    <string name="type.historic.castle.shiro">Jaapani kindlusloss</string>
+    <string name="type.historic.castle.stately">Suur härrastemaja</string>
     <string name="type.historic.city_gate">Linnavärav</string>
     <string name="type.historic.citywalls">Linnamüür</string>
     <string name="type.historic.fort">Kindlus</string>
     <string name="type.historic.gallows">Võllas</string>
     <string name="type.historic.locomotive">Ajalooline vedur</string>
-    <string name="type.historic.memorial">Memoriaal</string>
+    <string name="type.historic.memorial">Mälestusmärk</string>
     <string name="type.historic.memorial.cross">Mälestusrist</string>
-    <string name="type.historic.memorial.plaque">Mälestusmärk</string>
+    <string name="type.historic.memorial.plaque">Mälestustahvel</string>
     <string name="type.historic.memorial.sculpture">Skulptuur</string>
-    <string name="type.historic.memorial.statue">Kuju</string>
-    <string name="type.historic.memorial.stolperstein">Komistuskivi</string>
-    <string name="type.historic.stone">Ajalooline kivi</string>
+    <string name="type.historic.memorial.statue">Ausammas</string>
+    <string name="type.historic.memorial.stolperstein">Natsismiohvrite mälestuskivi sillutises</string>
+    <string name="type.historic.stone">Mälestuskivi</string>
     <string name="type.historic.memorial.war_memorial">Sõjamemoriaal</string>
     <string name="type.historic.mine">Ajalooline kaevandus</string>
     <string name="type.historic.monument">Monument</string>
-    <string name="type.historic.pillory">Häbipost</string>
+    <string name="type.historic.pillory">Ajalooline häbipost</string>
     <string name="type.historic.ruins">Varemed</string>
-    <string name="type.historic.ship">Laev</string>
+    <string name="type.historic.ship">Ajalooline laev</string>
     <string name="type.historic.tank">Ajalooline tank</string>
-    <string name="type.historic.tomb">Haud</string>
+    <string name="type.historic.tomb">Hauakamber</string>
     <!-- Usually has no historic and sometimes no religious context. E.g. a mountain summit cross. -->
     <string name="type.man_made.cross">Rist</string>
     <!-- Usually a Christian historical cross placed along a road. -->
     <string name="type.historic.wayside_cross">Teeäärne rist</string>
-    <string name="type.historic.wayside_shrine">Teeäärne pühamu</string>
-    <string name="type.historic.wreck">Laevahukk</string>
+    <string name="type.historic.wayside_shrine">Teeäärne altar</string>
+    <string name="type.historic.wreck">Laevavrakk</string>
     <string name="type.internet_access">Internet</string>
-    <string name="type.internet_access.wlan">Internet</string>
+    <string name="type.internet_access.wlan">Wifi</string>
     <string name="type.junction">Ristmik</string>
     <string name="type.junction.circular">Ringtee</string>
     <string name="type.junction.roundabout">Ringtee</string>
     <string name="type.landuse">Maakasutus</string>
-    <string name="type.landuse.allotments">Peenrad</string>
-    <string name="type.landuse.basin">Bassein</string>
-    <string name="type.landuse.brownfield">Ehitusmaa</string>
+    <string name="type.landuse.allotments">Aianduskrundid</string>
+    <string name="type.landuse.basin">Kogumisbassein</string>
+    <string name="type.landuse.brownfield">Pruunala</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.landuse.cemetery">Surnuaed</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.landuse.cemetery.christian">Kristlik surnuaed</string>
-    <string name="type.landuse.churchyard">Kirikuõu</string>
-    <string name="type.landuse.commercial">Kommertspiirkond</string>
-    <string name="type.landuse.construction">Ehitus</string>
-    <string name="type.landuse.education">Haridusrajatised</string>
-    <string name="type.landuse.farmland">Talumaa</string>
+    <string name="type.landuse.churchyard">Kirikuaed</string>
+    <string name="type.landuse.commercial">Ärimaa</string>
+    <string name="type.landuse.construction">Ehitusala</string>
+    <string name="type.landuse.education">Haridusasutuse maaala</string>
+    <string name="type.landuse.farmland">Põllumaa</string>
     <string name="type.landuse.farmyard">Taluõu</string>
     <string name="type.landuse.field">Põld</string>
     <string name="type.landuse.flowerbed">Lillepeenar</string>
-    <string name="type.landuse.forest">Mets</string>
+    <string name="type.landuse.forest">Majandusmets</string>
     <string name="type.landuse.forest.coniferous">Okaspuumets</string>
     <string name="type.landuse.forest.deciduous">Heitlehine mets</string>
     <string name="type.landuse.forest.mixed">Segamets</string>
-    <string name="type.landuse.garages">Garaažid</string>
+    <string name="type.landuse.garages">Garaažide maaala</string>
     <string name="type.landuse.grass">Muru</string>
-    <string name="type.landuse.greenfield">Ehituskrunt</string>
-    <string name="type.landuse.greenhouse_horticulture">Kasvuhoone</string>
-    <string name="type.landuse.industrial">Tööstusmaa</string>
+    <string name="type.landuse.greenfield">Ehituseks planeeritud roheala</string>
+    <string name="type.landuse.greenhouse_horticulture">Kasvuhoonete ala</string>
+    <string name="type.landuse.industrial">Tööstuspiirkond</string>
     <string name="type.landuse.landfill">Prügila</string>
     <string name="type.landuse.meadow">Heinamaa</string>
     <string name="type.landuse.military">Militaarala</string>
     <string name="type.landuse.orchard">Viljapuuaed</string>
     <string name="type.landuse.quarry">Karjäär</string>
-    <string name="type.landuse.railway">Raudtee ruumid</string>
-    <string name="type.landuse.recreation_ground">Puhkeväljak</string>
-    <string name="type.landuse.reservoir">Vesi</string>
-    <string name="type.landuse.residential">Elamumaa</string>
-    <string name="type.landuse.retail">Jaekaubandusmaa</string>
-    <string name="type.landuse.salt_pond">Tiik</string>
-    <string name="type.landuse.village_green">Maa</string>
+    <string name="type.landuse.railway">Raudteekoridor</string>
+    <string name="type.landuse.recreation_ground">Puhkeala</string>
+    <string name="type.landuse.reservoir">Veehoidla</string>
+    <string name="type.landuse.residential">Elamuala</string>
+    <string name="type.landuse.retail">Jaekaubandusala</string>
+    <string name="type.landuse.salt_pond">Soolatiik</string>
+    <string name="type.landuse.village_green">Külaplats</string>
     <string name="type.landuse.vineyard">Viinamarjaistandus</string>
-    <string name="type.leisure">Lõõgastus</string>
-    <string name="type.leisure.common">Avalik maa</string>
-    <string name="type.leisure.dog_park">Koerte ala</string>
-    <string name="type.leisure.fitness_centre">Spordikeskus</string>
-    <string name="type.leisure.fitness_station">Välivõimla</string>
+    <string name="type.leisure">Jõudeaja tegevused</string>
+    <string name="type.leisure.common">Ühismaakasutusala</string>
+    <string name="type.leisure.dog_park">Koertepark</string>
+    <string name="type.leisure.fitness_centre">Jõusaal</string>
+    <string name="type.leisure.fitness_station">Jõulinnak</string>
     <string name="type.leisure.dance">Tantsusaal</string>
     <string name="type.leisure.garden">Aed</string>
     <string name="type.leisure.garden.residential">Elamu aed</string>
     <string name="type.leisure.golf_course">Golfirada</string>
-    <string name="type.leisure.miniature_golf">Minigolf</string>
-    <string name="type.leisure.ice_rink">Liuväli</string>
-    <string name="type.leisure.marina">Marina</string>
+    <string name="type.leisure.miniature_golf">Minigolfirada</string>
+    <string name="type.leisure.ice_rink">Uisustaadion</string>
+    <string name="type.leisure.marina">Väikesadam</string>
     <string name="type.leisure.nature_reserve">Looduskaitseala</string>
     <string name="type.leisure.outdoor_seating">Istekohad õues</string>
     <string name="type.leisure.park">Park</string>
-    <string name="type.leisure.park.no.access">Park</string>
+    <string name="type.leisure.park.no.access">Erapark</string>
     <string name="type.leisure.park.permissive">Park</string>
-    <string name="type.leisure.park.private">Park</string>
+    <string name="type.leisure.park.private">Erapark</string>
     <string name="type.leisure.picnic_table">Piknikulaud</string>
     <string name="type.leisure.pitch">Spordiväljak</string>
     <string name="type.leisure.playground">Mänguväljak</string>
-    <string name="type.leisure.recreation_ground">Puhkeväljak</string>
+    <string name="type.leisure.recreation_ground">Puhkeala</string>
     <string name="type.leisure.sauna">Saun</string>
-    <string name="type.leisure.slipway">Elling</string>
+    <string name="type.leisure.slipway">Slipp</string>
     <string name="type.leisure.sports_centre">Spordikeskus</string>
     <string name="type.sport.climbing">Ronimiskeskus</string>
     <string name="type.sport.yoga">Joogastuudio</string>
     <string name="type.leisure.stadium">Staadion</string>
     <string name="type.leisure.swimming_pool">Ujumisbassein</string>
-    <string name="type.leisure.swimming_pool.private">Privaatne bassein</string>
+    <string name="type.leisure.swimming_pool.private">Privaatne ujumisbassein</string>
     <string name="type.leisure.track">Jooksurada</string>
     <string name="type.leisure.track.area">Jooksurada</string>
     <string name="type.leisure.water_park">Veepark</string>
     <string name="type.leisure.beach_resort">Rannakuurort</string>
-    <string name="type.man_made">Inimese loodud</string>
+    <string name="type.man_made">Inimtekkeline objekt</string>
     <string name="type.man_made.breakwater">Lainemurdja</string>
-    <string name="type.man_made.cairn">Karjäär</string>
-    <string name="type.man_made.chimney">Tehase korsten</string>
+    <string name="type.man_made.cairn">Kivikangur</string>
+    <string name="type.man_made.chimney">Korsten</string>
     <string name="type.man_made.cutline">Metsasiht</string>
-    <string name="type.man_made.survey_point">Uuringupunkt</string>
+    <string name="type.man_made.survey_point">Geodeetiline märk</string>
     <string name="type.man_made.flagpole">Lipumast</string>
     <string name="type.man_made.lighthouse">Majakas</string>
     <string name="type.man_made.mast">Mast</string>
     <string name="type.man_made.pier">Kai</string>
     <string name="type.man_made.pipeline">Torujuhe</string>
     <string name="type.man_made.pipeline.overground">Maapealne torujuhe</string>
-    <string name="type.man_made.silo">Elevaator</string>
+    <string name="type.man_made.silo">Silo</string>
     <string name="type.man_made.storage_tank">Mahuti</string>
-    <string name="type.man_made.surveillance">Jälgimiskaamera</string>
+    <string name="type.man_made.surveillance">Valvekaamera</string>
     <string name="type.man_made.tower">Torn</string>
     <!-- A huge telecommunications tower. Often a local monument or a landmark. -->
     <string name="type.man_made.communications_tower">Sidetorn</string>
     <!-- A regular telecommunications tower / mast. -->
-    <string name="type.man_made.tower.communication">Sidetorn</string>
+    <string name="type.man_made.tower.communication">Sidemast</string>
     <!-- A deep hole drilled into the earth to extract oil or gas. -->
-    <string name="type.man_made.petroleum_well">Nafta- või gaasikaev</string>
+    <string name="type.man_made.petroleum_well">Nafta- või gaasi puurauk</string>
     <!-- A tower/mast constructed to burn off excess gas. -->
-    <string name="type.man_made.flare">Gaasi leeke</string>
+    <string name="type.man_made.flare">Tööstuslik tõrvikpõleti</string>
     <string name="type.man_made.wastewater_plant">Reoveepuhasti</string>
-    <string name="type.man_made.water_tap">Veekraan</string>
-    <string name="type.man_made.water_tap.drinking_water_no">Veekraan</string>
+    <string name="type.man_made.water_tap">Avalik veekraan</string>
+    <string name="type.man_made.water_tap.drinking_water_no">Pole joogivesi</string>
     <string name="type.man_made.water_tower">Veetorn</string>
-    <string name="type.man_made.water_well">Vesiveski</string>
-    <string name="type.man_made.water_well.drinking_water_no">Vesiveski</string>
+    <string name="type.man_made.water_well">Veekaev</string>
+    <string name="type.man_made.water_well.drinking_water_no">Pole joogivesi</string>
     <string name="type.man_made.windmill">Tuuleveski</string>
-    <string name="type.man_made.works">Vabrik</string>
+    <string name="type.man_made.works">Tehas</string>
     <string name="type.military">Militaarobjekt</string>
     <string name="type.military.bunker">Punker</string>
     <string name="type.mountain_pass">Mäekuru</string>
     <string name="type.natural">Loodus</string>
     <!-- A rocky land cover. -->
-    <string name="type.natural.bare_rock">Paljas kivi</string>
+    <string name="type.natural.bare_rock">Paljand</string>
     <!-- A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. -->
-    <string name="type.natural.shingle">Pebbles</string>
+    <string name="type.natural.shingle">Kiviklibu</string>
     <!-- A loose surface consisting of angular, sharp stones. Usually on a mountain slope and prone to landslides. -->
-    <string name="type.natural.scree">Kiviklibu</string>
+    <string name="type.natural.scree">Rusukalle</string>
     <string name="type.natural.bay">Laht</string>
     <string name="type.natural.beach">Rand</string>
     <string name="type.natural.beach.sand">Liivarand</string>
     <string name="type.natural.beach.gravel">Kruusarand</string>
     <string name="type.natural.cape">Neem</string>
-    <string name="type.natural.cave_entrance">Koobas</string>
+    <string name="type.natural.cave_entrance">Koopa sissepääs</string>
     <string name="type.natural.cliff">Kalju</string>
-    <string name="type.natural.earth_bank">Maa pank</string>
+    <string name="type.natural.earth_bank">Nõlv</string>
     <string name="type.man_made.embankment">Muldkeha</string>
     <string name="type.natural.coastline">Rannajoon</string>
     <string name="type.natural.desert">Kõrb</string>
     <string name="type.natural.geyser">Geiser</string>
     <string name="type.natural.glacier">Liustik</string>
     <string name="type.natural.grassland">Rohumaa</string>
-    <string name="type.natural.heath">Nurm</string>
+    <string name="type.natural.heath">Nõmm</string>
     <string name="type.natural.hot_spring">Kuumaveeallikas</string>
     <string name="type.natural.water.lake">Järv</string>
-    <string name="type.natural.water.lock">Luku kamber</string>
+    <string name="type.natural.water.lock">Lüüs</string>
     <string name="type.natural.water.pond">Tiik</string>
     <string name="type.natural.water.reservoir">Veehoidla</string>
-    <string name="type.natural.water.basin">Bassein</string>
+    <string name="type.natural.water.basin">Kogumisbassein</string>
     <string name="type.natural.water.river">Jõgi</string>
     <string name="type.natural.land">Maa</string>
     <string name="type.natural.meadow">Heinamaa</string>
     <string name="type.natural.orchard">Viljapuuaed</string>
-    <string name="type.natural.peak">Tipp</string>
+    <string name="type.natural.peak">Mäetipp</string>
     <string name="type.natural.saddle">Mäesadul</string>
-    <string name="type.natural.rock">Kivi</string>
+    <string name="type.natural.rock">Kaljurahn</string>
     <string name="type.natural.scrub">Võsa</string>
-    <string name="type.natural.spring">Allikas</string>
-    <string name="type.natural.spring.drinking_water_no">Allikas</string>
+    <string name="type.natural.spring">Looduslik allikas</string>
+    <string name="type.natural.spring.drinking_water_no">Vesi pole joodav</string>
     <string name="type.natural.strait">Väin</string>
     <string name="type.natural.tree_row">Puude rida</string>
     <string name="type.natural.vineyard">Viinamarjaistandus</string>
@@ -740,14 +740,14 @@
     <string name="type.noexit">Tupiktee</string>
     <string name="type.office">Kontor</string>
     <string name="type.office.company">Ettevõtte kontor</string>
-    <string name="type.office.estate_agent">Kinnisvara vahendaja</string>
-    <string name="type.office.government">Riigikantselei</string>
+    <string name="type.office.estate_agent">Kinnisvarabüroo</string>
+    <string name="type.office.government">Valitsusasutus</string>
     <string name="type.office.insurance">Kindlustusbüroo</string>
     <string name="type.office.lawyer">Advokaat</string>
     <string name="type.office.ngo">Valitsusväline organisatsioon</string>
-    <string name="type.office.telecommunication">Telekommunikatsiooni ettevõte</string>
-    <string name="type.organic.only">Orgaaniline</string>
-    <string name="type.organic.yes">Orgaaniline</string>
+    <string name="type.office.telecommunication">Sideettevõte</string>
+    <string name="type.organic.only">Mahetoode</string>
+    <string name="type.organic.yes">Mahetoode</string>
     <string name="type.place.city">Linn</string>
     <string name="type.place.city.capital">Pealinn</string>
     <string name="type.place.city.capital.10">Linn</string>
@@ -767,10 +767,10 @@
     <string name="type.place.hamlet">Külake</string>
     <string name="type.place.island">Saar</string>
     <string name="type.place.islet">Laid</string>
-    <string name="type.place.isolated_dwelling">Isoleeritud eluruum</string>
+    <string name="type.place.isolated_dwelling">Üksik eluhoone</string>
     <string name="type.place.locality">Paikkond</string>
     <!-- Named part of a city or town, bigger than place=neighbourhood and smaller than place=suburb (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dquarter) -->
-    <string name="type.place.quarter">Naabruskond</string>
+    <string name="type.place.quarter">Kvartal</string>
     <!-- Named part of a city, town or suburb, smaller than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Neighbourhood) -->
     <string name="type.place.neighbourhood">Naabruskond</string>
     <string name="type.place.ocean">Ookean</string>
@@ -780,12 +780,12 @@
     <string name="type.place.state">Provints</string>
     <string name="type.place.state.USA">Osariik</string>
     <!-- Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) -->
-    <string name="type.place.suburb">Äärelinn</string>
+    <string name="type.place.suburb">Linnaosa</string>
     <string name="type.place.town">Linn</string>
     <string name="type.place.village">Küla</string>
     <string name="type.power">Energia</string>
-    <string name="type.power.generator">Generaator</string>
-    <string name="type.power.generator.solar">Päikese generaator</string>
+    <string name="type.power.generator">Elektrigeneraator</string>
+    <string name="type.power.generator.solar">Päikesepaneel</string>
     <string name="type.power.generator.wind">Tuulegeneraator</string>
     <string name="type.power.generator.gas">Gaasiturbiini elektrijaam</string>
     <string name="type.power.generator.hydro">Hüdroelektrijaam</string>
@@ -804,25 +804,25 @@
     <string name="type.power.tower">Kõrgepingemast</string>
     <string name="type.psurface">Pind</string>
     <string name="type.public_transport">Ühistransport</string>
-    <string name="type.public_transport.platform">Platvorm</string>
+    <string name="type.public_transport.platform">Ooteplatvorm</string>
     <string name="type.railway">Raudtee</string>
     <string name="type.railway.abandoned">Mahajäetud raudtee</string>
     <string name="type.railway.abandoned.bridge">Mahajäetud sild</string>
-    <string name="type.railway.abandoned.tunnel">Mahajäetud tunnel</string>
-    <string name="type.railway.construction">Raudtee ehitus</string>
+    <string name="type.railway.abandoned.tunnel">Mahajäetud raudteetunnel</string>
+    <string name="type.railway.construction">Ehitusel raudtee</string>
     <string name="type.railway.crossing">Raudtee ülesõit</string>
     <string name="type.railway.disused">Kasutamata raudtee</string>
-    <string name="type.railway.funicular">Funicular</string>
-    <string name="type.railway.funicular.bridge">Funikulöör</string>
-    <string name="type.railway.funicular.tunnel">Funikulöör</string>
-    <string name="type.railway.halt">Murdepunkt</string>
+    <string name="type.railway.funicular">Köisraudtee</string>
+    <string name="type.railway.funicular.bridge">Köisraudtee sild</string>
+    <string name="type.railway.funicular.tunnel">Köisraudtee tunnel</string>
+    <string name="type.railway.halt">Rongipeatus (nõudepeatus / teivasjaam)</string>
     <string name="type.railway.level_crossing">Raudteeületuskoht</string>
-    <string name="type.railway.light_rail">Kergrööbas</string>
-    <string name="type.railway.light_rail.bridge">Kergrööbas - sild</string>
-    <string name="type.railway.light_rail.tunnel">Kergrööbas - tunnel</string>
-    <string name="type.railway.monorail">Monorelss</string>
-    <string name="type.railway.monorail.bridge">Monorelss - sild</string>
-    <string name="type.railway.monorail.tunnel">Monorelss - tunnel</string>
+    <string name="type.railway.light_rail">Kergraudtee</string>
+    <string name="type.railway.light_rail.bridge">Kergraudtee sild</string>
+    <string name="type.railway.light_rail.tunnel">Kergraudtee tunnel</string>
+    <string name="type.railway.monorail">Monorelsstee</string>
+    <string name="type.railway.monorail.bridge">Monorelsstee sild</string>
+    <string name="type.railway.monorail.tunnel">Monorelsstee tunnel</string>
     <string name="type.railway.narrow_gauge">Kitsarööpmeline raudtee</string>
     <string name="type.railway.narrow_gauge.bridge">Kitsarööpmelise raudtee sild</string>
     <string name="type.railway.narrow_gauge.tunnel">Kitsarööpmelise raudtee tunnel</string>
@@ -835,152 +835,152 @@
     <string name="type.railway.rail.tourism">Turismiraudtee</string>
     <string name="type.railway.rail.main">Raudtee</string>
     <!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
-    <string name="type.railway.rail.branch">Teisene raudtee</string>
+    <string name="type.railway.rail.branch">Raudtee kõrvaltee</string>
     <!-- Non-passenger utility tracks: industrial, military, test. -->
     <string name="type.railway.rail.utility">Teenindus raudtee</string>
-    <string name="type.railway.rail.spur">Rööbastee</string>
+    <string name="type.railway.rail.spur">Haruraudtee</string>
     <!-- Short service tracks: siding, yard, crossover. -->
-    <string name="type.railway.rail.service">Lisarööpmel rööbastee</string>
-    <string name="type.railway.rail.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.highspeed.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.tourism.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.main.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.branch.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.utility.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.spur.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.service.bridge">Raudtee sild</string>
-    <string name="type.railway.rail.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.highspeed.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.tourism.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.main.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.branch.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.utility.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.spur.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.rail.service.tunnel">Raudtee tunnel</string>
-    <string name="type.railway.station">Raudtee jaam</string>
-    <string name="type.railway.station.funicular">Funicular</string>
-    <string name="type.railway.station.light_rail">Raudtee jaam</string>
-    <string name="type.railway.station.light_rail.berlin">Raudtee jaam</string>
-    <string name="type.railway.station.light_rail.london">Raudtee jaam</string>
-    <string name="type.railway.station.light_rail.porto">Raudtee jaam</string>
-    <string name="type.railway.station.monorail">Raudtee jaam</string>
-    <string name="type.railway.station.subway">Metroo</string>
-    <string name="type.railway.station.subway.adana">Metroo</string>
-    <string name="type.railway.station.subway.algiers">Metroo</string>
-    <string name="type.railway.station.subway.almaty">Metroo</string>
-    <string name="type.railway.station.subway.amsterdam">Metroo</string>
-    <string name="type.railway.station.subway.ankara">Metroo</string>
-    <string name="type.railway.station.subway.athens">Metroo</string>
-    <string name="type.railway.station.subway.baku">Metroo</string>
-    <string name="type.railway.station.subway.bangkok">Metroo</string>
-    <string name="type.railway.station.subway.barcelona">Metroo</string>
-    <string name="type.railway.station.subway.beijing">Metroo</string>
-    <string name="type.railway.station.subway.bengalore">Metroo</string>
-    <string name="type.railway.station.subway.berlin">Metroo</string>
-    <string name="type.railway.station.subway.bilbao">Metroo</string>
-    <string name="type.railway.station.subway.brasilia">Metroo</string>
-    <string name="type.railway.station.subway.brescia">Metroo</string>
-    <string name="type.railway.station.subway.brussels">Metroo</string>
-    <string name="type.railway.station.subway.bucharest">Metroo</string>
-    <string name="type.railway.station.subway.budapest">Metroo</string>
-    <string name="type.railway.station.subway.buenos_aires">Metroo</string>
-    <string name="type.railway.station.subway.bursa">Metroo</string>
-    <string name="type.railway.station.subway.cairo">Metroo</string>
-    <string name="type.railway.station.subway.caracas">Metroo</string>
-    <string name="type.railway.station.subway.catania">Metroo</string>
-    <string name="type.railway.station.subway.changchun">Metroo</string>
-    <string name="type.railway.station.subway.chengdu">Metroo</string>
-    <string name="type.railway.station.subway.chicago">Metroo</string>
-    <string name="type.railway.station.subway.chongqing">Metroo</string>
-    <string name="type.railway.station.subway.dalian">Metroo</string>
-    <string name="type.railway.station.subway.delhi">Metroo</string>
-    <string name="type.railway.station.subway.dnepro">Metroo</string>
-    <string name="type.railway.station.subway.dubai">Metroo</string>
-    <string name="type.railway.station.subway.ekb">Metroo</string>
-    <string name="type.railway.station.subway.fukuoka">Metroo</string>
-    <string name="type.railway.station.subway.glasgow">Metroo</string>
-    <string name="type.railway.station.subway.guangzhou">Metroo</string>
-    <string name="type.railway.station.subway.hamburg">Metroo</string>
-    <string name="type.railway.station.subway.helsinki">Metroo</string>
-    <string name="type.railway.station.subway.hiroshima">Metroo</string>
-    <string name="type.railway.station.subway.hongkong">Metroo</string>
-    <string name="type.railway.station.subway.isfahan">Metroo</string>
-    <string name="type.railway.station.subway.istanbul">Metroo</string>
-    <string name="type.railway.station.subway.izmir">Metroo</string>
-    <string name="type.railway.station.subway.kazan">Metroo</string>
-    <string name="type.railway.station.subway.kharkiv">Metroo</string>
-    <string name="type.railway.station.subway.kiev">Metroo</string>
-    <string name="type.railway.station.subway.kobe">Metroo</string>
-    <string name="type.railway.station.subway.kolkata">Metroo</string>
-    <string name="type.railway.station.subway.kunming">Metroo</string>
-    <string name="type.railway.station.subway.kyoto">Metroo</string>
-    <string name="type.railway.station.subway.la">Metroo</string>
-    <string name="type.railway.station.subway.lausanne">Metroo</string>
-    <string name="type.railway.station.subway.lille">Metroo</string>
-    <string name="type.railway.station.subway.lima">Metroo</string>
-    <string name="type.railway.station.subway.lisboa">Metroo</string>
-    <string name="type.railway.station.subway.london">Metroo</string>
-    <string name="type.railway.station.subway.lyon">Metroo</string>
-    <string name="type.railway.station.subway.madrid">Metroo</string>
-    <string name="type.railway.station.subway.malaga">Metroo</string>
-    <string name="type.railway.station.subway.manila">Metroo</string>
-    <string name="type.railway.station.subway.maracaibo">Metroo</string>
-    <string name="type.railway.station.subway.mashhad">Metroo</string>
-    <string name="type.railway.station.subway.mecca">Metroo</string>
-    <string name="type.railway.station.subway.medellin">Metroo</string>
-    <string name="type.railway.station.subway.mexico">Metroo</string>
-    <string name="type.railway.station.subway.milan">Metroo</string>
-    <string name="type.railway.station.subway.minsk">Metroo</string>
-    <string name="type.railway.station.subway.montreal">Metroo</string>
-    <string name="type.railway.station.subway.moscow">Metroo</string>
-    <string name="type.railway.station.subway.munchen">Metroo</string>
-    <string name="type.railway.station.subway.nagoya">Metroo</string>
-    <string name="type.railway.station.subway.newyork">Metroo</string>
-    <string name="type.railway.station.subway.nnov">Metroo</string>
-    <string name="type.railway.station.subway.novosibirsk">Metroo</string>
-    <string name="type.railway.station.subway.osaka">Metroo</string>
-    <string name="type.railway.station.subway.oslo">Metroo</string>
-    <string name="type.railway.station.subway.palma">Metroo</string>
-    <string name="type.railway.station.subway.panama">Metroo</string>
-    <string name="type.railway.station.subway.paris">Metroo</string>
-    <string name="type.railway.station.subway.philadelphia">Metroo</string>
-    <string name="type.railway.station.subway.pyongyang">Metroo</string>
-    <string name="type.railway.station.subway.rennes">Metroo</string>
-    <string name="type.railway.station.subway.rio">Metroo</string>
-    <string name="type.railway.station.subway.roma">Metroo</string>
-    <string name="type.railway.station.subway.rotterdam">Metroo</string>
-    <string name="type.railway.station.subway.samara">Metroo</string>
-    <string name="type.railway.station.subway.santiago">Metroo</string>
-    <string name="type.railway.station.subway.santo_domingo">Metroo</string>
-    <string name="type.railway.station.subway.saopaulo">Metroo</string>
-    <string name="type.railway.station.subway.sapporo">Metroo</string>
-    <string name="type.railway.station.subway.sendai">Metroo</string>
-    <string name="type.railway.station.subway.sf">Metroo</string>
-    <string name="type.railway.station.subway.shanghai">Metroo</string>
-    <string name="type.railway.station.subway.shenzhen">Metroo</string>
-    <string name="type.railway.station.subway.shiraz">Metroo</string>
-    <string name="type.railway.station.subway.singapore">Metroo</string>
-    <string name="type.railway.station.subway.sofia">Metroo</string>
-    <string name="type.railway.station.subway.spb">Metroo</string>
-    <string name="type.railway.station.subway.stockholm">Metroo</string>
-    <string name="type.railway.station.subway.tabriz">Metroo</string>
-    <string name="type.railway.station.subway.taipei">Metroo</string>
-    <string name="type.railway.station.subway.taoyuan">Metroo</string>
-    <string name="type.railway.station.subway.tashkent">Metroo</string>
-    <string name="type.railway.station.subway.tbilisi">Metroo</string>
-    <string name="type.railway.station.subway.tehran">Metroo</string>
-    <string name="type.railway.station.subway.tianjin">Metroo</string>
-    <string name="type.railway.station.subway.tokyo">Metroo</string>
-    <string name="type.railway.station.subway.valencia">Metroo</string>
-    <string name="type.railway.station.subway.vienna">Metroo</string>
-    <string name="type.railway.station.subway.warszawa">Metroo</string>
-    <string name="type.railway.station.subway.washington">Metroo</string>
-    <string name="type.railway.station.subway.wuhan">Metroo</string>
-    <string name="type.railway.station.subway.yerevan">Metroo</string>
-    <string name="type.railway.station.subway.yokohama">Metroo</string>
+    <string name="type.railway.rail.service">Kõrvalraudtee</string>
+    <string name="type.railway.rail.bridge">Raudteesild</string>
+    <string name="type.railway.rail.highspeed.bridge">Kiirraudtee sild</string>
+    <string name="type.railway.rail.tourism.bridge">Turismiraudtee sild</string>
+    <string name="type.railway.rail.main.bridge">Magistraalraudtee sild</string>
+    <string name="type.railway.rail.branch.bridge">Haruraudtee sild</string>
+    <string name="type.railway.rail.utility.bridge">Teenindusraudtee sild</string>
+    <string name="type.railway.rail.spur.bridge">Haruraudtee sild</string>
+    <string name="type.railway.rail.service.bridge">Teenindusraudtee sild</string>
+    <string name="type.railway.rail.tunnel">Raudteetunnel</string>
+    <string name="type.railway.rail.highspeed.tunnel">Kiirraudtee tunnel</string>
+    <string name="type.railway.rail.tourism.tunnel">Turismiraudtee tunnel</string>
+    <string name="type.railway.rail.main.tunnel">Magistraalraudtee tunnel</string>
+    <string name="type.railway.rail.branch.tunnel">Haruraudtee tunnel</string>
+    <string name="type.railway.rail.utility.tunnel">Teenindusraudtee tunnel</string>
+    <string name="type.railway.rail.spur.tunnel">Haruraudtee tunnel</string>
+    <string name="type.railway.rail.service.tunnel">Teenindusraudtee tunnel</string>
+    <string name="type.railway.station">Raudteejaam</string>
+    <string name="type.railway.station.funicular">Köisraudtee</string>
+    <string name="type.railway.station.light_rail">Kergraudtee jaam</string>
+    <string name="type.railway.station.light_rail.berlin">Raudteejaam (S-Bahn)</string>
+    <string name="type.railway.station.light_rail.london">Raudteejaam (DLR)</string>
+    <string name="type.railway.station.light_rail.porto">Kergraudtee jaam</string>
+    <string name="type.railway.station.monorail">Monorelstee jaam</string>
+    <string name="type.railway.station.subway">Metroojaam</string>
+    <string name="type.railway.station.subway.adana">Metroojaam</string>
+    <string name="type.railway.station.subway.algiers">Metroojaam</string>
+    <string name="type.railway.station.subway.almaty">Metroojaam</string>
+    <string name="type.railway.station.subway.amsterdam">Metroojaam</string>
+    <string name="type.railway.station.subway.ankara">Metroojaam</string>
+    <string name="type.railway.station.subway.athens">Metroojaam</string>
+    <string name="type.railway.station.subway.baku">Metroojaam</string>
+    <string name="type.railway.station.subway.bangkok">Metroojaam</string>
+    <string name="type.railway.station.subway.barcelona">Metroojaam</string>
+    <string name="type.railway.station.subway.beijing">Metroojaam</string>
+    <string name="type.railway.station.subway.bengalore">Metroojaam</string>
+    <string name="type.railway.station.subway.berlin">Metroojaam</string>
+    <string name="type.railway.station.subway.bilbao">Metroojaam</string>
+    <string name="type.railway.station.subway.brasilia">Metroojaam</string>
+    <string name="type.railway.station.subway.brescia">Metroojaam</string>
+    <string name="type.railway.station.subway.brussels">Metroojaam</string>
+    <string name="type.railway.station.subway.bucharest">Metroojaam</string>
+    <string name="type.railway.station.subway.budapest">Metroojaam</string>
+    <string name="type.railway.station.subway.buenos_aires">Metroojaam</string>
+    <string name="type.railway.station.subway.bursa">Metroojaam</string>
+    <string name="type.railway.station.subway.cairo">Metroojaam</string>
+    <string name="type.railway.station.subway.caracas">Metroojaam</string>
+    <string name="type.railway.station.subway.catania">Metroojaam</string>
+    <string name="type.railway.station.subway.changchun">Metroojaam</string>
+    <string name="type.railway.station.subway.chengdu">Metroojaam</string>
+    <string name="type.railway.station.subway.chicago">Metroojaam</string>
+    <string name="type.railway.station.subway.chongqing">Metroojaam</string>
+    <string name="type.railway.station.subway.dalian">Metroojaam</string>
+    <string name="type.railway.station.subway.delhi">Metroojaam</string>
+    <string name="type.railway.station.subway.dnepro">Metroojaam</string>
+    <string name="type.railway.station.subway.dubai">Metroojaam</string>
+    <string name="type.railway.station.subway.ekb">Metroojaam</string>
+    <string name="type.railway.station.subway.fukuoka">Metroojaam</string>
+    <string name="type.railway.station.subway.glasgow">Metroojaam</string>
+    <string name="type.railway.station.subway.guangzhou">Metroojaam</string>
+    <string name="type.railway.station.subway.hamburg">Metroojaam</string>
+    <string name="type.railway.station.subway.helsinki">Metroojaam</string>
+    <string name="type.railway.station.subway.hiroshima">Metroojaam</string>
+    <string name="type.railway.station.subway.hongkong">Metroojaam</string>
+    <string name="type.railway.station.subway.isfahan">Metroojaam</string>
+    <string name="type.railway.station.subway.istanbul">Metroojaam</string>
+    <string name="type.railway.station.subway.izmir">Metroojaam</string>
+    <string name="type.railway.station.subway.kazan">Metroojaam</string>
+    <string name="type.railway.station.subway.kharkiv">Metroojaam</string>
+    <string name="type.railway.station.subway.kiev">Metroojaam</string>
+    <string name="type.railway.station.subway.kobe">Metroojaam</string>
+    <string name="type.railway.station.subway.kolkata">Metroojaam</string>
+    <string name="type.railway.station.subway.kunming">Metroojaam</string>
+    <string name="type.railway.station.subway.kyoto">Metroojaam</string>
+    <string name="type.railway.station.subway.la">Metroojaam</string>
+    <string name="type.railway.station.subway.lausanne">Metroojaam</string>
+    <string name="type.railway.station.subway.lille">Metroojaam</string>
+    <string name="type.railway.station.subway.lima">Metroojaam</string>
+    <string name="type.railway.station.subway.lisboa">Metroojaam</string>
+    <string name="type.railway.station.subway.london">Metroojaam</string>
+    <string name="type.railway.station.subway.lyon">Metroojaam</string>
+    <string name="type.railway.station.subway.madrid">Metroojaam</string>
+    <string name="type.railway.station.subway.malaga">Metroojaam</string>
+    <string name="type.railway.station.subway.manila">Metroojaam</string>
+    <string name="type.railway.station.subway.maracaibo">Metroojaam</string>
+    <string name="type.railway.station.subway.mashhad">Metroojaam</string>
+    <string name="type.railway.station.subway.mecca">Metroojaam</string>
+    <string name="type.railway.station.subway.medellin">Metroojaam</string>
+    <string name="type.railway.station.subway.mexico">Metroojaam</string>
+    <string name="type.railway.station.subway.milan">Metroojaam</string>
+    <string name="type.railway.station.subway.minsk">Metroojaam</string>
+    <string name="type.railway.station.subway.montreal">Metroojaam</string>
+    <string name="type.railway.station.subway.moscow">Metroojaam</string>
+    <string name="type.railway.station.subway.munchen">Metroojaam</string>
+    <string name="type.railway.station.subway.nagoya">Metroojaam</string>
+    <string name="type.railway.station.subway.newyork">Metroojaam</string>
+    <string name="type.railway.station.subway.nnov">Metroojaam</string>
+    <string name="type.railway.station.subway.novosibirsk">Metroojaam</string>
+    <string name="type.railway.station.subway.osaka">Metroojaam</string>
+    <string name="type.railway.station.subway.oslo">Metroojaam</string>
+    <string name="type.railway.station.subway.palma">Metroojaam</string>
+    <string name="type.railway.station.subway.panama">Metroojaam</string>
+    <string name="type.railway.station.subway.paris">Metroojaam</string>
+    <string name="type.railway.station.subway.philadelphia">Metroojaam</string>
+    <string name="type.railway.station.subway.pyongyang">Metroojaam</string>
+    <string name="type.railway.station.subway.rennes">Metroojaam</string>
+    <string name="type.railway.station.subway.rio">Metroojaam</string>
+    <string name="type.railway.station.subway.roma">Metroojaam</string>
+    <string name="type.railway.station.subway.rotterdam">Metroojaam</string>
+    <string name="type.railway.station.subway.samara">Metroojaam</string>
+    <string name="type.railway.station.subway.santiago">Metroojaam</string>
+    <string name="type.railway.station.subway.santo_domingo">Metroojaam</string>
+    <string name="type.railway.station.subway.saopaulo">Metroojaam</string>
+    <string name="type.railway.station.subway.sapporo">Metroojaam</string>
+    <string name="type.railway.station.subway.sendai">Metroojaam</string>
+    <string name="type.railway.station.subway.sf">Metroojaam</string>
+    <string name="type.railway.station.subway.shanghai">Metroojaam</string>
+    <string name="type.railway.station.subway.shenzhen">Metroojaam</string>
+    <string name="type.railway.station.subway.shiraz">Metroojaam</string>
+    <string name="type.railway.station.subway.singapore">Metroojaam</string>
+    <string name="type.railway.station.subway.sofia">Metroojaam</string>
+    <string name="type.railway.station.subway.spb">Metroojaam</string>
+    <string name="type.railway.station.subway.stockholm">Metroojaam</string>
+    <string name="type.railway.station.subway.tabriz">Metroojaam</string>
+    <string name="type.railway.station.subway.taipei">Metroojaam</string>
+    <string name="type.railway.station.subway.taoyuan">Metroojaam</string>
+    <string name="type.railway.station.subway.tashkent">Metroojaam</string>
+    <string name="type.railway.station.subway.tbilisi">Metroojaam</string>
+    <string name="type.railway.station.subway.tehran">Metroojaam</string>
+    <string name="type.railway.station.subway.tianjin">Metroojaam</string>
+    <string name="type.railway.station.subway.tokyo">Metroojaam</string>
+    <string name="type.railway.station.subway.valencia">Metroojaam</string>
+    <string name="type.railway.station.subway.vienna">Metroojaam</string>
+    <string name="type.railway.station.subway.warszawa">Metroojaam</string>
+    <string name="type.railway.station.subway.washington">Metroojaam</string>
+    <string name="type.railway.station.subway.wuhan">Metroojaam</string>
+    <string name="type.railway.station.subway.yerevan">Metroojaam</string>
+    <string name="type.railway.station.subway.yokohama">Metroojaam</string>
     <string name="type.railway.subway">Metrooliin</string>
-    <string name="type.railway.subway.bridge">Metrooliin - sild</string>
-    <string name="type.railway.subway.tunnel">Metrooliin - tunnel</string>
+    <string name="type.railway.subway.bridge">Metrooliini sild</string>
+    <string name="type.railway.subway.tunnel">Metrooliini tunnel</string>
     <string name="type.railway.subway_entrance">Metroo sissepääs</string>
     <string name="type.railway.subway_entrance.adana">Metroo sissepääs</string>
     <string name="type.railway.subway_entrance.algiers">Metroo sissepääs</string>
@@ -1099,96 +1099,96 @@
     <string name="type.railway.tram.bridge">Trammiliini sild</string>
     <string name="type.railway.tram.tunnel">Trammiliini tunnel</string>
     <string name="type.railway.tram_stop">Trammipeatus</string>
-    <string name="type.route">Tee</string>
-    <string name="type.route.ferry">Praam</string>
+    <string name="type.route">Marsruut</string>
+    <string name="type.route.ferry">Praamiliin</string>
     <string name="type.shop">Pood</string>
     <string name="type.shop.alcohol">Alkoholipood</string>
     <string name="type.shop.bakery">Pagar</string>
     <string name="type.shop.bathroom_furnishing">Vannitoa sisustus</string>
     <string name="type.shop.beauty">Ilupood</string>
-    <string name="type.shop.beverages">Joogid</string>
+    <string name="type.shop.beverages">Joogipood</string>
     <string name="type.shop.bicycle">Jalgrattapood</string>
     <string name="type.shop.bookmaker">Kihlveokontor</string>
     <string name="type.shop.books">Raamatupood</string>
     <string name="type.shop.butcher">Lihunik</string>
     <string name="type.shop.cannabis">Kanepipood</string>
     <string name="type.shop.car">Autopood</string>
-    <string name="type.shop.car_parts">Autovaruosad</string>
+    <string name="type.shop.car_parts">Autovaruosade pood</string>
     <string name="type.shop.car_repair">Autoremonditöökoda</string>
     <string name="type.shop.car_repair.tyres">Rehviparandus</string>
     <string name="type.shop.caravan">Haagiselamute müük</string>
-    <string name="type.shop.carpet">Vaibad</string>
-    <string name="type.shop.chemist">Apteegipood</string>
+    <string name="type.shop.carpet">Vaibapood</string>
+    <string name="type.shop.chemist">Apteek ja ilupood</string>
     <string name="type.shop.chocolate">Šokolaadipood</string>
     <string name="type.shop.clothes">Rõivapood</string>
     <string name="type.shop.coffee">Kohvipood</string>
     <string name="type.shop.computer">Arvutipood</string>
-    <string name="type.shop.confectionery">Maiustused</string>
+    <string name="type.shop.confectionery">Kommipood</string>
     <string name="type.shop.convenience">Lähikauplus</string>
-    <string name="type.shop.copyshop">Koopiapood</string>
-    <string name="type.shop.cosmetics">Kosmeetika</string>
-    <string name="type.shop.curtain">Kardinad</string>
+    <string name="type.shop.copyshop">Koopiateenused</string>
+    <string name="type.shop.cosmetics">Kosmeetikapood</string>
+    <string name="type.shop.curtain">Kardinapood</string>
     <string name="type.shop.deli">Delikatessipood</string>
     <string name="type.shop.department_store">Kaubamaja</string>
     <string name="type.shop.doityourself">Tööriistapood</string>
-    <string name="type.shop.dry_cleaning">Keemiline pesu</string>
-    <string name="type.shop.electronics">Elektroonika</string>
+    <string name="type.shop.dry_cleaning">Keemiline puhastus</string>
+    <string name="type.shop.electronics">Elektroonikapood</string>
     <string name="type.shop.erotic">Erootikapood</string>
-    <string name="type.shop.fabric">Vabrikupood</string>
+    <string name="type.shop.fabric">Kangapood</string>
     <string name="type.shop.farm">Talutoitude pood</string>
-    <string name="type.shop.fashion_accessories">Moodsad aksessuaarid</string>
+    <string name="type.shop.fashion_accessories">Moeaksessuaaride pood</string>
     <string name="type.shop.florist">Lillepood</string>
-    <string name="type.shop.funeral_directors">Matusekorraldajad</string>
+    <string name="type.shop.funeral_directors">Matusekorraldaja</string>
     <string name="type.shop.furniture">Mööblipood</string>
-    <string name="type.shop.garden_centre">Aianduspood</string>
-    <string name="type.shop.gas">Gaasipood</string>
+    <string name="type.shop.garden_centre">Aianduskeskus</string>
+    <string name="type.shop.gas">Balloongaasi kauplus</string>
     <string name="type.shop.gift">Kingipood</string>
-    <string name="type.shop.greengrocer">Köögiviljapood</string>
-    <string name="type.shop.grocery">Toidukaubad</string>
+    <string name="type.shop.greengrocer">Puu- ja köögiviljapood</string>
+    <string name="type.shop.grocery">Toidukauplus</string>
     <string name="type.shop.hairdresser">Juuksur</string>
-    <string name="type.shop.hardware">Isetegemise tööriistad</string>
-    <string name="type.shop.health_food">Tervisetoitude pood</string>
-    <string name="type.shop.hearing_aids">Kuuldeaparaadi kauplus</string>
-    <string name="type.shop.herbalist">Maitsetaimede pood</string>
-    <string name="type.shop.hifi">HiFi heli</string>
-    <string name="type.shop.houseware">Majatarbed</string>
-    <string name="type.shop.jewelry">Ehted</string>
+    <string name="type.shop.hardware">Rauakauplus</string>
+    <string name="type.shop.health_food">Tervisliku toidu kauplus</string>
+    <string name="type.shop.hearing_aids">Kuuldeaparaatide kauplus</string>
+    <string name="type.shop.herbalist">Ravimtaimede pood</string>
+    <string name="type.shop.hifi">Hifi kauplus</string>
+    <string name="type.shop.houseware">Kodutarvete kauplus</string>
+    <string name="type.shop.jewelry">Ehtepood</string>
     <string name="type.shop.kiosk">Kiosk</string>
-    <string name="type.shop.kitchen">Köögipood</string>
-    <string name="type.shop.laundry">Pesu</string>
+    <string name="type.shop.kitchen">Köögimööblikauplus</string>
+    <string name="type.shop.laundry">Pesumaja</string>
     <string name="type.shop.mall">Kaubanduskeskus</string>
     <string name="type.shop.massage">Massaažisalong</string>
-    <string name="type.shop.mobile_phone">Mobiiltelefonid</string>
-    <string name="type.shop.money_lender">Rahalaenutaja</string>
+    <string name="type.shop.mobile_phone">Mobiiltelefonipood</string>
+    <string name="type.shop.money_lender">Kiirlaenukontor</string>
     <string name="type.shop.motorcycle">Mootorrattapood</string>
     <string name="type.shop.motorcycle_repair">Mootorrataste remont</string>
     <string name="type.shop.music">Plaadipood</string>
-    <string name="type.shop.musical_instrument">Muusikariistad</string>
-    <string name="type.shop.newsagent">Ajalehe stend</string>
-    <string name="type.shop.optician">Optik</string>
-    <string name="type.shop.outdoor">Välisvarustus</string>
-    <string name="type.shop.outpost">Vastuvõtupunkt</string>
-    <string name="type.shop.pasta">Pasta pood</string>
-    <string name="type.shop.pastry">Pagar</string>
+    <string name="type.shop.musical_instrument">Muusikariistade pood</string>
+    <string name="type.shop.newsagent">Ajalehekiosk</string>
+    <string name="type.shop.optician">Optikapood</string>
+    <string name="type.shop.outdoor">Matkatarvete kauplus</string>
+    <string name="type.shop.outpost">Veebikaubamaja teeninduslett</string>
+    <string name="type.shop.pasta">Pastapood</string>
+    <string name="type.shop.pastry">Pagari- ja kondiitriäri</string>
     <string name="type.shop.pawnbroker">Pandimaja</string>
     <string name="type.shop.pet">Lemmikloomapood</string>
-    <string name="type.shop.pet_grooming">Lemmikloomade hooldamine</string>
+    <string name="type.shop.pet_grooming">Ilusalong lemmikloomadele</string>
     <string name="type.shop.photo">Fotopood</string>
-    <string name="type.shop.rental">Laenutuspood</string>
+    <string name="type.shop.rental">Renditeenuse büroo</string>
     <string name="type.shop.rental.bicycle">Jalgrattalaenutus</string>
     <string name="type.shop.seafood">Mereandide pood</string>
-    <string name="type.shop.second_hand">Taaskasutus</string>
+    <string name="type.shop.second_hand">Taaskasutuspood</string>
     <string name="type.shop.shoes">Kingapood</string>
-    <string name="type.shop.sports">Sporditarbed</string>
-    <string name="type.shop.stationery">Kontoritarbed</string>
+    <string name="type.shop.sports">Sporditarvete pood</string>
+    <string name="type.shop.stationery">Kontoritarvete pood</string>
     <string name="type.shop.supermarket">Supermarket</string>
     <string name="type.shop.tattoo">Tätoveerimissalong</string>
     <string name="type.shop.tea">Teepood</string>
-    <string name="type.shop.ticket">Piletipood</string>
+    <string name="type.shop.ticket">Piletikassa</string>
     <string name="type.shop.toys">Mänguasjapood</string>
     <string name="type.shop.travel_agency">Reisibüroo</string>
     <string name="type.shop.tyres">Rehvipood</string>
-    <string name="type.shop.variety_store">Odavpood</string>
+    <string name="type.shop.variety_store">Odavkaupade pood</string>
     <string name="type.shop.video">Videopood</string>
     <string name="type.shop.video_games">Videomängude pood</string>
     <string name="type.shop.wine">Veinipood</string>
@@ -1204,21 +1204,21 @@
     <string name="type.shop.charity">Heategevuspood</string>
     <string name="type.shop.cheese">Juustupood</string>
     <string name="type.shop.craft">Kunst ja käsitöö</string>
-    <string name="type.shop.dairy">Piimatooted</string>
+    <string name="type.shop.dairy">Piimatoodete pood</string>
     <string name="type.shop.electrical">Elektritarvete pood</string>
     <string name="type.shop.fishing">Kalanduspood</string>
-    <string name="type.shop.interior_decoration">Sisekujunduse kaunistused</string>
-    <string name="type.shop.lottery">Loteriipiletid</string>
-    <string name="type.shop.medical_supply">Meditsiinitarbed</string>
-    <string name="type.shop.nutrition_supplements">Toidulisandid</string>
-    <string name="type.shop.paint">Värvid</string>
-    <string name="type.shop.perfumery">Parfümeeria</string>
-    <string name="type.shop.sewing">Õmblustarbed</string>
-    <string name="type.shop.storage_rental">Ladustuse rent</string>
-    <string name="type.shop.tobacco">Tubakas</string>
-    <string name="type.shop.trade">Kaubandustarvikud</string>
-    <string name="type.shop.watches">Kellad</string>
-    <string name="type.shop.wholesale">Hulgimüügi pood</string>
+    <string name="type.shop.interior_decoration">Sisekujunduskauplus</string>
+    <string name="type.shop.lottery">Lotokiosk</string>
+    <string name="type.shop.medical_supply">Meditsiinitarvikute kauplus</string>
+    <string name="type.shop.nutrition_supplements">Toidulisandite kauplus</string>
+    <string name="type.shop.paint">Värvipood</string>
+    <string name="type.shop.perfumery">Parfümeeriapood</string>
+    <string name="type.shop.sewing">Õmblustarvete pood</string>
+    <string name="type.shop.storage_rental">Väike rendiladu</string>
+    <string name="type.shop.tobacco">Tubakapood</string>
+    <string name="type.shop.trade">Profikaupade pood</string>
+    <string name="type.shop.watches">Kellapood</string>
+    <string name="type.shop.wholesale">Hulgimüügipood</string>
     <string name="type.sport">Sport</string>
     <string name="type.sport.american_football">Ameerika jalgpall</string>
     <string name="type.sport.archery">Vibulaskmine</string>
@@ -1230,7 +1230,7 @@
     <string name="type.sport.bowls">Murukeegel</string>
     <string name="type.sport.chess">Male</string>
     <string name="type.sport.cricket">Kriket</string>
-    <string name="type.sport.curling">Kurling</string>
+    <string name="type.sport.curling">Jääkeegel</string>
     <string name="type.sport.equestrian">Ratsasport</string>
     <string name="type.sport.golf">Golf</string>
     <string name="type.sport.gymnastics">Võimlemine</string>
@@ -1238,7 +1238,7 @@
     <string name="type.sport.multi">Erinevad spordialad</string>
     <!-- Used to tag a scuba diving site. -->
     <string name="type.sport.scuba_diving">Sukeldusmiskoht</string>
-    <string name="type.sport.shooting">Laskmine</string>
+    <string name="type.sport.shooting">Laskesport</string>
     <string name="type.sport.skateboard">Rulasõit</string>
     <string name="type.sport.skiing">Suusatamine</string>
     <string name="type.sport.soccer">Jalgpall</string>
@@ -1246,98 +1246,98 @@
     <string name="type.sport.table_tennis">Lauatennis</string>
     <string name="type.sport.tennis">Tenniseväljak</string>
     <string name="type.sport.volleyball">Võrkpall</string>
-    <string name="type.sport.10pin">Bowling</string>
-    <string name="type.sport.9pin">Bowling</string>
+    <string name="type.sport.10pin">Hobikeegel</string>
+    <string name="type.sport.9pin">Keegel</string>
     <string name="type.sport.padel">Padel</string>
-    <string name="type.sport.futsal">Futsal</string>
+    <string name="type.sport.futsal">Saalijalgpall</string>
     <string name="type.sport.ice_hockey">Jäähoki</string>
     <string name="type.sport.field_hockey">Maahoki</string>
-    <string name="type.sport.badminton">Badminton</string>
+    <string name="type.sport.badminton">Sulgpall</string>
     <string name="type.sport.pelota">Baski pelota</string>
     <string name="type.tourism">Turism</string>
     <string name="type.tourism.aquarium">Akvaarium</string>
     <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
     <string name="type.tourism.alpine_hut">Mägimajake</string>
-    <string name="type.tourism.apartment">Puhkuse korter</string>
+    <string name="type.tourism.apartment">Külaliskorter</string>
     <string name="type.tourism.artwork">Kunstiteos</string>
     <string name="type.tourism.artwork.architecture">Kunstiteos - arhitektuur</string>
-    <string name="type.tourism.artwork.painting">Kunstiteos - maal</string>
-    <string name="type.tourism.artwork.sculpture">Kunstiteos - skulptuur</string>
-    <string name="type.tourism.artwork.statue">Kunstiteos - kuju</string>
+    <string name="type.tourism.artwork.painting">Maal</string>
+    <string name="type.tourism.artwork.sculpture">Skulptuur</string>
+    <string name="type.tourism.artwork.statue">Kuju</string>
     <string name="type.tourism.attraction">Turismiatraktsioon</string>
-    <string name="type.attraction.amusement_ride">Lõbustus Ride</string>
+    <string name="type.attraction.amusement_ride">Lõbusõidu atraktsioon</string>
     <string name="type.attraction.animal">Loomade aedik</string>
     <string name="type.attraction.carousel">Karussell</string>
     <string name="type.attraction.historic">Ajalooline vaatamisväärsus</string>
     <string name="type.attraction.maze">Labürint</string>
-    <string name="type.attraction.roller_coaster">Vuoristorata</string>
+    <string name="type.attraction.roller_coaster">Ameerika mäed</string>
     <string name="type.attraction.water_slide">Vesiliug</string>
     <string name="type.tourism.attraction.specified">Turismiatraktsioon</string>
-    <string name="type.tourism.camp_site">Telkimine</string>
+    <string name="type.tourism.camp_site">Kämpinguala</string>
     <string name="type.tourism.caravan_site">Haagiselamute park</string>
     <!-- A rentable countryside vacation house. -->
     <string name="type.tourism.chalet">Puhkemaja</string>
-    <string name="type.tourism.gallery">Galerii</string>
+    <string name="type.tourism.gallery">Kunstigalerii</string>
     <string name="type.tourism.guest_house">Külalistemaja</string>
     <string name="type.tourism.hostel">Hostel</string>
     <string name="type.tourism.hotel">Hotell</string>
-    <string name="type.tourism.information">Turistiinfo</string>
+    <string name="type.tourism.information">Turismiinfo</string>
     <string name="type.tourism.information.board">Infotahvel</string>
-    <string name="type.tourism.information.guidepost">Juhtpost</string>
-    <string name="type.tourism.information.map">Turistikaart</string>
-    <string name="type.tourism.information.office">Turismiinfo</string>
+    <string name="type.tourism.information.guidepost">Teeviit</string>
+    <string name="type.tourism.information.map">Infotahvel kaardiga</string>
+    <string name="type.tourism.information.office">Turismiinfo kontor</string>
     <string name="type.tourism.information.visitor_centre">Külastuskeskus</string>
     <string name="type.tourism.motel">Motell</string>
     <string name="type.tourism.museum">Muuseum</string>
     <string name="type.tourism.picnic_site">Piknikukoht</string>
     <string name="type.leisure.resort">Kuurort</string>
     <string name="type.tourism.theme_park">Teemapark</string>
-    <string name="type.tourism.viewpoint">Vaatluskoht</string>
+    <string name="type.tourism.viewpoint">Vaatekoht</string>
     <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
-    <string name="type.tourism.wilderness_hut">Loodusonn</string>
+    <string name="type.tourism.wilderness_hut">Kõnnumaa ulualune</string>
     <string name="type.tourism.zoo">Loomaaed</string>
-    <string name="type.tourism.zoo.petting">Lemmikloomaaed</string>
+    <string name="type.tourism.zoo.petting">Loomade seltsiaed</string>
     <string name="type.traffic_calming">Liikluse rahustamine</string>
-    <string name="type.traffic_calming.bump">Liiklusee aeglustusmühk</string>
-    <string name="type.traffic_calming.hump">Liikluse aeglustussaar</string>
+    <string name="type.traffic_calming.bump">Kiirusepiiraja</string>
+    <string name="type.traffic_calming.hump">Liikluskünnis</string>
     <string name="type.waterway">Veetee</string>
     <string name="type.waterway.canal">Kanal</string>
-    <string name="type.waterway.canal.tunnel">Kanal</string>
-    <string name="type.waterway.fish_pass">Kala redel</string>
+    <string name="type.waterway.canal.tunnel">Kanal tunnelis</string>
+    <string name="type.waterway.fish_pass">Kalatrepp</string>
     <string name="type.waterway.dam">Tamm</string>
     <string name="type.barrier.ditch">Kraav</string>
     <string name="type.natural.water.ditch">Drenaažikraav</string>
-    <string name="type.waterway.ditch.tunnel">Truupp</string>
-    <string name="type.waterway.dock">Veetee dokk</string>
+    <string name="type.waterway.ditch.tunnel">Truup</string>
+    <string name="type.waterway.dock">Dokk</string>
     <string name="type.waterway.drain">Kuivenduskraav</string>
     <string name="type.natural.water.drain">Kuivenduskraav</string>
-    <string name="type.waterway.drain.tunnel">Truupp</string>
-    <string name="type.waterway.lock_gate">Lüüsi värav</string>
+    <string name="type.waterway.drain.tunnel">Truup</string>
+    <string name="type.waterway.lock_gate">Lüüsivärav</string>
     <string name="type.waterway.river">Jõgi</string>
-    <string name="type.waterway.river.tunnel">Jõgi</string>
+    <string name="type.waterway.river.tunnel">Jõgi tunnelis</string>
     <string name="type.waterway.stream">Oja</string>
-    <string name="type.waterway.stream.ephemeral">Jõgi</string>
-    <string name="type.waterway.stream.intermittent">Jõgi</string>
-    <string name="type.waterway.stream.tunnel">Oja</string>
+    <string name="type.waterway.stream.ephemeral">Väga ajutine jõgi</string>
+    <string name="type.waterway.stream.intermittent">Ajutine jõgi</string>
+    <string name="type.waterway.stream.tunnel">Oja tunnelis</string>
     <string name="type.waterway.waterfall">Kosk</string>
-    <string name="type.waterway.weir">Pais</string>
+    <string name="type.waterway.weir">Ülevoolupais</string>
     <string name="type.wheelchair">Ratastool</string>
-    <string name="type.wheelchair.limited">Piiratud ratastooliga ligipääs</string>
-    <string name="type.wheelchair.no">Puudub ratastooliga ligipääs</string>
-    <string name="type.wheelchair.yes">Täielik ratastooli ligipääs</string>
-    <string name="type.aerialway.j.bar">Slepplift</string>
-    <string name="type.aerialway.magic_carpet">Võluvaip</string>
-    <string name="type.aerialway.platter">Plaatlift</string>
-    <string name="type.aerialway.rope_tow">Köislift</string>
-    <string name="type.aerialway.t.bar">Ankurlift</string>
+    <string name="type.wheelchair.limited">Piiratud ligipääs ratastooliga</string>
+    <string name="type.wheelchair.no">Puudub ligipääs ratastooliga</string>
+    <string name="type.wheelchair.yes">Täielik ligipääs ratastooliga</string>
+    <string name="type.aerialway.j.bar">J-kinnitusega Slepplift</string>
+    <string name="type.aerialway.magic_carpet">Suusaeskalaator</string>
+    <string name="type.aerialway.platter">Isteplaadikesega lift</string>
+    <string name="type.aerialway.rope_tow">Vedukköis</string>
+    <string name="type.aerialway.t.bar">T-kinnitusega Slepplift</string>
     <string name="type.piste_type.downhill">Mäesuusarada</string>
     <string name="type.piste_type.downhill.area">Mäesuusarada</string>
-    <string name="type.piste_type.downhill.advanced">Raske laskumine</string>
-    <string name="type.piste_type.downhill.advanced.area">Raske laskumine</string>
-    <string name="type.piste_type.downhill.easy">Kerge laskumine</string>
-    <string name="type.piste_type.downhill.easy.area">Kerge laskumine</string>
-    <string name="type.piste_type.downhill.expert">Professionaalne laskumine</string>
-    <string name="type.piste_type.downhill.expert.area">Professionaalne laskumine</string>
+    <string name="type.piste_type.downhill.advanced">Keerukas mäesuusarada</string>
+    <string name="type.piste_type.downhill.advanced.area">Keerukas mäesuusarada</string>
+    <string name="type.piste_type.downhill.easy">Lihtne mäesuusarada</string>
+    <string name="type.piste_type.downhill.easy.area">Lihtne mäesuusarada</string>
+    <string name="type.piste_type.downhill.expert">Proffide mäesuusarada</string>
+    <string name="type.piste_type.downhill.expert.area">Proffide mäesuusarada</string>
     <string name="type.piste_type.downhill.freeride">Tasuta mäesuusatamine</string>
     <string name="type.piste_type.downhill.intermediate">Keskmise raskusastmega laskumine</string>
     <string name="type.piste_type.downhill.intermediate.area">Keskmise raskusastmega laskumine</string>
@@ -1346,29 +1346,52 @@
     <string name="type.piste_type.nordic">Murdmaa suusarada</string>
     <string name="type.piste_type.sled">Kelgurada</string>
     <string name="type.piste_type.sled.area">Kelgurada</string>
-    <string name="type.piste_type.snow_park">Snow Park</string>
-    <string name="type.piste_type.hike">Lumi matkarada</string>
-    <string name="type.piste_type.connection">Piste ühendus</string>
-    <string name="type.piste_type.skitour">Skituuri rada</string>
+    <string name="type.piste_type.snow_park">Lumepark</string>
+    <string name="type.piste_type.hike">Matkarada lumes matkamiseks</string>
+    <string name="type.piste_type.connection">Suusatõstukite ümberistumisjaam</string>
+    <string name="type.piste_type.skitour">Suusamatkarada</string>
     <string name="type.amenity.events_venue">Ürituste toimumiskoht</string>
-    <string name="type.shop.auction">Oksjon</string>
+    <string name="type.shop.auction">Oksjonimaja</string>
     <string name="type.shop.collector">Kollektsioneeritavad esemed</string>
     <string name="type.self_service.yes">Iseteenindus saadaval</string>
     <string name="type.self_service.only">Ainult iseteenindus</string>
     <string name="type.self_service.partially">Osaline iseteenindus</string>
     <string name="type.self_service.no">Iseteenindus puudub</string>
     <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
-    <string name="type.amenity.social_facility">Sotsiaalne rajatis</string>
+    <string name="type.amenity.social_facility">Sotsiaalasutus</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
     <string name="type.emergency.emergency_ward_entrance">Erakorralise meditsiini osakonna sissepääs</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Dojo</string>
+    <string name="type.amenity.dojo">Dōjō / Võitluskunstide kool</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Spordisaal</string>
     <string name="type.power.pole">Elektripost</string>
     <string name="type.amenity.shelter.lean_to">Poolvarikatus</string>
     <string name="type.attraction.big_wheel">Vaateratas</string>
     <string name="type.man_made.utility_pole">Valgustus- või sidepost</string>
-    <string name="type.attraction.bumper_car">Põrkavad elektriautod</string>
+    <string name="type.attraction.bumper_car">Autodroom</string>
     <string name="type.fee.yes">$ / €</string>
+    <string name="type.leisure.hackerspace">Häkkerite ühisruum</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
 </resources>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index e527206bd1..05edb83b0a 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -864,4 +864,6 @@
     <string name="core_placepage_unknown_place">Punkts kartē</string>
     <string name="nav_auto">Automātisks navigācijas laikā</string>
     <string name="start_track_recording">Ierakstīt ceļu</string>
+    <string name="stop_track_recording">Apstādināt ierakstīšanu</string>
+    <string name="stop_without_saving">Pārtraukt ierakstīšanu</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index 0e5410d0e5..d2e92c9a50 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -108,7 +108,6 @@
     <string name="type.amenity.prison">Prisão</string>
     <string name="type.amenity.pub">Bar ou boteco</string>
     <string name="type.amenity.public_bookcase">Biblioteca livre</string>
-
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
     <string name="type.amenity.recycling">Contêiner de reciclagem</string>
@@ -321,7 +320,6 @@
     <string name="type.healthcare.psychotherapist">Psicoterapia</string>
     <string name="type.healthcare.sample_collection">Amostragem</string>
     <string name="type.healthcare.speech_therapist">Terapia da fala</string>
-
     <!-- SECTION: Types: Roads -->
     <string name="type.highway">Rodovia</string>
     <string name="type.highway.bridleway">Caminho para cavaleiros</string>
@@ -485,7 +483,6 @@
     <string name="type.area_highway.track">Pista para desportos não motorizados</string>
     <string name="type.area_highway.trunk">Via expressa</string>
     <string name="type.area_highway.unclassified">Estrada sem classificação</string>
-
     <!-- SECTION: Types: Historic -->
     <string name="type.historic.aircraft">Aeronaves Históricas</string>
     <string name="type.historic.anchor">Âncora Histórica</string>
@@ -1111,4 +1108,6 @@
     <string name="type.emergency.emergency_ward_entrance">Entrada da ala de emergência</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Salão de esportes</string>
+    <string name="type.power.pole">Poste de eletricidade</string>
+    <string name="type.man_made.utility_pole">Poste</string>
 </resources>
diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml
index 9905757b2f..4f2cd3d2ac 100644
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -129,7 +129,6 @@
     <string name="type.amenity.prison">В\'язниця</string>
     <string name="type.amenity.pub">Паб</string>
     <string name="type.amenity.public_bookcase">Книгообмін</string>
-
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Прийом вторсировини</string>
     <string name="type.amenity.recycling">Контейнер для вторсировини</string>
@@ -369,7 +368,6 @@
     <string name="type.healthcare.psychotherapist">Психотерапія</string>
     <string name="type.healthcare.sample_collection">Збір аналізів</string>
     <string name="type.healthcare.speech_therapist">Логопедія</string>
-
     <!-- SECTION: Types: Roads -->
     <string name="type.highway">Дорога</string>
     <string name="type.highway.bridleway">Кінна доріжка</string>
@@ -535,7 +533,6 @@
     <string name="type.area_highway.track">Ґрунтівка</string>
     <string name="type.area_highway.trunk">Траса</string>
     <string name="type.area_highway.unclassified">Невелика дорога</string>
-
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Історичний об\'єкт</string>
     <string name="type.historic.aircraft">Історичний літак</string>
@@ -1363,4 +1360,16 @@
     <string name="type.amenity.dojo">Додзьо</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Спортивний зал</string>
+    <string name="type.emergency">Швидка</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.barrier.retaining_wall">Підпірна стіна</string>
+    <string name="type.fee.yes">$</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.barrier.hedge">Жива огорожа</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.highway.world_level">highway-world_level</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/af.lproj/InfoPlist.strings
index 014ed184f9..b6954fca92 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/InfoPlist.strings
@@ -1,8 +1,4 @@
 
-
-/********** 3d touch strings **********/
-
-
 /* Used in home screen quick actions. */
 "search" = "Search";
 
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
index 27f3763c59..0c8f42dd59 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -154,10 +154,6 @@
 
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Karavaanfasiliteite";
-
-
-/********** Other translations **********/
-
 "share_bookmarks_email_body" = "Hallo!\n\nMy boekmerke is aangeheg; open dit asb. in Organic Maps. Indien dit nie geïnstalleer is nie, kan u dit hier aflaai: https://omaps.app/get?kmz\n\nGeniet dit om met Organic Maps te reis!";
 
 /* message title of loading file */
@@ -414,10 +410,6 @@
 
 /* blue gray color */
 "blue_gray" = "Blougrys";
-
-
-/********** Routing dialogs strings **********/
-
 "dialog_routing_disclaimer_title" = "Wanneer u die roete volg, hou asb. die volgende in gedagte:";
 "dialog_routing_disclaimer_priority" = "– Padtoestande, verkeersreëls en padtekens neem kry voorkeur bo die navigasiewenke;";
 "dialog_routing_disclaimer_precision" = "– Die kaart kan onakkuraat wees en die voorgestelde roete is dalk nie die mees optimale manier om die bestemming te bereik nie;";
@@ -447,10 +439,6 @@
 "dialog_routing_download_and_build_cross_route" = "Wil u die kaart aflaai en ’n meer optimale roete bereken wat oor meer as een kaart loop?";
 "dialog_routing_download_cross_route" = "Laai bykomende kaarte af om ’n beter roete te bereken wat die grense van hierdie kaart oorskry.";
 
-
-/********** Strings for downloading map from search **********/
-
-
 /* «Show» context menu */
 "show" = "Toon";
 
@@ -875,10 +863,6 @@
 "moreyear_ago_sorttype" = "Meer as ’n jaar gelede";
 "near_me_sorttype" = "Naby my";
 "others_sorttype" = "Ander";
-
-
-/********** Bookmark types used for sorting **********/
-
 "food_places" = "Kos";
 "tourist_places" = "Besienswaardighede";
 "museums" = "Museums";
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.stringsdict
index 06e13d8423..12f3e70c11 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -19,7 +16,6 @@
 			<string>%d bookmarks</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -34,7 +30,6 @@
 			<string>%d files were found. You can see them after conversion.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -45,10 +40,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d tracks?</string>
 			<key>other</key>
-			<string>%d tracks</string>
+			<string>%d tracks?</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
index fcc53f1a1a..c824b71ac0 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -27,7 +24,6 @@
 			<string>%d إشارةً مرجعيةً</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -50,7 +46,6 @@
 			<string>تم العثور على %d ملفًا. يمكنك رؤيتها بعد التحويل.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -61,18 +56,13 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d مسار</string>
+			<key>zero</key>
+			<string>%d المسارات</string>
 			<key>two</key>
-			<string>%d مساران</string>
-			<key>few</key>
-			<string>%d مسارات</string>
-			<key>many</key>
-			<string>%d مسارًا</string>
+			<string>%d المسارات</string>
 			<key>other</key>
-			<string>%d مسارًا</string>
+			<string>%d المسارات</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
new file mode 100644
index 0000000000..fb3f4d92a7
--- /dev/null
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
@@ -0,0 +1,38 @@
+"delete" = "Desaniciar";
+"kilometres" = "Quilómetros";
+"close" = "Zarrar";
+"cancel" = "Encaboxar";
+"address" = "Señes";
+"miles" = "Milles";
+"search" = "Guetar";
+"zoom_to_country" = "Amosar nel mapa";
+"core_my_places" = "Los mios llugares";
+"category_parking" = "Aparcaderu";
+"placepage_distance" = "Distancia";
+"capacity" = "Capacidá: %@";
+"facebook" = "Facebook";
+"self_service" = "Autoserviciu";
+"edit_place" = "Editar llugar";
+"parks" = "Parques";
+"sort" = "Ordenar…";
+"network" = "Rede: %@";
+"use_cellular_data" = "Sí";
+"add_language" = "Amestar una llingua";
+"yes" = "Sí";
+"yes_available" = "Sí";
+"map" = "Mapa";
+"no_available" = "Non";
+"no" = "Non";
+"open_in_app" = "Abrir n’otra aplicación";
+"parkings" = "Aparcaderu";
+"core_my_position" = "La mio posición";
+"later" = "Más sero";
+"thank_you" = "Gracies";
+"museums" = "Museos";
+"elevation_profile_ascent" = "Ascensu";
+"search_in_the_list" = "Guetar na llista";
+"elevation_profile_descent" = "Descensu";
+"religious_places" = "Llugares relixosos";
+"editor_edit_place_name_hint" = "Nome del llugar";
+"text_more_button" = "… más";
+"current_location_unknown_error_title" = "Desconózse l’allugamientu actual.";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 35ccc140d6..2b3d844729 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -455,13 +455,13 @@
 "dialog_routing_download_and_update_maps" = "Baixeu i actualitzeu tots els mapes del trajecte per a calcular-ne la ruta.";
 "categories" = "Categories";
 "history" = "Historial";
-"search_not_found" = "Ups! No s'ha trobat cap resultat.";
+"search_not_found" = "No s’ha trobat cap resultat.";
 
 /* The message when user did not find anything in the search. */
 "search_not_found_query" = "Baixeu la regió on esteu cercant o proveu d'afegir un nom de ciutat o poble proper.";
 "search_history_title" = "Historial de cerca";
 "search_history_text" = "Mostra les cerques recents.";
-"clear_search" = "Buida l'historial de cerques.";
+"clear_search" = "Neteja l’historial de cerques";
 
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Viquipèdia";
@@ -604,16 +604,16 @@
 "downloader_no_downloaded_maps_title" = "No heu baixat cap mapa";
 "downloader_no_downloaded_maps_message" = "Baixeu mapes per a cercar una ubicacio i usar la navegació sense connexió.";
 "current_location_unknown_error_title" = "Es desconeix la ubicació actual.";
-"current_location_unknown_error_message" = "S'ha produït un error en cercar la vostra ubicació. Comproveu que l'aparel funciona correctament i torneu-ho a intentar.";
+"current_location_unknown_error_message" = "S’ha produït un error en determinar la vostra ubicació. Comproveu que l’aparell funciona correctament i torneu-ho a provar.";
 "location_services_disabled_header" = "Els serveis de geolocalització estan desactivats";
 "location_services_disabled_message" = "Activeu l'accés a la geolocalització en la configuració de l'aparell";
 "location_services_disabled_1" = "1. Obriu la configuració";
-"location_services_disabled_2" = "2. Toqueu Ubicació";
+"location_services_disabled_2" = "2. Toqueu «Ubicació»";
 
 /* iOS Dialog for the case when the location permission is not granted; you might find the exact wording for your language here: https://support.apple.com/en-us/102647 (replace 'en-us' in URL with your language/region) */
-"location_services_disabled_3" = "3. Trieu \"Mentre s'usa l'aplicació\"";
-"location_services_disabled_on_device_2" = "2. Seleccioneu Privadesa";
-"location_services_disabled_on_device_3" = "3. Seleccioneu Serveis d'ubicació";
+"location_services_disabled_3" = "3. Trieu «Mentre s’usa l’aplicació»";
+"location_services_disabled_on_device_2" = "2. Trieu «Privadesa»";
+"location_services_disabled_on_device_3" = "3. Trieu «Serveis d’ubicació»";
 "location_services_disabled_on_device_4" = "4. Activeu els serveis d'ubicació";
 "location_services_disabled_on_device_additional_message" = "O continuar utilitzant Organic Maps sense ubicació";
 
@@ -673,7 +673,7 @@
 /* Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "Assegureu-vos que no heu introduït cap dada personal.";
 "editor_share_to_all_dialog_message_2" = "Revisarem els canvis. Si tenim cap pregunta contactem amb vós via correu electrònic.";
-"navigation_stop_button" = "Atura't";
+"navigation_stop_button" = "Atura";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
 "recent_track_background_dialog_title" = "Voleu desactivar l'enregistrament de la ruta recent?";
@@ -744,16 +744,16 @@
 "bookmarks_import" = "Importa marcadors i les traces";
 "downloader_hide_screen" = "Amaga la pantalla";
 "downloader_percent" = "%@ (%@/%@)";
-"downloader_process" = "S'està baixant %@…";
-"downloader_applying" = "S'està aplicant %@…";
+"downloader_process" = "S’està baixant %@…";
+"downloader_applying" = "S’està aplicant %@…";
 "bookmarks_error_message_share_general" = "No s'ha pogut compartir a causa d'un error de l'aplicació";
 "bookmarks_error_title_share_empty" = "Error al compartir";
 "bookmarks_error_message_share_empty" = "No es pot compartir una llista buida";
 "bookmarks_error_message_empty_list_name" = "Introduïu el nom de la llista";
 "bookmarks_error_title_list_name_already_taken" = "Aquest nom ja és en ús";
 "bookmarks_error_title_list_name_too_long" = "Aquest nom és massa llarg";
-"profile" = "Perfil d'OpenStreetMap";
-"bookmarks_detect_title" = "S'han detectat fitxers nous";
+"profile" = "Perfil de l’OpenStreetMap";
+"bookmarks_detect_title" = "S’han detectat fitxers nous";
 "button_convert" = "Converteix";
 "bookmarks_convert_error_title" = "Error";
 "bookmarks_convert_error_message" = "Alguns fitxers no s'han convertit.";
@@ -763,7 +763,7 @@
 "button_layer_subway" = "Metro";
 "layers_title" = "Estils i capes de mapa";
 "subway_data_unavailable" = "El mapa del metro no és disponible";
-"title_error_downloading_bookmarks" = "S'ha produït un error";
+"title_error_downloading_bookmarks" = "S’ha produït un error";
 "popular_place" = "Popular";
 "export_file" = "Exporta KMZ";
 "export_file_gpx" = "Exporta GPX";
@@ -782,7 +782,7 @@
 
 /* Speed camera settings menu option - Never warn (about speedcams) */
 "pref_tts_speedcams_never" = "No n'avisis mai";
-"power_managment_title" = "Mode d'estalvi d'energia";
+"power_managment_title" = "Mode d’estalvi d’energia";
 "power_managment_description" = "Si està seleccionat el mode automàtic, l'aplicació desactivarà funcions que consumeixen energia, depenent del nivell de càrrega actual de la bateria";
 "power_managment_setting_never" = "Mai";
 "power_managment_setting_auto" = "Automàtic";
@@ -837,7 +837,7 @@
 "dialog_routing_check_gps_carplay" = "No hi ha senyal GPS. Aneu a un àrea oberta";
 "dialog_routing_unable_locate_route_carplay" = "No es pot calcular cap ruta. Indiqueu uns punts de ruta diferents.";
 "dialog_routing_download_files_carplay" = "Per a crear una ruta, baixeu les mapes que manquen en el vostre aparell";
-"dialog_routing_system_error_carplay" = "S'ha produït un error. Reinicieu l'aplicació";
+"dialog_routing_system_error_carplay" = "S’ha produït un error. Reinicieu l’aplicació";
 "dialog_routing_rebuild_from_current_location_carplay" = "Es tornarà a calcular la ruta des de la ubicació actual";
 "dialog_routing_rebuild_for_vehicle_carplay" = "La ruta es convertira a una d'automòbil";
 "not_all_shown_bookmarks_carplay" = "No es mostren totes les adreces d'interès";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
index 46108ea2ec..79e780c2d9 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
@@ -237,7 +237,7 @@
 "type.building.address" = "Adreça";
 "type.building.has_parts" = "Building";
 "type.building_part" = "Building";
-"type.building.garage" = "Garage";
+"type.building.garage" = "Garatge";
 "type.building.train_station" = "Edifici de l'Estació";
 "type.building.warehouse" = "Warehouse";
 "type.cemetery.grave" = "Grave";
@@ -270,16 +270,16 @@
 "type.cuisine.african" = "African";
 "type.cuisine.american" = "American";
 "type.cuisine.arab" = "Arab";
-"type.cuisine.argentinian" = "Argentinian";
-"type.cuisine.asian" = "Asian";
-"type.cuisine.austrian" = "Austrian";
+"type.cuisine.argentinian" = "Argentina";
+"type.cuisine.asian" = "Asiàtica";
+"type.cuisine.austrian" = "Austríaca";
 "type.cuisine.bagel" = "Bagel";
 "type.cuisine.balkan" = "Balkan";
 "type.cuisine.barbecue" = "Barbecue";
 "type.cuisine.bavarian" = "Bavarian";
 "type.cuisine.beef_bowl" = "Beef Bowl";
-"type.cuisine.brazilian" = "Brazilian";
-"type.cuisine.breakfast" = "Breakfast";
+"type.cuisine.brazilian" = "Brasilera";
+"type.cuisine.breakfast" = "Esmorzar";
 "type.cuisine.bubble_tea" = "Bubble Tea";
 "type.cuisine.burger" = "Burger";
 "type.cuisine.buschenschank" = "Buschenschank";
@@ -324,7 +324,7 @@
 "type.cuisine.malagasy" = "Malagasy";
 "type.cuisine.malaysian" = "Malaysian";
 "type.cuisine.mediterranean" = "Mediterranean";
-"type.cuisine.mexican" = "Mexican";
+"type.cuisine.mexican" = "Mexicana";
 "type.cuisine.moroccan" = "Moroccan";
 "type.cuisine.noodles" = "Noodles";
 "type.cuisine.oriental" = "East Asian";
@@ -343,11 +343,11 @@
 "type.cuisine.savory_pancakes" = "Savory Pancakes";
 "type.cuisine.seafood" = "Seafood";
 "type.cuisine.soba" = "Soba";
-"type.cuisine.spanish" = "Spanish";
+"type.cuisine.spanish" = "Espanyola";
 "type.cuisine.steak_house" = "Steak House";
 "type.cuisine.sushi" = "Sushi";
 "type.cuisine.tapas" = "Tapas";
-"type.cuisine.tea" = "Tea";
+"type.cuisine.tea" = "Te";
 "type.cuisine.thai" = "Thai";
 "type.cuisine.turkish" = "Turkish";
 "type.cuisine.vegan" = "Vegan";
@@ -527,7 +527,7 @@
 "type.highway.service.tunnel" = "Tunnel";
 "type.highway.services" = "Service Area";
 "type.highway.speed_camera" = "Càmera de trànsit";
-"type.highway.steps" = "Stairs";
+"type.highway.steps" = "Escales";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.steps.bridge" = "Bridge";
@@ -761,7 +761,7 @@
 "type.man_made.tower.communication" = "Torre de comunicacions";
 
 /* A deep hole drilled into the earth to extract oil or gas. */
-"type.man_made.petroleum_well" = "Poço de petroli o gas";
+"type.man_made.petroleum_well" = "Pou petrolífer o de gas";
 
 /* A tower/mast constructed to burn off excess gas. */
 "type.man_made.flare" = "Flama de gas";
@@ -769,8 +769,8 @@
 "type.man_made.water_tap" = "Water Tap";
 "type.man_made.water_tap.drinking_water_no" = "Water Tap";
 "type.man_made.water_tower" = "Water Tower";
-"type.man_made.water_well" = "Water Well";
-"type.man_made.water_well.drinking_water_no" = "Water Well";
+"type.man_made.water_well" = "Pou d’aigua";
+"type.man_made.water_well.drinking_water_no" = "Pou d’aigua";
 "type.man_made.windmill" = "Molí de vent";
 "type.man_made.works" = "Industrial Works";
 "type.mapswithme" = "mapswithme";
@@ -822,7 +822,7 @@
 "type.natural.strait" = "Strait";
 "type.natural.tree_row" = "Tree Row";
 "type.natural.vineyard" = "Vineyard";
-"type.natural.volcano" = "Volcano";
+"type.natural.volcano" = "Volcà";
 "type.natural.water" = "Water";
 "type.natural.wetland" = "Wetland";
 "type.natural.wetland.bog" = "Bog";
@@ -840,8 +840,8 @@
 "type.organic.yes" = "Organic";
 "type.place.city" = "Ciutat";
 "type.place.city.capital" = "Capital";
-"type.place.city.capital.10" = "City";
-"type.place.city.capital.11" = "City";
+"type.place.city.capital.10" = "Ciutat";
+"type.place.city.capital.11" = "Ciutat";
 "type.place.city.capital.2" = "Capital";
 "type.place.city.capital.3" = "City";
 "type.place.city.capital.4" = "City";
@@ -851,8 +851,8 @@
 "type.place.city.capital.8" = "City";
 "type.place.city.capital.9" = "City";
 "type.place.continent" = "Continent";
-"type.place.country" = "Country";
-"type.place.county" = "County";
+"type.place.country" = "País";
+"type.place.county" = "Comtat";
 "type.place.farm" = "Farm";
 "type.place.hamlet" = "Hamlet";
 "type.place.island" = "Illa";
@@ -865,10 +865,10 @@
 
 /* Named part of a city, town or suburb, smaller than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Neighbourhood) */
 "type.place.neighbourhood" = "Barri";
-"type.place.ocean" = "Ocean";
-"type.place.region" = "Region";
-"type.place.sea" = "Sea";
-"type.place.square" = "Square";
+"type.place.ocean" = "Oceà";
+"type.place.region" = "Regió";
+"type.place.sea" = "Mar";
+"type.place.square" = "Plaça";
 "type.place.state" = "State";
 "type.place.state.USA" = "State";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 2b70dd0a93..d36aeb05b8 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -361,7 +361,7 @@
 /* bookmark button text */
 "bookmark" = "bogmærke";
 "save" = "Gem";
-"create" = "skabe";
+"create" = "opret";
 
 /* red color */
 "red" = "Rød";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index 82953bcc94..158288ff55 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -239,7 +239,7 @@
 "type.building_part" = "Bygning";
 "type.building.garage" = "Garage";
 "type.building.train_station" = "Stationsbygning";
-"type.building.warehouse" = "Warehouse";
+"type.building.warehouse" = "Varehus";
 "type.cemetery.grave" = "Grav";
 "type.craft" = "Håndværk";
 "type.craft.beekeeper" = "Biavler";
@@ -384,11 +384,11 @@
 "type.healthcare.sample_collection" = "Prøvetagning";
 "type.healthcare.speech_therapist" = "Tale terapi";
 "type.highway" = "Highway";
-"type.highway.bridleway" = "Bridle Path";
+"type.highway.bridleway" = "Ridesti";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Bro";
-"type.highway.bridleway.permissive" = "Bridle Path";
+"type.highway.bridleway.permissive" = "Ridesti";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
@@ -401,11 +401,11 @@
 "type.highway.busway.tunnel" = "Tunnel";
 "type.highway.bus_stop" = "Busstoppested";
 "type.highway.construction" = "Vej under opbygning";
-"type.highway.cycleway" = "Cycle Path";
+"type.highway.cycleway" = "Cykelsti";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.cycleway.bridge" = "Bro";
-"type.highway.cycleway.permissive" = "Cycle Path";
+"type.highway.cycleway.permissive" = "Cykelsti";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "Tunnel";
@@ -581,7 +581,7 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Tunnel";
-"type.area_highway.cycleway" = "Cycle Path";
+"type.area_highway.cycleway" = "Cykelsti";
 "type.area_highway.footway" = "Sti";
 "type.area_highway.living_street" = "Gade";
 "type.area_highway.motorway" = "Gade";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index d50317678f..6ebd5478d1 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -627,7 +627,7 @@
 "kilometers_per_hour" = "χμ/ω";
 
 /* abbreviation for mile(s) */
-"mi" = "mi";
+"mi" = "μι";
 
 /* A unit of measure */
 "ft" = "πόδια";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
index ae98696e39..14784f97b9 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d αγαπημένα</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>Βρέθηκαν %d αρχεία. Θα τα δείτε μετά τη μετατροπή.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d διαδρομή</string>
+			<key>zero</key>
+			<string>%d ίχνη</string>
 			<key>other</key>
-			<string>%d διαδρομές</string>
+			<string>%d ίχνη</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 4cd02b871f..3eb2483950 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -414,7 +414,7 @@
 "dialog_routing_disclaimer_priority" = "— Las condiciones del camino, las reglas de tránsito y los señalamientos siempre tienen prioridad sobre las sugerencias de navegación;";
 "dialog_routing_disclaimer_precision" = "— El mapa puede ser impreciso y sugerir una ruta que no siempre puede ser el mejor camino para llegar al destino;";
 "dialog_routing_disclaimer_recommendations" = "— Las rutas sugeridas deben entenderse solo como recomendaciones;";
-"dialog_routing_disclaimer_borders" = "— Actúe con cautela en las rutas con zonas fronterizas: las rutas creadas por nuestra aplicación en ocasiones pueden atravesar las fronteras de países en lugares no autorizados;";
+"dialog_routing_disclaimer_borders" = "— Actúe con cautela en las rutas con zonas fronterizas: las rutas creadas por nuestra aplicación en ocasiones pueden atravesar las fronteras de países en lugares no autorizados.";
 "dialog_routing_disclaimer_beware" = "¡Manténgase alerta y a salvo durante el viaje!";
 "dialog_routing_check_gps" = "Verificar la señal del GPS";
 "dialog_routing_error_location_not_found" = "No se puede crear la ruta. No se pudieron identificar las coordenadas actuales del GPS.";
@@ -461,7 +461,7 @@
 "search_not_found_query" = "Descargue la región en la que está buscando o pruebe a añadir el nombre de una ciudad/pueblo cercano.";
 "search_history_title" = "Historial de búsquedas";
 "search_history_text" = "Ver búsquedas recientes.";
-"clear_search" = "Eliminar el historial de búsqueda";
+"clear_search" = "Vaciar historial de búsquedas";
 
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
@@ -603,7 +603,7 @@
 "editor_category_unsuitable_text" = "Organic Maps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añada dichas categorías directamente a <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a>. Consulte nuestra <a href=\"https://organicmaps.app/faq/editing/advanced-map-editing\">guía</a> para obtener instrucciones detalladas paso a paso.";
 "downloader_no_downloaded_maps_title" = "No ha descargado ningún mapa";
 "downloader_no_downloaded_maps_message" = "Descargue mapas para encontrar la ubicación y navegar sin conexión.";
-"current_location_unknown_error_title" = "La ubicación actual es desconocida.";
+"current_location_unknown_error_title" = "Se desconoce la ubicación actual.";
 "current_location_unknown_error_message" = "Se ha producido un error al buscar su ubicación. Compruebe que su dispositivo funciona correctamente e inténtelo más tarde.";
 "location_services_disabled_header" = "La identificación de la ubicación está desactivada";
 "location_services_disabled_message" = "Active el acceso a la geolocalización en los ajustes del dispositivo";
@@ -658,10 +658,10 @@
 "editor_remove_place_message" = "¿Eliminar el lugar añadido?";
 "editor_remove_place_button" = "Eliminar";
 "editor_place_doesnt_exist" = "El lugar no existe";
-"text_more_button" = "…más";
+"text_more_button" = "… más";
 
 /* Phone number error message */
-"error_enter_correct_phone" = "Introduzca un número de teléfono correcto";
+"error_enter_correct_phone" = "Introduzca un número de teléfono válido";
 "error_enter_correct_web" = "Introduzca una dirección web válida";
 "error_enter_correct_email" = "Introduzca un correo válido";
 "refresh" = "Actualizar";
@@ -671,7 +671,7 @@
 "editor_share_to_all_dialog_title" = "¿Quiere enviarlo a todos los usuarios?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato personal.";
+"editor_share_to_all_dialog_message_1" = "Cerciórese de que no ha introducido ningún dato privado o personal.";
 "editor_share_to_all_dialog_message_2" = "Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto con usted si tienen alguna pregunta.";
 "navigation_stop_button" = "Detener";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index df255c1de2..7ac4614882 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -270,26 +270,26 @@
 "type.cuisine.african" = "Aafrika";
 "type.cuisine.american" = "Ameerika";
 "type.cuisine.arab" = "Araabia";
-"type.cuisine.argentinian" = "Argentiina";
+"type.cuisine.argentinian" = "Argentina";
 "type.cuisine.asian" = "Aasia";
 "type.cuisine.austrian" = "Austria";
 "type.cuisine.bagel" = "Rõngassaiake";
 "type.cuisine.balkan" = "Balkani";
 "type.cuisine.barbecue" = "Grill";
 "type.cuisine.bavarian" = "Baieri";
-"type.cuisine.beef_bowl" = "Veiseliha kauss";
+"type.cuisine.beef_bowl" = "Veise-riisiroad";
 "type.cuisine.brazilian" = "Brasiilia";
 "type.cuisine.breakfast" = "Hommikusöök";
 "type.cuisine.bubble_tea" = "Mullitee";
 "type.cuisine.burger" = "Hamburger";
 "type.cuisine.buschenschank" = "Austria veinikõrts (buschenschank)";
-"type.cuisine.cake" = "Kook";
+"type.cuisine.cake" = "Koogid";
 "type.cuisine.caribbean" = "Kariibi";
-"type.cuisine.chicken" = "Kana";
+"type.cuisine.chicken" = "Kanaliha road";
 "type.cuisine.chinese" = "Hiina";
 "type.cuisine.coffee_shop" = "Kohvi";
-"type.cuisine.crepe" = "Krepp";
-"type.cuisine.croatian" = "Horvaatia";
+"type.cuisine.crepe" = "Kreperii";
+"type.cuisine.croatian" = "Horvaadi";
 "type.cuisine.curry" = "Karri";
 "type.cuisine.deli" = "Delikatesstoitude pood";
 "type.cuisine.diner" = "Söögikoht";
@@ -297,10 +297,10 @@
 "type.cuisine.ethiopian" = "Etioopia";
 "type.cuisine.filipino" = "Filipiinide";
 "type.cuisine.fine_dining" = "Peen restoran";
-"type.cuisine.fish" = "Kala";
-"type.cuisine.fish_and_chips" = "Kala ja krõpsud";
+"type.cuisine.fish" = "Kalaroad";
+"type.cuisine.fish_and_chips" = "Friteeritud kala ja kartulid";
 "type.cuisine.french" = "Prantsuse";
-"type.cuisine.friture" = "Fritüür";
+"type.cuisine.friture" = "Friteeritud toidud";
 "type.cuisine.georgian" = "Gruusia";
 "type.cuisine.german" = "Saksa";
 "type.cuisine.greek" = "Kreeka";
@@ -322,27 +322,27 @@
 "type.cuisine.lebanese" = "Liibanoni";
 "type.cuisine.local" = "Kohalik";
 "type.cuisine.malagasy" = "Madagaskari";
-"type.cuisine.malaysian" = "Malaisia";
+"type.cuisine.malaysian" = "Malai";
 "type.cuisine.mediterranean" = "Vahemere";
 "type.cuisine.mexican" = "Mehhiko";
 "type.cuisine.moroccan" = "Maroko";
-"type.cuisine.noodles" = "Nuudlid";
+"type.cuisine.noodles" = "Nuudliroad";
 "type.cuisine.oriental" = "Kaug-Ida";
-"type.cuisine.pancake" = "Pannkook";
+"type.cuisine.pancake" = "Pannkoogid";
 "type.cuisine.pasta" = "Pasta";
 "type.cuisine.persian" = "Pärsia";
-"type.cuisine.peruvian" = "Peruuvia";
-"type.cuisine.pizza" = "Pizza";
+"type.cuisine.peruvian" = "Peruu köök";
+"type.cuisine.pizza" = "Pitsa";
 "type.cuisine.polish" = "Poola";
 "type.cuisine.portuguese" = "Portugali";
-"type.cuisine.ramen" = "Ramen";
+"type.cuisine.ramen" = "Jaapani ramen-nuudlid";
 "type.cuisine.regional" = "Piirkondlik";
 "type.cuisine.russian" = "Vene";
-"type.cuisine.sandwich" = "Võileib";
-"type.cuisine.sausage" = "Vorst";
+"type.cuisine.sandwich" = "Võileivad";
+"type.cuisine.sausage" = "Vorstid";
 "type.cuisine.savory_pancakes" = "Soolased pannkoogid";
 "type.cuisine.seafood" = "Mereannid";
-"type.cuisine.soba" = "Soba";
+"type.cuisine.soba" = "Jaapani soba-nuudlid";
 "type.cuisine.spanish" = "Hispaania";
 "type.cuisine.steak_house" = "Liharestoran";
 "type.cuisine.sushi" = "Sushi";
@@ -350,11 +350,11 @@
 "type.cuisine.tea" = "Tee";
 "type.cuisine.thai" = "Tai";
 "type.cuisine.turkish" = "Türgi";
-"type.cuisine.vegan" = "Vegan";
+"type.cuisine.vegan" = "Täistaimetoidukoht";
 "type.cuisine.vegetarian" = "Taimetoit";
 "type.cuisine.vietnamese" = "Vietnami";
-"type.emergency" = "Hädaabi";
-"type.emergency.assembly_point" = "Erakorraline kogunemispunkt";
+"type.emergency" = "Pääste- ja abiteenused";
+"type.emergency.assembly_point" = "Kogunemiskoht hädaolukorras";
 "type.emergency.defibrillator" = "Defibrillaator";
 "type.emergency.fire_hydrant" = "Tuletõrjehüdrant";
 "type.emergency.phone" = "Hädaabi telefon";
@@ -369,30 +369,30 @@
 "type.entrance" = "Sissepääs";
 
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
-"type.entrance.main" = "Peasissekäik";
-"type.entrance.exit" = "Väljumine";
+"type.entrance.main" = "Peasissepääs";
+"type.entrance.exit" = "Väljupääs";
 "type.fee.yes" = "$ / €";
 "type.fee.no" = "Tasuta";
 "type.healthcare.laboratory" = "Meditsiinilabor";
 "type.healthcare.physiotherapist" = "Füsioterapeut";
-"type.healthcare.alternative" = "Alternatiivne meditsiin";
-"type.healthcare.audiologist" = "Audioloogia";
-"type.healthcare.blood_donation" = "Vereloovutuskeskus";
-"type.healthcare.optometrist" = "Optomeetria";
-"type.healthcare.podiatrist" = "Jalaravi";
+"type.healthcare.alternative" = "Alternatiivmeditsiin";
+"type.healthcare.audiologist" = "Audioloog";
+"type.healthcare.blood_donation" = "Verekeskus";
+"type.healthcare.optometrist" = "Optometrist";
+"type.healthcare.podiatrist" = "Jalaarst";
 "type.healthcare.psychotherapist" = "Psühhoteraapia";
-"type.healthcare.sample_collection" = "Proovivõtmine";
-"type.healthcare.speech_therapist" = "Logopeedia";
-"type.highway" = "Maantee";
-"type.highway.bridleway" = "Valjarada";
+"type.healthcare.sample_collection" = "Proovide kogumispunkt";
+"type.healthcare.speech_therapist" = "Logopeed";
+"type.highway" = "Tee";
+"type.highway.bridleway" = "Ratsutamisrada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Sild";
-"type.highway.bridleway.permissive" = "Valjarada";
+"type.highway.bridleway.permissive" = "Ratsutamisrada";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
-"type.highway.busway" = "Spetsiaalne bussitee";
+"type.highway.busway" = "Roobastega bussirada";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.busway.bridge" = "Sild";
@@ -408,7 +408,7 @@
 "type.highway.cycleway.permissive" = "Piiratud jalgrattatee";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.cycleway.tunnel" = "Jalgratta tunnel";
+"type.highway.cycleway.tunnel" = "Jalgrattatunnel";
 "type.highway.elevator" = "Lift";
 "type.highway.footway" = "Jalgrada";
 "type.highway.footway.sidewalk" = "Kõnnitee";
@@ -421,21 +421,21 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Jalakäijate tunnel";
 "type.highway.ford" = "Koolmekoht";
-"type.highway.living_street" = "Elamupiirkonna tänav";
+"type.highway.living_street" = "Õueala tee";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.living_street.bridge" = "Sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.living_street.tunnel" = "Tänavatunnel";
+"type.highway.living_street.tunnel" = "Elamupiirkonna tänava tunnel";
 "type.highway.motorway" = "Kiirtee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.motorway.bridge" = "Mootorrataste sild";
+"type.highway.motorway.bridge" = "Kiirtee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.motorway.tunnel" = "Kiirtee tunnel";
-"type.highway.motorway_junction" = "Väljumistee";
+"type.highway.motorway_junction" = "Mahasõit kiirteelt";
 "type.highway.motorway_link" = "Kiirtee kaldtee";
 
 /* These translations are used for all type.highway.*.bridge. */
@@ -455,7 +455,7 @@
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Sild";
-"type.highway.path.horse" = "Valjarada";
+"type.highway.path.horse" = "Ratsutamisrada";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
@@ -467,30 +467,30 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Jalakäijate tunnel";
-"type.highway.primary" = "Esmane tee";
+"type.highway.primary" = "Põhimaantee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.primary.bridge" = "Sild";
+"type.highway.primary.bridge" = "Põhimaantee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.primary.tunnel" = "Peatee tunnel";
-"type.highway.primary_link" = "Esmase tee kaldtee";
+"type.highway.primary.tunnel" = "Põhimaantee tunnel";
+"type.highway.primary_link" = "Põhimaantee kaldtee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.primary_link.bridge" = "Sild";
+"type.highway.primary_link.bridge" = "Põhimaantee ühendustee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.primary_link.tunnel" = "Tunnel";
+"type.highway.primary_link.tunnel" = "Põhimaantee ühendustee tunnel";
 "type.highway.raceway" = "Võistlusrada";
-"type.highway.residential" = "Tänav";
-"type.highway.residential.area" = "Tänav";
+"type.highway.residential" = "Elamupiirkonna tänav";
+"type.highway.residential.area" = "Elamupiirkonna tänav";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.residential.tunnel" = "Elamupirkonna tänava tunnel";
-"type.highway.rest_area" = "Puhkeala";
+"type.highway.rest_area" = "Teeäärne puhkekoht";
 "type.highway.road" = "Maantee";
 
 /* These translations are used for all type.highway.*.bridge. */
@@ -501,31 +501,31 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Tunnel";
-"type.highway.secondary" = "Teisene tee";
+"type.highway.secondary" = "Tugimaantee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.secondary.bridge" = "Sild";
+"type.highway.secondary.bridge" = "Tugimaantee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.secondary.tunnel" = "Tänava tunnel";
-"type.highway.secondary_link" = "Teisese tee kaldtee";
+"type.highway.secondary.tunnel" = "Tugimaantee tunnel";
+"type.highway.secondary_link" = "Tugimaantee ühendustee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.secondary_link.bridge" = "Sild";
+"type.highway.secondary_link.bridge" = "Tugimaantee ühendustee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.secondary_link.tunnel" = "Tänava tunnel";
-"type.highway.service" = "Hooldustee";
-"type.highway.service.area" = "Hooldustee";
+"type.highway.secondary_link.tunnel" = "Tugimaantee ühendustee tunnel";
+"type.highway.service" = "Juurdepääsutee";
+"type.highway.service.area" = "Juurdepääsutee ala";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.service.bridge" = "Maanteesild";
+"type.highway.service.bridge" = "Juurdepääsutee sild";
 "type.highway.service.driveway" = "Sissesõidutee";
 "type.highway.service.parking_aisle" = "Parkla vahetee";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.service.tunnel" = "Tänava tunnel";
-"type.highway.services" = "Teenindusala";
+"type.highway.service.tunnel" = "Juurdepääsutee tunnel";
+"type.highway.services" = "Maantee teenindusala";
 "type.highway.speed_camera" = "Kiiruskaamera";
 "type.highway.steps" = "Trepp";
 
@@ -534,20 +534,20 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Tunnel";
-"type.highway.tertiary" = "Tänav";
+"type.highway.tertiary" = "Kohalik maantee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.tertiary.bridge" = "Sild";
+"type.highway.tertiary.bridge" = "Kohaliku maantee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.tertiary.tunnel" = "Tunnel";
-"type.highway.tertiary_link" = "Tänav";
+"type.highway.tertiary.tunnel" = "Kohaliku maantee tunnel";
+"type.highway.tertiary_link" = "Kohaliku maantee ühendustee";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.tertiary_link.bridge" = "Sild";
+"type.highway.tertiary_link.bridge" = "Kohaliku maantee ühendustee sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.tertiary_link.tunnel" = "Tunnel";
+"type.highway.tertiary_link.tunnel" = "Kohaliku maantee ühendustee tunnel";
 "type.highway.track" = "Rada";
 "type.highway.track.area" = "Rada";
 
@@ -559,14 +559,14 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 "type.highway.traffic_signals" = "Valgusfoor";
-"type.highway.trunk" = "Magistraaltee";
+"type.highway.trunk" = "E-tähistusega põhimaantee";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk.bridge" = "Sild";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.trunk.tunnel" = "Tunnel";
-"type.highway.trunk_link" = "Magistraaltee";
+"type.highway.trunk.tunnel" = "E-tähistusega põhimaantee tunnel";
+"type.highway.trunk_link" = "E-tähistusega põhimaantee ühendustee";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.trunk_link.bridge" = "Sild";
@@ -582,19 +582,19 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Tunnel";
 "type.area_highway.cycleway" = "Jalgrattatee";
-"type.area_highway.footway" = "Käigutee";
-"type.area_highway.living_street" = "Elamupiirkonna tänav";
+"type.area_highway.footway" = "Jalgtee";
+"type.area_highway.living_street" = "Õueala tee";
 "type.area_highway.motorway" = "Kiirtee";
 "type.area_highway.path" = "Rada";
-"type.area_highway.pedestrian" = "Jalakäigutee";
-"type.area_highway.primary" = "Esmane tee";
-"type.area_highway.residential" = "Tänav";
-"type.area_highway.secondary" = "Teisene tee";
-"type.area_highway.service" = "Hooldustee";
-"type.area_highway.tertiary" = "Tänav";
+"type.area_highway.pedestrian" = "Jalakäijate tänav";
+"type.area_highway.primary" = "Põhimaantee";
+"type.area_highway.residential" = "Elamupiikonna tänav";
+"type.area_highway.secondary" = "Tugimaantee";
+"type.area_highway.service" = "Juurdepääsutee";
+"type.area_highway.tertiary" = "Kohalik maantee";
 "type.area_highway.steps" = "Trepp";
 "type.area_highway.track" = "Rada";
-"type.area_highway.trunk" = "Magistraaltee";
+"type.area_highway.trunk" = "E-tähistusega põhimaantee";
 "type.area_highway.unclassified" = "Vähetähtis tee";
 "type.highway.world_level" = "highway-world_level";
 "type.highway.world_towns_level" = "highway-world_towns_level";
@@ -608,44 +608,43 @@
 "type.historic.castle" = "Loss";
 "type.historic.castle.castrum" = "Rooma kindlus";
 "type.historic.castle.defensive" = "Kindlus";
-"type.historic.castle.fortified_church" = "Kindlustatud kirik";
+"type.historic.castle.fortified_church" = "Kindluskirik";
 "type.historic.castle.fortress" = "Kindlus";
-"type.historic.castle.hillfort" = "Linnus";
+"type.historic.castle.hillfort" = "Maalinn";
 "type.historic.castle.kremlin" = "Kreml";
 "type.historic.castle.manor" = "Mõisahoone";
 "type.historic.castle.palace" = "Palee";
-"type.historic.castle.shiro" = "Jaapani loss";
-"type.historic.castle.stately" = "Loss";
+"type.historic.castle.shiro" = "Jaapani kindlusloss";
+"type.historic.castle.stately" = "Suur härrastemaja";
 "type.historic.city_gate" = "Linnavärav";
 "type.historic.citywalls" = "Linnamüür";
 "type.historic.fort" = "Kindlus";
 "type.historic.gallows" = "Võllas";
 "type.historic.locomotive" = "Ajalooline vedur";
-"type.historic.memorial" = "Memoriaal";
+"type.historic.memorial" = "Mälestusmärk";
 "type.historic.memorial.cross" = "Mälestusrist";
-"type.historic.memorial.plaque" = "Mälestusmärk";
+"type.historic.memorial.plaque" = "Mälestustahvel";
 "type.historic.memorial.sculpture" = "Skulptuur";
-"type.historic.memorial.statue" = "Kuju";
-"type.historic.memorial.stolperstein" = "Komistuskivi";
-"type.historic.stone" = "Ajalooline kivi";
+"type.historic.memorial.statue" = "Ausammas";
+"type.historic.memorial.stolperstein" = "Natsismiohvrite mälestuskivi sillutises";
+"type.historic.stone" = "Mälestuskivi";
 "type.historic.memorial.war_memorial" = "Sõjamemoriaal";
 "type.historic.mine" = "Ajalooline kaevandus";
 "type.historic.monument" = "Monument";
-"type.historic.pillory" = "Häbipost";
+"type.historic.pillory" = "Ajalooline häbipost";
 "type.historic.ruins" = "Varemed";
-"type.historic.ship" = "Laev";
+"type.historic.ship" = "Ajalooline laev";
 "type.historic.tank" = "Ajalooline tank";
-"type.historic.tomb" = "Haud";
+"type.historic.tomb" = "Hauakamber";
 
 /* Usually has no historic and sometimes no religious context. E.g. a mountain summit cross. */
 "type.man_made.cross" = "Rist";
 
 /* Usually a Christian historical cross placed along a road. */
 "type.historic.wayside_cross" = "Teeäärne rist";
-"type.historic.wayside_shrine" = "Teeäärne pühamu";
-"type.historic.wreck" = "Laevahukk";
+"type.historic.wayside_shrine" = "Teeäärne altar";
+"type.historic.wreck" = "Laevavrakk";
 "type.hwtag" = "hwtag";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
 "type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
 "type.hwtag.lit" = "hwtag-lit";
 "type.hwtag.nobicycle" = "hwtag-nobicycle";
@@ -658,121 +657,121 @@
 "type.hwtag.yescar" = "hwtag-yescar";
 "type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
-"type.internet_access.wlan" = "Internet";
+"type.internet_access.wlan" = "Wifi";
 "type.junction" = "Ristmik";
 "type.junction.circular" = "Ringtee";
 "type.junction.roundabout" = "Ringtee";
 "type.landuse" = "Maakasutus";
-"type.landuse.allotments" = "Peenrad";
-"type.landuse.basin" = "Bassein";
-"type.landuse.brownfield" = "Ehitusmaa";
+"type.landuse.allotments" = "Aianduskrundid";
+"type.landuse.basin" = "Kogumisbassein";
+"type.landuse.brownfield" = "Pruunala";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery" = "Surnuaed";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Kristlik surnuaed";
-"type.landuse.churchyard" = "Kirikuõu";
-"type.landuse.commercial" = "Kommertspiirkond";
-"type.landuse.construction" = "Ehitus";
-"type.landuse.education" = "Haridusrajatised";
-"type.landuse.farmland" = "Talumaa";
+"type.landuse.churchyard" = "Kirikuaed";
+"type.landuse.commercial" = "Ärimaa";
+"type.landuse.construction" = "Ehitusala";
+"type.landuse.education" = "Haridusasutuse maaala";
+"type.landuse.farmland" = "Põllumaa";
 "type.landuse.farmyard" = "Taluõu";
 "type.landuse.field" = "Põld";
 "type.landuse.flowerbed" = "Lillepeenar";
-"type.landuse.forest" = "Mets";
+"type.landuse.forest" = "Majandusmets";
 "type.landuse.forest.coniferous" = "Okaspuumets";
 "type.landuse.forest.deciduous" = "Heitlehine mets";
 "type.landuse.forest.mixed" = "Segamets";
-"type.landuse.garages" = "Garaažid";
+"type.landuse.garages" = "Garaažide maaala";
 "type.landuse.grass" = "Muru";
-"type.landuse.greenfield" = "Ehituskrunt";
-"type.landuse.greenhouse_horticulture" = "Kasvuhoone";
-"type.landuse.industrial" = "Tööstusmaa";
+"type.landuse.greenfield" = "Ehituseks planeeritud roheala";
+"type.landuse.greenhouse_horticulture" = "Kasvuhoonete ala";
+"type.landuse.industrial" = "Tööstuspiirkond";
 "type.landuse.landfill" = "Prügila";
 "type.landuse.meadow" = "Heinamaa";
 "type.landuse.military" = "Militaarala";
 "type.landuse.orchard" = "Viljapuuaed";
 "type.landuse.quarry" = "Karjäär";
-"type.landuse.railway" = "Raudtee ruumid";
-"type.landuse.recreation_ground" = "Puhkeväljak";
-"type.landuse.reservoir" = "Vesi";
-"type.landuse.residential" = "Elamumaa";
-"type.landuse.retail" = "Jaekaubandusmaa";
-"type.landuse.salt_pond" = "Tiik";
-"type.landuse.village_green" = "Maa";
+"type.landuse.railway" = "Raudteekoridor";
+"type.landuse.recreation_ground" = "Puhkeala";
+"type.landuse.reservoir" = "Veehoidla";
+"type.landuse.residential" = "Elamuala";
+"type.landuse.retail" = "Jaekaubandusala";
+"type.landuse.salt_pond" = "Soolatiik";
+"type.landuse.village_green" = "Külaplats";
 "type.landuse.vineyard" = "Viinamarjaistandus";
-"type.leisure" = "Lõõgastus";
-"type.leisure.common" = "Avalik maa";
-"type.leisure.dog_park" = "Koerte ala";
-"type.leisure.fitness_centre" = "Spordikeskus";
-"type.leisure.fitness_station" = "Välivõimla";
+"type.leisure" = "Jõudeaja tegevused";
+"type.leisure.common" = "Ühismaakasutusala";
+"type.leisure.dog_park" = "Koertepark";
+"type.leisure.fitness_centre" = "Jõusaal";
+"type.leisure.fitness_station" = "Jõulinnak";
 "type.leisure.dance" = "Tantsusaal";
 "type.leisure.garden" = "Aed";
 "type.leisure.garden.residential" = "Elamu aed";
 "type.leisure.golf_course" = "Golfirada";
-"type.leisure.miniature_golf" = "Minigolf";
-"type.leisure.hackerspace" = "Hackerspace";
-"type.leisure.ice_rink" = "Liuväli";
-"type.leisure.marina" = "Marina";
+"type.leisure.miniature_golf" = "Minigolfirada";
+"type.leisure.hackerspace" = "Häkkerite ühisruum";
+"type.leisure.ice_rink" = "Uisustaadion";
+"type.leisure.marina" = "Väikesadam";
 "type.leisure.nature_reserve" = "Looduskaitseala";
 "type.leisure.outdoor_seating" = "Istekohad õues";
 "type.leisure.park" = "Park";
-"type.leisure.park.no.access" = "Park";
+"type.leisure.park.no.access" = "Erapark";
 "type.leisure.park.permissive" = "Park";
-"type.leisure.park.private" = "Park";
+"type.leisure.park.private" = "Erapark";
 "type.leisure.picnic_table" = "Piknikulaud";
 "type.leisure.pitch" = "Spordiväljak";
 "type.leisure.playground" = "Mänguväljak";
-"type.leisure.recreation_ground" = "Puhkeväljak";
+"type.leisure.recreation_ground" = "Puhkeala";
 "type.leisure.sauna" = "Saun";
-"type.leisure.slipway" = "Elling";
+"type.leisure.slipway" = "Slipp";
 "type.leisure.sports_centre" = "Spordikeskus";
 "type.sport.climbing" = "Ronimiskeskus";
 "type.sport.yoga" = "Joogastuudio";
 "type.leisure.stadium" = "Staadion";
 "type.leisure.swimming_pool" = "Ujumisbassein";
-"type.leisure.swimming_pool.private" = "Privaatne bassein";
+"type.leisure.swimming_pool.private" = "Privaatne ujumisbassein";
 "type.leisure.track" = "Jooksurada";
 "type.leisure.track.area" = "Jooksurada";
 "type.leisure.water_park" = "Veepark";
 "type.leisure.beach_resort" = "Rannakuurort";
-"type.man_made" = "Inimese loodud";
+"type.man_made" = "Inimtekkeline objekt";
 "type.man_made.breakwater" = "Lainemurdja";
-"type.man_made.cairn" = "Karjäär";
-"type.man_made.chimney" = "Tehase korsten";
+"type.man_made.cairn" = "Kivikangur";
+"type.man_made.chimney" = "Korsten";
 "type.man_made.cutline" = "Metsasiht";
-"type.man_made.survey_point" = "Uuringupunkt";
+"type.man_made.survey_point" = "Geodeetiline märk";
 "type.man_made.flagpole" = "Lipumast";
 "type.man_made.lighthouse" = "Majakas";
 "type.man_made.mast" = "Mast";
 "type.man_made.pier" = "Kai";
 "type.man_made.pipeline" = "Torujuhe";
 "type.man_made.pipeline.overground" = "Maapealne torujuhe";
-"type.man_made.silo" = "Elevaator";
+"type.man_made.silo" = "Silo";
 "type.man_made.storage_tank" = "Mahuti";
-"type.man_made.surveillance" = "Jälgimiskaamera";
+"type.man_made.surveillance" = "Valvekaamera";
 "type.man_made.tower" = "Torn";
 
 /* A huge telecommunications tower. Often a local monument or a landmark. */
 "type.man_made.communications_tower" = "Sidetorn";
 
 /* A regular telecommunications tower / mast. */
-"type.man_made.tower.communication" = "Sidetorn";
+"type.man_made.tower.communication" = "Sidemast";
 
 /* A deep hole drilled into the earth to extract oil or gas. */
-"type.man_made.petroleum_well" = "Nafta- või gaasikaev";
+"type.man_made.petroleum_well" = "Nafta- või gaasi puurauk";
 
 /* A tower/mast constructed to burn off excess gas. */
-"type.man_made.flare" = "Gaasi leeke";
+"type.man_made.flare" = "Tööstuslik tõrvikpõleti";
 "type.man_made.wastewater_plant" = "Reoveepuhasti";
-"type.man_made.water_tap" = "Veekraan";
-"type.man_made.water_tap.drinking_water_no" = "Veekraan";
+"type.man_made.water_tap" = "Avalik veekraan";
+"type.man_made.water_tap.drinking_water_no" = "Pole joogivesi";
 "type.man_made.water_tower" = "Veetorn";
-"type.man_made.water_well" = "Vesiveski";
-"type.man_made.water_well.drinking_water_no" = "Vesiveski";
+"type.man_made.water_well" = "Veekaev";
+"type.man_made.water_well.drinking_water_no" = "Pole joogivesi";
 "type.man_made.windmill" = "Tuuleveski";
-"type.man_made.works" = "Vabrik";
+"type.man_made.works" = "Tehas";
 "type.mapswithme" = "mapswithme";
 "type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militaarobjekt";
@@ -781,44 +780,44 @@
 "type.natural" = "Loodus";
 
 /* A rocky land cover. */
-"type.natural.bare_rock" = "Paljas kivi";
+"type.natural.bare_rock" = "Paljand";
 
 /* A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. */
-"type.natural.shingle" = "Pebbles";
+"type.natural.shingle" = "Kiviklibu";
 
 /* A loose surface consisting of angular, sharp stones. Usually on a mountain slope and prone to landslides. */
-"type.natural.scree" = "Kiviklibu";
+"type.natural.scree" = "Rusukalle";
 "type.natural.bay" = "Laht";
 "type.natural.beach" = "Rand";
 "type.natural.beach.sand" = "Liivarand";
 "type.natural.beach.gravel" = "Kruusarand";
 "type.natural.cape" = "Neem";
-"type.natural.cave_entrance" = "Koobas";
+"type.natural.cave_entrance" = "Koopa sissepääs";
 "type.natural.cliff" = "Kalju";
-"type.natural.earth_bank" = "Maa pank";
+"type.natural.earth_bank" = "Nõlv";
 "type.man_made.embankment" = "Muldkeha";
 "type.natural.coastline" = "Rannajoon";
 "type.natural.desert" = "Kõrb";
 "type.natural.geyser" = "Geiser";
 "type.natural.glacier" = "Liustik";
 "type.natural.grassland" = "Rohumaa";
-"type.natural.heath" = "Nurm";
+"type.natural.heath" = "Nõmm";
 "type.natural.hot_spring" = "Kuumaveeallikas";
 "type.natural.water.lake" = "Järv";
-"type.natural.water.lock" = "Luku kamber";
+"type.natural.water.lock" = "Lüüs";
 "type.natural.water.pond" = "Tiik";
 "type.natural.water.reservoir" = "Veehoidla";
-"type.natural.water.basin" = "Bassein";
+"type.natural.water.basin" = "Kogumisbassein";
 "type.natural.water.river" = "Jõgi";
 "type.natural.land" = "Maa";
 "type.natural.meadow" = "Heinamaa";
 "type.natural.orchard" = "Viljapuuaed";
-"type.natural.peak" = "Tipp";
+"type.natural.peak" = "Mäetipp";
 "type.natural.saddle" = "Mäesadul";
-"type.natural.rock" = "Kivi";
+"type.natural.rock" = "Kaljurahn";
 "type.natural.scrub" = "Võsa";
-"type.natural.spring" = "Allikas";
-"type.natural.spring.drinking_water_no" = "Allikas";
+"type.natural.spring" = "Looduslik allikas";
+"type.natural.spring.drinking_water_no" = "Vesi pole joodav";
 "type.natural.strait" = "Väin";
 "type.natural.tree_row" = "Puude rida";
 "type.natural.vineyard" = "Viinamarjaistandus";
@@ -830,14 +829,14 @@
 "type.noexit" = "Tupiktee";
 "type.office" = "Kontor";
 "type.office.company" = "Ettevõtte kontor";
-"type.office.estate_agent" = "Kinnisvara vahendaja";
-"type.office.government" = "Riigikantselei";
+"type.office.estate_agent" = "Kinnisvarabüroo";
+"type.office.government" = "Valitsusasutus";
 "type.office.insurance" = "Kindlustusbüroo";
 "type.office.lawyer" = "Advokaat";
 "type.office.ngo" = "Valitsusväline organisatsioon";
-"type.office.telecommunication" = "Telekommunikatsiooni ettevõte";
-"type.organic.only" = "Orgaaniline";
-"type.organic.yes" = "Orgaaniline";
+"type.office.telecommunication" = "Sideettevõte";
+"type.organic.only" = "Mahetoode";
+"type.organic.yes" = "Mahetoode";
 "type.place.city" = "Linn";
 "type.place.city.capital" = "Pealinn";
 "type.place.city.capital.10" = "Linn";
@@ -857,11 +856,11 @@
 "type.place.hamlet" = "Külake";
 "type.place.island" = "Saar";
 "type.place.islet" = "Laid";
-"type.place.isolated_dwelling" = "Isoleeritud eluruum";
+"type.place.isolated_dwelling" = "Üksik eluhoone";
 "type.place.locality" = "Paikkond";
 
 /* Named part of a city or town, bigger than place=neighbourhood and smaller than place=suburb (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dquarter) */
-"type.place.quarter" = "Naabruskond";
+"type.place.quarter" = "Kvartal";
 
 /* Named part of a city, town or suburb, smaller than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Neighbourhood) */
 "type.place.neighbourhood" = "Naabruskond";
@@ -873,12 +872,12 @@
 "type.place.state.USA" = "Osariik";
 
 /* Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) */
-"type.place.suburb" = "Äärelinn";
+"type.place.suburb" = "Linnaosa";
 "type.place.town" = "Linn";
 "type.place.village" = "Küla";
 "type.power" = "Energia";
-"type.power.generator" = "Generaator";
-"type.power.generator.solar" = "Päikese generaator";
+"type.power.generator" = "Elektrigeneraator";
+"type.power.generator.solar" = "Päikesepaneel";
 "type.power.generator.wind" = "Tuulegeneraator";
 "type.power.generator.gas" = "Gaasiturbiini elektrijaam";
 "type.power.generator.hydro" = "Hüdroelektrijaam";
@@ -908,25 +907,25 @@
 "type.psurface.unpaved_bad" = "psurface-unpaved_bad";
 "type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Ühistransport";
-"type.public_transport.platform" = "Platvorm";
+"type.public_transport.platform" = "Ooteplatvorm";
 "type.railway" = "Raudtee";
 "type.railway.abandoned" = "Mahajäetud raudtee";
 "type.railway.abandoned.bridge" = "Mahajäetud sild";
-"type.railway.abandoned.tunnel" = "Mahajäetud tunnel";
-"type.railway.construction" = "Raudtee ehitus";
+"type.railway.abandoned.tunnel" = "Mahajäetud raudteetunnel";
+"type.railway.construction" = "Ehitusel raudtee";
 "type.railway.crossing" = "Raudtee ülesõit";
 "type.railway.disused" = "Kasutamata raudtee";
-"type.railway.funicular" = "Funicular";
-"type.railway.funicular.bridge" = "Funikulöör";
-"type.railway.funicular.tunnel" = "Funikulöör";
-"type.railway.halt" = "Murdepunkt";
+"type.railway.funicular" = "Köisraudtee";
+"type.railway.funicular.bridge" = "Köisraudtee sild";
+"type.railway.funicular.tunnel" = "Köisraudtee tunnel";
+"type.railway.halt" = "Rongipeatus (nõudepeatus / teivasjaam)";
 "type.railway.level_crossing" = "Raudteeületuskoht";
-"type.railway.light_rail" = "Kergrööbas";
-"type.railway.light_rail.bridge" = "Kergrööbas - sild";
-"type.railway.light_rail.tunnel" = "Kergrööbas - tunnel";
-"type.railway.monorail" = "Monorelss";
-"type.railway.monorail.bridge" = "Monorelss - sild";
-"type.railway.monorail.tunnel" = "Monorelss - tunnel";
+"type.railway.light_rail" = "Kergraudtee";
+"type.railway.light_rail.bridge" = "Kergraudtee sild";
+"type.railway.light_rail.tunnel" = "Kergraudtee tunnel";
+"type.railway.monorail" = "Monorelsstee";
+"type.railway.monorail.bridge" = "Monorelsstee sild";
+"type.railway.monorail.tunnel" = "Monorelsstee tunnel";
 "type.railway.narrow_gauge" = "Kitsarööpmeline raudtee";
 "type.railway.narrow_gauge.bridge" = "Kitsarööpmelise raudtee sild";
 "type.railway.narrow_gauge.tunnel" = "Kitsarööpmelise raudtee tunnel";
@@ -940,154 +939,154 @@
 "type.railway.rail.main" = "Raudtee";
 
 /* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
-"type.railway.rail.branch" = "Teisene raudtee";
+"type.railway.rail.branch" = "Raudtee kõrvaltee";
 
 /* Non-passenger utility tracks: industrial, military, test. */
 "type.railway.rail.utility" = "Teenindus raudtee";
-"type.railway.rail.spur" = "Rööbastee";
+"type.railway.rail.spur" = "Haruraudtee";
 
 /* Short service tracks: siding, yard, crossover. */
-"type.railway.rail.service" = "Lisarööpmel rööbastee";
-"type.railway.rail.bridge" = "Raudtee sild";
-"type.railway.rail.highspeed.bridge" = "Raudtee sild";
-"type.railway.rail.tourism.bridge" = "Raudtee sild";
-"type.railway.rail.main.bridge" = "Raudtee sild";
-"type.railway.rail.branch.bridge" = "Raudtee sild";
-"type.railway.rail.utility.bridge" = "Raudtee sild";
-"type.railway.rail.spur.bridge" = "Raudtee sild";
-"type.railway.rail.service.bridge" = "Raudtee sild";
-"type.railway.rail.tunnel" = "Raudtee tunnel";
-"type.railway.rail.highspeed.tunnel" = "Raudtee tunnel";
-"type.railway.rail.tourism.tunnel" = "Raudtee tunnel";
-"type.railway.rail.main.tunnel" = "Raudtee tunnel";
-"type.railway.rail.branch.tunnel" = "Raudtee tunnel";
-"type.railway.rail.utility.tunnel" = "Raudtee tunnel";
-"type.railway.rail.spur.tunnel" = "Raudtee tunnel";
-"type.railway.rail.service.tunnel" = "Raudtee tunnel";
-"type.railway.station" = "Raudtee jaam";
-"type.railway.station.funicular" = "Funicular";
-"type.railway.station.light_rail" = "Raudtee jaam";
-"type.railway.station.light_rail.berlin" = "Raudtee jaam";
-"type.railway.station.light_rail.london" = "Raudtee jaam";
-"type.railway.station.light_rail.porto" = "Raudtee jaam";
-"type.railway.station.monorail" = "Raudtee jaam";
-"type.railway.station.subway" = "Metroo";
-"type.railway.station.subway.adana" = "Metroo";
-"type.railway.station.subway.algiers" = "Metroo";
-"type.railway.station.subway.almaty" = "Metroo";
-"type.railway.station.subway.amsterdam" = "Metroo";
-"type.railway.station.subway.ankara" = "Metroo";
-"type.railway.station.subway.athens" = "Metroo";
-"type.railway.station.subway.baku" = "Metroo";
-"type.railway.station.subway.bangkok" = "Metroo";
-"type.railway.station.subway.barcelona" = "Metroo";
-"type.railway.station.subway.beijing" = "Metroo";
-"type.railway.station.subway.bengalore" = "Metroo";
-"type.railway.station.subway.berlin" = "Metroo";
-"type.railway.station.subway.bilbao" = "Metroo";
-"type.railway.station.subway.brasilia" = "Metroo";
-"type.railway.station.subway.brescia" = "Metroo";
-"type.railway.station.subway.brussels" = "Metroo";
-"type.railway.station.subway.bucharest" = "Metroo";
-"type.railway.station.subway.budapest" = "Metroo";
-"type.railway.station.subway.buenos_aires" = "Metroo";
-"type.railway.station.subway.bursa" = "Metroo";
-"type.railway.station.subway.cairo" = "Metroo";
-"type.railway.station.subway.caracas" = "Metroo";
-"type.railway.station.subway.catania" = "Metroo";
-"type.railway.station.subway.changchun" = "Metroo";
-"type.railway.station.subway.chengdu" = "Metroo";
-"type.railway.station.subway.chicago" = "Metroo";
-"type.railway.station.subway.chongqing" = "Metroo";
-"type.railway.station.subway.dalian" = "Metroo";
-"type.railway.station.subway.delhi" = "Metroo";
-"type.railway.station.subway.dnepro" = "Metroo";
-"type.railway.station.subway.dubai" = "Metroo";
-"type.railway.station.subway.ekb" = "Metroo";
-"type.railway.station.subway.fukuoka" = "Metroo";
-"type.railway.station.subway.glasgow" = "Metroo";
-"type.railway.station.subway.guangzhou" = "Metroo";
-"type.railway.station.subway.hamburg" = "Metroo";
-"type.railway.station.subway.helsinki" = "Metroo";
-"type.railway.station.subway.hiroshima" = "Metroo";
-"type.railway.station.subway.hongkong" = "Metroo";
-"type.railway.station.subway.isfahan" = "Metroo";
-"type.railway.station.subway.istanbul" = "Metroo";
-"type.railway.station.subway.izmir" = "Metroo";
-"type.railway.station.subway.kazan" = "Metroo";
-"type.railway.station.subway.kharkiv" = "Metroo";
-"type.railway.station.subway.kiev" = "Metroo";
-"type.railway.station.subway.kobe" = "Metroo";
-"type.railway.station.subway.kolkata" = "Metroo";
-"type.railway.station.subway.kunming" = "Metroo";
-"type.railway.station.subway.kyoto" = "Metroo";
-"type.railway.station.subway.la" = "Metroo";
-"type.railway.station.subway.lausanne" = "Metroo";
-"type.railway.station.subway.lille" = "Metroo";
-"type.railway.station.subway.lima" = "Metroo";
-"type.railway.station.subway.lisboa" = "Metroo";
-"type.railway.station.subway.london" = "Metroo";
-"type.railway.station.subway.lyon" = "Metroo";
-"type.railway.station.subway.madrid" = "Metroo";
-"type.railway.station.subway.malaga" = "Metroo";
-"type.railway.station.subway.manila" = "Metroo";
-"type.railway.station.subway.maracaibo" = "Metroo";
-"type.railway.station.subway.mashhad" = "Metroo";
-"type.railway.station.subway.mecca" = "Metroo";
-"type.railway.station.subway.medellin" = "Metroo";
-"type.railway.station.subway.mexico" = "Metroo";
-"type.railway.station.subway.milan" = "Metroo";
-"type.railway.station.subway.minsk" = "Metroo";
-"type.railway.station.subway.montreal" = "Metroo";
-"type.railway.station.subway.moscow" = "Metroo";
-"type.railway.station.subway.munchen" = "Metroo";
-"type.railway.station.subway.nagoya" = "Metroo";
-"type.railway.station.subway.newyork" = "Metroo";
-"type.railway.station.subway.nnov" = "Metroo";
-"type.railway.station.subway.novosibirsk" = "Metroo";
-"type.railway.station.subway.osaka" = "Metroo";
-"type.railway.station.subway.oslo" = "Metroo";
-"type.railway.station.subway.palma" = "Metroo";
-"type.railway.station.subway.panama" = "Metroo";
-"type.railway.station.subway.paris" = "Metroo";
-"type.railway.station.subway.philadelphia" = "Metroo";
-"type.railway.station.subway.pyongyang" = "Metroo";
-"type.railway.station.subway.rennes" = "Metroo";
-"type.railway.station.subway.rio" = "Metroo";
-"type.railway.station.subway.roma" = "Metroo";
-"type.railway.station.subway.rotterdam" = "Metroo";
-"type.railway.station.subway.samara" = "Metroo";
-"type.railway.station.subway.santiago" = "Metroo";
-"type.railway.station.subway.santo_domingo" = "Metroo";
-"type.railway.station.subway.saopaulo" = "Metroo";
-"type.railway.station.subway.sapporo" = "Metroo";
-"type.railway.station.subway.sendai" = "Metroo";
-"type.railway.station.subway.sf" = "Metroo";
-"type.railway.station.subway.shanghai" = "Metroo";
-"type.railway.station.subway.shenzhen" = "Metroo";
-"type.railway.station.subway.shiraz" = "Metroo";
-"type.railway.station.subway.singapore" = "Metroo";
-"type.railway.station.subway.sofia" = "Metroo";
-"type.railway.station.subway.spb" = "Metroo";
-"type.railway.station.subway.stockholm" = "Metroo";
-"type.railway.station.subway.tabriz" = "Metroo";
-"type.railway.station.subway.taipei" = "Metroo";
-"type.railway.station.subway.taoyuan" = "Metroo";
-"type.railway.station.subway.tashkent" = "Metroo";
-"type.railway.station.subway.tbilisi" = "Metroo";
-"type.railway.station.subway.tehran" = "Metroo";
-"type.railway.station.subway.tianjin" = "Metroo";
-"type.railway.station.subway.tokyo" = "Metroo";
-"type.railway.station.subway.valencia" = "Metroo";
-"type.railway.station.subway.vienna" = "Metroo";
-"type.railway.station.subway.warszawa" = "Metroo";
-"type.railway.station.subway.washington" = "Metroo";
-"type.railway.station.subway.wuhan" = "Metroo";
-"type.railway.station.subway.yerevan" = "Metroo";
-"type.railway.station.subway.yokohama" = "Metroo";
+"type.railway.rail.service" = "Kõrvalraudtee";
+"type.railway.rail.bridge" = "Raudteesild";
+"type.railway.rail.highspeed.bridge" = "Kiirraudtee sild";
+"type.railway.rail.tourism.bridge" = "Turismiraudtee sild";
+"type.railway.rail.main.bridge" = "Magistraalraudtee sild";
+"type.railway.rail.branch.bridge" = "Haruraudtee sild";
+"type.railway.rail.utility.bridge" = "Teenindusraudtee sild";
+"type.railway.rail.spur.bridge" = "Haruraudtee sild";
+"type.railway.rail.service.bridge" = "Teenindusraudtee sild";
+"type.railway.rail.tunnel" = "Raudteetunnel";
+"type.railway.rail.highspeed.tunnel" = "Kiirraudtee tunnel";
+"type.railway.rail.tourism.tunnel" = "Turismiraudtee tunnel";
+"type.railway.rail.main.tunnel" = "Magistraalraudtee tunnel";
+"type.railway.rail.branch.tunnel" = "Haruraudtee tunnel";
+"type.railway.rail.utility.tunnel" = "Teenindusraudtee tunnel";
+"type.railway.rail.spur.tunnel" = "Haruraudtee tunnel";
+"type.railway.rail.service.tunnel" = "Teenindusraudtee tunnel";
+"type.railway.station" = "Raudteejaam";
+"type.railway.station.funicular" = "Köisraudtee";
+"type.railway.station.light_rail" = "Kergraudtee jaam";
+"type.railway.station.light_rail.berlin" = "Raudteejaam (S-Bahn)";
+"type.railway.station.light_rail.london" = "Raudteejaam (DLR)";
+"type.railway.station.light_rail.porto" = "Kergraudtee jaam";
+"type.railway.station.monorail" = "Monorelstee jaam";
+"type.railway.station.subway" = "Metroojaam";
+"type.railway.station.subway.adana" = "Metroojaam";
+"type.railway.station.subway.algiers" = "Metroojaam";
+"type.railway.station.subway.almaty" = "Metroojaam";
+"type.railway.station.subway.amsterdam" = "Metroojaam";
+"type.railway.station.subway.ankara" = "Metroojaam";
+"type.railway.station.subway.athens" = "Metroojaam";
+"type.railway.station.subway.baku" = "Metroojaam";
+"type.railway.station.subway.bangkok" = "Metroojaam";
+"type.railway.station.subway.barcelona" = "Metroojaam";
+"type.railway.station.subway.beijing" = "Metroojaam";
+"type.railway.station.subway.bengalore" = "Metroojaam";
+"type.railway.station.subway.berlin" = "Metroojaam";
+"type.railway.station.subway.bilbao" = "Metroojaam";
+"type.railway.station.subway.brasilia" = "Metroojaam";
+"type.railway.station.subway.brescia" = "Metroojaam";
+"type.railway.station.subway.brussels" = "Metroojaam";
+"type.railway.station.subway.bucharest" = "Metroojaam";
+"type.railway.station.subway.budapest" = "Metroojaam";
+"type.railway.station.subway.buenos_aires" = "Metroojaam";
+"type.railway.station.subway.bursa" = "Metroojaam";
+"type.railway.station.subway.cairo" = "Metroojaam";
+"type.railway.station.subway.caracas" = "Metroojaam";
+"type.railway.station.subway.catania" = "Metroojaam";
+"type.railway.station.subway.changchun" = "Metroojaam";
+"type.railway.station.subway.chengdu" = "Metroojaam";
+"type.railway.station.subway.chicago" = "Metroojaam";
+"type.railway.station.subway.chongqing" = "Metroojaam";
+"type.railway.station.subway.dalian" = "Metroojaam";
+"type.railway.station.subway.delhi" = "Metroojaam";
+"type.railway.station.subway.dnepro" = "Metroojaam";
+"type.railway.station.subway.dubai" = "Metroojaam";
+"type.railway.station.subway.ekb" = "Metroojaam";
+"type.railway.station.subway.fukuoka" = "Metroojaam";
+"type.railway.station.subway.glasgow" = "Metroojaam";
+"type.railway.station.subway.guangzhou" = "Metroojaam";
+"type.railway.station.subway.hamburg" = "Metroojaam";
+"type.railway.station.subway.helsinki" = "Metroojaam";
+"type.railway.station.subway.hiroshima" = "Metroojaam";
+"type.railway.station.subway.hongkong" = "Metroojaam";
+"type.railway.station.subway.isfahan" = "Metroojaam";
+"type.railway.station.subway.istanbul" = "Metroojaam";
+"type.railway.station.subway.izmir" = "Metroojaam";
+"type.railway.station.subway.kazan" = "Metroojaam";
+"type.railway.station.subway.kharkiv" = "Metroojaam";
+"type.railway.station.subway.kiev" = "Metroojaam";
+"type.railway.station.subway.kobe" = "Metroojaam";
+"type.railway.station.subway.kolkata" = "Metroojaam";
+"type.railway.station.subway.kunming" = "Metroojaam";
+"type.railway.station.subway.kyoto" = "Metroojaam";
+"type.railway.station.subway.la" = "Metroojaam";
+"type.railway.station.subway.lausanne" = "Metroojaam";
+"type.railway.station.subway.lille" = "Metroojaam";
+"type.railway.station.subway.lima" = "Metroojaam";
+"type.railway.station.subway.lisboa" = "Metroojaam";
+"type.railway.station.subway.london" = "Metroojaam";
+"type.railway.station.subway.lyon" = "Metroojaam";
+"type.railway.station.subway.madrid" = "Metroojaam";
+"type.railway.station.subway.malaga" = "Metroojaam";
+"type.railway.station.subway.manila" = "Metroojaam";
+"type.railway.station.subway.maracaibo" = "Metroojaam";
+"type.railway.station.subway.mashhad" = "Metroojaam";
+"type.railway.station.subway.mecca" = "Metroojaam";
+"type.railway.station.subway.medellin" = "Metroojaam";
+"type.railway.station.subway.mexico" = "Metroojaam";
+"type.railway.station.subway.milan" = "Metroojaam";
+"type.railway.station.subway.minsk" = "Metroojaam";
+"type.railway.station.subway.montreal" = "Metroojaam";
+"type.railway.station.subway.moscow" = "Metroojaam";
+"type.railway.station.subway.munchen" = "Metroojaam";
+"type.railway.station.subway.nagoya" = "Metroojaam";
+"type.railway.station.subway.newyork" = "Metroojaam";
+"type.railway.station.subway.nnov" = "Metroojaam";
+"type.railway.station.subway.novosibirsk" = "Metroojaam";
+"type.railway.station.subway.osaka" = "Metroojaam";
+"type.railway.station.subway.oslo" = "Metroojaam";
+"type.railway.station.subway.palma" = "Metroojaam";
+"type.railway.station.subway.panama" = "Metroojaam";
+"type.railway.station.subway.paris" = "Metroojaam";
+"type.railway.station.subway.philadelphia" = "Metroojaam";
+"type.railway.station.subway.pyongyang" = "Metroojaam";
+"type.railway.station.subway.rennes" = "Metroojaam";
+"type.railway.station.subway.rio" = "Metroojaam";
+"type.railway.station.subway.roma" = "Metroojaam";
+"type.railway.station.subway.rotterdam" = "Metroojaam";
+"type.railway.station.subway.samara" = "Metroojaam";
+"type.railway.station.subway.santiago" = "Metroojaam";
+"type.railway.station.subway.santo_domingo" = "Metroojaam";
+"type.railway.station.subway.saopaulo" = "Metroojaam";
+"type.railway.station.subway.sapporo" = "Metroojaam";
+"type.railway.station.subway.sendai" = "Metroojaam";
+"type.railway.station.subway.sf" = "Metroojaam";
+"type.railway.station.subway.shanghai" = "Metroojaam";
+"type.railway.station.subway.shenzhen" = "Metroojaam";
+"type.railway.station.subway.shiraz" = "Metroojaam";
+"type.railway.station.subway.singapore" = "Metroojaam";
+"type.railway.station.subway.sofia" = "Metroojaam";
+"type.railway.station.subway.spb" = "Metroojaam";
+"type.railway.station.subway.stockholm" = "Metroojaam";
+"type.railway.station.subway.tabriz" = "Metroojaam";
+"type.railway.station.subway.taipei" = "Metroojaam";
+"type.railway.station.subway.taoyuan" = "Metroojaam";
+"type.railway.station.subway.tashkent" = "Metroojaam";
+"type.railway.station.subway.tbilisi" = "Metroojaam";
+"type.railway.station.subway.tehran" = "Metroojaam";
+"type.railway.station.subway.tianjin" = "Metroojaam";
+"type.railway.station.subway.tokyo" = "Metroojaam";
+"type.railway.station.subway.valencia" = "Metroojaam";
+"type.railway.station.subway.vienna" = "Metroojaam";
+"type.railway.station.subway.warszawa" = "Metroojaam";
+"type.railway.station.subway.washington" = "Metroojaam";
+"type.railway.station.subway.wuhan" = "Metroojaam";
+"type.railway.station.subway.yerevan" = "Metroojaam";
+"type.railway.station.subway.yokohama" = "Metroojaam";
 "type.railway.subway" = "Metrooliin";
-"type.railway.subway.bridge" = "Metrooliin - sild";
-"type.railway.subway.tunnel" = "Metrooliin - tunnel";
+"type.railway.subway.bridge" = "Metrooliini sild";
+"type.railway.subway.tunnel" = "Metrooliini tunnel";
 "type.railway.subway_entrance" = "Metroo sissepääs";
 "type.railway.subway_entrance.adana" = "Metroo sissepääs";
 "type.railway.subway_entrance.algiers" = "Metroo sissepääs";
@@ -1206,97 +1205,97 @@
 "type.railway.tram.bridge" = "Trammiliini sild";
 "type.railway.tram.tunnel" = "Trammiliini tunnel";
 "type.railway.tram_stop" = "Trammipeatus";
-"type.route" = "Tee";
-"type.route.ferry" = "Praam";
+"type.route" = "Marsruut";
+"type.route.ferry" = "Praamiliin";
 "type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Pood";
 "type.shop.alcohol" = "Alkoholipood";
 "type.shop.bakery" = "Pagar";
 "type.shop.bathroom_furnishing" = "Vannitoa sisustus";
 "type.shop.beauty" = "Ilupood";
-"type.shop.beverages" = "Joogid";
+"type.shop.beverages" = "Joogipood";
 "type.shop.bicycle" = "Jalgrattapood";
 "type.shop.bookmaker" = "Kihlveokontor";
 "type.shop.books" = "Raamatupood";
 "type.shop.butcher" = "Lihunik";
 "type.shop.cannabis" = "Kanepipood";
 "type.shop.car" = "Autopood";
-"type.shop.car_parts" = "Autovaruosad";
+"type.shop.car_parts" = "Autovaruosade pood";
 "type.shop.car_repair" = "Autoremonditöökoda";
 "type.shop.car_repair.tyres" = "Rehviparandus";
 "type.shop.caravan" = "Haagiselamute müük";
-"type.shop.carpet" = "Vaibad";
-"type.shop.chemist" = "Apteegipood";
+"type.shop.carpet" = "Vaibapood";
+"type.shop.chemist" = "Apteek ja ilupood";
 "type.shop.chocolate" = "Šokolaadipood";
 "type.shop.clothes" = "Rõivapood";
 "type.shop.coffee" = "Kohvipood";
 "type.shop.computer" = "Arvutipood";
-"type.shop.confectionery" = "Maiustused";
+"type.shop.confectionery" = "Kommipood";
 "type.shop.convenience" = "Lähikauplus";
-"type.shop.copyshop" = "Koopiapood";
-"type.shop.cosmetics" = "Kosmeetika";
-"type.shop.curtain" = "Kardinad";
+"type.shop.copyshop" = "Koopiateenused";
+"type.shop.cosmetics" = "Kosmeetikapood";
+"type.shop.curtain" = "Kardinapood";
 "type.shop.deli" = "Delikatessipood";
 "type.shop.department_store" = "Kaubamaja";
 "type.shop.doityourself" = "Tööriistapood";
-"type.shop.dry_cleaning" = "Keemiline pesu";
-"type.shop.electronics" = "Elektroonika";
+"type.shop.dry_cleaning" = "Keemiline puhastus";
+"type.shop.electronics" = "Elektroonikapood";
 "type.shop.erotic" = "Erootikapood";
-"type.shop.fabric" = "Vabrikupood";
+"type.shop.fabric" = "Kangapood";
 "type.shop.farm" = "Talutoitude pood";
-"type.shop.fashion_accessories" = "Moodsad aksessuaarid";
+"type.shop.fashion_accessories" = "Moeaksessuaaride pood";
 "type.shop.florist" = "Lillepood";
-"type.shop.funeral_directors" = "Matusekorraldajad";
+"type.shop.funeral_directors" = "Matusekorraldaja";
 "type.shop.furniture" = "Mööblipood";
-"type.shop.garden_centre" = "Aianduspood";
-"type.shop.gas" = "Gaasipood";
+"type.shop.garden_centre" = "Aianduskeskus";
+"type.shop.gas" = "Balloongaasi kauplus";
 "type.shop.gift" = "Kingipood";
-"type.shop.greengrocer" = "Köögiviljapood";
-"type.shop.grocery" = "Toidukaubad";
+"type.shop.greengrocer" = "Puu- ja köögiviljapood";
+"type.shop.grocery" = "Toidukauplus";
 "type.shop.hairdresser" = "Juuksur";
-"type.shop.hardware" = "Isetegemise tööriistad";
-"type.shop.health_food" = "Tervisetoitude pood";
-"type.shop.hearing_aids" = "Kuuldeaparaadi kauplus";
-"type.shop.herbalist" = "Maitsetaimede pood";
-"type.shop.hifi" = "HiFi heli";
-"type.shop.houseware" = "Majatarbed";
-"type.shop.jewelry" = "Ehted";
+"type.shop.hardware" = "Rauakauplus";
+"type.shop.health_food" = "Tervisliku toidu kauplus";
+"type.shop.hearing_aids" = "Kuuldeaparaatide kauplus";
+"type.shop.herbalist" = "Ravimtaimede pood";
+"type.shop.hifi" = "Hifi kauplus";
+"type.shop.houseware" = "Kodutarvete kauplus";
+"type.shop.jewelry" = "Ehtepood";
 "type.shop.kiosk" = "Kiosk";
-"type.shop.kitchen" = "Köögipood";
-"type.shop.laundry" = "Pesu";
+"type.shop.kitchen" = "Köögimööblikauplus";
+"type.shop.laundry" = "Pesumaja";
 "type.shop.mall" = "Kaubanduskeskus";
 "type.shop.massage" = "Massaažisalong";
-"type.shop.mobile_phone" = "Mobiiltelefonid";
-"type.shop.money_lender" = "Rahalaenutaja";
+"type.shop.mobile_phone" = "Mobiiltelefonipood";
+"type.shop.money_lender" = "Kiirlaenukontor";
 "type.shop.motorcycle" = "Mootorrattapood";
 "type.shop.motorcycle_repair" = "Mootorrataste remont";
 "type.shop.music" = "Plaadipood";
-"type.shop.musical_instrument" = "Muusikariistad";
-"type.shop.newsagent" = "Ajalehe stend";
-"type.shop.optician" = "Optik";
-"type.shop.outdoor" = "Välisvarustus";
-"type.shop.outpost" = "Vastuvõtupunkt";
-"type.shop.pasta" = "Pasta pood";
-"type.shop.pastry" = "Pagar";
+"type.shop.musical_instrument" = "Muusikariistade pood";
+"type.shop.newsagent" = "Ajalehekiosk";
+"type.shop.optician" = "Optikapood";
+"type.shop.outdoor" = "Matkatarvete kauplus";
+"type.shop.outpost" = "Veebikaubamaja teeninduslett";
+"type.shop.pasta" = "Pastapood";
+"type.shop.pastry" = "Pagari- ja kondiitriäri";
 "type.shop.pawnbroker" = "Pandimaja";
 "type.shop.pet" = "Lemmikloomapood";
-"type.shop.pet_grooming" = "Lemmikloomade hooldamine";
+"type.shop.pet_grooming" = "Ilusalong lemmikloomadele";
 "type.shop.photo" = "Fotopood";
-"type.shop.rental" = "Laenutuspood";
+"type.shop.rental" = "Renditeenuse büroo";
 "type.shop.rental.bicycle" = "Jalgrattalaenutus";
 "type.shop.seafood" = "Mereandide pood";
-"type.shop.second_hand" = "Taaskasutus";
+"type.shop.second_hand" = "Taaskasutuspood";
 "type.shop.shoes" = "Kingapood";
-"type.shop.sports" = "Sporditarbed";
-"type.shop.stationery" = "Kontoritarbed";
+"type.shop.sports" = "Sporditarvete pood";
+"type.shop.stationery" = "Kontoritarvete pood";
 "type.shop.supermarket" = "Supermarket";
 "type.shop.tattoo" = "Tätoveerimissalong";
 "type.shop.tea" = "Teepood";
-"type.shop.ticket" = "Piletipood";
+"type.shop.ticket" = "Piletikassa";
 "type.shop.toys" = "Mänguasjapood";
 "type.shop.travel_agency" = "Reisibüroo";
 "type.shop.tyres" = "Rehvipood";
-"type.shop.variety_store" = "Odavpood";
+"type.shop.variety_store" = "Odavkaupade pood";
 "type.shop.video" = "Videopood";
 "type.shop.video_games" = "Videomängude pood";
 "type.shop.wine" = "Veinipood";
@@ -1313,21 +1312,21 @@
 "type.shop.charity" = "Heategevuspood";
 "type.shop.cheese" = "Juustupood";
 "type.shop.craft" = "Kunst ja käsitöö";
-"type.shop.dairy" = "Piimatooted";
+"type.shop.dairy" = "Piimatoodete pood";
 "type.shop.electrical" = "Elektritarvete pood";
 "type.shop.fishing" = "Kalanduspood";
-"type.shop.interior_decoration" = "Sisekujunduse kaunistused";
-"type.shop.lottery" = "Loteriipiletid";
-"type.shop.medical_supply" = "Meditsiinitarbed";
-"type.shop.nutrition_supplements" = "Toidulisandid";
-"type.shop.paint" = "Värvid";
-"type.shop.perfumery" = "Parfümeeria";
-"type.shop.sewing" = "Õmblustarbed";
-"type.shop.storage_rental" = "Ladustuse rent";
-"type.shop.tobacco" = "Tubakas";
-"type.shop.trade" = "Kaubandustarvikud";
-"type.shop.watches" = "Kellad";
-"type.shop.wholesale" = "Hulgimüügi pood";
+"type.shop.interior_decoration" = "Sisekujunduskauplus";
+"type.shop.lottery" = "Lotokiosk";
+"type.shop.medical_supply" = "Meditsiinitarvikute kauplus";
+"type.shop.nutrition_supplements" = "Toidulisandite kauplus";
+"type.shop.paint" = "Värvipood";
+"type.shop.perfumery" = "Parfümeeriapood";
+"type.shop.sewing" = "Õmblustarvete pood";
+"type.shop.storage_rental" = "Väike rendiladu";
+"type.shop.tobacco" = "Tubakapood";
+"type.shop.trade" = "Profikaupade pood";
+"type.shop.watches" = "Kellapood";
+"type.shop.wholesale" = "Hulgimüügipood";
 "type.sport" = "Sport";
 "type.sport.american_football" = "Ameerika jalgpall";
 "type.sport.archery" = "Vibulaskmine";
@@ -1339,7 +1338,7 @@
 "type.sport.bowls" = "Murukeegel";
 "type.sport.chess" = "Male";
 "type.sport.cricket" = "Kriket";
-"type.sport.curling" = "Kurling";
+"type.sport.curling" = "Jääkeegel";
 "type.sport.equestrian" = "Ratsasport";
 "type.sport.golf" = "Golf";
 "type.sport.gymnastics" = "Võimlemine";
@@ -1348,7 +1347,7 @@
 
 /* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Sukeldusmiskoht";
-"type.sport.shooting" = "Laskmine";
+"type.sport.shooting" = "Laskesport";
 "type.sport.skateboard" = "Rulasõit";
 "type.sport.skiing" = "Suusatamine";
 "type.sport.soccer" = "Jalgpall";
@@ -1356,103 +1355,103 @@
 "type.sport.table_tennis" = "Lauatennis";
 "type.sport.tennis" = "Tenniseväljak";
 "type.sport.volleyball" = "Võrkpall";
-"type.sport.10pin" = "Bowling";
-"type.sport.9pin" = "Bowling";
+"type.sport.10pin" = "Hobikeegel";
+"type.sport.9pin" = "Keegel";
 "type.sport.padel" = "Padel";
-"type.sport.futsal" = "Futsal";
+"type.sport.futsal" = "Saalijalgpall";
 "type.sport.ice_hockey" = "Jäähoki";
 "type.sport.field_hockey" = "Maahoki";
-"type.sport.badminton" = "Badminton";
+"type.sport.badminton" = "Sulgpall";
 "type.sport.pelota" = "Baski pelota";
 "type.tourism" = "Turism";
 "type.tourism.aquarium" = "Akvaarium";
 
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Mägimajake";
-"type.tourism.apartment" = "Puhkuse korter";
+"type.tourism.apartment" = "Külaliskorter";
 "type.tourism.artwork" = "Kunstiteos";
 "type.tourism.artwork.architecture" = "Kunstiteos - arhitektuur";
-"type.tourism.artwork.painting" = "Kunstiteos - maal";
-"type.tourism.artwork.sculpture" = "Kunstiteos - skulptuur";
-"type.tourism.artwork.statue" = "Kunstiteos - kuju";
+"type.tourism.artwork.painting" = "Maal";
+"type.tourism.artwork.sculpture" = "Skulptuur";
+"type.tourism.artwork.statue" = "Kuju";
 "type.tourism.attraction" = "Turismiatraktsioon";
-"type.attraction.amusement_ride" = "Lõbustus Ride";
+"type.attraction.amusement_ride" = "Lõbusõidu atraktsioon";
 "type.attraction.animal" = "Loomade aedik";
-"type.attraction.bumper_car" = "Põrkavad elektriautod";
+"type.attraction.bumper_car" = "Autodroom";
 "type.attraction.big_wheel" = "Vaateratas";
 "type.attraction.carousel" = "Karussell";
 "type.attraction.historic" = "Ajalooline vaatamisväärsus";
 "type.attraction.maze" = "Labürint";
-"type.attraction.roller_coaster" = "Vuoristorata";
+"type.attraction.roller_coaster" = "Ameerika mäed";
 "type.attraction.water_slide" = "Vesiliug";
 "type.tourism.attraction.specified" = "Turismiatraktsioon";
-"type.tourism.camp_site" = "Telkimine";
+"type.tourism.camp_site" = "Kämpinguala";
 "type.tourism.caravan_site" = "Haagiselamute park";
 
 /* A rentable countryside vacation house. */
 "type.tourism.chalet" = "Puhkemaja";
-"type.tourism.gallery" = "Galerii";
+"type.tourism.gallery" = "Kunstigalerii";
 "type.tourism.guest_house" = "Külalistemaja";
 "type.tourism.hostel" = "Hostel";
 "type.tourism.hotel" = "Hotell";
-"type.tourism.information" = "Turistiinfo";
+"type.tourism.information" = "Turismiinfo";
 "type.tourism.information.board" = "Infotahvel";
-"type.tourism.information.guidepost" = "Juhtpost";
-"type.tourism.information.map" = "Turistikaart";
-"type.tourism.information.office" = "Turismiinfo";
+"type.tourism.information.guidepost" = "Teeviit";
+"type.tourism.information.map" = "Infotahvel kaardiga";
+"type.tourism.information.office" = "Turismiinfo kontor";
 "type.tourism.information.visitor_centre" = "Külastuskeskus";
 "type.tourism.motel" = "Motell";
 "type.tourism.museum" = "Muuseum";
 "type.tourism.picnic_site" = "Piknikukoht";
 "type.leisure.resort" = "Kuurort";
 "type.tourism.theme_park" = "Teemapark";
-"type.tourism.viewpoint" = "Vaatluskoht";
+"type.tourism.viewpoint" = "Vaatekoht";
 
 /* Typically more basic, not staffed and free (compared to alpine_hut). */
-"type.tourism.wilderness_hut" = "Loodusonn";
+"type.tourism.wilderness_hut" = "Kõnnumaa ulualune";
 "type.tourism.zoo" = "Loomaaed";
-"type.tourism.zoo.petting" = "Lemmikloomaaed";
+"type.tourism.zoo.petting" = "Loomade seltsiaed";
 "type.traffic_calming" = "Liikluse rahustamine";
-"type.traffic_calming.bump" = "Liiklusee aeglustusmühk";
-"type.traffic_calming.hump" = "Liikluse aeglustussaar";
+"type.traffic_calming.bump" = "Kiirusepiiraja";
+"type.traffic_calming.hump" = "Liikluskünnis";
 "type.waterway" = "Veetee";
 "type.waterway.canal" = "Kanal";
-"type.waterway.canal.tunnel" = "Kanal";
-"type.waterway.fish_pass" = "Kala redel";
+"type.waterway.canal.tunnel" = "Kanal tunnelis";
+"type.waterway.fish_pass" = "Kalatrepp";
 "type.waterway.dam" = "Tamm";
 "type.barrier.ditch" = "Kraav";
 "type.natural.water.ditch" = "Drenaažikraav";
-"type.waterway.ditch.tunnel" = "Truupp";
-"type.waterway.dock" = "Veetee dokk";
+"type.waterway.ditch.tunnel" = "Truup";
+"type.waterway.dock" = "Dokk";
 "type.waterway.drain" = "Kuivenduskraav";
 "type.natural.water.drain" = "Kuivenduskraav";
-"type.waterway.drain.tunnel" = "Truupp";
-"type.waterway.lock_gate" = "Lüüsi värav";
+"type.waterway.drain.tunnel" = "Truup";
+"type.waterway.lock_gate" = "Lüüsivärav";
 "type.waterway.river" = "Jõgi";
-"type.waterway.river.tunnel" = "Jõgi";
+"type.waterway.river.tunnel" = "Jõgi tunnelis";
 "type.waterway.stream" = "Oja";
-"type.waterway.stream.ephemeral" = "Jõgi";
-"type.waterway.stream.intermittent" = "Jõgi";
-"type.waterway.stream.tunnel" = "Oja";
+"type.waterway.stream.ephemeral" = "Väga ajutine jõgi";
+"type.waterway.stream.intermittent" = "Ajutine jõgi";
+"type.waterway.stream.tunnel" = "Oja tunnelis";
 "type.waterway.waterfall" = "Kosk";
-"type.waterway.weir" = "Pais";
+"type.waterway.weir" = "Ülevoolupais";
 "type.wheelchair" = "Ratastool";
-"type.wheelchair.limited" = "Piiratud ratastooliga ligipääs";
-"type.wheelchair.no" = "Puudub ratastooliga ligipääs";
-"type.wheelchair.yes" = "Täielik ratastooli ligipääs";
-"type.aerialway.j.bar" = "Slepplift";
-"type.aerialway.magic_carpet" = "Võluvaip";
-"type.aerialway.platter" = "Plaatlift";
-"type.aerialway.rope_tow" = "Köislift";
-"type.aerialway.t.bar" = "Ankurlift";
+"type.wheelchair.limited" = "Piiratud ligipääs ratastooliga";
+"type.wheelchair.no" = "Puudub ligipääs ratastooliga";
+"type.wheelchair.yes" = "Täielik ligipääs ratastooliga";
+"type.aerialway.j.bar" = "J-kinnitusega Slepplift";
+"type.aerialway.magic_carpet" = "Suusaeskalaator";
+"type.aerialway.platter" = "Isteplaadikesega lift";
+"type.aerialway.rope_tow" = "Vedukköis";
+"type.aerialway.t.bar" = "T-kinnitusega Slepplift";
 "type.piste_type.downhill" = "Mäesuusarada";
 "type.piste_type.downhill.area" = "Mäesuusarada";
-"type.piste_type.downhill.advanced" = "Raske laskumine";
-"type.piste_type.downhill.advanced.area" = "Raske laskumine";
-"type.piste_type.downhill.easy" = "Kerge laskumine";
-"type.piste_type.downhill.easy.area" = "Kerge laskumine";
-"type.piste_type.downhill.expert" = "Professionaalne laskumine";
-"type.piste_type.downhill.expert.area" = "Professionaalne laskumine";
+"type.piste_type.downhill.advanced" = "Keerukas mäesuusarada";
+"type.piste_type.downhill.advanced.area" = "Keerukas mäesuusarada";
+"type.piste_type.downhill.easy" = "Lihtne mäesuusarada";
+"type.piste_type.downhill.easy.area" = "Lihtne mäesuusarada";
+"type.piste_type.downhill.expert" = "Proffide mäesuusarada";
+"type.piste_type.downhill.expert.area" = "Proffide mäesuusarada";
 "type.piste_type.downhill.freeride" = "Tasuta mäesuusatamine";
 "type.piste_type.downhill.intermediate" = "Keskmise raskusastmega laskumine";
 "type.piste_type.downhill.intermediate.area" = "Keskmise raskusastmega laskumine";
@@ -1461,12 +1460,12 @@
 "type.piste_type.nordic" = "Murdmaa suusarada";
 "type.piste_type.sled" = "Kelgurada";
 "type.piste_type.sled.area" = "Kelgurada";
-"type.piste_type.snow_park" = "Snow Park";
-"type.piste_type.hike" = "Lumi matkarada";
-"type.piste_type.connection" = "Piste ühendus";
-"type.piste_type.skitour" = "Skituuri rada";
+"type.piste_type.snow_park" = "Lumepark";
+"type.piste_type.hike" = "Matkarada lumes matkamiseks";
+"type.piste_type.connection" = "Suusatõstukite ümberistumisjaam";
+"type.piste_type.skitour" = "Suusamatkarada";
 "type.amenity.events_venue" = "Ürituste toimumiskoht";
-"type.shop.auction" = "Oksjon";
+"type.shop.auction" = "Oksjonimaja";
 "type.shop.collector" = "Kollektsioneeritavad esemed";
 "type.self_service.yes" = "Iseteenindus saadaval";
 "type.self_service.only" = "Ainult iseteenindus";
@@ -1474,13 +1473,14 @@
 "type.self_service.no" = "Iseteenindus puudub";
 
 /* https://wiki.openstreetmap.org/wiki/Key:social_facility */
-"type.amenity.social_facility" = "Sotsiaalne rajatis";
+"type.amenity.social_facility" = "Sotsiaalasutus";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance */
 "type.emergency.emergency_ward_entrance" = "Erakorralise meditsiini osakonna sissepääs";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo */
-"type.amenity.dojo" = "Dojo";
+"type.amenity.dojo" = "Dōjō / Võitluskunstide kool";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Spordisaal";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
index 4643cc610c..857c56abaf 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d signets</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>%d fichiers ont été trouvés. Vous les verrez après la conversion.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d piste</string>
+			<key>zero</key>
+			<string>%d trace</string>
 			<key>other</key>
-			<string>%d pistes</string>
+			<string>%d trace</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.stringsdict
index 06e13d8423..12f3e70c11 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -19,7 +16,6 @@
 			<string>%d bookmarks</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -34,7 +30,6 @@
 			<string>%d files were found. You can see them after conversion.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -45,10 +40,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d tracks?</string>
 			<key>other</key>
-			<string>%d tracks</string>
+			<string>%d tracks?</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index 46d571244d..fa53780e80 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d preferiti</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>%d file sono stati trovati. Li vedrai dopo la conversione.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d percorso</string>
+			<key>zero</key>
+			<string>%d tracce</string>
 			<key>other</key>
-			<string>%d percorsi</string>
+			<string>%d tracce</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
index 5c23d5df16..87388f70b6 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -19,7 +16,6 @@
 			<string>%d個のブックマーク</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -30,13 +26,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d ファイルが見つかりました。変換後にそれを見ることができます。</string>
 			<key>other</key>
 			<string>%d ファイルが見つかりました。変換後にそれを見ることができます。</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -47,12 +40,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d の追跡</string>
+			<key>zero</key>
+			<string>%d件の経路</string>
 			<key>other</key>
-			<string>%d の追跡</string>
+			<string>%d件の経路</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
index 874bc0c754..9969c41c15 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
@@ -410,10 +410,6 @@
 
 /* blue gray color */
 "blue_gray" = "Mėlynai pilkas";
-
-
-/********** Routing dialogs strings **********/
-
 "dialog_routing_disclaimer_title" = "Keliaudami maršrutu įsidėmėkite:";
 "dialog_routing_disclaimer_priority" = "— Kelių kokybė, eismo taisyklės ir kelio ženklai turi aukštesnį prioritetą už navigacijos užuominas;";
 "dialog_routing_disclaimer_precision" = "— Žemėlapis gali būti klaidingas ir patariamas maršrutas ne visada bus optimalus būdas pasiekti tikslą;";
@@ -443,10 +439,6 @@
 "dialog_routing_download_and_build_cross_route" = "Norėtumėte atsisiųsti žemėlapį, kad sukurtumėte labiau optimalų maršrutą, apimantį daugiau nei vieną žemėlapį?";
 "dialog_routing_download_cross_route" = "Atsisiųsti papildomų žemėlapių, kad sukurtumėte geresnį maršrutą, pereinantį šio žemėlapio ribas.";
 
-
-/********** Strings for downloading map from search **********/
-
-
 /* «Show» context menu */
 "show" = "Rodyti";
 
@@ -871,10 +863,6 @@
 "moreyear_ago_sorttype" = "Daugiau nei prieš metus";
 "near_me_sorttype" = "Arti manęs";
 "others_sorttype" = "Kita";
-
-
-/********** Bookmark types used for sorting **********/
-
 "food_places" = "Maistas";
 "tourist_places" = "Įžymybės";
 "museums" = "Muziejai";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
index 549028d058..ba38a486d9 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -1055,10 +1055,10 @@
 "start_track_recording" = "Ierakstīt ceļu";
 
 /* Prompt for stopping a track recording. */
-"stop_track_recording" = "Stop Track Recording";
+"stop_track_recording" = "Apstādināt ierakstīšanu";
 
 /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */
-"stop_without_saving" = "Stop Without Saving";
+"stop_without_saving" = "Pārtraukt ierakstīšanu";
 
 /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */
 "continue_recording" = "Continue Recording";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
index 9ba51924c5..d66985b2e2 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -410,10 +410,6 @@
 
 /* blue gray color */
 "blue_gray" = "Blue Gray";
-
-
-/********** Routing dialogs strings **********/
-
 "dialog_routing_disclaimer_title" = "When following the route, please keep in mind:";
 "dialog_routing_disclaimer_priority" = "— Road conditions, traffic laws, and road signs always take priority over navigation hints;";
 "dialog_routing_disclaimer_precision" = "— The map might be inaccurate, and the suggested route might not always be the most optimal way to reach the destination;";
@@ -443,10 +439,6 @@
 "dialog_routing_download_and_build_cross_route" = "Would you like to download the map and create a more optimal route spanning more than one map?";
 "dialog_routing_download_cross_route" = "Download additional maps to create a better route that crosses the boundaries of this map.";
 
-
-/********** Strings for downloading map from search **********/
-
-
 /* «Show» context menu */
 "show" = "Show";
 
@@ -871,10 +863,6 @@
 "moreyear_ago_sorttype" = "More than a year ago";
 "near_me_sorttype" = "Near me";
 "others_sorttype" = "Others";
-
-
-/********** Bookmark types used for sorting **********/
-
 "food_places" = "Food";
 "tourist_places" = "Sights";
 "museums" = "Museums";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
index 7a2d953559..ac87264dc5 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d bokmerker</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>%d filer funnet. Du vil se dem etter konverteringen.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d sti</string>
+			<key>zero</key>
+			<string>%d spor?</string>
 			<key>other</key>
-			<string>%d stier</string>
+			<string>%d spor?</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
index ab336ddbd3..e6c29960a3 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -17,11 +14,12 @@
 			<string>d</string>
 			<key>one</key>
 			<string>%d favorito</string>
+			<key>many</key>
+			<string>%d favoritos</string>
 			<key>other</key>
 			<string>%d favoritos</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -34,11 +32,12 @@
 			<string>d</string>
 			<key>one</key>
 			<string>%d arquivo foi encontrado. Você vai ver depois da conversão.</string>
+			<key>many</key>
+			<string>%d arquivos foram encontrados. Você os verá depois da conversão.</string>
 			<key>other</key>
 			<string>%d arquivos foram encontrados. Você os verá depois da conversão.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -51,10 +50,11 @@
 			<string>d</string>
 			<key>one</key>
 			<string>%d trilha</string>
+			<key>many</key>
+			<string>%d trilhas</string>
 			<key>other</key>
 			<string>%d trilhas</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index f3f60fafa1..62c982c927 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -898,10 +898,10 @@
 "type.power.tower" = "Torre de eletricidade";
 
 /* A single pole supporting minor power lines. */
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Poste de eletricidade";
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
-"type.man_made.utility_pole" = "Utility Pole";
+"type.man_made.utility_pole" = "Poste";
 "type.psurface" = "psurface";
 "type.psurface.paved_bad" = "psurface-paved_bad";
 "type.psurface.paved_good" = "psurface-paved_good";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
index 589a91bd7f..fba7480681 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d favoritos</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>%d ficheiros encontrados. Pode vê-los depois da conversão.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d trajeto</string>
+			<key>zero</key>
+			<string>%d trilhos</string>
 			<key>other</key>
-			<string>%d trajetos</string>
+			<string>%d trilhos</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict
index 3bbd716d55..9b56c49a29 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d preferate</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>Au fost găsite %d fișiere. Le vei vedea după conversiune.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d traseu</string>
+			<key>zero</key>
+			<string>%d înregistrări</string>
 			<key>other</key>
-			<string>%d trasee</string>
+			<string>%d înregistrări</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
index 767a59d171..752b684754 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -15,15 +12,16 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d меток</string>
 			<key>one</key>
 			<string>%d метка</string>
 			<key>few</key>
 			<string>%d метки</string>
-			<key>other</key>
+			<key>many</key>
 			<string>%d меток</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,11 +36,10 @@
 			<string>%d файл был найден. Вы увидите его после конвертации.</string>
 			<key>few</key>
 			<string>%d файла были найдены. Вы увидите их после конвертации.</string>
-			<key>other</key>
-			<string>%d файлов было найдено. Вы увидите их после конвертации.</string>
+			<key>many</key>
+			<string>%d файлов были найдены. Вы увидите их после конвертации.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -53,14 +50,15 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d треков</string>
 			<key>one</key>
 			<string>%d трек</string>
 			<key>few</key>
 			<string>%d трека</string>
-			<key>other</key>
+			<key>many</key>
 			<string>%d треков</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
index 2acde4d29d..b71d58302b 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d bokmärken</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>%d filer hittades. Du kommer att se dem efter omvandlingen.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,10 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d spår</string>
 			<key>other</key>
 			<string>%d spår</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
index a360c6fcd5..29eccf7efe 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -21,7 +18,6 @@
 			<string>%d yer imleri</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,7 +34,6 @@
 			<string>%d dosya bulundu. Dönüştürmeden sonra onları görebilirsiniz.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -49,12 +44,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d rota</string>
+			<key>zero</key>
+			<string>%d yol?</string>
 			<key>other</key>
-			<string>%d rotalar</string>
+			<string>%d yol?</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
index ccb050aec6..1550fb92ab 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -19,11 +16,10 @@
 			<string>%d мітка</string>
 			<key>few</key>
 			<string>%d мітки</string>
-			<key>other</key>
+			<key>many</key>
 			<string>%d міток</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -38,11 +34,10 @@
 			<string>%d файл був знайдений. Ви побачите його після перетворення.</string>
 			<key>few</key>
 			<string>%d файлу були знайдені. Ви побачите їх після конвертації.</string>
-			<key>other</key>
+			<key>many</key>
 			<string>%d файлів було знайдено. Ви побачите їх після конвертації.</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -53,14 +48,15 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d треків</string>
 			<key>one</key>
 			<string>%d трек</string>
 			<key>few</key>
 			<string>%d треки</string>
-			<key>other</key>
+			<key>many</key>
 			<string>%d треків</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
index e9b4807de2..bae781540a 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
@@ -202,10 +202,10 @@
 "type.barrier.entrance" = "Прохід";
 "type.barrier.fence" = "Огорожа";
 "type.barrier.gate" = "Ворота";
-"type.barrier.hedge" = "Hedge";
+"type.barrier.hedge" = "Жива огорожа";
 "type.barrier.kissing_gate" = "Ворота";
 "type.barrier.lift_gate" = "Шлагбаум";
-"type.barrier.retaining_wall" = "Retaining Wall";
+"type.barrier.retaining_wall" = "Підпірна стіна";
 "type.barrier.stile" = "Перелаз";
 "type.barrier.turnstile" = "Турнікет.";
 "type.barrier.swing_gate" = "Шлагбаум";
@@ -353,7 +353,7 @@
 "type.cuisine.vegan" = "Веганська кухня";
 "type.cuisine.vegetarian" = "Вегетаріанська кухня";
 "type.cuisine.vietnamese" = "В'єтнамська кухня";
-"type.emergency" = "Emergency";
+"type.emergency" = "Швидка";
 "type.emergency.assembly_point" = "Аварійний збірний пункт";
 "type.emergency.defibrillator" = "Дефібрилятор";
 "type.emergency.fire_hydrant" = "Пожежний гідрант";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
index 7eabd7e85d..8d69b4cfce 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
@@ -2,9 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-<!-- ********** Strings for downloading map from search **********/ -->
-
 	<key>bookmarks_places</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -19,7 +16,6 @@
 			<string>%d 個書籤</string>
 		</dict>
 	</dict>
-
 	<key>bookmarks_detect_message</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -30,13 +26,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>找到 %d 個文件，轉換後您可以看到它。</string>
 			<key>other</key>
 			<string>找到 %d 個文件，轉換後您可以看到它們。</string>
 		</dict>
 	</dict>
-
 	<key>tracks</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -47,10 +40,11 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d 軌跡</string>
 			<key>other</key>
-			<string>%d 個軌跡</string>
+			<string>%d 軌跡</string>
 		</dict>
 	</dict>
-
 </dict>
-</plist>
\ No newline at end of file
+</plist>