[fdroid] Release version 2025.06.10-4

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2026-01-07 13:03:54 +00:00 · 2025-06-10 21:15:28 +07:00
395 changed files with 15819 additions and 15925 deletions
--- a/README.md
+++ b/README.md
@@ -29,16 +29,16 @@

 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org) data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.

-There are apps for Android and iOS (and ARM MacOS).
-An alpha Linux / MacOS Qt desktop version, which is also suitable for Linux phones.
+There are apps for Android and iOS (and ARM macOS).
+An alpha linux / macOS Qt desktop version, which is also suitable for linux phones.

-The June app release is available on Google Play, F-Droid and as an APK to download now! We are working on publishing in the iOS App Store as well, please stay tuned!
+The first app release is available as an APK download now! We are still working on publishing on F-Droid, Google Play Store and iOS App Store as well, please stay tuned!

 <!--
 [<img src="docs/badges/apple-appstore.png" alt="App Store" width="160">](https://apps.apple.com/app/comaps/id1567437057)
+[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.comaps)
+[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.comaps/)
 -->
-[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.comaps.google)
-[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.comaps.fdroid/)
 [<img src="docs/badges/codeberg.png" alt="Codeberg" width="160">](https://codeberg.org/comaps/comaps/releases)

 <p float="left">
@@ -52,7 +52,7 @@ The June app release is available on Google Play, F-Droid and as an APK to downl

 **Respecting Privacy**: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.

-**Simple and Polished**: Essential, easy to use features that just work.
+**Simple and Polished**: essential easy to use features that just work.

 **Saves Your Battery and Space**: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -169,7 +169,6 @@ android {

    fdroid {
      dimension 'default'
-      applicationIdSuffix '.fdroid'
      versionName = android.defaultConfig.versionName + '-FDroid'
      buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@comaps.app"'
    }
--- a/android/app/src/fdroid/play/listings/cs-CZ/full-description.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/full-description.txt
@@ -14,19 +14,21 @@ Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší
 • <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>

 <b>Hlavní funkce</b>:
-• Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google
-• Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.
-• Pěší trasy a cyklostezky
-• Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího
-• Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu
-• Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení
-• Uložení oblíbených míst jedním klepnutím
-• Offline články z Wikipedie
-• Vrstva metra a navigace v něm
-• Záznam tras
-• Export a import záložek a tras ve formátech KML, KMZ a GPX
-• Tmavý režim k použití během noci
-• Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru
+<ul>
+<li>Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google</li>
+<li>Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.</li>
+<li>Pěší trasy a cyklostezky</li>
+<li>Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího</li>
+<li>Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu</li>
+<li>Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení</li>
+<li>Uložení oblíbených míst jedním klepnutím</li>
+<li>Offline články z Wikipedie</li>
+<li>Vrstva metra a navigace v něm</li>
+<li>Záznam tras</li>
+<li>Export a import záložek a tras ve formátech KML, KMZ a GPX</li>
+<li>Tmavý režim k použití během noci</li>
+<li>Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru</li>
+</ul>

 <b>Svoboda je tady</b>
 Objevujte své cesty, navigujte se světem se soukromím a komunitou na prvním místě!
--- a/android/app/src/fdroid/play/listings/de-DE/full-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/full-description.txt
@@ -14,6 +14,7 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>

 <b>Hauptfunktionen</b>:
+<ul>
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
 • Outdoor-Modus mit hervorgehobenen Wanderwegen, Campingplätzen, Wasserquellen, Gipfeln, Höhenlinien usw.
 • Geh- und Radwege
--- a/android/app/src/fdroid/play/listings/en-US/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-US/full-description.txt
@@ -14,19 +14,21 @@ Join the community there and help make the best maps app
 ‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>

 <b>Main Features</b>:
-• Downloadable detailed maps with places which are not available with Google Maps
-• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
-• Walking paths and cycleways
-• Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more
-• Search by name or an address or by point of interest category
-• Navigation with voice announcements for walking, cycling, or driving
-• Bookmark your favorite places with a single tap
-• Offline Wikipedia articles
-• Subway transit layer and directions
-• Track recording
-• Export and import bookmarks and tracks in KML, KMZ, GPX formats
-• A dark mode to use during the night
-• Improve map data for everyone using a basic built-in editor
+<ul>
+<li>Downloadable detailed maps with places which are not available with Google Maps</li>
+<li>Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc</li>
+<li>Walking paths and cycleways</li>
+<li>Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more</li>
+<li>Search by name or an address or by point of interest category</li>
+<li>Navigation with voice announcements for walking, cycling, or driving</li>
+<li>Bookmark your favorite places with a single tap</li>
+<li>Offline Wikipedia articles</li>
+<li>Subway transit layer and directions</li>
+<li>Track recording</li>
+<li>Export and import bookmarks and tracks in KML, KMZ, GPX formats</li>
+<li>A dark mode to use during the night</li>
+<li>Improve map data for everyone using a basic built-in editor</li>
+</ul>

 <b>Freedom Is Here</b>
 Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/fdroid/play/listings/et/full-description.txt
+++ b/android/app/src/fdroid/play/listings/et/full-description.txt
@@ -14,19 +14,21 @@ Liitu kogukonnaga ja aita luua parimat kaardirakendust:
 ‣ <b>Organisatsioon on avatud ja kasutab läbipaistvat otsustusprotsessi ning rahastamist ega taotle kasumit. Rakendus on avatud lähtekoodiga.</b>

 <b>Põhifunktsionaalsused</b>:
-• Allalaaditavad detailsed kaardid, mille sisu tihtipeale ei leia Google Mapsist
-• Kaardivaade välitingimuste jaoks, kus matkarajad, laagriplatsid, allikad, mäetipud, kontuurjooned ja palju muud vajalikku on esile tõstetud
-• Jalgrajad, rattateed ning maanteed
-• Huvipunktid, nagu restoranid, tanklad, hotellid, poed, vaatamisväärsused ja palju muud
-• Otsida saad nime, aadressi või huvipunkti kategooria alusel
-• Tee juhatamine hääljuhiste abil toimib nii kõndimisel, rattasõidul kui auto juhtimisel
-• Ühe puudutusega saad oma lemmikkohad märkida järjehoidjana
-• Vikipeedia artiklid, mida saad lugeda ilma võrguühenduseta
-• Metroode plaanid ja suunajuhised
-• Raja või teekonna salvestamise võimalus
-• Järjehoidjate ja radade eksport ning import KML, KMZ ja GPX vormingutes
-• Tume kaardivaade kasutamiseks öösel
-• Kasutades lihtsat muutmisliidest saad kaarti kõikide huvides täiendada
+<ul>
+<li>Allalaaditavad detailsed kaardid, mille sisu tihtipeale ei leia Google Mapsist</li>
+<li>Kaardivaade välitingimuste jaoks, kus matkarajad, laagriplatsid, allikad, mäetipud, kontuurjooned ja palju muud vajalikku on esile tõstetud</li>
+<li>Jalgrajad, rattateed ning maanteed</li>
+<li>Huvipunktid, nagu restoranid, tanklad, hotellid, poed, vaatamisväärsused ja palju muud</li>
+<li>Otsida saad nime, aadressi või huvipunkti kategooria alusel</li>
+<li>Tee juhatamine hääljuhiste abil toimib nii kõndimisel, rattasõidul kui auto juhtimisel</li>
+<li>Ühe puudutusega saad oma lemmikkohad märkida järjehoidjana</li>
+<li>Vikipeedia artiklid, mida saad lugeda ilma võrguühenduseta</li>
+<li>Metroode plaanid ja suunajuhised</li>
+<li>Raja või teekonna salvestamise võimalus</li>
+<li>Järjehoidjate ja radade eksport ning import KML, KMZ ja GPX vormingutes</li>
+<li>Tume kaardivaade kasutamiseks öösel</li>
+<li>Kasutades lihtsat muutmisliidest saad kaarti kõikide huvides täiendada</li>
+</ul>

 <b>Vabadus on siin</b>
 Uuri maailma ja avasta uusi teid - tee seda privaatselt ja kogukonnaga arvestades!
--- a/android/app/src/fdroid/play/listings/fi-FI/title.txt
+++ b/android/app/src/fdroid/play/listings/fi-FI/title.txt
@@ -1 +1 @@
-CoMaps - Vaella, pyöräile, autoile ilman verkkoyhteyttä, yksityisesti
+CoMaps - Patikoi, pyöräile, autoile ilman verkkoyhteyttä yksityisesti
--- a/android/app/src/fdroid/play/listings/fr-FR/full-description.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/full-description.txt
@@ -14,19 +14,21 @@ Rejoignez la communauté et aidez-nous à créer la meilleure application de nav
 ‣ <b>Prises de décisions et comptes clairs et transparents, but non lucratif et complètement open source.</b>

 <b>Fonctionnalités principales :</b>
-• Cartes détaillées téléchargeables avec des lieux non disponibles sur Google Maps
-• Mode extérieur avec sentiers de randonnée, campings, sources d'eau, sommets, courbes de niveau, etc. surlignés
-• Chemins piétons et pistes cyclables
-• Points d'intérêt comme des restaurants, stations-service, hôtels, magasins, lieux touristiques et bien plus
-• Recherche par nom, adresse ou catégorie de point d'intérêt
-• Navigation avec annonces vocales pour la marche, le vélo ou la conduite
-• Mettez en favori vos lieux préférés en un seul clic
-• Articles Wikipédia hors-ligne
-• Plan de métro et indications pour s'y rendre
-• Enregistrement des parcours
-• Exportez et importez vos favoris aux formats KML, KMZ et GPX
-• Mode sombre pour utiliser pendant la nuit
-• Amélioration de la carte par tout le monde avec un éditeur simple intégré
+<ul>
+<li>Cartes détaillées téléchargeables avec des lieux non disponibles sur Google Maps</li>
+<li>Mode extérieur avec sentiers de randonnée, campings, sources d'eau, sommets, courbes de niveau, etc. surlignés</li>
+<li>Chemins piétons et pistes cyclables</li>
+<li>Points d'intérêt comme des restaurants, stations-service, hôtels, magasins, lieux touristiques et bien plus</li>
+<li>Recherche par nom, adresse ou catégorie de point d'intérêt</li>
+<li>Navigation avec annonces vocales pour la marche, le vélo ou la conduite</li>
+<li>Mettez en favori vos lieux préférés en un seul clic</li>
+<li>Articles Wikipédia hors-ligne</li>
+<li>Plan de métro et indications pour s'y rendre</li>
+<li>Enregistrement des parcours</li>
+<li>Exportez et importez vos favoris aux formats KML, KMZ et GPX</li>
+<li>Mode sombre pour utiliser pendant la nuit</li>
+<li>Amélioration de la carte par tout le monde avec un éditeur simple intégré</li>
+</ul>

 <b>La liberté est ici</b>
 Découvrez votre voyage, naviguez dans le monde en plaçant la vie privée et la communauté au premier plan !
--- a/android/app/src/fdroid/play/listings/fr-FR/title.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/title.txt
@@ -1 +1 @@
-CoMaps - Rando, vélo, conduite hors ligne & privée
+CoMaps - Randonnée, vélo, conduite hors ligne en toute confidentialité
--- a/android/app/src/fdroid/play/listings/hr/full-description.txt
+++ b/android/app/src/fdroid/play/listings/hr/full-description.txt
@@ -14,19 +14,21 @@ Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za ka
 ‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>

 <b>Glavne značajke</b>:
-• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
-• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
-• Pješačke i biciklističke staze
-• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
-• Pretražujte po nazivu ili adresi ili po kategoriji interesa
-• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
-• Obilježite svoja omiljena mjesta jednim dodirom
-• Offline članci Wikipedije
-• Tranzitni sloj podzemne željeznice sa navigacijom
-• Snimanje GPS tragova
-• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
-• Tamni način rada za korištenje tijekom noći
-• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
+<ul>
+<li>Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama</li>
+<li>Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.</li>
+<li>Pješačke i biciklističke staze</li>
+<li>Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga</li>
+<li>Pretražujte po nazivu ili adresi ili po kategoriji interesa</li>
+<li>Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom</li>
+<li>Obilježite svoja omiljena mjesta jednim dodirom</li>
+<li>Offline članci Wikipedije</li>
+<li>Tranzitni sloj podzemne željeznice sa navigacijom</li>
+<li>Snimanje GPS tragova</li>
+<li>Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima</li>
+<li>Tamni način rada za korištenje tijekom noći</li>
+<li>Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte</li>
+</ul>

 <b>Sloboda je ovdje</b>
 Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!
--- a/android/app/src/fdroid/play/listings/it-IT/full-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/full-description.txt
@@ -14,19 +14,21 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 ‣ <b>Aperta e Trasparente nel Processo Decisionale e Finanziario, Senza Scopo di Lucro e Completamente Open Source</b>

 <b>Funzionalità principali</b>:
-• Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
-• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
-• Strade pedonali e piste ciclabili
-• Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
-• Cerca per nome, indirizzo o categoria
-• Navigazione con assistente vocale a piedi, in bici o in macchina
-• Salva i tuoi luoghi preferiti con un tocco
-• Leggi gli articoli Wikipedia Offline
-• Cartina delle metropolitane con direzioni
-• Registrazione del percorso
-• Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX
-• Modalità notturna per la notte
-• Migliora le mappe per tutti usando l'editor interno
+<ul>
+<li>Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps</li>
+<li>Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati</li>
+<li>Strade pedonali e piste ciclabili</li>
+<li>Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro</li>
+<li>Cerca per nome, indirizzo o categoria</li>
+<li>Navigazione con assistente vocale a piedi, in bici o in macchina</li>
+<li>Salva i tuoi luoghi preferiti con un tocco</li>
+<li>Leggi gli articoli Wikipedia Offline</li>
+<li>Cartina delle metropolitane con direzioni</li>
+<li>Registrazione del percorso</li>
+<li>Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX</li>
+<li>Modalità notturna per la notte</li>
+<li>Migliora le mappe per tutti usando l'editor interno</li>
+</ul>

 <b>La Libertà è Qui</b>
 Esplora la tua nuova avventura, naviga il mondo con Privacy e la comunità in prima linea!
--- a/android/app/src/fdroid/play/listings/pt-BR/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/full-description.txt
@@ -15,19 +15,21 @@ Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
 ‣ <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 categoria de ponto de interesse
-• Navegação com anúncios de voz para caminhada, ciclismo ou direção
-• Marque seus lugares favoritos com um único toque
-• Artigos offline da Wikipédia
-• Caminho de transporte e direções do metrô
-• Gravação de trilhas
-• Exporte e importe favoritos e trilhas em Formatos KML, KMZ, GPX
-• Um modo escuro para usar à noite
-• Aprimore os dados do mapa para todos usando um editor básico integrado
+<ul>
+<li>Mapas detalhados para download com locais não disponíveis no Google Maps</li>
+<li>Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.</li>
+<li>Trilhas para caminhada e ciclovias</li>
+<li>Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais</li>
+<li>Pesquise por nome, endereço ou categoria de ponto de interesse</li>
+<li>Navegação com anúncios de voz para caminhada, ciclismo ou direção</li>
+<li>Marque seus lugares favoritos com um único toque</li>
+<li>Artigos offline da Wikipédia</li>
+<li>Caminho de transporte e direções do metrô</li>
+<li>Gravação de trilhas</li>
+<li>Exporte e importe favoritos e trilhas em Formatos KML, KMZ, GPX</li>
+<li>Um modo escuro para usar à noite</li>
+<li>Aprimore os dados do mapa para todos usando um editor básico integrado</li>
+</ul>

 <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/title.txt
+++ b/android/app/src/fdroid/play/listings/pt/title.txt
@@ -1 +0,0 @@
-CoMaps - Andar, Pedalar, Dirigir Offline com Privacidade
--- a/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
@@ -8,19 +8,21 @@
 ‣ <b>Открытое и прозрачное принятие решений, финансовая отчетность, некоммерческая организация и полностью открытый исходный код.</b>

 <b>Главные особенности</b>:
-• Загружаемые и подробные карты с местами, которые недоступны в Google Maps
-• Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
-• Пешеходные переходы и велодорожки
-• Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое
-• Поиск по имени, адресу или категории достопримечательностей
-• Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
-• Возможность добавлять любимые места в закладки одним касанием
-• Загружаемые страницы Википедии
-• Слой общественного транспорта (метро)
-• Запись маршрута
-• Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
-• Темный режим для использования в ночное время
-• Улучшение картографических данных для всех с помощью базового встроенного редактора
-• Поддержка Android Auto и CarPlay
+<ul>
+<li>Загружаемые и подробные карты с местами, которые недоступны в Google Maps</li>
+<li>Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.</li>
+<li>Пешеходные переходы и велодорожки</li>
+<li>Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое</li>
+<li>Поиск по имени, адресу или категории достопримечательностей</li>
+<li>Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей</li>
+<li>Возможность добавлять любимые места в закладки одним касанием</li>
+<li>Загружаемые страницы Википедии</li>
+<li>Слой общественного транспорта (метро)</li>
+<li>Запись маршрута</li>
+<li>Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX</li>
+<li>Темный режим для использования в ночное время</li>
+<li>Улучшение картографических данных для всех с помощью базового встроенного редактора</li>
+<li>Поддержка Android Auto и CarPlay</li>
+</ul>

 <i>Свобода здесь - Открой для себя поездки, навигацию по миру, ставя приватность и сообщество во главе</i>
--- a/android/app/src/fdroid/play/listings/sr/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/full-description.txt
@@ -1,33 +0,0 @@
-Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОпенСтреетМап-у подацима, усмерени транспарентност, приватност и непрофитни. ЦОМПАПС је Апликације за органске карте виљушка, које је пак форк мапс.ме.
-
-Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
-Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
-• Користите апликацију и проширите глас о томе
-• Дајте повратне информације и пријавите проблеме
-• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
-‣<b>фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. 
-
-Све апликације су дизајниране за рад ван мреже.
-‣<b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
-‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
-‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
-‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
-‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </ Б>
-
-<b> Главне карактеристике </b>:
-• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
-• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
-• Стазе за планинарење и бицикле
-• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
-• Претражите име или адресу или по категоријама камате
-• навигација са гласовним најавама за ходање, бициклизам или аутомобил
-• Означите своја омиљена места једним додиром
-• Офлајн чланци Википедије
-• транзитни слој подземне пруге са навигацијом
-• Снимање ГПС трагова
-• Ознака и увоз и увоз у KML, KMZ, GPX формате
-• Тамни режим за употребу током ноћи
-• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
-
-<b> Слобода је овде </b>
-Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!
--- a/android/app/src/fdroid/play/listings/tr-TR/full-description.txt
+++ b/android/app/src/fdroid/play/listings/tr-TR/full-description.txt
@@ -1,2 +0,0 @@
-Gönüllüler tarafından yürütülen, OpenStreetMap harita verisini kullanan, şeffaf, mahremiyete saygılı, kamu yararına olma kararlılığıyla güçlendirilmiş bir özgür yazılım. CoMaps OrganicMaps isimli, esasen Maps.ME'nin çatalı olan bir özgür yazılımın çatalıdır.
-Projenin ortaya çıkma sebebini ve gidişatını <b><i>codeberg.org/comaps</i></b>'den okuyabilirsiniz.
--- a/android/app/src/fdroid/play/listings/tr-TR/short-description.txt
+++ b/android/app/src/fdroid/play/listings/tr-TR/short-description.txt
@@ -1 +0,0 @@
-Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı
--- a/android/app/src/fdroid/play/listings/tr-TR/title.txt
+++ b/android/app/src/fdroid/play/listings/tr-TR/title.txt
@@ -1 +0,0 @@
-CoMaps - İnternetsiz Seyahat Edin
--- a/android/app/src/fdroid/play/listings/zh-CN/full-description.txt
+++ b/android/app/src/fdroid/play/listings/zh-CN/full-description.txt
@@ -14,19 +14,21 @@
 ‣ <b>决策问责、财务透明、非营利性、完全开源。</b>

 <b>主要功能</b>：
-• 可下载详细的地图，包括许多Google地图中未显示的地方
-• 突出显示远足路线、露营地、水源、山峰、等高线等的户外模式
-• 步行道和自行车道
-• 餐厅、加油站、酒店、商店、景点等众多兴趣点
-• 按名称、地址或兴趣点类别搜索
-• 步行、骑车或驾驶时，可通过语音提示进行导航
-• 一键收藏您中意的地点
-• 离线阅读维基百科文章
-• 地铁交通图层和路线指示
-• 轨迹记录
-• 以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹
-• 选择天暗后自动开启的黑暗模式
-• 使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据
+<ul>
+<li>可下载详细的地图，包括许多Google地图中未显示的地方</li>
+<li>突出显示远足路线、露营地、水源、山峰、等高线等的户外模式</li>
+<li>步行道和自行车道</li>
+<li>餐厅、加油站、酒店、商店、景点等众多兴趣点</li>
+<li>按名称、地址或兴趣点类别搜索</li>
+<li>步行、骑车或驾驶时，可通过语音提示进行导航</li>
+<li>一键收藏您中意的地点</li>
+<li>离线阅读维基百科文章</li>
+<li>地铁交通图层和路线指示</li>
+<li>轨迹记录</li>
+<li>以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹</li>
+<li>选择天暗后自动开启的黑暗模式</li>
+<li>使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据</li>
+</ul>

 <b>自由在此</b>
 探索您的旅程，以隐私和社区为本，畅游世界！
--- a/android/app/src/fdroid/play/listings/zh-TW/full-description.txt
+++ b/android/app/src/fdroid/play/listings/zh-TW/full-description.txt
@@ -14,19 +14,21 @@
 ‣ <b>決策問責、財務透明、非營利性、完全開源。</b>

 <b>主要功能</b>：
-• 可下載詳細的地圖，包括許多Google地圖中未顯示的地方
-• 突出顯示遠足路線、露營地、水源、山峰、等高線等的戶外模式
-• 步道和自行車道
-• 餐廳、加油站、旅館、商店、景點等眾多興趣點
-• 按名稱、地址或興趣點類別搜尋
-• 步行、騎車或駕駛時，可透過語音提示進行導航
-• 一鍵收藏您喜愛的地點
-• 離線閱讀維基百科文章
-• 列車運輸圖層及路線指示
-• 軌跡記錄
-• 以 KML、KMZ 和 GPX 格式匯出和匯入書籤和軌跡
-• 選擇天暗後自動開啟的黑暗模式
-• 使用基本的內建編輯器來編輯 OpenStreetMap 地點，幫助大家改進地圖資料
+<ul>
+<li>可下載詳細的地圖，包括許多Google地圖中未顯示的地方</li>
+<li>突出顯示遠足路線、露營地、水源、山峰、等高線等的戶外模式</li>
+<li>步道和自行車道</li>
+<li>餐廳、加油站、旅館、商店、景點等眾多興趣點</li>
+<li>按名稱、地址或興趣點類別搜尋</li>
+<li>步行、騎車或駕駛時，可透過語音提示進行導航</li>
+<li>一鍵收藏您喜愛的地點</li>
+<li>離線閱讀維基百科文章</li>
+<li>列車運輸圖層及路線指示</li>
+<li>軌跡記錄</li>
+<li>以 KML、KMZ 和 GPX 格式匯出和匯入書籤和軌跡</li>
+<li>選擇天暗後自動開啟的黑暗模式</li>
+<li>使用基本的內建編輯器來編輯 OpenStreetMap 地點，幫助大家改進地圖資料</li>
+</ul>

 <b>自由在此</b>
 探索您的旅程，以隱私和社群為本，暢遊世界！
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.06.10-4-FDroid+25061004
--- a/android/app/src/google/play/listings/fi-FI/full-description.txt
+++ b/android/app/src/google/play/listings/fi-FI/full-description.txt
@@ -1,36 +0,0 @@
-Yhteisön johtama vapaa ja avoimeen lähdekoodiin perustuva karttasovellus, jonka karttadata perustuu OpenStreetMap:n avoimeen dataan. Sovelluksessa painottuu vahva sitoutuminen läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomaan toimintaan.
-
-Liity yhteisöön ja auta kehittämään parasta karttasovellusta
-• Käytä sovellusta ja levitä sanaa
-• Anna palautetta ja raportoi ongelmista
-• Päivitä karttadataa sovelluksessa tai OpenStreetMap:n verkkosivuilla
-
-<i>Palautteesi ja 5-tähden arvostelu on paras tukesi meille!</i>
-
-‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää.
-‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi matkasi ilman verkkoyhteyttä. Etsi reittipisteitä retkilläsi. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
-‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksityisyyttä silmälläpitäen. Sovellu ei tunnista ihmisä, seuraa toimintaasi, eikä kerää henkilökohtaisia tietojasi. Mainosvapaa.
-‣ <b>Säästää akkua ja tilaa</b>: Ei kuluta akkua, kuten toiset karttasovellukset. Kompaktit kartat säästävät tilaa puhelimessasi.
-‣ <b>Ilmainen ja yhteisön rakentama</b>: Ihmiset, kuten sinä ovat auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit auttaa myös kehittämällä sovellusta ja lahjoittamalla sovelluskehitykseen.
-‣ <b>Avoin ja läpinäkyvä päätöksenteko ja rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
-
-<b>Tärkeimmät ominaisuudet</b>:
-• Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta
-• Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.
-• Kävely- ja pyörätiet
-• Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta
-• Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla
-• Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa
-• Tallenna suosikkipaikkasi yhdellä napautuksella
-• Offline Wikipedia-artikkelit
-• Maanalaisen liikenteen tasot ja ohjeet
-• Reittien tallennus
-• Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa
-• Tumma tila iltaa ja yötä varten
-• Paranna karttadataa kaikille sisäänrakennetulla editorilla
-• Android Auto -tuki
-
-Raportoi sovellusvirheistä, ehdota ideoita liity yhteisöön osoitteessa <b><i>comaps.app</i></b>
-
-<b>Vapaus on täällä</b>
-Löydä matkasi, navigoi maailmassa yksityisyyden ja yhteisön tukemana!
--- a/android/app/src/google/play/listings/tr-TR/short-description.txt
+++ b/android/app/src/google/play/listings/tr-TR/short-description.txt
@@ -1 +0,0 @@
-Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı
--- a/android/app/src/google/play/listings/tr-TR/title.txt
+++ b/android/app/src/google/play/listings/tr-TR/title.txt
@@ -1 +0,0 @@
-CoMaps - Mahremiyetli Seyahat
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -119,7 +119,7 @@

        <data android:scheme="http"/>
        <data android:scheme="https"/>
-        <data android:host="comaps.at"/>
+        <data android:host="comaps.app"/>
      </intent-filter>

      <intent-filter>
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -34,6 +34,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.annotation.UiThread;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -119,8 +120,6 @@ import app.organicmaps.widget.menu.MainMenu;
 import app.organicmaps.widget.placepage.PlacePageController;
 import app.organicmaps.widget.placepage.PlacePageData;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

@@ -188,7 +187,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  private MapFragment mMapFragment;

  private View mPointChooser;
-  private MaterialToolbar mPointChooserToolbar;
+  private Toolbar mPointChooserToolbar;

  private RoutingPlanInplaceController mRoutingPlanInplaceController;

--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -15,12 +15,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;

-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
@@ -149,7 +148,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
    onBackPressed();
  }

-  protected MaterialToolbar getToolbar()
+  protected Toolbar getToolbar()
  {
    return findViewById(R.id.toolbar);
  }
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
@@ -10,13 +10,11 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -25,7 +23,7 @@ import app.organicmaps.widget.PlaceholderView;

 public abstract class BaseMwmRecyclerFragment<T extends RecyclerView.Adapter> extends Fragment
 {
-  private MaterialToolbar mToolbar;
+  private Toolbar mToolbar;

  @SuppressWarnings("NotNullFieldNotInitialized")
  @NonNull
--- a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
@@ -6,13 +6,11 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
-
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
@@ -28,7 +26,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
  {
    super.onSafeCreate(savedInstanceState);

-    MaterialToolbar toolbar = getToolbar();
+    Toolbar toolbar = getToolbar();
    if (toolbar != null)
    {
      int title = getToolbarTitle();
@@ -44,7 +42,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
    }
  }

-  protected void setupHomeButton(@NonNull MaterialToolbar toolbar)
+  protected void setupHomeButton(@NonNull Toolbar toolbar)
  {
    UiUtils.showHomeUpButton(toolbar);
  }
@@ -94,7 +92,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity

    if (title != null)
    {
-      MaterialToolbar toolbar = getToolbar();
+      Toolbar toolbar = getToolbar();
      if (toolbar != null && toolbar.getTitle() != null)
      {
        mLastTitle = toolbar.getTitle().toString();
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -480,13 +480,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde

      UiUtils.showIf(mSearchResultsMode && !TextUtils.isEmpty(found), mFoundName);

-      long size = getMapDisplaySize();
-      mSize.setText(StringUtils.getFileSizeString(mFragment.requireContext(), size));
-      mStatusIcon.update(mItem);
-    }
-
-    private long getMapDisplaySize()
-    {
      long size;
      if (mItem.status == CountryItem.STATUS_ENQUEUED ||
          mItem.status == CountryItem.STATUS_PROGRESS ||
@@ -494,16 +487,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
      {
        size = mItem.enqueuedSize;
      }
-      else if (mItem.status == CountryItem.STATUS_FAILED ||
-          mItem.status == CountryItem.STATUS_DOWNLOADABLE)
-      {
-        size = mItem.totalSize;
-      }
      else
      {
        size = ((!mSearchResultsMode && mMyMapsMode) ? mItem.size : mItem.totalSize);
      }
-      return size;
+
+      mSize.setText(StringUtils.getFileSizeString(mFragment.requireContext(), size));
+      mStatusIcon.update(mItem);
    }
  }

--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -189,7 +189,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE, R.string.error_enter_correct_web);
    initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE_MENU, R.string.error_enter_correct_web);
    initMetadataEntry(Metadata.MetadataType.FMD_EMAIL, R.string.error_enter_correct_email);
-    initMetadataEntry(Metadata.MetadataType.FMD_LEVEL, R.string.error_enter_correct_level);
    initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.string.error_enter_correct_fediverse_page);
    initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.string.error_enter_correct_facebook_page);
    initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.string.error_enter_correct_instagram_page);
@@ -432,7 +431,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

    // Details
    View mBlockLevels = view.findViewById(R.id.block_levels);
-    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor, R.string.editor_building_levels);
+    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor,
+        getString(R.string.editor_storey_number, Editor.nativeGetMaxEditableBuildingLevels()));
    mBuildingLevels.setInputType(InputType.TYPE_CLASS_NUMBER);
    mInputBuildingLevels = mBlockLevels.findViewById(R.id.custom_input);
    View blockPhone = view.findViewById(R.id.block_phone);
@@ -446,8 +446,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
            R.drawable.ic_website_menu, R.string.website_menu, InputType.TYPE_TEXT_VARIATION_URI);
    View emailBlock = initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
            R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-    View levelBlock = initBlock(view, Metadata.MetadataType.FMD_LEVEL, R.id.block_level,
-            R.drawable.ic_level_white, R.string.editor_level, InputType.TYPE_CLASS_NUMBER);
    View fediverseContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse,
            R.drawable.ic_mastodon_white, R.string.mastodon, InputType.TYPE_TEXT_VARIATION_URI);
    View facebookContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook,
@@ -505,7 +503,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE, websiteBlock);
    mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE_MENU, websiteMenuBlock);
    mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, emailBlock);
-    mDetailsBlocks.put(Metadata.MetadataType.FMD_LEVEL, levelBlock);
    mDetailsBlocks.put(Metadata.MetadataType.FMD_OPERATOR, operatorBlock);

    mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, fediverseContactBlock);
--- a/android/app/src/main/java/app/organicmaps/location/LocationHelper.java
+++ b/android/app/src/main/java/app/organicmaps/location/LocationHelper.java
@@ -213,7 +213,7 @@ public class LocationHelper implements BaseLocationProvider.Listener

    if (mSavedLocation != null)
    {
-      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
+      if (!LocationUtils.isFromFusedProvider(location) && !LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
      {
        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
        return;
--- a/android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java
+++ b/android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java
@@ -2,7 +2,6 @@ package app.organicmaps.location;

 import android.content.Context;
 import android.location.Location;
-import android.os.SystemClock;

 import androidx.annotation.NonNull;

@@ -58,7 +57,6 @@ class RouteSimulationProvider extends BaseLocationProvider
    location.setLatitude(mPoints[mCurrentPoint].mLat);
    location.setLongitude(mPoints[mCurrentPoint].mLon);
    location.setAccuracy(1.0f);
-    location.setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos());
    mListener.onLocationChanged(location);
    mCurrentPoint += 1;
    UiThread.runLater(this::nextPoint, INTERVAL_MS);
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -481,8 +481,6 @@ public class MapButtonsController extends Fragment
        .setAllSides()
        .build();
    ViewCompat.setOnApplyWindowInsetsListener(mFrame, insetsListener);
-    // Fixes insets on older Androids and with a search opened via API on all Androids.
-    mFrame.post(() -> ViewCompat.requestApplyInsets(mFrame));
  }

  @Override
--- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
@@ -16,6 +16,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -46,7 +47,6 @@ import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.widget.SearchToolbarController;
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.tabs.TabLayout;

@@ -226,7 +226,7 @@ public class SearchFragment extends BaseMwmFragment
  private void updateFrames()
  {
    final boolean hasQuery = mToolbarController.hasQuery();
-    MaterialToolbar toolbar = mToolbarController.getToolbar();
+    Toolbar toolbar = mToolbarController.getToolbar();
    AppBarLayout.LayoutParams lp = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
    lp.setScrollFlags(hasQuery ? AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
                                 | AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL : 0);
--- a/android/app/src/main/java/app/organicmaps/util/Constants.java
+++ b/android/app/src/main/java/app/organicmaps/util/Constants.java
@@ -13,7 +13,7 @@ public final class Constants
  public static class Url
  {
    public static final String SHORT_SHARE_PREFIX = "cm://";
-    public static final String HTTP_SHARE_PREFIX = "https://comaps.at/";
+    public static final String HTTP_SHARE_PREFIX = "https://comaps.app/";

    public static final String MAILTO_SCHEME = "mailto:";
    public static final String MAIL_SUBJECT = "?subject=";
@@ -23,6 +23,7 @@ public final class Constants
    public static final String MASTODON = "https://floss.social/@comaps";
    public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
    public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
+    //public static final String TWITTER = "https://twitter.com/user";

    public static final String CODE_REPO = "https://codeberg.org/comaps/comaps";

--- a/android/app/src/main/java/app/organicmaps/util/LocationUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/LocationUtils.java
@@ -84,9 +84,6 @@ public class LocationUtils

  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
  {
-    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
-      return false;
-
    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
      return true;
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -27,6 +27,7 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
@@ -36,8 +37,6 @@ import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputLayout;

 import java.util.Objects;
@@ -194,7 +193,7 @@ public final class UiUtils
    hide(tv);
  }

-  public static void showHomeUpButton(MaterialToolbar toolbar)
+  public static void showHomeUpButton(Toolbar toolbar)
  {
    toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
  }
@@ -298,7 +297,7 @@ public final class UiUtils
                    systemInsets.right, view.getPaddingBottom());
  }

-  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar,
+  public static void setupNavigationIcon(@NonNull Toolbar toolbar,
                                         @NonNull View.OnClickListener listener)
  {
    View customNavigationButton = toolbar.findViewById(R.id.back);
@@ -312,14 +311,14 @@ public final class UiUtils
    }
  }

-  public static void setupHomeUpButtonAsNavigationIcon(@NonNull MaterialToolbar toolbar,
+  public static void setupHomeUpButtonAsNavigationIcon(@NonNull Toolbar toolbar,
                                                       @NonNull View.OnClickListener listener)
  {
    UiUtils.showHomeUpButton(toolbar);
    toolbar.setNavigationOnClickListener(listener);
  }

-  public static void clearHomeUpButton(@NonNull MaterialToolbar toolbar)
+  public static void clearHomeUpButton(@NonNull Toolbar toolbar)
  {
    toolbar.setNavigationIcon(null);
    toolbar.setNavigationOnClickListener(null);
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
@@ -3,15 +3,14 @@ package app.organicmaps.util.bottomsheet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.location.TrackRecorder;
 import app.organicmaps.util.Config;
@@ -50,7 +49,7 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
  public void onBindViewHolder(ViewHolder viewHolder, final int position)
  {
    final MenuBottomSheetItem item = dataSet.get(position);
-    final ShapeableImageView iv = viewHolder.getIconImageView();
+    final ImageView iv = viewHolder.getIconImageView();
    if (item.iconRes == R.drawable.ic_donate && Config.isNY())
    {
      iv.setImageResource(R.drawable.ic_christmas_tree);
@@ -60,7 +59,7 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
      iv.setImageResource(item.iconRes);
    viewHolder.getContainer().setOnClickListener((v) -> onMenuItemClick(item));
    viewHolder.getTitleTextView().setText(item.titleRes);
-    MaterialTextView badge = viewHolder.getBadgeTextView();
+    TextView badge = viewHolder.getBadgeTextView();
    if (item.badgeCount > 0)
    {
      badge.setText(String.valueOf(item.badgeCount));
@@ -88,9 +87,9 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
  public static class ViewHolder extends RecyclerView.ViewHolder
  {
    private final LinearLayout container;
-    private final ShapeableImageView iconImageView;
-    private final MaterialTextView titleTextView;
-    private final MaterialTextView badgeTextView;
+    private final ImageView iconImageView;
+    private final TextView titleTextView;
+    private final TextView badgeTextView;

    public ViewHolder(View view)
    {
@@ -101,17 +100,17 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
      badgeTextView = view.findViewById(R.id.bottom_sheet_menu_item_badge);
    }

-    public ShapeableImageView getIconImageView()
+    public ImageView getIconImageView()
    {
      return iconImageView;
    }

-    public MaterialTextView getTitleTextView()
+    public TextView getTitleTextView()
    {
      return titleTextView;
    }

-    public MaterialTextView getBadgeTextView()
+    public TextView getBadgeTextView()
    {
      return badgeTextView;
    }
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -19,7 +20,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.android.material.textview.MaterialTextView;

 import java.util.ArrayList;
 import java.util.Objects;
@@ -93,7 +93,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
  {
    super.onViewCreated(view, savedInstanceState);
    attachToNearestContext();
-    MaterialTextView titleView = view.findViewById(R.id.bottomSheetTitle);
+    TextView titleView = view.findViewById(R.id.bottomSheetTitle);
    RecyclerView recyclerView = view.findViewById(R.id.bottomSheetMenuContainer);
    if (getArguments() != null)
    {
--- a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java
@@ -9,10 +9,8 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -23,7 +21,7 @@ public class ToolbarController
  @Nullable
  private  Activity mActivity;
  @NonNull
-  private final MaterialToolbar mToolbar;
+  private final Toolbar mToolbar;
  @NonNull
  protected final View.OnClickListener mNavigationClickListener = view -> onUpClick();

@@ -41,7 +39,7 @@ public class ToolbarController
    setSupportActionBar(activity, mToolbar);
  }

-  private void setSupportActionBar(@NonNull Activity activity, @NonNull MaterialToolbar toolbar)
+  private void setSupportActionBar(@NonNull Activity activity, @NonNull Toolbar toolbar)
  {
    AppCompatActivity appCompatActivity = (AppCompatActivity) activity;
    appCompatActivity.setSupportActionBar(toolbar);
@@ -88,7 +86,7 @@ public class ToolbarController
  }

  @NonNull
-  public MaterialToolbar getToolbar()
+  public Toolbar getToolbar()
  {
    return mToolbar;
  }
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -14,6 +14,7 @@ import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -32,8 +33,6 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;

@@ -204,7 +203,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.

  private void initToolbar(View view)
  {
-    MaterialToolbar toolbar = view.findViewById(R.id.toolbar);
+    Toolbar toolbar = view.findViewById(R.id.toolbar);

    ViewCompat.setOnApplyWindowInsetsListener(toolbar, PaddingInsetsListener.excludeBottom());

--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -18,6 +18,7 @@ import android.widget.TextView;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -51,8 +52,6 @@ import app.organicmaps.widget.placepage.sections.PlacePageOpeningHoursFragment;
 import app.organicmaps.widget.placepage.sections.PlacePagePhoneFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageProductsFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;

 import java.util.ArrayList;
@@ -87,7 +86,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
  private View mFrame;
  // Preview.
  private ViewGroup mPreview;
-  private MaterialToolbar mToolbar;
+  private Toolbar mToolbar;
  private TextView mTvTitle;
  private TextView mTvSecondaryTitle;
  private TextView mTvSubtitle;
--- a/android/app/src/main/res/drawable/onmap_downloader_background.xml
+++ b/android/app/src/main/res/drawable/onmap_downloader_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/menuBackground"/>
+    <solid android:color="#FFFFFF"/>
    <corners android:radius="10dp"/>
    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>
--- a/android/app/src/main/res/layout/accept_decline_button_container.xml
+++ b/android/app/src/main/res/layout/accept_decline_button_container.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+  <LinearLayout
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <Button
+      android:id="@+id/accept_btn"
+      style="@style/MwmWidget.Button.Primary"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/accept"/>
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/sharing_options_img_size">
+      <TextView
+        android:id="@+id/decline_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="?attr/selectableItemBackground"
+        android:fontFamily="@string/robotoMedium"
+        android:gravity="center"
+        android:letterSpacing="0.01"
+        android:textAllCaps="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="@dimen/text_size_body_3"
+        android:textStyle="normal"
+        android:text="@string/learn_more"
+        tools:ignore="UnusedAttribute"
+        tools:text="NOT NOW" />
+    </FrameLayout>
+  </LinearLayout>
+</merge>
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -8,7 +8,7 @@
  android:gravity="center"
  android:orientation="vertical">

-  <com.google.android.material.imageview.ShapeableImageView
+  <androidx.appcompat.widget.AppCompatImageView
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_margin="32dp"
@@ -22,7 +22,7 @@
      android:gravity="center"
      android:orientation="vertical">

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginBottom="8dp"
@@ -31,7 +31,7 @@
        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
        android:textStyle="bold" />

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/car_used_on_the_car_screen"
@@ -39,7 +39,7 @@
        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
  </LinearLayout>

-  <com.google.android.material.button.MaterialButton
+  <Button
      android:id="@+id/btn_continue"
      style="@style/MwmWidget.Button.Accent"
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -7,13 +7,13 @@
    android:gravity="center"
    android:orientation="vertical">

-  <com.google.android.material.imageview.ShapeableImageView
+  <ImageView
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_margin="32dp"
      app:srcCompat="@drawable/ic_location_permission_request" />

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_marginEnd="32dp"
@@ -23,7 +23,7 @@
      android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
      android:textStyle="bold" />

-  <com.google.android.material.button.MaterialButton
+  <Button
      android:id="@+id/btn_grant_permissions"
      style="@style/MwmWidget.Button.Accent"
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -13,7 +13,7 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content" />

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/bottomSheetTitle"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/bottom_sheet_handle.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_handle.xml
@@ -4,7 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content">

-  <com.google.android.material.imageview.ShapeableImageView
+  <ImageView
    android:layout_width="match_parent"
    android:layout_height="4dp"
    android:layout_marginTop="@dimen/margin_quarter"
--- a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -11,14 +11,14 @@
  android:background="?clickableBackground"
  android:orientation="horizontal">

-  <com.google.android.material.imageview.ShapeableImageView
+  <ImageView
    android:id="@+id/bottom_sheet_menu_item_icon"
    android:layout_width="@dimen/bookmark_icon_size"
    android:layout_height="match_parent"
    android:layout_gravity="center_vertical"
    tools:src="@drawable/ic_menu_download"
    app:tint="?android:textColorSecondary"/>
-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/bottom_sheet_menu_item_text"
    android:textAppearance="@style/MwmTextAppearance.Body1"
    android:layout_width="0dp"
@@ -29,7 +29,7 @@
    android:gravity="center_vertical"
    android:singleLine="true"
    tools:text="Menu Item" />
-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/bottom_sheet_menu_item_badge"
    style="@style/MwmWidget.Counter"
    android:layout_gravity="end|center_vertical"
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -6,7 +6,7 @@
  android:background="?cardBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -6,7 +6,7 @@
  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
@@ -15,7 +15,7 @@
    android:gravity="end|center_vertical"
    android:theme="@style/MwmWidget.ToolbarTheme"
    tools:ignore="UnusedAttribute">
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
  <LinearLayout
    android:layout_marginTop="@dimen/margin_half_double_plus"
    android:orientation="horizontal"
--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -5,7 +5,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:background="?windowBackgroundForced">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
@@ -22,7 +22,7 @@
        android:layout_gravity="end|center_vertical"
        android:scaleType="centerInside"
        android:contentDescription="@string/save" />
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
  <FrameLayout
    style="@style/MwmWidget.FrameLayout.Elevation"
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -228,9 +228,7 @@
          android:id="@+id/block_email"
          layout="@layout/item_editor_input"/>

-        <include
-          android:id="@+id/block_level"
-          layout="@layout/item_editor_input"/>
+        <!-- ToDo: Level is missing compared with iOS. -->

        <RelativeLayout
            android:id="@+id/block_wifi"
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -7,7 +7,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:orientation="vertical">

-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
@@ -43,7 +43,7 @@

    </androidx.constraintlayout.widget.ConstraintLayout>

-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>

  <FrameLayout
    android:id="@+id/fragment_container"
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -6,7 +6,7 @@
  android:layout_height="match_parent"
  android:orientation="vertical">

-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
@@ -18,7 +18,7 @@
      android:id="@+id/save"
      style="@style/MwmWidget.Downloader.ToolbarButton"
      android:text="@string/editor_report_problem_send_button"/>
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>

  <ScrollView
    android:id="@+id/scrollView"
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -9,10 +9,9 @@
  <CheckBox
    android:id="@+id/checkbox"
    android:layout_width="@dimen/margin_double_plus"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
    android:layout_centerVertical="true"
-    android:layout_alignParentTop="true"
-    android:layout_alignBottom="@id/bottom_line_container"
+    android:layout_marginStart="@dimen/margin_quarter"
    android:background="@null"
    android:button="@drawable/button_visibility_centre_inset"
    android:buttonTint="?accentColorSelector" />
@@ -33,7 +32,7 @@
    android:layout_height="wrap_content"
    android:layout_below="@id/name"
    android:layout_alignStart="@id/name"
-    android:paddingBottom="@dimen/margin_half_plus"
+    android:layout_marginBottom="@dimen/margin_half_plus"
    android:layout_toStartOf="@id/more"
    android:orientation="horizontal">
    <TextView
@@ -49,11 +48,9 @@
  <ImageView
    android:id="@+id/more"
    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
    android:layout_alignParentEnd="true"
    android:layout_centerVertical="true"
-    android:layout_alignParentTop="true"
-    android:layout_alignBottom="@id/bottom_line_container"
    android:background="?selectableItemBackgroundBorderless"
    android:importantForAccessibility="no"
    android:paddingHorizontal="@dimen/margin_half"
--- a/android/app/src/main/res/layout/onmap_downloader.xml
+++ b/android/app/src/main/res/layout/onmap_downloader.xml
@@ -16,6 +16,7 @@
    android:clipChildren="false"
    android:layout_gravity="center"
    android:gravity="center_horizontal"
+    android:backgroundTint="?menuBackground"
    android:background="@drawable/onmap_downloader_background"
    tools:ignore="UselessParent">

--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -6,7 +6,7 @@
  android:layout_height="match_parent"
  android:orientation="vertical">

-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar_point_chooser"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
@@ -41,7 +41,7 @@

    </LinearLayout>

-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>

  <TextView
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -11,7 +11,7 @@
  <FrameLayout android:layout_width="match_parent"
               android:layout_height="wrap_content">

-    <com.google.android.material.appbar.MaterialToolbar
+    <androidx.appcompat.widget.Toolbar
      android:id="@+id/toolbar"
      style="@style/MwmWidget.ToolbarStyle"
      android:theme="@style/MwmWidget.ToolbarTheme"
@@ -131,7 +131,7 @@

      </RelativeLayout>

-    </com.google.android.material.appbar.MaterialToolbar>
+    </androidx.appcompat.widget.Toolbar>
  </FrameLayout>
  <FrameLayout
    android:id="@+id/driving_options_btn_container"
--- a/android/app/src/main/res/layout/toolbar_default.xml
+++ b/android/app/src/main/res/layout/toolbar_default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
--- a/android/app/src/main/res/layout/toolbar_extended.xml
+++ b/android/app/src/main/res/layout/toolbar_extended.xml
@@ -4,7 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:orientation="vertical">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/toolbar_transparent.xml
+++ b/android/app/src/main/res/layout/toolbar_transparent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/toolbar"
  style="@style/MwmWidget.ToolbarStyle"
--- a/android/app/src/main/res/layout/toolbar_with_optional_search.xml
+++ b/android/app/src/main/res/layout/toolbar_with_optional_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/toolbar"
  style="@style/MwmWidget.ToolbarStyle.NoElevation"
@@ -11,4 +11,4 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:visibility="gone"/>
-</com.google.android.material.appbar.MaterialToolbar>
+</androidx.appcompat.widget.Toolbar>
--- a/android/app/src/main/res/layout/toolbar_with_search.xml
+++ b/android/app/src/main/res/layout/toolbar_with_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/toolbar"
  style="@style/MwmWidget.ToolbarStyle"
@@ -13,4 +13,4 @@
    android:orientation="vertical">
    <include layout="@layout/toolbar_search_controls" />
  </LinearLayout>
-</com.google.android.material.appbar.MaterialToolbar>
+</androidx.appcompat.widget.Toolbar>
--- a/android/app/src/main/res/layout/toolbar_with_search_no_elevation.xml
+++ b/android/app/src/main/res/layout/toolbar_with_search_no_elevation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/toolbar"
  style="@style/MwmWidget.ToolbarStyle.NoElevation"
@@ -12,4 +12,4 @@
    android:orientation="vertical">
    <include layout="@layout/toolbar_search_controls" />
  </LinearLayout>
-</com.google.android.material.appbar.MaterialToolbar>
+</androidx.appcompat.widget.Toolbar>
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -484,6 +484,7 @@
    <string name="download_over_mobile_header">Laai af oor ’n mobieledataverbinding?</string>
    <string name="download_over_mobile_message">Dit kan behoorlik duur wees met sommige planne of indien dooldata aktief is.</string>
    <string name="error_enter_correct_house_number">Voer ’n geldige gebounommer in</string>
+    <string name="editor_storey_number">Aantal verdiepings (maksimum van %d)</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">Die aantal verdiepings mag nie %d oorskry nie</string>
    <string name="editor_zip_code">Poskode</string>
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -510,6 +510,7 @@
    <string name="download_over_mobile_header">تنزيل باستخدام بيانات الجوال؟</string>
    <string name="download_over_mobile_message">قد يكون هذا مكلفاً جداً في بعض الاحيان أو عند التجوال.</string>
    <string name="error_enter_correct_house_number">أدخل رقم بناء صحيح</string>
+    <string name="editor_storey_number">عدد الطوابق (بحد أقصى %d)</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>
    <string name="editor_zip_code">الرمز البريدي</string>
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -45,7 +45,7 @@
    <string name="type.amenity.charging_station">محطة شحن</string>
    <string name="type.amenity.charging_station.bicycle">محطة شحن الدراجات</string>
    <string name="type.amenity.charging_station.motorcar">محطة شحن السيارات</string>
-    <string name="type.amenity.childcare">حضّانة</string>
+    <string name="type.amenity.childcare">حضانة</string>
    <string name="type.amenity.cinema">سينما</string>
    <string name="type.leisure.bowling_alley">صالة بولينج</string>
    <string name="type.amenity.clinic">عيادة</string>
@@ -62,7 +62,7 @@
    <string name="type.amenity.exhibition_centre">مركز المعرض</string>
    <string name="type.amenity.money_transfer">تحويل المال</string>
    <string name="type.amenity.music_school">مدرسة موسيقى</string>
-    <string name="type.amenity.language_school">مدرسة لغات</string>
+    <string name="type.amenity.language_school">مدرسة لغة</string>
    <string name="type.office.diplomatic">سفارة</string>
    <string name="type.amenity.fast_food">وجبات سريعة</string>
    <string name="type.amenity.ferry_terminal">محطة عبّارات</string>
@@ -1278,7 +1278,4 @@
    <string name="type.amenity.dojo">دوجو</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">الصالة الرياضية</string>
-    <string name="type.aerialway.mixed_lift">رفع مختلط</string>
-    <string name="type.amenity.love_hotel">فندق جب</string>
-    <string name="type.amenity.studio">معرض</string>
 </resources>
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -499,6 +499,7 @@
    <string name="download_over_mobile_header">Mobil şəbəkə vasitəsilə endirilsin?</string>
    <string name="download_over_mobile_message">Bəzi planlarda və ya rouminqlə bu olduqca bahalı hesab oluna bilərr.</string>
    <string name="error_enter_correct_house_number">Etibarlı bina nömrəsini daxil edin</string>
+    <string name="editor_storey_number">Mərtəbə sayı (maks. %d)</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">Mərtəbələrin sayı %d-dən çox olmamalıdır</string>
    <string name="editor_zip_code">Poçt kodu</string>
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -495,6 +495,7 @@
    <string name="download_over_mobile_header">Спампаваць праз мабільны інтэрнэт?</string>
    <string name="download_over_mobile_message">Гэта можа быць даволі дорага з некаторымі тарыфнымі планамі або ў роўмінгу.</string>
    <string name="error_enter_correct_house_number">Увядзіце правільны нумар дома</string>
+    <string name="editor_storey_number">Колькасць паверхаў (максімум %d)</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>
    <string name="editor_zip_code">Паштовы індэкс</string>
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -465,6 +465,7 @@
    <string name="download_over_mobile_header">Изтегляне чрез мобилни данни?</string>
    <string name="download_over_mobile_message">Това може да бъде значително скъпо при някои планове или при роуминг.</string>
    <string name="error_enter_correct_house_number">Въведете валиден номер на сграда</string>
+    <string name="editor_storey_number">Брой етажи (максимум %d)</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>
    <string name="editor_zip_code">Пощенски код</string>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -498,6 +498,7 @@
    <string name="download_over_mobile_header">Voleu baixar-ho a través d’una connexió de xarxa mòbil?</string>
    <string name="download_over_mobile_message">Podria ser força car amb algunes tarifes o amb itinerància de dades.</string>
    <string name="error_enter_correct_house_number">Introduïu un número d’edifici vàlid</string>
+    <string name="editor_storey_number">Nombre de plantes (màxim %d)</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">El nombre de plantes no pot excedir de %d</string>
    <string name="editor_zip_code">Codi postal</string>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -96,7 +96,7 @@
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
    <string name="wait_several_minutes">Tato akce může trvat několik minut. \nProsím čekejte…</string>
    <!-- Measurement units title in settings activity -->
-    <string name="measurement_units">Jednotky míry</string>
+    <string name="measurement_units">Měřicí jednotky</string>
    <!-- Detailed description of Measurement Units settings button -->
    <string name="measurement_units_summary">Vyberte si míle nebo kilometry</string>
    <!-- SECTION: Search categories -->
@@ -479,6 +479,7 @@
    <string name="download_over_mobile_header">Stáhnout pomocí připojení přes mobilní síť?</string>
    <string name="download_over_mobile_message">Toto by mohlo být s některými tarify nebo roamingem výrazně dražší.</string>
    <string name="error_enter_correct_house_number">Zadejte správné číslo domu</string>
+    <string name="editor_storey_number">Počet poschodí (max. %d)</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">Opravte počet poschodí, max. %d</string>
    <string name="editor_zip_code">PSČ</string>
@@ -761,7 +762,7 @@
    <!-- App tip #06 -->
    <string name="app_tip_06">Můžete pomoci přeložit naši aplikaci do vašeho jazyka.</string>
    <!-- App tip #07 -->
-    <string name="app_tip_07">Naše aplikace je vyvíjena několika nadšenci a komunitou.</string>
+    <string name="app_tip_07">Naše aplikace je vyvinuta několika nadšenci a komunitou.</string>
    <!-- App tip #08 -->
    <string name="app_tip_08">Mapová data můžete snadno opravit a vylepšit.</string>
    <!-- App tip #09 -->
@@ -881,7 +882,4 @@
    <string name="saved">Uloženo</string>
    <string name="pref_left_button_disable">Zakázat</string>
    <string name="pref_left_button_title">Nastavení levého tlačítka</string>
-    <string name="error_enter_correct_level">Zadejte platné číslo podlaží</string>
-    <string name="editor_building_levels">Podlaží (vč. přízemí, bez střechy)</string>
-    <string name="editor_level">Podlaží (0 je přízemí)</string>
 </resources>
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1028,7 +1028,7 @@
    <string name="type.shop.stationery">Papírnictví</string>
    <string name="type.shop.tattoo">Tetovací salon</string>
    <string name="type.shop.tea">Obchod s čajem</string>
-    <string name="type.shop.ticket">Prodej vstupenek, jízdenek</string>
+    <string name="type.shop.ticket">Prodej vstupenek</string>
    <string name="type.shop.toys">Hračkářství</string>
    <string name="type.shop.travel_agency">Cestovní kancelář</string>
    <string name="type.shop.tyres">Obchod s pneumatikami</string>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -475,6 +475,7 @@
    <string name="download_over_mobile_header">Download ved brug af mobilnetværksforbindelse?</string>
    <string name="download_over_mobile_message">Dette kan være meget dyrt med nogle abonnementer eller ved roaming.</string>
    <string name="error_enter_correct_house_number">Indtast et gyldigt bygningsnummer</string>
+    <string name="editor_storey_number">Antal etager (maks %d)</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">Antallet af etager må ikke overstige %d etager</string>
    <string name="editor_zip_code">Postnummer</string>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -497,6 +497,7 @@
    <string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
    <string name="download_over_mobile_message">Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden.</string>
    <string name="error_enter_correct_house_number">Richtige Hausnummer eingeben</string>
+    <string name="editor_storey_number">Anzahl der Etagen (maximal %d)</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">Das Gebäude kann nicht mehr als %d Etagen haben</string>
    <string name="editor_zip_code">Postleitzahl</string>
@@ -890,7 +891,4 @@
    <string name="pref_left_button_title">Einstellung linker Knopf</string>
    <string name="saved">Gespeichert</string>
    <string name="pref_left_button_disable">Deaktivieren</string>
-    <string name="editor_building_levels">Etagen (inkl. Erdgeschoss, ohne Dach)</string>
-    <string name="error_enter_correct_level">Geben Sie eine gültige Etagen Nummer ein</string>
-    <string name="editor_level">Etage (0 ist Erdgeschoss)</string>
 </resources>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -500,6 +500,7 @@
    <string name="download_over_mobile_header">Να γίνει λήψη μέσω δικτύου κινητής τηλεφωνίας;</string>
    <string name="download_over_mobile_message">Αυτό μπορεί να είναι πολύ ακριβό για μερικά πακέτα ή στην περίπτωση roaming.</string>
    <string name="error_enter_correct_house_number">Εισαγάγετε έναν έγκυρο αριθμό κτιρίου</string>
+    <string name="editor_storey_number">Αριθμός ορόφων (μέγιστο %d)</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>
    <string name="editor_zip_code">Ταχυδρομικός κώδικας</string>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -212,7 +212,7 @@
    <!-- Settings information group in settings screen -->
    <string name="prefs_group_information">Información</string>
    <string name="prefs_group_route">Navegación</string>
-    <string name="pref_zoom_title">Botones de zoom</string>
+    <string name="pref_zoom_title">Botones de zum</string>
    <string name="pref_zoom_summary">Visualización en la pantalla</string>
    <!-- Settings «Map» category: «Night style» title -->
    <string name="pref_map_style_title">Modo nocturno</string>
@@ -242,7 +242,7 @@
    <string name="pref_tts_playing_test_voice">Compruebe el volumen o la configuración de texto a voz del sistema si ahora no oye la voz.</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
    <string name="pref_tts_unavailable">No disponible</string>
-    <string name="pref_map_auto_zoom">Zoom automático</string>
+    <string name="pref_map_auto_zoom">Zum automático</string>
    <string name="placepage_distance">Distancia</string>
    <string name="search_show_on_map">Ver en el mapa</string>
    <!-- Menu button -->
@@ -499,6 +499,7 @@
    <string name="download_over_mobile_header">¿Descargar con conexión de red móvil?</string>
    <string name="download_over_mobile_message">Podría ser muy caro con ciertos planes o con itinerancia de datos.</string>
    <string name="error_enter_correct_house_number">Introducir el número de domicilio correcto</string>
+    <string name="editor_storey_number">Número de plantas (máx. %d)</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">El número de plantas no debe superar %d</string>
    <string name="editor_zip_code">Código postal</string>
@@ -893,6 +894,4 @@
    <string name="bluesky">Bluesky</string>
    <string name="error_enter_correct_bluesky_page">Introduce un nombre de usuario o una dirección web de Bluesky válidos</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
-    <string name="pref_left_button_title">Configurar botón izquierdo</string>
-    <string name="pref_left_button_disable">Desactivar</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -491,6 +491,7 @@
    <string name="download_over_mobile_header">Kas laadime alla mobiilivõrgu kaudu?</string>
    <string name="download_over_mobile_message">See võib mõningate lepingute või rändluse korral olla märgatavalt kallim.</string>
    <string name="error_enter_correct_house_number">Sisesta kehtiv majanumber</string>
+    <string name="editor_storey_number">Korruste arv (maks. %d)</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">Korruste arv ei või olla üle %d</string>
    <string name="editor_zip_code">Postiindeks</string>
@@ -885,7 +886,4 @@
    <string name="saved">Salvestatud</string>
    <string name="pref_left_button_disable">Keela</string>
    <string name="pref_left_button_title">Vasaku nupu seadistused</string>
-    <string name="editor_building_levels">Korruseid (sh esimene korrus, kuid katusekorruseta)</string>
-    <string name="editor_level">Korrus (0 on esimene korrus)</string>
-    <string name="error_enter_correct_level">Palun sisesta korruse number</string>
 </resources>
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -1401,5 +1401,4 @@
    <string name="type.highway.ladder">Redel</string>
    <string name="type.barrier.guard_rail">Madal maanteepiire</string>
    <string name="type.amenity.studio">Stuudio</string>
-    <string name="type.man_made.crane">Kraana</string>
 </resources>
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -497,6 +497,7 @@
    <string name="download_over_mobile_header">Deskargatu sare mugikorreko konexioarekin?</string>
    <string name="download_over_mobile_message">Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.</string>
    <string name="error_enter_correct_house_number">Sartu etxeko zenbaki baliozkoa</string>
+    <string name="editor_storey_number">Solairu kopurua (gehienez %d)</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">Solairu kopurua ez da %d-tik gorakoa izan behar</string>
    <string name="editor_zip_code">Posta kodea</string>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -470,6 +470,7 @@
    <string name="download_over_mobile_header">دانلود بر روی یک شبکه دیتای موبایل؟</string>
    <string name="download_over_mobile_message">این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد.</string>
    <string name="error_enter_correct_house_number">وارد کردن شماره ساختمان معتبر</string>
+    <string name="editor_storey_number">تعداد طبقات ( حداکثر %d )</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>
    <string name="editor_zip_code">کدپستی</string>
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -501,6 +501,7 @@
    <string name="download_over_mobile_header">Lataa käyttämällä puhelinverkkoyhteyttä?</string>
    <string name="download_over_mobile_message">Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä.</string>
    <string name="error_enter_correct_house_number">Syötä oikea talon numero</string>
+    <string name="editor_storey_number">Kerrosten määrä (maks. %d)</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">Kerrosten määrä saa olla korkeintaan %d</string>
    <string name="editor_zip_code">Postinumero</string>
@@ -890,7 +891,4 @@
    <string name="pref_left_button_title">Vasemman painikkeen asettelu</string>
    <string name="pref_left_button_disable">Poista käytöstä</string>
    <string name="saved">Tallennettu</string>
-    <string name="error_enter_correct_level">Syötä kerrosnumero</string>
-    <string name="editor_building_levels">Kerrokset (sis. pohjakerroksen, jätä pois katto)</string>
-    <string name="editor_level">Kerros (0 on pohjakerros)</string>
 </resources>
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -1338,19 +1338,4 @@
    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
    <string name="type.leisure.firepit">Tulentekopaikka</string>
    <string name="type.leisure">Leisure</string>
-    <string name="type.internet_access">Internet</string>
-    <string name="type.landuse.vineyard">Viinitarha</string>
-    <string name="type.landuse.village_green">Maa</string>
-    <string name="type.leisure.beach_resort">Rantalomakohde</string>
-    <string name="type.man_made.cairn">Kiviröykkiö</string>
-    <string name="type.man_made.cutline">Hakkuulinja</string>
-    <string name="type.man_made.pipeline">Putki</string>
-    <string name="type.man_made.pipeline.overground">Maanpäällinen putki</string>
-    <string name="type.man_made.storage_tank">Varastosäiliö</string>
-    <string name="type.man_made.breakwater">Aallonmurtaja</string>
-    <string name="type.leisure.recreation_ground">Virkistysalue</string>
-    <string name="type.internet_access.wlan">Internet</string>
-    <string name="type.man_made">Man Made</string>
-    <string name="type.fee.yes">$</string>
-    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -504,6 +504,7 @@
    <string name="download_over_mobile_header">Téléchargement avec une connexion réseau cellulaire ?</string>
    <string name="download_over_mobile_message">Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement.</string>
    <string name="error_enter_correct_house_number">Saisir un numéro de maison correct</string>
+    <string name="editor_storey_number">Nombre d\'étages (max %d)</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">Le nombre d\'étages ne doit pas dépasser %d</string>
    <string name="editor_zip_code">Code postal</string>
@@ -894,9 +895,6 @@
    <string name="error_enter_correct_bluesky_page">Entrez un nom d\'utilisateur ou une adresse web Bluesky correct</string>
    <string name="error_enter_correct_fediverse_page">Entrez un nom d\'utilisateur ou une adresse web Mastodon correct</string>
    <string name="saved">Enregistré</string>
-    <string name="pref_left_button_title">Configuration du bouton de gauche</string>
+    <string name="pref_left_button_title">Configuration du bouton en bas à gauche</string>
    <string name="pref_left_button_disable">Désactiver</string>
-    <string name="editor_building_levels">Étages (y compris le rez-de-chaussée, sans compter le toit)</string>
-    <string name="editor_level">Étage (0 est le rez-de-chaussée)</string>
-    <string name="error_enter_correct_level">Entrez un numéro d\'étage valide</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -354,6 +354,7 @@
    <string name="download_over_mobile_header">Descargar con conexión de rede móbil?</string>
    <string name="download_over_mobile_message">Podería ser moi caro con certos plans ou con itinerancia de datos.</string>
    <string name="error_enter_correct_house_number">Introducir o número de domicilio correcto</string>
+    <string name="editor_storey_number">Número de plantas (máx. %d)</string>
    <string name="error_enter_correct_storey_number">O número de plantas non debe superar %d</string>
    <string name="error_enter_correct_zip_code">Introduza un código postal válido</string>
    <string name="editor_about_osm">As súas edicións cárganse na base de datos pública <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Por favor, non engada información persoal ou protexida por dereitos de autor.</string>
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -487,6 +487,7 @@
    <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="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</string>
+    <string name="editor_storey_number">Emeletek száma (legfeljebb: %d)</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>
    <string name="editor_zip_code">Irányítószám</string>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -475,6 +475,7 @@
    <string name="download_over_mobile_header">Unduh dengan menggunakan koneksi jaringan seluler?</string>
    <string name="download_over_mobile_message">Ini bisa menjadi jauh mahal pada beberapa paket atau jika roaming.</string>
    <string name="error_enter_correct_house_number">Masukkan nomor rumah yang benar</string>
+    <string name="editor_storey_number">Jumlah lantai (maksimum %d)</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">Edit bangunan dengan maksimum %d lantai</string>
    <string name="editor_zip_code">Kode Pos</string>
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -431,6 +431,7 @@
    <string name="editor_time_allday">Allan sólarhringinn (24 klst)</string>
    <string name="select_cuisine">Veldu matreiðsluhefð</string>
    <string name="error_enter_correct_house_number">Settu inn gilt númer byggingar</string>
+    <string name="editor_storey_number">Fjöldi hæða (hámark %d)</string>
    <string name="error_enter_correct_storey_number">Fjöldi hæða getur ekki verið meiri en %d</string>
    <string name="downloader_no_downloaded_maps_title">Þú hefur ekki sótt nein kort</string>
    <string name="current_location_unknown_error_title">Fyrirliggjandi staðsetning er óþekkt.</string>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -485,6 +485,7 @@
    <string name="download_over_mobile_header">Vuoi scaricare utilizzando una connessione di rete cellulare?</string>
    <string name="download_over_mobile_message">Questa operazione potrebbe essere piuttosto costosa con alcuni piani telefonici o se in roaming.</string>
    <string name="error_enter_correct_house_number">Inserisci un numero civico valido</string>
+    <string name="editor_storey_number">Numero di piani (massimo %d)</string>
    <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
    <string name="error_enter_correct_storey_number">Il numero di piani non deve superare %d</string>
    <string name="editor_zip_code">Codice postale</string>
@@ -883,9 +884,4 @@
    <string name="instagram_url">https://www.instagram.com/comapscommunity/</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="saved">Salvato</string>
-    <string name="pref_left_button_title">Configurazione del bottone di sinistra</string>
-    <string name="pref_left_button_disable">Disattiva</string>
-    <string name="editor_building_levels">Piani (contando il piano terra, senza contare il tetto)</string>
-    <string name="editor_level">Piano (0 è il piano terra)</string>
-    <string name="error_enter_correct_level">Entra un numero di piano valido</string>
 </resources>
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -491,6 +491,7 @@
    <string name="download_over_mobile_header">להוריד באמצעות חיבור אינטרנט סלולרי?</string>
    <string name="download_over_mobile_message">זה עשוי להיות יקר עם חבילות גלישה מסוימות או בנדידה.</string>
    <string name="error_enter_correct_house_number">הזן מספר בית תקין</string>
+    <string name="editor_storey_number">מספר קומות (מקסימום: %d)</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>
    <string name="editor_zip_code">מיקוד</string>
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -501,6 +501,7 @@
    <string name="download_over_mobile_header">モバイル通信でダウンロードしますか？</string>
    <string name="download_over_mobile_message">プランによって、またはローミングしている場合、非常に高額になる可能性があります。</string>
    <string name="error_enter_correct_house_number">正しい番地を入力してください</string>
+    <string name="editor_storey_number">フロアの数（最大%d）</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>
    <string name="editor_zip_code">郵便番号</string>
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -1332,8 +1332,4 @@
    <string name="type.organic.only">有機</string>
    <string name="type.organic.yes">有機</string>
    <string name="type.power.pole">電柱</string>
-    <string name="type.amenity.shelter.lean_to">三壁の避難所</string>
-    <string name="type.amenity.vending_machine.excrement_bags">うんち袋の自販機</string>
-    <string name="type.amenity.parcel_locker">宅配ロッカー</string>
-    <string name="type.amenity.waste_transfer_station">ゴミ処理場</string>
 </resources>
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -473,6 +473,7 @@
    <string name="download_over_mobile_header">셀룰러 네트워크 접속을 사용하여 다운로드하시겠습니까?</string>
    <string name="download_over_mobile_message">이는 일부 플랜이나 로밍할 경우에 비싸다고 간주될 수 있습니다.</string>
    <string name="error_enter_correct_house_number">올바른 집 번호 입력</string>
+    <string name="editor_storey_number">층 수(최대 %d)</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>
    <string name="editor_zip_code">우편번호</string>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -488,6 +488,7 @@
    <string name="download_over_mobile_header">Atsisiųsti naudojant mobilųjį ryšį?</string>
    <string name="download_over_mobile_message">Tai gali būti itin brangu, naudojantis kai kuriais planais ar tarptinkliniu ryšiu.</string>
    <string name="error_enter_correct_house_number">Įveskite leistiną pastato numerį</string>
+    <string name="editor_storey_number">Aukštų skaičius (daugiausia %d)</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">Aukštų skaičius negali viršyti %d</string>
    <string name="editor_zip_code">Pašto kodas</string>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -500,6 +500,7 @@
    <string name="download_over_mobile_header">Vai lejupielādēt arī mobilajā tīklā?</string>
    <string name="download_over_mobile_message">Ja lietojat ierobežotus datus vai viesabonēšanu, tas var izmaksāt dārgi.</string>
    <string name="error_enter_correct_house_number">Ierakstiet derīgu ēkas numuru</string>
+    <string name="editor_storey_number">Stāvu skaits (maks. %d)</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">Stāvu skaits nedrīkst pārsniegt %d</string>
    <string name="editor_zip_code">Pasta indekss</string>
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -466,6 +466,7 @@
    <string name="download_over_mobile_header">मोबाईल डेटा वापरून डाउनलोड करायचे?</string>
    <string name="download_over_mobile_message">रोमिंग वर असल्यास हे बरेच महाग पडू शकते.</string>
    <string name="error_enter_correct_house_number">एक वैध बिल्डिंग क्रमांक प्रविष्ट करा</string>
+    <string name="editor_storey_number">मजल्यांची संख्या (कमाल %d)</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>
    <string name="editor_zip_code">पिनकोड</string>
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -343,6 +343,7 @@
    <string name="downloader_of">%1$d ta\' %2$d</string>
    <string name="download_over_mobile_header">Niżżel fuq konnessjoni tan-netwerk ċellulari?</string>
    <string name="error_enter_correct_house_number">Daħħal numru tal-bini validu</string>
+    <string name="editor_storey_number">Numru ta’ sulari (massimu ta’ %d)</string>
    <string name="error_enter_correct_storey_number">In-numru ta’ sulari m’ għandux jaqbeż il-%d</string>
    <string name="editor_zip_code">Kodiċi ZIP</string>
    <string name="error_enter_correct_zip_code">Daħħal kodiċi ZIP validu</string>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -499,6 +499,7 @@
    <string name="download_over_mobile_header">Last ned med mobildata?</string>
    <string name="download_over_mobile_message">Dette kan medføre store kostnader med enkelte dataplaner eller om du roamer.</string>
    <string name="error_enter_correct_house_number">Skriv riktig husnummer</string>
+    <string name="editor_storey_number">Antall etasjer (maks. %d)</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">Rediger bygningen med maks. %d etasjer</string>
    <string name="editor_zip_code">Postnummer</string>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`CoMaps - Andar, Pedalar, Dirigir Offline com Privacidade`
				`@@ -1 +0,0 @@`
				`Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı`