[styles] Only render pedestrian areas as areas and not as lines

Fixes #1265 Signed-off-by: map-per <map-per@gmx.de>
2025-12-24 06:53:46 +00:00 · 2025-08-25 13:40:33 +02:00
673 changed files with 5035 additions and 6617 deletions
--- a/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
+++ b/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
@@ -1 +0,0 @@
-মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
--- a/android/app/src/fdroid/play/listings/bn-BD/title.txt
+++ b/android/app/src/fdroid/play/listings/bn-BD/title.txt
@@ -1 +0,0 @@
-কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং
--- a/android/app/src/fdroid/play/listings/bn/short-description.txt
+++ b/android/app/src/fdroid/play/listings/bn/short-description.txt
@@ -0,0 +1 @@
+সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
--- a/android/app/src/fdroid/play/listings/bn/title.txt
+++ b/android/app/src/fdroid/play/listings/bn/title.txt
@@ -0,0 +1 @@
+কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ
--- a/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
@@ -0,0 +1,7 @@
+• Data OpenStreetMap k 4. 8.
+• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
+• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
+• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
+• podpora více zkratek a aliasů pro vyhledávání
+• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
+• plynulejší pohyb šipky pro určení polohy
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,8 +1,7 @@
-• OpenStreetMap-Daten vom 22. August
-• Neue Geschwindigkeitsanzeige & Details aufgezeichneter Strecken
-• Besserer dunkler Modus, neue farbige Labels 
-• Anzeige wann Orte & Öffnungszeiten überprüft wurden
-• Routenplanung berücksichtigt Stoppschilder, Ampeln & bedingte Einschränkungen.
-• GPS-Peilung wird statt Kompass bevorzugt & höhere GPS-Frequenz.
-• Adressen & Notizen im OSM-Editor unterstützt.
-• Mehr Verbesserungen an UI-Elementen & Kartenstil, alle Details in den Codeberg-Versionshinweisen!
+• OpenStreetMap-Daten vom 4. August
+• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
+• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
+• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
+• Unterstützung für mehr Such-Abkürzungen und Synonyme
+• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
+• Der Positionspfeil bewegt sich gleichmässiger
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,9 +1,7 @@
-• OpenStreetMap data as of August 22
-• New current speed indicator, display track info
-• Improved dark map style, added coloured labels
-• Display when places & opening hours were last checked
-• Routing now considers turns, stop signs, lights & conditional restrictions
-• Prefer GPS bearing over compass and increase location poll rate
-• Enable adding standalone addresses & notes in the editor
-• Various UI element & map style improvements
-Check our Codeberg release notes for more changes!
+• OpenStreetMap data as of August 4
+• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
+• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
+• upgrade altitude contour lines to 20m step for some popular hiking regions
+• support more search abbreviations and aliases
+• add search and bookmark icons for fast food, bicycle and charging stations
+• more smooth position arrow movements
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,9 +1,7 @@
-• Datos de OSM a 22-08-2025
-• Nuevo indicador de velocidad e información de pista
-• Modo oscuro mejorado y nombres de POI coloreados
-• Indicador de última revisión de lugares y horarios de apertura
-• Rutas mejoradas teniendo en cuenta giros, señales de STOP, semáforos y restricciones
-• Mayor precisión para determinar tu localización y sentido
-• Añade direcciones y notas con el editor
-• Otras mejoras en elementos de la interfaz y estilo del mapa
-Entra en nuestro Codeberg para más cambios!
+• Datos de OpenStreetMap a fecha 2025.08.04
+• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
+• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
+• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
+• Más abreviaturas y alias de búsqueda
+• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
+• Más fluidez de la flecha de posición
--- a/android/app/src/fdroid/play/listings/fa-IR/title.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/title.txt
@@ -1 +1 @@
-CoMaps - کوه‌نوردی، دوچرخه‌سواری و رانندگی آفلاین
+CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,9 +0,0 @@
-• Données OSM du 22 août
-• Nouvel indicateur de vitesse et détails des pistes
-• Amélioration du style sombre, ajout de labels colorées
-• Affichage de la date de dernière vérification d'un lieu
-• Support dans le routage des virages, signalisations et restrictions
-• Amélioration de la boussole et de la précision GPS
-• Support des adresses et des notes dans l'éditeur
-• Diverses améliorations d'UI et du style de la carte
-Plus d'informations sur notre Codeberg
--- a/android/app/src/fdroid/play/listings/hr/title.txt
+++ b/android/app/src/fdroid/play/listings/hr/title.txt
@@ -1 +1 @@
-CoMaps - Pješačite, biciklirajte, vozite Offline
+CoMaps - Pješačite, biciklirajte, vozite Offline i privatno
--- a/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
@@ -1,32 +0,0 @@
-A CoMaps egy közösség által létrehozott, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap térképadatain alapul, és amelyet az átláthatóság, a magánélet védelme és a nonprofit jelleg iránti elkötelezettség erősít. A CoMaps az Organic Maps villája, amely viszont a Maps.ME villája.
-
-A projekt előzményeiről és az irányáról a <b><i>codeberg.org/comaps</i></b> oldalon olvashatsz.
-Csatlakozz ott a közösséghez, és segíts a legjobb térképalkalmazás elkészítésében.
-• Használd az alkalmazást és terjeszd a hírét
-• Adj visszajelzést és jelentsd a problémákat
-• Frissítsd és javítsd a térképadatokat az alkalmazásban vagy az OpenStreetMap weboldalán.
-
-‣ <b>Offline-fókuszú:</b> Tervezd meg és navigáld külföldi útad mobilszolgáltatás nélkül, keress útpontokat egy távoli túra során stb. Az alkalmazás minden funkcióját úgy terveztük, hogy internetkapcsolat nélkül is működjön.
-‣ <b>A magánélet tiszteletben tartása:</b> Az alkalmazás az adatvédelem szem előtt tartásával készült, nem azonosítja az embereket, nem követi nyomon és nem gyűjt személyes adatokat, és reklámmentes.
-‣ <b>Takarékosdik az akkumulátorral és a tárhellyel:</b> Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A jól összeállítot kis méretű térképek értékes helyet takarítanak meg a telefonon.
-‣ <b>Egyszerű és szép grafikus felület,</b> nagyszerű és könnyen használható funkciók, amelyek egyszerűen működnek.
-‣ <b>Ingyenes és a közösség által készített:</b> A hozzád hasonló emberek segítettek az alkalmazás létrehozásában azáltal, hogy hozzáadtak helyeket az OpenStreetMap térképhez, tesztelték és visszajelzést adtak a funkciókról, valamint hozzájárultak a fejlesztői képességeikkel és a pénzükkel.
-‣ <b>Nyílt és átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.</b>
-
-<b>Főbb jellemzők:</b>
-• Letölthető részletes térképek olyan helyekkel, amelyek sok kereskedelmi térképen nem állnak rendelkezésre.
-• Szabadtéri üzemmód kiemelt túraútvonalakkal, táborhelyekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
-• Sétaútvonalak és kerékpárutak
-• Érdekes pontok, mint például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok minden más
-• Keresés név, cím vagy az érdekes pontok kategóriája alapján
-• Navigáció hangutasításokkal gyalogláshoz, kerékpározáshoz vagy vezetéshez
-• Kedvenc helyeid könyvjelzővel láthatod el egyetlen érintéssel
-• Wikipedia szócikkek internetkapcsolat nélkül
-• Metró tranzit réteg és irányok
-• Útvonal mentése
-• Könyvjelzők és nyomvonalak exportálása és importálása KML, KMZ, GPX formátumokban
-• Sötét üzemmód az éjszakai használathoz
-• Térképadatok javítása mindenki számára egy alapvető beépített szerkesztő segítségével
-
-<b>Itt van a szabadság</b>
-Fedezd fel az utadat, navigálj a világban úgy, hogy a magánélet és a közösség kerüljön előtérbe!
--- a/android/app/src/fdroid/play/listings/ia/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ia/short-description.txt
@@ -0,0 +1 @@
+Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -0,0 +1,7 @@
+• Dati di OpenStreetMap aggiornati al 4 Agosto
+• Migliorati i colori per acqua, foreste, servizi etc
+• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
+• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
+• Aggiunto il supporto per un maggior numero di alias
+• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
+• Resi più fluidi i movimenti della freccia di posizione
--- a/android/app/src/fdroid/play/listings/nl-NL/title.txt
+++ b/android/app/src/fdroid/play/listings/nl-NL/title.txt
@@ -1 +1 @@
-CoMaps - Wandel, fiets, rijd offline met privacy
+CoMaps - Wandel, fiets, rijdt offline met privacy
--- a/android/app/src/fdroid/play/listings/no-NO/title.txt
+++ b/android/app/src/fdroid/play/listings/no-NO/title.txt
@@ -1 +0,0 @@
-CoMaps - Gå tur, sykkel, kjør - med personvern
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,8 +1,7 @@
-• Dados OSM de 22/08
-• Novo indicador de velocidade e tela de informações de trilha
-• Melhor estilo de mapa escuro, rótulos coloridos adicionados
-• Exibição da última atualização de locais e horários de funcionamento
-• O roteamento agora considera conversões, PARE, semáforos, e restrições condicionais
-• Preferência por orientação GPS em vez de bússola e aumento da frequência de localização
-• Editor: adição de endereços e notas independentes
-• Melhorias em elementos da interface e estilo de mapa
+• Dados OSM de 4/08
+• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
+• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
+• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
+• Suporte a mais abreviações para busca
+• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
+• Movimentos mais suaves para seta de posição
--- a/android/app/src/fdroid/play/listings/pt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/full-description.txt
@@ -0,0 +1,32 @@
+Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
+
+Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
+Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
+• Use o aplicativo e divulgue-o.
+• Envie feedback e relate problemas.
+• Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
+
+‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
+‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
+‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
+‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
+‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
+‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
+
+<b>Principais recursos</b>:
+• Mapas detalhados para download com locais não disponíveis no Google Maps
+• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
+• Trilhas para caminhada e ciclovias
+• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
+• Pesquise por nome, endereço ou por categoria de ponto de interesse
+• Navegação com anúncios de voz para caminhadas, ciclismo ou direção
+• Marque seus lugares favoritos com um único toque
+• Artigos offline da Wikipédia
+• Camada e direções de transporte público do metrô
+• Gravação de trilhas
+• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
+• Um modo escuro para usar à noite
+• Aprimore os dados do mapa para todos usando um editor básico integrado
+
+<b>A Liberdade Chegou</b>
+Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
--- a/android/app/src/fdroid/play/listings/pt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/short-description.txt
@@ -0,0 +1 @@
+Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos
--- a/android/app/src/fdroid/play/listings/pt/title.txt
+++ b/android/app/src/fdroid/play/listings/pt/title.txt
@@ -0,0 +1 @@
+CoMaps - Mapas e Navegação - Offline e Privada
--- a/android/app/src/fdroid/play/listings/ro/title.txt
+++ b/android/app/src/fdroid/play/listings/ro/title.txt
@@ -1 +1 @@
-CoMaps - călătorește offline cu confidențialitate
+CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,9 +1,7 @@
-• Данные 22 августа
-• Новый спидометр,информация о маршруте
-• Улучшен тёмный стиль,цветные метки
-• Время последней проверки часов работы
-• Построении маршрута учитывает повороты, знак «Стоп»,светофоры и ограничения
-• Предпочтение отдается GPS-координатам,а не компасу,увеличена частота опроса местоположения
-• Можно добавлять отдельные адреса и заметки в редакторе
-• Улучшены различные элементы пользовательского интерфейса и стиль карты
-Ознакомьтесь с примечания к релизу про изменения!
+• Карты OpenStreetMap от 4 августа
+• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
+• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
+• Для некоторых популярных туристических регионов добавлены линии высот 20м
+• Поддержка дополнительных поисковых сокращений и синонимов
+• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
+• Более плавное движение стрелки местоположения
--- a/android/app/src/fdroid/play/listings/sr/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/full-description.txt
@@ -1,32 +1,32 @@
-Бесплатна апликација отвореног кода коју одржава заједница, која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps,  које је настала од апликације Maps.ME.
+Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОpenStreetMap-у подацима, усмерени транспарентност, приватност и непрофитни. CoMaps је Апликације за органске карте виљушка, које је пак форк Maps.ME.

 Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
 Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
 • Користите апликацију и проширите глас о томе
 • Дајте повратне информације и пријавите проблеме
-• Ажурирајте податке на мапи у апликацији или на сајту OpenStreetMap
+• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap

-‣ <b>Фокусирано на офлајн рад</b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним интернетом, тражите успутне тачке док сте на забаченом планинском путу, итд. Све функционалности су дизајниране за рад без интернета.
-‣ <b>Поштовање приватности</b>: Апликација је осмишљена са приватношћу корисника на уму - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
-‣ <b>Једноставно и елегантно</b>: Апликација је лака за употребу и једноставно функционише.
-‣ <b>Чува вашу батерију и простор</b>: Не троши батерију као остале апликације за навигацију. Компактне мапе чувају драгоцени простор на вашем телефону.
-‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама  и донацијама.
-‣ <b>Отворено и транспарентно доношење одлука и употреба донација, непрофитна и потпуно отвореног кода.</b>
+‣ <b> фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. Све апликације су дизајниране за рад ван мреже.
+‣ <b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
+‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
+‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
+‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
+‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </b>

 <b> Главне карактеристике </b>:
-• Преузмимање детаљне мапе са локацијама које нису доступне са Google мапама
-• Режим за излете са истакнутим планинарским стазама, камповима, изворима воде, планинским врховима, изохипсама итд.
+• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
+• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
 • Стазе за планинарење и бицикле
-• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, знаменитости и још много тога
-• Претрага по називу, адреси или категоријама
-• Навигација са гласовним инструкцијама за ходање, вожњу бицикла или аутомобила
-• Означивање омиљених места једним додиром
+• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
+• Претражите име или адресу или по категоријама камате
+• навигација са гласовним најавама за ходање, бициклизам или аутомобил
+• Означите своја омиљена места једним додиром
 • Офлајн чланци Википедије
-• Транзитни слој подземне железнице са навигацијом
-• Снимање ГПС путања
-• Увоз и увоз маркера и путања у KML, KMZ, GPX формате
+• транзитни слој подземне пруге са навигацијом
+• Снимање ГПС трагова
+• Ознака и увоз и увоз у KML, KMZ, GPX формате
 • Тамни режим за употребу током ноћи
-• Побољшајте карту за све кориснике, користећи основни едитор за мапе
+• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе

 <b> Слобода је овде </b>
-Откријте своје путовање, крећете се са светом са приватношћу и заједницом на првом месту!
+Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -0,0 +1,7 @@
+• подаци из OpenStreetMap-а од 4. августа
+• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
+• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
+• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
+• подршка за више скраћеница и алтернативних назива у претрази
+• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
+• равномерније кретање стрелице која приказује позицију
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.08.31-15-FDroid+25083115
+version: 2025.03.02-7-FDroid+25030207
--- a/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
@@ -73,7 +73,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
  public Template onGetTemplate()
  {
    final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
-    builder.setBackgroundColor(Colors.NAVIGATION_TEMPLATE_BACKGROUND);
+    builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT
+                                                                       : Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
    builder.setActionStrip(createActionStrip());
    builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));

--- a/android/app/src/main/java/app/organicmaps/car/util/Colors.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/Colors.java
@@ -11,7 +11,8 @@ public final class Colors
  public static final CarColor OPENING_HOURS_CLOSES_SOON = CarColor.YELLOW;
  public static final CarColor OPENING_HOURS_CLOSED = CarColor.RED;
  public static final CarColor START_NAVIGATION = CarColor.GREEN;
-  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND = CarColor.GREEN;
+  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_DAY = CarColor.GREEN;
+  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_NIGHT = CarColor.DEFAULT;
  public static final CarColor BUTTON_ACCEPT = CarColor.GREEN;

  private Colors() {}
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
@@ -29,7 +29,7 @@ public class LayersButton extends FloatingActionButton
  {
    final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
    if (mAreLayersActive)
-      mergeDrawableStates(drawableState, new int[] {R.attr.layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
    return drawableState;
  }

--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -26,7 +26,6 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
-import app.organicmaps.widget.CurrentSpeedView;
 import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
 import app.organicmaps.widget.menu.NavMenu;
@@ -52,8 +51,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
  private final LanesView mLanesView;
  @NonNull
  private final SpeedLimitView mSpeedLimit;
-  @NonNull
-  private final CurrentSpeedView mCurrentSpeed;

  private final MapButtonsViewModel mMapButtonsViewModel;

@@ -97,7 +94,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mLanesView = topFrame.findViewById(R.id.lanes);

    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
-    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);

    // Show a blank view below the navbar to hide the menu content
    final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
@@ -132,7 +128,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

    mLanesView.setLanes(info.lanes);

-    updateSpeedWidgets(info);
+    updateSpeedLimit(info);
  }

  private void updatePedestrian(@NonNull RoutingInfo info)
@@ -140,7 +136,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));

    info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    updateSpeedWidgets(info);
  }

  public void updateNorth()
@@ -266,18 +261,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    RoutingController.get().cancel();
  }

-  private void updateSpeedWidgets(@NonNull final RoutingInfo info)
+  private void updateSpeedLimit(@NonNull final RoutingInfo info)
  {
    final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation();
    if (location == null)
    {
-      mSpeedLimit.setSpeedLimit(-1, false);
-      mCurrentSpeed.setCurrentSpeed(-1);
+      mSpeedLimit.setSpeedLimit(0, false);
      return;
    }
    final int fSpeedLimit = StringUtils.nativeFormatSpeed(info.speedLimitMps);
    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(location.getSpeed());
    mSpeedLimit.setSpeedLimit(fSpeedLimit, speedLimitExceeded);
-    mCurrentSpeed.setCurrentSpeed(location.getSpeed());
  }
 }
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -45,8 +45,6 @@ import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
-
-import com.google.android.material.button.MaterialButton;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.LinkedList;
@@ -155,10 +153,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
    mTransitViewDecorator =
        new DotDividerItemDecoration(dividerDrawable, res.getDimensionPixelSize(R.dimen.margin_base),
                                     res.getDimensionPixelSize(R.dimen.margin_half));
-    MaterialButton manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
+    Button manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
    manageRouteButton.setOnClickListener(this);

-    MaterialButton saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
+    Button saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
    saveButton.setOnClickListener(this);
  }

@@ -170,7 +168,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
      showRouteAltitudeChart();
    showRoutingDetails();
    UiUtils.show(mAltitudeChartFrame);
-    MaterialButton saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
+    Button saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
    saveButton.setText(R.string.save);
    saveButton.setEnabled(true);
  }
--- a/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
@@ -1,172 +0,0 @@
-package app.organicmaps.widget;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public abstract class BaseSignView extends View
-{
-    private float mBorderWidthRatio = 0.1f;
-    protected void setBorderWidthRatio(float ratio) {
-        mBorderWidthRatio = ratio;
-    }
-
-    private float mBorderInsetRatio = 0f;
-    protected void setBorderInsetRatio(float ratio) {
-        mBorderInsetRatio = ratio;
-    }
-
-    // colors
-    protected int mBackgroundColor;
-    protected int mBorderColor;
-    protected int mAlertColor;
-    protected int mTextColor;
-    protected int mTextAlertColor;
-
-    // paints
-    protected final Paint mBackgroundPaint;
-    protected final Paint mBorderPaint;
-    protected final Paint mTextPaint;
-
-    // geometry
-    protected float mWidth;
-    protected float mHeight;
-    protected float mRadius;
-    protected float mBorderWidth;
-    protected float mBorderRadius;
-
-    public BaseSignView(Context ctx, @Nullable AttributeSet attrs)
-    {
-        super(ctx, attrs);
-        mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mBorderPaint.setStyle(Paint.Style.STROKE);
-        mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mTextPaint.setTextAlign(Paint.Align.CENTER);
-        mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
-    }
-
-    protected void setColors(int backgroundColor,
-                             int borderColor,
-                             int alertColor,
-                             int textColor,
-                             int textAlertColor)
-    {
-        mBackgroundColor   = backgroundColor;
-        mBorderColor       = borderColor;
-        mAlertColor        = alertColor;
-        mTextColor         = textColor;
-        mTextAlertColor    = textAlertColor;
-
-        mBackgroundPaint.setColor(mBackgroundColor);
-        mBorderPaint.setColor(mBorderColor);
-        mTextPaint.setColor(mTextColor);
-    }
-
-    @Override
-    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
-        super.onSizeChanged(width, height, oldWidth, oldHeight);
-        final float paddingX = getPaddingLeft() + getPaddingRight();
-        final float paddingY = getPaddingTop()  + getPaddingBottom();
-        mWidth  = width - paddingX;
-        mHeight = height - paddingY;
-        mRadius = Math.min(mWidth, mHeight) / 2f;
-        mBorderWidth  = mRadius * mBorderWidthRatio;
-        // subtract half the stroke PLUS the extra inset
-        final float gap = mRadius * mBorderInsetRatio;
-        mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
-        configureTextSize();
-    }
-
-    @Override
-    protected void onDraw(@NonNull Canvas canvas)
-    {
-        super.onDraw(canvas);
-        final String str = getValueString();
-        if (str == null) return;
-
-        final float cx = mWidth / 2f;
-        final float cy = mHeight / 2f;
-
-        // background & border
-        boolean alert = isAlert();
-        mBackgroundPaint.setColor(alert ? mAlertColor : mBackgroundColor);
-        canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
-        if (!alert)
-        {
-            mBorderPaint.setStrokeWidth(mBorderWidth);
-            mBorderPaint.setColor(mBorderColor);
-            canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
-        }
-
-        // text
-        mTextPaint.setColor(alert ? mTextAlertColor : mTextColor);
-        drawValueString(canvas, cx, cy, str);
-    }
-
-    @Override
-    public boolean onTouchEvent(@NonNull MotionEvent e)
-    {
-        final float cx = mWidth / 2f, cy = mHeight / 2f;
-        final float dx = e.getX() - cx, dy = e.getY() - cy;
-        if ((dx * dx) + (dy * dy) <= (mRadius * mRadius))
-        {
-            performClick();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean performClick()
-    {
-        super.performClick();
-        return false;
-    }
-
-    private void drawValueString(Canvas c, float cx, float cy, String str)
-    {
-        Rect b = new Rect();
-        mTextPaint.getTextBounds(str, 0, str.length(), b);
-        final float y = cy - b.exactCenterY();
-        c.drawText(str, cx, y, mTextPaint);
-    }
-
-    void configureTextSize()
-    {
-        String text = getValueString();
-        if (text == null) return;
-        final float textRadius = mBorderRadius - mBorderWidth;
-        final float maxTextSize = 2f * textRadius;
-        final float maxTextSize2 = maxTextSize * maxTextSize;
-        float lo = 0f, hi = maxTextSize, sz = maxTextSize;
-        Rect b = new Rect();
-        while (lo <= hi)
-        {
-            sz = (lo + hi) / 2f;
-            mTextPaint.setTextSize(sz);
-            mTextPaint.getTextBounds(text, 0, text.length(), b);
-            float area = b.width()*b.width() + b.height()*b.height();
-            if (area <= maxTextSize2)
-                lo = sz + 1f;
-            else
-                hi = sz - 1f;
-        }
-        mTextPaint.setTextSize(Math.max(1f, sz));
-    }
-
-    /** child must return the string to draw, or null if nothing */
-    @Nullable
-    protected abstract String getValueString();
-
-    /** child decides if this is in “alert” state */
-    protected abstract boolean isAlert();
-}
--- a/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
@@ -1,77 +0,0 @@
-package app.organicmaps.widget;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.util.Pair;
-
-import androidx.annotation.Nullable;
-
-import app.organicmaps.R;
-import app.organicmaps.sdk.util.StringUtils;
-
-public class CurrentSpeedView extends BaseSignView
-{
-  private double mSpeedMps = -1.0;
-  private String mSpeedStr = "--";
-
-  public CurrentSpeedView(Context ctx, @Nullable AttributeSet attrs)
-  {
-    super(ctx, attrs);
-
-    setBorderWidthRatio(0.1f);
-    setBorderInsetRatio(0.05f);
-
-    try (TypedArray a = ctx.getTheme()
-            .obtainStyledAttributes(attrs, R.styleable.CurrentSpeedView /* reuse same attrs or define new */ , 0, 0))
-    {
-      int bg   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      int bd   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBorderColor,     DefaultValues.BORDER_COLOR);
-      int tc   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedTextColor,       DefaultValues.TEXT_COLOR);
-      setColors(bg, bd, 0, tc, 0);
-
-      if (isInEditMode())
-      {
-        mSpeedMps = a.getInt(R.styleable.CurrentSpeedView_currentSpeedEditModeCurrentSpeed,  50);
-        mSpeedStr = Integer.toString((int)mSpeedMps);
-      }
-    }
-  }
-
-  public void setCurrentSpeed(double mps)
-  {
-    mSpeedMps = mps;
-    if (mps < 0)
-    {
-      mSpeedStr = "--";
-    }
-    else
-    {
-      Pair<String,String> su = StringUtils.nativeFormatSpeedAndUnits(mps);
-      mSpeedStr = su.first;
-    }
-    requestLayout();
-    configureTextSize();
-    invalidate();
-  }
-
-  @Nullable
-  @Override
-  protected String getValueString()
-  {
-    return mSpeedStr;
-  }
-
-  @Override
-  protected boolean isAlert()
-  {
-    return false;
-  }
-
-  private interface DefaultValues
-  {
-    int BACKGROUND_COLOR    = 0xFFFFFFFF;
-    int BORDER_COLOR        = 0xFF000000;
-    int TEXT_COLOR          = 0xFF000000;
-  }
-}
--- a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
@@ -3,134 +3,225 @@ package app.organicmaps.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.util.AttributeSet;
-
+import android.view.MotionEvent;
+import android.view.View;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import app.organicmaps.R;

-public class SpeedLimitView extends BaseSignView
+public class SpeedLimitView extends View
 {
-  private int    mSpeedLimit = -1;
-  private boolean mAlert     = false;
-  private String mSpeedStr   = "-1";
-  private final int unlimitedBorderColor;
-  private final int unlimitedStripeColor;
-
-  public SpeedLimitView(Context ctx, @Nullable AttributeSet attrs)
+  private interface DefaultValues
  {
-    super(ctx, attrs);
+    @ColorInt
+    int BACKGROUND_COLOR = Color.WHITE;
+    @ColorInt
+    int BORDER_COLOR = Color.RED;
+    @ColorInt
+    int ALERT_COLOR = Color.RED;
+    @ColorInt
+    int TEXT_COLOR = Color.BLACK;
+    @ColorInt
+    int TEXT_ALERT_COLOR = Color.WHITE;

-    setBorderWidthRatio(0.2f);
-    setBorderInsetRatio(0.05f);
-
-    try (TypedArray styleAttrs = ctx.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
-    {
-      final int bgColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      final int borderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
-      final int alertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
-      final int textColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
-      final int txtAlertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
-      setColors(bgColor, borderColor, alertColor, textColor, txtAlertColor);
-
-      unlimitedBorderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor, DefaultValues.UNLIMITED_BORDER_COLOR);
-      unlimitedStripeColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor, DefaultValues.UNLIMITED_STRIPE_COLOR);
-
-      if (isInEditMode())
-      {
-        mSpeedLimit = styleAttrs.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
-        mAlert = styleAttrs.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
-        mSpeedStr = Integer.toString(mSpeedLimit);
-      }
-    }
+    float BORDER_WIDTH_RATIO = 0.1f;
  }

-  public void setSpeedLimit(int limit, boolean alert)
+  @ColorInt
+  private final int mBackgroundColor;
+
+  @ColorInt
+  private final int mBorderColor;
+
+  @ColorInt
+  private final int mAlertColor;
+
+  @ColorInt
+  private final int mTextColor;
+
+  @ColorInt
+  private final int mTextAlertColor;
+
+  @NonNull
+  private final Paint mSignBackgroundPaint;
+  @NonNull
+  private final Paint mSignBorderPaint;
+  @NonNull
+  private final Paint mTextPaint;
+
+  private float mWidth;
+  private float mHeight;
+  private float mBackgroundRadius;
+  private float mBorderRadius;
+  private float mBorderWidth;
+
+  private int mSpeedLimit = 0;
+  @NonNull
+  private String mSpeedLimitStr = "0";
+  private boolean mAlert = false;
+
+  public SpeedLimitView(Context context, @Nullable AttributeSet attrs)
  {
-    if (mSpeedLimit != limit)
+    super(context, attrs);
+
+    try (TypedArray data = context.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
    {
-      mSpeedLimit = limit;
-      mSpeedStr   = Integer.toString(limit);
-      requestLayout();
+      mBackgroundColor =
+          data.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      mBorderColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
+      mAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
+      mTextColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
+      mTextAlertColor =
+          data.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      if (isInEditMode())
+      {
+        mSpeedLimit = data.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
+        mSpeedLimitStr = Integer.toString(mSpeedLimit);
+        mAlert = data.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
+      }
    }
+
+    mSignBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    mSignBackgroundPaint.setColor(mBackgroundColor);
+
+    mSignBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    mSignBorderPaint.setColor(mBorderColor);
+    mSignBorderPaint.setStrokeWidth(mBorderWidth);
+    mSignBorderPaint.setStyle(Paint.Style.STROKE);
+
+    mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    mTextPaint.setColor(mTextColor);
+    mTextPaint.setTextAlign(Paint.Align.CENTER);
+    mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
+  }
+
+  public void setSpeedLimit(final int speedLimit, boolean alert)
+  {
+    final boolean speedLimitChanged = mSpeedLimit != speedLimit;
+
+    mSpeedLimit = speedLimit;
    mAlert = alert;
-    configureTextSize();
+
+    if (speedLimitChanged)
+    {
+      mSpeedLimitStr = Integer.toString(mSpeedLimit);
+      configureTextSize();
+    }
+
    invalidate();
  }

-  @Nullable
  @Override
-  protected String getValueString()
+  protected void onDraw(@NonNull Canvas canvas)
  {
-    return (mSpeedLimit > 0 ? mSpeedStr : null);
+    super.onDraw(canvas);
+
+    final boolean validSpeedLimit = mSpeedLimit > 0;
+    if (!validSpeedLimit)
+      return;
+
+    final float cx = mWidth / 2;
+    final float cy = mHeight / 2;
+
+    drawSign(canvas, cx, cy, mAlert);
+    drawText(canvas, cx, cy, mAlert);
  }

-  @Override
-  protected boolean isAlert()
+  private void drawSign(@NonNull Canvas canvas, float cx, float cy, boolean alert)
  {
-    return mAlert;
-  }
-
-  @Override
-  protected void onDraw(Canvas canvas)
-  {
-    final float cx = mWidth/2f, cy = mHeight/2f;
-
-    if (mSpeedLimit == 0) // 0 means unlimited speed (maxspeed=none)
-    {
-      // background
-      mBackgroundPaint.setColor(mBackgroundColor);
-      canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
-
-      // black border
-      mBorderPaint.setColor(unlimitedBorderColor);
-      mBorderPaint.setStrokeWidth(mBorderWidth);
-      canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
-
-      // draw 5 diagonal stripes
-      drawUnlimitedStripes(canvas, cx, cy);
-    }
+    if (alert)
+      mSignBackgroundPaint.setColor(mAlertColor);
    else
+      mSignBackgroundPaint.setColor(mBackgroundColor);
+
+    canvas.drawCircle(cx, cy, mBackgroundRadius, mSignBackgroundPaint);
+    if (!alert)
    {
-      // delegate to BaseSignView’s onDraw
-      super.onDraw(canvas);
+      mSignBorderPaint.setStrokeWidth(mBorderWidth);
+      canvas.drawCircle(cx, cy, mBorderRadius, mSignBorderPaint);
    }
  }

-  private void drawUnlimitedStripes(Canvas c, float cx, float cy)
+  private void drawText(@NonNull Canvas canvas, float cx, float cy, boolean alert)
  {
-    final Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
-    stripe.setColor(unlimitedStripeColor);
-    stripe.setStrokeWidth(mBorderWidth * 0.4f);
+    if (alert)
+      mTextPaint.setColor(mTextAlertColor);
+    else
+      mTextPaint.setColor(mTextColor);

-    final float radius = mRadius * 0.8f; // Shorten to 80% of full radius
-    final float diag = (float) (1/Math.sqrt(2)); // 45 degrees
-    final float dx = -diag, dy = +diag;
-    final float px = -dy, py = +dx; // Perpendicular
-    final float step = radius * 0.15f; // Spacing
-
-    for (int i = -2; i <= 2; i++)
-    {
-      final float ox = px * step * i;
-      final float oy = py * step * i;
-      final float sx = cx + dx * radius + ox;
-      final float sy = cy + dy * radius + oy;
-      final float ex = cx - dx * radius + ox;
-      final float ey = cy - dy * radius + oy;
-      c.drawLine(sx, sy, ex, ey, stripe);
-    }
+    final Rect textBounds = new Rect();
+    mTextPaint.getTextBounds(mSpeedLimitStr, 0, mSpeedLimitStr.length(), textBounds);
+    final float textY = cy - textBounds.exactCenterY();
+    canvas.drawText(mSpeedLimitStr, cx, textY, mTextPaint);
  }

-
-  private interface DefaultValues
+  @Override
+  public boolean onTouchEvent(@NonNull MotionEvent event)
  {
-    int BACKGROUND_COLOR       = 0xFFFFFFFF;
-    int BORDER_COLOR           = 0xFFFF0000;
-    int ALERT_COLOR            = 0xFFFF0000;
-    int TEXT_COLOR             = 0xFF000000;
-    int TEXT_ALERT_COLOR       = 0xFFFFFFFF;
-    int UNLIMITED_BORDER_COLOR = 0xFF000000;
-    int UNLIMITED_STRIPE_COLOR = 0xFF000000;
+    final float cx = mWidth / 2;
+    final float cy = mHeight / 2;
+    if (Math.pow(event.getX() - cx, 2) + Math.pow(event.getY() - cy, 2) <= Math.pow(mBackgroundRadius, 2))
+    {
+      performClick();
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public boolean performClick()
+  {
+    super.performClick();
+    return false;
+  }
+
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh)
+  {
+    super.onSizeChanged(w, h, oldw, oldh);
+
+    final float paddingX = (float) (getPaddingLeft() + getPaddingRight());
+    final float paddingY = (float) (getPaddingTop() + getPaddingBottom());
+
+    mWidth = (float) w - paddingX;
+    mHeight = (float) h - paddingY;
+    mBackgroundRadius = Math.min(mWidth, mHeight) / 2;
+    mBorderWidth = mBackgroundRadius * 2 * DefaultValues.BORDER_WIDTH_RATIO;
+    mBorderRadius = mBackgroundRadius - mBorderWidth / 2;
+    configureTextSize();
+  }
+
+  // Apply binary search to determine the optimal text size that fits within the circular boundary.
+  private void configureTextSize()
+  {
+    final String text = mSpeedLimitStr;
+    final float textRadius = mBorderRadius - mBorderWidth;
+    final float textMaxSize = 2 * textRadius;
+    final float textMaxSizeSquared = (float) Math.pow(textMaxSize, 2);
+
+    float lowerBound = 0;
+    float upperBound = textMaxSize;
+    float textSize = textMaxSize;
+    final Rect textBounds = new Rect();
+
+    while (lowerBound <= upperBound)
+    {
+      textSize = (lowerBound + upperBound) / 2;
+      mTextPaint.setTextSize(textSize);
+      mTextPaint.getTextBounds(text, 0, text.length(), textBounds);
+
+      if (Math.pow(textBounds.width(), 2) + Math.pow(textBounds.height(), 2) <= textMaxSizeSquared)
+        lowerBound = textSize + 1;
+      else
+        upperBound = textSize - 1;
+    }
+
+    mTextPaint.setTextSize(Math.max(1, textSize));
  }
 }
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -1,14 +1,18 @@
 package app.organicmaps.widget.menu;

+import android.location.Location;
+import android.util.Pair;
 import android.view.View;
-import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
-import app.organicmaps.sdk.util.DateUtils;
+import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.Graphics;
+import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.button.MaterialButton;
@@ -26,12 +30,14 @@ public class NavMenu
  private final View mHeaderFrame;

  private final ShapeableImageView mTts;
-  private final MaterialTextView mEtaValue;
-  private final MaterialTextView mEtaAmPm;
+  private final View mSpeedViewContainer;
+  private final MaterialTextView mSpeedValue;
+  private final MaterialTextView mSpeedUnits;
  private final MaterialTextView mTimeHourValue;
  private final MaterialTextView mTimeHourUnits;
  private final MaterialTextView mTimeMinuteValue;
  private final MaterialTextView mTimeMinuteUnits;
+  private final MaterialTextView mTimeEstimate;
  private final MaterialTextView mDistanceValue;
  private final MaterialTextView mDistanceUnits;
  private final LinearProgressIndicator mRouteProgress;
@@ -86,12 +92,14 @@ public class NavMenu
    });

    // Bottom frame
-    mEtaValue = bottomFrame.findViewById(R.id.eta_value);
-    mEtaAmPm = bottomFrame.findViewById(R.id.eta_am_pm);
+    mSpeedViewContainer = bottomFrame.findViewById(R.id.speed_view_container);
+    mSpeedValue = bottomFrame.findViewById(R.id.speed_value);
+    mSpeedUnits = bottomFrame.findViewById(R.id.speed_dimen);
    mTimeHourValue = bottomFrame.findViewById(R.id.time_hour_value);
    mTimeHourUnits = bottomFrame.findViewById(R.id.time_hour_dimen);
    mTimeMinuteValue = bottomFrame.findViewById(R.id.time_minute_value);
    mTimeMinuteUnits = bottomFrame.findViewById(R.id.time_minute_dimen);
+    mTimeEstimate = bottomFrame.findViewById(R.id.time_estimate);
    mDistanceValue = bottomFrame.findViewById(R.id.distance_value);
    mDistanceUnits = bottomFrame.findViewById(R.id.distance_dimen);
    mRouteProgress = bottomFrame.findViewById(R.id.navigation_progress);
@@ -117,8 +125,6 @@ public class NavMenu

  private void onTtsClicked()
  {
-    if (!TtsPlayer.isReady())
-      Toast.makeText(mActivity, R.string.pref_tts_no_system_tts_short, Toast.LENGTH_SHORT).show();
    TtsPlayer.setEnabled(!TtsPlayer.isEnabled());
    refreshTts();
  }
@@ -189,34 +195,38 @@ public class NavMenu

  private void updateTimeEstimate(int seconds)
  {
-    // Calculate ETA from current local time and remaining seconds.
+    final String format =
+        android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext()) ? "HH:mm" : "h:mm a";
    final LocalTime localTime = LocalTime.now().plusSeconds(seconds);
+    mTimeEstimate.setText(localTime.format(DateTimeFormatter.ofPattern(format)));
+  }

-    // String to set the format of the ETA value (24h or AM/PM).
-    final String etaValueFormat;
+  private void updateSpeedView(@NonNull RoutingInfo info)
+  {
+    final Location last = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation();
+    if (last == null)
+      return;

-    // Text of the AM/PM view.
-    final String etaAmPmText;
+    Pair<String, String> speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
+    mSpeedValue.setText(speedAndUnits.first);

-    if (DateUtils.is24HourFormat(mTimeMinuteValue.getContext()))
+    if (info.speedLimitMps > 0.0 && last.getSpeed() > info.speedLimitMps)
    {
-      // 24 hours time format.
-      etaValueFormat = "HH:mm";
-      etaAmPmText = "";
+      if (info.isSpeedCamLimitExceeded())
+        mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary));
+      else
+        mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
    }
    else
-    {
-      // AM/PM time format.
-      etaValueFormat = "h:mm";
-      etaAmPmText = localTime.format(DateTimeFormatter.ofPattern("a"));
-    }
+      mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary));

-    mEtaValue.setText(localTime.format(DateTimeFormatter.ofPattern(etaValueFormat)));
-    mEtaAmPm.setText(etaAmPmText);
+    mSpeedUnits.setText(speedAndUnits.second);
+    mSpeedViewContainer.setActivated(info.isSpeedCamLimitExceeded());
  }

  public void update(@NonNull RoutingInfo info)
  {
+    updateSpeedView(info);
    updateTime(info.totalTimeInSeconds);
    mDistanceValue.setText(info.distToTarget.mDistanceStr);
    mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -106,6 +106,7 @@ public class PlacePageView extends Fragment
      Arrays.asList(CoordinatesFormat.LatLonDMS, CoordinatesFormat.LatLonDecimal, CoordinatesFormat.OLCFull,
                    CoordinatesFormat.UTM, CoordinatesFormat.MGRS, CoordinatesFormat.OSMLink);
  private View mFrame;
+  private Context mContext;

  // Preview.
  private ViewGroup mPreview;
@@ -143,7 +144,6 @@ public class PlacePageView extends Fragment
  private MaterialTextView mTvOutdoorSeating;
  private View mEntrance;
  private MaterialTextView mTvEntrance;
-  private MaterialTextView mTvLastChecked;
  private View mEditPlace;
  private View mAddOrganisation;
  private View mAddPlace;
@@ -308,7 +308,6 @@ public class PlacePageView extends Fragment
    mTvCuisine = mFrame.findViewById(R.id.tv__place_cuisine);
    mEntrance = mFrame.findViewById(R.id.ll__place_entrance);
    mTvEntrance = mEntrance.findViewById(R.id.tv__place_entrance);
-    mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
    mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
    mEditPlace.setOnClickListener(this);
    mAddOrganisation = mFrame.findViewById(R.id.ll__add_organisation);
@@ -663,14 +662,7 @@ public class PlacePageView extends Fragment
    refreshMetadataOrHide(outdoorSeating.equals("yes") ? getString(R.string.outdoor_seating) : "", mOutdoorSeating,
                          mTvOutdoorSeating);

-    final String lastChecked = mMapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE);
-    if (!lastChecked.isEmpty())
-    {
-      String periodSinceCheck = DateUtils.getRelativePeriodString(getResources(), lastChecked);
-      UiUtils.setTextAndShow(mTvLastChecked, requireContext().getString(R.string.existence_confirmed_time_ago, periodSinceCheck));
-    }
-    else
-      UiUtils.hide(mTvLastChecked);
+    //    showTaxiOffer(mapObject);

    if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
    {
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -16,22 +16,18 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
-import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.placepage.EditBookmarkFragment;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.textview.MaterialTextView;

-public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener,
-                                                                   Observer<MapObject>, EditBookmarkFragment.EditBookmarkListener
+public class PlacePageBookmarkFragment extends Fragment implements View.OnLongClickListener, Observer<MapObject>
 {
  private View mFrame;
  private MaterialTextView mTvBookmarkNote;
@@ -59,8 +55,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
    mFrame = view;
    mTvBookmarkNote = mFrame.findViewById(R.id.tv__bookmark_notes);
    mTvBookmarkNote.setOnLongClickListener(this);
-    final View editBookmarkBtn = mFrame.findViewById(R.id.tv__bookmark_edit);
-    editBookmarkBtn.setOnClickListener(this);
  }

  private void initWebView()
@@ -118,14 +112,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
    }
  }

-  @Override
-  public void onClick(View v)
-  {
-    final FragmentActivity activity = requireActivity();
-    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
-                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
-  }
-
  @Override
  public boolean onLongClick(View v)
  {
@@ -155,13 +141,4 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
      updateBookmarkDetails();
    }
  }
-
-  @Override
-  public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory)
-  {
-    Bookmark updatedBookmark = BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
-    if (updatedBookmark == null)
-      return;
-    mViewModel.setMapObject(updatedBookmark);
-  }
 }
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -21,7 +20,6 @@ import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
-import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -38,7 +36,6 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
  private MaterialTextView mTodayOpenTime;
  private MaterialTextView mTodayNonBusinessTime;
  private RecyclerView mFullWeekOpeningHours;
-  private MaterialTextView mLastCheckedDate;
  private PlaceOpeningHoursAdapter mOpeningHoursAdapter;

  private PlacePageViewModel mViewModel;
@@ -61,23 +58,10 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
    mTodayOpenTime = view.findViewById(R.id.oh_today_open_time);
    mTodayNonBusinessTime = view.findViewById(R.id.oh_nonbusiness_time);
    mFullWeekOpeningHours = view.findViewById(R.id.rw__full_opening_hours);
-    mLastCheckedDate = view.findViewById(R.id.oh_check_date);
    mOpeningHoursAdapter = new PlaceOpeningHoursAdapter();
    mFullWeekOpeningHours.setAdapter(mOpeningHoursAdapter);
  }

-  private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, TextView checkDateView)
-  {
-    final String checkDate = mapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE_OPEN_HOURS);
-    if (!checkDate.isEmpty())
-    {
-      String periodSinceCheck = DateUtils.getRelativePeriodString(resources, checkDate);
-      UiUtils.setTextAndShow(checkDateView, resources.getString(R.string.hours_confirmed_time_ago, periodSinceCheck));
-    }
-    else
-      UiUtils.hide(checkDateView);
-  }
-
  private void refreshTodayNonBusinessTime(Timespan[] closedTimespans)
  {
    final String hoursClosedLabel = getResources().getString(R.string.editor_hours_closed);
@@ -118,9 +102,6 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<

    final boolean isEmptyTT = (timetables == null || timetables.length == 0);
    final int color = ThemeUtils.getColor(requireContext(), android.R.attr.textColorPrimary);
-    final Resources resources = getResources();
-
-    setOrHideLastCheckedDate(mapObject, resources, mLastCheckedDate);

    if (isEmptyTT)
    {
@@ -138,6 +119,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
    else
    {
      UiUtils.show(mFrame);
+      final Resources resources = getResources();
      if (timetables[0].isFullWeek())
      {
        final Timetable tt = timetables[0];
@@ -179,7 +161,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
            else
              openTime = tt.workingTimespan.toWideString();

-            refreshTodayOpeningHours(resources.getString(app.organicmaps.sdk.R.string.today), openTime, color);
+            refreshTodayOpeningHours(resources.getString(R.string.today), openTime, color);
            refreshTodayNonBusinessTime(tt.closedTimespans);

            break;
--- a/android/app/src/main/res/color/accent_color_selector.xml
+++ b/android/app/src/main/res/color/accent_color_selector.xml
@@ -9,7 +9,7 @@
      android:state_checked="true"/>

  <item android:color="@color/base_accent"
-      app:layers_enabled="true"/>
+      app:state_layers_enabled="true"/>

  <item android:color="@color/icon_tint"/>
 </selector>
--- a/android/app/src/main/res/color/accent_color_selector_night.xml
+++ b/android/app/src/main/res/color/accent_color_selector_night.xml
@@ -9,7 +9,7 @@
        android:state_checked="true"/>

  <item android:color="@color/base_accent_night"
-        app:layers_enabled="true"/>
+        app:state_layers_enabled="true"/>

  <item android:color="@color/white_secondary"/>
 </selector>
--- a/android/app/src/main/res/drawable/ic_layers.xml
+++ b/android/app/src/main/res/drawable/ic_layers.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        app:state_layers_enabled="true"
+        android:drawable="@drawable/ic_layers_clear"/>
+    <item
+        app:state_layers_enabled="false"
+        android:drawable="@drawable/ic_layers_default"/>
+</selector>
--- a/android/app/src/main/res/drawable/ic_layers_default.xml
+++ b/android/app/src/main/res/drawable/ic_layers_default.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>
--- a/android/app/src/main/res/layout-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
@@ -3,7 +3,6 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/altitude_chart_panel"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
@@ -64,19 +63,17 @@
      tools:text="5 h 55 min • 1555km"
      tools:visibility="visible" />

-    <com.google.android.material.button.MaterialButton
+    <Button
      android:id="@+id/btn__manage_route"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_marginStart="6dp"
      style="@style/MwmWidget.Button"
      android:text="@string/planning_route_manage_route"
-      android:textColor="?android:textColorPrimary"
-      app:icon="@drawable/ic_manage_route"
-      app:iconTint="?android:textColorPrimary"
-      app:iconPadding="6dp"/>
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>

-    <com.google.android.material.button.MaterialButton
+    <Button
        android:id="@+id/btn__save"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -85,8 +82,7 @@
        android:layout_marginStart="@dimen/margin_base"
        android:minHeight="@dimen/primary_button_min_height"
        style="@style/MwmWidget.Button"
-        android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:text="@string/save"/>

    <Button
      android:id="@+id/start"
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -123,24 +123,12 @@
      app:lanesEditModeLanesCount="10"
      tools:visibility="visible" />

-  <app.organicmaps.widget.CurrentSpeedView
-      android:id="@+id/nav_current_speed"
-      style="@style/MwmWidget.CurrentSpeed"
-      android:layout_width="60dp"
-      android:layout_height="60dp"
-      android:layout_margin="@dimen/margin_half"
-      app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
-      app:layout_constraintTop_toBottomOf="@id/street_frame"/>
-
  <app.organicmaps.widget.SpeedLimitView
    android:id="@+id/nav_speed_limit"
    style="@style/MwmWidget.SpeedLimit"
-    android:layout_width="50dp"
-    android:layout_height="50dp"
+    android:layout_width="60dp"
+    android:layout_height="60dp"
    android:layout_margin="@dimen/margin_half"
    app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
-    app:layout_constraintTop_toBottomOf="@id/nav_current_speed"
-    android:translationY="-21dp"
-    android:translationX="-12dp"
-    android:translationZ="1dp"/>
+    app:layout_constraintTop_toBottomOf="@id/street_frame" />
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
@@ -3,7 +3,6 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/altitude_chart_panel"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
@@ -83,27 +82,24 @@
      android:layout_weight="10"
      android:layout_gravity="center_vertical" />

-    <com.google.android.material.button.MaterialButton
+    <Button
      android:id="@+id/btn__manage_route"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_marginStart="6dp"
      style="@style/MwmWidget.Button"
      android:text="@string/planning_route_manage_route"
-      android:textColor="?android:textColorPrimary"
-      app:icon="@drawable/ic_manage_route"
-      app:iconTint="?android:textColorPrimary"
-      app:iconPadding="6dp"/>
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>

-    <com.google.android.material.button.MaterialButton
+    <Button
        android:id="@+id/btn__save"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/margin_base"
        style="@style/MwmWidget.Button"
        android:minHeight="@dimen/primary_button_min_height"
-        android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:text="@string/save"/>

    <Button
      android:id="@+id/start"
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -3,7 +3,6 @@
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/altitude_chart_panel"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
@@ -89,20 +88,17 @@
        android:layout_height="wrap_content"
        android:orientation="horizontal"
        android:gravity="center_vertical" >
-        <com.google.android.material.button.MaterialButton
+        <Button
          android:layout_weight="1"
          android:id="@+id/btn__manage_route"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          style="@style/MwmWidget.Button"
          android:text="@string/planning_route_manage_route"
-          android:textColor="?android:textColorPrimary"
-          android:textAlignment="viewStart"
-          app:icon="@drawable/ic_manage_route"
-          app:iconTint="?android:textColorPrimary"
-          app:iconPadding="@dimen/margin_quarter_plus"/>
+          android:drawableStart="@drawable/ic_manage_route"
+          android:drawablePadding="@dimen/margin_quarter_plus"/>

-        <com.google.android.material.button.MaterialButton
+        <Button
          android:layout_weight="0"
          android:id="@+id/btn__save"
          android:layout_width="wrap_content"
@@ -110,8 +106,7 @@
          style="@style/MwmWidget.Button"
          android:layout_marginStart="@dimen/margin_base"
          android:minHeight="@dimen/primary_button_min_height"
-          android:text="@string/save"
-          android:textColor="?android:textColorPrimary"/>
+          android:text="@string/save"/>
    </LinearLayout>

 </LinearLayout>
--- a/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
@@ -13,35 +13,35 @@
    android:layout_height="match_parent"
    android:layout_weight="0.5"/>

-  <!-- ETA (Estimated Time of Arrival) -->
+  <!-- Speed -->
  <LinearLayout
-    android:id="@+id/eta_view_container"
+    android:id="@+id/speed_view_container"
    android:layout_width="wrap_content"
    android:layout_height="match_parent"
    android:orientation="vertical"
+    android:background="@drawable/speed_cams_bg"
    android:gravity="center"
    android:minWidth="@dimen/nav_numbers_side_min_width">

-    <!-- ETA value -->
    <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/eta_value"
+      android:id="@+id/speed_value"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:includeFontPadding="false"
      android:lines="1"
      android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
-      tools:text="99:99" />
+      tools:text="999" />

-    <!-- ETA AM/PM -->
+    <!-- Speed -->
    <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/eta_am_pm"
+      android:id="@+id/speed_dimen"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:includeFontPadding="false"
      android:lines="1"
      android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
      tools:background="#20FF0000"
-      tools:text="AM/PM" />
+      tools:text="km/h" />
  </LinearLayout>

  <Space
@@ -103,14 +103,14 @@
    </LinearLayout>

    <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/disused_text_view"
+      android:id="@+id/time_estimate"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:includeFontPadding="false"
      android:lines="1"
      android:textAlignment="center"
      android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
-      tools:text="----" />
+      tools:text="99:99 AM" />
  </LinearLayout>

  <Space
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -124,26 +124,13 @@
      app:lanesEditModeLanesCount="5"
      tools:visibility="visible" />

-  <app.organicmaps.widget.CurrentSpeedView
-      android:id="@+id/nav_current_speed"
-      style="@style/MwmWidget.CurrentSpeed"
-      android:layout_width="60dp"
-      android:layout_height="60dp"
-      android:layout_margin="@dimen/margin_half"
-      app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
-      app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
-      app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container"/>
-
  <app.organicmaps.widget.SpeedLimitView
    android:id="@+id/nav_speed_limit"
    style="@style/MwmWidget.SpeedLimit"
-    android:layout_width="50dp"
-    android:layout_height="50dp"
+    android:layout_width="60dp"
+    android:layout_height="60dp"
    android:layout_margin="@dimen/margin_half"
    app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
    app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
-    app:layout_constraintTop_toBottomOf="@id/nav_current_speed"
-    android:translationY="-23dp"
-    android:translationX="-23dp"
-    android:translationZ="1dp"/>
+    app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container" />
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -11,23 +11,9 @@
    android:id="@+id/tv__bookmark_notes"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_half"
+    android:layout_marginBottom="@dimen/margin_base"
    android:layout_marginEnd="@dimen/margin_base"
    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_base"
    android:textAppearance="?android:attr/textAppearance"
    tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
-
-  <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/tv__bookmark_edit"
-      style="@style/PlacePageMetadataText.Button"
-      android:gravity="center"
-      android:layout_height="@dimen/height_block_base"
-      android:background="?clickableBackground"
-      android:paddingEnd="@dimen/margin_base"
-      android:paddingStart="@dimen/margin_base"
-      android:text="@string/placepage_edit_bookmark_button"/>
-
-  <include
-    layout="@layout/divider_horizontal"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -74,15 +74,6 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"/>

-  <com.google.android.material.textview.MaterialTextView
-    android:id="@+id/place_page_last_checked"
-    style="?fontCaption"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/margin_half"
-    android:paddingHorizontal="@dimen/margin_base"
-    tools:text="Existence confirmed 1 month ago"/>
-
  <include android:visibility="gone" layout="@layout/place_page_editor"/>

  <include android:visibility="gone" layout="@layout/place_page_add_business"/>
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -3,7 +3,6 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  tools:visibility="visible"
  style="@style/PlacePageItemFrame">

  <com.google.android.material.imageview.ShapeableImageView
@@ -59,21 +58,6 @@
    android:layout_alignStart="@id/oh_nonbusiness_time"
    android:layout_below="@id/oh_nonbusiness_time"
    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    tools:itemCount="3"
-    tools:listitem="@layout/place_page_opening_hours_item"
    android:layout_marginTop="8dp"/>

-  <com.google.android.material.textview.MaterialTextView
-    android:id="@+id/oh_check_date"
-    style="?fontCaption"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:layout_alignParentEnd="true"
-    android:layout_alignStart="@id/oh_today_label"
-    android:layout_below="@id/rw__full_opening_hours"
-    android:textAppearance="@style/MwmTextAppearance.Body4"
-    android:textAlignment="viewStart"
-    android:visibility="gone"
-    tools:visibility="visible"
-    tools:text="Confirmed 2 months ago"/>
 </RelativeLayout>
--- a/android/app/src/main/res/layout/preference_switch.xml
+++ b/android/app/src/main/res/layout/preference_switch.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
-<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/switchWidget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:clickable="false"
-    android:focusable="false" />
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -397,6 +397,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Vandag gesluit</string>
    <string name="day_off">Gesluit</string>
+    <string name="today">Vandag</string>
    <string name="opens_in">Open oor %s</string>
    <string name="closes_in">Sluit oor %s</string>
    <string name="closed">Gesluit</string>
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -423,6 +423,7 @@
    <string name="twentyfour_seven">٢٤/٧(ليلاً ونهاراً)</string>
    <string name="day_off_today">مغلق اليوم</string>
    <string name="day_off">مغلق</string>
+    <string name="today">اليوم</string>
    <string name="opens_in">يفتح بعد %s</string>
    <string name="closes_in">يغلق في غضون %s</string>
    <string name="closed">مغلق</string>
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -31,6 +31,7 @@
    <string name="no_available">Non</string>
    <string name="yes">Sí</string>
    <string name="yes_available">Sí</string>
+    <string name="today">Güei</string>
    <string name="export_file">Esportar KMZ</string>
    <string name="no">Non</string>
    <string name="network">Rede: %s</string>
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -415,6 +415,7 @@
    <string name="twentyfour_seven">7/24</string>
    <string name="day_off_today">Bu gün bağlıdır</string>
    <string name="day_off">Bağlı</string>
+    <string name="today">Bu gün</string>
    <string name="opens_in">%s sonra açılır</string>
    <string name="closes_in">%s sonra bağlanır</string>
    <string name="closed">Bağlı</string>
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -409,6 +409,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Сёння закрыта</string>
    <string name="day_off">Закрыта</string>
+    <string name="today">Сёння</string>
    <string name="opens_in">Адчыняецца праз %s</string>
    <string name="closes_in">Зачыняецца праз %s</string>
    <string name="closed">Закрыта</string>
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -216,7 +216,7 @@
    <!-- Settings «Route» category: «Tts language» title -->
    <string name="pref_tts_language_title">Език на инструкциите</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Тестване на гласови указания</string>
+    <string name="pref_tts_test_voice_title">Тестване на гласови указания (TTS, Text-To-Speech)</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
    <string name="pref_tts_playing_test_voice">Проверете силата на звука или системните настройки за преобразуване на текст в реч, ако сега не чувате гласа.</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -389,6 +389,7 @@
    <string name="twentyfour_seven">24 часа</string>
    <string name="day_off_today">Затворено днес</string>
    <string name="day_off">Затворено</string>
+    <string name="today">Днес</string>
    <string name="closed">Затворено</string>
    <string name="edit_opening_hours">Редакция на работното време</string>
    <string name="no_osm_account">Нямате акаунт в OpenStreetMap?</string>
@@ -804,5 +805,4 @@
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/</string>
    <string name="saved">Запазено</string>
-    <string name="about_headline">Отворен проект, захранван от общността</string>
 </resources>
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -240,6 +240,7 @@
    <string name="editor_report_problem_under_construction_title">রক্ষণাবেক্ষণের জন্য বন্ধ</string>
    <string name="editor_report_problem_duplicate_place_title">ডুপ্লিকেট জায়গা</string>
    <string name="day_off_today">আজকে বন্ধ</string>
+    <string name="today">আজকে</string>
    <string name="opens_in">%s-এর মধ্যে খুলবে</string>
    <string name="closes_in">%s-এর মধ্যে বন্ধ হবে</string>
    <string name="no_osm_account">আপনার ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট নেই?</string>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -415,6 +415,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Avui és tancat</string>
    <string name="day_off">Tancat</string>
+    <string name="today">Avui</string>
    <string name="opens_in">Obre en %s</string>
    <string name="closes_in">Tanca en %s</string>
    <string name="closed">Tancat</string>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -408,6 +408,7 @@
    <string name="twentyfour_seven">Nonstop</string>
    <string name="day_off_today">Dnes zavřeno</string>
    <string name="day_off">Zavřeno</string>
+    <string name="today">Dnes</string>
    <string name="closed">Zavřeno</string>
    <string name="edit_opening_hours">Upravit otevírací dobu</string>
    <string name="no_osm_account">Nemáte účet u OpenStreetMap?</string>
@@ -882,7 +883,4 @@
    <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
    <string name="share_track">Sdílet stopu</string>
    <string name="delete_track_dialog_title">Odstranit %s?</string>
-    <string name="hours_confirmed_time_ago">Potvrzeno %s</string>
-    <string name="existence_confirmed_time_ago">Existence potvrzena %s</string>
-    <string name="pref_tts_no_system_tts_short">Nenalezen žádný modul pro převod textu na řeč, zkontrolujte nastavení aplikace</string>
 </resources>
--- a/android/app/src/main/res/values-cy/strings.xml
+++ b/android/app/src/main/res/values-cy/strings.xml
@@ -32,6 +32,7 @@
    <string name="editor_time_close">Ar gau</string>
    <string name="subway">Tanlwybr</string>
    <string name="downloader_retry">Ailgeisio</string>
+    <string name="today">Heddiw</string>
    <string name="button_plan">Cynllunio</string>
    <string name="translated_om_site_url">https://comaps.app/</string>
    <string name="list">Rhestr</string>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -404,6 +404,7 @@
    <string name="twentyfour_seven">Døgnet rundt</string>
    <string name="day_off_today">Lukket i dag</string>
    <string name="day_off">Lukket</string>
+    <string name="today">I dag</string>
    <string name="closed">Lukket</string>
    <string name="edit_opening_hours">Rediger åbningstid</string>
    <string name="no_osm_account">Har du ikke OpenStreetMap-konto?</string>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -413,6 +413,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Heute geschlossen</string>
    <string name="day_off">Geschlossen</string>
+    <string name="today">Heute</string>
    <string name="opens_in">Öffnet in %s</string>
    <string name="closes_in">Schließt in %s</string>
    <string name="closed">Geschlossen</string>
@@ -887,7 +888,4 @@
    <string name="osm_note_toast">Ein Hinweis wird zu OpenStreetMap geschickt</string>
    <string name="share_track">Strecke teilen</string>
    <string name="delete_track_dialog_title">%s löschen?</string>
-    <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
-    <string name="hours_confirmed_time_ago">Bestätigt %s</string>
-    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache Modul gefunden, überprüfe die App-Einstellungen</string>
 </resources>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -415,6 +415,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Κλειστό σήμερα</string>
    <string name="day_off">Κλειστό</string>
+    <string name="today">Σήμερα</string>
    <string name="opens_in">Ανοίγει σε %s</string>
    <string name="closes_in">Κλείνει σε %s</string>
    <string name="closed">Κλειστό</string>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -413,10 +413,11 @@
    <string name="editor_report_problem_duplicate_place_title">Lugar duplicado</string>
    <string name="autodownload">Descarga automática</string>
    <!-- Place Page opening hours text -->
-    <string name="daily">Diariamente</string>
+    <string name="daily">Diario</string>
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Cerrado hoy</string>
    <string name="day_off">Cerrado</string>
+    <string name="today">Hoy</string>
    <string name="opens_in">Abre en %s</string>
    <string name="closes_in">Cierra en %s</string>
    <string name="closed">Cerrado</string>
@@ -539,7 +540,7 @@
    <!-- For the first routing -->
    <string name="accept">Aceptar</string>
    <!-- For the first routing -->
-    <string name="decline">Rechazar</string>
+    <string name="decline">Declinar</string>
    <string name="mobile_data_dialog">¿Usar Internet móvil para mostrar información detallada?</string>
    <string name="mobile_data_option_always">Usar siempre</string>
    <string name="mobile_data_option_today">Sólo hoy</string>
@@ -890,6 +891,4 @@
    <string name="at">a las %s</string>
    <string name="osm_note_hint">O, como alternativa, deja una nota a la comunidad de OpenStreetMap para que alguien lo agregue o arregle.</string>
    <string name="osm_note_toast">Una nota será enviada a OpenStreetMap</string>
-    <string name="delete_track_dialog_title">Eliminar %s?</string>
-    <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -409,6 +409,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Täna suletud</string>
    <string name="day_off">Suletud</string>
+    <string name="today">Täna</string>
    <string name="opens_in">Avatakse %s möödumisel</string>
    <string name="closes_in">Suletakse %s möödumisel</string>
    <string name="closed">Suletud</string>
@@ -882,7 +883,4 @@
    <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
    <string name="share_track">Jaga rada</string>
    <string name="delete_track_dialog_title">Kas kustutame: %s?</string>
-    <string name="existence_confirmed_time_ago">Olemasolu on kontrollitud %s</string>
-    <string name="hours_confirmed_time_ago">Kontrollitud %s</string>
-    <string name="pref_tts_no_system_tts_short">Ühtegi kõnesünteesimootorit ei leidu, palun kontrolli rakenduse seadistusi</string>
 </resources>
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -415,6 +415,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Gaur atseden eguna</string>
    <string name="day_off">Itxita</string>
+    <string name="today">Gaur</string>
    <string name="opens_in">%s barru irekiko da</string>
    <string name="closes_in">%s barru itxiko da</string>
    <string name="closed">Itxita</string>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -394,6 +394,7 @@
    <string name="twentyfour_seven">شبانه روزی</string>
    <string name="day_off_today">امروز تعطیل است</string>
    <string name="day_off">تعطیل است</string>
+    <string name="today">امروز</string>
    <string name="closed">تعطیل</string>
    <string name="edit_opening_hours">ویرایش ساعت کاری</string>
    <string name="no_osm_account">آیا حساب OpenStreetMap ندارید؟</string>
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -416,6 +416,7 @@
    <string name="twentyfour_seven">Päivin ja öin</string>
    <string name="day_off_today">Suljettu tänään</string>
    <string name="day_off">Suljettu</string>
+    <string name="today">Tänään</string>
    <string name="opens_in">Avautuu %s kuluttua</string>
    <string name="closes_in">Sulkeutuu %s kuluttua</string>
    <string name="closed">Suljettu</string>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -101,7 +101,7 @@
    <string name="measurement_units_summary">Choisir entre miles et kilomètres</string>
    <!-- SECTION: Search categories -->
    <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
-    <string name="category_eat">Où manger</string>
+    <string name="category_eat">Un endroit pour manger</string>
    <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
    <string name="category_food">Épiceries</string>
    <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
@@ -165,13 +165,13 @@
    <!-- Warning message when doing search around current position -->
    <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de cartes sont actuellement désactivés</string>
+    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de carte sont actuellement désactivés.</string>
    <!-- Alert message that downloading is in progress. -->
    <string name="downloading_is_active">Le téléchargement de la carte est en cours</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">Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Téléchargez-les ici : https://www.comaps.app/download/</string>
    <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hé, regardez ce lieu dans CoMaps !</string>
+    <string name="bookmark_share_email_subject">Hé, regardez mon signet sur la carte CoMaps !</string>
    <!-- Subject for emailed position -->
    <string name="my_position_share_email_subject">Hé, regardez ma position actuelle sur la carte CoMaps !</string>
    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -187,7 +187,7 @@
    <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
    <string name="data_version">Données OpenStreetMap : %s</string>
    <!-- Confirmation for OpenStreetMap log out. -->
-    <string name="osm_log_out_confirmation">Êtes-vous certain de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
+    <string name="osm_log_out_confirmation">Êtes-vous sûr de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
    <!-- Title for tracks category in bookmarks manager -->
    <string name="tracks_title">Traces</string>
    <!-- Length of track in cell that describes route -->
@@ -221,7 +221,7 @@
    <!-- Settings «Route» category: «Tts announce street names» description -->
    <string name="pref_tts_street_names_description">Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix.</string>
    <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Langue des annonces vocales</string>
+    <string name="pref_tts_language_title">Langue vocale</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
    <string name="pref_tts_test_voice_title">Tester les instructions vocales</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
@@ -234,11 +234,11 @@
    <!-- Menu button -->
    <string name="menu">Menu</string>
    <!-- Text in menu -->
-    <string name="website">Site web</string>
+    <string name="website">Site internet</string>
    <!-- Text in About menu, opens CoMaps news website -->
    <string name="news">Nouvelles</string>
    <!-- Settings: Send feedback button and dialog title -->
-    <string name="feedback">Suggestions</string>
+    <string name="feedback">Feedback</string>
    <!-- Text in menu -->
    <string name="rate_the_app">Évaluer l\'appli</string>
    <!-- Text in menu -->
@@ -248,7 +248,7 @@
    <!-- Button in the main menu -->
    <string name="donate">Faire un don</string>
    <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Devenez contributeur et améliorez CoMaps</string>
+    <string name="how_to_support_us">Soutenir le projet</string>
    <!-- Button in the main Help dialog -->
    <string name="copyright">Tous droits réservés</string>
    <!-- Text in menu + Button in the main Help dialog -->
@@ -283,11 +283,11 @@
    <!-- Item in context menu. -->
    <string name="downloader_delete_map">Supprimer carte</string>
    <!-- Item in context menu. -->
-    <string name="downloader_update_map">Mettre à jour carte</string>
+    <string name="downloader_update_map">Mise à jour carte</string>
    <!-- Preference title -->
    <string name="google_play_services">Service de localisation Google Fused</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Un service propriétaire qui combine GPS, Wi-Fi, réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs Google.</string>
+    <string name="pref_use_google_play">Un service propriétaire qui combine le GPS, le Wi-Fi, les réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs de Google.</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -334,10 +334,10 @@
    <string name="blue_gray">Gris-bleu</string>
    <!-- SECTION: Routing dialogs strings -->
    <string name="dialog_routing_disclaimer_title">Lorsque vous suivez l\'itinéraire, gardez à l\'esprit les points suivants :</string>
-    <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;</string>
-    <string name="dialog_routing_disclaimer_precision">— La carte peut être erronée et l\'itinéraire proposé n\'est pas forcément optimal pour arriver à destination ;</string>
+    <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur l\'appareil de navigation ;</string>
+    <string name="dialog_routing_disclaimer_precision">— La carte peut être imprécise et l\'itinéraire proposé n\'est pas forcément le plus direct pour arriver à destination ;</string>
    <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
-    <string name="dialog_routing_disclaimer_borders">— Faites attention à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
+    <string name="dialog_routing_disclaimer_borders">— Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir des frontières étatiques dans des zones interdites ;</string>
    <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
    <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
    <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
@@ -346,10 +346,10 @@
    <string name="dialog_routing_location_unknown_turn_on">Impossible de déterminer les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire.</string>
    <string name="dialog_routing_unable_locate_route">Impossible de localiser l\'itinéraire</string>
    <string name="dialog_routing_cant_build_route">Impossible de créer l\'itinéraire</string>
-    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination.</string>
+    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination</string>
    <string name="dialog_routing_change_start">Modifiez votre point de départ</string>
    <string name="dialog_routing_start_not_determined">Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé.</string>
-    <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route.</string>
+    <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route</string>
    <string name="dialog_routing_change_end">Ajustez la destination</string>
    <string name="dialog_routing_end_not_determined">Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé.</string>
    <string name="dialog_routing_select_closer_end">Choisissez un lieu de destination à proximité d\'une route</string>
@@ -360,10 +360,10 @@
    <string name="dialog_routing_try_again">Veuillez réessayer</string>
    <string name="not_now">Pas maintenant</string>
    <string name="dialog_routing_download_and_build_cross_route">Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte ?</string>
-    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour calculer un meilleur itinéraire sortant des limites de la carte courante.</string>
+    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte.</string>
    <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Commencez par télécharger une carte pour effectuer des recherches et créer des itinéraires. Ensuite vous pourrez utilisez CoMaps sans connexion Internet.</string>
-    <string name="search_select_map">Sélectionnez une carte</string>
+    <string name="search_without_internet_advertisement">Pour commencer à rechercher et à créer des itinéraires, veuillez télécharger la carte. Après cela, vous n\'aurez plus besoin d\'une connexion Internet.</string>
+    <string name="search_select_map">Sélectionner la carte</string>
    <!-- «Show» context menu -->
    <string name="show">Afficher</string>
    <!-- «Hide» context menu -->
@@ -372,9 +372,9 @@
    <string name="history">Historique</string>
    <string name="search_not_found">Oups, aucun résultat trouvé</string>
    <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche.</string>
+    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche</string>
    <string name="search_history_title">Historique de recherche</string>
-    <string name="search_history_text">Affichez vos dernières recherches</string>
+    <string name="search_history_text">Accédez à vos dernières recherches</string>
    <string name="clear_search">Effacer l\'historique de recherche</string>
    <!-- Place Page link to Wikipedia article (if map object has it). -->
    <string name="read_in_wikipedia">Wikipédia</string>
@@ -402,14 +402,14 @@
    <string name="editor_time_simple">Mode simplifié</string>
    <string name="editor_hours_closed">Heures de fermeture</string>
    <string name="editor_example_values">Exemple de valeurs</string>
-    <string name="editor_correct_mistake">Corriger une erreur</string>
+    <string name="editor_correct_mistake">Corriger l\'erreur</string>
    <string name="editor_add_select_location">Sélectionnez un emplacement</string>
    <string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de le résoudre.</string>
    <string name="editor_report_problem_desription_2">Ou faites-le vous-même sur https://www.openstreetmap.org/</string>
    <string name="editor_report_problem_send_button">Envoyer</string>
    <string name="editor_report_problem_title">Problème</string>
    <string name="editor_report_problem_no_place_title">Ce lieu n\'existe pas</string>
-    <string name="editor_report_problem_under_construction_title">Fermé pour travaux</string>
+    <string name="editor_report_problem_under_construction_title">Fermé pour cause de maintenance</string>
    <string name="editor_report_problem_duplicate_place_title">Lieu en doublon</string>
    <string name="autodownload">Téléchargement automatique des cartes</string>
    <!-- Place Page opening hours text -->
@@ -417,6 +417,7 @@
    <string name="twentyfour_seven">24/24 et 7/7</string>
    <string name="day_off_today">Fermé aujourd\'hui</string>
    <string name="day_off">Fermé</string>
+    <string name="today">Aujourd\'hui</string>
    <string name="opens_in">Ouvert dans %s</string>
    <string name="closes_in">Ferme dans %s</string>
    <string name="closed">Fermé</string>
@@ -452,16 +453,16 @@
    <string name="level">Étage</string>
    <!-- Building level -->
    <string name="level_value_generic">Niveau : %s</string>
-    <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées en même temps qu\'elle</string>
+    <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées avec elle</string>
    <string name="downloader_update_maps">Mettre à jour les cartes</string>
-    <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis replanifier l\'itinéraire.</string>
+    <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire.</string>
    <string name="downloader_search_field_hint">Trouver une carte</string>
-    <string name="common_check_internet_connection_dialog">Veuillez vérifier que votre appareil est connecté à Internet</string>
+    <string name="common_check_internet_connection_dialog">Veuillez vous assurer que votre appareil est connecté à Internet</string>
    <string name="downloader_no_space_title">Espace insuffisant</string>
    <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
    <string name="editor_login_error_dialog">Erreur de connexion</string>
    <string name="editor_profile_changes">Modifications vérifiées</string>
-    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise.</string>
+    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise</string>
    <string name="editor_edit_place_title">Modification</string>
    <string name="editor_add_place_title">Ajout</string>
    <string name="editor_edit_place_name_hint">Nom du lieu</string>
@@ -476,7 +477,7 @@
    <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org</string>
    <!-- OSM explanation on Android login screen -->
    <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde !</string>
-    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier</string>
+    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier.</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">Télécharger avec une connexion réseau cellulaire ?</string>
@@ -514,7 +515,7 @@
    <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
    <string name="editor_comment_hint">Commentaire…</string>
    <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
-    <string name="editor_reset_edits_button">Ignorer</string>
+    <string name="editor_reset_edits_button">Réinitialiser</string>
    <string name="editor_remove_place_message">Supprimer le lieu ajouté ?</string>
    <string name="editor_remove_place_button">Supprimer</string>
    <string name="editor_place_doesnt_exist">Ce lieu n\'existe pas</string>
@@ -523,7 +524,7 @@
    <!-- Phone number error message -->
    <string name="error_enter_correct_phone">Saisissez un numéro de téléphone valide</string>
    <string name="error_enter_correct_web">Saisissez une adresse Internet valide</string>
-    <string name="error_enter_correct_email">Saisissez une adresse de courriel valide</string>
+    <string name="error_enter_correct_email">Saisissez un email valide</string>
    <string name="error_enter_correct_facebook_page">Saisissez une adresse web, un compte ou un nom de page Facebook valide</string>
    <string name="error_enter_correct_instagram_page">Saisissez une adresse web, un nom de compte Instagram valide</string>
    <string name="error_enter_correct_twitter_page">Saisissez une adresse web, un nom de compte Twitter valide</string>
@@ -534,7 +535,7 @@
    <string name="editor_share_to_all_dialog_title">Souhaitez-vous l’envoyer à tous les utilisateurs ?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
    <string name="editor_share_to_all_dialog_message_1">Assurez-vous de n’avoir pas saisi de données personnelles</string>
-    <string name="editor_share_to_all_dialog_message_2">Les cartographes OpenStreetMap vérifieront vos modifications et vous contacteront en cas de questions</string>
+    <string name="editor_share_to_all_dialog_message_2">Les contributeurs d\'OpenStreetMap vérifieront vos modifications et vous contacteront s\'ils ont des questions.</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Enregistreur de traces</string>
    <!-- For the first routing -->
@@ -547,10 +548,10 @@
    <string name="mobile_data_option_not_today">Ne pas utiliser aujourd\'hui</string>
    <string name="mobile_data">Internet mobile</string>
    <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Une connexion Internet est nécessaire pour recevoir les mises à jour de cartes et pour envoyer vos modifications</string>
+    <string name="mobile_data_description">L\'Internet mobile est requis pour les notifications de mise à jour de carte et le téléchargement des modifications.</string>
    <string name="mobile_data_option_never">Ne jamais utiliser</string>
    <string name="mobile_data_option_ask">Toujours demander</string>
-    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour</string>
+    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour.</string>
    <string name="big_font">Augmenter la taille de police sur la carte</string>
    <string name="traffic_update_app">Veuillez mettre à jour CoMaps</string>
    <!-- "traffic" as in "road congestion" -->
@@ -647,7 +648,7 @@
    <string name="avoid_ferry">Éviter les ferries</string>
    <string name="avoid_motorways">Éviter les autoroutes</string>
    <string name="unable_to_calc_alert_title">Impossible de calculer l\'itinéraire</string>
-    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez.</string>
+    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez</string>
    <string name="define_to_avoid_btn">Définissez les routes à éviter</string>
    <string name="change_driving_options_btn">Paramètres d\'itinéraire activés</string>
    <string name="toll_road">Route à péage</string>
@@ -775,9 +776,9 @@
    <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
    <string name="car_continue_in_the_car">Afficher dans la voiture</string>
    <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">CoMaps a besoin d\'accéder à votre position. Vérifiez la notification affichée sur le téléphone.</string>
+    <string name="aa_location_permissions_request">CoMaps a besoin d\'un accès à la localisation. Lorsque c\'est sûr, vérifie la notification sur ton téléphone.</string>
    <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Cette application a besoin de vôtre permission</string>
+    <string name="aa_request_permission_notification">Cette application a besoin de ta permission</string>
    <!-- The text in the activity for location permission request. -->
    <string name="aa_request_permission_activity_text">CoMaps dans Android Auto a besoin des permissions de localisation pour fonctionner efficacement</string>
    <!-- Grant Permissions button. -->
@@ -810,7 +811,7 @@
    <!-- To indicate if restaurant or other place has outdoor seating -->
    <string name="outdoor_seating">Places en terrasse</string>
    <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
-    <string name="power_save_dialog_summary">Pour une navigation plus précise, nous vous recommandons de désactiver le mode d\'économie d\'énergie dans les paramètres de la batterie du téléphone.</string>
+    <string name="power_save_dialog_summary">Pour une navigation plus précise, nous te recommandons de désactiver le mode d\'économie d\'énergie dans les paramètres de la batterie du téléphone.</string>
    <!-- Prompt to start recording a track. -->
    <string name="start_track_recording">Enregistrer la trace</string>
    <!-- Prompt for stopping a track recording. -->
@@ -824,9 +825,9 @@
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">L\'itinéraire est vide - il n\'y a rien à sauvegarder</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer.</string>
+    <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer</string>
    <string name="choose_color">Choisir la couleur</string>
-    <string name="edit_track">Modifier la trace</string>
+    <string name="edit_track">Modifier le trace</string>
    <string name="uri_open_location_failed">Aucune application installée ne permet d\'ouvrir l\'emplacement</string>
    <!-- preference string for using auto theme only in navigation mode -->
    <string name="nav_auto">Auto dans la navigation</string>
@@ -844,7 +845,7 @@
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <string name="openstreetmap">OpenStreetMap</string>
    <string name="navigation_stop_button">Stop</string>
-    <string name="telegram_url">https://t.me/CoMapsApp</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="app_site_url">https://comaps.app/fr/</string>
    <string name="codeberg">Codeberg</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
@@ -861,7 +862,7 @@
    <string name="vehicle">Véhicule</string>
    <string name="clear">Effacer</string>
    <string name="pedestrian">À pied</string>
-    <string name="bicycle">À vélo</string>
+    <string name="bicycle">Vélo</string>
    <string name="ruler">Règle</string>
    <string name="bookmark_color">Couleur du marque-page</string>
    <string name="panoramax">Image Panoramax</string>
@@ -890,9 +891,4 @@
    <string name="at">à %s</string>
    <string name="osm_note_hint">Sinon, laissez une note à la communauté OpenStreetMap pour que quelqu\'un d\'autre puisse ajouter ou corriger ce lieu.</string>
    <string name="osm_note_toast">La note va être envoyée à OpenStreetMap</string>
-    <string name="share_track">Partager la trace</string>
-    <string name="delete_track_dialog_title">Supprimer %s ?</string>
-    <string name="existence_confirmed_time_ago">Existance confirmée %s</string>
-    <string name="hours_confirmed_time_ago">Confirmé %s</string>
-    <string name="pref_tts_no_system_tts_short">Pas de synthèse vocale disponible, vérifiez les paramètres de l\'application</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -228,7 +228,7 @@
    <string name="rate_the_app">Valore a aplicación</string>
    <string name="faq">Preguntas frecuentes</string>
    <string name="donate">Doar</string>
-    <string name="how_to_support_us">Voluntariado para mellorar CoMaps</string>
+    <string name="how_to_support_us">Apoie o proxecto</string>
    <string name="copyright">Dereitos de autor</string>
    <string name="report_a_bug">Informar dun fallo</string>
    <string name="compass_calibration_recommended">Mellore a dirección da frecha movendo o teléfono en forma de oito para calibrar o compás.</string>
@@ -489,6 +489,7 @@
    <string name="translated_om_site_url">https://comaps.app/gl/</string>
    <string name="category_shopping">Compras</string>
    <string name="placepage_distance">Distancia</string>
+    <string name="today">Hoxe</string>
    <string name="category_toilet">Baño</string>
    <string name="off">Desactivado</string>
    <string name="cuisine">Cociña</string>
@@ -617,8 +618,4 @@
    <string name="at">ás %s</string>
    <string name="osm_note_hint">Ou, de xeito alternativo, deixarlle unha nota á comunidade OpenStreetMap para que alguén poida engadir ou arranxar a localización.</string>
    <string name="osm_note_toast">Enviarase unha nota a OpenStreetMap</string>
-    <string name="delete_track_dialog_title">Eliminar %s?</string>
-    <string name="hours_confirmed_time_ago">Confirmado %s</string>
-    <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
-    <string name="share_track">Compartir ruta</string>
 </resources>
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -360,6 +360,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Hüt zue</string>
    <string name="day_off">Zue</string>
+    <string name="today">Hüt</string>
    <string name="opens_in">Öffnet i %s</string>
    <string name="closes_in">Schlüüst i %s</string>
    <string name="closed">Zue</string>
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -103,6 +103,7 @@
    <string name="privacy">Privatnost</string>
    <string name="power_managment_setting_never">Nikada</string>
    <string name="editor_reset_edits_button">Odbaci</string>
+    <string name="today">Danas</string>
    <string name="password">Lozinka</string>
    <string name="details">Detalji</string>
    <string name="privacy_policy">Politika privatnosti</string>
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -9,7 +9,7 @@
    <string name="delete">Törlés</string>
    <string name="download_maps">Térképek letöltése</string>
    <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Nem sikerült letölteni, próbálja újra</string>
+    <string name="download_has_failed">Nem sikerült letölteni. Próbálja meg újra.</string>
    <!-- Settings/Downloader - info for country which started downloading -->
    <string name="downloading">Letöltés…</string>
    <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -23,11 +23,11 @@
    <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
    <string name="search_map">Keresés a térképen</string>
    <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Engedélyezze őket a beállításokban.</string>
+    <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Engedélyezze őket a Beállításokban.</string>
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Korlátozott pontosság</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">A pontos navigáció érdekében meg kell adni a beállításokban a pontos helymeghatározási engedélyt</string>
+    <string name="precise_location_is_disabled_long_text">A pontos navigáció érdekében engedélyezze a beállításokban a Pontos helymeghatározás opciót.</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">Megjelenítés a térképen</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
@@ -70,7 +70,7 @@
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
    <string name="bookmarks">Könyvjelzők</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Könyvjelzők és útvonalak</string>
+    <string name="bookmarks_and_tracks">Könyvjelzők és nyomvonalak</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Név</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -82,7 +82,7 @@
    <!-- Header of settings activity where user defines storage path -->
    <string name="maps_storage">Térképek mentési helye</string>
    <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">A térképek letöltéséhez válassza ki a mappát</string>
+    <string name="maps_storage_summary">Válassza ki a mappát a térképek letöltéséhez.</string>
    <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
    <string name="maps_storage_downloaded">Letöltött térképek</string>
    <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -162,9 +162,9 @@
    <!-- Warning message when doing search around current position -->
    <string name="unknown_current_position">Az Ön tartózkodási helye még nincs meghatározva</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Sajnos a térképtárolás beállítása jelenleg le van tiltva</string>
+    <string name="cant_change_this_setting">A térképek tárolása jelenleg ki van kapcsolva.</string>
    <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">A térkép letöltése folyamatban van</string>
+    <string name="downloading_is_active">A térkép letöltése folyamatban van.</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">Tekintse meg a helyzetemet az CoMaps alkalmazásban! %1$s vagy %2$s. Nincs offline térképe? Töltse le innen: https://www.comaps.app/download/</string>
    <!-- Subject for emailed bookmark -->
@@ -172,7 +172,7 @@
    <!-- Subject for emailed position -->
    <string name="my_position_share_email_subject">Tekintse meg a helyzetemet az CoMaps alkalmazásban!</string>
    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
-    <string name="my_position_share_email">Üdvözlöm.\n\nJelenleg itt vagyok: %1$s. Kattintson erre a hivatkozásra %2$s, vagy erre %3$s, hogy megtekintse a helyet a térképen.\n\nKöszönöm.</string>
+    <string name="my_position_share_email">Üdvözlöm!\n\nJelenleg itt tartózkodom: %1$s. Kattintson a következő hivatkozásra: %2$s, vagy ide: %3$s, hogy megtekintse a helyzetemet a térképen.\n\nKöszönöm!</string>
    <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
    <string name="share">Megosztás</string>
    <!-- Share by email button text, also used in editor and About. -->
@@ -220,7 +220,7 @@
    <!-- Settings «Route» category: «Test Voice Directions» title -->
    <string name="pref_tts_test_voice_title">Hangutasítások tesztelése</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot</string>
+    <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot.</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
    <string name="pref_tts_unavailable">Nem érhető el</string>
    <string name="pref_map_auto_zoom">Automatikus nagyítás</string>
@@ -237,11 +237,11 @@
    <!-- Text in menu -->
    <string name="help">Súgó</string>
    <!-- Button in the main Help dialog -->
-    <string name="faq">Gyakran ismételt kérdések</string>
+    <string name="faq">GYIK</string>
    <!-- Button in the main menu -->
    <string name="donate">Adományozás</string>
    <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Önkéntes munka és a CoMaps fejlesztése</string>
+    <string name="how_to_support_us">A projekt támogatása</string>
    <!-- Button in the main Help dialog -->
    <string name="copyright">Szerzői jogok</string>
    <!-- Text in menu + Button in the main Help dialog -->
@@ -259,14 +259,14 @@
    <!-- Downloaded maps list header -->
    <string name="downloader_downloaded_subtitle">Letöltve</string>
    <!-- Country queued for download -->
-    <string name="downloader_queued">Várólistához adva</string>
+    <string name="downloader_queued">Sorbaállítva</string>
    <string name="downloader_near_me_subtitle">A közelben</string>
    <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
    <string name="downloader_status_maps">Térképek</string>
    <string name="downloader_download_all_button">Összes letöltése</string>
    <string name="downloader_downloading">Letöltés:</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">A térkép törléséhez állítsa le a navigációt</string>
+    <string name="downloader_delete_map_while_routing_dialog">Állítsa le a navigációt a térkép törléséhez.</string>
    <!-- PointsInDifferentMWM -->
    <string name="routing_failed_cross_mwm_building">Útvonalakat csak akkor lehet készíteni, ha teljesen rajta vannak egy térképen.</string>
    <!-- Context menu item for downloader. -->
@@ -278,9 +278,9 @@
    <!-- Item in context menu. -->
    <string name="downloader_update_map">Térkép frissítése</string>
    <!-- Preference title -->
-    <string name="google_play_services">Google helymeghatározási szolgáltatás</string>
+    <string name="google_play_services">Google Play helymeghatározási szolgáltatások</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">A Google szolgáltatása, amely a GPS, a Wi-Fi, a mobilhálózatok stb. kombinálásával határozza meg az Ön tartózkodási helyét. Ez csatlakozik a Google szervereihez, és adatokat gyűjt Önről.</string>
+    <string name="pref_use_google_play">Bluetooth, Wi-Fi vagy mobilhálózat segítségével gyorsan meghatározhatja hozzávetőleges tartózkodási helyét</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -338,18 +338,18 @@
    <string name="dialog_routing_location_turn_on">Engedélyezze a helymeghatározási szolgáltatásokat</string>
    <string name="dialog_routing_location_unknown_turn_on">A jelenlegi GPS-koordináták nem találhatók. Engedélyezze a helymeghatározási szolgáltatásokat az útvonal kiszámításához.</string>
    <string name="dialog_routing_unable_locate_route">Nem sikerült meghatározni az útvonalat</string>
-    <string name="dialog_routing_cant_build_route">Nem lehet létrehozni az útvonalat</string>
+    <string name="dialog_routing_cant_build_route">Nem lehet létrehozni az útvonalat.</string>
    <string name="dialog_routing_change_start_or_end">Pontosítsa a kiindulópontot vagy a célállomást.</string>
    <string name="dialog_routing_change_start">Pontosítsa a kiindulópontot</string>
    <string name="dialog_routing_start_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a kiindulópontot.</string>
    <string name="dialog_routing_select_closer_start">Válasszon egy, az úthoz közelebb eső kiindulópontot.</string>
    <string name="dialog_routing_change_end">Pontosítsa célállomását</string>
    <string name="dialog_routing_end_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a célállomást.</string>
-    <string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást</string>
-    <string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet</string>
-    <string name="dialog_routing_intermediate_not_determined">Kérem, állítsa be a köztes helyet</string>
+    <string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást.</string>
+    <string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet.</string>
+    <string name="dialog_routing_intermediate_not_determined">Módosítsa a köztes helyet.</string>
    <string name="dialog_routing_system_error">Rendszerhiba</string>
-    <string name="dialog_routing_application_error">Az alkalmazás hibája miatt nem lehet létrehozni az útvonalat</string>
+    <string name="dialog_routing_application_error">Nem lehet létrehozni az útvonalat egy alkalmazáshiba miatt.</string>
    <string name="dialog_routing_try_again">Próbálja meg újra</string>
    <string name="not_now">Most nem</string>
    <string name="dialog_routing_download_and_build_cross_route">Szeretné letölteni a térképet, és egynél több térképen átívelő, optimálisabb útvonalat létrehozni?</string>
@@ -363,17 +363,17 @@
    <string name="hide">Elrejtés</string>
    <string name="categories">Kategóriák</string>
    <string name="history">Előzmények</string>
-    <string name="search_not_found">Hoppá, nincs találat</string>
+    <string name="search_not_found">Nincs eredmény.</string>
    <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg egy közeli város vagy település nevét hozzáadni.</string>
+    <string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg hozzáadni egy közeli város vagy település nevét.</string>
    <string name="search_history_title">Keresési előzmények</string>
-    <string name="search_history_text">Legutóbbi keresések megtekintése</string>
+    <string name="search_history_text">Legutóbbi keresések megtekintése.</string>
    <string name="clear_search">A keresési előzmények törlése</string>
    <string name="p2p_your_location">Saját tartózkodási hely</string>
    <string name="p2p_start">Indítás</string>
    <string name="p2p_from_here">Kiindulópont</string>
    <string name="p2p_to_here">Célpont</string>
-    <string name="p2p_only_from_current">Navigáció csak a jelenlegi tartózkodási helyétől indítható</string>
+    <string name="p2p_only_from_current">A navigáció csak a jelenlegi tartózkodási helyétől érhető el.</string>
    <string name="p2p_reroute_from_current">Szeretne útvonalat tervezni a jelenlegi tartózkodási helyétől?</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Következő</string>
@@ -408,6 +408,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Ma zárva</string>
    <string name="day_off">Zárva</string>
+    <string name="today">Ma</string>
    <string name="closed">Zárva</string>
    <string name="edit_opening_hours">Nyitvatartás szerkesztése</string>
    <string name="no_osm_account">Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen?</string>
@@ -436,14 +437,14 @@
    <!-- login text field -->
    <string name="email_or_username">E-mail-cím vagy felhasználónév</string>
    <string name="level">Szint</string>
-    <string name="downloader_delete_map_dialog">A térképpel együtt az Ön összes térképszerkesztése törlődik</string>
+    <string name="downloader_delete_map_dialog">Az összes térképszerkesztés törlődik a térképpel együtt.</string>
    <string name="downloader_update_maps">Térképek frissítése</string>
    <string name="downloader_mwm_migration_dialog">Az útvonal létrehozásához frissítenie kell az összes térképet, majd újra meg kell terveznie az útvonalat.</string>
    <string name="downloader_search_field_hint">Térkép keresése</string>
-    <string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az Ön készüléke csatlakozik az internethez</string>
+    <string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az eszköz csatlakozik az internethez.</string>
    <string name="downloader_no_space_title">Nincs elegendő tárhely</string>
    <string name="downloader_no_space_message">Törölje a felesleges adatokat</string>
-    <string name="editor_login_error_dialog">Bejelentkezési hiba</string>
+    <string name="editor_login_error_dialog">Bejelentkezési hiba.</string>
    <string name="editor_profile_changes">Jóváhagyott módosítások</string>
    <string name="editor_focus_map_on_location">Húzza a térképet, hogy a keresztet a hely vagy üzlet helyére helyezze.</string>
    <string name="editor_edit_place_title">Szerkesztés</string>
@@ -459,12 +460,12 @@
    <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
    <string name="osm_presentation">A közösségi OpenStreetMap adatok frissítésének időpontja: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
    <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen jobb térképet készíteni mindenki számára!</string>
-    <string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit</string>
+    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
+    <string name="login_to_make_edits_visible">Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára.</string>
    <!-- Downloaded 10 **of** 20 <- it is that "of" -->
    <string name="downloader_of">%1$d / %2$d</string>
    <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
-    <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat</string>
+    <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat.</string>
    <string name="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</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">Ez az épület legfeljebb %d emeletes lehet</string>
@@ -473,7 +474,7 @@
    <!-- Title for OSM note section in the editor -->
    <string name="editor_other_info">Megjegyzés az OpenStreetMap önkénteseinek (nem kötelező)</string>
    <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet a CoMaps segítségével szerkeszteni</string>
+    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet az CoMaps segítségével szerkeszteni</string>
    <!-- Information about OSM at the top of the editing page -->
    <string name="editor_about_osm">A szerkesztései feltöltődnek a nyilvános <a href="https://wiki.openstreetmap.org/wiki/Hu:Névjegy">OpenStreetMap</a> adatbázisba. Ne adjon hozzá személyes vagy szerzői jogvédelem alatt álló információkat.</string>
    <string name="editor_more_about_osm">További részletek az OpenStreetMap adatbázisról</string>
@@ -485,7 +486,7 @@
    <string name="editor_category_unsuitable_title">Nem találja a megfelelő kategóriát?</string>
    <string name="editor_category_unsuitable_text">Az CoMaps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href="https://www.comaps.app/support/advanced-map-editing/">útmutatónkat</a>.</string>
    <string name="downloader_no_downloaded_maps_title">Még nem töltött le térképet</string>
-    <string name="downloader_no_downloaded_maps_message">Térképek letöltése internetkapcsolat nélküli kereséshez és navigáláshoz</string>
+    <string name="downloader_no_downloaded_maps_message">Térkép letöltése offline kereséshez és navigáláshoz.</string>
    <!-- abbreviation for kilometers per hour -->
    <string name="kilometers_per_hour">km/h</string>
    <string name="miles_per_hour">mf/h</string>
@@ -509,8 +510,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Szeretné elküldeni az összes felhasználónak?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen magánjellegű vagy személyes adatokat</string>
-    <string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha bármilyen kérdésük van</string>
+    <string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen személyes információt.</string>
+    <string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha kérdéseik vannak.</string>
    <string name="navigation_stop_button">Megállítás</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Nyomvonal rögzítése</string>
@@ -524,10 +525,10 @@
    <string name="mobile_data_option_not_today">Ma ne használja</string>
    <string name="mobile_data">Mobilinternet</string>
    <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez mobilinternetre van szükség</string>
+    <string name="mobile_data_description">Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.</string>
    <string name="mobile_data_option_never">Soha ne használja</string>
    <string name="mobile_data_option_ask">Mindig kérdezzen rá</string>
-    <string name="traffic_update_maps_text">A forgalmi adatok megjelenítéséhez frissíteni kell a térképeket</string>
+    <string name="traffic_update_maps_text">Forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.</string>
    <string name="big_font">Betűméret növelése a térképen</string>
    <string name="traffic_update_app">Frissítse az CoMaps alkalmazást</string>
    <!-- "traffic" as in "road congestion" -->
@@ -537,7 +538,7 @@
    <string name="feedback_general">Általános visszajelzés</string>
    <string name="prefs_languages_information">Az CoMaps TTS-rendszert használ a hangnavigációhoz. Sok androidos eszköz használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
    <string name="prefs_languages_information_off">Egyes nyelveknél másik beszédszintetizátort vagy további nyelvi csomagot kell telepítenie az alkalmazás-áruházból (Google Play, Galaxy Store, App Gallery, FDroid). \nNyissa meg az eszköz beállításait → Nyelv és bevitel → Beszéd → Szöveg-beszéd átalakító kimenet. \nItt kezelheti a beszédszintézis beállításokat (például: nyelvi csomag letöltése a kapcsolat nélküli használathoz) és másik szövegfelolvasót jelölhet ki.</string>
-    <string name="prefs_languages_information_off_link">Ebben az útmutatóban további tájékoztatást talál</string>
+    <string name="prefs_languages_information_off_link">További tájékoztatást találhat még ebben az útmutatóban.</string>
    <string name="transliteration_title">Átírás latin betűkre</string>
    <string name="learn_more">Tudjon meg többet</string>
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -562,7 +563,7 @@
    </plurals>
    <string name="bookmarks_create_new_group">Új lista létrehozása</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Könyvjelzők és útvonalak importálása</string>
+    <string name="bookmarks_import">Könyvjelzők és nyomvonalak importálása</string>
    <string name="bookmarks_error_message_share_general">Nem lehet megosztani egy alkalmazáshiba miatt</string>
    <string name="bookmarks_error_title_share_empty">Megosztási hiba</string>
    <string name="bookmarks_error_message_share_empty">Üres lista nem osztható meg</string>
@@ -580,8 +581,8 @@
    </plurals>
    <string name="restore">Visszaállítás</string>
    <plurals name="tracks">
-        <item quantity="one">%d útvonal</item>
-        <item quantity="other">%d útvonal</item>
+        <item quantity="one">%d nyomvonal</item>
+        <item quantity="other">%d nyomvonal</item>
    </plurals>
    <!-- Settings privacy group in settings screen -->
    <string name="privacy">Adatvédelem</string>
@@ -607,11 +608,11 @@
    <!-- Speed camera settings menu option - Never warn (about speedcams) -->
    <string name="pref_tts_speedcams_never">Soha ne figyelmeztessen</string>
    <string name="power_managment_title">Energiatakarékos mód</string>
-    <string name="power_managment_description">Megpróbálja csökkenteni az energiafelhasználást bizonyos funkciók rovására</string>
+    <string name="power_managment_description">Próbálja meg csökkenteni az energiafelhasználást bizonyos funkciók rovására.</string>
    <string name="power_managment_setting_never">Soha</string>
    <string name="power_managment_setting_auto">Amikor az akkumulátor lemerül</string>
    <string name="power_managment_setting_manual_max">Mindig</string>
-    <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt a lehetőséget, akkor rögzítheti, és a „A CoMaps névjegye” képernyőn a „HIBA JELENTÉSE” gombra katintva elküldheti nekünk a hibával, problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
+    <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt az opciót, akkor a „Súgó” párbeszédpanel „Hibajelentés” menüpontjának használatával rögzítheti és kézzel küldheti el nekünk a problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
    <string name="driving_options_title">Útvonaltervezési beállítások</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_tolls">Díjköteles utak elkerülése</string>
@@ -753,7 +754,7 @@
    <string name="browser_not_available">A webböngésző nem érhető el</string>
    <string name="volume">Hangerő</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Az összes könyvjelző és útvonal exportálása</string>
+    <string name="bookmarks_export">Az összes könyvjelző és nyomvonal exportálása</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Beszédszintézis-beállítások</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -785,9 +786,9 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Rögzítés folytatása</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Elmenti a könyvjelzők és útvonalak közé?</string>
+    <string name="track_recording_alert_title">Elmenti a könyvjelzők és nyomvonalakba?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Az útvonal üres – nincs mit menteni</string>
+    <string name="track_recording_toast_nothing_to_save">A nyomvonal üres – nincs mit menteni</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
    <string name="error_no_file_manager_app">Nem lehet megjeleníteni a mappaválasztó párbeszédpanelt, mert nincs megfelelő alkalmazás telepítve az eszközén. Telepítsen egy fájlkezelő alkalmazást, és próbálja meg újra.</string>
    <string name="choose_color">Válasszon színt</string>
@@ -810,7 +811,7 @@
    <string name="facebook">Facebook</string>
    <string name="closes_in">Bezár %s múlva</string>
    <string name="opens_in">Kinyit %s múlva</string>
-    <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen</string>
+    <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen.</string>
    <string name="disk_error">Nem lehet mappát létrehozni és fájlokat áthelyezni az eszköz belső memóriájában vagy az SD-kártyán</string>
    <string name="disk_error_title">Lemezhiba</string>
    <string name="twitter">X (Twitter)</string>
@@ -836,49 +837,4 @@
    <string name="saved">Mentett</string>
    <string name="about_headline">Közösség által működtetett nyílt projekt</string>
    <string name="bluesky">Bluesky</string>
-    <string name="closed_now">Most zárva van</string>
-    <string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve %s</string>
-    <string name="hours_confirmed_time_ago">Ellenőrizve és megerősítve %s</string>
-    <string name="editor_level">Emelet (0 a földszint)</string>
-    <string name="error_enter_correct_level">Adja meg az emeletek számát</string>
-    <string name="editor_building_levels">Emeletek (beleértve a földszintet, kivéve a tetőt)</string>
-    <string name="error_enter_correct_fediverse_page">Adjon meg egy érvényes Mastodon felhasználónevet vagy webcímet</string>
-    <string name="osm_note_hint">Vagy írjon egy feljegyzést az OpenStreetMap közösségnek, hogy valaki más hozzáadhassa vagy kijavíthassa itt a helyet.</string>
-    <string name="error_enter_correct_bluesky_page">Adjon meg egy érvényes Bluesky felhasználónevet vagy webcímet</string>
-    <string name="osm_note_toast">A feljegyzés elküldésre kerül az OpenStreetMap közösséghez</string>
-    <string name="pref_left_button_disable">Letiltás</string>
-    <string name="codeberg">Codeberg</string>
-    <string name="pref_backup_now_summary_progress">A biztonsági mentés folyamatban van…</string>
-    <string name="pref_backup_now_summary">Készítsen biztonsági mentést most</string>
-    <string name="pref_backup_now_summary_ok">A biztonsági mentés sikeresen befejeződött</string>
-    <string name="pref_backup_now_summary_empty_lists">Nincsenek könyvjelzők és útvonalak a biztonsági mentéshez</string>
-    <string name="pref_backup_now_title">Biztonsági mentés most</string>
-    <string name="pref_backup_location_summary_initial">Válasszon ki egy mappát és adja meg az írási/olvasási engedélyt</string>
-    <string name="pref_left_button_title">A bal oldali gomb beállítása</string>
-    <string name="pref_backup_title">Könyvjelzők és útvonalak mentése</string>
-    <string name="pref_backup_summary">Automatikus biztonsági mentés az eszközön lévő mappába</string>
-    <string name="pref_backup_now_summary_folder_unavailable">A biztonsági mentés mappája nem elérhető</string>
-    <string name="pref_backup_status_summary_success">Az utolsó sikeres biztonsági mentés</string>
-    <string name="pref_backup_location_title">A biztonsági mentés mappája</string>
-    <string name="pref_backup_history_title">A megőrzendő biztonsági mentések száma</string>
-    <string name="backup_interval_every_week">Hetente</string>
-    <string name="pref_backup_interval_title">Automatikus biztonsági mentés</string>
-    <string name="backup_interval_every_day">Naponta</string>
-    <string name="pref_backup_now_summary_failed">Nem sikerült a biztonsági mentés</string>
-    <string name="backup_interval_manual_only">Ki (csak kézileg)</string>
-    <string name="dialog_report_error_missing_folder">A biztonsági mentés kiválasztott mappája nem érhető el, vagy nem írható. Válasszon másik mappát.</string>
-    <string name="at">ekkor: %s</string>
-    <string name="open_now">Most nyitva van</string>
-    <string name="delete_track_dialog_title">%s törlése?</string>
-    <string name="clear">Törlés</string>
-    <string name="route_type">Az útvonal típusa</string>
-    <string name="vehicle">Gépjármű</string>
-    <string name="pedestrian">Gyalogos</string>
-    <string name="bicycle">Kerékpár</string>
-    <string name="ruler">Vonalzó</string>
-    <string name="bookmark_color">A könyvjelző színe</string>
-    <string name="about_help">Névjegy és segítség</string>
-    <string name="share_track">Útvonal megosztása</string>
-    <string name="pref_tts_no_system_tts_short">Nem található szövegfelovasási szolgáltatás (TTS), ellenőrizze az alkalmazás beállításait a „Hangutasítások” müpontban</string>
-    <string name="dialog_report_error_with_logs">Kérjük, küldjön hibajelentést:\n - „Naplózás engedélyezése” a beállításokban\n - reprodukálja a hibát, problémát\n - „A CoMaps névjegye” képernyőn nyomja meg a „HIBA JELENTÉSE” gombot, és küldje el e-mailben vagy chaten keresztül.\n - naplózás kikapcsolása</string>
 </resources>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -402,6 +402,7 @@
    <string name="twentyfour_seven">siang dan malam</string>
    <string name="day_off_today">Tutup hari ini</string>
    <string name="day_off">Tutup</string>
+    <string name="today">Hari ini</string>
    <string name="closed">Tutup</string>
    <string name="edit_opening_hours">Sunting jam kerja</string>
    <string name="no_osm_account">Tidak ada akun di OpenStreetMap?</string>
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -45,6 +45,7 @@
    <string name="daily">Daglega</string>
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Lokað í dag</string>
+    <string name="today">Í dag</string>
    <string name="opens_in">Opnar eftir %s</string>
    <string name="closes_in">Lokar eftir %s</string>
    <string name="closed">Lokað</string>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -36,24 +36,24 @@
    <string name="try_again">Riprova</string>
    <string name="about_menu_title">Informazioni su CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Progetto aperto e sviluppato dalla comunità</string>
+    <string name="about_headline">Progetto Aperto e sviluppato dalla comunità</string>
    <!-- Text in About screen -->
    <string name="about_proposition_1">• Facile da usare e curata</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Attenta alla Privacy e senza pubblicità</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Utilizzabile senza connessione, veloce e occupa poco spazio</string>
+    <string name="about_proposition_3">• Usabile senza connessione, veloce e occupa poco spazio</string>
    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Applicazione open-source, senza scopo di lucro e trasparente nel processo decisionale e nella gestione delle finanze.</string>
+    <string name="about_developed_by_enthusiasts">Applicazione open-source, senza scopo di lucro e trasparente nel processo decisionale e nelle gestione delle finanze.</string>
    <!-- The button that opens system location settings -->
    <string name="location_settings">Impostazioni della posizione</string>
    <string name="close">Chiudi</string>
    <string name="unsupported_phone">L\'app necessita di OpenGL con accelerazione hardware. Purtroppo, il tuo dispositivo non è supportato.</string>
    <string name="download">Scarica</string>
    <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda SD per poter utilizzare CoMaps</string>
+    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda di memoria per poter utilizzare CoMaps</string>
    <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/memoria USB per utilizzare l\'app</string>
+    <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/ memoria USB per utilizzare l\'app</string>
    <string name="download_resources">Prima di iniziare è necessario scaricare la mappa generale del mondo sul tuo dispositivo. \nLa dimensione del download è di %s.</string>
    <string name="download_resources_continue">Vai alla mappa</string>
    <string name="downloading_country_can_proceed">Sto scaricando %1$s (%2$s). Ora puoi \nprocedere con la mappa.</string>
@@ -117,11 +117,11 @@
    <!-- Search category for entertainment; any changes should be duplicated in categories.txt @category_entertainment! -->
    <string name="category_entertainment">Intrattenimento</string>
    <!-- Search category for ATMs; any changes should be duplicated in categories.txt @category_atm! -->
-    <string name="category_atm">Bancomat ATM</string>
+    <string name="category_atm">Bancomat</string>
    <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
    <string name="category_nightlife">Vita notturna</string>
    <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Vacanza in famiglia</string>
+    <string name="category_children">Divertimento in famiglia</string>
    <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
    <string name="category_bank">Banca</string>
    <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -139,7 +139,7 @@
    <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
    <string name="category_water">Acqua</string>
    <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
-    <string name="category_rv">Struttura per camper</string>
+    <string name="category_rv">Per camper</string>
    <!-- SECTION: Other translations -->
    <!-- Notes field in Bookmarks view -->
    <string name="description">Informazioni</string>
@@ -159,7 +159,7 @@
    <!-- resource for context menu -->
    <string name="edit">Modifica</string>
    <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">La tua posizione non è stata ancora stabilita</string>
+    <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>
    <!-- Alert message that downloading is in progress. -->
@@ -232,7 +232,7 @@
    <!-- Text in About menu, opens CoMaps news website -->
    <string name="news">Notizie</string>
    <!-- Settings: Send feedback button and dialog title -->
-    <string name="feedback">Opinioni</string>
+    <string name="feedback">Feedback</string>
    <!-- Text in menu -->
    <string name="rate_the_app">Vota l\'app</string>
    <!-- Text in menu -->
@@ -242,7 +242,7 @@
    <!-- Button in the main menu -->
    <string name="donate">Dona</string>
    <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Volontariato e migliorare CoMaps</string>
+    <string name="how_to_support_us">Sostieni il progetto</string>
    <!-- Button in the main Help dialog -->
    <string name="copyright">Copyright</string>
    <!-- Text in menu + Button in the main Help dialog -->
@@ -325,7 +325,7 @@
    <!-- gray color -->
    <string name="gray">Grigio</string>
    <!-- blue gray color -->
-    <string name="blue_gray">Grigio azzurro</string>
+    <string name="blue_gray">Grigiazzurro</string>
    <!-- SECTION: Routing dialogs strings -->
    <string name="dialog_routing_disclaimer_title">Quando segui il percorso, ricorda che:</string>
    <string name="dialog_routing_disclaimer_priority">— Le condizioni stradali, il codice della strada e la segnaletica hanno sempre la precedenza sulle indicazioni del navigatore;</string>
@@ -411,6 +411,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Oggi chiuso</string>
    <string name="day_off">Chiuso</string>
+    <string name="today">Oggi</string>
    <string name="opens_in">Apre tra %s</string>
    <string name="closes_in">Chiude tra %s</string>
    <string name="closed">Chiuso</string>
@@ -885,9 +886,4 @@
    <string name="at">alle %s</string>
    <string name="osm_note_hint">In alternativa lascia una nota per la community di OpenStreetMap, così un altro utente potrà aggiungere o sistemare questo posto.</string>
    <string name="osm_note_toast">La nota verrà mandata a OpenStreetMap</string>
-    <string name="hours_confirmed_time_ago">Confermato %s</string>
-    <string name="existence_confirmed_time_ago">Esistenza confermata %s</string>
-    <string name="share_track">Traccia condivisa</string>
-    <string name="delete_track_dialog_title">Eliminare %s?</string>
-    <string name="pref_tts_no_system_tts_short">Motore testo - parlato non trovato, controlla le impostazioni dell\'app</string>
 </resources>
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -409,6 +409,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">סגור היום</string>
    <string name="day_off">סגור</string>
+    <string name="today">היום</string>
    <string name="opens_in">נפתח עוד %s</string>
    <string name="closes_in">נסגר עוד %s</string>
    <string name="closed">סגור</string>
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -419,6 +419,7 @@
    <string name="twentyfour_seven">昼と夜</string>
    <string name="day_off_today">本日終業</string>
    <string name="day_off">終業</string>
+    <string name="today">今日は</string>
    <string name="opens_in">あと %s に営業</string>
    <string name="closes_in">あと %s に閉店</string>
    <string name="closed">閉店</string>
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -402,6 +402,7 @@
    <string name="twentyfour_seven">24 시간</string>
    <string name="day_off_today">오늘 영업 종료됨</string>
    <string name="day_off">종료됨</string>
+    <string name="today">오늘</string>
    <string name="closed">닫음</string>
    <string name="edit_opening_hours">영업일 편집</string>
    <string name="no_osm_account">OpenStreetMap에서 계정이 없습니까?</string>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -403,6 +403,7 @@
    <string name="twentyfour_seven">24×7</string>
    <string name="day_off_today">Šiandien uždaryta</string>
    <string name="day_off">Uždaryta</string>
+    <string name="today">Šiandien</string>
    <string name="opens_in">Atsidaro už %s</string>
    <string name="closes_in">Užsidaro už %s</string>
    <string name="closed">Uždaryta</string>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -415,6 +415,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Šodien slēgts</string>
    <string name="day_off">Slēgts</string>
+    <string name="today">Šodien</string>
    <string name="opens_in">Atveras pēc %s</string>
    <string name="closes_in">Slēgts pēc %s</string>
    <string name="closed">Slēgts</string>
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -395,6 +395,7 @@
    <string name="twentyfour_seven">२४/७</string>
    <string name="day_off_today">आज बंद</string>
    <string name="day_off">बंद</string>
+    <string name="today">आज</string>
    <string name="closed">बंद</string>
    <string name="edit_opening_hours">व्यवसायाची वेळ संपादित करा</string>
    <string name="no_osm_account">OpenStreetMap खाते नाही?</string>
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -474,6 +474,7 @@
    <string name="yes">Iva</string>
    <string name="no">Le</string>
    <string name="editor_osm_notes">In-noti tad-dejta tal-mappa tiegħek</string>
+    <string name="today">Illum</string>
    <string name="social_media">Midja Soċjali</string>
    <string name="downloader_update_maps">Aġġorna l-Mapep</string>
    <string name="error_enter_correct_facebook_page">Daħħal indirizz tal-web, kont, jew isem tal-paġna validu ta ’Facebook</string>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -415,6 +415,7 @@
    <string name="twentyfour_seven">Dag og natt</string>
    <string name="day_off_today">Fridag i dag</string>
    <string name="day_off">Fridag</string>
+    <string name="today">I dag</string>
    <string name="opens_in">Åpner om %s</string>
    <string name="closes_in">Stenger om %s</string>
    <string name="closed">Stengt</string>
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ b/android/app/src/main/res/values-night-v27/themes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+</resources>
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Night theme -->
+    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+        <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
+        <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
+        <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+        <item name="android:textColorPrimary">@color/text_light</item>
+        <item name="android:textColorPrimaryInverse">@color/text_dark</item>
+        <item name="android:textColorSecondary">@color/text_light_subtitle</item>
+        <item name="android:windowBackground">?windowBackgroundForced</item>
+        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+        <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:fontFamily">@string/robotoRegular</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="clickableBackground">?selectableItemBackground</item>
+        <item name="android:statusBarColor">?colorPrimary</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+
+        <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
+        <item name="windowBackgroundForced">@color/bg_window_night</item>
+        <item name="cardBackground">@color/bg_cards_night</item>
+        <item name="titleDialogTheme">@color/white_primary</item>
+        <item name="textDialogTheme">@color/white_secondary</item>
+        <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="colorControlNormal">?secondary</item>
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
+        <item name="colorAccentTransparent">@color/base_accent_transparent</item>
+        <item name="colorBtnHighlight">@color/white_24</item>
+        <item name="panel">@color/bg_panel_night</item>
+        <item name="colorLogo">@color/base_accent_night</item>
+        <item name="iconTint">@color/white_secondary</item>
+        <item name="iconTintDisabled">@color/white_12</item>
+        <item name="iconTintActive">@color/yellow</item>
+        <item name="iconTintLight">@color/icon_tint_light_night</item>
+
+        <item name="secondary">@color/text_light_hint</item>
+        <item name="dividerHorizontal">@color/divider_night</item>
+
+        <item name="ppBackground">@color/bg_cards_night</item>
+        <item name="ppButtonsBackground">@color/bg_window_night</item>
+        <item name="ppFloatingMarkerIconColor">@color/white_54</item>
+
+        <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
+        <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
+        <item name="navLanesBackgroundColor">@color/base_accent_night</item>
+        <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
+        <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
+
+        <item name="buttonBackground">@drawable/button_night</item>
+        <item name="buttonTextColor">@color/button_text_night</item>
+        <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
+        <item name="buttonDialogTextColor">@color/base_accent_night</item>
+
+        <item name="accentButtonBackground">@drawable/button_accent_night</item>
+        <item name="accentButtonTextColor">@color/button_accent_text_night</item>
+        <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
+                   accentButtonTextColor selector -->
+        <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
+
+        <item name="primaryButtonBackground">@drawable/button_accent_night</item>
+
+        <item name="menuBackground">@color/bg_menu_night</item>
+
+        <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
+        <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
+        <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
+
+        <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
+        <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
+        <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
+        <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
+
+        <item name="routingButtonHint">@color/routing_button_tint</item>
+
+        <item name="android:listDivider">@drawable/list_divider_night</item>
+
+        <item name="transitPedestrianBackground">@color/white_4</item>
+        <item name="transitRulerBackground">@color/white_4</item>
+        <item name="transitStepDivider">@drawable/dot_divider_night</item>
+        <item name="accentColorSelector">@color/accent_color_selector_night</item>
+        <item name="android:textAppearance">@style/TextAppearance</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+        <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+        <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+        <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+        <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+        <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+        <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+        <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+        <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+        <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+        <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+        <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+        <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+        <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+        <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
+        <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
+        <item name="elevationProfilePropIconTint">@color/white_secondary</item>
+        <item name="altitudeBg">@drawable/bg_altitude_night</item>
+        <item name="elevationProfileAxisLabelColor">@color/white_54</item>
+        <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
+        <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
+        <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
+        <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
+        <item name="elevationProfileColor">@color/elevation_profile_dark</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
+
+        <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+        <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
+    </style>
+
+    <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
+
+    <style name="MwmTheme.Night.Splash">
+        <item name="android:windowBackground">@color/bg_primary_night</item>
+        <item name="android:textColorPrimary">@color/white_primary</item>
+        <item name="android:navigationBarColor">@color/bg_primary_night</item>
+        <item name="android:statusBarColor">@color/bg_primary_night</item>
+    </style>
+
+    <!-- Theme is overridden in v27 folder to handle cutouts -->
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+    </style>
+
+    <style name="MwmTheme.Night.CardBg">
+        <item name="android:windowBackground">@color/bg_cards_night</item>
+    </style>
+
+
+    <style name="MwmTheme.Night.WindowBg">
+        <item name="android:windowBackground">@color/bg_window_night</item>
+    </style>
+
+    <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">?buttonDialogTextColor</item>
+        <item name="colorSecondary">?buttonDialogTextColor</item>
+        <item name="colorPrimary">?buttonDialogTextColor</item>
+        <item name="android:background">?cardBackground</item>
+        <!-- Used for the message in the dialog -->
+        <item name="android:textColorPrimary">?textDialogTheme</item>
+        <item name="android:textSize">@dimen/text_size_body_1</item>
+        <!-- Used for the title in the dialog -->
+        <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
+    </style>
+
+    <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
+        <item name="android:textColor">?titleDialogTheme</item>
+    </style>
+
+    <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+        <item name="android:colorPrimaryDark">?statusBar</item>
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="colorPrimaryVariant">?statusBar</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
+        <item name="clickableBackground">?selectableItemBackground</item>
+        <item name="colorControlNormal">@color/text_dark_hint</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:textColorHint">@color/text_light_hint</item>
+        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:fontFamily">@string/robotoRegular</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
+    </style>
+
+    <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
+        <item name="colorPrimary">?buttonDialogTextColor</item>
+        <item name="android:fontFamily">@string/robotoMedium</item>
+        <item name="android:windowBackground">@color/bg_cards_night</item>
+        <item name="android:background">@color/bg_cards_night</item>
+    </style>
+
+    <style name="MwmTheme.Downloader.Night">
+        <item name="status_done">@drawable/downloader_done_night</item>
+        <item name="status_downloadable">@drawable/downloader_download_night</item>
+        <item name="status_folder">@drawable/downloader_folder_night</item>
+        <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
+    </style>
+
+    <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
+        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+    </style>
+
+    <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
+        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
+    </style>
+
+    <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
+        <item name="iconTint">@color/black_primary</item>
+    </style>
+
+    <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
+        <item name="android:popupBackground">?windowBackgroundForced</item>
+    </style>
+</resources>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -72,7 +72,7 @@
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
    <string name="bookmarks">Bladwijzers</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
+    <string name="bookmarks_and_tracks">Bladwijzers en tracks</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Naam</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -413,6 +413,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Vandaag gesloten</string>
    <string name="day_off">Gesloten</string>
+    <string name="today">Vandaag</string>
    <string name="opens_in">Opent over %s</string>
    <string name="closes_in">Sluit over %s</string>
    <string name="closed">Gesloten</string>
@@ -554,7 +555,7 @@
    <!-- Settings: "Send general feedback" button -->
    <string name="feedback_general">Algemene feedback</string>
    <string name="prefs_languages_information">We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak processor selecteren.</string>
+    <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak engine selecteren.</string>
    <string name="prefs_languages_information_off_link">Gelieve deze handleiding te lezen voor meer informatie</string>
    <string name="transliteration_title">Transliteratie in het Latijnse alfabet</string>
    <string name="learn_more">Meer informatie</string>
@@ -886,7 +887,4 @@
    <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
    <string name="share_track">Spoor delen</string>
    <string name="delete_track_dialog_title">%s verwijderen?</string>
-    <string name="existence_confirmed_time_ago">Bestaan bevestigd %s</string>
-    <string name="hours_confirmed_time_ago">Bevestigd %s</string>
-    <string name="pref_tts_no_system_tts_short">Geen tekst-naar-spraak processor gevonden, controleer de app-instellingen</string>
 </resources>
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -417,6 +417,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Dziś nieczynne</string>
    <string name="day_off">Nieczynne</string>
+    <string name="today">Dzisiaj</string>
    <string name="opens_in">Otwarcie za %s</string>
    <string name="closes_in">Zamknięcie za %s</string>
    <string name="closed">Zamknięte</string>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -25,7 +25,7 @@
    <!-- Location services are disabled by user alert - message -->
    <string name="location_is_disabled_long_text">No momento, todos os Serviços de Localização deste dispositivo ou aplicativo estão desativados. Ative-os nas 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 -->
@@ -159,9 +159,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">Desculpe, as configurações de armazenamento de mapas estão desabilitadas no momento</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 mapa está em andamento</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 -->
@@ -211,7 +211,7 @@
    <!-- Settings «Route» category: «Test Voice Directions» title -->
    <string name="pref_tts_test_voice_title">Testar orientação por voz</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 do sistema de conversão de texto em fala 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>
@@ -249,7 +249,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">Para apagar o mapa, pare a navegação</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. -->
@@ -376,6 +376,7 @@
    <string name="twentyfour_seven">24 horas por dia</string>
    <string name="day_off_today">Fechado hoje</string>
    <string name="day_off">Fechado</string>
+    <string name="today">Hoje</string>
    <string name="opens_in">Abre em %s</string>
    <string name="closes_in">Fecha em %s</string>
    <string name="closed">Fechado</string>
@@ -436,12 +437,12 @@
    <string name="error_enter_correct_zip_code">Insira um CEP válido</string>
    <!-- Information about OSM at the top of the editing page -->
    <string name="editor_about_osm">As suas edições são enviadas à base de dados pública <a href="https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap">OpenStreetMap</a>. Não adicione informações pessoais ou protegidas por direitos autorais.</string>
-    <string name="editor_more_about_osm">Mais sobre o OpenStreetMap</string>
+    <string name="editor_more_about_osm">Mais sobre OpenStreetMap</string>
    <string name="editor_osm_history">Seu histórico de edição</string>
    <string name="editor_osm_notes">Suas notas de dados do mapa</string>
-    <string name="editor_category_unsuitable_title">Não encontra uma categoria adequada?</string>
+    <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 baixou nenhum mapa</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 e navegar offline</string>
    <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
    <!-- abbreviation for kilometers per hour -->
@@ -570,7 +571,7 @@
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_tolls">Evitar pedágios</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">Evitar não pavimentadas</string>
+    <string name="avoid_unpaved">Evitar não-pavimentadas</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_ferry">Evitar balsas</string>
    <string name="avoid_motorways">Evitar rodovias</string>
@@ -579,7 +580,7 @@
    <string name="define_to_avoid_btn">Definir as estradas a serem evitadas</string>
    <string name="change_driving_options_btn">Opções de direção ativadas</string>
    <string name="toll_road">Pedágio</string>
-    <string name="unpaved_road">Via não pavimentada</string>
+    <string name="unpaved_road">Pista não pavimentada</string>
    <string name="ferry_crossing">Balsa</string>
    <!-- A generic "Yes" button in dialogs -->
    <string name="yes">Sim</string>
@@ -767,7 +768,7 @@
    <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="editor_time_from">De</string>
-    <string name="how_to_support_us">Voluntarie-se e melhore o CoMaps</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>
    <string name="editor_time_title">Horário de funcionamento</string>
    <string name="long_tap_toast">Dê um toque longo no mapa novamente para ver a interface</string>
@@ -855,7 +856,7 @@
    <string name="backup_interval_manual_only">Desligado (apenas manual)</string>
    <string name="dialog_report_error_missing_folder">A localização de backup selecionada está indisponível ou não permite escrita. Por favor, selecione outra localização.</string>
    <string name="dialog_report_error_with_logs">Por favor, nos envie um relatório de erro:\n - Habilite \"Ativar registros de execução\" nas configurações\n - reproduza o problema\n - na tela \"Sobre &amp; Ajuda\", pressione o botão \"Relatar um problema\" e envie via email ou chat\n - desative os registros de execução</string>
-    <string name="panoramax">Imagem do Panoramax</string>
+    <string name="panoramax">Imagem Panoramax</string>
    <string name="open_now">Aberto agora</string>
    <string name="closed_now">Fechado agora</string>
    <string name="at">às %s</string>
@@ -863,7 +864,4 @@
    <string name="osm_note_toast">A nota será enviada ao OpenStreetMap</string>
    <string name="delete_track_dialog_title">Apagar %s?</string>
    <string name="share_track">Compartilhar trilha</string>
-    <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
-    <string name="hours_confirmed_time_ago">Confirmado %s</string>
-    <string name="pref_tts_no_system_tts_short">Nenhum mecanismo de conversão de texto em voz encontrado, verifique as configurações do aplicativo</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -411,6 +411,7 @@
    <string name="twentyfour_seven">24 horas por dia</string>
    <string name="day_off_today">Fechado hoje</string>
    <string name="day_off">Fechado</string>
+    <string name="today">Hoje</string>
    <string name="closed">Fechado</string>
    <string name="edit_opening_hours">Editar horário de funcionamento</string>
    <string name="no_osm_account">Não tem uma conta no OpenStreetMap?</string>
@@ -879,7 +880,4 @@
    <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
    <string name="share_track">Partilhar Trajeto</string>
    <string name="delete_track_dialog_title">Apagar %s?</string>
-    <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
-    <string name="hours_confirmed_time_ago">Confirmado %s</string>
-    <string name="pref_tts_no_system_tts_short">Nenhuma máquina de ‘text-to-speech’ foi encnotrada, verifique as definições da aplicação</string>
 </resources>
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -409,6 +409,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Închis astăzi</string>
    <string name="day_off">Închis</string>
+    <string name="today">Azi</string>
    <string name="opens_in">Deschide în %s</string>
    <string name="closes_in">Închide în %s</string>
    <string name="closed">Închis</string>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -167,7 +167,7 @@
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
    <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">Смотри где я сейчас! Жми %1$s или %2$s Нету автономных карт? Скачай тут https://www.comaps.app/download/</string>
    <!-- Subject for emailed bookmark -->
@@ -248,7 +248,7 @@
    <!-- Button in the main menu -->
    <string name="donate">Поддержать деньгами</string>
    <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Помочь и улучшить CoMaps</string>
+    <string name="how_to_support_us">Помочь проекту</string>
    <!-- Button in the main Help dialog -->
    <string name="copyright">Копирайт</string>
    <!-- Text in menu + Button in the main Help dialog -->
@@ -273,7 +273,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. -->
@@ -345,18 +345,18 @@
    <string name="dialog_routing_location_turn_on">Включите режим определения геопозиции</string>
    <string name="dialog_routing_location_unknown_turn_on">Текущая геопозиция не определена. Для построения маршрута включите режим определения геопозиции.</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>
@@ -417,6 +417,7 @@
    <string name="twentyfour_seven">Круглосуточно</string>
    <string name="day_off_today">Сегодня закрыто</string>
    <string name="day_off">Закрыто</string>
+    <string name="today">Сегодня</string>
    <string name="opens_in">Открывается через %s</string>
    <string name="closes_in">Закроется через %s</string>
    <string name="closed">Закрыто</string>
@@ -456,7 +457,7 @@
    <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>
@@ -476,11 +477,11 @@
    <string name="osm_presentation">Созданные сообществом данные OpenStreetMap по состоянию на %s. Узнайте больше о том, как редактировать и обновлять карту на сайте OpenStreetMap.org</string>
    <!-- OSM explanation on Android login screen -->
    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - это открытый проект сообщества по созданию бесплатной карты. Он является основным источником картографических данных в CoMaps и работает как Википедия. Кто угодно может добавлять или редактировать места, которые позже увидят миллионы пользователей по всему миру. \nПрисоединяйтесь к сообществу и помогите сделать лучшую карту для всех!</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>
@@ -501,7 +502,7 @@
    <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="downloader_no_downloaded_maps_message">Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета.</string>
    <string name="current_location_unknown_error_title">Текущее местоположение неизвестно</string>
    <!-- abbreviation for kilometers per hour -->
    <string name="kilometers_per_hour">км/ч</string>
@@ -534,7 +535,7 @@
    <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_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.</string>
    <string name="navigation_stop_button">Cтоп</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Запись трека</string>
@@ -548,10 +549,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" -->
@@ -637,7 +638,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>
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -413,6 +413,7 @@
    <string name="twentyfour_seven">Deň a noc</string>
    <string name="day_off_today">Dnes deň voľna</string>
    <string name="day_off">Zatvorené</string>
+    <string name="today">Dnes</string>
    <string name="opens_in">Otvoria o %s</string>
    <string name="closes_in">Zatvoria o %s</string>
    <string name="closed">Zatvorené</string>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -410,6 +410,7 @@
    <string name="twentyfour_seven">24/7</string>
    <string name="day_off_today">Данас не ради</string>
    <string name="day_off">Затворено</string>
+    <string name="today">Данас</string>
    <string name="opens_in">Отвара се за %s</string>
    <string name="closes_in">Затвара се за %s</string>
    <string name="closed">Затворено</string>
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -402,6 +402,7 @@
    <string name="twentyfour_seven">Dygnet runt</string>
    <string name="day_off_today">Stängt idag</string>
    <string name="day_off">Stängt</string>
+    <string name="today">Idag</string>
    <string name="closed">Stängt</string>
    <string name="edit_opening_hours">Redigera öppettider</string>
    <string name="no_osm_account">Inget konto hos OpenStreetMap?</string>
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -402,6 +402,7 @@
    <string name="twentyfour_seven">ทั้งกลางวันและกลางคืน</string>
    <string name="day_off_today">วันนี้ปิด</string>
    <string name="day_off">ปิด</string>
+    <string name="today">วันนี้</string>
    <string name="closed">ปิด</string>
    <string name="edit_opening_hours">แก้ไขชั่วโมงทำการ</string>
    <string name="no_osm_account">ไม่มีบัญชีใน OpenStreetMap?</string>
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -413,6 +413,7 @@
    <string name="twentyfour_seven">7/24</string>
    <string name="day_off_today">Bugün kapalı</string>
    <string name="day_off">Kapalı</string>
+    <string name="today">Bugün</string>
    <string name="opens_in">%s sonra açılıyor</string>
    <string name="closes_in">%s sonra kapanıyor</string>
    <string name="closed">Kapalı</string>
@@ -843,7 +844,7 @@
    <string name="app_site_url">https://comaps.app/tr/</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="codeberg">Codeberg</string>
-    <string name="telegram_url">https://t.me/CoMaps_TR</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="pref_left_button_title">Sol alt tuş ataması</string>
    <string name="pref_left_button_disable">Devre dışı</string>
    <string name="error_enter_correct_fediverse_page">Gireceğiniz Mastodon kullanıcı adı ve adresi halihazırda mevcut olmalı</string>
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -417,6 +417,7 @@
    <string name="twentyfour_seven">Цілодобово</string>
    <string name="day_off_today">Сьогодні зачинено</string>
    <string name="day_off">Зачинено</string>
+    <string name="today">Сьогодні</string>
    <string name="opens_in">Відкривається через %s</string>
    <string name="closes_in">Зачиняється через %s</string>
    <string name="closed">Зачинено</string>
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -9,12 +9,4 @@
    <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
    <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
  </style>
-  <style name="MwmTheme.Night.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
-    <item name="colorPrimaryVariant">@android:color/black</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-    <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
-    <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-  </style>
 </resources>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত`
				`@@ -1 +0,0 @@`
				`কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং`
				`@@ -0,0 +1 @@`
				`সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত`
				`@@ -0,0 +1 @@`
				`কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ`
				`@@ -0,0 +1 @@`
				`Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate`
				`@@ -1 +0,0 @@`
				`CoMaps - Gå tur, sykkel, kjør - med personvern`
				`@@ -0,0 +1 @@`
				`Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos`
				`@@ -0,0 +1 @@`
				`CoMaps - Mapas e Navegação - Offline e Privada`