Don't exit and fail on bad python script exit coce

Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>
add csv diff
2026-01-11 14:54:17 +00:00 · 2026-01-04 09:30:24 +01:00 · 2026-01-01 12:45:56 -08:00 · 2026-01-01 06:08:10 +01:00 · 2026-01-01 00:01:28 +01:00 · 2025-12-31 22:50:15 +01:00
380 changed files with 8081 additions and 16069 deletions
--- a/.forgejo/workflows/process_subways.yml
+++ b/.forgejo/workflows/process_subways.yml
@@ -1,13 +1,17 @@
-name: process_subways
+name: compare_subways
 on:
  workflow_dispatch: # Manual trigger
+  schedule:
+    # Run daily at 00:00 UTC
+    - cron: '0 0 * * *'

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

@@ -22,20 +26,68 @@ jobs:
      volumes:
        - /mnt/4tbexternal:/mnt/4tbexternal
    concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-compare-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 }}
+          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
      - 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:
@@ -44,7 +96,7 @@ jobs:
        - /mnt/4tbexternal/:/mnt/4tbexternal/
        - /mnt/4tbexternal/osm-planet:/home/planet
    concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
      cancel-in-progress: true
    steps:
      - name: Check for O5M Planet File
@@ -82,9 +134,8 @@ jobs:
            --data-urlencode topic=codeberg-bot \
            --data-urlencode 'content=O5M planet update is done!'

-  update-subways:
-    if: inputs.run-subways
-    name: Update Subways
+  compare-subways:
+    name: Compare Subways
    runs-on: mapfilemaker
    needs:
      - clone-repos
@@ -94,31 +145,19 @@ jobs:
        - /mnt/4tbexternal/:/mnt/4tbexternal/
        - /mnt/4tbexternal/osm-planet:/home/planet
    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-compare-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: Update Subways
+      - name: Compare 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 \
@@ -127,3 +166,47 @@ 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@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 1

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

      - name: Checkout sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        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@v6
+        uses: actions/upload-artifact@v4
        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@v6
+        uses: actions/checkout@v4

      - name: Parallel submodules checkout
        shell: bash
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,20 @@ 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 2026 CoMaps Contributors
+Copyright 2025 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,20 +254,18 @@ 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",
@@ -277,38 +275,28 @@ android {
            "fi",
            "fr",
            "fr-rCA",
-            "gl",
-            "gsw",
-            "he",
+            "iw",
            "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",
@@ -363,8 +351,6 @@ 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> (auf Englisch).
+Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
 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 viel Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
+‣ <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, 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>Freiheit beginnt hier</b>
-Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
+<b>Entdecke die Unabhängigkeit</b>
+Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
--- 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,9 +1,8 @@
-• 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
+• OpenStreetMap Daten vom 17. Dezember
+• Map download server nun wählbar
+• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
+• Vermeidung von Parkplatzwegen im Routing
+• Neuer Zoombutton
+• Verbesserte Französchische Suchsynonme
+• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
+Mehr auf codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/de-DE/short-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
+Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
--- a/android/app/src/fdroid/play/listings/en-AU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-AU/full-description.txt
@@ -1,32 +0,0 @@
-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
@@ -1,32 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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,9 +1,8 @@
-• 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)
-
+• OpenStreetMap data as of December 17
+• Make map download server configurable
+• Added info about outdated maps and an update button to the selected place info card
+• Avoid using parking aisles for routing
+• Changed shape of zoom buttons
+• Improved French search synonyms
+• OSM editor: check length limit for OSM tags in value validation
 More details on codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,9 +0,0 @@
-• 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,9 +1,8 @@
-• 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
+• Données OpenStreetMap du 17 décembre
+• Serveur de téléchargement de cartes configurable
+• Ajout d'un message d'avertissement pour les cartes trop anciennes
+• Évitement des allées de parking dans les itinéraires
+• Mise à jour de l'apparence des boutons de zooms
+• Amélioration des synonymes de recherche en français
+• Editeur OSM: vérification de la taille limite des tags OSM
+Plus d'informations sur codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/hr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/hr/release-notes.txt
@@ -1,7 +0,0 @@
-• 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
@@ -1,32 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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,9 +1,8 @@
-• 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)
-
+• Dados OSM de 17/12
+• Servidor de download de mapas configurável
+• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
+• Evita o uso de corredores de estacionamento para roteamento
+• Formato dos botões de zoom alterado
+• Sinônimos de busca em francês aprimorados
+• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
 Mais detalhes em codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,8 +1,8 @@
-• Карты OpenStreetMap от 6 января
-• Редактор: возможность добавления POI, определяемых несколькими тегами, например церквей, мечетей, буддистских храмов..
-• Добавлены миниатюрные железные дороги и очистные сооружения
-• Использование диалогов Material 3 и более тёмного фона в тёмном режиме
-• Удалены фиктивные ограничения скорости для заездов / съездов с шоссе
-• Менее чувствительное длительное нажатие на экран (переход в полноэкранный режим)
-
+• Карты OpenStreetMap от 17 декабря
+• Возможность настройки сервера для скачивания карт
+• Добавлена информация об устаревании карт и кнопка обновления (при выборе места на карте)
+• Парковочные проезды больше не используются для транзитной маршрутизации
+• Изменены кнопки масштабирования карты
+• На карту добавлены ирригационные гидранты
+• Редактор OSM: проверка максимальной длины OSM тегов
 Подробнее на 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
@@ -1,32 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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-Webseite
+• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website

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

-<b>Freiheit beginnt hier</b>
-Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
+<b>Entdecke die Unabhängigkeit</b>
+Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
--- 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 @@
-Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
+Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
--- a/android/app/src/google/play/listings/en-AU/full-description.txt
+++ b/android/app/src/google/play/listings/en-AU/full-description.txt
@@ -1,36 +0,0 @@
-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)
+        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                           .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,6 +132,7 @@ 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;

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

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

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

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

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

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

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

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

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

  private void reportUnsupported()
  {
-    new MaterialAlertDialogBuilder(this)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .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_M3_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_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)
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
          .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)
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
          .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,7 +42,6 @@ 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,7 +77,6 @@ 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)
+        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.download_resources_custom_url_title)
            .setMessage(R.string.download_resources_custom_url_message)
            .setView(dialogView)
--- 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())
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
                                     .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)
+      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
          .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)
+    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
        .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)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
                                .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)
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
        .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)
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
        .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,6 +53,7 @@ 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())
+    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .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())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(message)
        .setPositiveButton(title,
                           (dialog, which) -> {
@@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void placeDisused()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
      .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,7 +237,6 @@ 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);
  }

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

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

  private void showNoobDialog()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .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())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .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,15 +1,11 @@
 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;
@@ -25,7 +21,6 @@ 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
  {
@@ -39,8 +34,6 @@ 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<>();

@@ -75,12 +68,6 @@ 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())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .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())
+        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
               .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/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)
+    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
                  .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())
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
                                             .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,7 +1,6 @@
 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;
@@ -141,13 +140,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
  private void updateMapLanguageCodeSummary()
  {
    final Preference pref = getPreference(getString(R.string.pref_map_locale));
-    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());
-    }
+    Locale locale = new Locale(MapLanguageCode.getMapLanguageCode());
+    pref.setSummary(locale.getDisplayLanguage());
  }

  private void updateRoutingSettingsPrefsSummary()
@@ -500,7 +494,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    pref.setOnPreferenceClickListener(preference -> {
      if (MapManager.nativeIsDownloading())
      {
-        new MaterialAlertDialogBuilder(requireActivity())
+        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
            .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())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .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())
+          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
              .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,6 +184,20 @@ 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/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(), R.style.MwmTheme_BottomSheetDialog) {
+    return new BottomSheetDialog(requireContext(), getTheme()) {
      @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,7 +61,6 @@ 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())
+    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .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())
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
                       .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,9 +428,8 @@ 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,
-                       enabled);
+                       mMapObject.isBookmark());
  }

  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,7 +23,6 @@ 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;
@@ -42,7 +41,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
  private PlacePageViewModel mViewModel;

  private Bookmark currentBookmark;
-  private Track currentTrack;

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

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

  @Override
@@ -170,11 +152,6 @@ 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="?appBackground" />
+      <solid android:color="?cardBackground" />
    </shape>
  </item>
  <item android:id="@android:id/mask">
--- 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,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  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/Widget.Material3.CardView.Filled"
+  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
-<LinearLayout
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:background="?cardBackground">

  <LinearLayout
    android:orientation="vertical"
@@ -55,4 +49,3 @@
      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,9 +22,12 @@
      android:layout_height="match_parent"
      android:clipChildren="false"
      android:clipToPadding="false"
-      android:baselineAligned="false"
-      android:orientation="horizontal"
+      android:orientation="vertical"
      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"
@@ -108,5 +111,6 @@
            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="?colorSurfaceContainerLow"/>
+    android:background="?cardBackground"/>
 </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,7 +17,6 @@
    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,7 +11,8 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
-    android:background="?menuBackground"
+    android:backgroundTint="?menuBackground"
+    android:background="@drawable/onmap_downloader_background"
    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,6 +8,7 @@
  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,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  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
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
  android:orientation="vertical"
+  android:background="?cardBackground"
  android:minWidth="@dimen/bookmark_purchase_img_width"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">
@@ -27,11 +21,9 @@
    android:layout_marginEnd="@dimen/margin_base_plus"
    android:layout_marginStart="@dimen/margin_base_plus"
    tools:text="Select list"/>
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
+  <include
    android:layout_marginTop="@dimen/margin_base"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    android:scrollbars="vertical"/>
+    layout="@layout/recycler_default"/>
 </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,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  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">

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

    <RadioButton
-      style="@style/MwmTextAppearance.Subtitle1"
+      style="@style/TextAppearance.Subtitle1"
      android:id="@+id/sort_by_default"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -82,4 +77,3 @@
      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,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  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/Widget.Material3.CardView.Filled"
+  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
-<LinearLayout
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:background="?cardBackground">

  <LinearLayout
    android:orientation="vertical"
@@ -47,4 +41,3 @@
    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,6 +13,7 @@
    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="?appBackground"
+  android:background="?cardBackground"
  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="?appBackground"
+  android:background="?cardBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
  <com.google.android.material.appbar.MaterialToolbar
@@ -69,6 +69,7 @@
      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,6 +11,5 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:scrollbars="vertical"
-    android:fadeScrollbars="false"
-    android:background="?appBackground"/>
+    android:fadeScrollbars="false" />
 </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="?appBackground"
+  android:background="?cardBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
  <include layout="@layout/toolbar_with_search"/>
@@ -17,12 +17,10 @@
    style="@style/MwmWidget.Button.Primary"
    tools:text="@string/downloader_update_all_button"/>

-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
+  <include
+    layout="@layout/recycler_default"
    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="?appBackground">
+  android:background="?cardBackground">
  <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,7 +5,6 @@
  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="?windowBackgroundForced">
+        android:background="?cardBackground">

        <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="?appBackground">
+        android:background="?cardBackground">

        <androidx.recyclerview.widget.RecyclerView
          android:id="@+id/recycler"
          android:clipToPadding="false"
-          android:background="?appBackground"
+          android:background="?cardBackground"
          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,10 +4,6 @@
  style="@style/MwmWidget.FrameLayout"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?appBackground"
-    android:scrollbars="vertical"/>
+  <include
+    layout="@layout/recycler_default"/>
 </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:app="http://schemas.android.com/apk/res-auto"
+  xmlns:card_view="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
@@ -16,9 +16,33 @@
    <com.google.android.material.card.MaterialCardView
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_half"
      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      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">

      <LinearLayout
        android:id="@+id/examples"
@@ -26,26 +50,6 @@
        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="?appBackground"
+    android:background="?cardBackground"
    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="?appBackground"
+  android:background="?windowBackgroundForced"
  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="?appBackground"
+  android:background="?cardBackground"
  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="?colorSurfaceContainerHigh"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -7,7 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?colorSurfaceContainerHigh"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -1,14 +1,11 @@
-<com.google.android.material.card.MaterialCardView
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/MwmWidget.M3.Editor.CardView"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    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:layout_height="@dimen/height_item_oneline"
+    android:background="?clickableBackground"
+    android:layout_marginTop="@dimen/margin_half"
    android:paddingStart="@dimen/margin_half_plus"
    android:paddingEnd="@dimen/margin_half_plus">

@@ -28,6 +25,7 @@
        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"
@@ -43,6 +41,7 @@
    <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"
@@ -50,4 +49,3 @@
      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="?colorSurfaceContainerLow"/>
+    android:background="?cardBackground"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -17,7 +17,6 @@
    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="?appBackground"
+  android:background="?cardBackground"
  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="?appBackground"
+  android:background="?cardBackground"
  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,7 +4,6 @@
  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,14 +15,21 @@
    android:theme="@style/MwmWidget.ToolbarTheme"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:title="@string/editor_add_select_location">
+    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"/>
    </com.google.android.material.appbar.MaterialToolbar>

  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:padding="@dimen/margin_base"
    android:text="@string/editor_focus_map_on_location"
    app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />
--- a/android/app/src/main/res/layout/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="?appBackground"
+  android:background="?cardBackground"
  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,13 +146,16 @@
    android:foreground="@drawable/shadow_top"
    android:visibility="gone"
    tools:visibility="visible">
-    <LinearLayout
+    <RelativeLayout
      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"
@@ -171,7 +174,8 @@
          android:textAppearance="?android:attr/textAppearanceSmall"
          android:textColor="@color/text_light"
          tools:text="test" />
-    </LinearLayout>
+      </LinearLayout>
+    </RelativeLayout>
  </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,662 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
+</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,34 +303,4 @@
    <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 que comence amb http:// o https://</string>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -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 seznamu</string>
+    <string name="bookmark_set_name">Název záložky</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Místa</string>
+    <string name="bookmarks">Záložky</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Oblíbené</string>
+    <string name="bookmarks_and_tracks">Záložky a stopy</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">Má oblíbená místa z CoMaps</string>
+    <string name="share_bookmarks_email_subject">Sdílené záložky CoMaps</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Načítání oblíbených</string>
+    <string name="load_kmz_title">Nahrávání záložek</string>
    <!-- Kmz file successful loading -->
-    <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>
+    <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>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Nepodařilo se načíst oblíbená místa. Soubor může být poškozený nebo vadný.</string>
+    <string name="load_kmz_failed">Nahrávání záložek se nezdařilo. 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 uložené místo</string>
+    <string name="placepage_edit_bookmark_button">Upravit záložku</string>
    <string name="placepage_personal_notes_hint">Vlastní poznámka (text nebo HTML)</string>
    <string name="editor_reset_edits_message">Vymazat všechny místní změny?</string>
    <string name="editor_reset_edits_button">Zahodit změny</string>
@@ -547,19 +547,18 @@
    <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 oblíbených</string>
+    <string name="bookmark_lists">Seznamy</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 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>
+        <item quantity="one">%d záložka</item>
+        <item quantity="few">%d záložky</item>
+        <item quantity="other">%d záložek</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">Importovat oblíbené</string>
+    <string name="bookmarks_import">Import záložek a stop</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>
@@ -590,7 +589,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 uložení místa klepněte na místo na mapě a následně na ikonu hvězdy</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="category_desc_more">…ještě</string>
    <string name="export_file">Exportovat KMZ</string>
    <string name="export_file_gpx">Export GPX</string>
@@ -643,7 +642,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 oblíbené</string>
+    <string name="sort_bookmarks">Třídit záložky</string>
    <!-- Android -->
    <string name="by_default">Podle výchozího stavu</string>
    <!-- Android -->
@@ -753,7 +752,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">Exportovat všechna místa a stopy</string>
+    <string name="bookmarks_export">Export všech záložek a stop</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. -->
@@ -785,7 +784,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 oblíbených?</string>
+    <string name="track_recording_alert_title">Uložit do záložek a stop?</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 -->
@@ -804,7 +803,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á 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="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="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>
@@ -834,16 +833,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 oblíbeného místa</string>
+    <string name="bookmark_color">Barva záložky</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álohovat oblíbené</string>
+    <string name="pref_backup_title">Záloha záložek a stop</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á místa ani stopy k zálohování</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_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>
@@ -916,8 +915,7 @@
    <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 http:// nebo https://</string>
+    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
    <string name="advanced">Pokročilé</string>
    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
-    <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 URL, der starter med http:// eller https://</string>
+    <string name="download_resources_custom_url_error_scheme">Indtast en fuld URL, der starter med https:// og ender med /</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -23,7 +23,7 @@
    <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
    <string name="search_map">Auf der Karte suchen</string>
    <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktiviere diese in den Einstellungen.</string>
+    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Eingeschränkte Genauigkeit</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
@@ -54,9 +54,9 @@
    <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um CoMaps zu verwenden</string>
    <!-- Used in DownloadResources startup screen -->
    <string name="not_enough_free_space_on_sdcard">Bitte zuerst den Speicherplatz auf der SD-Karte/USB-Speicher freigeben, um die Anwendung nutzen zu können</string>
-    <string name="download_resources">Bevor du die App verwendest, lade bitte die weltweite Übersichtskarte herunter. \nEs werden %s des Speicherplatzes benötigt.</string>
+    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s des Speicherplatzes benötigt.</string>
    <string name="download_resources_continue">Zur Karte</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. \nDu kannst jetzt zur Karte weitergehen.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. \nSie können jetzt zur Karte weitergehen.</string>
    <string name="download_country_ask">%1$s herunterladen? (%2$s)</string>
    <string name="update_country_ask">%1$s aktualisieren? (%2$s)</string>
    <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Neue Liste erstellen</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Name der Liste</string>
+    <string name="bookmark_set_name">Name der Lesezeichenliste</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Orte</string>
+    <string name="bookmarks">Lesezeichen</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoriten</string>
+    <string name="bookmarks_and_tracks">Lesezeichen und Tracks</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Name</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,12 +148,12 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notizen</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Meine CoMaps-Favoriten</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen aus der CoMaps-App. Du kannst sie in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie unter https://www.comaps.app/de/download/ herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
+    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps-App. Du kannst in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Favoriten laden</string>
+    <string name="load_kmz_title">Lesezeichen werden geladen</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst dieses nun auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
+    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Sie können diese nun auf Ihrer Karte oder im Lesezeichen-Manager anzeigen.</string>
    <!-- Kml file loading failed -->
    <string name="load_kmz_failed">Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -169,9 +169,9 @@
    <!-- Alert message that downloading is in progress. -->
    <string name="downloading_is_active">Die Karte wird jetzt heruntergeladen</string>
    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Du hast CoMaps nicht installiert? Lade die App hier herunter: https://www.comaps.app/de/download/</string>
+    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/de/download/</string>
    <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir mein Lesezeichen in der CoMaps-App an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel in der CoMaps-App an!</string>
    <!-- Subject for emailed position -->
    <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -181,7 +181,7 @@
    <!-- Share by email button text, also used in editor and About. -->
    <string name="email">E-Mail</string>
    <!-- Text for message when used successfully copied something -->
-    <string name="copied_to_clipboard">Kopiert in der Zwischenablage: %s</string>
+    <string name="copied_to_clipboard">In die Zwischenablage kopiert: %s</string>
    <!-- Used for bookmark editing -->
    <string name="done">Fertig</string>
    <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
@@ -236,11 +236,11 @@
    <!-- Settings: Send feedback button and dialog title -->
    <string name="feedback">Feedback</string>
    <!-- Text in menu -->
-    <string name="rate_the_app">Bewerte die App</string>
+    <string name="rate_the_app">Bewerten Sie die App</string>
    <!-- Text in menu -->
    <string name="help">Hilfe</string>
    <!-- Button in the main Help dialog -->
-    <string name="faq">Häufige Fragen und Antworten (FAQ)</string>
+    <string name="faq">Häufige Fragen und Antworten</string>
    <!-- Button in the main menu -->
    <string name="donate">Spenden</string>
    <!-- Button in the main Help dialog -->
@@ -250,13 +250,13 @@
    <!-- Text in menu + Button in the main Help dialog -->
    <string name="report_a_bug">App-Fehler melden</string>
    <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
-    <string name="compass_calibration_recommended">Verbessere die Pfeilrichtung, indem du das Smartphone so bewegst, als würdest du eine acht (8) in der Luft nachzeichnen, um den Kompass zu kalibrieren.</string>
+    <string name="compass_calibration_recommended">Verbessern Sie die Pfeilrichtung, indem Sie das Telefon in einer Achterbewegung bewegen, um den Kompass zu kalibrieren.</string>
    <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
-    <string name="compass_calibration_required">Bewege das Smartphone so, als wenn du damit eine acht (8) in der Luft zeichnen würdest, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
+    <string name="compass_calibration_required">Bewegen Sie das Telefon in einer Achterbewegung, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
    <!-- Toast text when user hides UI with a long tap anywhere on the map -->
-    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche wiederzusehen</string>
+    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche zu sehen</string>
    <!-- Update all button text -->
-    <string name="downloader_update_all_button">Alle Karten aktualisieren</string>
+    <string name="downloader_update_all_button">Alle aktualisieren</string>
    <!-- Cancel all button text -->
    <string name="downloader_cancel_all">Alle abbrechen</string>
    <!-- Downloaded maps list header -->
@@ -289,11 +289,11 @@
    <!-- Text for routing error dialog -->
    <string name="routing_download_maps_along">Karten entlang der Route herunterladen</string>
    <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Zum Erstellen einer Route müssen alle Karten von deinem Standort bis zum Ziel heruntergeladen und aktualisiert worden sein.</string>
+    <string name="routing_requires_all_map">Zum Erstellen einer Route müssen alle Karten von Ihrem Standort bis zum Ziel heruntergeladen und aktualisiert worden sein.</string>
    <!-- Text for routing error dialog -->
    <string name="routing_not_enough_space">Nicht genügend Speicherplatz</string>
    <!-- location service disabled -->
-    <string name="enable_location_services">Bitte aktiviere die Standortdienste</string>
+    <string name="enable_location_services">Bitte aktivieren Sie die Standortdienste</string>
    <string name="save">Speichern</string>
    <string name="create">Erstellen</string>
    <!-- red color -->
@@ -329,36 +329,36 @@
    <!-- blue gray color -->
    <string name="blue_gray">Graublau</string>
    <!-- SECTION: Routing dialogs strings -->
-    <string name="dialog_routing_disclaimer_title">Wenn du der Route folgst, beachte bitte:</string>
+    <string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
    <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
-    <string name="dialog_routing_disclaimer_precision">— Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
+    <string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
    <string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
-    <string name="dialog_routing_disclaimer_borders">— Bitte sei vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
-    <string name="dialog_routing_disclaimer_beware">Bitte fahre aufmerksam und sicher!</string>
+    <string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
+    <string name="dialog_routing_disclaimer_beware">Bitte fahren Sie aufmerksam und sicher!</string>
    <string name="dialog_routing_check_gps">GPS-Signal prüfen</string>
    <string name="dialog_routing_error_location_not_found">Route kann nicht erstellt werden. Aktuelle GPS-Koordinaten konnten nicht ermittelt werden.</string>
-    <string name="dialog_routing_location_turn_wifi">Bitte prüfe dein GPS-Signal. Aktiviertes W-LAN verbessert deine Standortgenauigkeit.</string>
+    <string name="dialog_routing_location_turn_wifi">Bitte prüfen Sie Ihr GPS-Signal. WLAN verbessert Ihre Standortgenauigkeit.</string>
    <string name="dialog_routing_location_turn_on">Standortdienste aktivieren</string>
-    <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktiviere die Standortdienste, um die Route zu berechnen.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktivieren Sie Standortdienste, um die Route zu berechnen.</string>
    <string name="dialog_routing_unable_locate_route">Route kann nicht ermittelt werden</string>
    <string name="dialog_routing_cant_build_route">Route konnte nicht erstellt werden</string>
-    <string name="dialog_routing_change_start_or_end">Bitte passe deinen Startpunkt oder Ziel an.</string>
+    <string name="dialog_routing_change_start_or_end">Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an.</string>
    <string name="dialog_routing_change_start">Startpunkt anpassen</string>
    <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt konnte nicht gefunden werden.</string>
-    <string name="dialog_routing_select_closer_start">Bitte wähle einen Startpunkt, der näher an einer Straße liegt.</string>
+    <string name="dialog_routing_select_closer_start">Bitte wählen Sie einen Startpunkt, der näher an einer Straße liegt.</string>
    <string name="dialog_routing_change_end">Ziel anpassen</string>
    <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel konnte nicht gefunden werden.</string>
-    <string name="dialog_routing_select_closer_end">Bitte wähle einen Zielort näher an einer Straße</string>
+    <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher an einer Straße</string>
    <string name="dialog_routing_change_intermediate">Der Zwischenstopp konnte nicht gefunden werden</string>
-    <string name="dialog_routing_intermediate_not_determined">Bitte passe deinen Zwischenstopp an</string>
+    <string name="dialog_routing_intermediate_not_determined">Bitte passen Sie Ihren Zwischenstopp an</string>
    <string name="dialog_routing_system_error">Systemfehler</string>
    <string name="dialog_routing_application_error">Wegen eines Anwendungsfehlers konnte keine Route erstellt werden</string>
-    <string name="dialog_routing_try_again">Bitte versuche es erneut</string>
+    <string name="dialog_routing_try_again">Bitte versuchen Sie es erneut</string>
    <string name="not_now">Nicht jetzt</string>
-    <string name="dialog_routing_download_and_build_cross_route">Möchtest du die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
-    <string name="dialog_routing_download_cross_route">Lade zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
+    <string name="dialog_routing_download_and_build_cross_route">Möchten Sie die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
+    <string name="dialog_routing_download_cross_route">Laden Sie zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
    <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, lade bitte die Karte herunter. Du benötigst danach keine Internetverbindung mehr.</string>
+    <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, laden Sie bitte die Karte herunter. Sie benötigen danach keine Internetverbindung mehr.</string>
    <string name="search_select_map">Karte auswählen</string>
    <!-- «Show» context menu -->
    <string name="show">Anzeigen</string>
@@ -368,16 +368,16 @@
    <string name="history">Verlauf</string>
    <string name="search_not_found">Uups, kein Ergebnis gefunden</string>
    <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Lade die Region herunter, in der du suchst, oder füge den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
+    <string name="search_not_found_query">Laden Sie die Region herunter, in der Sie suchen, oder fügen Sie den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
    <string name="search_history_title">Suchverlauf</string>
    <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
    <string name="clear_search">Suchverlauf löschen</string>
-    <string name="p2p_your_location">Dein Standort</string>
+    <string name="p2p_your_location">Ihr Standort</string>
    <string name="p2p_start">Start</string>
-    <string name="p2p_from_here">Route von</string>
-    <string name="p2p_to_here">Route nach</string>
+    <string name="p2p_from_here">Von</string>
+    <string name="p2p_to_here">Nach</string>
    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
-    <string name="p2p_reroute_from_current">Soll eine Route von deinem aktuellen Standort aus berechnet werden?</string>
+    <string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Weiter</string>
    <!-- Tab title in the Edit Opening Hours time picker -->
@@ -395,17 +395,17 @@
    <string name="editor_time_advanced">Erweiterter Modus</string>
    <string name="editor_time_simple">Einfacher Modus</string>
    <string name="editor_hours_closed">Schließzeiten</string>
-    <string name="editor_example_values">Beispielwerte</string>
+    <string name="editor_example_values">Beispiele</string>
    <string name="editor_correct_mistake">Fehler korrigieren</string>
    <string name="editor_add_select_location">Standort auswählen</string>
-    <string name="editor_report_problem_desription_1">Bitte beschreibe das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
-    <string name="editor_report_problem_desription_2">Oder korrigiere es selbst auf https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
+    <string name="editor_report_problem_desription_2">Oder korrigieren Sie es selbst auf https://www.openstreetmap.org/</string>
    <string name="editor_report_problem_send_button">Senden</string>
    <string name="editor_report_problem_title">Problem</string>
    <string name="editor_report_problem_no_place_title">Dieser Ort existiert nicht</string>
    <string name="editor_report_problem_under_construction_title">Wegen Bauarbeiten geschlossen</string>
    <string name="editor_report_problem_duplicate_place_title">Doppelt vorhanderer Ort</string>
-    <string name="autodownload">Automatisch herunterladen</string>
+    <string name="autodownload">Karten automatisch herunterladen</string>
    <!-- Place Page opening hours text -->
    <string name="daily">Täglich</string>
    <string name="twentyfour_seven">24/7</string>
@@ -427,13 +427,13 @@
    <string name="street">Straße</string>
    <!-- Editable House Number text field (in address block). -->
    <string name="house_number">Hausnummer</string>
-    <string name="details">Einzelheiten</string>
+    <string name="details">Details</string>
    <string name="social_media">Social Media</string>
    <string name="building">Gebäude</string>
    <!-- Text field to enter non-existing street name, below list of known streets around -->
    <string name="add_street">Eine Straße hinzufügen</string>
    <!-- Error to display when a new street name is not entered in the New street dialog -->
-    <string name="empty_street_name_error">Gebe einen Straßennamen ein</string>
+    <string name="empty_street_name_error">Geben Sie einen Straßennamen ein</string>
    <string name="choose_language">Eine Sprache wählen</string>
    <string name="choose_street">Eine Straße wählen</string>
    <string name="cuisine">Küche</string>
@@ -444,11 +444,11 @@
    <string name="level_value_generic">Stock: %s</string>
    <string name="downloader_delete_map_dialog">Alle Kartenänderungen werden zusammen mit der Karte gelöscht</string>
    <string name="downloader_update_maps">Karten aktualisieren</string>
-    <string name="downloader_mwm_migration_dialog">Um eine Route zu erstellen, musst du alle heruntergeladenen Karten aktualisieren und dann die Route erneut planen.</string>
+    <string name="downloader_mwm_migration_dialog">Um eine Route zu erstellen, müssen Sie alle Karten aktualisieren und dann die Route erneut planen.</string>
    <string name="downloader_search_field_hint">Karte finden</string>
-    <string name="common_check_internet_connection_dialog">Stelle bitte sicher, dass dein Gerät mit dem Internet verbunden ist</string>
+    <string name="common_check_internet_connection_dialog">Stellen Sie bitte sicher, dass Ihr Gerät mit dem Internet verbunden ist</string>
    <string name="downloader_no_space_title">Nicht genug Speicherplatz</string>
-    <string name="downloader_no_space_message">Bitte entferne unnötige Daten</string>
+    <string name="downloader_no_space_message">Bitte entfernen Sie unnötige Daten</string>
    <string name="editor_login_error_dialog">Login fehlgeschlagen</string>
    <string name="editor_profile_changes">Bestätigte Änderungen der Karte</string>
    <string name="editor_focus_map_on_location">Verschiebe die Karte, um das Kreuz an der Stelle zu platzieren, an der sich der Ort oder das Geschäft befindet.</string>
@@ -464,8 +464,8 @@
    <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
    <string name="osm_presentation">Von der Community erstellte OpenStreetMap-Daten (Stand: %s). Erfahre mehr darüber, wie du die Karte bearbeiten und aktualisieren kannst unter OpenStreetMap.org</string>
    <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ist ein Gemeinschaftsprojekt zum Erstellen einer freien und offenen Karte. Es ist die Hauptgrundlage für Kartendaten in CoMaps und funktioniert ähnlich wie Wikipedia. Du kannst Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzenden auf der ganzen Welt zur Verfügung stehen.\nTrete der Gemeinschaft bei und helfe mit, die Karte für alle besser zu machen!</string>
-    <string name="login_to_make_edits_visible">Erstelle ein Konto bei OpenStreetMap oder melde dich dort an, um deine Kartenbearbeitungen weltweit zu veröffentlichen</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ist ein Gemeinschaftsprojekt zum Erstellen einer freien und offenen Karte. Es ist die Hauptquelle für Kartendaten in CoMaps und funktioniert ähnlich wie Wikipedia. Sie können Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzenden auf der ganzen Welt zur Verfügung stehen. \nTreten Sie der Gemeinschaft bei und helfen Sie mit, die Karte für alle besser zu machen!</string>
+    <string name="login_to_make_edits_visible">Erstellen Sie ein Konto bei OpenStreetMap oder melden sich dort an, um Ihre Kartenbearbeitungen weltweit zu veröffentlichen</string>
    <!-- Downloaded 10 **of** 20 <- it is that "of" -->
    <string name="downloader_of">%1$d von %2$d</string>
    <string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
@@ -474,13 +474,13 @@
    <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
    <string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als %d Etagen haben</string>
    <string name="editor_zip_code">Postleitzahl</string>
-    <string name="error_enter_correct_zip_code">Gebe eine gültige Postleitzahl ein</string>
+    <string name="error_enter_correct_zip_code">Geben Sie eine gültige Postleitzahl ein</string>
    <!-- Title for OSM note section in the editor -->
    <string name="editor_other_info">Hinweis an Freiwillige von OpenStreetMap (optional)</string>
    <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beschreibe Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
+    <string name="editor_note_hint">Beschreiben Sie Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
    <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Deine Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte trage keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
+    <string name="editor_about_osm">Ihre Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte tragen Sie keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
    <string name="editor_more_about_osm">Mehr Informationen über OpenStreetMap</string>
    <string name="editor_osm_history">Ihr Bearbeitungsverlauf</string>
    <string name="editor_osm_notes">Ihre Hinweise zu den Kartendaten</string>
@@ -488,9 +488,9 @@
    <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
    <string name="operator">Betreiber: %s</string>
    <string name="editor_category_unsuitable_title">Keine passende Kategorie gefunden?</string>
-    <string name="editor_category_unsuitable_text">Mit CoMaps kannst du nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden (auf Englisch)</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
+    <string name="editor_category_unsuitable_text">Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
    <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
-    <string name="downloader_no_downloaded_maps_message">Lade Karten für die Offline-Suche und Navigation herunter</string>
+    <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter</string>
    <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt</string>
    <!-- abbreviation for kilometers per hour -->
    <string name="kilometers_per_hour">km/h</string>
@@ -499,7 +499,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Mehr</string>
-    <string name="placepage_edit_bookmark_button">Gespeicherten Ort bearbeiten</string>
+    <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
    <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
    <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
@@ -507,21 +507,21 @@
    <string name="editor_remove_place_button">Löschen</string>
    <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
    <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
-    <string name="delete_place_empty_comment_error">Gebe bitte den Grund für die Löschung an</string>
+    <string name="delete_place_empty_comment_error">Geben Sie bitte den Grund für die Löschung an</string>
    <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Gebe eine gültige Telefonnummer ein</string>
-    <string name="error_enter_correct_web">Gebe eine gültige Internetadresse ein</string>
-    <string name="error_enter_correct_email">Gebe eine gültige E-Mail-Adresse ein</string>
-    <string name="error_enter_correct_facebook_page">Gebe eine gültige Facebook-Webadresse, ein -Konto oder einen -Seitennamen ein</string>
-    <string name="error_enter_correct_instagram_page">Gebe eine gültige Instagram-Webadresse oder einen -Kontonamen ein</string>
-    <string name="error_enter_correct_twitter_page">Gebe einen gültigen X-Benutzernamen oder eine gültige X-Webadresse ein</string>
-    <string name="error_enter_correct_vk_page">Gebe einen gültigen VK-Benutzernamen oder eine gültige VK-Webadresse ein</string>
-    <string name="error_enter_correct_line_page">Gebe eine gültige LINE-ID oder Webadresse ein</string>
+    <string name="error_enter_correct_phone">Geben Sie eine gültige Telefonnummer ein</string>
+    <string name="error_enter_correct_web">Geben Sie eine gültige Internetadresse ein</string>
+    <string name="error_enter_correct_email">Geben Sie eine gültige Email-Adresse ein</string>
+    <string name="error_enter_correct_facebook_page">Geben Sie eine gültige Facebook-Webadresse, ein Konto oder einen Seitennamen ein</string>
+    <string name="error_enter_correct_instagram_page">Geben Sie eine gültige Instagram-Webadresse oder einen Kontonamen ein</string>
+    <string name="error_enter_correct_twitter_page">Geben Sie eine gültige Twitter-Webadresse oder einen Benutzernamen ein</string>
+    <string name="error_enter_correct_vk_page">Geben Sie eine gültige VK-Webadresse oder einen Kontonamen ein</string>
+    <string name="error_enter_correct_line_page">Geben Sie eine gültige LINE-Webadresse oder LINE ID ein</string>
    <string name="placepage_add_place_button">Ort zu OpenStreetMap hinzufügen</string>
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">An alle Nutzer*innen senden?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Stelle sicher, dass du keine privaten oder persönlichen Daten eingegeben hast.</string>
+    <string name="editor_share_to_all_dialog_message_1">Stellen Sie sicher, dass Sie keine persönlichen oder privaten Daten eingegeben haben.</string>
    <string name="editor_share_to_all_dialog_message_2">Freiwillige von OpenStreetMap werden die Änderungen prüfen und sich bei Fragen mit Ihnen in Verbindung setzen.</string>
    <string name="navigation_stop_button">Beenden</string>
    <!-- Shown as toast when starting the recent track recording -->
@@ -541,15 +541,15 @@
    <string name="mobile_data_option_ask">Immer fragen</string>
    <string name="traffic_update_maps_text">Um Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden</string>
    <string name="big_font">Schrift auf der Karte vergrößern</string>
-    <string name="traffic_update_app">Bitte aktualisiere CoMaps</string>
+    <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
    <!-- "traffic" as in "road congestion" -->
    <string name="traffic_data_unavailable">Es sind keine Verkehrsdaten verfügbar</string>
    <string name="enable_logging">Protokollierung aktivieren</string>
    <!-- Settings: "Send general feedback" button -->
    <string name="feedback_general">Allgemeines Feedback</string>
-    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme (TTS; zu deutsch: Text-zu-Sprache) für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das du bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren kannst</string>
-    <string name="prefs_languages_information_off">Für einige Sprachen musst du einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus deinem App-Store installieren (Google Play Store, Samsung Galaxy Store, Huawei AppGallery, F-Droid).\nÖffne die Einstellungen deines Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier kannst du die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
-    <string name="prefs_languages_information_off_link">Weitere Informationen findest du in dieser Anleitung</string>
+    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können</string>
+    <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
+    <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
    <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
    <string name="learn_more">Weitere Informationen</string>
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -561,25 +561,25 @@
    <string name="placepage_remove_stop">Stopp entfernen</string>
    <string name="placepage_add_stop">Stopp hinzufügen</string>
    <string name="dialog_error_storage_title">Problem mit dem Zugriff auf den Speicher</string>
-    <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Bitte überprüfe das oder kontaktiere uns unter support@comaps.app</string>
+    <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
-    <string name="error_enter_correct_name">Bitte gebe deinen korrekten Namen ein</string>
-    <string name="bookmark_lists">Favoritenlisten</string>
+    <string name="error_enter_correct_name">Bitte geben Sie einen korrekten Namen ein</string>
+    <string name="bookmark_lists">Listen</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Alle ausblenden</string>
    <string name="bookmark_lists_show_all">Alle anzeigen</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d gespeicherter Ort</item>
-        <item quantity="other">%d gespeicherte Orte</item>
+        <item quantity="one">%d Lesezeichen</item>
+        <item quantity="other">%d Lesezeichen</item>
    </plurals>
    <string name="bookmarks_create_new_group">Neue Liste erstellen</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Favoriten importieren</string>
+    <string name="bookmarks_import">Lesezeichen und Tracks importieren</string>
    <string name="bookmarks_error_message_share_general">Teilen wegen eines Anwendungsfehlers nicht möglich</string>
    <string name="bookmarks_error_title_share_empty">Fehler beim Teilen</string>
    <string name="bookmarks_error_message_share_empty">Eine leere Liste kann nicht geteilt werden</string>
    <string name="bookmarks_error_title_empty_list_name">Der Name darf nicht leer sein</string>
-    <string name="bookmarks_error_message_empty_list_name">Bitte gebe den Listennamen ein</string>
+    <string name="bookmarks_error_message_empty_list_name">Bitte geben Sie den Listennamen ein</string>
    <string name="bookmarks_new_list_hint">Neue Liste</string>
    <string name="bookmarks_error_title_list_name_already_taken">Dieser Name wird bereits verwendet</string>
    <string name="bookmarks_error_message_list_name_already_taken">Bitte wähle einen anderen Namen</string>
@@ -587,8 +587,8 @@
    <string name="phone_number">Telefonnummer</string>
    <string name="profile">OpenStreetMap-Profil</string>
    <plurals name="bookmarks_detect_message">
-        <item quantity="one">%d Datei wurde gefunden. Du wirst sie nach der Konvertierung sehen.</item>
-        <item quantity="other">%d Dateien wurden gefunden. Du wirst sie nach der Konvertierung sehen.</item>
+        <item quantity="one">%d Datei wurde gefunden. Sie werden sie nach der Konvertierung sehen.</item>
+        <item quantity="other">%d Dateien wurden gefunden. Sie werden sie nach der Konvertierung sehen.</item>
    </plurals>
    <string name="restore">Wiederherstellen</string>
    <plurals name="tracks">
@@ -603,7 +603,7 @@
    <string name="subway">U-Bahn</string>
    <string name="layers_title">Kartenstile und Ebenen</string>
    <string name="bookmarks_empty_list_title">Die Liste ist leer</string>
-    <string name="bookmarks_empty_list_message">Um einen Ort zu speichern, tipp einfach auf einen Ort auf der Karte und dann auf das Sternsymbol</string>
+    <string name="bookmarks_empty_list_message">Zum Hinzufügen eines Lesezeichens tippen Sie in der Karte auf den Ort und dann unten auf das Sternchen</string>
    <string name="category_desc_more">…mehr</string>
    <string name="export_file">KMZ exportieren</string>
    <string name="export_file_gpx">GPX exportieren</string>
@@ -623,7 +623,7 @@
    <string name="power_managment_setting_never">Niemals</string>
    <string name="power_managment_setting_auto">Bei niedrigem Akkustand</string>
    <string name="power_managment_setting_manual_max">Immer</string>
-    <string name="enable_logging_warning_message">Aktiviere diese Option zeitweise, um manuell Aktivitäten zwecks Diagnostik aufzuzeichnen und zu senden. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktiviere diese Option, reproduziere das Problem und sende die Protokolle über die Schaltfläche \"Fehler melden\" an uns.</string>
+    <string name="enable_logging_warning_message">Aktivieren Sie diese Option zeitweise, um manuell Aktivitäten zwecks Diagnostik aufzuzeichnen und zu senden. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option, reproduzieren Sie das Problem und senden Sie die Protokolle über die Schaltfläche \"Fehler melden\" an uns.</string>
    <string name="driving_options_title">Routenoptionen</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_tolls">Mautstraßen vermeiden</string>
@@ -633,7 +633,7 @@
    <string name="avoid_ferry">Fähren meiden</string>
    <string name="avoid_motorways">Autobahnen meiden</string>
    <string name="unable_to_calc_alert_title">Route kann nicht berechnet werden</string>
-    <string name="unable_to_calc_alert_subtitle">Es konnte keine Route gefunden werden. Dies kann an deinen Routingoptionen oder an unvollständigen OpenStreetMap-Daten liegen. Bitte ändere deine Routingoptionen und versuche es erneut.</string>
+    <string name="unable_to_calc_alert_subtitle">Es konnte keine Route gefunden werden. Dies kann an Ihren Routingoptionen oder an unvollständigen OpenStreetMap-Daten liegen. Bitte ändern Sie Ihre Routingoptionen und versuchen Sie es erneut.</string>
    <string name="define_to_avoid_btn">Routenoptionen einstellen</string>
    <string name="change_driving_options_btn">Routenoptionen aktiv</string>
    <string name="toll_road">Mautstraße</string>
@@ -651,12 +651,12 @@
    <string name="capacity">Kapazität: %s</string>
    <!-- To indicate the network of ATMs, bicycle rentals, electric vehicle charging stations... -->
    <string name="network">Netzwerk: %s</string>
-    <string name="trip_finished">Du bist am Ziel angekommen!</string>
+    <string name="trip_finished">Sie sind angekommen!</string>
    <string name="ok">OK</string>
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Sortieren…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Favoriten sortieren</string>
+    <string name="sort_bookmarks">Lesezeichen sortieren</string>
    <!-- Android -->
    <string name="by_default">Nach Voreinstellung</string>
    <!-- Android -->
@@ -690,12 +690,12 @@
    <string name="medicine">Medizin</string>
    <string name="search_in_the_list">In der Liste suchen</string>
    <string name="religious_places">Religiöse Orte</string>
-    <string name="select_list">Wähle eine Liste aus</string>
+    <string name="select_list">Wählen Sie eine Liste</string>
    <string name="transit_not_found">Die U-Bahn-Navigation ist in dieser Region noch nicht verfügbar</string>
    <string name="dialog_pedestrian_route_is_long_header">Keine U-Bahn-Route gefunden</string>
-    <string name="dialog_pedestrian_route_is_long_message">Wähle einen Start- oder Endpunkt näher an einer U-Bahn-Station</string>
+    <string name="dialog_pedestrian_route_is_long_message">Wählen Sie einen Start- oder Endpunkt näher an einer U-Bahn-Station</string>
    <string name="button_layer_isolines">Höhenlinien</string>
-    <string name="isolines_activation_error_dialog">Um die Höhenlinien nutzen zu können, aktualisiere die Karte des betreffenden Gebiets oder lade diese herunter</string>
+    <string name="isolines_activation_error_dialog">Um die Höhenlinien nutzen zu können, aktualisieren Sie die Karte des betreffenden Gebiets oder laden Sie diese herunter</string>
    <string name="isolines_location_error_dialog">Topographieebene ist für dieses Gebiet noch nicht verfügbar</string>
    <string name="elevation_profile_ascent">Bergauf</string>
    <string name="elevation_profile_descent">Bergab</string>
@@ -706,7 +706,7 @@
    <string name="elevation_profile_time">Dauer:</string>
    <string name="isolines_toast_zooms_1_10">Karte vergrößern, um Höhenlinien sichtbar zu machen</string>
    <string name="downloader_loading_ios">Wird heruntergeladen</string>
-    <string name="download_map_title">Lade die weltweite Übersichtskarte herunter</string>
+    <string name="download_map_title">Laden Sie die weltweite Übersichtskarte herunter</string>
    <!-- Used in DownloadResources startup screen -->
    <string name="disk_error">Ordner kann nicht erstellt und Dateien können nicht auf den Gerätespeicher oder die SD-Karte verschoben werden</string>
    <!-- Used in DownloadResources startup screen -->
@@ -735,21 +735,21 @@
    <!-- App tip #01 -->
    <string name="app_tip_01">Mit Ihren Spenden und Ihrer Unterstützung können wir die besten Karten der Welt erstellen!</string>
    <!-- App tip #02 -->
-    <string name="app_tip_02">Gefällt dir unsere App? Bitte spende, um die Entwicklung zu unterstützen! Gefällt sie dir noch nicht? Bitte lass uns wissen warum und wir werden das Problem beheben!</string>
+    <string name="app_tip_02">Gefällt Ihnen unsere App? Bitte spenden Sie, um die Entwicklung zu unterstützen! Gefällt es Ihnen noch nicht? Bitte lassen Sie uns wissen warum und wir werden das Problem beheben!</string>
    <!-- App tip #03 -->
-    <string name="app_tip_03">Wenn du eine*n Softwareentwickler*in kennst, kannst du der Person bitten, eine Funktion zu implementieren, die du benötigst.</string>
+    <string name="app_tip_03">Wenn Sie eine*n Softwareentwickler*in kennen, können Sie ihn oder sie bitten, eine Funktion zu implementieren, die Sie benötigen.</string>
    <!-- App tip #04 -->
-    <string name="app_tip_04">Tippe irgendwo auf der Karte, um etwas auszuwählen. Tippe lange, um die Menü-Oberfläche aus- und wieder einzublenden.</string>
+    <string name="app_tip_04">Tippen Sie irgendwo auf die Karte, um etwas auszuwählen. Tippen Sie lange, um die Oberfläche aus- und wieder einzublenden.</string>
    <!-- App tip #05 -->
-    <string name="app_tip_05">Wusstest du, dass du deinen aktuellen Standort auf der Karte auswählen kannst?</string>
+    <string name="app_tip_05">Wussten Sie, dass Sie Ihren aktuellen Standort auf der Karte auswählen können?</string>
    <!-- App tip #06 -->
-    <string name="app_tip_06">Du kannst dabei helfen, unsere App in deiner Sprache zu übersetzen.</string>
+    <string name="app_tip_06">Sie können dabei helfen, unsere App in Ihre Sprache zu übersetzen.</string>
    <!-- App tip #07 -->
    <string name="app_tip_07">Unsere App wird von einigen Enthusiasten und der Community entwickelt.</string>
    <!-- App tip #08 -->
-    <string name="app_tip_08">Du kannst die Kartendaten einfach korrigieren und verbessern.</string>
+    <string name="app_tip_08">Sie können die Kartendaten einfach korrigieren und verbessern.</string>
    <!-- App tip #09 -->
-    <string name="app_tip_09">Unser Hauptziel ist es, schnelle, datenschutzorientierte und benutzerfreundliche Karten zu erstellen, die du lieben wirst.</string>
+    <string name="app_tip_09">Unser Hauptziel ist es, schnelle, datenschutzorientierte und benutzerfreundliche Karten zu erstellen, die Sie lieben werden.</string>
    <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
    <string name="car_used_on_the_phone_screen">Du verwendest jetzt CoMaps auf dem Telefondisplay</string>
    <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
@@ -774,11 +774,11 @@
    <string name="browser_not_available">Webbrowser ist nicht verfügbar</string>
    <string name="volume">Lautstärke</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Alle Orte und Tracks exportieren</string>
+    <string name="bookmarks_export">Alle Lesezeichen und Tracks exportieren</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Einstellungen des Sprachsynthesesystems</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
-    <string name="pref_tts_no_system_tts">Die Einstellungen für die Sprachsynthese wurden nicht gefunden. Bist du sicher, dass dein Endgerät sie unterstützt?</string>
+    <string name="pref_tts_no_system_tts">Die Einstellungen für die Sprachsynthese wurden nicht gefunden. Bist du sicher, dass dein Gerät sie unterstützt?</string>
    <string name="drive_through">Drive-through</string>
    <string name="clear_the_search">Lösche die Suche</string>
    <string name="zoom_in">Vergrößern</string>
@@ -806,11 +806,11 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Aufnahme fortsetzen</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Zu Favoriten hinzufügen?</string>
+    <string name="track_recording_alert_title">In Lesezeichen und Tracks speichern?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Route ist leer - nichts zu speichern</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Das Dialogfeld zur Ordnerauswahl kann nicht angezeigt werden, da keine geeignete App auf deinem Endgerät installiert ist. Bitte installiere eine Dateimanager-App und versuche es erneut.</string>
+    <string name="error_no_file_manager_app">Das Dialogfeld zur Ordnerauswahl kann nicht angezeigt werden, da keine geeignete App auf Ihrem Gerät installiert ist. Bitte installieren Sie eine Dateimanager-App und versuchen Sie es erneut.</string>
    <string name="choose_color">Farbe auswählen</string>
    <string name="edit_track">Track bearbeiten</string>
    <string name="uri_open_location_failed">Keine App installiert, die den Speicherort öffnen kann</string>
@@ -824,13 +824,13 @@
    <string name="app_site_url">https://comaps.app/de/</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
-    <string name="error_enter_correct_bluesky_page">Gebe einen gültigen Bluesky-Nutzernamen oder Webadresse ein</string>
-    <string name="error_enter_correct_fediverse_page">Gebe einen gültigen Mastodon-Nutzernamen oder Webadresse an</string>
+    <string name="error_enter_correct_bluesky_page">Geben Sie einen gültigen Bluesky-Nutzernamen oder Webadresse ein</string>
+    <string name="error_enter_correct_fediverse_page">Geben Sie einen gültigen Mastodon-Nutzernamen oder Webadresse an</string>
    <string name="pref_left_button_title">Einstellung linker Knopf</string>
    <string name="saved">Gespeichert</string>
    <string name="pref_left_button_disable">Deaktivieren</string>
    <string name="editor_building_levels">Etagen (inkl. Erdgeschoss, ohne Dach)</string>
-    <string name="error_enter_correct_level">Gebe eine gültige Stockwerk-Nummer ein</string>
+    <string name="error_enter_correct_level">Geben Sie eine gültige Stockwerk-Nummer ein</string>
    <string name="editor_level">Etage (0 ist Erdgeschoss)</string>
    <string name="clear">Löschen</string>
    <string name="vehicle">Fahrzeug</string>
@@ -838,13 +838,13 @@
    <string name="ruler">Lineal</string>
    <string name="route_type">Routentyp</string>
    <string name="pedestrian">Fußgänger</string>
-    <string name="bookmark_color">Farbe für Favoriten</string>
+    <string name="bookmark_color">Lesezeichenfarbe</string>
    <string name="about_help">Über &amp; Hilfe</string>
    <string name="panoramax">Panoramax-Bild</string>
    <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
    <string name="pref_backup_now_summary">Backup sofort erstellen</string>
    <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks zum Sichern</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Lesezeichen und Tracks für Backup vorhanden</string>
    <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
    <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
    <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>
@@ -852,7 +852,7 @@
    <string name="pref_backup_interval_title">Automatisches Backup</string>
    <string name="backup_interval_every_day">Täglich</string>
    <string name="backup_interval_manual_only">Aus (nur manuell)</string>
-    <string name="pref_backup_title">Favoriten sichern</string>
+    <string name="pref_backup_title">Backup von Lesezeichen und Tracks</string>
    <string name="pref_backup_status_summary_success">Letztes erfolgreiches Backup</string>
    <string name="dialog_report_error_with_logs">Bitte sende uns einen Fehlerbericht:\n - in den Einstellungen \"Protokollierung aktivieren\"\n - das Problem reproduzieren\n - im Bildschirm \"Über &amp; Hilfe\" drücke den \"App-Fehler melden\"-Knopf und sende via E-Mail oder Chat\n - die Protokollierung deaktivieren</string>
    <string name="dialog_report_error_missing_folder">Der ausgewählte Backup-Ort ist nicht verfügbar oder beschreibbar. Bitte wähle einen anderen Ort.</string>
@@ -871,7 +871,7 @@
    <string name="hours_confirmed_time_ago">Bestätigt %s</string>
    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache-Modul gefunden, überprüfe die App-Einstellungen</string>
    <string name="avoid_steps">Treppen vermeiden</string>
-    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht, um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
+    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
    <string name="offline_explanation_title">Offline-Karten</string>
    <string name="offline_explanation_text">Um die Gegend anzusehen und zu erkunden, musst du eine Karte runterladen.\nLade dir Karten für die Gebiete runter, die du bereisen willst.</string>
    <string name="charge_socket_type2">Typ 2 (ohne Kabel)</string>
@@ -891,7 +891,7 @@
    <string name="charge_socket_count">Anzahl</string>
    <string name="unknown_count">unbekannt</string>
    <string name="error_invalid_number">ungültige Zahl</string>
-    <string name="list_description_empty">Bearbeite die Liste, um eine Beschreibung hinzuzufügen</string>
+    <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
    <string name="avoid_paved">Befestigte Straßen meiden</string>
    <string name="opens_at">Öffnet um %s</string>
    <string name="closes_at">Schließt um %s</string>
@@ -904,7 +904,7 @@
    <string name="editor_business_vacant_button">Geschäft steht leer</string>
    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
    <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Verwende diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
+    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
    <string name="charge_socket_schuko">Schuko</string>
    <string name="power_management">Stromverbrauch verwalten</string>
    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
@@ -919,6 +919,5 @@
    <string name="advanced">Fortgeschritten</string>
    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
-    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// oder http:// anfängt</string>
-    <string name="pref_maplanguage_local">Lokale Sprache</string>
+    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
 </resources>
--- a/android/app/src/main/res/values-en-rAU/strings.xml
+++ b/android/app/src/main/res/values-en-rAU/strings.xml
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_site_url">https://comaps.app/</string>
-    <string name="back">Back</string>
-    <string name="cancel">Cancel</string>
-    <string name="delete">Delete</string>
-    <string name="download_maps">Download Maps</string>
-    <string name="download_has_failed">Download failed, tap to try again</string>
-    <string name="downloading">Downloading…</string>
-    <string name="kilometres">Kilometres</string>
-    <string name="miles">Miles</string>
-    <string name="later">Later</string>
-    <string name="search">Search</string>
-    <string name="search_map">Search Map</string>
-    <string name="location_is_disabled_long_text">You currently have all Location Services for this device or application disabled. Please enable them in Settings.</string>
-    <string name="limited_accuracy">Limited Accuracy</string>
-    <string name="choose_color">Choose Colour</string>
-    <string name="bookmark_color">Bookmark colour</string>
-    <string name="precise_location_is_disabled_long_text">To ensure accurate navigation enable Precise Location in settings</string>
-    <string name="zoom_to_country">Show on the map</string>
-    <string name="country_status_download_failed">Download failed</string>
-    <string name="try_again">Try Again</string>
-    <string name="about_menu_title">About CoMaps</string>
-    <string name="about_headline">Open project powered by the community</string>
-    <string name="about_proposition_1">• Easy to use and polished</string>
-    <string name="about_proposition_2">• Privacy focused and ad-free</string>
-    <string name="about_proposition_3">• Offline, fast and compact</string>
-    <string name="about_developed_by_enthusiasts">Fully open source, not for profit, transparent decision-making and finances.</string>
-    <string name="location_settings">Location Settings</string>
-    <string name="close">Close</string>
-    <string name="unsupported_phone">The app requires hardware accelerated OpenGL. Unfortunately, your device is not supported.</string>
-    <string name="download">Download</string>
-    <string name="disconnect_usb_cable">Please disconnect USB cable or insert a memory card to use CoMaps</string>
-    <string name="not_enough_free_space_on_sdcard">Please free up some space on the SD card or USB storage first in order to use the app</string>
-    <string name="download_resources">Before you start using the app, please download the world overview map to your device. \nIt will use %s of storage.</string>
-    <string name="download_resources_continue">Go to Map</string>
-    <string name="downloading_country_can_proceed">Downloading %1$s (%2$s). You can now \nproceed to the map.</string>
-    <string name="download_country_ask">Download %1$s? (%2$s)</string>
-    <string name="update_country_ask">Update %1$s? (%2$s)</string>
-    <string name="download_country_failed">%s download has failed</string>
-    <string name="add_new_set">Add a new list</string>
-    <string name="bookmarks">Bookmarks</string>
-    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
-    <string name="name">Name</string>
-    <string name="address">Address</string>
-    <string name="list">List</string>
-    <string name="settings">Settings</string>
-    <string name="maps_storage">Save maps to</string>
-    <string name="maps_storage_summary">Select the folder to download maps to</string>
-    <string name="maps_storage_downloaded">Downloaded maps</string>
-    <string name="maps_storage_free_size">%1$s free of %2$s</string>
-    <string name="move_maps">Move maps?</string>
-    <string name="move_maps_error">Error moving map files</string>
-    <string name="wait_several_minutes">This might take several minutes. \nPlease wait…</string>
-    <string name="measurement_units">Unit of measurement</string>
-    <string name="description">Notes</string>
-    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
-    <string name="share_bookmarks_email_body">Hello! \n \nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/ \n \nEnjoy travelling with CoMaps!</string>
-    <string name="load_kmz_title">Loading Bookmarks</string>
-    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or in the Bookmarks Manager screen.</string>
-    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted.</string>
-    <string name="failed_to_open_file">Failed to open file %1$s \n \n%2$s</string>
-    <string name="edit">Edit</string>
-    <string name="unknown_current_position">Your location hasn\'t been determined yet</string>
-    <string name="cant_change_this_setting">Sorry, Map Storage settings are currently disabled</string>
-    <string name="downloading_is_active">Map download is in progress now</string>
-    <string name="my_position_share_sms">Check out my current location in CoMaps! %1$s or %2$s Don\'t have offline maps? Download here: https://www.comaps.app/download/</string>
-    <string name="share">Share</string>
-    <string name="email">Email</string>
-    <string name="copied_to_clipboard">Copied to clipboard: %s</string>
-    <string name="done">Done</string>
-    <string name="tracks_title">Tracks</string>
-    <string name="length">Length</string>
-    <string name="share_my_location">Share My Location</string>
-    <string name="prefs_group_general">General settings</string>
-    <string name="prefs_group_information">Information</string>
-    <string name="prefs_group_route">Navigation</string>
-    <string name="pref_zoom_title">Zoom buttons</string>
-    <string name="pref_zoom_summary">Display on the map</string>
-    <string name="pref_map_style_title">Night Mode</string>
-    <string name="off">Off</string>
-    <string name="on">On</string>
-    <string name="auto">Auto</string>
-    <string name="pref_map_3d_title">Perspective view</string>
-    <string name="pref_map_3d_buildings_disabled_summary">3D buildings are disabled in power saving mode</string>
-    <string name="pref_tts_enable_title">Voice Instructions</string>
-    <string name="pref_tts_street_names_title">Announce Street Names</string>
-    <string name="pref_tts_street_names_description">When enabled, the name of the street or exit to turn onto will be spoken aloud.</string>
-    <string name="pref_tts_language_title">Voice Language</string>
-    <string name="pref_tts_test_voice_title">Test Voice Directions</string>
-    <string name="pref_tts_playing_test_voice">Check the volume or system Text-To-Speech settings if you don\'t hear the voice now</string>
-    <string name="pref_tts_unavailable">Not Available</string>
-    <string name="pref_map_auto_zoom">Auto zoom</string>
-    <string name="placepage_distance">Distance</string>
-    <string name="search_show_on_map">View on map</string>
-    <string name="menu">Menu</string>
-    <string name="website">Website</string>
-    <string name="news">News</string>
-    <string name="panoramax">Panoramax Picture</string>
-    <string name="feedback">Feedback</string>
-    <string name="rate_the_app">Rate the app</string>
-    <string name="help">Help</string>
-    <string name="faq">Frequently Asked Questions</string>
-    <string name="donate">Donate</string>
-    <string name="how_to_support_us">Volunteer and improve CoMaps</string>
-    <string name="copyright">Copyright</string>
-    <string name="report_a_bug">Report a bug</string>
-    <string name="compass_calibration_recommended">Improve arrow direction by moving the phone in a figure-eight motion to calibrate the compass.</string>
-    <string name="compass_calibration_required">Move the phone in a figure-eight motion to calibrate the compass and fix the arrow direction on the map.</string>
-    <string name="long_tap_toast">Long-tap on the map again to see the interface</string>
-    <string name="downloader_update_all_button">Update All</string>
-    <string name="downloader_cancel_all">Cancel All</string>
-    <string name="downloader_downloaded_subtitle">Downloaded</string>
-    <string name="downloader_queued">Queued</string>
-    <string name="downloader_near_me_subtitle">Near me</string>
-    <string name="downloader_status_maps">Maps</string>
-    <string name="downloader_download_all_button">Download All</string>
-    <string name="downloader_downloading">Downloading:</string>
-    <string name="downloader_delete_map_while_routing_dialog">To delete map, please stop navigation</string>
-    <string name="downloader_download_map">Download map</string>
-    <string name="downloader_retry">Retry</string>
-    <string name="downloader_delete_map">Delete Map</string>
-    <string name="downloader_update_map">Update Map</string>
-    <string name="google_play_services">Google Fused Location Service</string>
-    <string name="pref_use_google_play">A proprietary service that combines GPS, WiFi, cellular networks etc. to determine your location more accurately. It may connect to Google servers.</string>
-    <string name="routing_requires_all_map">In order to create a route, we need to download and update all the maps from your location to your destination.</string>
-    <string name="routing_not_enough_space">Not enough space</string>
-    <string name="enable_location_services">Please enable Location Services</string>
-    <string name="save">Save</string>
-    <string name="create">Create</string>
-    <string name="red">Red</string>
-    <string name="yellow">Yellow</string>
-    <string name="blue">Blue</string>
-    <string name="green">Green</string>
-    <string name="purple">Purple</string>
-    <string name="orange">Orange</string>
-    <string name="brown">Brown</string>
-    <string name="pink">Pink</string>
-    <string name="deep_purple">Deep Purple</string>
-    <string name="light_blue">Light Blue</string>
-    <string name="cyan">Cyan</string>
-    <string name="teal">Teal</string>
-    <string name="lime">Lime</string>
-    <string name="deep_orange">Deep Orange</string>
-    <string name="gray">Grey</string>
-    <string name="blue_gray">Blue Grey</string>
-    <string name="dialog_routing_disclaimer_title">When following the route, please keep in mind:</string>
-    <string name="dialog_routing_disclaimer_priority">— Road conditions, traffic laws, and road signs always take priority over navigation hints;</string>
-    <string name="dialog_routing_disclaimer_precision">— The map might be inaccurate, and the suggested route might not always be the most optimal way to reach the destination;</string>
-    <string name="dialog_routing_disclaimer_recommendations">— Suggested routes should only be understood as recommendations;</string>
-    <string name="dialog_routing_disclaimer_borders">— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.</string>
-    <string name="dialog_routing_disclaimer_beware">Please stay alert and safe on the roads!</string>
-    <string name="dialog_routing_check_gps">Check GPS signal</string>
-    <string name="dialog_routing_error_location_not_found">Unable to create route. Current GPS coordinates could not be identified.</string>
-    <string name="dialog_routing_location_turn_wifi">Please check your GPS signal. Enabling WiFi will improve your location accuracy.</string>
-    <string name="dialog_routing_location_turn_on">Enable location services</string>
-    <string name="dialog_routing_location_unknown_turn_on">Unable to locate current GPS coordinates. Enable location services to calculate route.</string>
-    <string name="dialog_routing_unable_locate_route">Unable to locate route</string>
-    <string name="dialog_routing_cant_build_route">Unable to create route</string>
-    <string name="dialog_routing_change_start_or_end">Please change your starting point or destination.</string>
-    <string name="dialog_routing_change_start">Change starting point</string>
-    <string name="dialog_routing_start_not_determined">Route was not created. Unable to locate starting point.</string>
-</resources>
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -19,8 +19,8 @@
    <string name="editor_zip_code">Postcode</string>
    <string name="error_enter_correct_zip_code">Enter a valid postcode</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d place</item>
-        <item quantity="other">%d places</item>
+        <item quantity="one">%d bookmark</item>
+        <item quantity="other">%d bookmarks</item>
    </plurals>
    <plurals name="bookmarks_detect_message">
        <item quantity="one">%d file was found. You can see it after conversion.</item>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zyphlar	6c1fef4908	Don't exit and fail on bad python script exit coce Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2026-01-04 09:30:24 +01:00
zyphlar	766a4fb2a3	add csv diff Signed-off-by: zyphlar <zyphlar@gmail.com>	2026-01-01 12:45:56 -08:00
zyphlar	6dc3036fcf	htmldir Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2026-01-01 06:08:10 +01:00
zyphlar	36a65945ba	remove branch and unused vars Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2026-01-01 00:01:28 +01:00
zyphlar	5c53a3cad6	actually use cities.txt Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-31 22:50:15 +01:00
zyphlar	3bea0b32a2	change arguments Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-31 08:23:53 +01:00
zyphlar	925ce544bc	use test branch Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-31 06:57:52 +01:00
zyphlar	599b3b81ec	typo Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-30 15:27:04 -08:00
zyphlar	2d981cde05	clone main repo too Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-30 15:27:04 -08:00
zyphlar	8670cb7b43	update pbf Either move to o5m for subways or remove from here Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-30 15:27:04 -08:00
zyphlar	a73ffe96c5	fix cicd Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-30 15:27:04 -08:00
				`@@ -1 +0,0 @@`
				`Easy map navigation - Discover more of your journey - Powered by the community`
				`@@ -1 +0,0 @@`
				`CoMaps - Hike, Bike, Drive Offline with Privacy`
				`@@ -1 +0,0 @@`
				`Navigacyon mappa es - Trovya moy a dha kerdh - Selys war an kemeneth`
				`@@ -1 +0,0 @@`
				`Jednostavna navigacija - Saznajte više o svom putovanju - Održava zajednica`
				`@@ -1 +0,0 @@`
				`CoMaps - pešačenje, bicikl, vožnja sa privatnošću`