diff --git a/android/app/src/fdroid/play/listings/es-ES/full-description.txt b/android/app/src/fdroid/play/listings/es-ES/full-description.txt
new file mode 100644
index 000000000..dc9c35d8c
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/es-ES/full-description.txt
@@ -0,0 +1,65 @@
+Una aplicación de mapas gratuita y de código abierto liderada por la comunidad, basada en los datos de OpenStreetMap y reforzada con un compromiso con la transparencia, la privacidad y la ausencia de fines de lucro. CoMaps es un fork o derivado de Organic Maps, que a su vez es un fork de Maps.ME.
+
+<br><br>
+
+Lee más sobre los motivos del proyecto y su dirección en <b><i>codeberg.org/comaps</i></b>.
+
+<br><br>
+
+Únete allí a la comunidad y ayuda a crear la mejor app de mapas
+
+• Usa la aplicación y corre la voz sobre ella
+
+• Envía comentarios y reporta problemas
+
+• Actualiza los datos del mapa en la app o en el sitio web de OpenStreetMap
+
+<br><br>
+
+‣ <b>Enfocada en el uso sin conexión</b>: Planifica y navega tus viajes sin necesidad de conexión móvil, busca puntos de paso en rutas remotas, etc. Todas las funciones están diseñadas para funcionar sin conexión.
+
+‣ <b>Respeta tu Privacidad</b>: La app está diseñada pensando en tu privacidad: no identifica personas, no rastrea y no recoge datos personales. Sin publicidad.
+
+‣ <b>Sencilla y Pulida</b>: funciones esenciales fáciles de usar que simplemente funcionan.
+
+‣ <b>Ahorra Batería y Espacio</b>: No consume la batería como otras apps de navegación. Los mapas compactos ahorran espacio valioso en tu teléfono.
+
+‣ <b>Gratuita y Creada por la Comunidad</b>: Personas como tú ayudaron a construir la app añadiendo lugares a OpenStreetMap, probando funciones, dando opiniones y contribuyendo con desarrollo o financiación.
+
+‣ <b>Toma de decisiones y finanzas abiertas y transparentes, sin ánimo de lucro y completamente de código abierto.</b>
+
+<br><br>
+
+<b>Funciones Principales</b>:
+
+• Mapas detallados descargables con lugares que no aparecen en Google Maps
+
+• Modo exterior con rutas de senderismo destacadas, campings, fuentes de agua, picos, curvas de nivel, etc.
+
+• Caminos peatonales y carriles bici
+
+• Puntos de interés como restaurantes, gasolineras, hoteles, tiendas, lugares turísticos y muchos más
+
+• Búsqueda por nombre, dirección o categoría de punto de interés
+
+• Navegación con indicaciones por voz para caminar, ir en bici o conducir
+
+• Guarda tus lugares favoritos con un solo toque
+
+• Artículos de Wikipedia sin conexión
+
+• Capa de transporte subterráneo y rutas
+
+• Grabación de rutas
+
+• Exporta e importa favoritos y rutas en formatos KML, KMZ y GPX
+
+• Modo oscuro para usar de noche
+
+• Mejora los datos del mapa para todos usando un editor básico integrado
+
+<br><br>
+
+<b>La Libertad Está Aquí</b>
+
+Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.
diff --git a/android/app/src/fdroid/play/listings/es-ES/title.txt b/android/app/src/fdroid/play/listings/es-ES/title.txt
new file mode 100644
index 000000000..d1d88becf
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/es-ES/title.txt
@@ -0,0 +1 @@
+CoMaps - Senderismo, ciclismo y conducción offline
diff --git a/android/app/src/google/play/listings/es-ES/full-description.txt b/android/app/src/google/play/listings/es-ES/full-description.txt
new file mode 100644
index 000000000..c7a53a4c1
--- /dev/null
+++ b/android/app/src/google/play/listings/es-ES/full-description.txt
@@ -0,0 +1,71 @@
+Una aplicación de mapas gratuita y de código abierto liderada por la comunidad, basada en los datos de OpenStreetMap y reforzada con un compromiso con la transparencia, la privacidad y la ausencia de fines de lucro.
+
+<br><br>
+
+Únete a la comunidad y ayuda a crear la mejor app de mapas
+
+• Usa la aplicación y corre la voz sobre ella
+
+• Envía comentarios y reporta problemas
+
+• Actualiza los datos del mapa en la app o en el sitio web de OpenStreetMap
+
+<br><br>
+
+<i>¡Tus comentarios y valoraciones de 5 estrellas son el mejor apoyo para nosotros!</i>
+
+<br><br>
+
+‣ <b>Sencilla y Pulida</b>: funciones esenciales fáciles de usar que simplemente funcionan.
+
+‣ <b>Enfocada en el uso sin conexión</b>: Planifica y navega tus viajes sin necesidad de conexión móvil, busca puntos de paso en rutas remotas, etc. Todas las funciones están diseñadas para funcionar sin conexión.
+
+‣ <b>Respeta tu Privacidad</b>: La app está diseñada pensando en tu privacidad: no identifica personas, no rastrea y no recoge datos personales. Sin publicidad.
+
+‣ <b>Ahorra Batería y Espacio</b>: No consume la batería como otras apps de navegación. Los mapas compactos ahorran espacio valioso en tu teléfono.
+
+‣ <b>Gratuita y Creada por la Comunidad</b>: Personas como tú ayudaron a construir la app añadiendo lugares a OpenStreetMap, probando funciones, dando opiniones y contribuyendo con desarrollo o financiación.
+
+‣ <b>Toma de decisiones y finanzas abiertas y transparentes, sin ánimo de lucro y completamente de código abierto.</b>
+
+<br><br>
+
+<b>Funciones Principales</b>:
+
+• Mapas detallados descargables con lugares que no aparecen en Google Maps
+
+• Modo exterior con rutas de senderismo destacadas, campings, fuentes de agua, picos, curvas de nivel, etc.
+
+• Caminos peatonales y carriles bici
+
+• Puntos de interés como restaurantes, gasolineras, hoteles, tiendas, lugares turísticos y muchos más
+
+• Búsqueda por nombre, dirección o categoría de punto de interés
+
+• Navegación con indicaciones por voz para caminar, ir en bici o conducir
+
+• Guarda tus lugares favoritos con un solo toque
+
+• Artículos de Wikipedia sin conexión
+
+• Capa de transporte subterráneo y rutas
+
+• Grabación de rutas
+
+• Exporta e importa favoritos y rutas en formatos KML, KMZ y GPX
+
+• Modo oscuro para usar de noche
+
+• Mejora los datos del mapa para todos usando un editor básico integrado
+
+• Compatibilidad con Android Auto
+
+<br><br>
+
+Por favor, informa de errores, sugiere ideas y únete a nuestra comunidad en el sitio web <b><i>comaps.app</i></b>.
+
+<br><br>
+
+<b>La Libertad Está Aquí</b>
+
+Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.
diff --git a/android/app/src/main/res/values-bg/types_strings.xml b/android/app/src/main/res/values-bg/types_strings.xml
index 7b0d8918a..ce9355907 100644
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -653,7 +653,7 @@
     <string name="type.railway.subway_entrance.mecca">Вход ма метро</string>
     <string name="type.railway.subway_entrance.panama">Вход ма метро</string>
     <string name="type.railway.subway_entrance.philadelphia">Вход ма метро</string>
-    <string name="type.shop.beauty">Магазин за красота</string>
+    <string name="type.shop.beauty">Салон за красота</string>
     <string name="type.shop.bicycle">Магазин за колела</string>
     <string name="type.shop.butcher">Месар</string>
     <string name="type.shop.car_parts">Магазин за авточасти</string>
@@ -1223,4 +1223,88 @@
     <string name="type.railway.subway.tunnel">Тунел на метрото</string>
     <string name="type.railway.subway_entrance.budapest">Вход в метрото</string>
     <string name="type.railway.subway_entrance.vienna">Вход в метрото</string>
+    <string name="type.post_office.post_partner">Пощенски партньор</string>
+    <string name="type.amenity.bicycle_parking.covered">Покрит паркинг за колела</string>
+    <string name="type.amenity.luggage_locker">Шкафче за багаж</string>
+    <string name="type.leisure.escape_game">Ескейп стая</string>
+    <string name="type.amenity.parking.park_and_ride">Паркинг с трансфер до обществения транспорт</string>
+    <string name="type.railway.tram_stop">Трамвайна спирка</string>
+    <string name="type.route.ferry">Ферибот</string>
+    <string name="type.shop.alcohol">Магазин за алкохол</string>
+    <string name="type.shop.bookmaker">Букмейкър</string>
+    <string name="type.shop.books">Книжарница</string>
+    <string name="type.shop.caravan">Автокъща на домове на колела</string>
+    <string name="type.shop.chocolate">Магазин за шоколад</string>
+    <string name="type.shop.coffee">Магазин за кафе</string>
+    <string name="type.shop.computer">Магазин за компютри</string>
+    <string name="type.shop.convenience">Магазин за хранителни стоки</string>
+    <string name="type.shop.department_store">Универсален магазин</string>
+    <string name="type.shop.dry_cleaning">Химическо чистене</string>
+    <string name="type.shop.electronics">Магазин за електроника</string>
+    <string name="type.shop.bakery">Пекарна</string>
+    <string name="type.shop.confectionery">Магазин за бонбони</string>
+    <string name="type.amenity.ranger_station">Станция за рейнджъри</string>
+    <string name="type.shop.clothes">Магазин за дрехи</string>
+    <string name="type.railway.tram.tunnel">Тунел на трамвайна линия</string>
+    <string name="type.shop.copyshop">Копирен център</string>
+    <string name="type.shop">Магазин</string>
+    <string name="type.shop.car">Автокъща</string>
+    <string name="type.railway.tram">Трамвайна линия</string>
+    <string name="type.railway.tram.bridge">Мост на трамвайна линия</string>
+    <string name="type.shop.jewelry">Магазин за бижута</string>
+    <string name="type.shop.fabric">Магазин за платове</string>
+    <string name="type.shop.funeral_directors">Погребални директори</string>
+    <string name="type.shop.garden_centre">Градински център</string>
+    <string name="type.shop.gift">Магазин за сувенири</string>
+    <string name="type.shop.kiosk">Киоск</string>
+    <string name="type.shop.laundry">Обществена пералня</string>
+    <string name="type.shop.massage">Масажен салон</string>
+    <string name="type.shop.money_lender">Кредитор</string>
+    <string name="type.shop.motorcycle">Магазин за мотоциклети</string>
+    <string name="type.shop.music">Магазин за грамофонни плочи</string>
+    <string name="type.shop.newsagent">Киоск за вестници</string>
+    <string name="type.shop.optician">Оптика</string>
+    <string name="type.shop.pawnbroker">Заложна къща</string>
+    <string name="type.shop.photo">Магазин за снимки</string>
+    <string name="type.shop.stationery">Магазин за канцеларски материали</string>
+    <string name="type.shop.ticket">Продажба на билети</string>
+    <string name="type.shop.travel_agency">Туристическа агенция</string>
+    <string name="type.shop.variety_store">Магазин за разнообразни стоки</string>
+    <string name="type.shop.video_games">Магазин за видеоигри</string>
+    <string name="type.sport.gymnastics">Гимнастика</string>
+    <string name="type.sport.handball">Хандбал</string>
+    <string name="type.sport.shooting">Стрелба</string>
+    <string name="type.sport.soccer">Футбол</string>
+    <string name="type.tourism.artwork.architecture">Архитектурни произведения на изкуството</string>
+    <string name="type.tourism.artwork.painting">Живопис</string>
+    <string name="type.attraction.bumper_car">Блъскащи коли</string>
+    <string name="type.attraction.big_wheel">Виенско колело</string>
+    <string name="type.tourism.camp_site">Място за къмпинг</string>
+    <string name="type.tourism.caravan_site">Парк за домове на колела</string>
+    <string name="type.tourism.hotel">Хотел</string>
+    <string name="type.tourism.museum">Музей</string>
+    <string name="type.tourism.motel">Мотел</string>
+    <string name="type.sport.skiing">Каране на ски</string>
+    <string name="type.tourism.artwork.sculpture">Скулптура</string>
+    <string name="type.shop.furniture">Магазин за мебели</string>
+    <string name="type.shop.erotic">Еротичен магазин</string>
+    <string name="type.shop.mobile_phone">Магазин за мобилни телефони</string>
+    <string name="type.shop.video">Магазин за видео</string>
+    <string name="type.shop.outdoor">Магазин за къмпинг</string>
+    <string name="type.shop.tattoo">Студио за татуировки</string>
+    <string name="type.sport.golf">Голф</string>
+    <string name="type.tourism.gallery">Художествена галерия</string>
+    <string name="type.sport.scuba_diving">Място за гмуркане</string>
+    <string name="type.sport.basketball">Баскетбол</string>
+    <string name="type.sport.athletics">Атлетика</string>
+    <string name="type.sport.baseball">Бейзбол</string>
+    <string name="type.sport.cricket">Крикет</string>
+    <string name="type.sport.curling">Кърлинг</string>
+    <string name="type.shop.mall">Търговски център</string>
+    <string name="type.shop.musical_instrument">Магазин за музикални инструменти</string>
+    <string name="type.sport.bowls">Чаши</string>
+    <string name="type.shop.greengrocer">Магазин за плодове и зеленчуци</string>
+    <string name="type.shop.hairdresser">Фризьорски салон</string>
+    <string name="type.tourism">Туризъм</string>
+    <string name="type.tourism.zoo">Зоопарк</string>
 </resources>
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 9e688e203..0bc2f0b37 100644
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1369,4 +1369,10 @@
     <string name="type.power.line">Strømledning</string>
     <string name="type.highway.ladder">Stige</string>
     <string name="type.amenity.love_hotel">Kærlighedshotel</string>
+    <string name="type.amenity.bicycle_parking.covered">Overdækket cykelparkering</string>
+    <string name="type.post_office.post_partner">Postpartner</string>
+    <string name="type.natural.wetland.swamp">Sump</string>
+    <string name="type.amenity.luggage_locker">Bagageboks</string>
+    <string name="type.natural.wetland.saltmarsh">Strandeng</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Tidevandspåvirket strandeng</string>
 </resources>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 41e4db40b..6fc7c1717 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Poista</string>
     <string name="download_maps">Lataa karttoja</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Lataus epäonnistui. Napauta yrittääksesi uudelleen.</string>
+    <string name="download_has_failed">Lataus epäonnistui, napauta yrittääksesi uudelleen.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Ladataan…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -32,7 +32,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Rajoitettu tarkkuus</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Tarkan navigoinnin varmistamiseksi ota Tarkka sijainti käyttöön asetuksissa.</string>
+    <string name="precise_location_is_disabled_long_text">Tarkan navigoinnin varmistamiseksi, ota Tarkka sijainti käyttöön asetuksissa.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Näytä kartalla</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index 6d2503b53..6ed6a5765 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -1408,4 +1408,5 @@
     <string name="type.natural.wetland.tidalflat">Vuorovesitasanko</string>
     <string name="type.natural.wetland.reedbed">Ruovikko</string>
     <string name="type.leisure.escape_game">Pakohuonepeli</string>
+    <string name="type.amenity.bicycle_parking.covered">Pyöräkatos</string>
 </resources>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index e688fc34f..b0a909670 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -671,7 +671,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Jamais avertir</string>
     <string name="power_managment_title">Mode économie d\'énergie</string>
-    <string name="power_managment_description">Essayez de réduire la consommation d’énergie au détriment de certaines fonctionnalités</string>
+    <string name="power_managment_description">Essayer de réduire la consommation d’énergie au détriment de certaines fonctionnalités</string>
     <string name="power_managment_setting_never">Jamais</string>
     <string name="power_managment_setting_auto">Automatique</string>
     <string name="power_managment_setting_manual_max">Économie d\'énergie maximale</string>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index b55c3f8f6..c5bb63a7f 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -4,9 +4,9 @@
     <string name="back">Zrugg</string>
     <string name="cancel">Abbräche</string>
     <string name="delete">Lösche</string>
-    <string name="precise_location_is_disabled_long_text">Zum e gnaui Navigation chönne z gwährleiste, aktivier i de Iistellige d Option \"Genauen Standort verwenden\".</string>
+    <string name="precise_location_is_disabled_long_text">Zum e gnaui Navigation chönne z gwährleiste, aktivier i de Iistellige d Option \"Genauen Standort verwenden\"</string>
     <string name="download_maps">Charte abelade</string>
-    <string name="download_has_failed">S Abelade isch fehlgschlage. Tippe zum nomal versueche.</string>
+    <string name="download_has_failed">S Abelade isch fehlgschlage, Tippe zum nomal versueche</string>
     <string name="downloading">Wird abeglade…</string>
     <string name="kilometres">Kilometer</string>
     <string name="mb">MB</string>
@@ -39,7 +39,7 @@
     <string name="core_placepage_unknown_place">Chartepunkt</string>
     <string name="editor_osm_history">Din Bearbeitigsverlauf</string>
     <string name="editor_osm_notes">Dini Hiiwiis zu de Chartedate</string>
-    <string name="downloader_no_downloaded_maps_message">Lad Charte für d Offline-Suechi und Navigation abe.</string>
+    <string name="downloader_no_downloaded_maps_message">Lad Charte für d Offline-Suechi und Navigation abe</string>
     <string name="m">m</string>
     <string name="km">km</string>
     <string name="kilometers_per_hour">km/h</string>
@@ -173,7 +173,7 @@
     <string name="list">Lischte</string>
     <string name="settings">Iistellige</string>
     <string name="maps_storage">Charte speichere uf</string>
-    <string name="maps_storage_summary">Wähl de Speicherot für di abegladne Charte.</string>
+    <string name="maps_storage_summary">Wähl de Speicherot für di abegladne Charte</string>
     <string name="maps_storage_downloaded">Abegladni Charte</string>
     <string name="maps_storage_internal">Interne persönliche Speicher</string>
     <string name="maps_storage_shared">Interne gmeinsame Speicher</string>
@@ -213,8 +213,8 @@
     <string name="failed_to_open_file">Datei het nöd chönne göffnet werde %1$s \n \n%2$s</string>
     <string name="edit">Bearbeite</string>
     <string name="unknown_current_position">Din Standort het nonig chönne ermittlet werde</string>
-    <string name="cant_change_this_setting">Leider sind d Iistellige für d Chartespeicherig aktuell deaktiviert.</string>
-    <string name="downloading_is_active">D Charte wird abeglade.</string>
+    <string name="cant_change_this_setting">Leider sind d Iistellige für d Chartespeicherig aktuell deaktiviert</string>
+    <string name="downloading_is_active">D Charte wird abeglade</string>
     <string name="my_position_share_sms">Lueg dir min aktuelle Standort uf CoMaps aa! %1$s oder %2$s Kei Offline-Charte installiert? Da abelade: https://www.comaps.app/download/</string>
     <string name="bookmark_share_email_subject">Hey, lueg dir mini Stecknadle uf de CoMaps-Charte aa!</string>
     <string name="my_position_share_email_subject">Hey, lueg dir min aktuelle Standort uf de CoMaps-Charte aa!</string>
@@ -244,7 +244,7 @@
     <string name="pref_tts_street_names_description">Wenn aktiviert, wird de Name vo de Strass oder Uusfahrt, wo abboge wird, luut aakündigt.</string>
     <string name="pref_tts_language_title">Sprach für d Sprachfüehrig</string>
     <string name="pref_tts_test_voice_title">Teste d Sprachaawisige (TTS, Text-To-Speech)</string>
-    <string name="pref_tts_playing_test_voice">Überprüef d Luutstärchi oder d Text-To-Speech-Iistellige vom System, wenn du d Stimm jetzt nöd ghörsch.</string>
+    <string name="pref_tts_playing_test_voice">Überprüef d Luutstärchi oder d Text-To-Speech-Iistellige vom System, wenn du d Stimm jetzt nöd ghörsch</string>
     <string name="pref_tts_unavailable">Nöd verfüegbar</string>
     <string name="pref_map_auto_zoom">Auto-Zoom</string>
     <string name="placepage_distance">Entfernig</string>
@@ -283,7 +283,7 @@
     <string name="downloader_status_maps">Charte</string>
     <string name="downloader_download_all_button">Alli abelade</string>
     <string name="downloader_downloading">Wird abeglade:</string>
-    <string name="downloader_delete_map_while_routing_dialog">Zum Lösche vo de Charte bitte d Navigation unterbreche.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Zum Lösche vo de Charte bitte d Navigation unterbreche</string>
     <string name="routing_failed_cross_mwm_building">Es chönd nur Route erstellt werde, wo vollständig i einere einzige Charte enthalte sind.</string>
     <string name="downloader_download_map">Charte abelade</string>
     <string name="downloader_retry">Wiederhole</string>
@@ -322,16 +322,16 @@
     <string name="dialog_routing_location_turn_wifi">Bitte prüef dis GPS-Signal. WLAN verbessert dini Standortgenauigkeit.</string>
     <string name="dialog_routing_location_unknown_turn_on">Aktuelli GPS-Koordinate chönd nöd ermittlet werde. Aktivier d Standortdienst, zum d Route z berechne.</string>
     <string name="dialog_routing_unable_locate_route">Route cha nöd ermittlet werde</string>
-    <string name="dialog_routing_cant_build_route">Route cha nöd erstellt werde.</string>
+    <string name="dialog_routing_cant_build_route">Route cha nöd erstellt werde</string>
     <string name="dialog_routing_change_start">Startpunkt aapasse</string>
     <string name="dialog_routing_start_not_determined">Route isch nöd erstellt worde. Startpunkt cha nöd gfunde werde.</string>
     <string name="dialog_routing_select_closer_start">Bitte wähl en Startpunkt, wo nöcher anere Strass liit.</string>
     <string name="dialog_routing_change_end">Ziil aapasse</string>
-    <string name="dialog_routing_select_closer_end">Bitte wähl en Ziilort, wo nöcher anere Strass liit.</string>
-    <string name="dialog_routing_change_intermediate">Zwüschestopp cha nöd gfunde werde.</string>
-    <string name="dialog_routing_intermediate_not_determined">Bitte pass din Zwüschestopp a.</string>
+    <string name="dialog_routing_select_closer_end">Bitte wähl en Ziilort, wo nöcher anere Strass liit</string>
+    <string name="dialog_routing_change_intermediate">Zwüschestopp cha nöd gfunde werde</string>
+    <string name="dialog_routing_intermediate_not_determined">Bitte pass din Zwüschestopp a</string>
     <string name="dialog_routing_system_error">Systemfehler</string>
-    <string name="dialog_routing_application_error">Route cha weg emne Aawendigsfehler nöd erstellt werde.</string>
+    <string name="dialog_routing_application_error">Route cha weg emne Aawendigsfehler nöd erstellt werde</string>
     <string name="dialog_routing_try_again">Bitte versuechs nomal</string>
     <string name="not_now">Nöd jetzt</string>
     <string name="dialog_routing_download_cross_route">Lad zuesätzlichi Charte abe, zum e besseri Route z erstelle, wo d Grenze vo dere Charte überschritet.</string>
@@ -341,9 +341,9 @@
     <string name="hide">Uusblende</string>
     <string name="categories">Kategorie</string>
     <string name="history">Verlauf</string>
-    <string name="search_not_found">Leider isch nüt gfunde worde.</string>
+    <string name="search_not_found">Leider isch nüt gfunde worde</string>
     <string name="search_history_title">Suechverlauf</string>
-    <string name="search_history_text">Da werded dini letschte Suechaafrage aazeigt.</string>
+    <string name="search_history_text">Da werded dini letschte Suechaafrage aazeigt</string>
     <string name="clear_search">Suechverlauf lösche</string>
     <string name="read_in_wikipedia">Wikipedia</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
@@ -351,7 +351,7 @@
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Vo</string>
     <string name="p2p_to_here">Nach</string>
-    <string name="p2p_only_from_current">D Navigation isch nur vo dim aktuelle Standort verfüegbar.</string>
+    <string name="p2p_only_from_current">D Navigation isch nur vo dim aktuelle Standort verfüegbar</string>
     <string name="p2p_reroute_from_current">Sött e Route vo dim aktuelle Standort uus berechnet werde?</string>
     <string name="next_button">Wiiter</string>
     <string name="editor_time_from">Vo</string>
@@ -405,13 +405,13 @@
     <string name="editor_add_phone">Telefon hinzuefüege</string>
     <string name="level">Etage</string>
     <string name="level_value_generic">Etage: %s</string>
-    <string name="downloader_delete_map_dialog">Alli Charteänderige werded zemme mit de Charte glöscht.</string>
+    <string name="downloader_delete_map_dialog">Alli Charteänderige werded zemme mit de Charte glöscht</string>
     <string name="downloader_update_maps">Charte aktualisiere</string>
     <string name="downloader_search_field_hint">Charte finde</string>
-    <string name="common_check_internet_connection_dialog">Bitte überprüef dini Iistellige und stell sicher, dass dis Grät mit em Internet verbunde isch.</string>
+    <string name="common_check_internet_connection_dialog">Bitte überprüef dini Iistellige und stell sicher, dass dis Grät mit em Internet verbunde isch</string>
     <string name="downloader_no_space_title">Nöd gnueg Speicherplatz</string>
     <string name="downloader_no_space_message">Bitte lösch unnötigi Date</string>
-    <string name="editor_login_error_dialog">Login-Fehler.</string>
+    <string name="editor_login_error_dialog">Login-Fehler</string>
     <string name="editor_profile_changes">Bestätigti Änderige a de Charte</string>
     <string name="editor_focus_map_on_location">Verschieb d Charte, zum s Chrüz a de Stell z platziere, wo sich de Ort oder s Gschäft befindet.</string>
     <string name="editor_edit_place_title">Wird bearbeitet</string>
@@ -422,10 +422,10 @@
     <string name="editor_report_problem_other_title">Es anders Problem</string>
     <string name="placepage_add_business_button">Organisation hinzuefüege</string>
     <string name="message_invalid_feature_position">Es Objekt cha da nöd positioniert werde</string>
-    <string name="login_to_make_edits_visible">Erstell es OpenStreetMap-Konto oder meld dich a, zum dini Chartebearbeitige weltwiit z veröffentliche.</string>
+    <string name="login_to_make_edits_visible">Erstell es OpenStreetMap-Konto oder meld dich a, zum dini Chartebearbeitige weltwiit z veröffentliche</string>
     <string name="downloader_of">%1$d vo %2$d</string>
     <string name="download_over_mobile_header">Über e Mobilfunktnetzverbindig abelade?</string>
-    <string name="download_over_mobile_message">Das chönnt mit gwüssne Tarif oder bim Roaming sehr tüür werde.</string>
+    <string name="download_over_mobile_message">Das chönnt mit gwüssne Tarif oder bim Roaming sehr tüür werde</string>
     <string name="error_enter_correct_zip_code">Gib die richtigi Postleitzahl ii</string>
     <string name="editor_note_hint">Beschrib Chartefehler oder Sache, wo mit CoMaps nöd chönd bearbeitet werde</string>
     <string name="editor_more_about_osm">Meh Informatione über OpenStreetMap</string>
@@ -452,8 +452,8 @@
     <string name="error_enter_correct_fediverse_page">Gib en gültige Mastodon-Nutzername oder Webadresse ii</string>
     <string name="error_enter_correct_bluesky_page">Gib en gültige Bluesky-Nutzername oder Webadresse ii</string>
     <string name="placepage_add_place_button">Ort zu OpenStreetMap hinzuefüege</string>
-    <string name="editor_share_to_all_dialog_message_1">Stell sicher, dass du kei persönlichi oder privati Sache iigeh hesch.</string>
-    <string name="editor_share_to_all_dialog_message_2">Freiwilligi vo OpenStreetMap werded dini Änderige prüefe und sich bi Frage mit dir in Verbindig setze.</string>
+    <string name="editor_share_to_all_dialog_message_1">Stell sicher, dass du kei persönlichi oder privati Sache iigeh hesch</string>
+    <string name="editor_share_to_all_dialog_message_2">Freiwilligi vo OpenStreetMap werded dini Änderige prüefe und sich bi Frage mit dir in Verbindig setze</string>
     <string name="navigation_stop_button">Beende</string>
     <string name="track_recording">Strecki wird uufzeichnet</string>
     <string name="accept">Aaneh</string>
@@ -464,7 +464,7 @@
     <string name="mobile_data">Mobils Internet</string>
     <string name="mobile_data_option_never">Nie verwende</string>
     <string name="mobile_data_option_ask">Immer fröge</string>
-    <string name="traffic_update_maps_text">Zum Verchehrsdate aazzeige, müend d Charte aktualisiert werde.</string>
+    <string name="traffic_update_maps_text">Zum Verchehrsdate aazzeige, müend d Charte aktualisiert werde</string>
     <string name="big_font">Schrift uf de Charte vergrössere</string>
     <string name="traffic_update_app">Bitte aktualisier CoMaps</string>
     <string name="enable_logging">Protokollierig aktiviere</string>
@@ -488,7 +488,7 @@
     <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Blitzer</string>
     <string name="power_managment_title">Stromsparmodus</string>
-    <string name="power_managment_description">Versuech, de Stromverbruuch uf Choschte wo einige Funktione z reduziere.</string>
+    <string name="power_managment_description">Versuech, de Stromverbruuch uf Choschte wo einige Funktione z reduziere</string>
     <string name="power_managment_setting_never">Nie</string>
     <string name="power_managment_setting_auto">Bi niedrigem Akkustand</string>
     <string name="power_managment_setting_manual_max">Immer</string>
@@ -594,7 +594,7 @@
     <string name="editor_other_info">Hiiwiis a Freiwilligi vo OpenStreetMap (optional)</string>
     <string name="editor_category_unsuitable_title">Kei passendi Kategorie gfunde?</string>
     <string name="editor_category_unsuitable_text">Mit CoMaps cha mer nur eifachi Punktkategorie hinzuefüege, drum kei Städt, Strasse, See, Gebäudeumriss etc. Bitte füeg sottigi Kategorie direkt bi <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzue. I eusem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfade</a> findsch du e detaillierti Schritt-für-Schritt-Aaleitig.</string>
-    <string name="current_location_unknown_error_title">Aktuelle Standort isch unbekannt.</string>
+    <string name="current_location_unknown_error_title">Aktuelle Standort isch unbekannt</string>
     <string name="editor_share_to_all_dialog_title">A alli Benutzer sende?</string>
     <string name="placepage_remove_stop">Stopp entferne</string>
     <string name="bookmarks_error_title_empty_list_name">De Name derf nöd leer sii</string>
@@ -610,8 +610,8 @@
     <string name="error_enter_correct_house_number">Richtigi Huusnummere iigeh</string>
     <string name="editor_operator">Betriiber</string>
     <string name="mobile_data_dialog">Mobils Internet verwende, zum genaueri Informatione aazzeige?</string>
-    <string name="mobile_data_description">Für Benachrichtigunge über Charteaktualisierige und s Ufelade vo Änderige isch e mobili Internetverbindig erforderlich.</string>
-    <string name="prefs_languages_information_off_link">Wiiteri Informatione findsch i dere Aaleitig.</string>
+    <string name="mobile_data_description">Für Benachrichtigunge über Charteaktualisierige und s Ufelade vo Änderige isch e mobili Internetverbindig erforderlich</string>
+    <string name="prefs_languages_information_off_link">Wiiteri Informatione findsch i dere Aaleitig</string>
     <string name="core_entrance">Iigang</string>
     <string name="privacy_policy">Dateschutzerchlärig</string>
     <string name="notification_channel_downloader">Charte-Downloader</string>
diff --git a/android/app/src/main/res/values-gsw/types_strings.xml b/android/app/src/main/res/values-gsw/types_strings.xml
index bfdf75923..fdaaa1a43 100644
--- a/android/app/src/main/res/values-gsw/types_strings.xml
+++ b/android/app/src/main/res/values-gsw/types_strings.xml
@@ -1315,4 +1315,8 @@
     <string name="type.natural.wetland.mangrove">Mangrove</string>
     <string name="type.natural.wetland.tidalflat">Watt</string>
     <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.post_office.post_partner">Postpartner</string>
+    <string name="type.amenity.bicycle_parking.covered">Überdachte Veloparkplatz</string>
+    <string name="type.amenity.luggage_locker">Gepäckschlüüssfach</string>
+    <string name="type.amenity.ranger_station">Förschterstation</string>
 </resources>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index ff922e0a0..d3c9c147b 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Cancella</string>
     <string name="download_maps">Scarica mappe</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Download fallito. Riprova.</string>
+    <string name="download_has_failed">Download fallito, tocca per riprovare</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Download in corso…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -29,7 +29,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Precisione limitata</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Per garantire una navigazione accurata, attiva la funzione Posizione precisa nelle impostazioni.</string>
+    <string name="precise_location_is_disabled_long_text">Per garantire una navigazione accurata, attiva la funzione Posizione precisa nelle impostazioni</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostra sulla mappa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Salva mappe in</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Seleziona la cartella in cui scaricare le mappe.</string>
+    <string name="maps_storage_summary">Seleziona la cartella in cui scaricare le mappe</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mappe scaricate</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -167,9 +167,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">La tua posizione non è stata ancora determinata</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono disabilitate al momento.</string>
+    <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono disabilitate al momento</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Il download della mappa è in corso.</string>
+    <string name="downloading_is_active">Il download della mappa è in corso</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Guarda la mia posizione in CoMaps! %1$s o %2$s Non hai scaricato l\'app? La puoi scaricare da qui: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -227,7 +227,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Prova le indicazioni vocali (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se ora non senti la voce.</string>
+    <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se ora non senti la voce</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Non disponibile</string>
     <string name="pref_map_auto_zoom">Zoom automatico</string>
@@ -273,7 +273,7 @@
     <string name="downloader_download_all_button">Scarica tutte</string>
     <string name="downloader_downloading">Sto scaricando:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Per eliminare una mappa interrompi la navigazione.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Per eliminare una mappa interrompi la navigazione</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Si possono creare solo percorsi che siano completamente contenuti nella mappa di una singola regione.</string>
     <!-- Context menu item for downloader. -->
@@ -345,18 +345,18 @@
     <string name="dialog_routing_location_turn_on">Abilita i servizi di localizzazione</string>
     <string name="dialog_routing_location_unknown_turn_on">Impossibile individuare le coordinate GPS attuali. Per calcolare il percorso, abilita i servizi di localizzazione.</string>
     <string name="dialog_routing_unable_locate_route">Impossibile individuare il percorso</string>
-    <string name="dialog_routing_cant_build_route">Impossibile creare il percorso.</string>
+    <string name="dialog_routing_cant_build_route">Impossibile creare il percorso</string>
     <string name="dialog_routing_change_start_or_end">Modifica il punto di partenza o la destinazione.</string>
     <string name="dialog_routing_change_start">Modifica il punto di partenza</string>
     <string name="dialog_routing_start_not_determined">Percorso non creato. Impossibile individuare il punto di partenza.</string>
     <string name="dialog_routing_select_closer_start">Seleziona un punto di partenza più vicino a una strada.</string>
     <string name="dialog_routing_change_end">Modifica la destinazione</string>
     <string name="dialog_routing_end_not_determined">Percorso non creato. Impossibile individuare la destinazione.</string>
-    <string name="dialog_routing_select_closer_end">Seleziona una destinazione più vicina a una strada.</string>
-    <string name="dialog_routing_change_intermediate">Impossibile individuare il punto intermedio.</string>
-    <string name="dialog_routing_intermediate_not_determined">Modifica il punto intermedio.</string>
+    <string name="dialog_routing_select_closer_end">Seleziona una destinazione più vicina a una strada</string>
+    <string name="dialog_routing_change_intermediate">Impossibile individuare il punto intermedio</string>
+    <string name="dialog_routing_intermediate_not_determined">Modifica il punto intermedio</string>
     <string name="dialog_routing_system_error">Errore di sistema</string>
-    <string name="dialog_routing_application_error">Impossibile creare il percorso a causa di un errore dell\'applicazione.</string>
+    <string name="dialog_routing_application_error">Impossibile creare il percorso a causa di un errore dell\'applicazione</string>
     <string name="dialog_routing_try_again">Riprova</string>
     <string name="not_now">Non ora</string>
     <string name="dialog_routing_download_and_build_cross_route">Vuoi scaricare la mappa e creare un percorso migliore che si estende su più mappe?</string>
@@ -370,11 +370,11 @@
     <string name="hide">Nascondi</string>
     <string name="categories">Categorie</string>
     <string name="history">Cronologia</string>
-    <string name="search_not_found">Non ho trovato nulla.</string>
+    <string name="search_not_found">Oops, non è stato trovato nulla</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Scarica la regione in cui stai effettuando la ricerca oppure prova ad aggiungere il nome di una città/villaggio vicino.</string>
     <string name="search_history_title">Cronologia delle ricerche</string>
-    <string name="search_history_text">Visualizza le ricerche recenti.</string>
+    <string name="search_history_text">Visualizza le ricerche recenti</string>
     <string name="clear_search">Cancella сronologia ricerche</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipedia</string>
@@ -382,7 +382,7 @@
     <string name="p2p_start">Inizia</string>
     <string name="p2p_from_here">Parti da</string>
     <string name="p2p_to_here">Vai a</string>
-    <string name="p2p_only_from_current">La navigazione è disponibile solo dalla tua posizione attuale.</string>
+    <string name="p2p_only_from_current">La navigazione è disponibile solo dalla tua posizione attuale</string>
     <string name="p2p_reroute_from_current">Vuoi pianificare un percorso dalla tua posizione attuale?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Avanti</string>
@@ -452,14 +452,14 @@
     <string name="email_or_username">E-mail o nome utente</string>
     <string name="editor_add_phone">Aggiungi numero</string>
     <string name="level">Piano</string>
-    <string name="downloader_delete_map_dialog">Tutte le tue modifiche alla mappa saranno cancellate insieme alla mappa.</string>
+    <string name="downloader_delete_map_dialog">Tutte le tue modifiche alla mappa saranno cancellate insieme alla mappa</string>
     <string name="downloader_update_maps">Aggiorna mappe</string>
     <string name="downloader_mwm_migration_dialog">Per creare un percorso, devi aggiornare tutte le mappe e pianificare nuovamente il percorso.</string>
     <string name="downloader_search_field_hint">Trova la mappa</string>
-    <string name="common_check_internet_connection_dialog">Verifica che il tuo dispositivo sia connesso a internet.</string>
+    <string name="common_check_internet_connection_dialog">Verifica che il tuo dispositivo sia connesso a internet</string>
     <string name="downloader_no_space_title">Spazio insufficiente</string>
     <string name="downloader_no_space_message">Cancella i dati non necessari</string>
-    <string name="editor_login_error_dialog">Errore durante l\'accesso.</string>
+    <string name="editor_login_error_dialog">Errore durante l\'accesso</string>
     <string name="editor_profile_changes">Modifiche approvate</string>
     <string name="editor_focus_map_on_location">Trascina la mappa per posizionare la croce sulla posizione del luogo o dell\'attività commerciale.</string>
     <string name="editor_edit_place_title">Modifica</string>
@@ -476,11 +476,11 @@
     <string name="osm_presentation">Dati OpenStreetMap creati dalla comunità aggiornati al %s. Per saperne di più su come modificare e aggiornare la mappa, visita OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) è un progetto comunitario per creare una mappa libera e aperta. È la principale fonte di dati cartografici di CoMaps e funziona in modo simile a Wikipedia. Puoi aggiungere o modificare luoghi che diventano disponibili per milioni di utenti in tutto il mondo. \nEntra a far parte della comunità e contribuisci a creare una mappa migliore per tutti!</string>
-    <string name="login_to_make_edits_visible">Crea un account OpenStreetMap o effettua il login per pubblicare le tue modifiche alla mappa in tutto il mondo.</string>
+    <string name="login_to_make_edits_visible">Crea un’utenza OpenStreetMap o effettua il login per pubblicare le tue modifiche alla mappa in tutto il mondo</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d su %2$d</string>
     <string name="download_over_mobile_header">Vuoi scaricare utilizzando una connessione di rete cellulare?</string>
-    <string name="download_over_mobile_message">Questa operazione potrebbe essere piuttosto costosa con alcuni piani telefonici o se in roaming.</string>
+    <string name="download_over_mobile_message">Questa operazione potrebbe essere piuttosto costosa con alcuni piani telefonici o se in roaming</string>
     <string name="error_enter_correct_house_number">Inserisci un numero civico valido</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Il numero di piani non deve superare %d</string>
@@ -503,8 +503,8 @@
     <string name="editor_category_unsuitable_title">Non riesci a trovare una categoria adatta?</string>
     <string name="editor_category_unsuitable_text">CoMaps consente di aggiungere solo punti semplici, escludendo p.es. città, strade, laghi, planimetria edifici ecc. È possibile aggiungere tali categorie direttamente su <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulta la nostra <a href="https://www.comaps.app/support/advanced-map-editing/">guida</a> per istruzioni dettagliate.</string>
     <string name="downloader_no_downloaded_maps_title">Non hai scaricato mappe</string>
-    <string name="downloader_no_downloaded_maps_message">Scarica mappe per trovare luoghi e navigare offline.</string>
-    <string name="current_location_unknown_error_title">Posizione attuale sconosciuta.</string>
+    <string name="downloader_no_downloaded_maps_message">Scarica delle mappe per trovare luoghi e navigare offline</string>
+    <string name="current_location_unknown_error_title">Posizione attuale sconosciuta</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -540,8 +540,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Vuoi inviarlo a tutti gli utenti?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Assicurati di non aver inserito alcun dato personale.</string>
-    <string name="editor_share_to_all_dialog_message_2">Gli editor di OpenStreetMap controlleranno le modifiche e si metteranno in contatto con te in caso di domande.</string>
+    <string name="editor_share_to_all_dialog_message_1">Assicurati di non aver inserito alcun dato privato o personale</string>
+    <string name="editor_share_to_all_dialog_message_2">Gli editor di OpenStreetMap controlleranno le modifiche e si metteranno in contatto con te in caso di domande</string>
     <string name="navigation_stop_button">Ferma</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Sto registrando la traccia</string>
@@ -555,10 +555,10 @@
     <string name="mobile_data_option_not_today">Non usare oggi</string>
     <string name="mobile_data">Internet mobile</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">L\'internet mobile è necessario per ricevere notifiche sugli aggiornamenti alle mappe e per caricare modifiche alla mappa.</string>
+    <string name="mobile_data_description">L\'internet mobile è necessario per ricevere notifiche sugli aggiornamenti alle mappe e per caricare modifiche</string>
     <string name="mobile_data_option_never">Non usare mai</string>
     <string name="mobile_data_option_ask">Chiedi sempre</string>
-    <string name="traffic_update_maps_text">Per visualizzare i dati sul traffico, le mappe devono essere aggiornate.</string>
+    <string name="traffic_update_maps_text">Per visualizzare i dati sul traffico, le mappe devono essere aggiornate</string>
     <string name="big_font">Aumenta dimensione caratteri sulla mappa</string>
     <string name="traffic_update_app">Aggiorna CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -568,7 +568,7 @@
     <string name="feedback_general">Feedback generale</string>
     <string name="prefs_languages_information">Usiamo il TTS di sistema per le istruzioni vocali. Molti dispositivi Android utilizzano Google TTS, lo puoi scaricare o aggiornare da Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Per alcune lingue, sarà necessario installare un altro sintetizzatore vocale o un language pack aggiuntivo dall\'app store (Google Play, Galaxy Store, App Gallery, FDroid). \nApri le impostazioni del tuo dispositivo → Lingua e inserimento → Da testo a voce → Motore sintesi vocale. \nQui puoi gestire le impostazioni di sintesi vocale (ad esempio, scaricare una lingua per l\'utilizzo offline) e selezionare un altro motore di sintesi vocale.</string>
-    <string name="prefs_languages_information_off_link">Per maggiori informazioni, consulta questa guida.</string>
+    <string name="prefs_languages_information_off_link">Per maggiori informazioni, consulta questa guida</string>
     <string name="transliteration_title">Traslittera in caratteri latini</string>
     <string name="learn_more">Scopri di più</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -613,7 +613,7 @@
     <string name="profile">Profilo OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d file è stato trovato. Lo vedrai dopo la conversione.</item>
-        <item quantity="many"/>
+        <item quantity="many">%d file sono stati trovati. Li vedrai dopo la conversione.</item>
         <item quantity="other">%d file sono stati trovati. Li vedrai dopo la conversione.</item>
     </plurals>
     <string name="restore">Ripristina</string>
@@ -650,7 +650,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Non avvisare mai</string>
     <string name="power_managment_title">Modalità risparmio energetico</string>
-    <string name="power_managment_description">Riduce il consumo di batteria disattivando alcune funzionalità.</string>
+    <string name="power_managment_description">Prova a ridurre il consumo di batteria disattivando alcune funzionalità</string>
     <string name="power_managment_setting_never">Mai</string>
     <string name="power_managment_setting_auto">Quando c\'è poca batteria</string>
     <string name="power_managment_setting_manual_max">Sempre</string>
@@ -734,7 +734,7 @@
     <string name="elevation_profile_min_elevation">Min. elevazione</string>
     <string name="elevation_profile_max_elevation">Max. elevazione</string>
     <string name="elevation_profile_difficulty">Difficoltà</string>
-    <string name="elevation_profile_distance">Dist.:</string>
+    <string name="elevation_profile_distance">Distanza:</string>
     <string name="elevation_profile_time">Tempo:</string>
     <string name="isolines_toast_zooms_1_10">Ingrandisci la mappa per vedere le curve di livello</string>
     <string name="downloader_loading_ios">Download in corso</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 87c1a8d90..3868f7d96 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Apagar</string>
     <string name="download_maps">Baixar mapas</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">O download falhou. Toque para tentar de novo.</string>
+    <string name="download_has_failed">O download falhou, toque para tentar de novo</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Baixando…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Atualmente todos os serviços de localização para este dispositivo ou aplicativo estão desativados. Por favor ative-os em configurações.</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, ative a Localização precisa nas configurações.</string>
+    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, ative a opção \"Melhorar Precisão de local\" nas configurações</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostrar no mapa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -82,7 +82,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Salvar mapas para</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecione o local para onde os mapas devem ser baixados.</string>
+    <string name="maps_storage_summary">Selecione o local para onde os mapas devem ser baixados</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapas</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -173,9 +173,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">A sua localização ainda não foi determinada</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Lamentamos, as configurações do armazenamento do mapa estão desativadas.</string>
+    <string name="cant_change_this_setting">Lamentamos, as configurações do armazenamento do mapa estão desativadas</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">O download do país está atualmente em progresso.</string>
+    <string name="downloading_is_active">O download do mapa está atualmente em progresso</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Veja onde estou agora. Abra o link: %1$s ou %2$s Não tem mapas offline instalados? Baixe aqui: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -225,7 +225,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Testar orientação por voz (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Verifique o volume ou as configurações de conversão de texto em fala do sistema se você não estiver ouvindo a voz agora.</string>
+    <string name="pref_tts_playing_test_voice">Verifique o volume ou as configurações de conversão de texto em fala do sistema se você não estiver ouvindo a voz agora</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Não disponível</string>
     <string name="pref_map_auto_zoom">Zoom automático</string>
@@ -263,7 +263,7 @@
     <string name="downloader_download_all_button">Baixar tudo</string>
     <string name="downloader_downloading">Baixando:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Favor parar a navegação para apagar o mapa.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Favor parar a navegação para apagar o mapa</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Só podem ser criadas rotas que estejam completamente contidas em um único mapa.</string>
     <!-- Context menu item for downloader. -->
@@ -333,17 +333,17 @@
     <string name="dialog_routing_location_turn_on">Ative os serviços de localização</string>
     <string name="dialog_routing_location_unknown_turn_on">Não foi possível localizar as coordenadas do GPS. Ative os serviços de localização para que a rota seja traçada.</string>
     <string name="dialog_routing_unable_locate_route">Não foi possível encontrar uma rota</string>
-    <string name="dialog_routing_cant_build_route">Não foi possível gerar uma rota.</string>
+    <string name="dialog_routing_cant_build_route">Não foi possível criar uma rota</string>
     <string name="dialog_routing_change_start_or_end">Ajuste o ponto de partida ou o ponto de chegada.</string>
     <string name="dialog_routing_change_start">Ajuste o ponto de partida</string>
     <string name="dialog_routing_start_not_determined">A rota não foi traçada, pois não foi possível localizar o ponto de partida.</string>
     <string name="dialog_routing_select_closer_start">Selecione um ponto de partida mais perto de uma estrada.</string>
     <string name="dialog_routing_change_end">Ajuste o ponto de chegada</string>
     <string name="dialog_routing_end_not_determined">A rota não foi traçada, pois não foi possível localizar o ponto de chegada.</string>
-    <string name="dialog_routing_select_closer_end">Selecione um ponto de chegada mais perto de uma estrada.</string>
-    <string name="dialog_routing_intermediate_not_determined">Ajuste seu ponto intermédio.</string>
+    <string name="dialog_routing_select_closer_end">Selecione um ponto de chegada mais perto de uma estrada</string>
+    <string name="dialog_routing_intermediate_not_determined">Por favor, ajuste seu ponto intermediário</string>
     <string name="dialog_routing_system_error">Erro de sistema</string>
-    <string name="dialog_routing_application_error">Não foi possível traçar uma rota devido a um erro no aplicativo.</string>
+    <string name="dialog_routing_application_error">Não foi possível traçar uma rota devido a um erro no aplicativo</string>
     <string name="dialog_routing_try_again">Por favor, tente novamente</string>
     <string name="not_now">Agora não</string>
     <string name="dialog_routing_download_and_build_cross_route">Deseja baixar o mapa e traçar uma rota melhor, mas que se estenda por mais de um mapa?</string>
@@ -357,11 +357,11 @@
     <string name="hide">Ocultar</string>
     <string name="categories">Categorias</string>
     <string name="history">Histórico</string>
-    <string name="search_not_found">Sinto muito, nenhum resultado foi encontrado.</string>
+    <string name="search_not_found">Sinto muito, nenhum resultado foi encontrado</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Faça o download da região onde está pesquisando ou tente adicionar o nome de uma cidade ou povoado ao redor.</string>
     <string name="search_history_title">Histórico de busca</string>
-    <string name="search_history_text">Visualizar as buscas recentes.</string>
+    <string name="search_history_text">Visualizar as buscas recentes</string>
     <string name="clear_search">Limpar histórico de pesquisa</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipédia</string>
@@ -369,7 +369,7 @@
     <string name="p2p_start">Iniciar</string>
     <string name="p2p_from_here">Rota de</string>
     <string name="p2p_to_here">Rota para</string>
-    <string name="p2p_only_from_current">Só é possível navegar a partir da sua localização atual.</string>
+    <string name="p2p_only_from_current">A navegação só está disponível a partir da sua localização atual</string>
     <string name="p2p_reroute_from_current">Deseja planejar uma rota a partir da sua localização atual?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Próxima</string>
@@ -419,14 +419,14 @@
     <string name="select_cuisine">Selecione a culinária</string>
     <!-- login text field -->
     <string name="email_or_username">Email ou nome de usuário</string>
-    <string name="downloader_delete_map_dialog">Todas as edições no mapa serão excluídas juntamente com o mapa.</string>
+    <string name="downloader_delete_map_dialog">Todas as suas edições no mapa serão excluídas juntamente com o mapa</string>
     <string name="downloader_update_maps">Atualizar mapas</string>
     <string name="downloader_mwm_migration_dialog">Para criar um itinerário é necessário atualizar todos os mapas e, em seguida, planejá-lo novamente.</string>
     <string name="downloader_search_field_hint">Encontrar o mapa</string>
-    <string name="common_check_internet_connection_dialog">Por favor, verifique as suas configurações e certifique-se de que o dispositivo está conectado à internet.</string>
+    <string name="common_check_internet_connection_dialog">Certifique-se de que seu dispositivo esteja conectado à internet</string>
     <string name="downloader_no_space_title">Não há espaço suficiente</string>
     <string name="downloader_no_space_message">Por favor, remova os dados desnecessários</string>
-    <string name="editor_login_error_dialog">Erro no login.</string>
+    <string name="editor_login_error_dialog">Erro ao iniciar sessão</string>
     <string name="editor_profile_changes">Alterações verificadas</string>
     <string name="editor_edit_place_title">Edição</string>
     <string name="editor_add_place_title">Adicionando</string>
@@ -440,11 +440,11 @@
     <string name="osm_presentation">Dados do OpenStreetMap criados pela comunidade até %s. Saiba mais sobre como editar e atualizar o mapa em OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">O OpenStreetMap (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do CoMaps e funciona de forma semelhante à Wikipédia. Você pode adicionar ou editar lugares e eles ficam disponíveis para milhões de usuários no mundo todo. \nJunte-se à comunidade e ajude a criar um mapa melhor para todos!</string>
-    <string name="login_to_make_edits_visible">Crie uma conta no OpenStreetMap ou faça login para publicar suas edições de mapas para o mundo.</string>
+    <string name="login_to_make_edits_visible">Crie uma conta OpenStreetMap ou inicie sessão para publicar suas edições de mapas no mundo todo</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
     <string name="download_over_mobile_header">Baixar usando uma conexão de rede celular?</string>
-    <string name="download_over_mobile_message">Isto pode ser muito caro com alguns planos ou se você estiver em roaming.</string>
+    <string name="download_over_mobile_message">Isto pode ser muito caro com alguns planos ou se você estiver em roaming</string>
     <string name="error_enter_correct_house_number">Informe o número correto do endereço</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">O número de andares não pode ser maior que %d</string>
@@ -460,8 +460,8 @@
     <string name="editor_category_unsuitable_title">Você não encontra uma categoria adequada?</string>
     <string name="editor_category_unsuitable_text">O CoMaps permite que você adicione apenas categorias de pontos simples, o que significa que não há cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente no <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nosso <a href="https://www.comaps.app/support/advanced-map-editing/">guia</a> para obter instruções detalhadas passo a passo.</string>
     <string name="downloader_no_downloaded_maps_title">Você não fez o download de nenhum mapa</string>
-    <string name="downloader_no_downloaded_maps_message">Baixe mapas para pesquisar locais e usar navegação offline.</string>
-    <string name="current_location_unknown_error_title">A localização atual é desconhecida.</string>
+    <string name="downloader_no_downloaded_maps_message">Baixe mapas para pesquisar e navegar offline</string>
+    <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -495,8 +495,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Deseja enviar para todos os usuários?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado pessoal.</string>
-    <string name="editor_share_to_all_dialog_message_2">Os editores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida.</string>
+    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal</string>
+    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Registro da pista</string>
     <!-- For the first routing -->
@@ -509,10 +509,10 @@
     <string name="mobile_data_option_not_today">Não utilizar hoje</string>
     <string name="mobile_data">Internet móvel</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Para visualizar informações detalhadas sobre os locais, tais como fotos, preços e avaliações, é necessário acesso à internet móvel.</string>
+    <string name="mobile_data_description">Internet móvel é necessária para notificações de atualização de mapas e envio de edições</string>
     <string name="mobile_data_option_never">Nunca utilizar</string>
     <string name="mobile_data_option_ask">Perguntar sempre</string>
-    <string name="traffic_update_maps_text">Para ver os dados de tráfego, os mapas devem ser atualizados.</string>
+    <string name="traffic_update_maps_text">Para mostrar os dados de trânsito, os mapas devem ser atualizados</string>
     <string name="big_font">Aumentar tamanho da fonte no mapa</string>
     <string name="traffic_update_app">Atualize o CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -521,7 +521,7 @@
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Opinão geral</string>
     <string name="prefs_languages_information">Utilizamos o sistema TTS (texto-para-voz) para instruções de voz. Muitos dispositivos do Android usam o TTS do Google, você pode baixá-lo ou atualizá-lo no Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia.</string>
+    <string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia</string>
     <string name="transliteration_title">Transliterar para alfabeto latino</string>
     <string name="learn_more">Saber mais</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -596,7 +596,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Nunca avisar</string>
     <string name="power_managment_title">Modo de economia de energia</string>
-    <string name="power_managment_description">Tentar reduzir o consumo de energia em detrimento de algumas funcionalidades.</string>
+    <string name="power_managment_description">Tentar reduzir o consumo de energia em detrimento de algumas funcionalidades</string>
     <string name="power_managment_setting_never">Nunca</string>
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máxima economia de energia</string>
@@ -803,7 +803,7 @@
     <string name="instagram">Instagram</string>
     <string name="vk">VK</string>
     <string name="app_site_url">https://comaps.app/pt-BR/</string>
-    <string name="dialog_routing_change_intermediate">Não foi possível localizar o ponto intermediário.</string>
+    <string name="dialog_routing_change_intermediate">Não foi possível localizar o ponto intermediário</string>
     <string name="editor_time_from">De</string>
     <string name="how_to_support_us">Apoie o projeto</string>
     <string name="google_play_services">Serviço de localização integrada do Google</string>
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 86481c647..43304a2de 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
@@ -1398,4 +1398,8 @@
     <string name="type.natural.wetland.tidalflat">Planície de maré</string>
     <string name="type.natural.wetland.saltmarsh">Sapal</string>
     <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.amenity.luggage_locker">Armário guarda-volumes</string>
+    <string name="type.amenity.bicycle_parking.covered">Bicicletário coberto</string>
+    <string name="type.post_office.post_partner">Parceiro postal</string>
+    <string name="type.amenity.ranger_station">Posto de guardas florestais</string>
 </resources>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index 3794b4d0b..20e9adc70 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -380,7 +380,7 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Преузмите регион где вршите претрагу, или пробајте да додате име оближњег насеља.</string>
     <string name="search_history_title">Историја претраге</string>
-    <string name="search_history_text">Погледајте ваше недавне претраге.</string>
+    <string name="search_history_text">Погледајте ваше недавне претраге</string>
     <string name="clear_search">Обриши историју претраге</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Википедија</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 56b918f19..9fb3fb936 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -32,7 +32,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">精度有限</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">为确保导航准确，请在设置中启用 \"精确定位\"。</string>
+    <string name="precise_location_is_disabled_long_text">为确保准确导航，请在设置中启用确切位置</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">在地图上显示</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -91,7 +91,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">将地图保存到</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">选择下载地图的文件夹。</string>
+    <string name="maps_storage_summary">选择要下载地图的文件夹</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">已下载的地图</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -182,9 +182,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">您的位置尚未确定</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">很抱歉，地图存储设置目前已停用。</string>
+    <string name="cant_change_this_setting">抱歉，地图存储设置当前已禁用</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">地图下载进行中。</string>
+    <string name="downloading_is_active">地图下载正在进行中</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">嘿，在 CoMaps 上查看我目前的位置吧！请打开 %1$s 或 %2$s 链接，还没安装离线地图？在此下载: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -242,7 +242,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">测试语音指令（TTS，文本转语音系统）</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">如果您现在听不到声音，请检查音量或系统文本到语音系统的设置。</string>
+    <string name="pref_tts_playing_test_voice">如果您现在听不到声音，请检查音量或系统文本转语音设置</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">不可用</string>
     <string name="pref_map_auto_zoom">自动缩放</string>
@@ -294,7 +294,7 @@
     <string name="downloader_download_all_button">下载全部</string>
     <string name="downloader_downloading">正在下载：</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">要删除地图，请停止导航。</string>
+    <string name="downloader_delete_map_while_routing_dialog">要删除地图，请停止导航</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">路线只能完全处在同一地图里时才能被规划。</string>
     <!-- Context menu item for downloader. -->
@@ -366,18 +366,18 @@
     <string name="dialog_routing_location_turn_on">启用定位服务</string>
     <string name="dialog_routing_location_unknown_turn_on">无法定位当前 GPS 坐标。请启用定位服务以规划路线。</string>
     <string name="dialog_routing_unable_locate_route">无法定位路线</string>
-    <string name="dialog_routing_cant_build_route">无法规划路线。</string>
+    <string name="dialog_routing_cant_build_route">无法规划路线</string>
     <string name="dialog_routing_change_start_or_end">请调整您的起点或目的地。</string>
     <string name="dialog_routing_change_start">调整出发点</string>
     <string name="dialog_routing_start_not_determined">路线未规划。无法定位起点。</string>
     <string name="dialog_routing_select_closer_start">请选择更靠近公路的起点。</string>
     <string name="dialog_routing_change_end">调整目的地</string>
     <string name="dialog_routing_end_not_determined">路线未规划。无法定位目的地。</string>
-    <string name="dialog_routing_select_closer_end">请选择更靠近公路的目的地位置。</string>
-    <string name="dialog_routing_change_intermediate">无法定位途径点。</string>
-    <string name="dialog_routing_intermediate_not_determined">请调整您的途径点。</string>
+    <string name="dialog_routing_select_closer_end">请选择更靠近公路的目的地位置</string>
+    <string name="dialog_routing_change_intermediate">无法定位途径点</string>
+    <string name="dialog_routing_intermediate_not_determined">请调整您的途径点</string>
     <string name="dialog_routing_system_error">系统错误</string>
-    <string name="dialog_routing_application_error">由于应用程序出错，因此无法规划路线。</string>
+    <string name="dialog_routing_application_error">由于应用程序错误，无法规划路线</string>
     <string name="dialog_routing_try_again">请再试一次</string>
     <string name="not_now">以后再说</string>
     <string name="dialog_routing_download_and_build_cross_route">您是否要下载地图，以规划跨越边界的更佳路线？</string>
@@ -391,11 +391,11 @@
     <string name="hide">隐藏</string>
     <string name="categories">类别</string>
     <string name="history">历史</string>
-    <string name="search_not_found">很抱歉，没有搜到任何地点。</string>
+    <string name="search_not_found">糟糕，找不到任何结果</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">下载您要搜索的区域的地图，或尝试输入附近的城镇或村庄名称。</string>
     <string name="search_history_title">搜索历史记录</string>
-    <string name="search_history_text">查看您最近的搜索记录。</string>
+    <string name="search_history_text">查看您最近的搜索</string>
     <string name="clear_search">清除搜索记录</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">维基百科</string>
@@ -405,7 +405,7 @@
     <string name="p2p_start">开始</string>
     <string name="p2p_from_here">从这出发</string>
     <string name="p2p_to_here">到这去</string>
-    <string name="p2p_only_from_current">导航只能从您目前的位置开始。</string>
+    <string name="p2p_only_from_current">导航只能从您当前的位置开始</string>
     <string name="p2p_reroute_from_current">您是否想要规划当前位置的路线？</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">下一页</string>
@@ -477,14 +477,14 @@
     <string name="level">楼层</string>
     <!-- Building level -->
     <string name="level_value_generic">楼层：%s</string>
-    <string name="downloader_delete_map_dialog">所有对地图的修改都将与地图一起被删除。</string>
+    <string name="downloader_delete_map_dialog">您对地图的所有编辑都将随地图一起删除</string>
     <string name="downloader_update_maps">更新地图</string>
     <string name="downloader_mwm_migration_dialog">为了规划路线，您需要更新全部地图并重新规划路线。</string>
     <string name="downloader_search_field_hint">搜索地图</string>
-    <string name="common_check_internet_connection_dialog">请检查您的设置并确保您的设备已连接至网络。</string>
+    <string name="common_check_internet_connection_dialog">请确保您的设备已连接到互联网</string>
     <string name="downloader_no_space_title">没有足够的空间</string>
     <string name="downloader_no_space_message">请删除不必要的数据</string>
-    <string name="editor_login_error_dialog">无法登录。</string>
+    <string name="editor_login_error_dialog">登录错误</string>
     <string name="editor_profile_changes">已验证的更改</string>
     <string name="editor_focus_map_on_location">拖动地图，将十字架放在地点或企业的位置。</string>
     <string name="editor_edit_place_title">编辑中</string>
@@ -501,11 +501,11 @@
     <string name="osm_presentation">截至 %s 的社区创建的 OpenStreetMap 数据。请访问 OpenStreetMap.org 以了解有关如何编辑和更新地图的信息</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org（OSM）是一个构建免费开放地图的社区项目。它是 CoMaps 中地图数据的主要来源，其工作原理类似于维基百科。您可以添加或编辑地点，可供全世界数以百万计的用户使用并受益。\n加入OSM，让我们共绘更优质的地图吧！</string>
-    <string name="login_to_make_edits_visible">创建 OpenStreetMap 账号或登录，向全世界发布您编辑的地图。</string>
+    <string name="login_to_make_edits_visible">创建 OpenStreetMap 账号或登录，向全世界发布您编辑的地图</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d / %2$d</string>
     <string name="download_over_mobile_header">用手机网络连接下载吗？</string>
-    <string name="download_over_mobile_message">如果您使用移动数据或漫游来进行下载，将可能导致额外的费用。</string>
+    <string name="download_over_mobile_message">对于某些套餐或漫游，这可能会相当昂贵</string>
     <string name="error_enter_correct_house_number">输入正确的门牌号码</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">最多可编辑 %d 层的建筑</string>
@@ -528,8 +528,8 @@
     <string name="editor_category_unsuitable_title">找不到合适的类别？</string>
     <string name="editor_category_unsuitable_text">CoMaps 只允许添加简单的点类别，即无法添加城镇、道路、湖泊、建筑轮廓等类别。请直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 添加此类类别。请查看我们的<a href="https://www.comaps.app/support/advanced-map-editing/">指南</a>，了解详细的步骤说明。</string>
     <string name="downloader_no_downloaded_maps_title">您尚未下载任何地图</string>
-    <string name="downloader_no_downloaded_maps_message">下载地图来查找位置和离线浏览。</string>
-    <string name="current_location_unknown_error_title">当前位置未知。</string>
+    <string name="downloader_no_downloaded_maps_message">下载地图以离线搜索和导航</string>
+    <string name="current_location_unknown_error_title">当前位置未知</string>
     <!-- abbreviation for meters -->
     <string name="m">米</string>
     <!-- abbreviation for kilometers -->
@@ -568,8 +568,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">您想要发送给所有用户吗？</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">确保您没有输入任何个人数据。</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改并在有任何问题时与您联系。</string>
+    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系</string>
     <string name="navigation_stop_button">停止</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">记录轨迹</string>
@@ -583,10 +583,10 @@
     <string name="mobile_data_option_not_today">今天不使用</string>
     <string name="mobile_data">移动网络</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">要显示地点的详细信息（例如照片、价格和评价），需要使用移动网络。</string>
+    <string name="mobile_data_description">地图更新通知和上传编辑内容需要移动互联网</string>
     <string name="mobile_data_option_never">从不使用</string>
     <string name="mobile_data_option_ask">总是询问</string>
-    <string name="traffic_update_maps_text">诺要显示交通数据，必须更新地图。</string>
+    <string name="traffic_update_maps_text">要显示交通数据，必须更新地图</string>
     <string name="big_font">增大地图上的字体大小</string>
     <string name="traffic_update_app">请更新 CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -596,7 +596,7 @@
     <string name="feedback_general">常规反馈</string>
     <string name="prefs_languages_information">我们的语音导航使用“文本转语音”系统。许多 Android 设备使用 Google 的文本转语音系统，您可以从 Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) 下载或更新这一功能</string>
     <string name="prefs_languages_information_off">某些语言需要特意从应用商店（Google Play、三星Galaxy Store、华为应用市场、F-Droid）中安装相关的语音合成器或语言包，才能使用该功能。 \n打开您的设备的设置 → 语言和输入法 → 语音 → 文字转语音 (TTS) 输出。 \n您可以在这里管理语音合成的设置（例如，下载语言包供离线使用）和选择其他 TTS 引擎。</string>
-    <string name="prefs_languages_information_off_link">如需了解更多信息，请查阅此指南。</string>
+    <string name="prefs_languages_information_off_link">如需了解详情，请查阅此指南</string>
     <string name="transliteration_title">拉丁字母音译</string>
     <string name="learn_more">了解更多信息</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -672,7 +672,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">永远不会对摄像头发出警告</string>
     <string name="power_managment_title">省电模式</string>
-    <string name="power_managment_description">如果开启省电模式，本应用将根据手机的当前电量关闭耗电功能。</string>
+    <string name="power_managment_description">启用省电模式，部分功能可能受限</string>
     <string name="power_managment_setting_never">从不</string>
     <string name="power_managment_setting_auto">当电量低时</string>
     <string name="power_managment_setting_manual_max">最大程度省电</string>
@@ -923,4 +923,5 @@
     <string name="dialog_report_error_with_logs">请向我们发送错误报告：\n - 在设置中“启用日志记录”\n - 重现问题\n - 在“关于和帮助”屏幕中点击“报告错误”按钮，然后通过电子邮件或聊天软件发送\n - 禁用日志记录</string>
     <string name="closed_now">已歇业</string>
     <string name="open_now">营业中</string>
+    <string name="at">%s</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
index fc8a0c703..74240754e 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -91,7 +91,7 @@
 "type.amenity.parking.no.access" = "Частен паркинг";
 "type.amenity.parking.permissive" = "Частен паркинг";
 "type.amenity.parking.private" = "Частен паркинг";
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Паркинг с трансфер до обществения транспорт";
 "type.amenity.parking.underground" = "Подземен паркинг";
 "type.amenity.parking.underground.fee" = "Подземен паркинг";
 "type.amenity.parking.underground.private" = "Частен подземен паркинг";
@@ -1199,103 +1199,103 @@
 "type.railway.subway_entrance.wuhan" = "Вход в метрото";
 "type.railway.subway_entrance.yerevan" = "Вход в метрото";
 "type.railway.subway_entrance.yokohama" = "Вход в метрото";
-"type.railway.tram" = "Tram Line";
-"type.railway.tram.bridge" = "Tram Line Bridge";
-"type.railway.tram.tunnel" = "Tram Line Tunnel";
-"type.railway.tram_stop" = "Tram Stop";
+"type.railway.tram" = "Трамвайна линия";
+"type.railway.tram.bridge" = "Мост на трамвайна линия";
+"type.railway.tram.tunnel" = "Тунел на трамвайна линия";
+"type.railway.tram_stop" = "Трамвайна спирка";
 "type.route" = "Route";
-"type.route.ferry" = "Ferry";
+"type.route.ferry" = "Ферибот";
 "type.route.shuttle_train" = "route-shuttle_train";
-"type.shop" = "Shop";
-"type.shop.alcohol" = "Liquor Shop";
-"type.shop.bakery" = "Bakery";
+"type.shop" = "Магазин";
+"type.shop.alcohol" = "Магазин за алкохол";
+"type.shop.bakery" = "Пекарна";
 "type.shop.bathroom_furnishing" = "Обзавеждане за баня";
-"type.shop.beauty" = "Магазин за красота";
+"type.shop.beauty" = "Салон за красота";
 "type.shop.beverages" = "Напитки";
 "type.shop.bicycle" = "Магазин за колела";
-"type.shop.bookmaker" = "Bookmaker";
-"type.shop.books" = "Bookstore";
+"type.shop.bookmaker" = "Букмейкър";
+"type.shop.books" = "Книжарница";
 "type.shop.butcher" = "Месар";
 "type.shop.cannabis" = "Магазин за канабис";
-"type.shop.car" = "Car Dealership";
+"type.shop.car" = "Автокъща";
 "type.shop.car_parts" = "Магазин за авточасти";
 "type.shop.car_repair" = "Сервиз за коли";
 "type.shop.car_repair.tyres" = "Гумаджия";
-"type.shop.caravan" = "RV Dealership";
+"type.shop.caravan" = "Автокъща на домове на колела";
 "type.shop.carpet" = "Килими";
 "type.shop.chemist" = "Химик";
-"type.shop.chocolate" = "Chocolate Shop";
-"type.shop.clothes" = "Clothes Shop";
-"type.shop.coffee" = "Coffee Shop";
-"type.shop.computer" = "Computer Store";
-"type.shop.confectionery" = "Candy Shop";
-"type.shop.convenience" = "Convenience Store";
-"type.shop.copyshop" = "Copyshop";
+"type.shop.chocolate" = "Магазин за шоколад";
+"type.shop.clothes" = "Магазин за дрехи";
+"type.shop.coffee" = "Магазин за кафе";
+"type.shop.computer" = "Магазин за компютри";
+"type.shop.confectionery" = "Магазин за бонбони";
+"type.shop.convenience" = "Магазин за хранителни стоки";
+"type.shop.copyshop" = "Копирен център";
 "type.shop.cosmetics" = "Магазин за козметика";
 "type.shop.curtain" = "Пердета";
 "type.shop.deli" = "Магазин за деликатеси";
-"type.shop.department_store" = "Department Store";
+"type.shop.department_store" = "Универсален магазин";
 "type.shop.doityourself" = "Строителен маркет";
-"type.shop.dry_cleaning" = "Dry Cleaner";
-"type.shop.electronics" = "Electronics Shop";
-"type.shop.erotic" = "Erotic Shop";
-"type.shop.fabric" = "Fabric Shop";
+"type.shop.dry_cleaning" = "Химическо чистене";
+"type.shop.electronics" = "Магазин за електроника";
+"type.shop.erotic" = "Еротичен магазин";
+"type.shop.fabric" = "Магазин за платове";
 "type.shop.farm" = "Магазин за селскостопански храни";
 "type.shop.fashion_accessories" = "Модни аксесоари";
 "type.shop.florist" = "Цветарски магазин";
-"type.shop.funeral_directors" = "Funeral Directors";
-"type.shop.furniture" = "Furniture Store";
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.funeral_directors" = "Погребални директори";
+"type.shop.furniture" = "Магазин за мебели";
+"type.shop.garden_centre" = "Градински център";
 "type.shop.gas" = "Магазин за газ";
-"type.shop.gift" = "Gift Shop";
-"type.shop.greengrocer" = "Greengrocer";
+"type.shop.gift" = "Магазин за сувенири";
+"type.shop.greengrocer" = "Магазин за плодове и зеленчуци";
 "type.shop.grocery" = "Хранителни стоки";
-"type.shop.hairdresser" = "Hairdresser";
+"type.shop.hairdresser" = "Фризьорски салон";
 "type.shop.hardware" = "Железария";
 "type.shop.health_food" = "Магазин за здравословни храни";
 "type.shop.hearing_aids" = "Магазин за слухови апарати";
 "type.shop.herbalist" = "Магазин за билки";
 "type.shop.hifi" = "HiFi аудио";
 "type.shop.houseware" = "Магазин за домакински принадлежности";
-"type.shop.jewelry" = "Jewelry Store";
-"type.shop.kiosk" = "Kiosk";
+"type.shop.jewelry" = "Магазин за бижута";
+"type.shop.kiosk" = "Киоск";
 "type.shop.kitchen" = "Магазин за кухня";
-"type.shop.laundry" = "Laundry";
-"type.shop.mall" = "Mall";
-"type.shop.massage" = "Massage Salon";
-"type.shop.mobile_phone" = "Cell Phone Store";
-"type.shop.money_lender" = "Money Lender";
-"type.shop.motorcycle" = "Motorcycle Shop";
+"type.shop.laundry" = "Обществена пералня";
+"type.shop.mall" = "Търговски център";
+"type.shop.massage" = "Масажен салон";
+"type.shop.mobile_phone" = "Магазин за мобилни телефони";
+"type.shop.money_lender" = "Кредитор";
+"type.shop.motorcycle" = "Магазин за мотоциклети";
 "type.shop.motorcycle_repair" = "Ремонт на мотоциклети";
-"type.shop.music" = "Record Store";
-"type.shop.musical_instrument" = "Musical Instrument Shop";
-"type.shop.newsagent" = "Newspaper Stand";
-"type.shop.optician" = "Optician";
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.music" = "Магазин за грамофонни плочи";
+"type.shop.musical_instrument" = "Магазин за музикални инструменти";
+"type.shop.newsagent" = "Киоск за вестници";
+"type.shop.optician" = "Оптика";
+"type.shop.outdoor" = "Магазин за къмпинг";
 "type.shop.outpost" = "Точка на вземане";
 "type.shop.pasta" = "Магазин за паста";
 "type.shop.pastry" = "Тестени изделия";
-"type.shop.pawnbroker" = "Pawnbroker";
+"type.shop.pawnbroker" = "Заложна къща";
 "type.shop.pet" = "Магазин за животни";
 "type.shop.pet_grooming" = "Грижа за домашни любимци";
-"type.shop.photo" = "Photo Shop";
+"type.shop.photo" = "Магазин за снимки";
 "type.shop.rental" = "Магазин под наем";
 "type.shop.rental.bicycle" = "Магазин за велосипеди под наем";
 "type.shop.seafood" = "Риба";
 "type.shop.second_hand" = "Магазин втора употреба";
 "type.shop.shoes" = "Магазин за обувки";
 "type.shop.sports" = "Спортни стоки";
-"type.shop.stationery" = "Stationery Shop";
+"type.shop.stationery" = "Магазин за канцеларски материали";
 "type.shop.supermarket" = "Супермаркет";
-"type.shop.tattoo" = "Tattoo Parlour";
+"type.shop.tattoo" = "Студио за татуировки";
 "type.shop.tea" = "Магазин за чай";
-"type.shop.ticket" = "Ticket Shop";
+"type.shop.ticket" = "Продажба на билети";
 "type.shop.toys" = "Играчки";
-"type.shop.travel_agency" = "Travel Agency";
+"type.shop.travel_agency" = "Туристическа агенция";
 "type.shop.tyres" = "Гуми";
-"type.shop.variety_store" = "Variety Store";
-"type.shop.video" = "Video Shop";
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.variety_store" = "Магазин за разнообразни стоки";
+"type.shop.video" = "Магазин за видео";
+"type.shop.video_games" = "Магазин за видеоигри";
 "type.shop.wine" = "Вино";
 "type.shop.agrarian" = "Селскостопански магазин";
 "type.shop.antiques" = "Антики";
@@ -1328,27 +1328,27 @@
 "type.sport" = "Спорт";
 "type.sport.american_football" = "Американски футбол";
 "type.sport.archery" = "Стрелба с лък";
-"type.sport.athletics" = "Athletics";
+"type.sport.athletics" = "Атлетика";
 "type.sport.australian_football" = "Австралийски футбол";
-"type.sport.baseball" = "Baseball";
-"type.sport.basketball" = "Basketball";
+"type.sport.baseball" = "Бейзбол";
+"type.sport.basketball" = "Баскетбол";
 "type.sport.beachvolleyball" = "Плажен волейбол";
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Чаши";
 "type.sport.chess" = "Шахмат";
-"type.sport.cricket" = "Cricket";
-"type.sport.curling" = "Curling";
+"type.sport.cricket" = "Крикет";
+"type.sport.curling" = "Кърлинг";
 "type.sport.equestrian" = "Конен спорт";
-"type.sport.golf" = "Golf";
-"type.sport.gymnastics" = "Gymnastics";
-"type.sport.handball" = "Handball";
+"type.sport.golf" = "Голф";
+"type.sport.gymnastics" = "Гимнастика";
+"type.sport.handball" = "Хандбал";
 "type.sport.multi" = "Различни спортове";
 
 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
-"type.sport.shooting" = "Shooting";
+"type.sport.scuba_diving" = "Място за гмуркане";
+"type.sport.shooting" = "Стрелба";
 "type.sport.skateboard" = "Скейтбординг";
-"type.sport.skiing" = "Skiing";
-"type.sport.soccer" = "Soccer";
+"type.sport.skiing" = "Каране на ски";
+"type.sport.soccer" = "Футбол";
 "type.sport.swimming" = "Плуване";
 "type.sport.table_tennis" = "Тенис на маса";
 "type.sport.tennis" = "Тенис корт";
@@ -1361,45 +1361,45 @@
 "type.sport.field_hockey" = "Хокей на трева";
 "type.sport.badminton" = "Бадминтон";
 "type.sport.pelota" = "Баска пелота";
-"type.tourism" = "Tourism";
+"type.tourism" = "Туризъм";
 "type.tourism.aquarium" = "Аквариум";
 
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Планинска хижа";
 "type.tourism.apartment" = "Ваканционен апартамент";
 "type.tourism.artwork" = "Artwork";
-"type.tourism.artwork.architecture" = "Architectural Artwork";
-"type.tourism.artwork.painting" = "Painting";
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.architecture" = "Архитектурни произведения на изкуството";
+"type.tourism.artwork.painting" = "Живопис";
+"type.tourism.artwork.sculpture" = "Скулптура";
 "type.tourism.artwork.statue" = "Статуя";
 "type.tourism.attraction" = "Забележителност";
 "type.attraction.amusement_ride" = "Развлекателна атракция";
 "type.attraction.animal" = "Заграждение за животни";
-"type.attraction.bumper_car" = "Bumper Car";
-"type.attraction.big_wheel" = "Big Wheel";
+"type.attraction.bumper_car" = "Блъскащи коли";
+"type.attraction.big_wheel" = "Виенско колело";
 "type.attraction.carousel" = "Въртележка";
 "type.attraction.historic" = "Историческа атракция";
 "type.attraction.maze" = "Лабиринт";
 "type.attraction.roller_coaster" = "Въртележка";
 "type.attraction.water_slide" = "Водна пързалка";
 "type.tourism.attraction.specified" = "Забележителност";
-"type.tourism.camp_site" = "Campground";
-"type.tourism.caravan_site" = "RV Park";
+"type.tourism.camp_site" = "Място за къмпинг";
+"type.tourism.caravan_site" = "Парк за домове на колела";
 
 /* A rentable countryside vacation house. */
 "type.tourism.chalet" = "Ваканционна вила";
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Художествена галерия";
 "type.tourism.guest_house" = "Къща за гости";
 "type.tourism.hostel" = "Гостилница";
-"type.tourism.hotel" = "Hotel";
+"type.tourism.hotel" = "Хотел";
 "type.tourism.information" = "Туринформация";
 "type.tourism.information.board" = "Информационен щит";
 "type.tourism.information.guidepost" = "Пътеводител";
 "type.tourism.information.map" = "Карта";
 "type.tourism.information.office" = "Туристически офис";
 "type.tourism.information.visitor_centre" = "Център за посетители";
-"type.tourism.motel" = "Motel";
-"type.tourism.museum" = "Museum";
+"type.tourism.motel" = "Мотел";
+"type.tourism.museum" = "Музей";
 "type.tourism.picnic_site" = "Picnic Site";
 "type.leisure.resort" = "Resort";
 "type.tourism.theme_park" = "Theme Park";
@@ -1407,7 +1407,7 @@
 
 /* Typically more basic, not staffed and free (compared to alpine_hut). */
 "type.tourism.wilderness_hut" = "Хижа-заслон";
-"type.tourism.zoo" = "Zoo";
+"type.tourism.zoo" = "Зоопарк";
 "type.tourism.zoo.petting" = "Зоопарк за домашни любимци";
 "type.traffic_calming" = "Traffic Calming";
 "type.traffic_calming.bump" = "Traffic Bump";
@@ -1499,8 +1499,8 @@
 "type.man_made.crane" = "Кран";
 "type.natural.wetland.saltmarsh.tidal" = "Приливни солени блато";
 "type.landuse.plant_nursery" = "Посадъчен материал";
-"type.leisure.escape_game" = "Escape Room";
-"type.post_office.post_partner" = "Post Partner";
-"type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.luggage_locker" = "Luggage Locker";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.leisure.escape_game" = "Ескейп стая";
+"type.post_office.post_partner" = "Пощенски партньор";
+"type.amenity.ranger_station" = "Станция за рейнджъри";
+"type.amenity.luggage_locker" = "Шкафче за багаж";
+"type.amenity.bicycle_parking.covered" = "Покрит паркинг за колела";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index 5db165ae3..8997333dc 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -1491,16 +1491,16 @@
 "type.natural.wetland.tidalflat" = "Tidal Flat";
 "type.sport.diving" = "High Diving";
 "type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
-"type.natural.wetland.swamp" = "Swamp";
+"type.natural.wetland.swamp" = "Sump";
 "type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
+"type.natural.wetland.saltmarsh" = "Strandeng";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.natural.wetland.fen" = "Fen";
-"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
+"type.natural.wetland.saltmarsh.tidal" = "Tidevandspåvirket strandeng";
 "type.natural.wetland.reedbed" = "Reed Bed";
 "type.railway.station.subway.qingdao" = "Subway Station";
 "type.leisure.escape_game" = "Escape Room";
-"type.amenity.luggage_locker" = "Luggage Locker";
-"type.post_office.post_partner" = "Post Partner";
+"type.amenity.luggage_locker" = "Bagageboks";
+"type.post_office.post_partner" = "Postpartner";
 "type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.bicycle_parking.covered" = "Overdækket cykelparkering";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index fdd0496bb..5a38a3fa2 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -1503,4 +1503,4 @@
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.post_office.post_partner" = "Post Partner";
 "type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.bicycle_parking.covered" = "Pyöräkatos";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
index e90877a42..7d1d31672 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
@@ -586,6 +586,6 @@
 "social_mastodon" = "Mastodon";
 "social_pixelfed" = "Pixelfed";
 "pref_mapappearance_title" = "Chartedarstellig";
-"pref_maplanguage_title" = "Map Language";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
+"pref_maplanguage_title" = "Charte-Spraach";
+"transliteration_title_disabled_summary" = "Bi de Nutzig vo de lokale Spraach für d Charte uusgschaltet";
+"pref_maplanguage_local" = "Lokali Spraach";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
index 449033c1a..654801711 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
@@ -1314,7 +1314,7 @@
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.natural.wetland.tidalflat" = "Watt";
 "type.leisure.escape_game" = "Escape Room";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
-"type.amenity.luggage_locker" = "Luggage Locker";
-"type.amenity.ranger_station" = "Ranger Station";
-"type.post_office.post_partner" = "Post Partner";
+"type.amenity.bicycle_parking.covered" = "Überdachte Veloparkplatz";
+"type.amenity.luggage_locker" = "Gepäckschlüüssfach";
+"type.amenity.ranger_station" = "Förschterstation";
+"type.post_office.post_partner" = "Postpartner";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index 4f4cad458..587215fb3 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -12,6 +12,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Nessun preferito</string>
 			<key>one</key>
 			<string>%d preferito</string>
 			<key>other</key>
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 28c8db259..056a273d3 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1098,6 +1098,6 @@
 "osm_profile_view_edit_history" = "Ver histórico de edições";
 "osm_profile_view_notes" = "Ver notas";
 "pref_mapappearance_title" = "Aparência do mapa";
-"pref_maplanguage_title" = "Map Language";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
+"pref_maplanguage_title" = "Idioma do mapa";
+"transliteration_title_disabled_summary" = "Desativado quando sempre se utiliza o idioma local para o mapa";
+"pref_maplanguage_local" = "Idioma local";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index ffe2b7800..ed007c749 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -1500,7 +1500,7 @@
 "type.natural.wetland.tidalflat" = "Planície de maré";
 "type.natural.wetland.saltmarsh" = "Sapal";
 "type.leisure.escape_game" = "Escape Room";
-"type.amenity.luggage_locker" = "Luggage Locker";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
-"type.post_office.post_partner" = "Post Partner";
-"type.amenity.ranger_station" = "Ranger Station";
+"type.amenity.luggage_locker" = "Armário guarda-volumes";
+"type.amenity.bicycle_parking.covered" = "Bicicletário coberto";
+"type.post_office.post_partner" = "Parceiro postal";
+"type.amenity.ranger_station" = "Posto de guardas florestais";
diff --git a/iphone/metadata/pt-BR/keywords.txt b/iphone/metadata/pt-BR/keywords.txt
index 3f4cd179c..1cc2d3a45 100644
--- a/iphone/metadata/pt-BR/keywords.txt
+++ b/iphone/metadata/pt-BR/keywords.txt
@@ -1 +1 @@
-comaps,mapas,open street maps,osm,viagem,trilha,bicicleta,direção,offline,privacidade,navegação,gps
+comaps,mapas,openstreetmap,osm,viagem,trilha,bicicleta,direção,offline,privacidade,navegação,gps