[android] Move url translations to do not translate file

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
[android] Fix camera cutout offset in navigation
2025-12-30 17:44:07 +00:00 · 2025-12-30 18:06:24 +01:00 · 2025-12-30 17:41:10 +01:00 · 2025-12-30 17:40:51 +01:00 · 2025-12-30 17:38:05 +01:00 · 2025-12-30 17:27:10 +01:00
355 changed files with 13087 additions and 6545 deletions
--- a/.forgejo/CODEOWNERS
+++ b/.forgejo/CODEOWNERS
@@ -1,69 +1,55 @@
-# All non-assigned.
-* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @organicmaps/design
-/android/app/src/main/res/font/ @organicmaps/design
-/android/app/src/main/res/mipmap*/ @organicmaps/design
-/data/*.ttf @organicmaps/design
-/data/resources-svg/ @organicmaps/design
-/data/search-icons/ @organicmaps/design
-/iphone/Maps/Images.xcassets/ @organicmaps/design
+/android/app/src/main/res/drawable*/ @comaps/design
+/android/app/src/main/res/font/ @comaps/design
+/android/app/src/main/res/mipmap*/ @comaps/design
+/data/*.ttf @comaps/design
+/data/resources-svg/ @comaps/design
+/data/search-icons/ @comaps/design
+/iphone/Maps/Images.xcassets/ @comaps/design
 # Android.
-/android/ @organicmaps/android
-/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
-/docs/JAVA_STYLE.md @organicmaps/android
+/android/ @comaps/android
+/android/app/src/main/java/app/comaps/car/ @comaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @comaps/android
+/docs/JAVA_STYLE.md @comaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @organicmaps/ios
-/xcode/ @organicmaps/ios
-/docs/OBJC_STYLE.md @organicmaps/ios
+/iphone/ @comaps/ios
+/xcode/ @comaps/ios
+/docs/OBJC_STYLE.md @comaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
-# Qt
-/qt/ @organicmaps/qt
-# Rendering
-/drape/ @organicmaps/rendering
-/drape_frontend/ @organicmaps/rendering
-# Map Data.
-/tools/python/maps_generator/ @organicmaps/data
-/generator/ @organicmaps/data
-/topography_generator/ @organicmaps/data
-/data/borders/ @organicmaps/data
-/data/conf/isolines/ @organicmaps/data
-/docs/SUBWAY_GENERATION.md @organicmaps/data
-/docs/MAPS.md @organicmaps/data
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
 # no owner (changed often to add a new POI)
 /generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-/data/styles/ @organicmaps/styles
-/data/types.txt @organicmaps/styles
-/data/visibility.txt @organicmaps/styles
-/data/mapcss-mapping.csv @organicmaps/styles
-/data/replaced_tags.txt @organicmaps/styles
-/data/classificator.txt @organicmaps/styles
-/data/drules_* @organicmaps/styles
+/data/styles/ @comaps/styles
+/data/types.txt @comaps/styles
+/data/visibility.txt @comaps/styles
+/data/mapcss-mapping.csv @comaps/styles
+/data/replaced_tags.txt @comaps/styles
+/data/classificator.txt @comaps/styles
+/data/drules_* @comaps/styles
 /docs/STYLES.md
-/tools/kothic/ @organicmaps/styles
+/tools/kothic/ @comaps/styles
 # DevOps.
-/.forgejo/workflows @organicmaps/devops
-/android/*gradle* @organicmaps/devops
-/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
-/xcode/fastlane/ @organicmaps/devops
-# Growth.
-README.md @organicmaps/growth
-/.forgejo/FUNDING.yml @organicmaps/growth
-/android/app/src/fdroid/play/ @organicmaps/growth
-/android/app/src/google/play/ @organicmaps/growth
-/iphone/metadata/ @organicmaps/growth
+/.forgejo/workflows @comaps/devops
+/android/*gradle* @comaps/devops
+/docs/RELEASE_MANAGEMENT.md @comaps/devops
+/xcode/fastlane/ @comaps/devops
+/tools/python/maps_generator/ @comaps/devops
+/generator/ @comaps/devops
+/topography_generator/ @comaps/devops
+/data/borders/ @comaps/devops
+/data/conf/isolines/ @comaps/devops
+/docs/SUBWAY_GENERATION.md @comaps/devops
+/docs/MAPS.md @comaps/devops
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @comaps/devops
 # Legal.
-LEGAL @organicmaps/legal
-LICENSE @organicmaps/legal
-NOTICE @organicmaps/legal
-CONTRIBUTORS @organicmaps/legal
-/docs/CODE_OF_CONDUCT.md @organicmaps/legal
-/docs/DCO.md @organicmaps/legal
-/docs/GOVERNANCE.md @organicmaps/legal
+LEGAL @comaps/admins
+LICENSE @comaps/admins
+NOTICE @comaps/admins
+CONTRIBUTORS @comaps/admins
+/docs/CODE_OF_CONDUCT.md @comaps/admins
+/docs/DCO.md @comaps/admins
+/docs/GOVERNANCE.md @comaps/admins
--- a/.forgejo/FUNDING.yml
+++ b/.forgejo/FUNDING.yml
@@ -1 +1,3 @@
 open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]
--- a/.forgejo/workflows/map-generator.yml
+++ b/.forgejo/workflows/map-generator.yml
@@ -105,17 +105,17 @@ jobs:
        run: |
          echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
          cd ~
-          git clone --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
+          git clone --depth 1 --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
      - name: Checkout wikiparser repo
        shell: bash
        run: |
          cd ~
-          git clone https://codeberg.org/comaps/wikiparser.git
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/wikiparser.git
      - name: Checkout subways repo
        shell: bash
        run: |
          cd ~
-          git clone https://codeberg.org/comaps/subways.git
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git

  copy-coasts:
    # if: inputs.run-copy-coasts
--- a/.forgejo/workflows/process_subways.yml
+++ b/.forgejo/workflows/process_subways.yml
@@ -0,0 +1,129 @@
+name: process_subways
+on:
+  workflow_dispatch: # Manual trigger
+
+env:
+  PLANET: /home/planet/planet/planet.o5m
+  TMPDIR: /tmp
+  HTML_DIR: "/mnt/4tbexternal/osm-planet/subway/validator"
+  DUMP: "$HTML_DIR"
+  SKIP_PLANET_UPDATE: "1"
+  DEBIAN_FRONTEND: nonnteractive
+  TZ: Etc/UTC
+
+# /var/www/html/subways is mapped as a volume on cdn-fi-1
+# as is /tmp/planet
+jobs:
+  clone-repos:
+    name: Clone Git Repos
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal:/mnt/4tbexternal
+    concurrency:
+      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/cache@v4
+        with:
+          path: "~"
+          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
+      - name: Checkout subways repo
+        shell: bash
+        run: |
+          cd ~
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
+
+  update-planet-o5m:
+    name: Update O5M Planet
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal/:/mnt/4tbexternal/
+        - /mnt/4tbexternal/osm-planet:/home/planet
+    concurrency:
+      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Check for O5M Planet File
+        shell: bash
+        run: |
+          if [ ! -f /home/planet/planet/planet.o5m ]; then
+          echo "WARN: No file at /home/planet/planet/planet.o5m"
+
+          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
+          echo "ERROR: No file at /home/planet/planet/planet-latest.osm.pbf"
+          ls -al /home/planet/
+          ls -al /home/planet/planet/
+          exit 1
+          fi
+
+          echo "Converting planet-latest.osm.pbf to planet.o5m"
+          cd /home/planet/planet/
+          osmconvert -v --drop-author --drop-version --hash-memory=4000 planet-latest.osm.pbf -o=planet.o5m
+          echo "Conversion is done."
+          fi
+      - name: Update O5M planet
+        run: |
+          echo "Starting..."
+          cd /home/planet/planet/
+          rm -f planet-new.o5m
+          osmupdate -v --drop-author --drop-version --hash-memory=4000  --max-merge=32 --out-o5m planet.o5m planet-new.o5m
+          mv planet-new.o5m planet.o5m
+          echo "Done."
+      - name: Notify Zulip
+        run: |
+          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
+            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
+            --data-urlencode type=stream \
+            --data-urlencode 'to="DevOps"' \
+            --data-urlencode topic=codeberg-bot \
+            --data-urlencode 'content=O5M planet update is done!'
+
+  update-subways:
+    if: inputs.run-subways
+    name: Update Subways
+    runs-on: mapfilemaker
+    needs:
+      - clone-repos
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal/:/mnt/4tbexternal/
+        - /mnt/4tbexternal/osm-planet:/home/planet
+    concurrency:
+      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/cache@v4
+        with:
+          path: "~"
+          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
+      - name: Update Subways
+        shell: bash
+        run: |
+          cd ~/comaps/
+          cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
+          ./tools/unix/maps/generate_subways.sh
+      - name: Compare with VK validation
+        shell: bash
+        run: |
+          cd ~/subways
+          if [ -f "$HTML_DIR/index.html" ]; then
+            echo "Comparing local validation with VK's validation..."
+            python3 ./scripts/compare_html_validation.py "$HTML_DIR/index.html" \
+              --vk-url "https://maps.vk.com/osm/tools/subways/latest/index.html"
+          else
+            echo "Local index.html not found at $HTML_DIR/index.html"
+            exit 1
+          fi
+      - name: Notify Zulip
+        run: |
+          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
+            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
+            --data-urlencode type=stream \
+            --data-urlencode 'to="DevOps"' \
+            --data-urlencode topic=codeberg-bot \
+            --data-urlencode 'content=Subways are done!'
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]
--- a/.gitignore
+++ b/.gitignore
@@ -155,6 +155,8 @@ android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 ./server/
 iphone/Maps/app.omaps/
+# Generated file
+libs/indexer/localized_types_map.cpp

 *.li

--- a/1
+++ b/1
@@ -10,6 +10,7 @@ CoMaps contributors:
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
+NoelClick
 thesupertechie
 vikiawv
 Yannik Bloscheck
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+## Reporting Vulnerabilities
+You can report a security vulnerability by creating an issue or send mail to security@comaps.app
+
+## Verifying Fingerprints
+
+To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
+```
+SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
+SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
+MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
+```
+
+To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
+```
+app.comaps
+48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
+```
--- a/android/app/src/fdroid/play/listings/ca/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ca/full-description.txt
@@ -0,0 +1,32 @@
+Una aplicació de mapes gratuïta i de codi obert dirigida per la comunitat basada en dades d'OpenStreetMap i reforçada amb el compromís amb la transparència, la privadesa i la no ànim de lucre. CoMaps és una derivació/fork d'Organic Maps, que al seu torn és una derivació de Maps.ME.
+
+Llegiu sobre els motius del projecte i la seva direcció a <b><i>codeberg.org/comaps</i></b>.
+Uneix-te a la comunitat i ajuda a crear la millor aplicació de mapes
+• Utilitza l'aplicació i difon-la
+• Dona comentaris i informa de problemes
+• Actualitza les dades del mapa a l'aplicació o al lloc web d'OpenStreetMap
+
+‣ <b>Enfocat fora de línia</b>: Planifica i navega pel teu viatge a l'estranger sense necessitat de servei mòbil, cerca punts de referència mentre fas una excursió llunyana, etc. Totes les funcions de l'aplicació estan dissenyades per funcionar fora de línia.
+‣ <b>Respecte a la privadesa</b>: L'aplicació està dissenyada tenint en compte la privadesa: no identifica persones, no fa seguiment i no recopila informació personal. Sense anuncis.
+‣ <b>Senzill i polit</b>: funcions essencials fàcils d'utilitzar que simplement funcionen.
+‣ <b>Estalvia bateria i espai</b>: No consumeix bateria com altres aplicacions de navegació. Els mapes compactes estalvien espai preciós al telèfon.
+‣ <b>Gratuït i creat per la comunitat</b>: Gent com tu ha ajudat a crear l'aplicació afegint llocs a OpenStreetMap, provant i donant comentaris sobre les funcions i aportant les seves habilitats de desenvolupament i diners.
+‣ <b>Presa de decisions i finances obertes i transparents, sense ànim de lucre i de codi obert.</b>
+
+<b>Característiques principals</b>:
+• Mapes detallats descarregables amb llocs que no estan disponibles amb Google Maps
+• Mode exterior amb rutes de senderisme destacades, càmpings, fonts d'aigua, pics, corbes de nivell, etc.
+• Senders per caminar i carrils bici
+• Punts d'interès com restaurants, gasolineres, hotels, botigues, llocs d'interès i molts més
+• Cerca per nom, adreça o categoria de punt d'interès
+• Navegació amb anuncis de veu per caminar, anar amb bicicleta o conduir
+• Marca els teus llocs preferits amb un sol toc
+• Articles de la Viquipèdia fora de línia
+• Capa i indicacions de trànsit de metro
+• Enregistrament de rutes
+• Exporta i importa marcadors i rutes en formats KML, KMZ i GPX
+• Un mode fosc per utilitzar durant la nit
+• Millora les dades del mapa per a tothom mitjançant un editor bàsic integrat
+
+<b>La llibertat és aquí</b>
+Descobreix el teu viatge, navega pel món amb la privadesa i la comunitat al capdavant!
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -0,0 +1,8 @@
+• OpenStreetMap Daten vom 17. Dezember
+• Map download server nun wählbar
+• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
+• Vermeidung von Parkplatzwegen im Routing
+• Neuer Zoombutton
+• Verbesserte Französchische Suchsynonme
+• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
+Mehr auf codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,13 +1,8 @@
-• Fixed voice directions pronouncing weird symbols in the beginning
-• OpenStreetMap data as of November 23
-
-Changes in the previous release:
-• Added trees
-• Made bus stop icons smaller and show up earlier
-• Reduce visibility of entrances
-• Added several other POI types
-• Show sand areas on the map
-• Add business is vacant option to the OSM editor
-• Improved road shields in Europe
-• Avoid paved roads routing option
-• Added icons to the settings page
+• OpenStreetMap data as of December 17
+• Make map download server configurable
+• Added info about outdated maps and an update button to the selected place info card
+• Avoid using parking aisles for routing
+• Changed shape of zoom buttons
+• Improved French search synonyms
+• OSM editor: check length limit for OSM tags in value validation
+More details on codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -0,0 +1,8 @@
+• Données OpenStreetMap du 17 décembre
+• Serveur de téléchargement de cartes configurable
+• Ajout d'un message d'avertissement pour les cartes trop anciennes
+• Évitement des allées de parking dans les itinéraires
+• Mise à jour de l'apparence des boutons de zooms
+• Amélioration des synonymes de recherche en français
+• Editeur OSM: vérification de la taille limite des tags OSM
+Plus d'informations sur codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/lt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/full-description.txt
@@ -0,0 +1,32 @@
+Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą. „CoMaps“ programa yra kilusi iš „Organic Maps“, o pastaroji – iš programos „Maps.ME“.
+
+Apie šio projekto kilmę, jos priežastis ir palaikomą kryptį galite paskaityti adresu <b><i>codeberg.org/comaps</i></b>.
+Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
+• Naudokitės programa ir paskleiskite žinią apie ją
+• Teikite atsiliepimus ir praneškite apie problemas
+• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
+
+‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
+‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
+‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
+‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
+‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
+‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
+
+<b>Pagrindinės funkcijos</b>:
+• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
+• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
+• Pėsčiųjų ir dviračių takai;
+• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
+• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
+• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
+• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
+• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
+• Kelionių metro sluoksnis ir maršrutai;
+• Trasų įrašymas;
+• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
+• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
+• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi.
+
+<b>Laisvė yra čia</b>
+Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!
--- a/android/app/src/fdroid/play/listings/lt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/short-description.txt
@@ -0,0 +1 @@
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
--- a/android/app/src/fdroid/play/listings/lt/title.txt
+++ b/android/app/src/fdroid/play/listings/lt/title.txt
@@ -0,0 +1 @@
+CoMaps – keliaukite atsijungę ir privačiai
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -0,0 +1,8 @@
+• Dados OSM de 17/12
+• Servidor de download de mapas configurável
+• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
+• Evita o uso de corredores de estacionamento para roteamento
+• Formato dos botões de zoom alterado
+• Sinônimos de busca em francês aprimorados
+• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
+Mais detalhes em codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -0,0 +1,8 @@
+• Карты OpenStreetMap от 17 декабря
+• Возможность настройки сервера для скачивания карт
+• Добавлена информация об устаревании карт и кнопка обновления (при выборе места на карте)
+• Парковочные проезды больше не используются для транзитной маршрутизации
+• Изменены кнопки масштабирования карты
+• На карту добавлены ирригационные гидранты
+• Редактор OSM: проверка максимальной длины OSM тегов
+Подробнее на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/sl/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/full-description.txt
@@ -1,31 +1,31 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
+Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.

-Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preberite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
 Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Uporabljajte orodje in širite glas o njem
 • Dajajte povratne informacije in poročajte o napakah
 • Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap

-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
+‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potovanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
 ‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
 ‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
 ‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
 ‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>

 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih zemljevidih niso na voljo.
 • Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
 • Iščite po imenu, hišnemu naslovu ali po vrsti
-• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
+• Usmerjanje z glasovnimi navodili za hojo, kolesarjenje ali vožnjo avtomobila.
 • Zaznamujte svoje najljubše kraje s preprostim dotikom
 • Wikipedijini članki brez povezave
 • Prometna plast podzemne železnice z usmerjanjem
 • Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
 • Temni prikaz za uporabo ponoči
-• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika
+• Izboljšajte podatke zemljevida za vse z uporabo vgrajenega urejevalnika

 <b>Svoboda je tu</b>
 Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!
--- a/android/app/src/fdroid/play/listings/sl/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/short-description.txt
@@ -1 +1 @@
-Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti
--- a/android/app/src/fdroid/play/listings/sl/title.txt
+++ b/android/app/src/fdroid/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps–Hodi, kolesari, vozi brez povezave, zasebno
+CoMaps – hodi in vozi brez povezave, zasebno
--- a/android/app/src/google/play/listings/es-ES/full-description.txt
+++ b/android/app/src/google/play/listings/es-ES/full-description.txt
@@ -68,4 +68,4 @@ Por favor, informa de errores, sugiere ideas y únete a nuestra comunidad en el

 <b>La Libertad Está Aquí</b>

-Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.
+¡Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad!
--- a/android/app/src/google/play/listings/lt/full-description.txt
+++ b/android/app/src/google/play/listings/lt/full-description.txt
@@ -0,0 +1,36 @@
+Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą.
+
+Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
+• Naudokitės programa ir paskleiskite žinią apie ją
+• Teikite atsiliepimus ir praneškite apie problemas
+• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
+
+<i>Jūsų atsiliepimai ir 5 žvaigždučių vertinimai yra geriausias palaikymas mums!</i>
+
+‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
+‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
+‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
+‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
+‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
+‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
+
+<b>Pagrindinės funkcijos</b>:
+• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
+• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
+• Pėsčiųjų ir dviračių takai;
+• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
+• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
+• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
+• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
+• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
+• Kelionių metro sluoksnis ir maršrutai;
+• Trasų įrašymas;
+• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
+• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
+• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi;
+• „Android Auto“ palaikymas.
+
+Praneškite apie programos problemas, siūlykite idėjas ir prisijunkite prie mūsų bendruomenės svetainėje <b><i>comaps.app</i></b>.
+
+<b>Laisvė yra čia</b>
+Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!
--- a/android/app/src/google/play/listings/lt/short-description.txt
+++ b/android/app/src/google/play/listings/lt/short-description.txt
@@ -0,0 +1 @@
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
--- a/android/app/src/google/play/listings/lt/title.txt
+++ b/android/app/src/google/play/listings/lt/title.txt
@@ -0,0 +1 @@
+CoMaps – naviguokite privačiai
--- a/android/app/src/google/play/listings/sl/short-description.txt
+++ b/android/app/src/google/play/listings/sl/short-description.txt
@@ -1 +1 @@
-Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti
--- a/android/app/src/google/play/listings/sl/title.txt
+++ b/android/app/src/google/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps - Usmerjajte zasebno
+CoMaps - Usmerjajte se zasebno
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -18,6 +18,7 @@ import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
@@ -25,7 +26,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.view.ViewCompat;
+
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.base.BaseMwmFragmentActivity;
+import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
@@ -38,11 +47,7 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
+
 import java.util.List;
 import java.util.Objects;

@@ -54,6 +59,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  private MaterialTextView mTvMessage;
  private LinearProgressIndicator mProgress;
  private MaterialButton mBtnDownload;
+  private MaterialButton mBtnAdvanced;
  private MaterialCheckBox mChbDownloadCountry;

  private String mCurrentCountry;
@@ -267,6 +273,14 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
    mProgress = findViewById(R.id.progressbar);
    mBtnDownload = findViewById(R.id.btn_download_resources);
    mChbDownloadCountry = findViewById(R.id.chb_download_country);
+    mBtnAdvanced = findViewById(R.id.btn_advanced);
+
+    mBtnAdvanced.setOnClickListener(v -> {
+      CustomMapServerDialog.show(this, url -> {
+        prepareFilesDownload(false);
+      });
+    });
+    mBtnAdvanced.setEnabled(true);

    mBtnListeners = new View.OnClickListener[BTN_COUNT];
    mBtnNames = new String[BTN_COUNT];
@@ -291,6 +305,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  {
    mBtnDownload.setOnClickListener(mBtnListeners[action]);
    mBtnDownload.setText(mBtnNames[action]);
+
+    // Allow changing server only when idle or after an error.
+    boolean advancedEnabled = (action == DOWNLOAD || action == TRY_AGAIN || action == RESUME);
+    mBtnAdvanced.setEnabled(advancedEnabled);
+    mBtnAdvanced.setAlpha(advancedEnabled ? 1f : 0.5f);
  }

  private void doDownload()
@@ -359,6 +378,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity

  private void finishFilesDownload(int result)
  {
+    mBtnAdvanced.setEnabled(true);
+    mBtnAdvanced.setAlpha(1f);
+
    if (result == ERR_NO_MORE_FILES)
    {
      // World and WorldCoasts has been downloaded, we should register maps again to correctly add them to the model.
@@ -428,12 +450,16 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
                           .setTitle(titleId)
                           .setMessage(messageId)
                           .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(PAUSE))
+                           .setOnCancelListener((dialog) -> setAction(RESUME))
                           .setPositiveButton(R.string.try_again,
                                              (dialog, which) -> {
                                                setAction(TRY_AGAIN);
                                                onTryAgainClicked();
                                              })
+                           .setNegativeButton(R.string.cancel,
+                                              (dialog, which) -> {
+                                                setAction(RESUME);
+                                              })
                           .setOnDismissListener(dialog -> mAlertDialog = null)
                           .show();
  }
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -133,7 +133,6 @@ import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textview.MaterialTextView;
-
 import java.util.ArrayList;
 import java.util.Objects;

@@ -1814,13 +1813,22 @@ public class MwmActivity extends BaseMwmFragmentActivity
    return false;
  }

-  private void deliverTtsMessage() {
-    if(Config.isTtsMessageDelivered())
+  private void deliverTtsMessage()
+  {
+    if (Config.isTtsMessageDelivered())
      return;

-    String navigationStartMessage = getResources().getString(R.string.navigation_start_tts_message);
-    navigationStartMessage += TtsPlayer.INSTANCE.getLanguageDisplayName();
-    Toast.makeText(this, navigationStartMessage, Toast.LENGTH_LONG).show();
+    String languageDisplayName = TtsPlayer.INSTANCE.getLanguageDisplayName();
+
+    if (languageDisplayName != null)
+    {
+      String navigationStartMessage = getResources().getString(R.string.navigation_start_tts_message);
+      navigationStartMessage += languageDisplayName;
+      Toast.makeText(this, navigationStartMessage, Toast.LENGTH_LONG).show();
+    }
+    else
+      Toast.makeText(this, getResources().getString(R.string.navigation_start_tts_disabled_message), Toast.LENGTH_LONG)
+          .show();

    Config.setTtsMessageDelivered();
  }
--- a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
@@ -0,0 +1,86 @@
+package app.organicmaps.dialog;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import app.organicmaps.R;
+import app.organicmaps.sdk.Framework;
+
+public final class CustomMapServerDialog
+{
+  public interface OnUrlAppliedListener
+  {
+    void onUrlApplied(@NonNull String url);
+  }
+
+  private CustomMapServerDialog() {}
+
+  public static void show(@NonNull Context context,
+                          @Nullable OnUrlAppliedListener listener)
+  {
+    View dialogView = LayoutInflater.from(context)
+        .inflate(R.layout.dialog_custom_map_server, null);
+    TextInputLayout til = dialogView.findViewById(R.id.til_custom_map_server);
+    TextInputEditText edit = dialogView.findViewById(R.id.edit_custom_map_server);
+
+    SharedPreferences prefs =
+        PreferenceManager.getDefaultSharedPreferences(context);
+    String current = prefs.getString(context.getString(R.string.pref_custom_map_download_url), "");
+    edit.setText(current);
+
+    MaterialAlertDialogBuilder builder =
+        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+            .setTitle(R.string.download_resources_custom_url_title)
+            .setMessage(R.string.download_resources_custom_url_message)
+            .setView(dialogView)
+            .setNegativeButton(R.string.cancel, null)
+            .setPositiveButton(R.string.save, null);
+
+    AlertDialog dialog = builder.create();
+    dialog.setOnShowListener(dlg -> {
+      Button ok = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+      ok.setOnClickListener(v -> {
+        String url = edit.getText() != null ? edit.getText().toString().trim() : "";
+
+        if (!url.isEmpty()
+            && !url.startsWith("http://")
+            && !url.startsWith("https://"))
+        {
+          til.setError(context.getString(R.string.download_resources_custom_url_error_scheme));
+          return;
+        }
+
+        til.setError(null);
+
+        String normalizedUrl = Framework.normalizeServerUrl(url);
+
+        prefs.edit()
+            .putString(context.getString(R.string.pref_custom_map_download_url), normalizedUrl)
+            .apply();
+
+        // Apply to native
+        Framework.applyCustomMapDownloadUrl(context, normalizedUrl);
+
+        if (listener != null)
+          listener.onUrlApplied(normalizedUrl);
+
+        dialog.dismiss();
+      });
+    });
+
+    dialog.show();
+  }
+}
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -948,7 +948,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

    mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);

-    if (Editor.nativeIsMapObjectUploaded())
+    if (Editor.nativeAreSomeFeatureChangesUploaded())
    {
      mReset.setText(R.string.editor_place_doesnt_exist);
      return;
@@ -966,7 +966,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void reset()
  {
-    if (Editor.nativeIsMapObjectUploaded())
+    if (Editor.nativeAreSomeFeatureChangesUploaded())
    {
      placeDoesntExist();
      return;
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -18,7 +18,6 @@ import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
-import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.routing.CarDirection;
 import app.organicmaps.sdk.routing.RoutingController;
@@ -99,6 +98,11 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);

+    View mTopbar = topFrame.findViewById(R.id.statutbar);
+    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
+        UiUtils.setViewNavigationTopInsetsMargin(v, windowInsets);
+        return windowInsets;
+    });
    // Show a blank view below the navbar to hide the menu content
    final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
    final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);
@@ -268,18 +272,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

  private void updateSpeedWidgets(@NonNull final RoutingInfo info)
  {
-    final LocationHelper locationHelper = MwmApplication.from(mFrame.getContext()).getLocationHelper();
-    final Location location = locationHelper.getSavedLocation();
+    final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation();
    if (location == null)
    {
      mSpeedLimit.setSpeedLimit(-1, false);
      mCurrentSpeed.setCurrentSpeed(-1);
      return;
    }
-    final double currentAvgSpeed = locationHelper.getAverageSpeed();
    final int fSpeedLimit = StringUtils.nativeFormatSpeed(info.speedLimitMps);
-    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(currentAvgSpeed);
+    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(location.getSpeed());
    mSpeedLimit.setSpeedLimit(fSpeedLimit, speedLimitExceeded);
-    mCurrentSpeed.setCurrentSpeed(currentAvgSpeed);
+    mCurrentSpeed.setCurrentSpeed(location.getSpeed());
  }
 }
--- a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
@@ -6,12 +6,10 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;

@@ -44,7 +42,6 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
-    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
    RecyclerView recyclerView = getListView();
    ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
  }
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -4,16 +4,23 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;

 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.LanguagesFragment;
 import app.organicmaps.editor.ProfileActivity;
@@ -35,7 +42,7 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.log.LogsManager;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -73,6 +80,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    initScreenSleepEnabledPrefsCallbacks();
    initShowOnLockScreenPrefsCallbacks();
    initLeftButtonPrefs();
+    initCustomMapDownloadUrlPrefsCallbacks();
  }

  private void initLeftButtonPrefs()
@@ -535,6 +543,34 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    });
  }

+  private void initCustomMapDownloadUrlPrefsCallbacks()
+  {
+    Preference customUrlPref = getPreference(getString(R.string.pref_custom_map_download_url));
+
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
+
+    String current = prefs.getString(getString(R.string.pref_custom_map_download_url), "");
+    String normalizedUrl = Framework.normalizeServerUrl(current);
+
+    // Initial summary
+    customUrlPref.setSummary(normalizedUrl.isEmpty()
+        ? getString(R.string.download_resources_custom_url_summary_none)
+        : normalizedUrl);
+
+    // Sync native
+    Framework.applyCustomMapDownloadUrl(requireContext(), normalizedUrl);
+
+    // Show dialog
+    customUrlPref.setOnPreferenceClickListener(preference -> {
+      CustomMapServerDialog.show(requireContext(), url -> {
+        preference.setSummary(url.isEmpty()
+            ? getString(R.string.download_resources_custom_url_summary_none)
+            : url);
+      });
+      return true;
+    });
+  }
+
  private void removePreference(@NonNull String categoryKey, @NonNull Preference preference)
  {
    final PreferenceCategory category = getPreference(categoryKey);
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -90,8 +90,7 @@ public enum ThemeSwitcher
    {
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

      if (RoutingController.get().isVehicleNavigation())
        style = MapStyle.VehicleDark;
@@ -104,8 +103,7 @@ public enum ThemeSwitcher
    {
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);

      if (RoutingController.get().isVehicleNavigation())
        style = MapStyle.VehicleClear;
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -196,7 +196,7 @@ public final class UiUtils
  public static void showHomeUpButton(MaterialToolbar toolbar)
  {
    toolbar.setNavigationIcon(
-        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
  }

  // this method returns the total height of the display (in pixels) including notch and other touchable areas
@@ -281,6 +281,14 @@ public final class UiUtils
    view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
  }

+  public static void setViewNavigationTopInsetsMargin(View view, WindowInsetsCompat windowInsets)
+  {
+      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+      ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+      lp.topMargin = systemInsets.top;
+      view.setLayoutParams(lp);
+  }
+
  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
  {
    View customNavigationButton = toolbar.findViewById(R.id.back);
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -154,6 +154,7 @@ public class PlacePageView extends Fragment
  private MaterialTextView mTvLastChecked;
  private View mEditPlace;
  private View mAddPlace;
+  private View mMapTooOld;
  private View mEditTopSpace;
  private ShapeableImageView mColorIcon;
  private MaterialTextView mTvCategory;
@@ -318,6 +319,7 @@ public class PlacePageView extends Fragment
    mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
    mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
    mAddPlace = mFrame.findViewById(R.id.ll__place_add);
+    mMapTooOld = mFrame.findViewById(R.id.cv__map_too_old);
    mEditTopSpace = mFrame.findViewById(R.id.edit_top_space);
    latlon.setOnLongClickListener(this);
    address.setOnLongClickListener(this);
@@ -684,39 +686,84 @@ public class PlacePageView extends Fragment

    if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
    {
-      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace);
+      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace, mMapTooOld);
    }
    else
    {
      UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
      UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
+      UiUtils.hide(mMapTooOld);
      MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
      MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);
-      mTvEditPlace.setOnClickListener(this);
-      mTvAddPlace.setOnClickListener(this);
-      mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
-      mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
-      final int editTextButtonColor =
-          Editor.nativeShouldEnableEditPlace()
+
+      boolean shouldEnableEditPlace = Editor.nativeShouldEnableEditPlace();
+
+      if (shouldEnableEditPlace)
+      {
+        mTvEditPlace.setEnabled(true);
+        mTvAddPlace.setEnabled(true);
+        mTvEditPlace.setOnClickListener(this);
+        mTvAddPlace.setOnClickListener(this);
+      }
+      else
+      {
+        String countryId = MapManager.nativeGetSelectedCountry();
+
+        if (countryId != null && MapManager.nativeIsMapTooOldToEdit(countryId))
+        {
+          // map editing is disabled because the map is too old
+          mTvEditPlace.setEnabled(true);
+          mTvAddPlace.setEnabled(true);
+          mTvEditPlace.setOnClickListener((v) -> {
+            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+          });
+          mTvAddPlace.setOnClickListener((v) -> {
+            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+          });
+
+          CountryItem map = CountryItem.fill(countryId);
+
+          if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
+              || map.status == CountryItem.STATUS_FAILED)
+          {
+            UiUtils.show(mMapTooOld);
+
+            boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
+            MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
+            UiUtils.showIf(canUpdateMap, mTvUpdateTooOldMap);
+
+            MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description);
+            if (canUpdateMap)
+            {
+              mapTooOldDescription.setText(R.string.place_page_map_too_old_description);
+              mTvUpdateTooOldMap.setOnClickListener((v) -> {
+                MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
+                UiUtils.hide(mMapTooOld);
+              });
+            }
+            else
+              mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
+          }
+        }
+        else
+        {
+          // map editing is disabled for other reasons
+          mTvEditPlace.setEnabled(false);
+          mTvAddPlace.setEnabled(false);
+        }
+      }
+
+      final int editButtonColor =
+          shouldEnableEditPlace
              ? ContextCompat.getColor(
                    getContext(),
                    UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
              : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
-      final ColorStateList editStrokeButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-      },
-              new int[]{
-                      ContextCompat.getColor(
-                              getContext(),
-                              UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)),
-                      ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled)
-              });
-      mTvEditPlace.setTextColor(editTextButtonColor);
-      mTvAddPlace.setTextColor(editTextButtonColor);
-      mTvEditPlace.setStrokeColor(editStrokeButtonColor);
-      mTvAddPlace.setStrokeColor(editStrokeButtonColor);
+
+      mTvEditPlace.setTextColor(editButtonColor);
+      mTvAddPlace.setTextColor(editButtonColor);
+      mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
+      mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
      UiUtils.showIf(
          UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace),
          mEditTopSpace);
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
@@ -2,6 +2,6 @@
 <shape
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:shape="rectangle">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
  <corners android:radius="100dp"/>
 </shape>
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
@@ -2,5 +2,5 @@
 <shape
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:shape="oval">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
 </shape>
--- a/android/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/android/app/src/main/res/drawable/ic_cloud_download.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?colorControlNormal"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960">
+      
+    <path android:fillColor="@android:color/white"
+        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q227,294 295,229Q363,164 440,164Q473,164 496.5,187.5Q520,211 520,244L520,486L584,424L640,480L480,640L320,480L376,424L440,486L440,244Q364,258 322,317.5Q280,377 280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,392 658,350.5Q636,309 600,280L600,187Q674,222 717,290.5Q760,359 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800ZM480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442L480,442Q480,442 480,442Q480,442 480,442Z"/>
+    
+</vector>
--- a/android/app/src/main/res/drawable/info_icon.xml
+++ b/android/app/src/main/res/drawable/info_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="48dp"
+  android:height="48dp"
+  android:viewportWidth="960"
+  android:viewportHeight="960"
+  android:tint="?colorControlNormal">
+  <path
+    android:fillColor="@android:color/white"
+    android:pathData="M453,680L513,680L513,440L453,440L453,680ZM479.98,366Q494,366 503.5,356.8Q513,347.6 513,334Q513,319.55 503.52,309.78Q494.04,300 480.02,300Q466,300 456.5,309.78Q447,319.55 447,334Q447,347.6 456.48,356.8Q465.96,366 479.98,366ZM480.27,880Q397.53,880 324.77,848.5Q252,817 197.5,762.5Q143,708 111.5,635.16Q80,562.32 80,479.5Q80,396.68 111.5,323.84Q143,251 197.5,197Q252,143 324.84,111.5Q397.68,80 480.5,80Q563.32,80 636.16,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,479.73Q880,562.47 848.5,635.23Q817,708 763,762.32Q709,816.63 636,848.32Q563,880 480.27,880ZM480.5,820Q622,820 721,720.5Q820,621 820,479.5Q820,338 721.19,239Q622.38,140 480,140Q339,140 239.5,238.81Q140,337.62 140,480Q140,621 239.5,720.5Q339,820 480.5,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -5,7 +5,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:clipToPadding="false"
    android:fadeScrollbars="false"
    android:fillViewport="true">
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -13,7 +13,7 @@
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:fadeScrollbars="false"
    android:fillViewport="true"
    android:clipToPadding="false">
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -11,13 +11,12 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="15dp"
+    android:layout_height="1dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="500dp"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
    android:elevation="@dimen/nav_elevation"
@@ -52,7 +51,6 @@
    app:layout_constraintEnd_toStartOf="@+id/street_frame"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginStart="@dimen/margin_quarter"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
--- a/android/app/src/main/res/layout-w1020dp/activity_settings.xml
+++ b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
@@ -3,7 +3,8 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?appBackground">

  <include
    layout="@layout/toolbar_extended"/>
@@ -17,7 +18,8 @@
      android:id="@+id/fragment_container"
      style="@style/MwmWidget.FrameLayout.Elevation"
      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
+      android:layout_height="match_parent"
+      android:background="?appBackground"/>
  </com.google.android.material.card.MaterialCardView>

 </FrameLayout>
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:clipToPadding="false"
    android:fadeScrollbars="false"
    android:fillViewport="true">
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -5,12 +5,24 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?appBackground">
  <androidx.constraintlayout.widget.ConstraintLayout
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_above="@+id/button_container"
    android:layout_gravity="center">
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_advanced"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_settings"
+        app:iconTint="?iconTint"
+        android:contentDescription="@string/download_resources_custom_url_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_margin="@dimen/margin_half" />
+
    <LinearLayout
      android:layout_width="match_parent"
      android:layout_height="match_parent"
@@ -26,7 +38,7 @@
        app:tint="?colorSecondary"/>
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/head_message"
-        style="?fontHeadline6"
+        style="@style/TextAppearance.Headline6"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_base"
@@ -36,7 +48,7 @@
        android:text="@string/download_map_title" />
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/download_message"
-        style="?fontBody2"
+        style="@style/TextAppearance.Body2"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/margin_base"
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -4,7 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:gravity="center"
  android:orientation="vertical">

@@ -28,7 +28,7 @@
        android:layout_marginBottom="8dp"
        android:text="@string/aa_connected_title"
        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+        android:textAppearance="@style/TextAppearance.Headline4"
        android:textStyle="bold" />

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

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:gravity="center"
    android:orientation="vertical">

@@ -20,7 +20,7 @@
      android:layout_marginStart="32dp"
      android:text="@string/aa_request_permission_activity_text"
      android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+      android:textAppearance="@style/TextAppearance.Headline4"
      android:textStyle="bold" />

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -3,7 +3,8 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?appBackground">

  <include
    layout="@layout/toolbar_default"/>
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -22,7 +22,7 @@
    android:layout_marginStart="@dimen/margin_base"
    android:maxLines="3"
    android:ellipsize="end"
-    android:textAppearance="?fontHeadline6"
+    android:textAppearance="@style/TextAppearance.Headline6"
    tools:text="Title" />

  <androidx.recyclerview.widget.RecyclerView
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -12,7 +12,7 @@
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/margin_base"
    android:text="@string/download_country_ask"
-    android:textAppearance="?fontBody2"
+    android:textAppearance="@style/TextAppearance.Body2"
    android:visibility="gone"
    tools:visibility="visible"/>
  <com.google.android.material.progressindicator.LinearProgressIndicator
--- a/android/app/src/main/res/layout/dialog_custom_map_server.xml
+++ b/android/app/src/main/res/layout/dialog_custom_map_server.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/til_custom_map_server"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_base"
+    android:paddingBottom="@dimen/margin_half"
+    android:hint="@string/download_resources_custom_url_title"
+    app:placeholderText="@string/download_resources_custom_url_hint"
+    app:endIconMode="clear_text">
+
+  <com.google.android.material.textfield.TextInputEditText
+      android:id="@+id/edit_custom_map_server"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:inputType="textUri"
+      android:singleLine="true" />
+</com.google.android.material.textfield.TextInputLayout>
--- a/android/app/src/main/res/layout/dialog_edit_text.xml
+++ b/android/app/src/main/res/layout/dialog_edit_text.xml
@@ -14,7 +14,6 @@
    android:textAppearance="@style/MwmTextAppearance.Title" />
  <com.google.android.material.textfield.TextInputLayout
    android:id="@+id/et__input_layout"
-    style="?fontBody1"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    app:hintEnabled="false">
--- a/android/app/src/main/res/layout/dialog_missed_map.xml
+++ b/android/app/src/main/res/layout/dialog_missed_map.xml
@@ -24,7 +24,7 @@
    android:id="@+id/items_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?panel">
+    android:background="?windowBackgroundForced">
    <include
      layout="@layout/item_missed_map"
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/dialog_missed_maps.xml
+++ b/android/app/src/main/res/layout/dialog_missed_maps.xml
@@ -26,7 +26,7 @@
    android:id="@+id/items_frame"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?windowBackgroundForced"
    android:listSelector="?clickableBackground"
    android:drawSelectorOnTop="true"/>

--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -27,7 +27,7 @@
    android:layout_marginTop="@dimen/margin_base">

    <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
      android:id="@+id/sort_by_default"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
      android:id="@+id/sort_by_name"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
      android:id="@+id/sort_by_type"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
      android:id="@+id/sort_by_distance"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
      android:id="@+id/sort_by_time"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -17,7 +17,6 @@
    android:orientation="vertical">
    <com.google.android.material.textfield.TextInputLayout
      android:id="@+id/edit_bookmark_name_input"
-      style="?fontBody1"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:hint="@string/name"
@@ -61,7 +60,7 @@
      android:layout_below="@id/tv__bookmark_set_title"
      android:layout_centerVertical="true"
      android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?attr/selectableItemBackground"
+      android:background="?selectableItemBackground"
      android:clickable="true"
      android:paddingTop="@dimen/margin_quarter_plus"
      android:paddingBottom="@dimen/margin_half_plus"
@@ -88,7 +87,6 @@
      tools:src="@drawable/ic_bookmark_none" />
  </RelativeLayout>
  <com.google.android.material.textfield.TextInputLayout
-    style="?fontBody1"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginEnd="@dimen/margin_half"
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -17,7 +17,7 @@
      android:layout_marginEnd="@dimen/margin_base"
      android:paddingTop="@dimen/margin_half"
      android:paddingBottom="@dimen/margin_base"
-      android:textAppearance="?fontHeadline6"
+      android:textAppearance="@style/TextAppearance.Headline6"
      tools:text="Xindian Shitoushan Trail" />
    <include
      layout="@layout/item_divider"
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -2,19 +2,11 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?attr/cardBackground"
+  android:background="?appBackground"
  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorPrimary"
-    android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme">
-  </com.google.android.material.appbar.MaterialToolbar>
+  <include layout="@layout/toolbar_default"/>
  <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
@@ -18,7 +18,7 @@
        app:srcCompat="@drawable/ic_done"
        android:layout_width="?actionBarSize"
        android:layout_height="?actionBarSize"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="?selectableItemBackgroundBorderless"
        android:layout_gravity="end|center_vertical"
        android:scaleType="centerInside"
        android:contentDescription="@string/save" />
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -402,11 +402,13 @@
        <com.google.android.material.textview.MaterialTextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_half"
            android:fontFamily="@string/robotoMedium"
            android:text="@string/editor_other_info"
            android:textAppearance="@style/MwmTextAppearance.Body3"/>
        <com.google.android.material.textfield.TextInputLayout
            android:id="@+id/custom_input"
+            android:layout_marginBottom="@dimen/margin_quarter"
            style="@style/MwmWidget.Editor.CustomTextInput"
            android:gravity="center_vertical"
            android:minHeight="74dp"
@@ -416,6 +418,7 @@
              android:id="@+id/input"
              style="@style/MwmWidget.Editor.FieldLayout.EditText"
              android:inputType="textMultiLine"
+              android:gravity="top"
              android:hint="@string/editor_note_hint"/>
        </com.google.android.material.textfield.TextInputLayout>
      </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -48,7 +48,6 @@
  <FrameLayout
    android:id="@+id/fragment_container"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel"/>
+    android:layout_height="match_parent" />

 </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -13,7 +13,7 @@
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:fadeScrollbars="false"
    android:fillViewport="true"
    android:clipToPadding="false">
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -6,13 +6,12 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:orientation="vertical"
-  android:background="?cardBackground">
+  android:background="?appBackground">
  <com.google.android.material.appbar.MaterialToolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?colorPrimary"
    android:gravity="end|center_vertical"
    android:theme="@style/MwmWidget.ToolbarTheme">
    <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/fragment_prefs_storage.xml
+++ b/android/app/src/main/res/layout/fragment_prefs_storage.xml
@@ -5,7 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
-    android:background="?cardBackground">
+    android:background="?appBackground">

  <com.google.android.material.textview.MaterialTextView
      android:id="@+id/header"
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -15,15 +15,20 @@
    android:theme="@style/MwmWidget.ToolbarTheme">
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/save"
-      style="@style/MwmWidget.Downloader.ToolbarButton"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:gravity="center"
+      android:layout_gravity="end|center_vertical"
+      android:background="?selectableItemBackgroundBorderless"
+      android:padding="@dimen/margin_half"
+      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
      android:text="@string/editor_report_problem_send_button"/>
  </com.google.android.material.appbar.MaterialToolbar>

  <ScrollView
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel">
+    android:layout_height="match_parent">

    <LinearLayout
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -15,7 +15,7 @@
      android:id="@+id/app_bar"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary"
+      android:background="?colorPrimary"
      android:elevation="@dimen/dp_0"
      app:elevation="@dimen/dp_0">
        <include
--- a/android/app/src/main/res/layout/fragment_suggest_country_download.xml
+++ b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
@@ -6,7 +6,6 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
  android:animateLayoutChanges="true"
  android:clickable="true"
  android:clipToPadding="false"
--- a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
+++ b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
@@ -16,7 +16,7 @@
      android:layout_marginStart="@dimen/margin_base"
      android:layout_marginTop="@dimen/margin_base"
      android:text="@string/layers_title"
-      android:textAppearance="?fontHeadline6"
+      android:textAppearance="@style/TextAppearance.Headline6"
      app:layout_constraintStart_toStartOf="parent"
      app:layout_constraintTop_toTopOf="parent" />
    <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/item_bookmark_button.xml
+++ b/android/app/src/main/res/layout/item_bookmark_button.xml
@@ -24,6 +24,6 @@
    android:layout_gravity="center_vertical"
    android:fontFamily="@string/robotoMedium"
    tools:text="Some text should go here"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
    android:textColor="?colorSecondary"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -30,7 +30,7 @@
    android:ellipsize="middle"
    android:singleLine="true"
    android:textAlignment="viewStart"
-    android:textAppearance="?fontBody1"
+    android:textAppearance="@style/TextAppearance.Body1"
    tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
  <LinearLayout
    android:id="@+id/bottom_line_container"
--- a/android/app/src/main/res/layout/item_bookmark_collection.xml
+++ b/android/app/src/main/res/layout/item_bookmark_collection.xml
@@ -25,7 +25,7 @@
      android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
      android:ellipsize="middle"
      android:singleLine="true"
-      android:textAppearance="?fontBody1"
+      android:textAppearance="@style/TextAppearance.Body1"
      tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/size"
@@ -37,7 +37,7 @@
      android:ellipsize="end"
      android:singleLine="true"
      android:textColor="?android:textColorSecondary"
-      style="?fontBody2"
+      style="@style/TextAppearance.Body2"
      tools:text="42000000" />
  </LinearLayout>
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
@@ -12,7 +12,7 @@
  android:paddingBottom="@dimen/margin_half_plus">
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/text_message"
-    style="?fontHeadline6"
+    style="@style/TextAppearance.Headline6"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_alignParentStart="true"
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/android/app/src/main/res/layout/item_category_description.xml
@@ -25,7 +25,6 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="start|bottom"
-        android:background="@android:color/transparent"
        android:clickable="true"
        android:gravity="start|top"
        android:text="@string/category_desc_more"
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.textview.MaterialTextView
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/text"
-  style="?fontHeadline6"
+  style="@style/TextAppearance.Headline6"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:background="?windowBackgroundForced"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -6,7 +6,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_gravity="center"
  android:orientation="vertical"
-  android:background="?windowBackgroundForced"
+  android:background="?cardBackground"
  android:padding="@dimen/margin_base">
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
@@ -14,7 +14,7 @@
    android:gravity="center"
    android:maxWidth="500dp"
    android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.MdcTypographyStyles.Headline6"
+    android:textAppearance="@style/TextAppearance.Headline6"
    android:textStyle="bold" />
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/editor_category_unsuitable_text"
--- a/android/app/src/main/res/layout/item_localized_name.xml
+++ b/android/app/src/main/res/layout/item_localized_name.xml
@@ -4,18 +4,16 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/name"
  android:layout_width="match_parent"
-  android:layout_height="@dimen/editor_height_field"
+  android:layout_height="wrap_content"
  android:animateLayoutChanges="true"
  android:gravity="center_vertical"
  android:orientation="horizontal">
  <com.google.android.material.textfield.TextInputLayout
    android:id="@+id/input_layout"
-    style="?fontBody1"
    android:layout_width="0dp"
    android:layout_height="wrap_content"
    android:layout_weight="1"
-    android:hint="@string/editor_edit_place_name_hint"
-    android:textColorHint="?android:textColorSecondary">
+    android:hint="@string/editor_edit_place_name_hint">
    <com.google.android.material.textfield.TextInputEditText
      android:id="@+id/input"
      style="@style/MwmWidget.Editor.FieldLayout.EditText"
@@ -31,5 +29,5 @@
    android:background="?selectableItemBackgroundBorderless"
    android:padding="@dimen/margin_half_plus"
    app:srcCompat="@drawable/ic_close"
-    app:tint="@color/base_red" />
+    app:tint="?iconTint" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -7,6 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -7,6 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -147,12 +147,12 @@
    <LinearLayout
      android:id="@+id/allday"
      android:layout_width="match_parent"
-      android:layout_height="@dimen/editor_height_allday"
+      android:layout_height="wrap_content"
      android:layout_gravity="center_vertical"
      android:background="?clickableBackground"
      android:gravity="center_vertical"
      android:orientation="horizontal"
-      android:padding="@dimen/margin_half_plus">
+      android:padding="@dimen/margin_half">

      <com.google.android.material.textview.MaterialTextView
        android:layout_width="0dp"
@@ -164,7 +164,8 @@
      <com.google.android.material.materialswitch.MaterialSwitch
        android:id="@+id/sw__allday"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_quarter"/>

    </LinearLayout>

--- a/android/app/src/main/res/layout/item_track.xml
+++ b/android/app/src/main/res/layout/item_track.xml
@@ -29,7 +29,7 @@
      android:layout_marginTop="@dimen/margin_base"
      android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
      android:singleLine="true"
-      android:textAppearance="?fontBody1"
+      android:textAppearance="@style/TextAppearance.Body1"
      tools:text="@string/tracks_title" />
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
      android:layout_marginBottom="@dimen/margin_half_plus"
      android:singleLine="true"
      android:textColor="?android:textColorSecondary"
-      android:textAppearance="?fontBody2"
+      android:textAppearance="@style/TextAppearance.Body2"
      tools:text="@string/by_distance" />
  </LinearLayout>
  <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -11,13 +11,12 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="25dp"
+    android:layout_height="1dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus"
    android:layout_marginStart="@dimen/nav_street_left"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
@@ -35,10 +34,10 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:maxLines="2"
-        android:padding="@dimen/margin_quarter"
+        android:padding="@dimen/margin_half"
        android:autoSizeTextType="uniform"
        android:autoSizeMinTextSize="19sp"
-        android:autoSizeMaxTextSize="25sp"
+        android:autoSizeMaxTextSize="24sp"
        android:minHeight="60dp"
        android:layout_gravity="center_vertical"
        android:gravity="center"
@@ -55,7 +54,6 @@
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
    android:layout_marginStart="@dimen/margin_half"
-    android:layout_marginTop="@dimen/margin_half_plus"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
    <LinearLayout
--- a/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
+++ b/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
@@ -45,7 +45,7 @@
    android:paddingStart="0dp"
    android:paddingEnd="@dimen/altitude_chart_container_padding_left">

-    <View
+    <com.google.android.material.divider.MaterialDivider
      android:layout_width="match_parent"
      android:layout_height="@dimen/divider_height"
      android:background="?dividerHorizontal"/>
--- a/android/app/src/main/res/layout/place_page_description_layout.xml
+++ b/android/app/src/main/res/layout/place_page_description_layout.xml
@@ -34,8 +34,7 @@
    android:textAppearance="?android:attr/textAppearance"
    android:gravity="start|top"
    android:textColor="?attr/colorSecondary"
-    android:text="@string/category_desc_more"
-    android:background="@android:color/transparent"/>
+    android:text="@string/category_desc_more" />
  <include
    layout="@layout/item_divider"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -4,7 +4,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?panel"
+  android:background="?windowBackgroundForced"
  android:orientation="vertical">


@@ -82,13 +82,15 @@

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

+  <include android:visibility="gone" layout="@layout/place_page_map_too_old"/>
+
  <include android:visibility="gone" layout="@layout/place_page_editor"/>

  <include android:visibility="gone" layout="@layout/place_page_add"/>
--- a/android/app/src/main/res/layout/place_page_map_too_old.xml
+++ b/android/app/src/main/res/layout/place_page_map_too_old.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+android:id="@+id/cv__map_too_old"
+android:layout_width="match_parent"
+android:layout_height="wrap_content"
+android:layout_marginHorizontal="@dimen/margin_base"
+android:layout_marginTop="@dimen/margin_half"
+app:strokeWidth="1dp"
+app:strokeColor="@color/base_accent"
+app:cardBackgroundColor="?cardBackground">
+
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
+  android:padding="@dimen/margin_base"
+  android:gravity="center_vertical">
+
+  <com.google.android.material.imageview.ShapeableImageView
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_marginEnd="@dimen/margin_base"
+    app:srcCompat="@drawable/info_icon"
+    app:tint="@color/base_accent" />
+
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:orientation="vertical">
+
+    <com.google.android.material.textview.MaterialTextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_quarter"
+      android:text="@string/place_page_map_too_old_title"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      android:textStyle="bold"
+      android:textColor="?android:textColorPrimary" />
+
+    <com.google.android.material.textview.MaterialTextView
+      android:id="@+id/tv__map_too_old_description"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_quarter"
+      android:text="@string/place_page_map_too_old_description"
+      android:fontFamily="@string/robotoRegular"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textColor="?android:textColorPrimary" />
+
+    <com.google.android.material.button.MaterialButton
+      android:id="@+id/mb__update_too_old_map"
+      style="@style/MwmWidget.M3.Button.Primary"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:layout_gravity="end"
+      android:text="@string/place_page_update_too_old_map"/>
+
+  </LinearLayout>
+
+</LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -65,7 +65,7 @@

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/oh_check_date"
-    style="?fontCaption"
+    style="@style/TextAppearance.Caption"
    android:layout_height="wrap_content"
    android:layout_width="wrap_content"
    android:layout_alignParentEnd="true"
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -155,7 +155,7 @@
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_half_plus"
        android:layout_marginBottom="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackground"
+        android:background="?selectableItemBackground"
        android:gravity="center"
        android:orientation="horizontal"
        android:paddingStart="@dimen/margin_quarter"
--- a/android/app/src/main/res/layout/placeholder_title.xml
+++ b/android/app/src/main/res/layout/placeholder_title.xml
@@ -6,6 +6,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginBottom="@dimen/margin_half_plus"
-  android:textAppearance="@style/MwmTextAppearance.Title.Toolbar"
+  android:textSize="@dimen/text_size_headline"
+  android:fontFamily="@string/robotoMedium"
  android:gravity="center_horizontal"
  tools:text="Some long long long placeholder title"/>
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -29,7 +29,7 @@
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?cardBackground"
    android:padding="@dimen/margin_base"
    android:text="@string/editor_focus_map_on_location"
    app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />
--- a/android/app/src/main/res/layout/pp_buttons_fragment.xml
+++ b/android/app/src/main/res/layout/pp_buttons_fragment.xml
@@ -4,7 +4,7 @@
  android:id="@+id/pp_buttons_layout"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?ppButtonsBackground"
+  android:background="?windowBackgroundForced"
  android:orientation="horizontal"
  android:layout_gravity="bottom">
  <include layout="@layout/item_divider" />
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -28,10 +28,9 @@
            android:layout_width="?attr/actionBarSize"
            android:layout_height="?attr/actionBarSize"
            android:layout_alignParentStart="true"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
            app:srcCompat="?homeAsUpIndicator"
-            android:scaleType="center"
-            tools:src="@drawable/ic_expand_more" />
+            android:scaleType="center" />

        <RadioGroup
            android:id="@+id/route_type"
@@ -143,7 +142,7 @@
    android:id="@+id/driving_options_btn_container"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?attr/drivingOptionsViewBg"
+    android:background="?drivingOptionsViewBg"
    android:foreground="@drawable/shadow_top"
    android:visibility="gone"
    tools:visibility="visible">
@@ -151,7 +150,7 @@
      android:id="@+id/driving_options_btn"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:background="?attr/selectableItemBackgroundBorderless"
+      android:background="?selectableItemBackgroundBorderless"
      android:gravity="center"
      android:minHeight="@dimen/height_block_base">
      <LinearLayout
--- a/android/app/src/main/res/layout/tab_timepicker.xml
+++ b/android/app/src/main/res/layout/tab_timepicker.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/MwmWidget.Tab"
-  android:textAppearance="@style/MwmTextAppearance.Body3"
-  tools:drawableStart="@drawable/ic_menu_open"
-  tools:text="Some tab"/>
--- a/android/app/src/main/res/layout/toolbar_extended.xml
+++ b/android/app/src/main/res/layout/toolbar_extended.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:orientation="vertical">
@@ -9,7 +10,8 @@
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme.DownButton"/>
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    app:navigationIcon="@drawable/ic_expand_more"/>

  <View
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/toolbar_search_controls.xml
+++ b/android/app/src/main/res/layout/toolbar_search_controls.xml
@@ -14,10 +14,9 @@
    android:id="@+id/back"
    android:layout_width="?attr/actionBarSize"
    android:layout_height="?attr/actionBarSize"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
    app:srcCompat="?homeAsUpIndicator"
    android:scaleType="center"
-    tools:src="@drawable/ic_expand_more"
    android:contentDescription="@string/back"/>

  <com.google.android.material.textfield.TextInputEditText
@@ -52,7 +51,7 @@
    android:layout_height="?actionBarSize"
    android:layout_gravity="center_vertical"
    android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
    android:contentDescription="@string/clear_the_search"
    android:scaleType="center"
    app:srcCompat="@drawable/ic_close"/>
@@ -63,7 +62,7 @@
    android:layout_height="?actionBarSize"
    android:layout_gravity="center_vertical"
    android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
    android:contentDescription="@null"
    android:scaleType="center"
    app:srcCompat="@drawable/ic_mic_white"
--- a/android/app/src/main/res/layout/toolbar_transparent.xml
+++ b/android/app/src/main/res/layout/toolbar_transparent.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/toolbar"
-  style="@style/MwmWidget.ToolbarStyle"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:theme="@style/MwmWidget.ToolbarTheme.Transparent"/>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -295,7 +295,7 @@
    <!-- location service disabled -->
    <string name="enable_location_services">Activeu els serveis de geolocalització</string>
    <string name="save">Desa</string>
-    <string name="create">crea</string>
+    <string name="create">Crear</string>
    <!-- red color -->
    <string name="red">Vermell</string>
    <!-- yellow color -->
@@ -473,7 +473,7 @@
    <string name="error_enter_correct_house_number">Introduïu un número d’edifici vàlid</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>
+    <string name="editor_zip_code">Codi Postal</string>
    <string name="error_enter_correct_zip_code">Introduïu un codi postal vàlid</string>
    <!-- Title for OSM note section in the editor -->
    <string name="editor_other_info">Nota per als voluntaris d\'OpenStreetMap (opcional)</string>
@@ -502,7 +502,7 @@
    <string name="placepage_edit_bookmark_button">Edita el marcador</string>
    <string name="placepage_personal_notes_hint">Notes personals (text o html)</string>
    <string name="editor_reset_edits_message">Voleu descartar tots els canvis locals?</string>
-    <string name="editor_reset_edits_button">Descarta</string>
+    <string name="editor_reset_edits_button">Descartar canvis</string>
    <string name="editor_remove_place_message">Voleu suprimir el lloc afegit?</string>
    <string name="editor_remove_place_button">Suprimeix</string>
    <string name="editor_place_doesnt_exist">El lloc no existeix</string>
@@ -521,8 +521,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Voleu enviar-ho a tots els usuaris?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal</string>
-    <string name="editor_share_to_all_dialog_message_2">Revisarem els canvis. Si tenim cap pregunta contactem amb vós via correu electrònic</string>
+    <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Els editors d\'OpenStreetMap revisaran els canvis. Et contactaran si tenen cap pregunta.</string>
    <string name="navigation_stop_button">Atura</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">S’està enregistrant el recorregut</string>
@@ -875,4 +875,54 @@
    <string name="delete_track_dialog_title">Voleu eliminar %s?</string>
    <string name="pref_tts_no_system_tts_short">No s\'ha trobat cap motor de text a veu, comproveu la configuració de l\'app</string>
    <string name="offline_explanation_title">Mapes sense Connexió</string>
+    <string name="charge_socket_schuko">EU Domèstic</string>
+    <string name="unknown_socket_type">endoll desconegut</string>
+    <string name="edit_socket_info_tooltip">Crea nous endolls o edita els existents.</string>
+    <string name="charging_station_available_sockets">Endolls disponibles</string>
+    <string name="charge_socket_unknown_other">Altres o desconegut</string>
+    <string name="charge_socket_count">Recompte</string>
+    <string name="charge_socket_power">Potència (kW)</string>
+    <string name="editor_socket">Editar endoll</string>
+    <string name="unknown_count">desconegut</string>
+    <string name="error_value_must_be_positive">El valor ha de ser positiu</string>
+    <string name="error_invalid_number">Número invàlid</string>
+    <string name="offline_explanation_text">Un mapa ha de ser desconegut per a veure i navegar l\'àrea.\nDescarrega mapes per a àrees on vulgues viatjar.</string>
+    <string name="list_description_empty">Edita la llista per afegir una descripció</string>
+    <string name="opens_at">Obre a %s</string>
+    <string name="closes_at">Tanca a %s</string>
+    <string name="opens_day_at">Obre els %1$s a %2$s</string>
+    <string name="closes_day_at">Tanca els %1$s a %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="many">%d mins</item>
+        <item quantity="other">%d mins</item>
+    </plurals>
+    <string name="editor_place_doesnt_exist_description">Descriu com és el lloc ara mateix per enviar una nota d\'error a la comunitat d\'OpenStreetMap</string>
+    <string name="editor_business_vacant_button">El negoci està vacant</string>
+    <string name="editor_mark_business_vacant_title">Marcar negoci com a vacant</string>
+    <string name="editor_mark_business_vacant_description">Fes servir aquesta funció si el negoci s\'ha mogut, i l\'espai està buit i llest per a un altre llogater.</string>
+    <string name="editor_submit">Enviar</string>
+    <string name="power_management">Gestió de Potència</string>
+    <string name="avoid_steps">Evita escales</string>
+    <string name="avoid_paved">Evita carreteres asfaltades</string>
+    <string name="unknown_power_output">desconegut</string>
+    <string name="charge_socket_type2">Tipus 2 (sense cable)</string>
+    <string name="charge_socket_type2_cable">Tipus 2 (amb cable)</string>
+    <string name="charge_socket_type2_combo">Tipus 2 comb.</string>
+    <string name="charge_socket_type1">Tipus 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="place_page_too_old_to_edit">L\'edició de dades d\'OpenStreetMap està deshabilitada perquè les dades del mapa són massa antigues.</string>
+    <string name="place_page_map_too_old_title">Dades del mapa desactualitzades</string>
+    <string name="place_page_map_too_old_description">Les teves dades de mapa son molt antigues, per favor actualitza el mapa.</string>
+    <string name="place_page_app_too_old_description">Les teues dades del mapa son molt antigues, per favor actualitza l\'app de CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualitzar regió del mapa</string>
+    <string name="prefs_speed_cameras_information">Les advertències de càmeres radar estan deshabilitades als països on estan prohibides per llei.</string>
+    <string name="navigation_start_tts_message">"Iniciant Navegació, idioma d\'instruccions de veu: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruccions de veu desactivades: motor TTS no disponible</string>
+    <string name="advanced">Avançat</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
+    <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">No establert</string>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -493,7 +493,7 @@
    <string name="placepage_edit_bookmark_button">Upravit záložku</string>
    <string name="placepage_personal_notes_hint">Vlastní poznámka (text nebo HTML)</string>
    <string name="editor_reset_edits_message">Vymazat všechny místní změny?</string>
-    <string name="editor_reset_edits_button">Zahodit</string>
+    <string name="editor_reset_edits_button">Zahodit změny</string>
    <string name="editor_remove_place_message">Odstranit přidané místo?</string>
    <string name="editor_remove_place_button">Odstranit</string>
    <string name="editor_place_doesnt_exist">Místo neexistuje</string>
@@ -905,4 +905,17 @@
    </plurals>
    <string name="power_management">Správa výkonu</string>
    <string name="charge_socket_schuko">Domovní EU</string>
+    <string name="prefs_speed_cameras_information">Upozornění na radary jsou vypnuty v zemích, kde je tato funkcionalita zakázána místními zákony.</string>
+    <string name="navigation_start_tts_message">"Spouštím navigaci, jazyk hlasových instrukcí: "</string>
+    <string name="place_page_map_too_old_title">Mapová data jsou zastaralá</string>
+    <string name="place_page_map_too_old_description">Vaše mapová data jsou velmi stará, doporučujeme je aktualizovat.</string>
+    <string name="place_page_app_too_old_description">Vaše aktuální mapová data jsou velmi stará, aktualizujte prosím aplikaci CoMaps.</string>
+    <string name="place_page_update_too_old_map">Aktualizovat oblast mapy</string>
+    <string name="place_page_too_old_to_edit">Úprava OpenStreetMap je zakázaná, protože mapová data jsou příliš stará.</string>
+    <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
+    <string name="download_resources_custom_url_title">Vlastní mapový server</string>
+    <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
+    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
+    <string name="advanced">Pokročilé</string>
+    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -489,7 +489,7 @@
    <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
    <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
    <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
-    <string name="editor_reset_edits_button">Kassér</string>
+    <string name="editor_reset_edits_button">Kassér ændringer</string>
    <string name="editor_remove_place_message">Slet tilføjet sted?</string>
    <string name="editor_remove_place_button">Slet</string>
    <string name="editor_place_doesnt_exist">Stedet eksisterer ikke</string>
@@ -607,7 +607,7 @@
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_tolls">Undgå betalingsveje</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">Undgå ikke-asfalterede veje</string>
+    <string name="avoid_unpaved">Undgå veje uden fast belægning</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_ferry">Undgå færger</string>
    <string name="avoid_motorways">Undgå motorveje</string>
@@ -894,4 +894,17 @@
    <string name="editor_submit">Indsend</string>
    <string name="power_management">Strømstyring</string>
    <string name="charge_socket_schuko">Europæisk</string>
+    <string name="prefs_speed_cameras_information">Advarsler om hastighedskameraer er deaktiveret i lande, hvor advarsler er forbudt i henhold til lokal lovgivning.</string>
+    <string name="navigation_start_tts_message">"Starter navigation, sprog for stemmeinstruktioner: "</string>
+    <string name="place_page_map_too_old_title">Kortdata forældet</string>
+    <string name="place_page_map_too_old_description">Dine nuværende kortdata er meget gamle. Opdater kortet.</string>
+    <string name="place_page_app_too_old_description">Dine nuværende kortdata er meget gamle. Opdater CoMaps-appen.</string>
+    <string name="place_page_update_too_old_map">Opdater kortregion</string>
+    <string name="place_page_too_old_to_edit">Redigering af OpenStreetMap er deaktiveret, fordi kortdataene er for gamle.</string>
+    <string name="navigation_start_tts_disabled_message">Stemmeinstruktioner deaktiveret: TTS-motor ikke tilgængelig</string>
+    <string name="advanced">Avanceret</string>
+    <string name="download_resources_custom_url_title">Brugerdefineret kortserver</string>
+    <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
+    <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
+    <string name="download_resources_custom_url_error_scheme">Indtast en fuld URL, der starter med https:// og ender med /</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
    <string name="delete">Löschen</string>
    <string name="download_maps">Karten herunterladen</string>
    <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen, Antippen für einen neuen Versuch</string>
+    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen – antippen für einen erneuten Versuch</string>
    <!-- Settings/Downloader - info for country which started downloading -->
    <string name="downloading">Wird heruntergeladen …</string>
    <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Eingeschränkte Genauigkeit</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktivieren Sie „Genauer Standort“ in den Einstellungen</string>
+    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktiviere „Genauer Standort“ in den Einstellungen</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">Auf der Karte anzeigen</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
@@ -36,7 +36,7 @@
    <string name="try_again">Erneut versuchen</string>
    <string name="about_menu_title">Über CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Offenes Projekt, von der Gemeinschaft entwickelt</string>
+    <string name="about_headline">Freies Projekt, von der Gemeinschaft entwickelt</string>
    <!-- Text in About screen -->
    <string name="about_proposition_1">• Ausgereift und einfach zu bedienen</string>
    <!-- Text in About screen -->
@@ -53,10 +53,10 @@
    <!-- Used in DownloadResources startup screen -->
    <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um CoMaps zu verwenden</string>
    <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen</string>
-    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s Speicherplatz benötigt.</string>
+    <string name="not_enough_free_space_on_sdcard">Bitte zuerst den Speicherplatz auf der SD-Karte/USB-Speicher freigeben, um die Anwendung nutzen zu können</string>
+    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s des Speicherplatzes benötigt.</string>
    <string name="download_resources_continue">Zur Karte</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. Sie können jetzt \nzur Karte weitergehen.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. \nSie können jetzt zur Karte weitergehen.</string>
    <string name="download_country_ask">%1$s herunterladen? (%2$s)</string>
    <string name="update_country_ask">%1$s aktualisieren? (%2$s)</string>
    <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -84,7 +84,7 @@
    <!-- Header of settings activity where user defines storage path -->
    <string name="maps_storage">Karten speichern auf</string>
    <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Wählen Sie den Speicherort für die herunterzuladenden Karten</string>
+    <string name="maps_storage_summary">Wähle den Speicherort für die herunterzuladenden Karten</string>
    <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
    <string name="maps_storage_downloaded">Heruntergeladene Karten</string>
    <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -94,7 +94,7 @@
    <!-- Error moving map files from one storage to another -->
    <string name="move_maps_error">Fehler beim Verschieben der Karten</string>
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
+    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
    <!-- Measurement units title in settings activity -->
    <string name="measurement_units">Maßeinheiten</string>
    <!-- Detailed description of Measurement Units settings button -->
@@ -105,7 +105,7 @@
    <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
    <string name="category_food">Lebensmittel</string>
    <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
-    <string name="category_transport">Verkehr</string>
+    <string name="category_transport">ÖPNV</string>
    <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
    <string name="category_fuel">Tankstelle</string>
    <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
@@ -125,7 +125,7 @@
    <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
    <string name="category_nightlife">Nachtleben</string>
    <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Freizeit mit Kindern</string>
+    <string name="category_children">Familienfreizeit</string>
    <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
    <string name="category_bank">Bank</string>
    <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -137,7 +137,7 @@
    <!-- Search category for post offices; any changes should be duplicated in categories.txt @category_post! -->
    <string name="category_post">Post</string>
    <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
-    <string name="category_police">Polizeistation</string>
+    <string name="category_police">Polizei</string>
    <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
    <string name="category_recycling">Recycling</string>
    <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -148,8 +148,8 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notizen</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit Ihnen geteilt</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps App. Sie können sie mit CoMaps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Reisen mit CoMaps!</string>
+    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps-App. Du kannst in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
    <!-- message title of loading file -->
    <string name="load_kmz_title">Lesezeichen werden geladen</string>
    <!-- Kmz file successful loading -->
@@ -163,15 +163,15 @@
    <!-- resource for context menu -->
    <string name="edit">Bearbeiten</string>
    <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">Ihr Standort konnte noch nicht ermittelt werden</string>
+    <string name="unknown_current_position">Dein Standort konnte noch nicht ermittelt werden</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
    <string name="cant_change_this_setting">Entschuldige, die Einstellungen für die Kartenspeicherung sind aktuell deaktiviert</string>
    <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Die Karte wird heruntergeladen</string>
+    <string name="downloading_is_active">Die Karte wird jetzt heruntergeladen</string>
    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/download/</string>
+    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/de/download/</string>
    <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel auf der CoMaps-Karte an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel in der CoMaps-App an!</string>
    <!-- Subject for emailed position -->
    <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -179,7 +179,7 @@
    <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
    <string name="share">Teilen</string>
    <!-- Share by email button text, also used in editor and About. -->
-    <string name="email">Email</string>
+    <string name="email">E-Mail</string>
    <!-- Text for message when used successfully copied something -->
    <string name="copied_to_clipboard">In die Zwischenablage kopiert: %s</string>
    <!-- Used for bookmark editing -->
@@ -197,7 +197,7 @@
    <string name="prefs_group_information">Information</string>
    <string name="prefs_group_route">Navigation</string>
    <string name="pref_zoom_title">Zoom-Tasten</string>
-    <string name="pref_zoom_summary">Auf der Karte anzeigen</string>
+    <string name="pref_zoom_summary">Zur Anzeige auf der Karte</string>
    <!-- Settings «Map» category: «Night style» title -->
    <string name="pref_map_style_title">Nachtmodus</string>
    <!-- Generic «Off» string -->
@@ -219,9 +219,9 @@
    <!-- Settings «Route» category: «Tts announce street names» description -->
    <string name="pref_tts_street_names_description">Wenn aktiviert, wird der Name der Straße oder Ausfahrt, in die abgebogen werden soll, laut angekündigt.</string>
    <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Sprache für Sprachführung</string>
+    <string name="pref_tts_language_title">Sprache der Sprachführung</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Teste Sprachanweisungen</string>
+    <string name="pref_tts_test_voice_title">Teste die Sprachanweisungen</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
    <string name="pref_tts_playing_test_voice">Überprüfe die Lautstärke oder die Text-To-Speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hören kannst</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -330,7 +330,7 @@
    <string name="blue_gray">Graublau</string>
    <!-- SECTION: Routing dialogs strings -->
    <string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
-    <string name="dialog_routing_disclaimer_priority">– Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
+    <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
    <string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
    <string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
    <string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
@@ -502,7 +502,7 @@
    <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
    <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
    <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
-    <string name="editor_reset_edits_button">Verwerfen</string>
+    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
    <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
    <string name="editor_remove_place_button">Löschen</string>
    <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
@@ -543,7 +543,7 @@
    <string name="big_font">Schrift auf der Karte vergrößern</string>
    <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
    <!-- "traffic" as in "road congestion" -->
-    <string name="traffic_data_unavailable">Verkehrsdaten sind nicht verfügbar</string>
+    <string name="traffic_data_unavailable">Es sind keine Verkehrsdaten verfügbar</string>
    <string name="enable_logging">Protokollierung aktivieren</string>
    <!-- Settings: "Send general feedback" button -->
    <string name="feedback_general">Allgemeines Feedback</string>
@@ -873,7 +873,7 @@
    <string name="avoid_steps">Treppen vermeiden</string>
    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
    <string name="offline_explanation_title">Offline-Karten</string>
-    <string name="offline_explanation_text">Um die Gegend anzusehen, muss eine Karte heruntergeladen werden.\nLaden Sie Karten für die Gebiete herunter, die Sie bereisen möchten.</string>
+    <string name="offline_explanation_text">Um die Gegend anzusehen und zu erkunden, musst du eine Karte runterladen.\nLade dir Karten für die Gebiete runter, die du bereisen willst.</string>
    <string name="charge_socket_type2">Typ 2 (ohne Kabel)</string>
    <string name="charge_socket_type2_cable">Typ 2 (mit Kabel)</string>
    <string name="charge_socket_type2_combo">Typ 2 Combo</string>
@@ -898,13 +898,26 @@
    <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
    <string name="closes_day_at">Schließt am %1$s um %2$s</string>
    <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="other">%d min</item>
+        <item quantity="one">(%d min)</item>
+        <item quantity="other">(%d min)</item>
    </plurals>
    <string name="editor_business_vacant_button">Geschäft steht leer</string>
-    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
    <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Wenn das Unternehmen ausgezogen ist und die Fläche leer und bereit für die nächste Miete ist.</string>
+    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
    <string name="charge_socket_schuko">Schuko</string>
-    <string name="power_management">Energiemanagement</string>
+    <string name="power_management">Stromverbrauch verwalten</string>
+    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
+    <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
+    <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
+    <string name="place_page_update_too_old_map">Kartenregion aktualisieren</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-Bearbeitung ist deaktiviert, da die Kartendaten zu alt sind.</string>
+    <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
+    <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
+    <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</string>
+    <string name="download_resources_custom_url_title">Benutzerdefinierter Kartenserver</string>
+    <string name="advanced">Fortgeschritten</string>
+    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
+    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
+    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
 </resources>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės`
				`@@ -0,0 +1 @@`
				`CoMaps – keliaukite atsijungę ir privačiai`