diff --git a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
index 5a2007378..5143bd224 100644
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -6,4 +6,4 @@ Apresentamos o logo do CoMaps!
 • Exibição de horário de funcionamento ao selecionar um ponto de interesse
 • Divididas áreas úmidas em vários tipos distintos
 • Atualizada cores/ícones para vegetação e outros elementos
-• Ar livre: curvas de nível de altitude mais destacadas
\ No newline at end of file
+• Ar livre: curvas de nível de altitude mais destacadas
diff --git a/android/app/src/fdroid/play/listings/pt-BR/title.txt b/android/app/src/fdroid/play/listings/pt-BR/title.txt
index 1600419ea..b472b9ea1 100644
--- a/android/app/src/fdroid/play/listings/pt-BR/title.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/title.txt
@@ -1 +1 @@
-CoMaps - Mapas com Privacidade
+CoMaps - Mapas e Navegação Offline com Privacidade
diff --git a/android/app/src/google/play/listings/pt-BR/title.txt b/android/app/src/google/play/listings/pt-BR/title.txt
index d64397c3c..b2f4278f8 100644
--- a/android/app/src/google/play/listings/pt-BR/title.txt
+++ b/android/app/src/google/play/listings/pt-BR/title.txt
@@ -1 +1 @@
-CoMaps - Navegue privadamente
+CoMaps - Navegue Privadamente
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 ce9355907..e933c8ecb 100644
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -508,8 +508,8 @@
     <string name="type.tourism.zoo.petting">Зоопарк за домашни любимци</string>
     <string name="type.waterway.fish_pass">Стълба за риба</string>
     <string name="type.natural.water.ditch">Отводнителна канавка</string>
-    <string name="type.waterway.ditch.tunnel">водосток</string>
-    <string name="type.waterway.drain.tunnel">водосток</string>
+    <string name="type.waterway.ditch.tunnel">Водосток</string>
+    <string name="type.waterway.drain.tunnel">Водосток</string>
     <string name="type.piste_type.snow_park">Снежен парк</string>
     <string name="type.piste_type.hike">Зимна пътека</string>
     <string name="type.piste_type.connection">Свързване на пистите</string>
@@ -1307,4 +1307,17 @@
     <string name="type.shop.hairdresser">Фризьорски салон</string>
     <string name="type.tourism">Туризъм</string>
     <string name="type.tourism.zoo">Зоопарк</string>
+    <string name="type.tourism.picnic_site">Място за пикник</string>
+    <string name="type.leisure.resort">Курорт</string>
+    <string name="type.traffic_calming">Успокояване на трафика</string>
+    <string name="type.traffic_calming.bump">Легнал полицай</string>
+    <string name="type.traffic_calming.hump">Легнал полицай</string>
+    <string name="type.waterway">Воден път</string>
+    <string name="type.barrier.ditch">Канавка</string>
+    <string name="type.waterway.dock">Док на водния път</string>
+    <string name="type.waterway.drain">Дренаж</string>
+    <string name="type.natural.water.drain">Дренаж</string>
+    <string name="type.waterway.lock_gate">Шлюз</string>
+    <string name="type.waterway.canal.tunnel">Тунел под канала</string>
+    <string name="type.waterway.canal">Канал</string>
 </resources>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 08f82da3d..b631074f5 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -357,18 +357,18 @@
     <string name="dialog_routing_location_turn_on">Standortdienste aktivieren</string>
     <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktivieren Sie Standortdienste, um die Route zu berechnen.</string>
     <string name="dialog_routing_unable_locate_route">Route kann nicht ermittelt werden</string>
-    <string name="dialog_routing_cant_build_route">Route kann nicht erstellt werden</string>
+    <string name="dialog_routing_cant_build_route">Route konnte nicht erstellt werden</string>
     <string name="dialog_routing_change_start_or_end">Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an.</string>
     <string name="dialog_routing_change_start">Startpunkt anpassen</string>
     <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt kann nicht gefunden werden.</string>
     <string name="dialog_routing_select_closer_start">Bitte wählen Sie einen Startpunkt, der näher an einer Straße liegt.</string>
     <string name="dialog_routing_change_end">Ziel anpassen</string>
     <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel kann nicht gefunden werden.</string>
-    <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher zur Straße</string>
-    <string name="dialog_routing_change_intermediate">Der Zwischenstopp kann nicht gefunden werden</string>
+    <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher an einer Straße</string>
+    <string name="dialog_routing_change_intermediate">Der Zwischenstopp konnte nicht gefunden werden</string>
     <string name="dialog_routing_intermediate_not_determined">Bitte passen Sie Ihren Zwischenstopp an</string>
     <string name="dialog_routing_system_error">Systemfehler</string>
-    <string name="dialog_routing_application_error">Wegen eines Anwendungsfehlers kann keine Route erstellt werden</string>
+    <string name="dialog_routing_application_error">Wegen eines Anwendungsfehlers konnte keine Route erstellt werden</string>
     <string name="dialog_routing_try_again">Bitte versuchen Sie es erneut</string>
     <string name="not_now">Nicht jetzt</string>
     <string name="dialog_routing_download_and_build_cross_route">Möchten Sie die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
@@ -386,13 +386,13 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Laden Sie die Region herunter, in der Sie suchen, oder fügen Sie den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
     <string name="search_history_title">Suchverlauf</string>
-    <string name="search_history_text">Anzeige Ihre letzten Suchanfragen</string>
+    <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
     <string name="clear_search">Suchverlauf löschen</string>
     <string name="p2p_your_location">Ihr Standort</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Von</string>
     <string name="p2p_to_here">Nach</string>
-    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort möglich</string>
+    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
     <string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Weiter</string>
@@ -471,7 +471,7 @@
     <string name="common_check_internet_connection_dialog">Stellen Sie bitte sicher, dass Ihr Gerät mit dem Internet verbunden ist</string>
     <string name="downloader_no_space_title">Nicht genug Speicherplatz</string>
     <string name="downloader_no_space_message">Bitte entfernen Sie unnötige Daten</string>
-    <string name="editor_login_error_dialog">Login Fehler</string>
+    <string name="editor_login_error_dialog">Login fehlgeschlagen</string>
     <string name="editor_profile_changes">Bestätigte Änderungen der Karte</string>
     <string name="editor_focus_map_on_location">Verschiebe die Karte, um das Kreuz an der Stelle zu platzieren, an der sich der Ort oder das Geschäft befindet.</string>
     <string name="editor_edit_place_title">Wird bearbeitet</string>
@@ -497,7 +497,7 @@
     <!-- 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">Das Gebäude kann nicht mehr als %d Etagen haben</string>
     <string name="editor_zip_code">Postleitzahl</string>
-    <string name="error_enter_correct_zip_code">Geben Sie die korrekte Postleitzahl ein</string>
+    <string name="error_enter_correct_zip_code">Geben Sie eine gültige Postleitzahl ein</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">Kartenpunkt</string>
     <!-- Title for OSM note section in the editor -->
@@ -513,7 +513,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Betreiber: %s</string>
     <string name="editor_category_unsuitable_title">Keine passende Kategorie gefunden?</string>
-    <string name="editor_category_unsuitable_text">Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, daher keine Städte, Straßen, Seen, Gebäudeumrisse, etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt-Anleitung.</string>
+    <string name="editor_category_unsuitable_text">Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
     <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
     <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter</string>
     <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt</string>
@@ -597,7 +597,7 @@
     <string name="placepage_remove_stop">Stopp entfernen</string>
     <string name="placepage_add_stop">Stopp hinzufügen</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Bitte melde dich bei OpenStreetMap an, um alle deine Kartenbearbeitungen automatisch hochzuladen. Erfahre mehr <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
+    <string name="alert_reauth_message">Bitte melde dich bei OpenStreetMap an, um alle deine Kartenbearbeitungen automatisch hochzuladen. Erfahre <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a> mehr.</string>
     <string name="dialog_error_storage_title">Problem mit dem Zugriff auf den Speicher</string>
     <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/app/src/main/res/values-de/types_strings.xml
index 702d5679f..64b2b4edb 100644
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -1132,7 +1132,7 @@
     <string name="type.shop.laundry">Wäscherei</string>
     <string name="type.shop.mall">Einkaufszentrum</string>
     <string name="type.shop.massage">Massagesalon</string>
-    <string name="type.shop.mobile_phone">Handyladen</string>
+    <string name="type.shop.mobile_phone">Mobilfunkgeschäft</string>
     <string name="type.shop.money_lender">Geldverleiher</string>
     <string name="type.shop.motorcycle">Motorradladen</string>
     <string name="type.shop.motorcycle_repair">Motorradwerkstatt</string>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index a94eff3d6..9a94c1370 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -64,14 +64,14 @@
     <string name="editor_time_title">Horario de apertura</string>
     <string name="editor_zip_code">Código postal</string>
     <string name="editor_share_to_all_dialog_title">Quere envialo a todos os usuarios?</string>
-    <string name="editor_share_to_all_dialog_message_1">Confírmese de que non introduciu ningún dato privado ou persoal.</string>
-    <string name="editor_share_to_all_dialog_message_2">Os editores de OpenStreetMap comprobarán os cambios e poñeranse en contacto con vostede se teñen algunha pregunta.</string>
+    <string name="editor_share_to_all_dialog_message_1">Comprobe que non escribeu ningún dato privado ou persoal</string>
+    <string name="editor_share_to_all_dialog_message_2">Os editores de OpenStreetMap comprobarán os cambios e poñeranse en contacto con vostede se teñen algunha pregunta</string>
     <string name="navigation_stop_button">Deter</string>
     <string name="mobile_data_option_ask">Preguntar sempre</string>
-    <string name="traffic_update_maps_text">Para mostrar os datos de tráfico, deben actualizarse os mapas.</string>
+    <string name="traffic_update_maps_text">Para mostrar os datos de tráfico, deben actualizarse os mapas</string>
     <string name="big_font">Aumentar tamaño do texto no mapa</string>
     <string name="traffic_update_app">Por favor, actualice CoMaps</string>
-    <string name="prefs_languages_information_off_link">Para obter máis información, consulte esta guía.</string>
+    <string name="prefs_languages_information_off_link">Para obter máis información, consulte esta guía</string>
     <string name="core_entrance">Entrada</string>
     <string name="privacy">Privacidade</string>
     <string name="privacy_policy">Normativa de privacidade</string>
@@ -163,11 +163,11 @@
     <string name="download">Descargar</string>
     <string name="show">Amosar</string>
     <string name="download_maps">Descargar mapas</string>
-    <string name="download_has_failed">Erro durante a descarga. Toque para tentalo de novo.</string>
+    <string name="download_has_failed">Erro durante a descarga, toque para volver a intentalo.</string>
     <string name="core_my_position">A miña posición</string>
     <string name="search_map">Buscar no mapa</string>
     <string name="location_is_disabled_long_text">Non se pode acceder aos servizos de localización neste dispositivo ou aplicación. Actíveos na configuración.</string>
-    <string name="precise_location_is_disabled_long_text">Para garantir unha navegación máis exacta, active a Precisión da localización nos axustes.</string>
+    <string name="precise_location_is_disabled_long_text">Para garantir unha navegación máis precisa, active a Precisión da localización nos axustes.</string>
     <string name="zoom_to_country">Amosar no mapa</string>
     <string name="country_status_download_failed">Erro durante a descarga</string>
     <string name="about_headline">Proxecto de código aberto xestionado pola comunidade</string>
@@ -189,7 +189,7 @@
     <string name="bookmarks">Marcadores</string>
     <string name="name">Nome</string>
     <string name="address">Enderezo</string>
-    <string name="maps_storage_summary">Seleccione o cartafol onde deben descargarse os mapas.</string>
+    <string name="maps_storage_summary">Seleccione o cartafol onde deben descargarse os mapas</string>
     <string name="maps_storage_downloaded">Mapas descargados</string>
     <string name="maps_storage">Gardar mapas en</string>
     <string name="maps_storage_shared">Almacenamento interno compartido</string>
@@ -212,8 +212,8 @@
     <string name="unknown_file_type">A aplicación non recoñece o tipo de arquivo: \n%1$s</string>
     <string name="failed_to_open_file">Non se puido abrir o arquivo %1$s \n \n%2$s</string>
     <string name="unknown_current_position">Aínda non se determinou a súa localización</string>
-    <string name="cant_change_this_setting">Sentímolo, a configuración do almacenamento de mapas está desactivada.</string>
-    <string name="downloading_is_active">A descarga do mapa está en curso.</string>
+    <string name="cant_change_this_setting">Sentímolo, a configuración da almacenaxe de mapas está desactivada</string>
+    <string name="downloading_is_active">A descarga do mapa está en curso</string>
     <string name="my_position_share_sms">Olla a miña localización actual en CoMaps! %1$s ou %2$s Non ten mapas offline? Descárgueos aquí: https://www.comaps.app/download/</string>
     <string name="bookmark_share_email_subject">Mira o meu marcador no mapa de CoMaps!</string>
     <string name="my_position_share_email_subject">Mira a miña localización actual no mapa en CoMaps!</string>
@@ -233,7 +233,7 @@
     <string name="pref_tts_street_names_title">Anunciar nomes de rúas</string>
     <string name="pref_tts_street_names_description">Cando se activa, o nome da rúa ou a saída para virar pronunciarase en voz alta.</string>
     <string name="pref_tts_test_voice_title">Probar indicacións de voz (TTS, Text-To-Speech)</string>
-    <string name="pref_tts_playing_test_voice">Comprobe o volume ou a configuración de texto a voz do sistema se agora non oe a voz.</string>
+    <string name="pref_tts_playing_test_voice">Comprobe o volume ou a configuración de texto a voz do sistema se agora non oe a voz</string>
     <string name="pref_tts_unavailable">Non dispoñible</string>
     <string name="pref_map_auto_zoom">Zum automático</string>
     <string name="search_show_on_map">Ver no mapa</string>
@@ -252,7 +252,7 @@
     <string name="downloader_near_me_subtitle">Preto de min</string>
     <string name="downloader_download_all_button">Descargar todos</string>
     <string name="downloader_downloading">Descargando:</string>
-    <string name="downloader_delete_map_while_routing_dialog">Para eliminar o mapa, deteña a navegación.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Para eliminar o mapa, deteña a navegación</string>
     <string name="pref_use_google_play">Un servizo propietario que combina GPS, Wi-Fi, redes móbiles etc. para determinar a túa localización de xeito máis preciso. Podería conectarse aos servidores de Google.</string>
     <string name="routing_failed_cross_mwm_building">Só se poden crear rutas que estean totalmente contidas nun mapa dunha soa rexión.</string>
     <string name="downloader_download_map">Descargar mapa</string>
@@ -277,31 +277,31 @@
     <string name="dialog_routing_location_turn_wifi">Verifique o sinal do GPS. Activar a Wi-fi mellorará a precisión da súa localización.</string>
     <string name="dialog_routing_location_unknown_turn_on">Non se poden atopar as coordenadas do GPS. Active os servizos de localización para calcular a ruta.</string>
     <string name="dialog_routing_unable_locate_route">Imposible de atopar unha ruta</string>
-    <string name="dialog_routing_cant_build_route">Non se pode crear unha ruta.</string>
+    <string name="dialog_routing_cant_build_route">Non se pode crear unha ruta</string>
     <string name="dialog_routing_change_start_or_end">Axuste o seu punto de inicio ou o seu destino.</string>
     <string name="dialog_routing_change_start">Axustar o punto de inicio</string>
     <string name="dialog_routing_start_not_determined">A ruta non se creou. Non se puido atopar o punto de inicio.</string>
     <string name="dialog_routing_select_closer_start">Seleccione un punto de inicio próximo a unha estrada.</string>
     <string name="dialog_routing_end_not_determined">A ruta non se creou. Non se puido atopar o destino.</string>
-    <string name="dialog_routing_select_closer_end">Seleccione un punto de destino próximo a unha estrada.</string>
-    <string name="dialog_routing_change_intermediate">Non se puido situar a parada intermedia.</string>
-    <string name="dialog_routing_intermediate_not_determined">Por favor, axuste a parada intermedia.</string>
-    <string name="dialog_routing_application_error">Non se puido crear a ruta debido a un erro na aplicación.</string>
+    <string name="dialog_routing_select_closer_end">Seleccione un punto de destino próximo a unha estrada</string>
+    <string name="dialog_routing_change_intermediate">Non se puido situar a parada intermedia</string>
+    <string name="dialog_routing_intermediate_not_determined">Por favor, axuste a parada intermedia</string>
+    <string name="dialog_routing_application_error">Non se puido crear a ruta debido a un erro na aplicación</string>
     <string name="dialog_routing_try_again">Tentar novamente</string>
     <string name="not_now">Non agora</string>
     <string name="dialog_routing_download_and_build_cross_route">Desexa descargar o mapa e crear unha ruta mellor que abarque máis dun mapa?</string>
     <string name="dialog_routing_download_cross_route">Descargue mapas adicionais para crear unha ruta mellor que cruce os límites deste mapa.</string>
     <string name="search_without_internet_advertisement">Para empezar a buscar e crear rutas, descargue o mapa. Despois diso, xa non necesitará unha conexión a Internet.</string>
     <string name="search_select_map">Seleccionar mapa</string>
-    <string name="search_not_found">Non se atopou ningún resultado.</string>
+    <string name="search_not_found">Non se atopou ningún resultado</string>
     <string name="search_not_found_query">Descargue a rexión na que está a buscar ou probe a engadir o nome dunha cidade/poboo próximo.</string>
     <string name="search_history_title">Historial de procuras</string>
-    <string name="search_history_text">Ver procuras recentes.</string>
+    <string name="search_history_text">Ver procuras recentes</string>
     <string name="clear_search">Baleirar historial de procuras</string>
     <string name="p2p_from_here">Ruta desde</string>
     <string name="editor_time_delete">Eliminar horario</string>
     <string name="p2p_to_here">Ruta á</string>
-    <string name="p2p_only_from_current">navegación só está dispoñible desde a súa localización actual.</string>
+    <string name="p2p_only_from_current">A navegación só está dispoñible desde a súa localización actual</string>
     <string name="p2p_reroute_from_current">Quere planificar unha ruta desde a súa localización actual?</string>
     <string name="editor_time_allday">Todo o día (24 horas)</string>
     <string name="editor_time_add_closed">Engadir horas de peche</string>
@@ -330,11 +330,11 @@
     <string name="postal_code">Código postal</string>
     <string name="email_or_username">Correo electrónico ou usuario</string>
     <string name="level_value_generic">Nivel: %s</string>
-    <string name="downloader_delete_map_dialog">Todas as edicións feitas ao mapa eliminaranse xunto con leste.</string>
+    <string name="downloader_delete_map_dialog">Todas as edicións feitas ao mapa eliminaranse xunto con este</string>
     <string name="choose_street">Elixa unha cale</string>
     <string name="downloader_update_maps">Actualizar mapas</string>
     <string name="downloader_mwm_migration_dialog">Para crear unha ruta, é necesario actualizar todos os mapas e volver planificar a ruta.</string>
-    <string name="common_check_internet_connection_dialog">Revise a configuración e asegúrese de que o seu dispositivo estea conectado a Internet.</string>
+    <string name="common_check_internet_connection_dialog">Comprobe que o seu dispositivo estea conectado a Internet</string>
     <string name="downloader_no_space_title">Non hai suficiente espazo</string>
     <string name="downloader_no_space_message">Elimine os datos innecesarios</string>
     <string name="editor_profile_changes">Cambios verificados</string>
@@ -347,9 +347,9 @@
     <string name="message_invalid_feature_position">Non se pode situar ningún obxecto aquí</string>
     <string name="osm_presentation">Datos de OpenStreetMap creados pola comunidade a partir de %s. Máis información sobre como editar e actualizar o mapa en OpenStreetMap.org</string>
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) é un proxecto comunitario para construír un mapa libre e aberto. É a principal fonte de datos cartográficos de CoMaps e funciona de forma similar a Wikipedia. Vostede pode engadir ou editar lugares e estes pasan a estar dispoñibles para millóns de usuarios de todo o mundo. \nÚnase á comunidade e axude a crear un mapa mellor para todos!</string>
-    <string name="login_to_make_edits_visible">Cre unha conta OpenStreetMap ou inicie sesión para publicar as súas edicións de mapas en todo o mundo.</string>
+    <string name="login_to_make_edits_visible">Cre unha conta OpenStreetMap ou inicie sesión para publicar as súas edicións de mapas en todo o mundo</string>
     <string name="download_over_mobile_header">Descargar con conexión de rede móbil?</string>
-    <string name="download_over_mobile_message">Podería ser moi caro con certos plans ou con itinerancia de datos.</string>
+    <string name="download_over_mobile_message">Podería ser moi caro con certos plans ou con itinerancia de datos</string>
     <string name="error_enter_correct_house_number">Introducir o número de domicilio correcto</string>
     <string name="error_enter_correct_storey_number">O número de plantas non debe superar %d</string>
     <string name="error_enter_correct_zip_code">Introduza un código postal válido</string>
@@ -362,8 +362,8 @@
     <string name="editor_category_unsuitable_title">Non acha unha categoría adecuada?</string>
     <string name="editor_category_unsuitable_text">CoMaps permite engadir unicamente categorías de puntos sinxelos, é dicir, non cidades, estradas, lagos, contornos de edificios, etc. Por favor, engada ditas categorías directamente <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nosa <a href="https://www.comaps.app/support/advanced-map-editing/">guía</a> para obter instrucións detalladas paso a paso.</string>
     <string name="downloader_no_downloaded_maps_title">Non descargou ningún mapa</string>
-    <string name="downloader_no_downloaded_maps_message">Descargue mapas para atopar a localización e navegar sen conexión.</string>
-    <string name="current_location_unknown_error_title">Descoñécese a localización actual.</string>
+    <string name="downloader_no_downloaded_maps_message">Descargue mapas para atopar a localización e navegar sen conexión</string>
+    <string name="current_location_unknown_error_title">Descoñécese a localización actual</string>
     <string name="miles_per_hour">mph</string>
     <string name="ft">pé</string>
     <string name="placepage_more_button">Más</string>
@@ -389,7 +389,7 @@
     <string name="mobile_data_option_today">Só hoxe</string>
     <string name="mobile_data_option_not_today">Non usar hoxe</string>
     <string name="mobile_data">Internet móbil</string>
-    <string name="mobile_data_description">Necesítase Internet móbil para mostrar información detallada dos lugares, como fotografías, prezos e recensións.</string>
+    <string name="mobile_data_description">Necesítase Internet móbil para notificacións de actualizacións do mapa e subir edicións</string>
     <string name="traffic_data_unavailable">Os datos de tráfico non están dispoñibles</string>
     <string name="feedback_general">Opinión xeral</string>
     <string name="prefs_languages_information">Utilizamos o sistema TTS para as instrucións de voz. Moitos dispositivos de Android usan Google TTS. Pode descargar ou actualizalo desde Google Play (https://play.google.com/store/apps/details?ide=com.google.android.tts)</string>
@@ -423,7 +423,7 @@
     <string name="notification_channel_downloader">Descargador de mapas</string>
     <string name="pref_tts_speedcams_auto">Alertar ao exceder velocidade límite</string>
     <string name="power_managment_title">Modo de aforro de enerxía</string>
-    <string name="power_managment_description">Tratarase de reducir o consumo de enerxía a expensas de certas funcionalidades.</string>
+    <string name="power_managment_description">Tratarase de reducir o consumo de enerxía a expensas de certas funcións</string>
     <string name="power_managment_setting_auto">Cando queda pouca enerxía</string>
     <string name="enable_logging_warning_message">Active esta opción temporalmente para gravar e enviar de forma manual rexistros para diagnosticar defectos enviados mediante a opción «Informar dun fallo» no diálogo Axuda. Os rexistros poden incluír localizacións.</string>
     <string name="access_rules_author_only">Edición en liña</string>
@@ -543,7 +543,7 @@
     <string name="money">Diñeiro</string>
     <string name="shops">Tendas</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Gl:Acerca_do_OpenStreetMap</string>
-    <string name="editor_login_error_dialog">Erro de inicio de sesión.</string>
+    <string name="editor_login_error_dialog">Erro de inicio de sesión</string>
     <string name="by_type">Por tipo</string>
     <string name="view_menu">Ver menú</string>
     <string name="volume">Volume</string>
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index cb68e4eb7..ffd5bb03c 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -830,7 +830,7 @@
     <string name="type.railway.station.light_rail.london">Stazione ferroviaria</string>
     <string name="type.railway.station.light_rail.porto">Stazione ferroviaria</string>
     <string name="type.railway.station.monorail">Stazione ferroviaria</string>
-    <string name="type.railway.station.subway">Stazione metropolitana</string>
+    <string name="type.railway.station.subway">Stazione Metropolitana</string>
     <string name="type.railway.station.subway.adana">Stazione metropolitana</string>
     <string name="type.railway.station.subway.algiers">Stazione metropolitana</string>
     <string name="type.railway.station.subway.almaty">Stazione metropolitana</string>
@@ -885,7 +885,7 @@
     <string name="type.railway.station.subway.lille">Stazione metropolitana</string>
     <string name="type.railway.station.subway.lima">Stazione metropolitana</string>
     <string name="type.railway.station.subway.lisboa">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.london">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.london">Stazione Metropolitana di Londra</string>
     <string name="type.railway.station.subway.lyon">Stazione metropolitana</string>
     <string name="type.railway.station.subway.madrid">Stazione metropolitana</string>
     <string name="type.railway.station.subway.malaga">Stazione metropolitana</string>
@@ -900,12 +900,12 @@
     <string name="type.railway.station.subway.montreal">Stazione metropolitana</string>
     <string name="type.railway.station.subway.moscow">Stazione metropolitana</string>
     <string name="type.railway.station.subway.munchen">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.nagoya">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.newyork">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.nagoya">Stazione metropolitana di Nagoya</string>
+    <string name="type.railway.station.subway.newyork">Stazione metropolitana di New York</string>
     <string name="type.railway.station.subway.nnov">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.novosibirsk">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.osaka">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.oslo">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.novosibirsk">Stazione metropolitana di Novosibirsk</string>
+    <string name="type.railway.station.subway.osaka">Stazione metropolitana di Osaka</string>
+    <string name="type.railway.station.subway.oslo">Stazione metropolitana di Oslo</string>
     <string name="type.railway.station.subway.palma">Stazione metropolitana</string>
     <string name="type.railway.station.subway.panama">Stazione metropolitana</string>
     <string name="type.railway.station.subway.paris">Stazione metropolitana</string>
@@ -1402,4 +1402,13 @@
     <string name="type.railway.station.subway.qingdao">Stazione metropolitana</string>
     <string name="type.natural.wetland.swamp">Palude</string>
     <string name="type.natural.wetland.mangrove">Mangrovie</string>
+    <string name="type.amenity.luggage_locker">Deposito Bagagli</string>
+    <string name="type.amenity.bicycle_parking.covered">Parcheggio Biciclette Coperto</string>
+    <string name="type.post_office.post_partner">Partner Postale</string>
+    <string name="type.natural.wetland.saltmarsh">Palude Salmastra</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Palude Salmastra di Marea</string>
+    <string name="type.natural.wetland.reedbed">Giunco</string>
+    <string name="type.natural.wetland.tidalflat">Piana di Marea</string>
+    <string name="type.natural.wetland.fen">Paludre</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
 </resources>
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 3868f7d96..4a48f81be 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -422,7 +422,7 @@
     <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="downloader_search_field_hint">Encontrar mapa</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>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 9fb3fb936..8f6c2a943 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -510,7 +510,7 @@
     <!-- 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>
     <string name="editor_zip_code">邮政编码</string>
-    <string name="error_enter_correct_zip_code">输入正确的邮政编码</string>
+    <string name="error_enter_correct_zip_code">输入有效的邮政编码</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">地图点</string>
     <!-- Title for OSM note section in the editor -->
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
index 74240754e..aa834008a 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -1400,8 +1400,8 @@
 "type.tourism.information.visitor_centre" = "Център за посетители";
 "type.tourism.motel" = "Мотел";
 "type.tourism.museum" = "Музей";
-"type.tourism.picnic_site" = "Picnic Site";
-"type.leisure.resort" = "Resort";
+"type.tourism.picnic_site" = "Място за пикник";
+"type.leisure.resort" = "Курорт";
 "type.tourism.theme_park" = "Theme Park";
 "type.tourism.viewpoint" = "Гледка";
 
@@ -1409,22 +1409,22 @@
 "type.tourism.wilderness_hut" = "Хижа-заслон";
 "type.tourism.zoo" = "Зоопарк";
 "type.tourism.zoo.petting" = "Зоопарк за домашни любимци";
-"type.traffic_calming" = "Traffic Calming";
-"type.traffic_calming.bump" = "Traffic Bump";
-"type.traffic_calming.hump" = "Traffic Hump";
-"type.waterway" = "Waterway";
-"type.waterway.canal" = "Canal";
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.traffic_calming" = "Успокояване на трафика";
+"type.traffic_calming.bump" = "Легнал полицай";
+"type.traffic_calming.hump" = "Легнал полицай";
+"type.waterway" = "Воден път";
+"type.waterway.canal" = "Канал";
+"type.waterway.canal.tunnel" = "Тунел под канала";
 "type.waterway.fish_pass" = "Стълба за риба";
 "type.waterway.dam" = "Язовир";
-"type.barrier.ditch" = "Ditch";
+"type.barrier.ditch" = "Канавка";
 "type.natural.water.ditch" = "Отводнителна канавка";
-"type.waterway.ditch.tunnel" = "водосток";
-"type.waterway.dock" = "Waterway Dock";
-"type.waterway.drain" = "Drain";
-"type.natural.water.drain" = "Drain";
-"type.waterway.drain.tunnel" = "водосток";
-"type.waterway.lock_gate" = "Lock Gate";
+"type.waterway.ditch.tunnel" = "Водосток";
+"type.waterway.dock" = "Док на водния път";
+"type.waterway.drain" = "Дренаж";
+"type.natural.water.drain" = "Дренаж";
+"type.waterway.drain.tunnel" = "Водосток";
+"type.waterway.lock_gate" = "Шлюз";
 "type.waterway.river" = "Река";
 "type.waterway.river.tunnel" = "Река";
 "type.waterway.stream" = "Поток";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 5c0b8cae5..01cd858ca 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -625,7 +625,7 @@
 /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */
 "error_enter_correct_storey_number" = "Das Gebäude kann nicht mehr als %d Etagen haben";
 "editor_zip_code" = "Postleitzahl";
-"error_enter_correct_zip_code" = "Geben Sie die korrekte Postleitzahl ein";
+"error_enter_correct_zip_code" = "Geben Sie eine gültige Postleitzahl ein";
 
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "Kartenpunkt";
@@ -640,7 +640,7 @@
 /* To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... */
 "operator" = "Betreiber: %@";
 "editor_category_unsuitable_title" = "Keine passende Kategorie gefunden?";
-"editor_category_unsuitable_text" = "Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, daher keine Städte, Straßen, Seen, Gebäudeumrisse, etc. Bitte füge solche Kategorien direkt bei <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a> hinzu. In unserem <a href=\"https://www.comaps.app/support/advanced-map-editing/\">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt-Anleitung.";
+"editor_category_unsuitable_text" = "Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a> hinzu. In unserem <a href=\"https://www.comaps.app/support/advanced-map-editing/\">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.";
 "downloader_no_downloaded_maps_title" = "Keine Karten heruntergeladen";
 "downloader_no_downloaded_maps_message" = "Laden Sie Karten für die Offline-Suche und Navigation herunter.";
 "current_location_unknown_error_title" = "Aktueller Standort ist unbekannt.";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index 18cadc2a7..c645aa1e1 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -1265,7 +1265,7 @@
 "type.shop.laundry" = "Wäscherei";
 "type.shop.mall" = "Einkaufszentrum";
 "type.shop.massage" = "Massagesalon";
-"type.shop.mobile_phone" = "Handyladen";
+"type.shop.mobile_phone" = "Mobilfunkgeschäft";
 "type.shop.money_lender" = "Geldverleiher";
 "type.shop.motorcycle" = "Motorradladen";
 "type.shop.motorcycle_repair" = "Motorradwerkstatt";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 79a2d3ee0..a0e223d19 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -53,7 +53,6 @@
 
 /* Text in About screen */
 "about_proposition_3" = "Transparent and not for profit";
-
 "close" = "Close";
 "download" = "Download";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 814a602e9..2c48d0e8d 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -672,7 +672,6 @@
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cimitero cristiano";
-"type.landuse.religious" = "Religious Land";
 "type.landuse.commercial" = "Area commerciale";
 "type.landuse.construction" = "Cantiere";
 "type.landuse.education" = "Strutture didattiche";
@@ -969,7 +968,7 @@
 "type.railway.station.light_rail.london" = "Stazione ferroviaria";
 "type.railway.station.light_rail.porto" = "Stazione ferroviaria";
 "type.railway.station.monorail" = "Stazione ferroviaria";
-"type.railway.station.subway" = "Stazione metropolitana";
+"type.railway.station.subway" = "Stazione Metropolitana";
 "type.railway.station.subway.adana" = "Stazione metropolitana";
 "type.railway.station.subway.algiers" = "Stazione metropolitana";
 "type.railway.station.subway.almaty" = "Stazione metropolitana";
@@ -1024,7 +1023,7 @@
 "type.railway.station.subway.lille" = "Stazione metropolitana";
 "type.railway.station.subway.lima" = "Stazione metropolitana";
 "type.railway.station.subway.lisboa" = "Stazione metropolitana";
-"type.railway.station.subway.london" = "Stazione metropolitana di Londra";
+"type.railway.station.subway.london" = "Stazione Metropolitana di Londra";
 "type.railway.station.subway.lyon" = "Stazione metropolitana";
 "type.railway.station.subway.madrid" = "Stazione metropolitana";
 "type.railway.station.subway.malaga" = "Stazione metropolitana";
@@ -1494,13 +1493,14 @@
 "type.railway.station.subway.qingdao" = "Stazione metropolitana di Qingdao";
 "type.natural.wetland.swamp" = "Palude";
 "type.natural.wetland.mangrove" = "Mangrovie";
-"type.natural.wetland.tidalflat" = "Tidal Flat";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
-"type.natural.wetland.fen" = "Fen";
-"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
-"type.natural.wetland.reedbed" = "Reed Bed";
+"type.natural.wetland.tidalflat" = "Piana di Marea";
+"type.natural.wetland.saltmarsh" = "Palude Salmastra";
+"type.natural.wetland.fen" = "Paludre";
+"type.natural.wetland.saltmarsh.tidal" = "Palude Salmastra di Marea";
+"type.natural.wetland.reedbed" = "Giunco";
 "type.leisure.escape_game" = "Escape Room";
-"type.amenity.luggage_locker" = "Luggage Locker";
+"type.amenity.luggage_locker" = "Deposito Bagagli";
 "type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
-"type.post_office.post_partner" = "Post Partner";
+"type.amenity.bicycle_parking.covered" = "Parcheggio Biciclette Coperto";
+"type.post_office.post_partner" = "Partner Postale";
+"type.landuse.religious" = "Religious Land";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings
index 541a582f2..79ecbfdb9 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings
@@ -6,10 +6,10 @@
 "bookmarks_and_tracks" = "Favoritos e trilhas";
 
 /* Used in home screen quick actions. */
-"route" = "Rota";
+"route" = "Criar rota";
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "A deteção da localização atual em segundo plano é necessária para desfrutar plenamente da funcionalidade do aplicativo. Ela é usada para navegação e para salvar sua trilha recentemente viajada.";
+"NSLocationAlwaysUsageDescription" = "A detecção da localização em segundo plano é necessária para aproveitar ao máximo a funcionalidade do aplicativo. Ela é usada para navegação e para salvar o último trajeto percorrido.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "A determinação de sua localização é necessária para a navegação e para salvar sua trilha recentemente viajada.";
+"NSLocationWhenInUseUsageDescription" = "O acesso à sua localização é necessária para navegação e para salvar o último trajeto percorrido.";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 056a273d3..1f2bc3fe9 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -588,7 +588,7 @@
 "please_note" = "Aviso";
 "downloader_delete_map_dialog" = "Todas as edições no mapa serão excluídas juntamente com o mapa.";
 "downloader_update_maps" = "Atualizar mapas";
-"downloader_search_field_hint" = "Encontrar o mapa";
+"downloader_search_field_hint" = "Encontrar mapa";
 "migration_download_error_dialog" = "Erro no download";
 "common_check_internet_connection_dialog" = "Por favor, verifique as suas configurações e certifique-se de que o dispositivo está conectado à internet.";
 "downloader_no_space_title" = "Não há espaço suficiente";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
index 0d3d526e7..87f327bcd 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
@@ -35,11 +35,11 @@
 			<key>zero</key>
 			<string>%d arquivo foi encontrado.</string>
 			<key>one</key>
-			<string>%d arquivo foi encontrado. Você vai ver depois da conversão.</string>
+			<string>%d arquivo foi encontrado. Você poderá vê-lo após a conversão.</string>
 			<key>many</key>
-			<string>%d arquivos foram encontrados. Você os verá depois da conversão.</string>
+			<string>%d arquivos foram encontrados. Você poderá vê-los após a conversão.</string>
 			<key>other</key>
-			<string>%d arquivos foram encontrados. Você os verá depois da conversão.</string>
+			<string>%d arquivos foram encontrados. Você poderá vê-los após a conversão.</string>
 		</dict>
 	</dict>
 	<key>tracks</key>
@@ -53,7 +53,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>%d trilhas</string>
+			<string>%d trilha</string>
 			<key>one</key>
 			<string>%d trilha</string>
 			<key>many</key>
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 0dad7aec3..c71cdf919 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -623,7 +623,7 @@
 /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */
 "error_enter_correct_storey_number" = "最多可编辑 %d 层的建筑";
 "editor_zip_code" = "邮政编码";
-"error_enter_correct_zip_code" = "输入正确的邮政编码";
+"error_enter_correct_zip_code" = "输入有效的邮政编码";
 
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "地图点";
diff --git a/iphone/metadata/pt-BR/subtitle.txt b/iphone/metadata/pt-BR/subtitle.txt
index 29e74963d..e6ace2707 100644
--- a/iphone/metadata/pt-BR/subtitle.txt
+++ b/iphone/metadata/pt-BR/subtitle.txt
@@ -1 +1 @@
-Navegue privadamente
+Navegue com Privacidade