[countries] Order map parts correctly after German states

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
[android] Fix colors used on bottomsheet during track recording
2026-01-11 14:54:17 +00:00 · 2026-01-10 21:34:51 +01:00 · 2026-01-10 19:05:56 +01:00 · 2026-01-10 14:18:30 +00:00 · 2026-01-10 15:18:23 +01:00 · 2026-01-10 14:55:09 +01:00
379 changed files with 15881 additions and 8129 deletions
--- a/.forgejo/workflows/process_subways.yml
+++ b/.forgejo/workflows/process_subways.yml
@@ -1,17 +1,13 @@
-name: compare_subways
+name: process_subways
 on:
  workflow_dispatch: # Manual trigger
-  schedule:
-    # Run daily at 00:00 UTC
-    - cron: '0 0 * * *'

 env:
-  #PLANET: /home/planet/planet/planet-latest.pbf
-  #TMPDIR: /tmp
+  PLANET: /home/planet/planet/planet.o5m
+  TMPDIR: /tmp
  HTML_DIR: "/mnt/4tbexternal/osm-planet/subway/validator"
-  #DUMP: "$HTML_DIR"
-  #SKIP_PLANET_UPDATE: "1"
-  SPREADSHEET_ID: "1SEW1-NiNOnA2qDwievcxYV1FOaQl1mb1fdeyqAxHu3k"
+  DUMP: "$HTML_DIR"
+  SKIP_PLANET_UPDATE: "1"
  DEBIAN_FRONTEND: nonnteractive
  TZ: Etc/UTC

@@ -26,68 +22,20 @@ jobs:
      volumes:
        - /mnt/4tbexternal:/mnt/4tbexternal
    concurrency:
-      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
+      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 main repo
-        shell: bash
-        run: |
-          echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
-          cd ~
-          git clone --depth 1 --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
+          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-pbf:
-    name: Update PBF 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 }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Download Planet File if Absent
-        shell: bash
-        # TODO: replace wget2 with curl -Z
-        run: |
-          if [ ! -d /home/planet/planet/ ]; then
-          mkdir -p /home/planet/planet/
-          fi
-          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
-          cd /home/planet/planet/
-          wget2 --verbose --progress=bar --continue https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
-          else
-          echo "planet-latest.osm.pbf was found, raw download not required."
-          fi
-      - name: Update PBF Planet
-        shell: bash
-        run: |
-          cd /home/planet/planet/
-          rm -f planet-latest-new.osm.pbf
-          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
-          mv planet-latest-new.osm.pbf planet-latest.osm.pbf
-      - 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=PBF planet update is done!'
-
  update-planet-o5m:
-    if: false
    name: Update O5M Planet
    runs-on: mapfilemaker
    container:
@@ -96,7 +44,7 @@ jobs:
        - /mnt/4tbexternal/:/mnt/4tbexternal/
        - /mnt/4tbexternal/osm-planet:/home/planet
    concurrency:
-      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
      cancel-in-progress: true
    steps:
      - name: Check for O5M Planet File
@@ -134,8 +82,9 @@ jobs:
            --data-urlencode topic=codeberg-bot \
            --data-urlencode 'content=O5M planet update is done!'

-  compare-subways:
-    name: Compare Subways
+  update-subways:
+    if: inputs.run-subways
+    name: Update Subways
    runs-on: mapfilemaker
    needs:
      - clone-repos
@@ -145,19 +94,31 @@ jobs:
        - /mnt/4tbexternal/:/mnt/4tbexternal/
        - /mnt/4tbexternal/osm-planet:/home/planet
    concurrency:
-      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
+      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: Compare Subways
+      - 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 \
@@ -166,47 +127,3 @@ jobs:
            --data-urlencode 'to="DevOps"' \
            --data-urlencode topic=codeberg-bot \
            --data-urlencode 'content=Subways are done!'
-      - name: Compare with VK validation
-        shell: bash
-        run: |
-          set -e
-          cd ~/subways
-          if [ -f "$HTML_DIR/cities.txt" ]; then
-            echo "Comparing local validation with VK's validation..."
-            python3 ./scripts/compare_html_validation.py "$HTML_DIR/cities.txt" \
-              --remote-url "https://maps.vk.com/osm/tools/subways/latest/cities.txt"
-          else
-            echo "Local cities.txt not found at $HTML_DIR/cities.txt"
-            exit 1
-          fi
-      - name: Compare Google Sheets Data
-        shell: bash
-        run: |
-          set -e
-
-          # Download the Google Sheets data
-          GOOGLE_SHEETS_URL="https://docs.google.com/spreadsheets/d/${SPREADSHEET_ID}/export?format=csv"
-          echo "Downloading Google Sheets data from: $GOOGLE_SHEETS_URL"
-          curl -sL "$GOOGLE_SHEETS_URL" -o /tmp/google_sheets.csv
-
-          # Normalize line endings to avoid spurious diffs
-          sed 's/\r$//' source_data/Rapid.csv > /tmp/local_normalized.csv
-          sed 's/\r$//' /tmp/google_sheets.csv > /tmp/google_normalized.csv
-
-          # Generate unified diff
-          echo ""
-          echo "Differences between local Rapid.csv and Google Sheets:"
-          echo ""
-
-          if diff -u /tmp/local_normalized.csv /tmp/google_normalized.csv > /tmp/full_diff.txt; then
-            echo "No differences found! Local Rapid.csv is in sync with Google Sheets."
-            exit 0
-          else
-            cat /tmp/full_diff.txt
-
-            echo ""
-            echo "The above diff can be saved as a patch and applied with:"
-            echo "  patch source_data/Rapid.csv < patch-file"
-            echo "or by manually reviewing and applying the changes."
-            exit 1
-          fi
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          fetch-depth: 1

@@ -78,7 +78,7 @@ jobs:
          pip install "protobuf<3.21" --break-system-packages

      - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          fetch-depth: 200 # enough to get all commits for the current day

@@ -103,7 +103,7 @@ jobs:
          ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}

      - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: android-${{ matrix.flavor }}
          path: android/app/build/outputs/apk/**/CoMaps-*.apk
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -35,7 +35,7 @@ jobs:
          xcodebuild -downloadPlatform iOS

      - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Parallel submodules checkout
        shell: bash
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,20 +116,6 @@ endif()

 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})

-if (PLATFORM_LINUX OR PLATFORM_ANDROID)
-  find_program(LLD_FOUND ld.lld)
-  if (LLD_FOUND)
-    message(STATUS "Using ld.lld linker")
-    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld")
-  else()
-    find_program(GOLD_FOUND ld.gold)
-    if (GOLD_FOUND)
-      message(STATUS "Using ld.gold")
-      set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold")
-    endif()
-  endif()
-endif()
-
 if (NOT SKIP_TESTS)
  enable_testing()
  # Enables ctest -T memcheck with valgrind
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 Copyright 2020 My.com B.V. (Mail.Ru Group)
 Copyright 2025 Organic Maps Contributors
-Copyright 2025 CoMaps Contributors
+Copyright 2026 CoMaps Contributors

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -254,18 +254,20 @@ android {
  androidResources {
    ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
    noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
+    // Some languages not supported by Android require to be specified here to be applied
    localeFilters += [
+            "en",
            "af",
            "ar",
            "az",
            "be",
            "bg",
+            "bn",
            "ca",
            "cs",
            "da",
            "de",
            "el",
-            "en",
            "en-rGB",
            "es",
            "es-rMX",
@@ -275,28 +277,38 @@ android {
            "fi",
            "fr",
            "fr-rCA",
-            "iw",
+            "gl",
+            "gsw",
+            "he",
            "hi",
            "hu",
+            "id",
            "in",
+            "is",
            "it",
+            "iw",
            "ja",
+            "kw",
            "ko",
            "lt",
            "lv",
            "mr",
            "mt",
            "nb",
+            "nb-rNO",
            "nl",
            "pl",
            "pt",
            "pt-rBR",
            "ro",
            "ru",
+            "sl",
            "sk",
            "sr",
+            "b+sr+Latn",
            "sv",
            "sw",
+            "ta",
            "th",
            "tr",
            "uk",
@@ -351,6 +363,8 @@ dependencies {
  implementation libs.androidx.recyclerview
  implementation libs.androidx.work.runtime
  implementation libs.androidx.lifecycle.process
+  implementation libs.androidx.documentfile
+  // 1.13 Material library version doesn't render properly alpha properties on map buttons
  implementation libs.android.material
  // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
  // https://github.com/organicmaps/organicmaps/issues/6106
--- a/android/app/src/fdroid/play/listings/de-DE/full-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/full-description.txt
@@ -1,6 +1,6 @@
 Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.

-Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
+Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b> (auf Englisch).
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
@@ -9,9 +9,9 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
 ‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
 ‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
-‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
+‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig viel Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, diese App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source.</b>

 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor

-<b>Entdecke die Unabhängigkeit</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+<b>Freiheit beginnt hier</b>
+Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,8 +1,9 @@
-• 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
+• OSM-Daten vom 6. Januar
+• Editor: POI mit mehr als einem Tag, (z.B. Arten von Kunstwerken wie Skulpturen...), mehr POI können als leer/stillgelegt werden
+• Miniatureisenbahnen & Kläranlagen hinzugefügt
+• Material 3-Dialoge & dunklerer Hintergrund im Darkmode
+• Fiktive Geschwindigkeitsbegrenzungen für Verbindungsstraßen entfernt
+• Versatz der Kameraausschnitt in der Navigation behoben
+• Weniger empfindliches langes Antippen
+
+Weitere Details unter codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/de-DE/short-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
--- a/android/app/src/fdroid/play/listings/en-AU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-AU/full-description.txt
@@ -0,0 +1,32 @@
+A community led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
+
+Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
+Join the community there and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+‣ <b>Offline focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - it does not identify people, does not track, and does not collect personal information. Ad free.
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, cycling, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/fdroid/play/listings/en-GB/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/full-description.txt
@@ -0,0 +1,32 @@
+A community-led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
+
+Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
+Join the community there and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+‣ <b>Offline-focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, cycling, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/fdroid/play/listings/en-GB/short-description.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/short-description.txt
@@ -0,0 +1 @@
+Easy map navigation - Discover more of your journey - Powered by the community
--- a/android/app/src/fdroid/play/listings/en-GB/title.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/title.txt
@@ -0,0 +1 @@
+CoMaps - Hike, Bike, Drive Offline with Privacy
--- 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,8 +1,9 @@
-• 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
+• OpenStreetMap data as of January 6
+• Editor: add POI types with more than one OSM tag, e.g. artwork subtypes sculptures, paintings..; more POI types could be marked as vacant/disused
+• Added miniature railways and wastewater treatment plants
+• Use Material 3 dialogs and darker background in dark mode
+• Removed fictional speed limits for link roads
+• Fixed camera cutout offset in navigation
+• Less sensitive long tap (full-screen mode)
+
 More details on codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -0,0 +1,9 @@
+• Datos OSM a 06/01
+• Editor: se añaden tipos de POI con más de una etiqueta, ej. esculturas, pinturas...; se podrán marcar más tipos como en desuso
+• Se añaden ferrocarriles mini y plantas de tratamiento de aguas
+• Se utilizan diálogos Material 3 y fondo más oscuro en el modo oscuro
+• Se eliminan límites de velocidad ficticios para enlaces
+• Se corrige desplazamiento en la navegación
+• Toque largo menos sensible (en pantalla completa)
+
+Más detalles en 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
@@ -1,8 +1,9 @@
-• 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
+• Données OpenStreetMap du 6 janvier
+• Éditeur : support des types de POI avec plus d’un tag OSM, par exemple types d’œuvres d’art sculptures, peintures..
+• Rendu des rails pour trains miniatures et des stations d'épuration
+• Utilisation des pop-ups Material 3 et d'un fond plus sombre en thème sombre
+• Suppression des limites de vitesse fictives sur les bretelles de routes
+• Correction des instructions de navigation sur les appareils avec des encoches
+• Appui long moins sensible (en mode plein écran)
+
+Plus de détails sur codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/hr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/hr/release-notes.txt
@@ -0,0 +1,7 @@
+• OpenStreetMap podaci od 6. siječnja
+• Uređivač: dodane točake interesa s više od jedne OSM oznake, npr. podtipovi umjetnina kao skulpture, slike...; više točaka interesa se sada može označiti kao upražnjene/napuštene
+• Dodane minijaturne željeznice i postrojenja za pročišćavanje otpadnih voda
+• Korištenje Material 3 dijaloga i tamnije pozadine u tamnom načinu rada
+• Uklonjena su izmišljena ograničenja brzine za spojne ceste
+
+Više detalja na codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/kw/full-description.txt
+++ b/android/app/src/fdroid/play/listings/kw/full-description.txt
@@ -0,0 +1,32 @@
+Unn app mappys rydh hag ygor selys war an kemeneth, selys war data OpenStreetMap ha krefhys gans omrians dhe klerder, privetter, ha heb budh. CoMaps yw unn forgh a Organic Maps, unn forgh a Maps.ME.
+
+Redya ma a-dro resons rag an ragdres hag y tu yn <b><i>codeberg.org/comaps</i></b>.
+Omjunya an kemeneth ena ha gweres gul an app mappys gwella
+• Devnydhya an app ha kevrenna y'n
+• Dasliva ha derivas kudynnow
+• Nowedhi data mappa yn an app po war an gwasiva OpenStreetMap
+
+‣ <b>Fogellys war dhywarlinen</b>: Devisya ha viajya dha viaj tramor neb res rag gonis kellgowser, hwilas leow ha war unn gwandrans pell, h.e. Oll nasyow app yw desinys dhe oberi dhywarlinen.
+‣ <b>Ow Gul Revrons dhe Privetter</b>: An app yw desinys gans privetter yn brys - na aswon tus, na helerghi, ha na kuntel kudhlow personel. Heb argemynnow.
+‣ <b>Sempel ha Polsys</b>: nasyow es may oberi poran.
+‣ <b>Sawya dha Batri hag Efander</b>: Na gwakhe dha batri haval dhe appys navigacyon aral. Mappys kesstrothys sawya efander precyous war dha kellgowser.
+‣ <b>Rydh ha Byldys gans an Kemeneth</b>: Tus haval dhe ty gwerys byldya an app gans owth addya leos dhe OpenStreetMap, ow previ ha dasliva a-dro nasyow hag ow kevri aga sleynethow hag arghans i.
+‣ <b>Erviransow hag Arghansereth Ygor ha Treusweladow, Heb Budh, ha Kod Ygor yn Leun</b>
+
+<b>Nasyow Chif</b>
+• Mappys manylys iskargadow gans leos ankavadow war Google Maps
+• Fordh Yn-Mes gans olow gwandrans, kampvaow, pennfentynnyow dowr, menydhyow, linennow kettres, h.e.
+• Hensyow kerdhyans ha diwrosyans
+• Leow kepar ha bostiow, petrolvaow, ostelyow, gwethjiow, troyll gwelyow, ha moy
+• Hwilas gans hanow po unn trigva po gans klass leow
+• Navigacyon gans gwarnyansow kewsys rag ow walkya, ow diwrosa, po ow lewa
+• Lyververkya dha leow drudh gans unn tava unnik
+• Artiklow dhywarlinen Wikipedya
+• Gwiskas metro ha tuyow
+• Helerghyans lerghow
+• Esperthi hag ynperthi lyververkys ha lerghow yn furvasow KML, KMZ, GPX
+• Unn fordh du rag an nos
+• Gwellhe data mappa rag peub ow devnydhya unn chanjyell selyek
+
+<b>Rydhses Yw Omma</b>
+Trovya dha viaj, viajya an nor gans privetter ha kemeneth a-talenebek!
--- a/android/app/src/fdroid/play/listings/kw/short-description.txt
+++ b/android/app/src/fdroid/play/listings/kw/short-description.txt
@@ -0,0 +1 @@
+Navigacyon mappa es - Trovya moy a dha kerdh - Selys war an kemeneth
--- a/android/app/src/fdroid/play/listings/kw/title.txt
+++ b/android/app/src/fdroid/play/listings/kw/title.txt
@@ -0,0 +1 @@
+CoMaps - Viajya gans Privetter
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,8 +1,9 @@
-• 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
+• Dados OSM de 6/1
+• Editor: adição de POIs com mais de uma etiqueta OSM, por exemplo esculturas e pinturas; mais tipos de POI podem ser marcados como vagos/desativados
+• Adição de ferrovias em miniatura e ETEs
+• Uso de diálogos Material 3 e fundo mais escuro no modo escuro
+• Remoção de limites de velocidade fictícios para vias de ligação
+• Correção de recorte da câmera na navegação
+• Toque longo menos sensível (modo tela cheia)
+
 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
@@ -1,8 +1,8 @@
-• Карты OpenStreetMap от 17 декабря
-• Возможность настройки сервера для скачивания карт
-• Добавлена информация об устаревании карт и кнопка обновления (при выборе места на карте)
-• Парковочные проезды больше не используются для транзитной маршрутизации
-• Изменены кнопки масштабирования карты
-• На карту добавлены ирригационные гидранты
-• Редактор OSM: проверка максимальной длины OSM тегов
+• Карты OpenStreetMap от 6 января
+• Редактор: возможность добавления POI, определяемых несколькими тегами, например церквей, мечетей, буддистских храмов..
+• Добавлены миниатюрные железные дороги и очистные сооружения
+• Использование диалогов Material 3 и более тёмного фона в тёмном режиме
+• Удалены фиктивные ограничения скорости для заездов / съездов с шоссе
+• Менее чувствительное длительное нажатие на экран (переход в полноэкранный режим)
+
 Подробнее на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/sr-Latn/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr-Latn/full-description.txt
@@ -0,0 +1,32 @@
+Besplatna aplikacija otvorenog koda koju održava zajednica i koja se zasniva na OpenStreetMap podacima. Neprofitna, transparentna i ceni vašu privatnost. CoMaps je nastala od aplikacije Organic Maps, koja je nastala od aplikacije Maps.ME.
+
+Pročitajte o razlozima projekta i njegovog pravca na <b><i>codeberg.org/comaps</i></b>
+Pridružite se otvorenoj zajednici i pomozite da napravimo najbolju aplikaciju za mape
+• Koristite aplikaciju i proširite glas o tome
+• Dajte povratne informacije i prijavite probleme
+• Ažurirajte podatke na mapi u aplikaciji ili na sajtu OpenStreetMap
+
+‣ <b>Fokusirano na oflajn rad</b>: Planirajte i upravljajte putovanjem u inostranstvu bez potrebe za mobilnim internetom, tražite usputne tačke dok ste na zabačenom planinskom putu, itd. Sve funkcionalnosti su dizajnirane za rad bez interneta.
+‣ <b>Poštovanje privatnosti</b>: Aplikacija je osmišljena sa privatnošću korisnika na umu - ne identifikuje ljude, ne prati ili prikuplja lične podatke. Nema reklama.
+‣ <b>Jednostavno i elegantno</b>: Aplikacija je laka za upotrebu i jednostavno funkcioniše.
+‣ <b>Čuva vašu bateriju i prostor</b>: Ne troši bateriju kao ostale aplikacije za navigaciju. Kompaktne mape čuvaju dragoceni prostor na vašem telefonu.
+‣ <b>Otvoreno i napravljeno od strane zajednice</b>: Ljudi poput vas su doprineli razvoju aplikacije dodavanjem lokacija na OpenStreetMap, testiranjem, davanjem povratnih informacija o aplikaciji i pomogli su svojim programerskim veštinama i donacijama.
+‣ <b>Otvoreno i transparentno donošenje odluka i upotreba donacija, neprofitna i potpuno otvorenog koda.</b>
+
+<b> Glavne karakteristike </b>:
+• Preuzmimanje detaljne mape sa lokacijama koje nisu dostupne sa Google mapama
+• Režim za izlete sa istaknutim planinarskim stazama, kampovima, izvorima vode, planinskim vrhovima, izohipsama itd.
+• Staze za planinarenje i bicikle
+• Tačke interesa kao što su restorani, benzinske pumpe, hoteli, prodavnice, znamenitosti i još mnogo toga
+• Pretraga po nazivu, adresi ili kategorijama
+• Navigacija sa glasovnim instrukcijama za hodanje, vožnju bicikla ili automobila
+• Označivanje omiljenih mesta jednim dodirom
+• Oflajn članci Vikipedije
+• Tranzitni sloj podzemne železnice sa navigacijom
+• Snimanje GPS putanja
+• Uvoz i uvoz markera i putanja u KML, KMZ, GPX formate
+• Tamni režim za upotrebu tokom noći
+• Poboljšajte kartu za sve korisnike, koristeći osnovni editor za mape
+
+<b> Sloboda je ovde </b>
+Otkrijte svoje putovanje, krećete se sa svetom sa privatnošću i zajednicom na prvom mestu!
--- a/android/app/src/fdroid/play/listings/sr-Latn/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sr-Latn/short-description.txt
@@ -0,0 +1 @@
+Jednostavna navigacija - Saznajte više o svom putovanju - Održava zajednica
--- a/android/app/src/fdroid/play/listings/sr-Latn/title.txt
+++ b/android/app/src/fdroid/play/listings/sr-Latn/title.txt
@@ -0,0 +1 @@
+CoMaps - pešačenje, bicikl, vožnja sa privatnošću
--- a/android/app/src/google/play/listings/de-DE/full-description.txt
+++ b/android/app/src/google/play/listings/de-DE/full-description.txt
@@ -3,7 +3,7 @@ Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf Op
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
-• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website
+• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap-Webseite

 <i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>

@@ -12,7 +12,7 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Datenschutz ist uns wichtig!</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source.</b>

 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -24,13 +24,13 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Lesezeichen mit einem einzigen Tippen speichern
 • Offline verfügbare Wikipedia-Artikel
 • U- und S-Bahn-Netze
-• Aufzeichnen von GPS Tracks
+• Aufzeichnen von GPS-Tracks
 • Import und Export von Favoriten und Routen im KML-, KMZ- oder GPX-Format
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 • Unterstützung für Android Auto

-Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>
+Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app/de/</i></b>

-<b>Entdecke die Unabhängigkeit</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+<b>Freiheit beginnt hier</b>
+Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
--- a/android/app/src/google/play/listings/de-DE/short-description.txt
+++ b/android/app/src/google/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
--- a/android/app/src/google/play/listings/en-AU/full-description.txt
+++ b/android/app/src/google/play/listings/en-AU/full-description.txt
@@ -0,0 +1,36 @@
+A community led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit.
+
+Join the community and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+<i>Your feedback and 5-star reviews are the best support for us!</i>
+
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Offline focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - it does not identify people, does not track, and does not collect personal information. Ad free.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, biking, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+• Android Auto support
+
+Please report app issues, suggest ideas and join our community at <b><i>comaps.app</i></b> website.
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -446,7 +446,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
      default -> throw new AssertionError("Unexpected result code = " + result);
    };

-        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        mAlertDialog = new MaterialAlertDialogBuilder(this)
                           .setTitle(titleId)
                           .setMessage(messageId)
                           .setCancelable(true)
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -132,7 +132,6 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Objects;

@@ -432,7 +431,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    }

    dismissLocationErrorDialog();
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
                               .setMessage(R.string.unknown_current_position)
                               .setCancelable(true)
                               .setPositiveButton(R.string.ok, null)
@@ -655,7 +654,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
        else
        {
          dismissAlertDialog();
-          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+          mAlertDialog = new MaterialAlertDialogBuilder(this)
                             .setTitle(R.string.message_invalid_feature_position)
                             .setPositiveButton(R.string.ok, null)
                             .setOnDismissListener(dialog -> mAlertDialog = null)
@@ -712,7 +711,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
    if (!TextUtils.isEmpty(appName))
    {
      setTitle(appName);
-      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
    }
  }

@@ -1155,7 +1153,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

    if (type == IsolinesState.EXPIREDDATA)
    {
-      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+      mAlertDialog = new MaterialAlertDialogBuilder(this)
                         .setTitle(R.string.downloader_update_maps)
                         .setMessage(R.string.isolines_activation_error_dialog)
                         .setPositiveButton(
@@ -1774,7 +1772,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    dismissAlertDialog();
    mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
            .setTitle(R.string.unable_to_calc_alert_title)
            .setMessage(R.string.unable_to_calc_alert_subtitle)
            .setPositiveButton(R.string.settings,
@@ -1797,7 +1795,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      builder.append(getString(resId)).append("\n\n");

    dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                       .setTitle(R.string.dialog_routing_disclaimer_title)
                       .setMessage(builder.toString())
                       .setCancelable(false)
@@ -1846,7 +1844,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return true;

    final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint());
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
        .setTitle(R.string.p2p_only_from_current)
        .setMessage(R.string.p2p_reroute_from_current)
        .setCancelable(false)
@@ -2040,7 +2038,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
        {
          mPreciseLocationDialogShown = true;
          final MaterialAlertDialogBuilder builder =
-              new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+              new MaterialAlertDialogBuilder(this)
                  .setTitle("⚠ " + getString(R.string.limited_accuracy))
                  .setMessage(R.string.precise_location_is_disabled_long_text)
                  .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2074,7 +2072,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return;
    }

-    mLocationErrorDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(this)
                               .setTitle(R.string.enable_location_services)
                               .setMessage(R.string.location_is_disabled_long_text)
                               .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2167,7 +2165,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return;
    }

-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
                                                   .setTitle(R.string.enable_location_services)
                                                   .setMessage(R.string.location_is_disabled_long_text)
                                                   .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2253,7 +2251,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

    dismissAlertDialog();
    final MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
            .setTitle(R.string.current_location_unknown_error_title)
            .setCancelable(true)
            .setMessage(R.string.power_save_dialog_summary)
@@ -2278,7 +2276,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    dismissAlertDialog();
    mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
            .setTitle(R.string.load_kmz_title)
            .setMessage(getString(R.string.unknown_file_type, uri))
            .setPositiveButton(R.string.ok, null)
@@ -2295,7 +2293,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    dismissAlertDialog();
    mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
            .setTitle(R.string.load_kmz_title)
            .setMessage(getString(R.string.failed_to_open_file, uri, error))
            .setPositiveButton(R.string.ok, null)
@@ -2317,7 +2315,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  public void onBookmarksFileImportFailed()
  {
    dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                       .setTitle(R.string.load_kmz_title)
                       .setMessage(R.string.load_kmz_failed)
                       .setPositiveButton(R.string.ok, null)
@@ -2578,7 +2576,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

  private void reportUnsupported()
  {
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this)
        .setMessage(R.string.unsupported_phone)
        .setCancelable(false)
        .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity
  private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
  {
    mCanceled = true;
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_M3_AlertDialog)
        .setTitle(titleId)
        .setMessage(messageId)
        .setPositiveButton(
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
@@ -60,14 +60,14 @@ public enum BookmarksSharingHelper
    case BookmarkSharingResult.SUCCESS ->
      SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
    case BookmarkSharingResult.EMPTY_CATEGORY ->
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
          .setTitle(R.string.bookmarks_error_title_share_empty)
          .setMessage(R.string.bookmarks_error_message_share_empty)
          .setPositiveButton(R.string.ok, null)
          .show();
    case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
    {
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
          .setTitle(R.string.dialog_routing_system_error)
          .setMessage(R.string.bookmarks_error_message_share_general)
          .setPositiveButton(R.string.ok, null)
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
@@ -42,6 +42,7 @@ public class ChooseBookmarkCategoryFragment
  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
  {
    View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
    mRecycler = root.findViewById(R.id.recycler);
    mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
    return root;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -77,6 +77,7 @@ public class ChooseBookmarksSortingTypeFragment
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    final Bundle args = getArguments();
    if (args == null)
--- a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
@@ -42,7 +42,7 @@ public final class CustomMapServerDialog
    edit.setText(current);

    MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(context)
            .setTitle(R.string.download_resources_custom_url_title)
            .setMessage(R.string.download_resources_custom_url_message)
            .setView(dialogView)
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
@@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
      negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON);
    }

-    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity())
                                     .setView(buildView())
                                     .setNegativeButton(negativeButtonText, null)
                                     .setPositiveButton(positiveButtonText, null)
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
  {
    if (RoutingController.get().isNavigating())
    {
-      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(adapter.mActivity)
          .setTitle(R.string.downloader_delete_map)
          .setMessage(R.string.downloader_delete_map_while_routing_dialog)
          .setPositiveButton(R.string.ok, null)
@@ -133,7 +133,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
      return;
    }

-    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(adapter.mActivity)
        .setTitle(R.string.downloader_delete_map)
        .setMessage(R.string.downloader_delete_map_dialog)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
@@ -49,7 +49,7 @@ public class MapManagerHelper
        return;
    }

-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity)
                                .setTitle(R.string.country_status_download_failed)
                                .setMessage(getErrorCodeStrRes(errorData.errorCode))
                                .setNegativeButton(R.string.cancel,
@@ -72,7 +72,7 @@ public class MapManagerHelper

  private static void notifyNoSpaceInternal(Activity activity)
  {
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
        .setTitle(R.string.downloader_no_space_title)
        .setMessage(R.string.downloader_no_space_message)
        .setPositiveButton(android.R.string.ok, null)
@@ -123,7 +123,7 @@ public class MapManagerHelper
      return false;
    }

-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
        .setTitle(R.string.download_over_mobile_header)
        .setMessage(R.string.download_over_mobile_message)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -53,7 +53,6 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
  public void onResume()
  {
    super.onResume();
-    refreshTimetables();
  }

  private void initViews(View view)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -493,7 +493,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      }
    });

-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
        .setTitle(R.string.editor_socket)
        .setView(dialogView)
        .setPositiveButton(R.string.save,
@@ -997,7 +997,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      message = R.string.editor_reset_edits_message;
    }

-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
        .setTitle(message)
        .setPositiveButton(title,
                           (dialog, which) -> {
@@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void placeDisused()
  {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
      .setTitle(R.string.editor_mark_business_vacant_title)
      .setMessage(R.string.editor_mark_business_vacant_description)
      .setPositiveButton(R.string.editor_submit, (dlg, which) -> {
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -237,6 +237,7 @@ public class EditorHostFragment
    for (LocalizedName name : sNames)
      languages.add(name.lang);
    args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
+    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
    editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
  }

@@ -352,7 +353,7 @@ public class EditorHostFragment

  private void processNoFeatures()
  {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
        .setTitle(R.string.downloader_no_space_title)
        .setPositiveButton(R.string.ok, null)
        .show();
@@ -386,7 +387,7 @@ public class EditorHostFragment

  private void showNoobDialog()
  {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
        .setTitle(R.string.editor_share_to_all_dialog_title)
        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                    + getString(R.string.editor_share_to_all_dialog_message_2))
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -155,7 +155,7 @@ public class FeatureCategoryFragment
  // Duplicate of showNoobDialog()
  private void showNoteConfirmationDialog(double lat, double lon, String noteText)
  {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
        .setTitle(R.string.editor_share_to_all_dialog_title)
        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                    + getString(R.string.editor_share_to_all_dialog_message_2))
--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
@@ -1,11 +1,15 @@
 package app.organicmaps.editor;

+import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.core.os.ConfigurationCompat;
 import androidx.core.os.LocaleListCompat;
 import androidx.fragment.app.Fragment;
+
+import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.Language;
@@ -21,6 +25,7 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
  final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
+  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";

  public interface Listener
  {
@@ -34,6 +39,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
  protected LanguagesAdapter createAdapter()
  {
    Bundle args = getArguments();
+    boolean includeLocalLanguage =
+        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
    Set<String> existingLanguages =
        args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();

@@ -68,6 +75,12 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>

    languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());

+    if (includeLocalLanguage) {
+      String localLanguageLabel = getString(R.string.pref_maplanguage_local);
+      Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
+      languages.add(0, localLanguage);
+    }
+
    return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()]));
  }

--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment

  private void onAuthFail()
  {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
        .setTitle(R.string.editor_login_error_dialog)
        .setPositiveButton(R.string.ok, null)
        .show();
--- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
@@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment
    FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab);
    feedbackFab.setOnClickListener(
        v
-        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        -> new MaterialAlertDialogBuilder(requireActivity())
               .setTitle(R.string.feedback)
               .setNegativeButton(R.string.cancel, null)
               .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)},
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -296,7 +296,7 @@ public class MapButtonsController extends Fragment
      mBadgeDrawable.setMaxCharacterCount(0);
      mBadgeDrawable.setHorizontalOffset(verticalOffset);
      mBadgeDrawable.setVerticalOffset(dpToPx(9, context));
-      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent));
+      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.active_track_recording));
      mBadgeDrawable.setVisible(enable);
      BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
    }
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
@@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
    if (mDialog != null && mDialog.isShowing())
      return;

-    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
+    mDialog = new MaterialAlertDialogBuilder(mActivity)
                  .setMessage(R.string.common_check_internet_connection_dialog)
                  .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false))
                  .setCancelable(true)
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
  public Dialog onCreateDialog(Bundle savedInstanceState)
  {
    parseArguments();
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity())
                                             .setCancelable(true)
                                             .setNegativeButton(android.R.string.cancel, null);
    beforeDialogCreated(builder);
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -1,6 +1,7 @@
 package app.organicmaps.settings;

 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
+import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;

 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -140,8 +141,13 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
  private void updateMapLanguageCodeSummary()
  {
    final Preference pref = getPreference(getString(R.string.pref_map_locale));
-    Locale locale = new Locale(MapLanguageCode.getMapLanguageCode());
-    pref.setSummary(locale.getDisplayLanguage());
+    String mapLanguageCode = MapLanguageCode.getMapLanguageCode();
+    if (mapLanguageCode.equals(DEFAULT_LANG_CODE)) {
+      pref.setSummary(R.string.pref_maplanguage_local);
+    } else {
+      Locale locale = new Locale(mapLanguageCode);
+      pref.setSummary(locale.getDisplayLanguage());
+    }
  }

  private void updateRoutingSettingsPrefsSummary()
@@ -494,7 +500,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    pref.setOnPreferenceClickListener(preference -> {
      if (MapManager.nativeIsDownloading())
      {
-        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(requireActivity())
            .setTitle(R.string.downloading_is_active)
            .setMessage(R.string.cant_change_this_setting)
            .setPositiveButton(R.string.ok, null)
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
@@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment
    final String oldPath = storages.get(currentIndex).mPath;
    final String newPath = storages.get(newIndex).mPath;

-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
        .setCancelable(false)
        .setTitle(R.string.move_maps)
        .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath))
@@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment

        if (!result)
        {
-          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+          new MaterialAlertDialogBuilder(requireActivity())
              .setTitle(R.string.move_maps_error)
              .setPositiveButton(
                  R.string.report_a_bug,
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -184,20 +184,6 @@ public class Utils
    }
  }

-  public static void showFacebookPage(Activity activity)
-  {
-    try
-    {
-      // Exception is thrown if we don't have installed Facebook application.
-      getPackageInfo(activity.getPackageManager(), Constants.Package.FB_PACKAGE, 0);
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_NATIVE)));
-    }
-    catch (final Exception e)
-    {
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_HTTP)));
-    }
-  }
-
  public static void openUrl(@NonNull Context context, @Nullable String url)
  {
    if (TextUtils.isEmpty(url))
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
@@ -65,8 +65,6 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
      iv.setImageResource(R.drawable.ic_track_recording_on);
      iv.setImageTintMode(null);
      viewHolder.getTitleTextView().setText(R.string.stop_track_recording);
-      badge.setBackgroundResource(R.drawable.track_recorder_badge);
-      badge.setVisibility(View.VISIBLE);
    }
  }

--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
  @Override
  public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
  {
-    return new BottomSheetDialog(requireContext(), getTheme()) {
+    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
      @Override
      public void onAttachedToWindow()
      {
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
@@ -61,6 +61,7 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
    setCancelable(mCancelable);
    setOnCancelListener(mCancelListener);
    setContentView(R.layout.dialog_stacked_buttons);
+    getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    TextView title = findViewById(R.id.tv__title);
    UiUtils.setTextAndHideIfEmpty(title, mTitle);
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
@@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
        mIconResId = getArguments().getInt(ICON_RES);
    }

-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
        .setView(buildView())
        .setTitle(R.string.choose_color)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -464,7 +464,7 @@ public class PlacePageController
      mAlertDialog.show();
      return;
    }
-    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext())
                       .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                       .setCancelable(true)
                       .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -428,8 +428,9 @@ public class PlacePageView extends Fragment

  private void updateBookmarkView()
  {
+   boolean enabled = mMapObject.isBookmark() || mMapObject.isTrack();
    updateViewFragment(PlacePageBookmarkFragment.class, BOOKMARK_FRAGMENT_TAG, R.id.place_page_bookmark_fragment,
-                       mMapObject.isBookmark());
+                       enabled);
  }

  private void updateTrackView()
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -23,6 +23,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -41,6 +42,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
  private PlacePageViewModel mViewModel;

  private Bookmark currentBookmark;
+  private Track currentTrack;

  @Nullable
  @Override
@@ -88,7 +90,15 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL

  private void updateBookmarkDetails()
  {
-    final String notes = currentBookmark.getBookmarkDescription();
+      String notes = null;
+      if (currentBookmark != null)
+      {
+          notes = currentBookmark.getBookmarkDescription();
+      }
+      if (currentTrack != null)
+      {
+          notes = currentTrack.getTrackDescription();
+      }
    if (TextUtils.isEmpty(notes))
    {
      UiUtils.hide(mTvBookmarkNote);
@@ -120,8 +130,16 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
  public void onClick(View v)
  {
    final FragmentActivity activity = requireActivity();
-    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
-                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    if (currentBookmark != null)
+    {
+        EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
+                getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    }
+    else if (currentTrack != null)
+    {
+        EditBookmarkFragment.editBookmark(currentTrack.getCategoryId(), currentTrack.getTrackId(), activity,
+                getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    }
  }

  @Override
@@ -152,6 +170,11 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
      currentBookmark = (Bookmark) mapObject;
      updateBookmarkDetails();
    }
+    if (mapObject != null && mapObject.isTrack())
+    {
+      currentTrack = (Track) mapObject;
+      updateBookmarkDetails();
+    }
  }

  @Override
--- a/android/app/src/main/res/drawable/bg_clickable_card.xml
+++ b/android/app/src/main/res/drawable/bg_clickable_card.xml
@@ -4,7 +4,7 @@
  android:color="?colorControlHighlight">
  <item>
    <shape>
-      <solid android:color="?cardBackground" />
+      <solid android:color="?appBackground" />
    </shape>
  </item>
  <item android:id="@android:id/mask">
--- a/android/app/src/main/res/drawable/track_recorder_badge.xml
+++ b/android/app/src/main/res/drawable/track_recorder_badge.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <corners android:radius="12dp" />
-  <solid android:color="@color/active_track_recording" />
-</shape>
--- a/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">

  <LinearLayout
    android:orientation="vertical"
@@ -49,3 +55,4 @@
      tools:text="Do not Use Today"/>
  </LinearLayout>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -22,12 +22,9 @@
      android:layout_height="match_parent"
      android:clipChildren="false"
      android:clipToPadding="false"
-      android:orientation="vertical"
+      android:baselineAligned="false"
+      android:orientation="horizontal"
      tools:ignore="ScrollViewSize">
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
        <LinearLayout
          android:layout_width="0dp"
          android:layout_height="match_parent"
@@ -111,6 +108,5 @@
            android:text="@string/register_at_openstreetmap" />
        </LinearLayout>
      </LinearLayout>
-    </LinearLayout>
  </ScrollView>
 </LinearLayout>
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/android/app/src/main/res/layout-land/layout_nav.xml
@@ -41,5 +41,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|start"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -17,6 +17,7 @@
    android:id="@+id/street_frame"
    android:layout_width="500dp"
    android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
    android:elevation="@dimen/nav_elevation"
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -11,8 +11,7 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
-    android:backgroundTint="?menuBackground"
-    android:background="@drawable/onmap_downloader_background"
+    android:background="?menuBackground"
    android:padding="@dimen/margin_base"
    android:clipToPadding="false"
    android:clipChildren="false"
--- a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -8,7 +8,6 @@
  android:paddingStart="@dimen/margin_base"
  android:paddingEnd="@dimen/margin_base"
  android:gravity="center_vertical"
-  android:background="?clickableBackground"
  android:orientation="horizontal">

  <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
+++ b/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  style="@style/Widget.Material3.CardView.Filled"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
  android:orientation="vertical"
-  android:background="?cardBackground"
  android:minWidth="@dimen/bookmark_purchase_img_width"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">
@@ -21,9 +27,11 @@
    android:layout_marginEnd="@dimen/margin_base_plus"
    android:layout_marginStart="@dimen/margin_base_plus"
    tools:text="Select list"/>
-  <include
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
    android:layout_marginTop="@dimen/margin_base"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    layout="@layout/recycler_default"/>
+    android:scrollbars="vertical"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
+  style="@style/Widget.Material3.CardView.Filled"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:layout_margin="@dimen/margin_double_and_half"
-  android:background="?cardBackground"
  android:minWidth="@dimen/dialog_min_width"
  android:minHeight="@dimen/dialog_min_height"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
  android:orientation="vertical"
  android:padding="@dimen/margin_base_plus">

@@ -27,7 +32,7 @@
    android:layout_marginTop="@dimen/margin_base">

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
      android:id="@+id/sort_by_default"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -77,3 +82,4 @@
      app:buttonTint="@null"/>
  </RadioGroup>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout/dialog_stacked_buttons.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">

  <LinearLayout
    android:orientation="vertical"
@@ -41,3 +47,4 @@
    style="@style/MwmWidget.Button.StackedButtonsDialog"
    tools:text="Do not Use Today"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/downloader_item_header.xml
+++ b/android/app/src/main/res/layout/downloader_item_header.xml
@@ -13,7 +13,6 @@
    android:paddingTop="@dimen/margin_half"
    android:paddingBottom="@dimen/margin_half"
    android:layout_marginEnd="@dimen/margin_base"
-    android:background="?cardBackground"
    android:textAppearance="@style/MwmTextAppearance.Caption"
    tools:text="Downloaded"
    tools:background="#80FF0000"/>
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -6,7 +6,7 @@
  android:id="@+id/rl__bookmark_details"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:padding="@dimen/margin_half">
  <LinearLayout
    android:id="@+id/ll__bookmark_name"
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
  <com.google.android.material.appbar.MaterialToolbar
@@ -69,7 +69,6 @@
      android:inputType="textMultiLine"/>
    </com.google.android.material.textfield.TextInputLayout>
    <View
-      android:background="?cardBackground"
      android:layout_width="match_parent"
      android:layout_height="match_parent"/>
  </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_categories.xml
+++ b/android/app/src/main/res/layout/fragment_categories.xml
@@ -11,5 +11,6 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:scrollbars="vertical"
-    android:fadeScrollbars="false" />
+    android:fadeScrollbars="false"
+    android:background="?appBackground"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_downloader.xml
+++ b/android/app/src/main/res/layout/fragment_downloader.xml
@@ -4,7 +4,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  style="@style/MwmWidget.Floating"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
  <include layout="@layout/toolbar_with_search"/>
@@ -17,10 +17,12 @@
    style="@style/MwmWidget.Button.Primary"
    tools:text="@string/downloader_update_all_button"/>

-  <include
-    layout="@layout/recycler_default"
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:background="?appBackground"
+    android:scrollbars="vertical"
    android:layout_below="@id/toolbar"
    android:layout_above="@id/action"/>

--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -4,7 +4,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">
  <com.google.android.material.appbar.MaterialToolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -5,6 +5,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:background="?windowBackgroundForced"
  android:orientation="vertical">

  <com.google.android.material.appbar.MaterialToolbar
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -10,7 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:id="@+id/frameLayout"
-        android:background="?cardBackground">
+        android:background="?windowBackgroundForced">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/phones_recycler"
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -20,8 +20,8 @@
      android:gravity="center"
      android:layout_gravity="end|center_vertical"
      android:background="?selectableItemBackgroundBorderless"
+      android:textSize="@dimen/text_size_toolbar"
      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>

--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -61,12 +61,12 @@
        android:layout_height="match_parent"
        android:clickable="true"
        android:focusable="true"
-        android:background="?cardBackground">
+        android:background="?appBackground">

        <androidx.recyclerview.widget.RecyclerView
          android:id="@+id/recycler"
          android:clipToPadding="false"
-          android:background="?cardBackground"
+          android:background="?appBackground"
          android:layout_width="match_parent"
          android:layout_height="match_parent"
          />
--- a/android/app/src/main/res/layout/fragment_search_categories.xml
+++ b/android/app/src/main/res/layout/fragment_search_categories.xml
@@ -4,6 +4,10 @@
  style="@style/MwmWidget.FrameLayout"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <include
-    layout="@layout/recycler_default"/>
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?appBackground"
+    android:scrollbars="vertical"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
@@ -13,36 +13,12 @@
    android:orientation="vertical"
    android:padding="@dimen/margin_half">

-    <com.google.android.material.card.MaterialCardView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/et__timetable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@null"
-        android:gravity="top|start"
-        android:inputType="textMultiLine"
-        android:padding="@dimen/margin_base"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:hint="hint"
-        tools:text="trololo \ntrololo \ntrololo"/>
-
-    </com.google.android.material.card.MaterialCardView>
-
    <com.google.android.material.card.MaterialCardView
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_marginTop="@dimen/margin_half"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
+      style="@style/MwmWidget.M3.Editor.CardView"
+      app:cardBackgroundColor="?cardBackground">

      <LinearLayout
        android:id="@+id/examples"
@@ -50,6 +26,26 @@
        android:layout_height="match_parent"
        android:orientation="vertical"
        android:animateLayoutChanges="true">
+          <com.google.android.material.textfield.TextInputLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:padding="@dimen/margin_half"
+              android:layout_marginBottom="@dimen/margin_half"
+              app:hintEnabled="false">
+
+          <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/et__timetable"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_alignParentBottom="true"
+              android:background="@null"
+              android:gravity="top|start"
+              android:inputType="textMultiLine"
+              android:padding="@dimen/margin_base"
+              android:textAppearance="@style/MwmTextAppearance.Body3"
+              tools:hint="hint"
+              tools:text="trololo \ntrololo \ntrololo"/>
+          </com.google.android.material.textfield.TextInputLayout>

        <com.google.android.material.textview.MaterialTextView
          android:id="@+id/tv__examples_title"
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/android/app/src/main/res/layout/item_category_description.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:padding="@dimen/margin_base">

  <LinearLayout
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -5,7 +5,7 @@
  style="@style/MwmTextAppearance.Headline6"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?appBackground"
  android:gravity="start|center_vertical"
  android:paddingStart="@dimen/margin_base"
  android:paddingTop="@dimen/margin_base_plus"
--- 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="?cardBackground"
+  android:background="?appBackground"
  android:padding="@dimen/margin_base">
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -7,7 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
  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,7 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
  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_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -1,11 +1,14 @@
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/MwmWidget.M3.Editor.CardView"
    android:layout_width="match_parent"
-    android:layout_height="@dimen/height_item_oneline"
-    android:background="?clickableBackground"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_margin="@dimen/margin_eighth"
+    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/margin_half"
    android:paddingStart="@dimen/margin_half_plus"
    android:paddingEnd="@dimen/margin_half_plus">

@@ -25,7 +28,6 @@
        android:layout_marginStart="@dimen/margin_half"
        android:layout_marginEnd="@dimen/margin_half"
        android:layout_toStartOf="@id/delete_icon"
-        android:textColorHint="?android:textColorSecondary"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/delete_icon"
        app:layout_constraintStart_toEndOf="@+id/phone_icon"
@@ -41,7 +43,6 @@
    <com.google.android.material.imageview.ShapeableImageView
      android:id="@+id/delete_icon"
      style="@style/MwmWidget.Editor.MetadataIcon"
-      android:layout_marginStart="@dimen/margin_half"
      app:layout_constraintBottom_toBottomOf="parent"
      app:layout_constraintEnd_toEndOf="parent"
      app:layout_constraintTop_toTopOf="parent"
@@ -49,3 +50,4 @@
      app:srcCompat="@drawable/ic_delete" />

 </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/layout_nav.xml
+++ b/android/app/src/main/res/layout/layout_nav.xml
@@ -40,5 +40,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|center"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -17,6 +17,7 @@
    android:id="@+id/street_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
    android:layout_marginStart="@dimen/nav_street_left"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
--- a/android/app/src/main/res/layout/menu.xml
+++ b/android/app/src/main/res/layout/menu.xml
@@ -4,7 +4,7 @@
  android:id="@+id/menu_frame"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:clickable="true"
  android:visibility="gone"
  tools:visibility="visible">
--- a/android/app/src/main/res/layout/menu_route_plan_line.xml
+++ b/android/app/src/main/res/layout/menu_route_plan_line.xml
@@ -2,7 +2,7 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:orientation="horizontal"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">

--- a/android/app/src/main/res/layout/place_page.xml
+++ b/android/app/src/main/res/layout/place_page.xml
@@ -4,6 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:descendantFocusability="blocksDescendants"
+  android:background="?cardBackground"
  android:orientation="vertical">
  <include
    android:id="@+id/pp__preview"
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -15,21 +15,14 @@
    android:theme="@style/MwmWidget.ToolbarTheme"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-      <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_half"
-        android:text="@string/editor_add_select_location"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:title="@string/editor_add_select_location">
    </com.google.android.material.appbar.MaterialToolbar>

  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    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/routing_action_panel.xml
+++ b/android/app/src/main/res/layout/routing_action_panel.xml
@@ -6,7 +6,7 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:minHeight="@dimen/height_block_base"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:baselineAligned="false">
  <LinearLayout
    android:id="@+id/btn__search_point"
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -146,16 +146,13 @@
    android:foreground="@drawable/shadow_top"
    android:visibility="gone"
    tools:visibility="visible">
-    <RelativeLayout
+    <LinearLayout
      android:id="@+id/driving_options_btn"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:background="?selectableItemBackgroundBorderless"
      android:gravity="center"
      android:minHeight="@dimen/height_block_base">
-      <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
        <com.google.android.material.imageview.ShapeableImageView
          android:id="@+id/driving_options_btn_img"
          android:layout_width="@dimen/margin_base_plus"
@@ -174,8 +171,7 @@
          android:textAppearance="?android:attr/textAppearanceSmall"
          android:textColor="@color/text_light"
          tools:text="test" />
-      </LinearLayout>
-    </RelativeLayout>
+    </LinearLayout>
  </FrameLayout>
  <FrameLayout
    style="@style/MwmWidget.FrameLayout.Elevation"
--- a/android/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/android/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,3 +1,662 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Nazad</string>
+    <string name="cancel">Odustani</string>
+    <string name="delete">Obriši</string>
+    <string name="download_maps">Preuzmi mape</string>
+    <string name="download_has_failed">Preuzimanje nije uspelo. Tapni za ponovni pokušaj</string>
+    <string name="downloading">Preuzimanje…</string>
+    <string name="kilometres">Kilometri</string>
+    <string name="miles">Milje</string>
+    <string name="later">Kasnije</string>
+    <string name="search">Pretraga</string>
+    <string name="search_map">Traži na mapi</string>
+    <string name="location_is_disabled_long_text">Trenutno su svi lokacijski servisi na ovom uređaju ili aplikaciji isključeni. Potrebno je da ih uključite u Podešavanjima.</string>
+    <string name="limited_accuracy">Ograničena tačnost</string>
+    <string name="precise_location_is_disabled_long_text">Da bi se osigurala tačna navigacija omogućite preciznu lokaciju u podešavanjima</string>
+    <string name="zoom_to_country">Prikaži mapu</string>
+    <string name="country_status_download_failed">Preuzimanje nije uspelo</string>
+    <string name="try_again">Pokušaj ponovo</string>
+    <string name="about_menu_title">O aplikaciji</string>
+    <string name="about_headline">Otvoreni projekat koji pokreće zajednica</string>
+    <string name="about_proposition_1">• Laka i polirana</string>
+    <string name="about_proposition_2">• Orijentisana na privatnost i bez reklama</string>
+    <string name="about_proposition_3">• Oflajn, brza i kompaktna</string>
+    <string name="about_developed_by_enthusiasts">Potpuno otvorenog koda, neprofitna, transparentna u odlučivanju i finansijama.</string>
+    <string name="location_settings">Podešavanja lokacije</string>
+    <string name="close">Zatvori</string>
+    <string name="unsupported_phone">Ova aplikacija zahteva OpenGL. Na žalost, vaš uređaj nije podržan.</string>
+    <string name="download">Preuzmi</string>
+    <string name="disconnect_usb_cable">Molim vas otkačite USB kabl, ili ubacite memorijsku karticu da biste koristili CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Molim vas, prvo oslobodite nešto prostora na SD kartici ili na USB memoriji da biste koristili aplikaciju</string>
+    <string name="download_resources">Pre nego što počnete da koristite aplikaciju, prvo preuzmite na vaš uređaj mapu sveta. \nZa to će biti potrebno %s memorije.</string>
+    <string name="download_resources_continue">Idi na mapu</string>
+    <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Možete \notići na mapu.</string>
+    <string name="download_country_ask">Preuzeti %1$s? (%2$s)</string>
+    <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
+    <string name="pause">Pauza</string>
+    <string name="continue_button">Nastavi</string>
+    <string name="download_country_failed">%s preuzimanje nije uspelo</string>
+    <string name="add_new_set">Napravi novu listu</string>
+    <string name="bookmark_set_name">Naziv liste</string>
+    <string name="bookmarks">Mesta</string>
+    <string name="bookmarks_and_tracks">Favoriti</string>
+    <string name="name">Naziv</string>
+    <string name="address">Adresa</string>
+    <string name="list">Lista</string>
+    <string name="settings">Podešavanja</string>
+    <string name="maps_storage">Mesto za čuvanje mapa</string>
+    <string name="maps_storage_summary">Izaberite folder u kom se čuvaju mape</string>
+    <string name="maps_storage_downloaded">Preuzete mape</string>
+    <string name="maps_storage_free_size">slobodno %1$s od %2$s</string>
+    <string name="move_maps">Premestiti mapu?</string>
+    <string name="move_maps_error">Greška prilikom premeštanja mapa</string>
+    <string name="wait_several_minutes">Ovo može da potraje nekoliko minuta. \nMolim vas, sačekajte…</string>
+    <string name="measurement_units">Jedinice mere</string>
+    <string name="measurement_units_summary">Izaberite između kilometara i milja</string>
+    <string name="category_eat">Gde jesti</string>
+    <string name="category_food">Namirnice</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_fuel">Gorivo</string>
+    <string name="category_parking">Parking</string>
+    <string name="category_shopping">Kupovina</string>
+    <string name="category_secondhand">Polovna odeća</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="category_tourism">Turistička atrakcija</string>
+    <string name="category_entertainment">Zabava</string>
+    <string name="category_atm">Bankomat</string>
+    <string name="category_nightlife">Noćni život</string>
+    <string name="category_children">Sve za decu</string>
+    <string name="category_bank">Banka</string>
+    <string name="category_pharmacy">Apoteka</string>
+    <string name="category_hospital">Bolnica</string>
+    <string name="category_toilet">Toalet</string>
+    <string name="category_post">Pošta</string>
+    <string name="category_police">Policija</string>
+    <string name="category_recycling">Reciklaža</string>
+    <string name="category_water">Voda</string>
+    <string name="category_rv">Za kamper vozila</string>
+    <string name="description">Napomene</string>
+    <string name="share_bookmarks_email_subject">CoMaps favoriti</string>
+    <string name="share_bookmarks_email_body">Zdravo! \n \nU prilogu su moji favoriti; molim te da ih otvoriš u CoMaps-u. Ako ga nemaš već instaliranog, možeš da ga preuzmeš odavde: https://www.comaps.app/download/ \n \nUživaj u putovanju sa CoMaps-om!</string>
+    <string name="load_kmz_title">Učitavanje favorita</string>
+    <string name="load_kmz_successful">Favoriti su uspešno učitani! Možete ih pronači na mapi pomoću Menadžera favorita.</string>
+    <string name="load_kmz_failed">Neuspešno učitavanje favorita. Moguće da je fajl oštećen ili neispravan.</string>
+    <string name="unknown_file_type">Aplikacija ne prepoznaje ovu vrstu fajla: \n%1$s</string>
+    <string name="failed_to_open_file">Otvaranje fajla %1$s nije uspelo \n \n%2$s</string>
+    <string name="edit">Izmeni</string>
+    <string name="unknown_current_position">Vaša lokacija još nije određena</string>
+    <string name="cant_change_this_setting">Izvinite, podešavanje lokacije za čuvanje mapa je trenutno onemogućeno</string>
+    <string name="downloading_is_active">Preuzimanje mapa je u toku</string>
+    <string name="my_position_share_sms">Vidi moju trenutnu lokaciju u CoMaps-u! %1$s ili %2$s Još ne koristiš offline mape? Preuzmi ih ovde: https://www.comaps.app/download/</string>
+    <string name="bookmark_share_email_subject">Hej, vidi moj marker u CoMaps-u!</string>
+    <string name="my_position_share_email_subject">Hej, vidi moju trenutnu lokaciju na CoMaps mapi!</string>
+    <string name="my_position_share_email">Zdravo, \n \nJa sam ovde: %1$s. Klikni na ovaj %2$s ili ovaj link %3$s da bi video to mesto na mapi. \n \nHvala.</string>
+    <string name="share">Podeli</string>
+    <string name="email">Email</string>
+    <string name="copied_to_clipboard">Kopirano u klipbord: %s</string>
+    <string name="done">Gotovo</string>
+    <string name="data_version">OpenStreetMap podaci: %s</string>
+    <string name="tracks_title">Putanje</string>
+    <string name="length">Dužina</string>
+    <string name="share_my_location">Podeli moju lokaciju</string>
+    <string name="prefs_group_general">Opšta podešavanja</string>
+    <string name="prefs_group_information">Informacije</string>
+    <string name="prefs_group_route">Navigacija</string>
+    <string name="pref_zoom_title">Dugme za zumiranje</string>
+    <string name="pref_zoom_summary">Prikaži na mapi</string>
+    <string name="pref_map_style_title">Noćni režim</string>
+    <string name="off">Isključeno</string>
+    <string name="on">Uključeno</string>
+    <string name="auto">Automatski</string>
+    <string name="pref_map_3d_title">Prikaz perspektive</string>
+    <string name="pref_map_3d_buildings_title">3D zgrade</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D zgrade se ne prikazuju u režimu čuvanja baterije</string>
+    <string name="pref_tts_enable_title">Glasovne instrukcije</string>
+    <string name="pref_tts_street_names_title">Najavi ime ulice</string>
+    <string name="pref_tts_street_names_description">Kada je uključeno, ime ulice ili izlaz na koji treba skrenuti će biti izgovoren.</string>
+    <string name="pref_tts_language_title">Jezik glasa</string>
+    <string name="pref_tts_test_voice_title">Testiraj glasovne instrukcije</string>
+    <string name="pref_tts_playing_test_voice">Proverite glasnoću ili sistemska podešavanja Teksta-u-govor ako sada ne čujete glas</string>
+    <string name="pref_tts_unavailable">Nije dostupno</string>
+    <string name="pref_map_auto_zoom">Automatsko uvećavanje</string>
+    <string name="placepage_distance">Razdaljina</string>
+    <string name="search_show_on_map">Prikaži na mapi</string>
+    <string name="menu">Meni</string>
+    <string name="website">Veb-sajt</string>
+    <string name="news">Novosti</string>
+    <string name="panoramax">Panoramax Picture</string>
+    <string name="feedback">Povratne informacije</string>
+    <string name="rate_the_app">Ocena aplikacije</string>
+    <string name="help">Pomoć</string>
+    <string name="faq">Često postavljena pitanja</string>
+    <string name="donate">Donacija</string>
+    <string name="how_to_support_us">Volontirajte i poboljšajte CoMaps</string>
+    <string name="copyright">Copyright</string>
+    <string name="report_a_bug">Prijavite problem</string>
+    <string name="compass_calibration_recommended">Poboljšajte smer strelice tako što ćete pomerati telefon u putanji osmice kao biste kalibrisali kompas.</string>
+    <string name="compass_calibration_required">Pomerajte telefon u putanji osmice kako biste kalibrisali kompas i popravili smer strelice na mapi.</string>
+    <string name="long_tap_toast">Dodirnite dugo mapu da biste ponovo videli interfejs</string>
+    <string name="downloader_update_all_button">Ažuriraj sve</string>
+    <string name="downloader_cancel_all">Odustani od svih</string>
+    <string name="downloader_downloaded_subtitle">Preuzeto</string>
+    <string name="downloader_queued">Na čekanju</string>
+    <string name="downloader_near_me_subtitle">Blizu mene</string>
+    <string name="downloader_status_maps">Mape</string>
+    <string name="downloader_download_all_button">Preuzmi sve</string>
+    <string name="downloader_downloading">Preuzimanje:</string>
+    <string name="downloader_delete_map_while_routing_dialog">Da biste obrisali mapu, zaustavite navigaciju</string>
+    <string name="routing_failed_cross_mwm_building">Mogu se kreirati samo rute koje se kompletno nalaze u okviru mape jednog regiona.</string>
+    <string name="downloader_download_map">Preuzmi mapu</string>
+    <string name="downloader_retry">Pokušaj ponovo</string>
+    <string name="downloader_delete_map">Obriši mapu</string>
+    <string name="downloader_update_map">Ažuriraj mapu</string>
+    <string name="google_play_services">Google Fused lokacijski servis</string>
+    <string name="pref_use_google_play">Usluga lokacije koja kombinuje GPS, Wi-Fi, mobilnu mrežu i druge podatke kako bi se lokacija otkrila što je preciznije. Takođe se možete povezati sa Google serverima.</string>
+    <string name="routing_download_maps_along">Preuzmi sve mape koje se nalaze na ruti</string>
+    <string name="routing_requires_all_map">Da bi ruta mogla da se kreira, potrebno je da preuzimanje i ažuriranje svih mapa između vaše lokacije i vašeg odredišta.</string>
+    <string name="routing_not_enough_space">Nema dovoljno prostora</string>
+    <string name="enable_location_services">Molim vas uključite Lokacijske servise</string>
+    <string name="save">Sačuvaj</string>
+    <string name="create">Kreiraj</string>
+    <string name="red">Crvena</string>
+    <string name="yellow">Žuta</string>
+    <string name="blue">Plava</string>
+    <string name="green">Zelena</string>
+    <string name="purple">Ljubičasta</string>
+    <string name="orange">Narandžasta</string>
+    <string name="brown">Braon</string>
+    <string name="pink">Roze</string>
+    <string name="deep_purple">Tamno ljubičasta</string>
+    <string name="light_blue">Svetlo plava</string>
+    <string name="cyan">Cijan</string>
+    <string name="teal">Teal</string>
+    <string name="lime">Limeta</string>
+    <string name="deep_orange">Tamno narandžasta</string>
+    <string name="gray">Siva</string>
+    <string name="blue_gray">Plavo siva</string>
+    <string name="dialog_routing_disclaimer_title">Kada pratite rutu, obratite pažnju:</string>
+    <string name="dialog_routing_disclaimer_priority">— Uslovi na putu, saobraćajni propisi i znakovi imaju prioritet u odnosu na navigaciju;</string>
+    <string name="dialog_routing_disclaimer_precision">— Mapa može biti netačna i predložena ruta ne mora uvek biti najoptimalniji način da stignete na odredište;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Predloženu rutu treba da shvatite samo kao predlog;</string>
+    <string name="dialog_routing_disclaimer_borders">— Budite pažljivi sa rutama koje prolaze i blizini granica: rute koje kreira naša aplikacija mogu ponekad prelaziti granice dražava na nedozvoljenim mestima.</string>
+    <string name="dialog_routing_disclaimer_beware">Molimo Vas da budete oprezni i bezbedni na putu!</string>
+    <string name="dialog_routing_check_gps">Proveri GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Ne mogu da napravim rutu. Trenutne GPS koordinate ne mogu da se odrede.</string>
+    <string name="dialog_routing_location_turn_wifi">Molim Vas da proverite vaš GPS signal. Uključivanje Wi-Fi-a će popraviti preciznost vaše lokacije.</string>
+    <string name="dialog_routing_location_turn_on">Uključi Lokacijske servise</string>
+    <string name="dialog_routing_location_unknown_turn_on">Nije moguće odrediti trenutne GPS koordinate. Uključi lokacijske servise radi pronalaženja rute.</string>
+    <string name="dialog_routing_unable_locate_route">Ne mogu da pronađem rutu</string>
+    <string name="dialog_routing_cant_build_route">Ne mogu da napravim rutu</string>
+    <string name="dialog_routing_change_start_or_end">Molim Vas da podesite početnu ili odredišnu tačku.</string>
+    <string name="dialog_routing_change_start">Podesi početnu tačku</string>
+    <string name="dialog_routing_start_not_determined">Ruta nije kreirana. Ne mogu da odredim početnu tačku.</string>
+    <string name="dialog_routing_select_closer_start">Molim vas da izaberete početnu tačku bliže putu.</string>
+    <string name="dialog_routing_change_end">Podesi odredišnu tačku</string>
+    <string name="dialog_routing_end_not_determined">Ruta nije napravljena. Ne mogu da pronađem odredište.</string>
+    <string name="dialog_routing_select_closer_end">Molim Vas da izaberete odredišnu tačnu bliže putu</string>
+    <string name="dialog_routing_change_intermediate">Ne mogu da pronađem međuodredište</string>
+    <string name="dialog_routing_intermediate_not_determined">Molim Vas da podesite međuodredište</string>
+    <string name="dialog_routing_system_error">Sistemska greška</string>
+    <string name="dialog_routing_application_error">Ne mogu da napravim rutu zbog greške u aplikaciji.</string>
+    <string name="dialog_routing_try_again">Molim Vas, pokušajte ponovo</string>
+    <string name="not_now">Ne sada</string>
+    <string name="dialog_routing_download_and_build_cross_route">Da li želite da preuzmete mapu i napravite optimalniju rutu koja se prostire na više od jedne mape?</string>
+    <string name="dialog_routing_download_cross_route">Preuzmi dodatne mape i napravi bolju rutu koja se prestire preko granica ove mape.</string>
+    <string name="search_without_internet_advertisement">Da biste počeli da pretražujete i pravite rute, molim Vas da preuzmete mapu. Nakon toga veza sa internetom Vam više neće biti potrebna.</string>
+    <string name="search_select_map">Izaberi mapu</string>
+    <string name="show">Prikaži</string>
+    <string name="hide">Sakrij</string>
+    <string name="categories">Kategorije</string>
+    <string name="history">Istorija</string>
+    <string name="search_not_found">Ups, nema rezultata</string>
+    <string name="search_not_found_query">Preuzmite region gde vršite pretragu, ili probajte da dodate ime obližnjeg naselja.</string>
+    <string name="search_history_title">Istorija pretrage</string>
+    <string name="search_history_text">Pogledajte vaše nedavne pretrage</string>
+    <string name="clear_search">Obriši istoriju pretrage</string>
+    <string name="read_in_wikipedia">Vikipedija</string>
+    <string name="wikimedia_commons">Vikimedijina ostava</string>
+    <string name="p2p_your_location">Vaša lokacija</string>
+    <string name="p2p_start">Kreni</string>
+    <string name="p2p_from_here">Start</string>
+    <string name="p2p_to_here">Odredište</string>
+    <string name="p2p_only_from_current">Navigacija je moguća samo od vaše trenutne lokacije</string>
+    <string name="p2p_reroute_from_current">Da li želite da napravite rutu od vaše trenutne lokacije?</string>
+    <string name="next_button">Dalje</string>
+    <string name="editor_time_from">Od</string>
+    <string name="editor_time_to">Do</string>
+    <string name="editor_time_add">Dodaj vreme</string>
+    <string name="editor_time_delete">Obriši vreme</string>
+    <string name="editor_time_allday">Non-stop (24 sata)</string>
+    <string name="editor_time_open">Otvoreno</string>
+    <string name="editor_time_close">Zatvoreno</string>
+    <string name="editor_time_add_closed">Dodaj neradno vreme</string>
+    <string name="editor_time_title">Radno vreme</string>
+    <string name="editor_time_advanced">Napredni režim</string>
+    <string name="editor_time_simple">Jednostavni režim</string>
+    <string name="editor_hours_closed">Neradno vreme</string>
+    <string name="editor_example_values">Primeri</string>
+    <string name="editor_correct_mistake">Ispravi grešku</string>
+    <string name="editor_add_select_location">Izaberite lokaciju</string>
+    <string name="editor_report_problem_desription_1">Molim Vas da detaljno opišete problem kako bi OpenStreetMap zajednica mogla da ga popravi.</string>
+    <string name="editor_report_problem_desription_2">Ili to učinite sami na https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_send_button">Pošalji</string>
+    <string name="editor_report_problem_title">Problem</string>
+    <string name="editor_report_problem_no_place_title">Ovo mesto ne postoji</string>
+    <string name="editor_report_problem_under_construction_title">Zatvoreno zbog održavanja</string>
+    <string name="editor_report_problem_duplicate_place_title">Duplirano mesto</string>
+    <string name="autodownload">Automatsko preuzimanje mapa</string>
+    <string name="daily">Svaki dan</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Danas ne radi</string>
+    <string name="day_off">Zatvoreno</string>
+    <string name="opens_in">Otvara se za %s</string>
+    <string name="closes_in">Zatvara se za %s</string>
+    <string name="closed">Zatvoreno</string>
+    <string name="opens_at">Otvara se u %s</string>
+    <string name="closes_at">Zatvara se u %s</string>
+    <string name="opens_day_at">Otvara se u %1$s u %2$s</string>
+    <string name="closes_day_at">Zatvara se u %1$s u %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="few">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="hours_confirmed_time_ago">Provereno %s</string>
+    <string name="existence_confirmed_time_ago">Provereno da postoji %s</string>
+    <string name="edit_opening_hours">Promeni radno vreme</string>
+    <string name="no_osm_account">Nemate OpenStreetMap nalog?</string>
+    <string name="register_at_openstreetmap">Registrujte se na OpenStreetMap-u</string>
+    <string name="login">Prijavite se</string>
+    <string name="not_signed_in">Niste prijavljeni</string>
+    <string name="login_osm">Prijava na OpenStreetMap</string>
+    <string name="logout">Odjavi se</string>
+    <string name="edit_place">Izmeni mesto</string>
+    <string name="add_language">Dodaj jezik</string>
+    <string name="street">Ulica</string>
+    <string name="house_number">Kućni broj</string>
+    <string name="details">Detalji</string>
+    <string name="social_media">Društveni mediji</string>
+    <string name="building">Zgrada</string>
+    <string name="add_street">Dodaj ulicu</string>
+    <string name="empty_street_name_error">Molim Vas, unesite naziv ulice</string>
+    <string name="choose_language">Izaberite jezik</string>
+    <string name="choose_street">Izaberite ulicu</string>
+    <string name="cuisine">Kuhinja</string>
+    <string name="select_cuisine">Izaberite kuhinju</string>
+    <string name="editor_add_phone">Dodaj broj telefona</string>
+    <string name="level">Sprat</string>
+    <string name="level_value_generic">Sprat: %s</string>
+    <string name="downloader_delete_map_dialog">Sve vaše promene na mapi će biti obrisane zajedno sa mapom</string>
+    <string name="downloader_update_maps">Ažuriraj mape</string>
+    <string name="downloader_mwm_migration_dialog">Da biste napravili rutu, potrebno je da ažurirate sve mape, a zatim da ponovo planirate rutu.</string>
+    <string name="downloader_search_field_hint">Pronađi mapu</string>
+    <string name="common_check_internet_connection_dialog">Molim Vas da proverite da li je Vaš uređaj povezan na internet</string>
+    <string name="downloader_no_space_title">Nema dovoljno prostora</string>
+    <string name="downloader_no_space_message">Molim Vas da obrišete nepotrebne podatke</string>
+    <string name="editor_login_error_dialog">Greška prilikom prijave</string>
+    <string name="editor_profile_changes">Verifikovane promene</string>
+    <string name="editor_focus_map_on_location">Prevucite mapu da postavite krst na lokaciju mesta ili posla.</string>
+    <string name="editor_edit_place_title">Izmena</string>
+    <string name="editor_add_place_title">Dodavanje</string>
+    <string name="editor_edit_place_name_hint">Naziv mesta</string>
+    <string name="editor_default_language_hint">Kao što je napisano na lokalnom jeziku</string>
+    <string name="editor_edit_place_category_title">Kategorija</string>
+    <string name="detailed_problem_description">Detaljan opis problema</string>
+    <string name="editor_report_problem_other_title">Drugi problem</string>
+    <string name="message_invalid_feature_position">Objekat ne može biti na ovom mestu</string>
+    <string name="osm_presentation">Podaci sa OpenStreetMap-a koje je kreirala zajednica do %s. Naučite više o tome kako da menjate i ažurirate mapu na OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je projekat zajednice koji ima za cilj pravljenje besplatne, slobodne i otvorene mape. OSM je glavni izvor podataka za mape u CoMaps-u i funkcioniše na sličan način kao Vikipedija. Možete dodati ili promeniti mesta i vaše promene postaju vidljive milionima korisnika širom sveta. \nPridružite se zajednici i pomozite da napravimo bolju mapu koja je dostupna svima!</string>
+    <string name="login_to_make_edits_visible">Prijavite se na openstreetmap.org da biste objavili vaše promene ostatku sveta</string>
+    <string name="downloader_of">%1$d od %2$d</string>
+    <string name="download_over_mobile_header">Preuzimanje preko mobilne mreže?</string>
+    <string name="download_over_mobile_message">Ovo može biti značajno skuplje u okviru određenih paketa ili u romingu</string>
+    <string name="error_enter_correct_house_number">Uneste ispravan kućni broj</string>
+    <string name="editor_building_levels">Spratovi (uklj. prizemlje, isključujući krov)</string>
+    <string name="error_enter_correct_storey_number">Broj spratova ne sme da prelazi %d</string>
+    <string name="editor_zip_code">Poštanski broj</string>
+    <string name="error_enter_correct_zip_code">Unesite ispravan poštanski broj</string>
+    <string name="editor_other_info">Napomena za OpenStreetMap volontere (nije obavezna)</string>
+    <string name="editor_note_hint">Opišite greške na mapi ili stvari koje se ne mogu promeniti pomoću CoMaps-a</string>
+    <string name="editor_about_osm">Vaše promene su poslate u javnu <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> bazu podataka. Molimo Vas da ne dodajete lične podatke ili podatke zaštićene autorskim pravima.</string>
+    <string name="editor_more_about_osm">Više o OpenStreetMap-u</string>
+    <string name="editor_osm_history">Vaša istorija uređivanja</string>
+    <string name="editor_osm_notes">Vaši podaci o mapi</string>
+    <string name="editor_operator">Operator</string>
+    <string name="operator">Operator: %s</string>
+    <string name="editor_category_unsuitable_title">Ne možete da pronađete odgovarajuću kategoriju?</string>
+    <string name="editor_category_unsuitable_text">CoMaps omogućava dodavanje jednostavnih kategorija za tačke na mapi, što isključuje gradove, puteve, jezera, tlocrte zgrada, itd. Molimo Vas da takve kategorije dodate direktno na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pročitajte naše <a href="https://www.comaps.app/support/advanced-map-editing/">uputstvo</a> za detaljne instrukcije, korak-po-korak.</string>
+    <string name="downloader_no_downloaded_maps_title">Niste preuzeli ni jednu mapu</string>
+    <string name="downloader_no_downloaded_maps_message">Preuzmite mape da biste pretraživali i koristili navigaciju bez interneta</string>
+    <string name="current_location_unknown_error_title">Trenutna lokacija nije poznata</string>
+    <string name="kilometers_per_hour">km/č</string>
+    <string name="miles_per_hour">mi/č</string>
+    <string name="hour">č</string>
+    <string name="minute">min</string>
+    <string name="day">d</string>
+    <string name="placepage_more_button">Više</string>
+    <string name="placepage_edit_bookmark_button">Izmeni snimljeno mesto</string>
+    <string name="placepage_personal_notes_hint">Lične beleške (tekst ili html)</string>
+    <string name="editor_reset_edits_message">Brisanje svih izmena koje nisu poslate?</string>
+    <string name="editor_reset_edits_button">Odbaci promene</string>
+    <string name="editor_remove_place_message">Brisanje dodatog mesta?</string>
+    <string name="editor_remove_place_button">Obriši</string>
+    <string name="editor_place_doesnt_exist">Mesto ne postoji</string>
+    <string name="editor_place_doesnt_exist_description">Opišite kako mesto sada izgleda ta biste poslali poruku o grešci OpenStreetMap zajednici</string>
+    <string name="delete_place_empty_comment_error">Molim Vas navedite razlog zbog čega brište ovo mesto</string>
+    <string name="editor_business_vacant_button">Poslovni prostor je prazan</string>
+    <string name="editor_mark_business_vacant_title">Označi poslovni prostor kao prazan</string>
+    <string name="editor_mark_business_vacant_description">Koristite da biste naznačili da se firma iselila i da je poslovni prostor prazan i spreman da primi novog zakupca.</string>
+    <string name="editor_submit">Pošalji</string>
+    <string name="error_enter_correct_phone">Unesite ispravan broj telefona</string>
+    <string name="error_enter_correct_web">Unesite ispravnu veb adresu</string>
+    <string name="error_enter_correct_email">Unesite ispravan email</string>
+    <string name="editor_level">Sprat (0 je prizemlje)</string>
+    <string name="error_enter_correct_level">Unesite važeći sprat</string>
+    <string name="error_enter_correct_facebook_page">Unesite ispravnu Facebook veb adresu, nalog, ili ime stranice</string>
+    <string name="error_enter_correct_instagram_page">Unesite ispravno Instagram korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_twitter_page">Unesite ispravno Twitter korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_vk_page">Unesite ispravno VK korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_line_page">Unesite ispravan LINE ID ili veb adresu</string>
+    <string name="error_enter_correct_fediverse_page">Unesite važeće korisničko ime Mastodona ili veb adresu</string>
+    <string name="error_enter_correct_bluesky_page">Unesite važeće Bluesky korisničko ime ili veb adresu</string>
+    <string name="placepage_add_place_button">Dodaj mesto na OpenStreetMap</string>
+    <string name="place_page_map_too_old_title">Mape su zastarele</string>
+    <string name="place_page_map_too_old_description">Mape su stare, preuzmite nove.</string>
+    <string name="place_page_app_too_old_description">Mape su veoma stare, preuzmite novu veziju CoMaps aplikacije.</string>
+    <string name="place_page_update_too_old_map">Ažuriranje regionalnih mapa</string>
+    <string name="place_page_too_old_to_edit">Uređivanje OpenStreetMap-a je onemogućeno jer su podaci mape suviše stari.</string>
+    <string name="osm_note_hint">Ili ostavite napomenu OpenStreetMap zajednici da bi neko drugi mogao da doda ili papravi ovo mesto.</string>
+    <string name="osm_note_toast">Napomena će biti poslata na OpenStreetMap</string>
+    <string name="editor_share_to_all_dialog_title">Da li želite da podelite sa svim drugim korisnicima?</string>
+    <string name="editor_share_to_all_dialog_message_1">Proverite da niste uneli privatne ili lične podatke.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap maperi će proveriti promene i kontaktirati Vas ukoliko budu imali pitanja.</string>
+    <string name="navigation_stop_button">Stop</string>
+    <string name="track_recording">Snimanje putanje</string>
+    <string name="accept">Prihvati</string>
+    <string name="decline">Odbij</string>
+    <string name="mobile_data_dialog">Koristi mobilni internet radi prikaza detljnih informacija?</string>
+    <string name="mobile_data_option_always">Uvek koristi</string>
+    <string name="mobile_data_option_today">Samo danas</string>
+    <string name="mobile_data_option_not_today">Nemoj danas</string>
+    <string name="mobile_data">Mobilni internet</string>
+    <string name="mobile_data_description">Mobilni internet je potreban za obaveštenja o ažuriranju mape i za slanje izmena</string>
+    <string name="mobile_data_option_never">Nikad ne koristi</string>
+    <string name="mobile_data_option_ask">Uvek me pitaj</string>
+    <string name="traffic_update_maps_text">Da bi se prikazali podaci o saobraćaju, mapa mora da se ažurira</string>
+    <string name="big_font">Uvećana slova na mapi</string>
+    <string name="traffic_update_app">Molim Vas da ažurirate CoMaps</string>
+    <string name="traffic_data_unavailable">Podaci o saobraćaju nisu dostupni</string>
+    <string name="enable_logging">Snimanje log fajlova</string>
+    <string name="feedback_general">Vaše mišljenje</string>
+    <string name="prefs_languages_information">Koristimo sistemski servis tekst-u-govor za glasovne instrukcije. Mnogi Android uređaji koriste Google Prepoznavanje i sintezu govora, koji možete da preuzmete ili ažurirate putem Google Play prodavnice (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Za pojedine jezike, moraćete da instalirate sintetizator govora ili jezički paket putem prodavnice aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite Podešavanja vašeg uređaja → Jezik i unos → Govor → Izlaz Teksta u govor. \nOvde možete da upravljate podešavanjima za sintezu govora (na primer, da preuzmete jezički paket za upotrebu bez interneta) i da izaberete neku drugu mašinu za Tekst-u-govor.</string>
+    <string name="prefs_languages_information_off_link">Za više informacija pogledajte ovo uputstvo</string>
+    <string name="prefs_speed_cameras_information">Upozorenja o prekršajnim kamerama za brzinu su onemogućena u zemljama u kojima su upozorenja zabranjena zakonom.</string>
+    <string name="transliteration_title">Transliteracija u latinicu</string>
+    <string name="learn_more">Saznaj više</string>
+    <string name="routing_add_start_point">Koristite pretragu ili kratko dodirnite mapu da biste dodali početnu tačku rute</string>
+    <string name="routing_add_finish_point">Koristite pretragu ili kratko dodirnite mapu da biste dodali odredišnu tačku</string>
+    <string name="planning_route_manage_route">Izmeni rutu</string>
+    <string name="button_plan">Plan</string>
+    <string name="placepage_remove_stop">Ukloni međuodredište</string>
+    <string name="placepage_add_stop">Međuodredište</string>
+    <string name="saved">Sačuvano</string>
+    <string name="dialog_error_storage_title">Problem sa pristupom memoriji</string>
+    <string name="dialog_error_storage_message">Eksterna memorija nije dostupna. SD kartica je možda uklonjena, oštećena, ili je fajl sistem samo za čitanje. Molim Vas, proverite Vašu SD karticu ili nas kontaktirajte na support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Simuliraj neispravnu memoriju</string>
+    <string name="error_enter_correct_name">Molim Vas da unesete ispravan naziv</string>
+    <string name="bookmark_lists">Liste favorita</string>
+    <string name="bookmark_lists_hide_all">Sakrij sve</string>
+    <string name="bookmark_lists_show_all">Prikaži sve</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%d favorit</item>
+        <item quantity="few">%d favorita</item>
+        <item quantity="other">%d favorita</item>
+    </plurals>
+    <string name="bookmarks_create_new_group">Kreiraj novu listu</string>
+    <string name="bookmarks_import">Uvezi favorite</string>
+    <string name="bookmarks_error_message_share_general">Deljenje nije moguće zbog greške u aplikaciji</string>
+    <string name="bookmarks_error_title_share_empty">Greška prilikom deljenja</string>
+    <string name="bookmarks_error_message_share_empty">Ne može se podeliti prazna lista</string>
+    <string name="bookmarks_error_title_empty_list_name">Naziv ne sme biti prazan</string>
+    <string name="bookmarks_error_message_empty_list_name">Molim Vas unesite ime liste</string>
+    <string name="bookmarks_new_list_hint">Nova lista</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Ovaj naziv već postoji</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Molim Vas izaberite drugi naziv</string>
+    <string name="please_wait">Molim Vas sačekajte…</string>
+    <string name="phone_number">Broj telefona</string>
+    <string name="profile">OpenStreetMap profil</string>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">%d fajl je pronađen. Možete da ga pogledate nakon konverzije.</item>
+        <item quantity="few">%d fajla je pronađeno. Možete da ih pogledate nakon konverzije.</item>
+        <item quantity="other">%d fajlova je pronađeno. Možete da ih pogledate nakon konverzije.</item>
+    </plurals>
+    <string name="restore">Rekonstruiši</string>
+    <plurals name="tracks">
+        <item quantity="one">%d putanja</item>
+        <item quantity="few">%d putanje</item>
+        <item quantity="other">%d putanja</item>
+    </plurals>
+    <string name="privacy">Privatnost</string>
+    <string name="privacy_policy">Politika privatnosti</string>
+    <string name="power_management">Upravljanje napajanjem</string>
+    <string name="terms_of_use">Uslovi korišćenja</string>
+    <string name="button_layer_traffic">Saobraćaj</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Stilovi mape i slojevi</string>
+    <string name="bookmarks_empty_list_title">Ova lista je prazna</string>
+    <string name="bookmarks_empty_list_message">Da biste dodali mesto, kratko dodirnite mesto na mapi, a onda dodirnite ikonicu sa zvezdom</string>
+    <string name="category_desc_more">…više</string>
+    <string name="export_file">Eksportuj KMZ</string>
+    <string name="export_file_gpx">Eksportuj GPX</string>
+    <string name="delete_list">Obriši listu</string>
+    <string name="speedcams_alert_title">Prekršajne kamere</string>
+    <string name="place_description_title">Opis mesta</string>
+    <string name="notification_channel_downloader">Preuzimanje mapa</string>
+    <string name="pref_tts_speedcams_auto">Upozoriti kod prekoračenja brzine</string>
+    <string name="pref_tts_speedcams_always">Uvek me upozori</string>
+    <string name="pref_tts_speedcams_never">Nemoj da me upozoravaš</string>
+    <string name="power_managment_title">Režim čuvanja baterije</string>
+    <string name="power_managment_description">Smanjuje potrošnju električne energije isključivanjem određenih funkcionalnosti</string>
+    <string name="power_managment_setting_never">Nikad</string>
+    <string name="power_managment_setting_auto">Kada je baterija pri kraju</string>
+    <string name="power_managment_setting_manual_max">Uvek</string>
+    <string name="enable_logging_warning_message">Privremeno uključite ovu opciju da biste sačuvali detaljne dijagnostičke logove ukoliko imate neki problem. Logove možete da nam pošaljete korišćenjem opcije \"Prijavite problem\" u prozoru Pomoć. Napomena: Logovi mogu da sadrže informacije o vašoj lokaciji.</string>
+    <string name="driving_options_title">Opcije rutiranja</string>
+    <string name="avoid_tolls">Izbegavaj putarine</string>
+    <string name="avoid_unpaved">Izbegavaj neasfaltirane puteve</string>
+    <string name="avoid_ferry">Izbegavaj trajekte</string>
+    <string name="avoid_motorways">Izbegavaj autoputeve</string>
+    <string name="avoid_steps">Izbegavaj stepenice</string>
+    <string name="avoid_paved">Izbegavaj asfaltirane puteve</string>
+    <string name="unable_to_calc_alert_title">Nije moguće izračunati rutu</string>
+    <string name="unable_to_calc_alert_subtitle">Ruta nije pronađena. Uzrok mogu biti opcije rutiranja ili nepotpuni OpenStreetMap podaci. Molim Vas da promenite vaše opcije rutiranja i pokušate ponovo.</string>
+    <string name="define_to_avoid_btn">Izaberi puteve za izbegavanje</string>
+    <string name="change_driving_options_btn">Opcije rutiranja su uključene</string>
+    <string name="toll_road">Putevi sa putarinama</string>
+    <string name="unpaved_road">Neasfaltirani putevi</string>
+    <string name="ferry_crossing">Linije trajekta</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne</string>
+    <string name="yes_available">Da</string>
+    <string name="no_available">Ne</string>
+    <string name="capacity">Broj mesta: %s</string>
+    <string name="network">Mreža: %s</string>
+    <string name="trip_finished">Stigli ste!</string>
+    <string name="ok">OK</string>
+    <string name="sort">Sortiranje…</string>
+    <string name="sort_bookmarks">Sortiranje favorita</string>
+    <string name="by_default">Podrazumevano</string>
+    <string name="by_type">Po tipu</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="by_date">Po datumu</string>
+    <string name="by_name">Po nazivu</string>
+    <string name="week_ago_sorttype">Pre nedelju dana</string>
+    <string name="month_ago_sorttype">Pre mesec dana</string>
+    <string name="moremonth_ago_sorttype">Pre više od mesec dana</string>
+    <string name="moreyear_ago_sorttype">Pre više od godinu dana</string>
+    <string name="near_me_sorttype">Blizu mene</string>
+    <string name="others_sorttype">Ostali</string>
+    <string name="food_places">Hrana</string>
+    <string name="tourist_places">Atrakcije</string>
+    <string name="museums">Muzeji</string>
+    <string name="parks">Parkovi</string>
+    <string name="swim_places">Plivanje</string>
+    <string name="mountains">Planine</string>
+    <string name="animals">Životinje</string>
+    <string name="hotels">Hoteli</string>
+    <string name="buildings">Zgrade</string>
+    <string name="money">Novac</string>
+    <string name="shops">Prodavnice</string>
+    <string name="parkings">Parking</string>
+    <string name="fuel_places">Benzinske stanice</string>
+    <string name="medicine">Medicina</string>
+    <string name="search_in_the_list">Pretraži listu</string>
+    <string name="religious_places">Verska mesta</string>
+    <string name="select_list">Izaberite listu</string>
+    <string name="transit_not_found">Navigacija u metrou u ovom regionu još nije dostupna</string>
+    <string name="dialog_pedestrian_route_is_long_header">Nije pronađena metro ruta</string>
+    <string name="dialog_pedestrian_route_is_long_message">Molim vas izaberite početnu i krajnju tačku bliže metro stanicama</string>
+    <string name="button_layer_isolines">Izolinije</string>
+    <string name="isolines_activation_error_dialog">Prikazivanje izolinija zahteva preuzmanje podataka sa mape za ovu oblast</string>
+    <string name="isolines_location_error_dialog">Izolinije nisu dostupne za ovu oblast</string>
+    <string name="elevation_profile_ascent">Uspon</string>
+    <string name="elevation_profile_descent">Spust</string>
+    <string name="elevation_profile_min_elevation">Minimalna visina</string>
+    <string name="elevation_profile_max_elevation">Maksimalna visina</string>
+    <string name="elevation_profile_difficulty">Težina</string>
+    <string name="elevation_profile_distance">Udalj.:</string>
+    <string name="elevation_profile_time">Vreme:</string>
+    <string name="isolines_toast_zooms_1_10">Uvećajte da biste videli izolinije</string>
+    <string name="downloader_loading_ios">Preuzimanje</string>
+    <string name="download_map_title">Preuzmi mapu sveta</string>
+    <string name="disk_error">Ne mogu da napravim folder i premenstim fajlove na internu memoriju uređaja ili na SD karticu</string>
+    <string name="disk_error_title">Greška sa memorijom</string>
+    <string name="connection_failure">Povezivanje nije uspelo</string>
+    <string name="disconnect_usb_cable_title">Otkačite USB kabl</string>
+    <string name="enable_keep_screen_on">Ekran uvek uključen</string>
+    <string name="enable_keep_screen_on_description">Kada je odabrano, ekran će uvek biti uključen dok se prikazuje mapa.</string>
+    <string name="enable_show_on_lock_screen">Prikaz mape na zaključanom ekranu</string>
+    <string name="enable_show_on_lock_screen_description">Kada je odabrano, aplikacija će raditi i na zaključanom ekranu, tj. kada je uređaj zaključan.</string>
+    <string name="change_map_locale">Jezik mape</string>
+    <string name="splash_subtitle">Podaci za mape su sa OpenStreetMap-a</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
+    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
+    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="app_tip_00">Hvala što koristite mape koje je napravila zajednica!</string>
+    <string name="app_tip_01">Sa vašim donacijama i podrškom, možemo da napravimo najbolje mape na svetu!</string>
+    <string name="app_tip_02">Da li vam se dopada naša aplikacija? Molim Vas da donirate da biste podržali dalji razvoj! Još vam se ne dopada? Molimo Vas da nam javite zašto, pa ćemo da je popravimo!</string>
+    <string name="app_tip_03">Ako znate nekog programera, možete da ga zamolite da implementira funkcionalnost koja vam je potrebna.</string>
+    <string name="app_tip_04">Dodirnite bilo gde na mapi da biste izabrali bilo šta. Dug dodir se koristi da se sakrije i prikaže interfejs.</string>
+    <string name="app_tip_05">Da li ste znali da možete da izaberete vašu trenutnu lokaciju na mapi?</string>
+    <string name="app_tip_06">Možete da pomognete da se aplikacija prevede na vaš jezik.</string>
+    <string name="app_tip_07">Naša aplikacija je razvijena od strane nekoliko entuzijasta i zajednice.</string>
+    <string name="app_tip_08">Lako možete da popravite ili unapredite podatke na mapi.</string>
+    <string name="app_tip_09">Naš glavni cilj je da napravimo brzu aplikaciju za mape, jednostavnu za korišćenje, orijentisanu na privatnost, koju ćete voleti.</string>
+    <string name="car_used_on_the_phone_screen">Vi sada koristite CoMaps na ekranu telefona</string>
+    <string name="car_used_on_the_car_screen">Vi sada koristite CoMaps na ekranu automobila</string>
+    <string name="aa_connected_title">Povezani ste na Android Auto</string>
+    <string name="car_continue_on_the_phone">Nastavi na telefonu</string>
+    <string name="car_continue_in_the_car">Prebaci na ekran automobila</string>
+    <string name="aa_location_permissions_request">CoMaps je potreban lokacijski pristup. Kada je sigurno, proverite obaveštenje na svom telefonu.</string>
+    <string name="aa_request_permission_notification">Ova aplikacija je potrebna vaša dozvola</string>
+    <string name="aa_request_permission_activity_text">CoMaps u Android Auto-u je potrebna dozvola za lokaciju da efikasno rade</string>
+    <string name="aa_grant_permissions">Odobri dozvole</string>
+    <string name="button_layer_outdoor">Na otvorenom</string>
+    <string name="browser_not_available">Veb čitač nije dostupan</string>
+    <string name="volume">Jačina zvuka</string>
+    <string name="bookmarks_export">Eksportuj sve mesta i putanje</string>
+    <string name="pref_tts_open_system_settings">Sistemska podešavanja sinteze govora</string>
+    <string name="pref_tts_no_system_tts">Sinteza govora nije pronađena, da li ste sigurni da je vaš uređaj podržava?</string>
+    <string name="drive_through">Prolaz za vozila</string>
+    <string name="clear_the_search">Obriši pretragu</string>
+    <string name="zoom_in">Uvećaj</string>
+    <string name="zoom_out">Umanji</string>
+    <string name="website_menu">Link menija</string>
+    <string name="view_menu">Prikaži meni</string>
+    <string name="open_in_app">Otvori u drugoj aplikaciji</string>
+    <string name="self_service">Samoposluživanje</string>
+    <string name="select_option">Izaberite opciju</string>
+    <string name="outdoor_seating">Bašta</string>
+    <string name="power_save_dialog_summary">Za precizniju navigaciju preporučujemo da se isključi režim čuvanja baterije u Podešavanjima vezanim za beteriju telefona.</string>
+    <string name="start_track_recording">Snimi putanju</string>
+    <string name="stop_track_recording">Zaustavi snimanje putanje</string>
+    <string name="stop_without_saving">Zaustavi bez snimanja</string>
+    <string name="continue_recording">Nastavi snimanje</string>
+    <string name="track_recording_alert_title">Sačuvati u favoritima?</string>
+    <string name="track_recording_toast_nothing_to_save">Putanja je prazna, nema šta da se sačuva</string>
+    <string name="error_no_file_manager_app">Dijalog za izbor foldera nije moguće prikazati pošto na uređaju nije instalirana odgovarajuća aplikacija. Molim Vas da instalirate aplikaciju za upravljanje fajlovima i pokušate ponovo.</string>
+    <string name="choose_color">Izaberite boju</string>
+    <string name="edit_track">Izmenite putanju</string>
+    <string name="uri_open_location_failed">Nema instaliranih aplikacija koje mogu da otvore lokaciju.</string>
+    <string name="nav_auto">Automatski u navigaciji</string>
+    <string name="pref_left_button_title">Podešavanje levog dugmeta</string>
+    <string name="pref_left_button_disable">Isključi</string>
+    <string name="pref_backup_title">Čuvanje favorita</string>
+    <string name="pref_backup_summary">Automatski napraviti rezervnu kopiju u folderu na uređaju</string>
+    <string name="pref_backup_now_title">Napravite rezervnu kopiju sada</string>
+    <string name="pref_backup_now_summary">Napravite rezervnu kopiju</string>
+    <string name="pref_backup_now_summary_progress">Pravim rezervnu kopiju…</string>
+    <string name="pref_backup_now_summary_ok">Rezervna kopija je uspešno završena</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema mesta i putanja za izradu rezervne kopije</string>
+    <string name="pref_backup_now_summary_failed">Rezervna kopija nije uspela</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Folder za rezervnu kopiju nije dostupan</string>
+    <string name="pref_backup_status_summary_success">Poslednja uspešna rezervna kopija</string>
+    <string name="pref_backup_location_title">Lokacija rezervnih kopija</string>
+    <string name="pref_backup_location_summary_initial">Molim vas, prvo izaberite folder i dajte dozvolu</string>
+    <string name="pref_backup_history_title">Broj sačuvanih rezervnih kopija</string>
+    <string name="pref_backup_interval_title">Automatska rezervna kopija</string>
+    <string name="backup_interval_every_day">Svaki dan</string>
+    <string name="backup_interval_every_week">Sedmično</string>
+    <string name="backup_interval_manual_only">Isključeno (samo ručno)</string>
+    <string name="dialog_report_error_missing_folder">Izabrana lokacija rezervne kopije nije dostupna za snimanje. Molimo vas, odaberite drugo mesto.</string>
+    <string name="dialog_report_error_with_logs">Molimo vas, pošaljite nam poruku o grešci:\n- \"Omogući vođenje dnevnika\" u podešavanjima\n- reprodukujte problem\n- na ekranu \"O programu i pomoć\" kliknite na dugme \"Prijavi grešku\" i pošaljite na e-mail ili čat\n- onemogući vođenje dnevnika</string>
+    <string name="clear">Čisto</string>
+    <string name="route_type">Tip rute</string>
+    <string name="vehicle">Vozilo</string>
+    <string name="pedestrian">Pešak</string>
+    <string name="bicycle">Bicikla</string>
+    <string name="ruler">Lenjir</string>
+    <string name="bookmark_color">Boja favorita</string>
+    <string name="about_help">O programu i pomoć</string>
+    <string name="open_now">Sada je otvoreno</string>
+    <string name="closed_now">Zatvoreno sada</string>
+    <string name="at">na %s</string>
+    <string name="share_track">Podeli putanju</string>
+    <string name="delete_track_dialog_title">Obrisati %s?</string>
+    <string name="pref_tts_no_system_tts_short">Nije pronađen program za pretvaranje teksta u govor, proverite podešavanja aplikacije</string>
+    <string name="navigation_start_tts_message">"Pokretanje navigacije, jezik glasovnih instrukcija: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovne instrukcije onemogućene: TTS motor nije dostupan</string>
+    <string name="unknown_power_output">nepoznato</string>
+    <string name="charge_socket_type2">Tip 2 (bez kabla)</string>
+    <string name="charge_socket_type2_cable">Tip 2 (sa kablom)</string>
+    <string name="charge_socket_type2_combo">Tip 2 kombo</string>
+    <string name="charge_socket_type1">Tip 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="charge_socket_schuko">Šuho</string>
+    <string name="unknown_socket_type">nepoznata utičnica</string>
+    <string name="edit_socket_info_tooltip">Kreirajte novu utičnicu ili promenite postojeće.</string>
+    <string name="charging_station_available_sockets">Raspoložive utičnice</string>
+    <string name="charge_socket_unknown_other">Druga ili nepoznata</string>
+    <string name="charge_socket_count">Broj</string>
+    <string name="charge_socket_power">Snaga (kW)</string>
+    <string name="editor_socket">Izmeni utičnicu</string>
+    <string name="unknown_count">nepoznato</string>
+    <string name="error_value_must_be_positive">Vrednost mora biti veća od nule</string>
+    <string name="error_invalid_number">Neispravan broj</string>
+    <string name="offline_explanation_title">Oflajn mape</string>
+    <string name="offline_explanation_text">Potrebno je preuzimanje mape da bi oblast mogla da se pregleda i da bi radilo navođenje.\nPreuzmite mape za oblasti gde želite da putujete.</string>
+    <string name="list_description_empty">Promenite listu da biste dodali opis</string>
+    <string name="advanced">Napredno</string>
+    <string name="download_resources_custom_url_title">Sopstveni server mapa</string>
+    <string name="download_resources_custom_url_message">Zameni podrazumevani server za preuzimanje mapa koji se koristi za preuzimanja mapa. Ostavite prazno da biste koristili CoMaps server.</string>
+    <string name="download_resources_custom_url_summary_none">Nije postavljeno</string>
+    <string name="download_resources_custom_url_error_scheme">Unesite punu URL adresu koja počinje sa https:// i koja se završava sa /</string>
+    <string name="pref_maplanguage_local">Lokalni jezik</string>
+</resources>
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="back">পিছনে</string>
-    <string name="download_maps">ডাউনলোডকৃত মানচিত্র</string>
-    <string name="delete">মুছো</string>
+    <string name="download_maps">মানচিত্র ডাউনলোড করুন</string>
+    <string name="delete">মুছুন</string>
    <string name="cancel">বাতিল</string>
    <string name="miles">মাইল</string>
    <string name="later">পরে</string>
    <string name="search">খুঁজুন</string>
-    <string name="download_has_failed">ডাউনলোড ব্যর্থ। আবার চেষ্টা করতে টিপ দাও।</string>
+    <string name="download_has_failed">ডাউনলোড ব্যর্থ হয়েছে, আবার চেষ্টা করতে টিপ দিন</string>
    <string name="search_map">ম্যাপ অনুসন্ধান</string>
    <string name="kilometres">কিলোমিটার</string>
    <string name="downloading">ডাউনলোডরত…</string>
@@ -303,4 +303,34 @@
    <string name="editor_report_problem_other_title">আলাদা সমস্যা</string>
    <string name="osm_presentation">কমিউনিটি দ্বারা তৈরি ওপেনস্ট্রিটম্যাপ ডেটা টি %s তারিখ অব্দি সাম্পতিক। মানচিত্রটি সম্পাদনা এবং আপডেট করার সম্পর্কে আরও জানুন OpenStreetMap.org-এ</string>
    <string name="editor_edit_place_category_title">শ্রেণি</string>
+    <string name="opens_at">%s এ খুলবে</string>
+    <string name="closes_at">%s এ বন্ধ হবে</string>
+    <string name="downloader_of">%2$d এর মধ্যে %1$d</string>
+    <string name="error_enter_correct_house_number">সঠিক বিল্ডিং নম্বর দিন</string>
+    <string name="editor_more_about_osm">আরো OpenStreetMap সম্বন্ধে</string>
+    <string name="downloader_no_downloaded_maps_title">আপনি কোনো মানচিত্র ডাউনলোড করেননি</string>
+    <string name="current_location_unknown_error_title">বর্তমান অবস্থান অজানা</string>
+    <string name="editor_place_doesnt_exist">স্থানটি অস্তিত্বই নেই</string>
+    <string name="error_enter_correct_phone">সঠিক ফোন নম্বর দিন</string>
+    <string name="error_enter_correct_web">সঠিক ওয়েব এড্রেস দিন</string>
+    <string name="error_enter_correct_email">সঠিক ইমেইল দিন</string>
+    <string name="placepage_add_place_button">OpenStreetMap এ স্থান যোগ করুন</string>
+    <string name="editor_zip_code">ডাক কোড</string>
+    <string name="error_enter_correct_zip_code">সঠিক ডাক কোড প্রদান করুন</string>
+    <string name="editor_reset_edits_button">পরিবর্তনগুলো বাতিল করুন</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%dটি বুকমার্ক</item>
+        <item quantity="other">%dটি বুকমার্ক</item>
+    </plurals>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি এটি দেখতে পারবেন।</item>
+        <item quantity="other">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি সেগুলো দেখতে পারবেন।</item>
+    </plurals>
+    <plurals name="tracks">
+        <item quantity="one">%dটি ট্র্যাক</item>
+        <item quantity="other">%dটি ট্র্যাক</item>
+    </plurals>
+    <string name="app_tip_06">আপনি আমাদের অ্যাপটি আপনার ভাষায় অনুবাদ করতে সাহায্য করতে পারেন।</string>
+    <string name="offline_explanation_title">অফলাইন মানচিত্র</string>
+    <string name="offline_explanation_text">এলাকাটি দেখতে এবং নেভিগেট করতে একটি মানচিত্র ডাউনলোড করতে হবে।\nআপনি যেসব এলাকায় ভ্রমণ করতে চান সেগুলোর মানচিত্র ডাউনলোড করুন।</string>
 </resources>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -924,5 +924,5 @@
    <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>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Přidat novou skupinu záložek</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Název záložky</string>
+    <string name="bookmark_set_name">Název seznamu</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Záložky</string>
+    <string name="bookmarks">Místa</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Záložky a stopy</string>
+    <string name="bookmarks_and_tracks">Oblíbené</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Název</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,13 +144,13 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Poznámky</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Sdílené záložky CoMaps</string>
+    <string name="share_bookmarks_email_subject">Má oblíbená místa z CoMaps</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Nahrávání záložek</string>
+    <string name="load_kmz_title">Načítání oblíbených</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Záložky byly úspěšně nahrány! Naleznete je na mapě nebo ve správci záložek.</string>
+    <string name="load_kmz_successful">Oblíbená místa byla úspěšně nahrána! Naleznete je na mapě nebo ve správci oblíbených.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Nahrávání záložek se nezdařilo. Soubor může být poškozený nebo vadný.</string>
+    <string name="load_kmz_failed">Nepodařilo se načíst oblíbená místa. Soubor může být poškozený nebo vadný.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Typ souboru není aplikací rozpoznán: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -490,7 +490,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Více</string>
-    <string name="placepage_edit_bookmark_button">Upravit záložku</string>
+    <string name="placepage_edit_bookmark_button">Upravit uložené místo</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 změny</string>
@@ -547,18 +547,19 @@
    <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
    <string name="error_enter_correct_name">Zadejte prosím správný název</string>
-    <string name="bookmark_lists">Seznamy</string>
+    <string name="bookmark_lists">Seznamy oblíbených</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Skrýt vše</string>
    <string name="bookmark_lists_show_all">Zobrazit vše</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d záložka</item>
-        <item quantity="few">%d záložky</item>
-        <item quantity="other">%d záložek</item>
+        <item quantity="one">%d uložené místo</item>
+        <item quantity="few">%d uložená místa</item>
+        <item quantity="many">%d uložených míst</item>
+        <item quantity="other">%d uložených míst</item>
    </plurals>
    <string name="bookmarks_create_new_group">Vytvořit nový seznam</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Import záložek a stop</string>
+    <string name="bookmarks_import">Importovat oblíbené</string>
    <string name="bookmarks_error_message_share_general">Nelze sdílet kvůli chybě aplikace</string>
    <string name="bookmarks_error_title_share_empty">Chyba sdílení</string>
    <string name="bookmarks_error_message_share_empty">Nelze sdílet s prázdným seznamem</string>
@@ -589,7 +590,7 @@
    <string name="subway">Metro</string>
    <string name="layers_title">Styly a vrstvy mapy</string>
    <string name="bookmarks_empty_list_title">Seznam je prázdný</string>
-    <string name="bookmarks_empty_list_message">Pro přidání nové značky klikněte na symbol hvězdičky na obrázku objektu</string>
+    <string name="bookmarks_empty_list_message">Pro uložení místa klepněte na místo na mapě a následně na ikonu hvězdy</string>
    <string name="category_desc_more">…ještě</string>
    <string name="export_file">Exportovat KMZ</string>
    <string name="export_file_gpx">Export GPX</string>
@@ -642,7 +643,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Třídit…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Třídit záložky</string>
+    <string name="sort_bookmarks">Třídit oblíbené</string>
    <!-- Android -->
    <string name="by_default">Podle výchozího stavu</string>
    <!-- Android -->
@@ -752,7 +753,7 @@
    <string name="browser_not_available">Webový prohlížeč není k dispozici</string>
    <string name="volume">Hlasitost</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Export všech záložek a stop</string>
+    <string name="bookmarks_export">Exportovat všechna místa a stopy</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Systémové nastavení syntézy řeči</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -784,7 +785,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Pokračovat v nahrávání</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Uložit do záložek a stop?</string>
+    <string name="track_recording_alert_title">Uložit do oblíbených?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Trasa je prázdná - není co ukládat</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -803,7 +804,7 @@
    <string name="error_enter_correct_instagram_page">Zadejte platné uživatelské jméno nebo webovou adresu Instagramu</string>
    <string name="error_enter_correct_twitter_page">Zadejte platné uživatelské jméno nebo webovou adresu Twitteru</string>
    <string name="maps_storage_free_size">%1$s z %2$s volných</string>
-    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš mé záložky; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://www.comaps.app/download/ \n \nUžij si cestování s CoMaps!</string>
+    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš má oblíbená místa; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://www.comaps.app/download/ \n \nUžij si cestování s CoMaps!</string>
    <string name="disk_error">Nepodařilo se vytvořit složku a přesunout soubory v interní paměti zařízení nebo na SD kartě</string>
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <string name="error_enter_correct_vk_page">Zadejte platné uživatelské jméno nebo webovou adresu VK</string>
@@ -833,16 +834,16 @@
    <string name="pedestrian">Pěší zóna</string>
    <string name="bicycle">Jízdní kolo</string>
    <string name="ruler">Pravítko</string>
-    <string name="bookmark_color">Barva záložky</string>
+    <string name="bookmark_color">Barva oblíbeného místa</string>
    <string name="clear">Vymazat</string>
    <string name="panoramax">Obrázek Panoramax</string>
    <string name="about_help">O aplikaci a nápověda</string>
    <string name="pref_backup_summary">Automaticky zálohovat do složky na vašem zařízení</string>
-    <string name="pref_backup_title">Záloha záložek a stop</string>
+    <string name="pref_backup_title">Zálohovat oblíbené</string>
    <string name="pref_backup_now_title">Zálohovat nyní</string>
    <string name="pref_backup_now_summary">Nyní vytvořit zálohu</string>
    <string name="pref_backup_now_summary_ok">Záloha úspěšně dokončena</string>
-    <string name="pref_backup_now_summary_empty_lists">Nemáte žádné záložky ani stopy k zálohování</string>
+    <string name="pref_backup_now_summary_empty_lists">Nemáte žádná místa ani stopy k zálohování</string>
    <string name="pref_backup_now_summary_progress">Zálohování…</string>
    <string name="pref_backup_now_summary_failed">Zálohování selhalo</string>
    <string name="pref_backup_now_summary_folder_unavailable">Složka pro zálohování není dostupná</string>
@@ -915,7 +916,8 @@
    <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="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na http:// nebo https://</string>
    <string name="advanced">Pokročilé</string>
    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
+    <string name="pref_maplanguage_local">Místní jazyk</string>
 </resources>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -906,5 +906,5 @@
    <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>
+    <string name="download_resources_custom_url_error_scheme">Indtast en URL, der starter med http:// eller https://</string>
 </resources>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Easy map navigation - Discover more of your journey - Powered by the community`
				`@@ -0,0 +1 @@`
				`CoMaps - Hike, Bike, Drive Offline with Privacy`
				`@@ -0,0 +1 @@`
				`Navigacyon mappa es - Trovya moy a dha kerdh - Selys war an kemeneth`
				`@@ -0,0 +1 @@`
				`Jednostavna navigacija - Saznajte više o svom putovanju - Održava zajednica`
				`@@ -0,0 +1 @@`
				`CoMaps - pešačenje, bicikl, vožnja sa privatnošću`