[android] Use error in textfield instead alert dialog

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

.forgejo/workflows/process_subways.yml

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

CMakeLists.txt

@@ -116,20 +116,6 @@ endif()
 
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
 
-if (PLATFORM_LINUX OR PLATFORM_ANDROID)
-  find_program(LLD_FOUND ld.lld)
-  if (LLD_FOUND)
-    message(STATUS "Using ld.lld linker")
-    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld")
-  else()
-    find_program(GOLD_FOUND ld.gold)
-    if (GOLD_FOUND)
-      message(STATUS "Using ld.gold")
-      set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold")
-    endif()
-  endif()
-endif()
-
 if (NOT SKIP_TESTS)
   enable_testing()
   # Enables ctest -T memcheck with valgrind

NOTICE

@@ -1,6 +1,6 @@
 Copyright 2020 My.com B.V. (Mail.Ru Group)
 Copyright 2025 Organic Maps Contributors
-Copyright 2025 CoMaps Contributors
+Copyright 2026 CoMaps Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

SECURITY.md

@@ -0,0 +1,17 @@
+## Reporting Vulnerabilities
+You can report a security vulnerability by creating an issue or send mail to security@comaps.app
+
+## Verifying Fingerprints
+
+To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
+```
+SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
+SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
+MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
+```
+
+To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
+```
+app.comaps
+48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
+```

android/app/build.gradle

@@ -351,6 +351,7 @@ dependencies {
   implementation libs.androidx.recyclerview
   implementation libs.androidx.work.runtime
   implementation libs.androidx.lifecycle.process
+  implementation libs.androidx.documentfile
   implementation libs.android.material
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,10 +1,8 @@
-• OpenStreetMap-Daten vom 9. Dezember
-• Material 3 Design
-• Im OSM-Editor können nun Ladestationen hinzugefügt werden
-• Schuko und Typ E Ladestationen hinzugefügt
-• Verbesserte Suchvorschläge
-• Litauische und lettische Sprachankündigungen
-• Die Fahranweisungen wurden vergrößert
-• Der Zoomlevel passt sich an die Distanz zur nächsten Abbiegung an
-• Neue Anordnung der Einstellungen
-Weitere Einzelheiten auf 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

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,10 +1,8 @@
-• OpenStreetMap data as of December 9
-• Use Material 3 themes
-• Support charging sockets in OSM Editor
-• Added schuko/type-E charge sockets
-• Improved search results ranking
-• Enabled Lithuanian and Latvian in voice announcements
-• Improved size of driving indications
-• Base zoom level on distance to next turn
-• Reordered settings
+• 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

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,11 +0,0 @@
-• Datos de OpenStreetMap a fecha 9/12.
-• Uso de temas Material 3.
-• Compatibilidad con enchufes de recarga en Editor.
-• Se añaden enchufes de recarga schuko/tipo E.
-• Se mejora la búsqueda.
-• Se habilitan el lituano y el letón en las indicaciones de voz.
-• Se aumenta el tamaño de las indicaciones de conducción.
-• Nivel de zoom base según la distancia al siguiente giro.
-• Se han reordenado los ajustes.
-
-Más detalles en codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,10 +1,8 @@
-• Données OpenStreetMap du 9 Décembre
-• Utilisation de Material 3
-• Support de l'édition des bornes de recharge dans l'éditeur OSM
-• Ajout du type de prise schuko/type-E
-• Amélioration de l'ordre des résultats de recherche
-• Ajout du lituanien et du letton dans le guidage vocal
-• Amélioration de la taille des instructions dans la navigation
-• Niveau de zoom basé sur la distance jusqu’au prochain virage
-• Réorganisation des paramètres
-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

android/app/src/fdroid/play/listings/hr/release-notes.txt

@@ -1,10 +0,0 @@
-• Podaci OpenStreetMap karte od 9. prosinca
-• Korištenje Material 3 tema
-• Podrška za utičnice za punjenje u OSM Editoru
-• Dodane šuko/tip-E utičnice
-• Poboljšano rangiranje rezultata pretraživanja
-• Omogućeni litvanski i latvijski jezici u glasovnim najavama
-• Povećana veličina indikatora vožnje
-• Razina zumiranja se mijenja ovisno o udaljenosti do sljedećeg skretanja
-• Promijenjen redoslijed postavki
-Više detalja na codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/lt/full-description.txt

@@ -0,0 +1,32 @@
+Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą. „CoMaps“ programa yra kilusi iš „Organic Maps“, o pastaroji – iš programos „Maps.ME“.
+
+Apie šio projekto kilmę, jos priežastis ir palaikomą kryptį galite paskaityti adresu <b><i>codeberg.org/comaps</i></b>.
+Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
+• Naudokitės programa ir paskleiskite žinią apie ją
+• Teikite atsiliepimus ir praneškite apie problemas
+• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
+
+‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
+‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
+‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
+‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
+‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
+‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
+
+<b>Pagrindinės funkcijos</b>:
+• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
+• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
+• Pėsčiųjų ir dviračių takai;
+• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
+• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
+• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
+• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
+• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
+• Kelionių metro sluoksnis ir maršrutai;
+• Trasų įrašymas;
+• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
+• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
+• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi.
+
+<b>Laisvė yra čia</b>
+Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!

android/app/src/fdroid/play/listings/pl-PL/release-notes.txt

@@ -1,10 +0,0 @@
-• Dane OpenStreetMap z 9 grudnia
-• Użycie motywów Material 3
-• Obsługa gniazd ładowania w Edytorze OSM
-• Dodane gniazda ładowania schuko/type-E
-• Poprawiony ranking wyników wyszukiwania
-• Dodane litewskie i łotewskie komunikaty głosowe
-• Poprawiony rozmiar znaków drogowych
-• Poziom powiększenia oparty na odległości do następnego manewru
-• Zmieniona kolejność ustawień
-Więcej szczegółów na codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,10 +1,8 @@
-• Dados OpenStreetMap atualizados em 9 de dezembro
-• Uso do estilo Material 3
-• Suporte para tomadas de carregamento no Editor OSM
-• Adição de tomadas de carregamento Schuko/Tipo E
-• Melhoria na classificação dos resultados de busca
-• Adição dos idiomas letão e lituano nas orientações por voz
-• Melhoria no tamanho das indicações de direção
-• Nível de zoom baseado em distância até a próxima curva
-• Configurações reordenadas
+• 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

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -0,0 +1,8 @@
+• Карты OpenStreetMap от 17 декабря
+• Возможность настройки сервера для скачивания карт
+• Добавлена ​​информация об устаревании карт и ​​кнопка обновления (при выборе места на карте)
+• Парковочные проезды больше не используются для транзитной маршрутизации
+• Изменены кнопки масштабирования карты
+• На карту добавлены ирригационные гидранты
+• Редактор OSM: проверка максимальной длины OSM тегов
+Подробнее на codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/sl/full-description.txt

@@ -19,13 +19,13 @@ Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
 • Iščite po imenu, hišnemu naslovu ali po vrsti
-• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
+• Usmerjanje z glasovnimi navodili za hojo, kolesarjenje ali vožnjo avtomobila.
 • Zaznamujte svoje najljubše kraje s preprostim dotikom
 • Wikipedijini članki brez povezave
 • Prometna plast podzemne železnice z usmerjanjem
 • Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
 • Temni prikaz za uporabo ponoči
-• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika
+• Izboljšajte podatke zemljevida za vse z uporabo vgrajenega urejevalnika
 
 <b>Svoboda je tu</b>
 Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!

android/app/src/fdroid/play/listings/sl/short-description.txt

@@ -1 +1 @@
-Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti

android/app/src/fdroid/play/listings/sl/title.txt

@@ -1 +1 @@
-CoMaps–Hodi, kolesari, vozi brez povezave, zasebno
+CoMaps – hodi in vozi brez povezave, zasebno

android/app/src/google/play/listings/lt/full-description.txt

@@ -0,0 +1,36 @@
+Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą.
+
+Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
+• Naudokitės programa ir paskleiskite žinią apie ją
+• Teikite atsiliepimus ir praneškite apie problemas
+• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
+
+<i>Jūsų atsiliepimai ir 5 žvaigždučių vertinimai yra geriausias palaikymas mums!</i>
+
+‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
+‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
+‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
+‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
+‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
+‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
+
+<b>Pagrindinės funkcijos</b>:
+• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
+• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
+• Pėsčiųjų ir dviračių takai;
+• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
+• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
+• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
+• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
+• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
+• Kelionių metro sluoksnis ir maršrutai;
+• Trasų įrašymas;
+• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
+• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
+• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi;
+• „Android Auto“ palaikymas.
+
+Praneškite apie programos problemas, siūlykite idėjas ir prisijunkite prie mūsų bendruomenės svetainėje <b><i>comaps.app</i></b>.
+
+<b>Laisvė yra čia</b>
+Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!

android/app/src/google/play/listings/sl/short-description.txt

@@ -1 +1 @@
-Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java

@@ -16,8 +16,7 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.Utils;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import java.util.Objects;
@@ -38,7 +37,7 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
   @NonNull
   private TextInputEditText mEditCategoryNameView;
   @NonNull
-  private ShapeableImageView mSaveView;
+  private MaterialButton mSaveView;
 
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState)
@@ -75,12 +74,32 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
       @Override
       public void onTextChanged(CharSequence charSequence, int i, int i1, int i2)
       {
-        clearNameBtn.setEndIconVisible(charSequence.length() > 0);
+          if (charSequence.length() >= 1)
+          {
+              clearNameBtn.setEndIconVisible(true);
+              mSaveView.setEnabled(true);
+          }
+          else
+          {
+              clearNameBtn.setEndIconVisible(false);
+              mSaveView.setEnabled(false);
+              mEditCategoryNameView.setError(getString(R.string.bookmarks_error_title_empty_list_name));
+          }
       }
 
       @Override
       public void afterTextChanged(Editable editable)
-      {}
+      {
+          if (BookmarkManager.INSTANCE.isUsedCategoryName(getEditableCategoryName()) && !TextUtils.equals(getEditableCategoryName(), mCategory.getName()))
+          {
+              mEditCategoryNameView.setError(getString(R.string.bookmarks_error_title_list_name_already_taken));
+              mSaveView.setEnabled(false);
+          }
+          else
+          {
+              mSaveView.setEnabled(true);
+          }
+      }
     });
     mEditDescView = root.findViewById(R.id.edit_description);
     mEditDescView.setText(mCategory.getDescription());
@@ -91,8 +110,6 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
   private void onEditDoneClicked()
   {
     final String newCategoryName = getEditableCategoryName();
-    if (!validateCategoryName(newCategoryName))
-      return;
 
     if (isCategoryNameChanged())
       BookmarkManager.INSTANCE.setCategoryName(mCategory.getId(), newCategoryName);
@@ -109,30 +126,6 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
     return !TextUtils.equals(categoryName, mCategory.getName());
   }
 
-  private boolean validateCategoryName(@Nullable String name)
-  {
-    if (TextUtils.isEmpty(name))
-    {
-      new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
-          .setTitle(R.string.bookmarks_error_title_empty_list_name)
-          .setMessage(R.string.bookmarks_error_message_empty_list_name)
-          .setPositiveButton(R.string.ok, null)
-          .show();
-      return false;
-    }
-
-    if (BookmarkManager.INSTANCE.isUsedCategoryName(name) && !TextUtils.equals(name, mCategory.getName()))
-    {
-      new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
-          .setTitle(R.string.bookmarks_error_title_list_name_already_taken)
-          .setMessage(R.string.bookmarks_error_message_list_name_already_taken)
-          .setPositiveButton(R.string.ok, null)
-          .show();
-      return false;
-    }
-    return true;
-  }
-
   @NonNull
   private String getEditableCategoryName()
   {

android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java

@@ -152,7 +152,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
     if (mInputValidator != null)
     {
       final String maybeError = mInputValidator.validate(activity, input);
-      mEtInputLayout.getEditText().setError(maybeError);
+      mEtInputLayout.setError(maybeError);
       mEtInputLayout.requestFocus();
       return maybeError == null;
     }

android/app/src/main/java/app/organicmaps/editor/EditorFragment.java

@@ -196,10 +196,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       {
         final Context context = mInputBuildingLevels.getContext();
         final boolean isValid = Editor.nativeIsLevelValid(s.toString());
-        UiUtils.setInputError(mInputBuildingLevels,
-                              isValid ? null
-                                      : context.getString(R.string.error_enter_correct_storey_number,
-                                                          Editor.nativeGetMaxEditableBuildingLevels()));
+        mInputBuildingLevels.setError(isValid ? null : context.getString(R.string.error_enter_correct_storey_number,
+                Editor.nativeGetMaxEditableBuildingLevels()));
       }
     });
 
@@ -948,7 +946,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);
 
-    if (Editor.nativeIsMapObjectUploaded())
+    if (Editor.nativeAreSomeFeatureChangesUploaded())
     {
       mReset.setText(R.string.editor_place_doesnt_exist);
       return;
@@ -966,7 +964,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void reset()
   {
-    if (Editor.nativeIsMapObjectUploaded())
+    if (Editor.nativeAreSomeFeatureChangesUploaded())
     {
       placeDoesntExist();
       return;

android/app/src/main/java/app/organicmaps/routing/NavigationController.java

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

android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java

@@ -6,12 +6,10 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 
@@ -44,7 +42,6 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
     RecyclerView recyclerView = getListView();
     ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
   }

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -24,7 +24,6 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.WindowCompat;
@@ -196,7 +195,7 @@ public final class UiUtils
   public static void showHomeUpButton(MaterialToolbar toolbar)
   {
     toolbar.setNavigationIcon(
-        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
 
   // this method returns the total height of the display (in pixels) including notch and other touchable areas
@@ -209,15 +208,7 @@ public final class UiUtils
   }
   public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error)
   {
-    setInputError(layout, error == 0 ? null : layout.getContext().getString(error));
-  }
-
-  public static void setInputError(@NonNull TextInputLayout layout, String error)
-  {
-    layout.getEditText().setError(error);
-    layout.getEditText().setTextColor(error == null
-                                          ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary)
-                                          : ContextCompat.getColor(layout.getContext(), R.color.base_red));
+    layout.setError(error == 0 ? null : layout.getContext().getString(error));
   }
 
   public static void setFullscreen(@NonNull Activity activity, boolean fullscreen)
@@ -281,6 +272,14 @@ public final class UiUtils
     view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
   }
 
+  public static void setViewNavigationTopInsetsMargin(View view, WindowInsetsCompat windowInsets)
+  {
+      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+      ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+      lp.topMargin = systemInsets.top;
+      view.setLayoutParams(lp);
+  }
+
   public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
   {
     View customNavigationButton = toolbar.findViewById(R.id.back);

android/app/src/main/res/drawable/ic_browse_activity.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M80,360v-160q0,-33 23.5,-56.5T160,120h640q33,0 56.5,23.5T880,200v160h-80v-160L160,200v160L80,360ZM160,720q-33,0 -56.5,-23.5T80,640v-200h80v200h640v-200h80v200q0,33 -23.5,56.5T800,720L160,720ZM40,840v-80h880v80L40,840ZM480,420ZM80,440v-80h240q11,0 21,6t15,16l47,93 123,-215q5,-9 14,-14.5t20,-5.5q11,0 21,5.5t15,16.5l49,98h235v80L620,440q-11,0 -21,-5.5T584,418l-26,-53 -123,215q-5,10 -15,15t-21,5q-11,0 -20.5,-6T364,578l-69,-138L80,440Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_cloud_download.xml

@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?colorControlNormal"
+    android:tint="?iconTint"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="960"

android/app/src/main/res/drawable/ic_dark_mode.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M480,840q-150,0 -255,-105T120,480q0,-150 105,-255t255,-105q14,0 27.5,1t26.5,3q-41,29 -65.5,75.5T444,300q0,90 63,153t153,63q55,0 101,-24.5t75,-65.5q2,13 3,26.5t1,27.5q0,150 -105,255T480,840ZM480,760q88,0 158,-48.5T740,585q-20,5 -40,8t-40,3q-123,0 -209.5,-86.5T364,300q0,-20 3,-40t8,-40q-78,32 -126.5,102T200,480q0,116 82,198t198,82ZM470,490Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_download_st.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
     <path
         android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z"
         android:fillColor="#FFF"/>

android/app/src/main/res/drawable/ic_eco.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M216,784q-45,-45 -70.5,-104T120,558q0,-63 24,-124.5T222,318q35,-35 86.5,-60t122,-39.5Q501,204 591.5,201t202.5,7q8,106 5,195t-16.5,160.5q-13.5,71.5 -38,125T684,778q-53,53 -112.5,77.5T450,880q-65,0 -127,-25.5T216,784ZM328,768q29,17 59.5,24.5T450,800q46,0 91,-18.5t86,-59.5q18,-18 36.5,-50.5t32,-85Q709,534 716,459.5t2,-177.5q-49,-2 -110.5,-1.5T485,290q-61,9 -116,29t-90,55q-45,45 -62,89t-17,85q0,59 22.5,103.5T262,714q42,-80 111,-153.5T534,440q-72,63 -125.5,142.5T328,768ZM328,768ZM328,768Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_instant_mix.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M200,800v-280h-80v-80h240v80h-80v280h-80ZM200,360v-200h80v200h-80ZM360,360v-80h80v-120h80v120h80v80L360,360ZM440,800v-360h80v360h-80ZM680,800v-120h-80v-80h240v80h-80v120h-80ZM680,520v-360h80v360h-80Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v124q18,7 29,22t11,34v80q0,19 -11,34t-29,22v404q0,33 -23.5,56.5T680,920L280,920ZM280,840h400v-720L280,120v720ZM280,840v-720,720ZM394,640h172q14,0 24,-10t10,-24v-132q0,-14 -10,-24t-24,-10h-6v-40q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400v40h-6q-14,0 -24,10t-10,24v132q0,14 10,24t24,10ZM440,440v-40q0,-17 11.5,-28.5T480,360q17,0 28.5,11.5T520,400v40h-80Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_network_manage.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M339,698q22,-22 49.5,-36t58.5,-19q-5,19 -8,38t-3,39q0,24 3.5,47t11.5,44L339,698ZM254,614 L170,528q62,-62 142,-95t168,-33q49,0 96,10.5t90,30.5q-44,8 -81.5,29T517,522q-9,-1 -18.5,-1.5T480,520q-64,0 -122.5,24.5T254,614ZM84,444 L0,360q95,-97 219.5,-148.5T480,160q136,0 260.5,51.5T960,360l-84,84q-79,-79 -181.5,-121.5T480,280q-112,0 -214.5,42.5T84,444ZM760,520 L772,580q12,5 22.5,10.5T816,604l58,-18 40,68 -46,40q2,12 2,26t-2,26l46,40 -40,68 -58,-18q-11,8 -21.5,13.5T772,860l-12,60h-80l-12,-60q-12,-5 -22.5,-10.5T624,836l-58,18 -40,-68 46,-40q-2,-12 -2,-26t2,-26l-46,-40 40,-68 58,18q11,-8 21.5,-13.5T668,580l12,-60h80ZM720,640q-33,0 -56.5,23.5T640,720q0,33 23.5,56.5T720,800q33,0 56.5,-23.5T800,720q0,-33 -23.5,-56.5T720,640Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_profile.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_record_voice_over.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="m798,638 l-62,-62q44,-41 69,-97t25,-119q0,-63 -25,-118t-69,-96l62,-64q56,53 89,125t33,153q0,81 -33,153t-89,125ZM670,510l-64,-64q18,-17 29,-38.5t11,-47.5q0,-26 -11,-47.5T606,274l64,-64q32,29 50,67.5t18,82.5q0,44 -18,82.5T670,510ZM360,520q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM40,840v-112q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18q77,0 141,18t115,44q30,15 47,44t17,62v112L40,840ZM120,760h480v-32q0,-11 -5.5,-20T580,694q-36,-18 -92.5,-36T360,640q-71,0 -127.5,18T140,694q-9,5 -14.5,14t-5.5,20v32ZM360,440q33,0 56.5,-23.5T440,360q0,-33 -23.5,-56.5T360,280q-33,0 -56.5,23.5T280,360q0,33 23.5,56.5T360,440ZM360,360ZM360,760Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_sd_card.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M360,440h80v-160h-80v160ZM480,440h80v-160h-80v160ZM600,440h80v-160h-80v160ZM240,880q-33,0 -56.5,-23.5T160,800v-480l240,-240h320q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-640L434,160L240,354v446ZM240,800h480,-480Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_search_recent_st.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/>

android/app/src/main/res/drawable/ic_settings_backup_restore.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,840q-139,0 -241,-91.5T122,520h82q14,104 92.5,172T480,760q117,0 198.5,-81.5T760,480q0,-117 -81.5,-198.5T480,200q-69,0 -129,32t-101,88h110v80L120,400v-240h80v94q51,-64 124.5,-99T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480q0,75 -28.5,140.5t-77,114q-48.5,48.5 -114,77T480,840Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_straighten.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M160,720q-33,0 -56.5,-23.5T80,640v-320q0,-33 23.5,-56.5T160,240h640q33,0 56.5,23.5T880,320v320q0,33 -23.5,56.5T800,720L160,720ZM160,640h640v-320L680,320v160h-80v-160h-80v160h-80v-160h-80v160h-80v-160L160,320v320ZM280,480h80,-80ZM440,480h80,-80ZM600,480h80,-80ZM480,480Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_text_fields.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M280,800v-520L80,280v-120h520v120L400,280v520L280,800ZM640,800v-320L520,480v-120h360v120L760,480v320L640,800Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_three_d_rotation.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480h80q0,115 72.5,203T418,794l-58,-58 56,-56L598,862q-29,10 -58.5,14T480,880ZM500,600v-240h120q17,0 28.5,11.5T660,400v160q0,17 -11.5,28.5T620,600L500,600ZM300,600v-60h100v-40h-60v-40h60v-40L300,420v-60h120q17,0 28.5,11.5T460,400v160q0,17 -11.5,28.5T420,600L300,600ZM560,540h40v-120h-40v120ZM800,480q0,-115 -72.5,-203T542,166l58,58 -56,56 -182,-182q29,-10 58.5,-14t59.5,-4q83,0 156,31.5T763,197q54,54 85.5,127T880,480h-80Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_translate.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125 -202,201ZM628,688h144l-72,-204 -72,204Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_translate_indic.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM628,688h144l-72,-204 -72,204ZM254,640q-66,0 -123.5,-38.5T44,498l72,-36q21,42 58,70t79,28q38,0 62.5,-23.5T340,480q0,-33 -23.5,-56.5T260,400h-60v-80h60q25,0 42.5,-17.5T320,260q0,-25 -17,-42.5T261,200q-23,0 -41,15t-32,33l-63,-49q26,-32 60,-55.5t77,-23.5q57,0 97.5,40.5T400,259q0,27 -10,52.5T361,357q10,10 18.5,20.5T396,400h124v-200h-80v-80h240v80h-80v116l-61,164L420,480v4q0,63 -46,109.5T254,640Z"
       android:fillColor="#fff"/>

android/app/src/main/res/drawable/ic_wifi_find.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
   <path
       android:pathData="M480,840 L0,359q93,-93 215.5,-146T480,160q142,0 264.5,53T960,359l-56,57q-81,-81 -190,-128.5T480,240q-103,0 -195,32.5T117,363l419,420 -56,57ZM864,800L761,698q-18,11 -38,16.5t-43,5.5q-68,0 -114,-46t-46,-114q0,-68 46,-114t114,-46q68,0 114,46t46,114q0,23 -5.5,43T818,641l102,103 -56,56ZM680,640q34,0 57,-23t23,-57q0,-34 -23,-57t-57,-23q-34,0 -57,23t-23,57q0,34 23,57t57,23ZM480,783Z"
       android:fillColor="#fff"/>

android/app/src/main/res/layout-land/about.xml

@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:text="@string/about_headline"
             android:textAlignment="center"
-            android:textAppearance="@style/MwmTextAppearance.Headline"
+            android:textAppearance="@style/MwmTextAppearance.Headline6"
             android:textColor="?android:textColorPrimary"
             app:layout_constraintTop_toTopOf="@id/version" />
         </LinearLayout>

android/app/src/main/res/layout-land/fragment_osm_login.xml

@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">

android/app/src/main/res/layout-land/layout_nav_top.xml

@@ -11,13 +11,12 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:id="@+id/statutbar"
-    android:layout_height="15dp"
+    android:layout_height="1dp"
     app:layout_constraintTop_toTopOf="parent" />
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/street_frame"
     android:layout_width="500dp"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
     android:elevation="@dimen/nav_elevation"
@@ -52,7 +51,6 @@
     app:layout_constraintEnd_toStartOf="@+id/street_frame"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
     android:layout_marginStart="@dimen/margin_quarter"
     android:clickable="true"
     android:elevation="@dimen/nav_elevation">

android/app/src/main/res/layout-w1020dp/activity_settings.xml

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

android/app/src/main/res/layout/about.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">
@@ -42,7 +42,7 @@
         android:layout_marginBottom="@dimen/margin_base"
         android:text="@string/about_headline"
         android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.Headline"
+        android:textAppearance="@style/MwmTextAppearance.Headline6"
         android:textColor="?android:textColorPrimary" />
 
     <com.google.android.material.textview.MaterialTextView

android/app/src/main/res/layout/activity_download_resources.xml

@@ -5,7 +5,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?appBackground">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -38,7 +38,7 @@
         app:tint="?colorSecondary"/>
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/head_message"
-        style="@style/TextAppearance.Headline6"
+        style="@style/MwmTextAppearance.Headline6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
@@ -48,7 +48,7 @@
         android:text="@string/download_map_title" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/download_message"
-        style="@style/TextAppearance.Body2"
+        style="@style/MwmTextAppearance.Body2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"

android/app/src/main/res/layout/activity_map_placeholder.xml

@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:gravity="center"
   android:orientation="vertical">
 
@@ -28,7 +28,7 @@
         android:layout_marginBottom="8dp"
         android:text="@string/aa_connected_title"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Headline4"
+        android:textAppearance="@style/MwmTextAppearance.Headline4"
         android:textStyle="bold" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:text="@string/car_used_on_the_car_screen"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Body1" />
+        android:textAppearance="@style/MwmTextAppearance.Body1" />
   </LinearLayout>
 
   <com.google.android.material.button.MaterialButton

android/app/src/main/res/layout/activity_request_permissions.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -20,7 +20,7 @@
       android:layout_marginStart="32dp"
       android:text="@string/aa_request_permission_activity_text"
       android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.Headline4"
+      android:textAppearance="@style/MwmTextAppearance.Headline4"
       android:textStyle="bold" />
 
   <com.google.android.material.button.MaterialButton

android/app/src/main/res/layout/activity_settings.xml

@@ -3,7 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?appBackground">
 
   <include
     layout="@layout/toolbar_default"/>

android/app/src/main/res/layout/bottom_sheet.xml

@@ -22,7 +22,7 @@
     android:layout_marginStart="@dimen/margin_base"
     android:maxLines="3"
     android:ellipsize="end"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/MwmTextAppearance.Headline6"
     tools:text="Title" />
 
   <androidx.recyclerview.widget.RecyclerView

android/app/src/main/res/layout/button_with_progress.xml

@@ -12,7 +12,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base"
     android:text="@string/download_country_ask"
-    android:textAppearance="@style/TextAppearance.Body2"
+    android:textAppearance="@style/MwmTextAppearance.Body2"
     android:visibility="gone"
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator

android/app/src/main/res/layout/dialog_sorting_types.xml

@@ -27,7 +27,7 @@
     android:layout_marginTop="@dimen/margin_base">
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_default"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_type"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_distance"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
       android:id="@+id/sort_by_time"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"

android/app/src/main/res/layout/elevation_profile_internal.xml

@@ -17,7 +17,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:paddingTop="@dimen/margin_half"
       android:paddingBottom="@dimen/margin_base"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="@style/MwmTextAppearance.Headline6"
       tools:text="Xindian Shitoushan Trail" />
     <include
       layout="@layout/item_divider"

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -2,18 +2,11 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme">
-  </com.google.android.material.appbar.MaterialToolbar>
+  <include layout="@layout/toolbar_default"/>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -12,15 +12,16 @@
     android:layout_height="wrap_content"
     android:theme="@style/MwmWidget.ToolbarTheme">
 
-      <com.google.android.material.imageview.ShapeableImageView
-        app:tint="@color/image_view"
+      <com.google.android.material.button.MaterialButton
         android:id="@+id/save"
-        app:srcCompat="@drawable/ic_done"
+        app:icon="@drawable/ic_done"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="24dp"
         android:layout_width="?actionBarSize"
         android:layout_height="?actionBarSize"
         android:background="?selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
-        android:scaleType="centerInside"
         android:contentDescription="@string/save" />
   </com.google.android.material.appbar.MaterialToolbar>
   <FrameLayout

android/app/src/main/res/layout/fragment_osm_login.xml

@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">

android/app/src/main/res/layout/fragment_osm_profile.xml

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
-  android:background="?cardBackground">
+  android:background="?appBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/fragment_prefs_storage.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?cardBackground">
+    android:background="?appBackground">
 
   <com.google.android.material.textview.MaterialTextView
       android:id="@+id/header"

android/app/src/main/res/layout/fragment_report.xml

@@ -15,7 +15,13 @@
     android:theme="@style/MwmWidget.ToolbarTheme">
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/save"
-      style="@style/MwmWidget.Downloader.ToolbarButton"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:gravity="center"
+      android:layout_gravity="end|center_vertical"
+      android:background="?selectableItemBackgroundBorderless"
+      android:padding="@dimen/margin_half"
+      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
       android:text="@string/editor_report_problem_send_button"/>
   </com.google.android.material.appbar.MaterialToolbar>
 

android/app/src/main/res/layout/fragment_suggest_country_download.xml

@@ -6,7 +6,6 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
   android:animateLayoutChanges="true"
   android:clickable="true"
   android:clipToPadding="false"

android/app/src/main/res/layout/fragment_toggle_map_layer.xml

@@ -16,7 +16,7 @@
       android:layout_marginStart="@dimen/margin_base"
       android:layout_marginTop="@dimen/margin_base"
       android:text="@string/layers_title"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="@style/MwmTextAppearance.Headline6"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
     <com.google.android.material.button.MaterialButton

android/app/src/main/res/layout/item_bookmark_category.xml

@@ -30,7 +30,7 @@
     android:ellipsize="middle"
     android:singleLine="true"
     android:textAlignment="viewStart"
-    android:textAppearance="@style/TextAppearance.Body1"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
     tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
   <LinearLayout
     android:id="@+id/bottom_line_container"

android/app/src/main/res/layout/item_bookmark_collection.xml

@@ -25,7 +25,7 @@
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:ellipsize="middle"
       android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/size"
@@ -37,7 +37,7 @@
       android:ellipsize="end"
       android:singleLine="true"
       android:textColor="?android:textColorSecondary"
-      style="@style/TextAppearance.Body2"
+      style="@style/MwmTextAppearance.Body2"
       tools:text="42000000" />
   </LinearLayout>
 </LinearLayout>

android/app/src/main/res/layout/item_bookmark_group_list_header.xml

@@ -12,7 +12,7 @@
   android:paddingBottom="@dimen/margin_half_plus">
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/text_message"
-    style="@style/TextAppearance.Headline6"
+    style="@style/MwmTextAppearance.Headline6"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_alignParentStart="true"

android/app/src/main/res/layout/item_category_title.xml

@@ -2,7 +2,7 @@
 <com.google.android.material.textview.MaterialTextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/text"
-  style="@style/TextAppearance.Headline6"
+  style="@style/MwmTextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="?windowBackgroundForced"

android/app/src/main/res/layout/item_feature_category_footer.xml

@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?windowBackgroundForced"
+  android:background="?cardBackground"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
@@ -14,7 +14,7 @@
     android:gravity="center"
     android:maxWidth="500dp"
     android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/MwmTextAppearance.Headline6"
     android:textStyle="bold" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"

android/app/src/main/res/layout/item_missed_map.xml

@@ -7,6 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:background="?cardBackground"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

android/app/src/main/res/layout/item_missed_map_group.xml

@@ -7,6 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:background="?cardBackground"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

android/app/src/main/res/layout/item_track.xml

@@ -29,7 +29,7 @@
       android:layout_marginTop="@dimen/margin_base"
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       tools:text="@string/tracks_title" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
       android:layout_marginBottom="@dimen/margin_half_plus"
       android:singleLine="true"
       android:textColor="?android:textColorSecondary"
-      android:textAppearance="@style/TextAppearance.Body2"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
       tools:text="@string/by_distance" />
   </LinearLayout>
   <com.google.android.material.imageview.ShapeableImageView

android/app/src/main/res/layout/layout_nav_top.xml

@@ -11,13 +11,12 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:id="@+id/statutbar"
-    android:layout_height="25dp"
+    android:layout_height="1dp"
     app:layout_constraintTop_toTopOf="parent" />
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus"
     android:layout_marginStart="@dimen/nav_street_left"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
@@ -55,7 +54,6 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
     android:layout_marginStart="@dimen/margin_half"
-    android:layout_marginTop="@dimen/margin_half_plus"
     android:clickable="true"
     android:elevation="@dimen/nav_elevation">
     <LinearLayout

android/app/src/main/res/layout/place_page_details.xml

@@ -82,7 +82,7 @@
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/place_page_last_checked"
-    style="@style/TextAppearance.Caption"
+    style="@style/MwmTextAppearance.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/margin_half"

android/app/src/main/res/layout/place_page_map_too_old.xml

@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
 android:layout_marginTop="@dimen/margin_half"
 app:strokeWidth="1dp"
 app:strokeColor="@color/base_accent"
-app:cardBackgroundColor="@color/bg_cards">
+app:cardBackgroundColor="?cardBackground">
 
 <LinearLayout
   android:layout_width="match_parent"

android/app/src/main/res/layout/place_page_opening_hours_fragment.xml

@@ -65,7 +65,7 @@
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/oh_check_date"
-    style="@style/TextAppearance.Caption"
+    style="@style/MwmTextAppearance.Caption"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:layout_alignParentEnd="true"

android/app/src/main/res/layout/placeholder_title.xml

@@ -6,6 +6,7 @@
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:layout_marginBottom="@dimen/margin_half_plus"
-  android:textAppearance="@style/MwmTextAppearance.Title.Toolbar"
+  android:textSize="@dimen/text_size_headline"
+  android:fontFamily="@string/robotoMedium"
   android:gravity="center_horizontal"
   tools:text="Some long long long placeholder title"/>

android/app/src/main/res/layout/routing_plan.xml

@@ -30,8 +30,7 @@
             android:layout_alignParentStart="true"
             android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
-            android:scaleType="center"
-            tools:src="@drawable/ic_expand_more" />
+            android:scaleType="center" />
 
         <RadioGroup
             android:id="@+id/route_type"

android/app/src/main/res/layout/tab_timepicker.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/MwmWidget.Tab"
-  android:textAppearance="@style/MwmTextAppearance.Body3"
-  tools:drawableStart="@drawable/ic_menu_open"
-  tools:text="Some tab"/>

android/app/src/main/res/layout/toolbar_extended.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
@@ -9,7 +10,8 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme.DownButton"/>
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    app:navigationIcon="@drawable/ic_expand_more"/>
 
   <View
     android:layout_width="match_parent"

android/app/src/main/res/layout/toolbar_search_controls.xml

@@ -17,7 +17,6 @@
     android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
-    tools:src="@drawable/ic_expand_more"
     android:contentDescription="@string/back"/>
 
   <com.google.android.material.textfield.TextInputEditText

android/app/src/main/res/layout/toolbar_transparent.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/toolbar"
-  style="@style/MwmWidget.ToolbarStyle"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:theme="@style/MwmWidget.ToolbarTheme.Transparent"/>

android/app/src/main/res/values-ca/strings.xml

@@ -502,7 +502,7 @@
     <string name="placepage_edit_bookmark_button">Edita el marcador</string>
     <string name="placepage_personal_notes_hint">Notes personals (text o html)</string>
     <string name="editor_reset_edits_message">Voleu descartar tots els canvis locals?</string>
-    <string name="editor_reset_edits_button">Descarta</string>
+    <string name="editor_reset_edits_button">Descartar canvis</string>
     <string name="editor_remove_place_message">Voleu suprimir el lloc afegit?</string>
     <string name="editor_remove_place_button">Suprimeix</string>
     <string name="editor_place_doesnt_exist">El lloc no existeix</string>
@@ -920,4 +920,9 @@
     <string name="prefs_speed_cameras_information">Les advertències de càmeres radar estan deshabilitades als països on estan prohibides per llei.</string>
     <string name="navigation_start_tts_message">"Iniciant Navegació, idioma d\'instruccions de veu: "</string>
     <string name="navigation_start_tts_disabled_message">Instruccions de veu desactivades: motor TTS no disponible</string>
+    <string name="advanced">Avançat</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
+    <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">No establert</string>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
 </resources>

android/app/src/main/res/values-cs/strings.xml

@@ -493,7 +493,7 @@
     <string name="placepage_edit_bookmark_button">Upravit záložku</string>
     <string name="placepage_personal_notes_hint">Vlastní poznámka (text nebo HTML)</string>
     <string name="editor_reset_edits_message">Vymazat všechny místní změny?</string>
-    <string name="editor_reset_edits_button">Zahodit</string>
+    <string name="editor_reset_edits_button">Zahodit změny</string>
     <string name="editor_remove_place_message">Odstranit přidané místo?</string>
     <string name="editor_remove_place_button">Odstranit</string>
     <string name="editor_place_doesnt_exist">Místo neexistuje</string>
@@ -913,4 +913,9 @@
     <string name="place_page_update_too_old_map">Aktualizovat oblast mapy</string>
     <string name="place_page_too_old_to_edit">Úprava OpenStreetMap je zakázaná, protože mapová data jsou příliš stará.</string>
     <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
+    <string name="download_resources_custom_url_title">Vlastní mapový server</string>
+    <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
+    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
+    <string name="advanced">Pokročilé</string>
+    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>

android/app/src/main/res/values-da/strings.xml

@@ -489,7 +489,7 @@
     <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
-    <string name="editor_reset_edits_button">Kassér</string>
+    <string name="editor_reset_edits_button">Kassér ændringer</string>
     <string name="editor_remove_place_message">Slet tilføjet sted?</string>
     <string name="editor_remove_place_button">Slet</string>
     <string name="editor_place_doesnt_exist">Stedet eksisterer ikke</string>
@@ -902,4 +902,9 @@
     <string name="place_page_update_too_old_map">Opdater kortregion</string>
     <string name="place_page_too_old_to_edit">Redigering af OpenStreetMap er deaktiveret, fordi kortdataene er for gamle.</string>
     <string name="navigation_start_tts_disabled_message">Stemmeinstruktioner deaktiveret: TTS-motor ikke tilgængelig</string>
+    <string name="advanced">Avanceret</string>
+    <string name="download_resources_custom_url_title">Brugerdefineret kortserver</string>
+    <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
+    <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
+    <string name="download_resources_custom_url_error_scheme">Indtast en fuld URL, der starter med https:// og ender med /</string>
 </resources>

android/app/src/main/res/values-de/strings.xml

@@ -9,7 +9,7 @@
     <string name="delete">Löschen</string>
     <string name="download_maps">Karten herunterladen</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen, Antippen für einen neuen Versuch</string>
+    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen – antippen für einen erneuten Versuch</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Wird heruntergeladen …</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Eingeschränkte Genauigkeit</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktivieren Sie „Genauer Standort“ in den Einstellungen</string>
+    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktiviere „Genauer Standort“ in den Einstellungen</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Auf der Karte anzeigen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -36,7 +36,7 @@
     <string name="try_again">Erneut versuchen</string>
     <string name="about_menu_title">Über CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Offenes Projekt, von der Gemeinschaft entwickelt</string>
+    <string name="about_headline">Freies Projekt, von der Gemeinschaft entwickelt</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Ausgereift und einfach zu bedienen</string>
     <!-- Text in About screen -->
@@ -53,10 +53,10 @@
     <!-- Used in DownloadResources startup screen -->
     <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um CoMaps zu verwenden</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen</string>
-    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s Speicherplatz benötigt.</string>
+    <string name="not_enough_free_space_on_sdcard">Bitte zuerst den Speicherplatz auf der SD-Karte/USB-Speicher freigeben, um die Anwendung nutzen zu können</string>
+    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s des Speicherplatzes benötigt.</string>
     <string name="download_resources_continue">Zur Karte</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. Sie können jetzt \nzur Karte weitergehen.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. \nSie können jetzt zur Karte weitergehen.</string>
     <string name="download_country_ask">%1$s herunterladen? (%2$s)</string>
     <string name="update_country_ask">%1$s aktualisieren? (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -84,7 +84,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Karten speichern auf</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Wählen Sie den Speicherort für die herunterzuladenden Karten</string>
+    <string name="maps_storage_summary">Wähle den Speicherort für die herunterzuladenden Karten</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Heruntergeladene Karten</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -94,7 +94,7 @@
     <!-- Error moving map files from one storage to another -->
     <string name="move_maps_error">Fehler beim Verschieben der Karten</string>
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
+    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
     <!-- Measurement units title in settings activity -->
     <string name="measurement_units">Maßeinheiten</string>
     <!-- Detailed description of Measurement Units settings button -->
@@ -105,7 +105,7 @@
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
     <string name="category_food">Lebensmittel</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
-    <string name="category_transport">Verkehr</string>
+    <string name="category_transport">ÖPNV</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
     <string name="category_fuel">Tankstelle</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
@@ -125,7 +125,7 @@
     <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
     <string name="category_nightlife">Nachtleben</string>
     <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Freizeit mit Kindern</string>
+    <string name="category_children">Familienfreizeit</string>
     <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
     <string name="category_bank">Bank</string>
     <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -137,7 +137,7 @@
     <!-- Search category for post offices; any changes should be duplicated in categories.txt @category_post! -->
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
-    <string name="category_police">Polizeistation</string>
+    <string name="category_police">Polizei</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recycling</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -148,8 +148,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notizen</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit Ihnen geteilt</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps App. Sie können sie mit CoMaps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Reisen mit CoMaps!</string>
+    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps-App. Du kannst in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Lesezeichen werden geladen</string>
     <!-- Kmz file successful loading -->
@@ -163,15 +163,15 @@
     <!-- resource for context menu -->
     <string name="edit">Bearbeiten</string>
     <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">Ihr Standort konnte noch nicht ermittelt werden</string>
+    <string name="unknown_current_position">Dein Standort konnte noch nicht ermittelt werden</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Entschuldige, die Einstellungen für die Kartenspeicherung sind aktuell deaktiviert</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Die Karte wird heruntergeladen</string>
+    <string name="downloading_is_active">Die Karte wird jetzt heruntergeladen</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/download/</string>
+    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/de/download/</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel auf der CoMaps-Karte an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel in der CoMaps-App an!</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -179,7 +179,7 @@
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Teilen</string>
     <!-- Share by email button text, also used in editor and About. -->
-    <string name="email">Email</string>
+    <string name="email">E-Mail</string>
     <!-- Text for message when used successfully copied something -->
     <string name="copied_to_clipboard">In die Zwischenablage kopiert: %s</string>
     <!-- Used for bookmark editing -->
@@ -197,7 +197,7 @@
     <string name="prefs_group_information">Information</string>
     <string name="prefs_group_route">Navigation</string>
     <string name="pref_zoom_title">Zoom-Tasten</string>
-    <string name="pref_zoom_summary">Auf der Karte anzeigen</string>
+    <string name="pref_zoom_summary">Zur Anzeige auf der Karte</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Nachtmodus</string>
     <!-- Generic «Off» string -->
@@ -219,9 +219,9 @@
     <!-- Settings «Route» category: «Tts announce street names» description -->
     <string name="pref_tts_street_names_description">Wenn aktiviert, wird der Name der Straße oder Ausfahrt, in die abgebogen werden soll, laut angekündigt.</string>
     <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Sprache für Sprachführung</string>
+    <string name="pref_tts_language_title">Sprache der Sprachführung</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Teste Sprachanweisungen</string>
+    <string name="pref_tts_test_voice_title">Teste die Sprachanweisungen</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Überprüfe die Lautstärke oder die Text-To-Speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hören kannst</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -330,7 +330,7 @@
     <string name="blue_gray">Graublau</string>
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
-    <string name="dialog_routing_disclaimer_priority">– Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
+    <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
     <string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
     <string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
@@ -543,7 +543,7 @@
     <string name="big_font">Schrift auf der Karte vergrößern</string>
     <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
-    <string name="traffic_data_unavailable">Verkehrsdaten sind nicht verfügbar</string>
+    <string name="traffic_data_unavailable">Es sind keine Verkehrsdaten verfügbar</string>
     <string name="enable_logging">Protokollierung aktivieren</string>
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Allgemeines Feedback</string>
@@ -873,7 +873,7 @@
     <string name="avoid_steps">Treppen vermeiden</string>
     <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
     <string name="offline_explanation_title">Offline-Karten</string>
-    <string name="offline_explanation_text">Um die Gegend anzusehen, muss eine Karte heruntergeladen werden.\nLaden Sie Karten für die Gebiete herunter, die Sie bereisen möchten.</string>
+    <string name="offline_explanation_text">Um die Gegend anzusehen und zu erkunden, musst du eine Karte runterladen.\nLade dir Karten für die Gebiete runter, die du bereisen willst.</string>
     <string name="charge_socket_type2">Typ 2 (ohne Kabel)</string>
     <string name="charge_socket_type2_cable">Typ 2 (mit Kabel)</string>
     <string name="charge_socket_type2_combo">Typ 2 Combo</string>
@@ -898,15 +898,15 @@
     <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
     <string name="closes_day_at">Schließt am %1$s um %2$s</string>
     <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="other">%d min</item>
+        <item quantity="one">(%d min)</item>
+        <item quantity="other">(%d min)</item>
     </plurals>
     <string name="editor_business_vacant_button">Geschäft steht leer</string>
     <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
     <string name="editor_submit">Absenden</string>
     <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
     <string name="charge_socket_schuko">Schuko</string>
-    <string name="power_management">Energiemanagement</string>
+    <string name="power_management">Stromverbrauch verwalten</string>
     <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
     <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
     <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
@@ -915,4 +915,9 @@
     <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
     <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
     <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</string>
+    <string name="download_resources_custom_url_title">Benutzerdefinierter Kartenserver</string>
+    <string name="advanced">Fortgeschritten</string>
+    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
+    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
+    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
 </resources>

android/app/src/main/res/values-el/strings.xml

@@ -450,7 +450,7 @@
     <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet.</string>
     <string name="downloader_no_space_title">Δεν υπάρχει αρκετός χώρος</string>
     <string name="downloader_no_space_message">Διαγράψτε μη απαραίτητα δεδομένα</string>
-    <string name="editor_login_error_dialog">Σφάλμα σύνδεσης.</string>
+    <string name="editor_login_error_dialog">Σφάλμα σύνδεσης</string>
     <string name="editor_profile_changes">Επαληθευμένες αλλαγές</string>
     <string name="editor_focus_map_on_location">Σύρετε το χάρτη για να τοποθετήσετε το σταυρό στη θέση του τόπου ή της επιχείρησης.</string>
     <string name="editor_edit_place_title">Επεξεργασία</string>
@@ -466,9 +466,9 @@
     <string name="osm_presentation">Δεδομένα OpenStreetMap που δημιουργήθηκαν από την κοινότητα στις %s. Μάθετε περισσότερα για τον τρόπο επεξεργασίας και ενημέρωσης του χάρτη στο OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">Το OpenStreetMap.org (OSM) είναι ένα κοινοτικό έργο για τη δημιουργία ενός ελεύθερου και ανοικτού χάρτη. Είναι η κύρια πηγή δεδομένων χάρτη στους CoMaps και λειτουργεί παρόμοια με τη Wikipedia. Μπορείτε να προσθέσετε ή να επεξεργαστείτε τοποθεσίες και αυτές γίνονται διαθέσιμες σε εκατομμύρια χρήστες σε όλο τον κόσμο. \nΕνταχθείτε στην κοινότητα και βοηθήστε να φτιάξουμε έναν καλύτερο χάρτη για όλους!</string>
-    <string name="login_to_make_edits_visible">Δημιουργήστε έναν λογαριασμό OpenStreetMap ή συνδεθείτε για να δημοσιεύσετε τις επεξεργασίες του χάρτη σας στον κόσμο.</string>
+    <string name="login_to_make_edits_visible">Δημιουργήστε έναν λογαριασμό OpenStreetMap ή συνδεθείτε για να δημοσιεύσετε τις επεξεργασίες του χάρτη σας στον κόσμο</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
-    <string name="downloader_of">%1$d/%2$d</string>
+    <string name="downloader_of">%1$d από %2$d</string>
     <string name="download_over_mobile_header">Να γίνει λήψη μέσω δικτύου κινητής τηλεφωνίας;</string>
     <string name="download_over_mobile_message">Αυτό μπορεί να είναι πολύ ακριβό για μερικά πακέτα ή στην περίπτωση roaming.</string>
     <string name="error_enter_correct_house_number">Εισαγάγετε έναν έγκυρο αριθμό κτιρίου</string>
@@ -491,7 +491,7 @@
     <string name="editor_category_unsuitable_title">Δεν μπορείτε να βρείτε την κατάλληλη κατηγορία;</string>
     <string name="editor_category_unsuitable_text">Οι CoMaps επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://www.comaps.app/support/advanced-map-editing/">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
     <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
-    <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να αναζητήσετε μια τοποθεσία και να χρησιμοποιήσετε την πλοήγησης χωρίς σύνδεση.</string>
+    <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να κάνετε αναζήτηση και να πλοηγηθείτε χωρίς σύνδεση</string>
     <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">χμ/ω</string>
@@ -499,7 +499,7 @@
     <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένου</string>
     <string name="placepage_personal_notes_hint">Προσωπικές σημειώσεις (κείμενο ή html)</string>
     <string name="editor_reset_edits_message">Απόρριψη όλων των τοπικών αλλαγών;</string>
-    <string name="editor_reset_edits_button">Απόρριψη</string>
+    <string name="editor_reset_edits_button">Απόρριψη αλλαγών</string>
     <string name="editor_remove_place_message">Διαγραφή της τοποθεσίας που προστέθηκε;</string>
     <string name="editor_remove_place_button">Διαγραφή</string>
     <string name="editor_place_doesnt_exist">Η τοποθεσία δεν υπάρχει</string>
@@ -825,4 +825,15 @@
     <string name="panoramax">εικόνα Panoramax</string>
     <string name="app_site_url">https://comaps.app/</string>
     <string name="saved">Αποθηκεύτηκε</string>
+    <string name="opens_at">Ανοίγει στις %s</string>
+    <string name="closes_at">Κλείνει στις %s</string>
+    <string name="opens_day_at">Ανοίγει στις %1$s στις %2$s</string>
+    <string name="closes_day_at">Κλείνει στις %1$s στις %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d λεπ</item>
+        <item quantity="other">%d λεπ</item>
+    </plurals>
+    <string name="hours_confirmed_time_ago">Επιβεβαιώθηκε %s</string>
+    <string name="existence_confirmed_time_ago">Ύπαρξη επιβεβαιώθηκε %s</string>
+    <string name="editor_building_levels">Όροφοι (με το ισόγειο, χωρίς την ταράτσα)</string>
 </resources>

android/app/src/main/res/values-es/strings.xml

@@ -392,7 +392,7 @@
     <string name="editor_time_delete">Eliminar horario</string>
     <!-- Text for allday switch. -->
     <string name="editor_time_allday">Todo el día (24 horas)</string>
-    <string name="editor_time_open">Abierto</string>
+    <string name="editor_time_open">Apertura</string>
     <string name="editor_time_close">Cierre</string>
     <string name="editor_time_add_closed">Añadir horas de pausa</string>
     <string name="editor_time_title">Horario de apertura</string>
@@ -505,7 +505,7 @@
     <string name="placepage_edit_bookmark_button">Editar marcador</string>
     <string name="placepage_personal_notes_hint">Notas personales (texto o html)</string>
     <string name="editor_reset_edits_message">¿Restablecer todos los cambios locales?</string>
-    <string name="editor_reset_edits_button">Restablecer</string>
+    <string name="editor_reset_edits_button">Descartar cambios</string>
     <string name="editor_remove_place_message">¿Eliminar el lugar añadido?</string>
     <string name="editor_remove_place_button">Eliminar</string>
     <string name="editor_place_doesnt_exist">El lugar no existe</string>
@@ -922,4 +922,9 @@
     <string name="prefs_speed_cameras_information">Las advertencias de radares de velocidad están deshabilitadas en países donde las alertas están prohibidas por ley.</string>
     <string name="navigation_start_tts_message">"Iniciando Navegación, idioma de las instrucciones por voz: "</string>
     <string name="navigation_start_tts_disabled_message">Instrucciones por voz deshabilitadas: Motor de TTS no disponible</string>
+    <string name="advanced">Avanzado</string>
+    <string name="download_resources_custom_url_title">Servidor de mapas personalizado</string>
+    <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string>
+    <string name="download_resources_custom_url_summary_none">No establecido</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL completo empezando con https:// y terminando con /</string>
 </resources>

android/app/src/main/res/values-et/strings.xml

@@ -497,7 +497,7 @@
     <string name="placepage_edit_bookmark_button">Muuda järjehoidjat</string>
     <string name="placepage_personal_notes_hint">Isiklikud märkmed (tekst või html)</string>
     <string name="editor_reset_edits_message">Kas loobud kõigist kohalikest muudatustest?</string>
-    <string name="editor_reset_edits_button">Loobu</string>
+    <string name="editor_reset_edits_button">Loobu muudatustest</string>
     <string name="editor_remove_place_message">Kas kustutad lisatud koha?</string>
     <string name="editor_remove_place_button">Kustuta</string>
     <string name="editor_place_doesnt_exist">Kohta pole olemas</string>
@@ -911,4 +911,9 @@
     <string name="place_page_update_too_old_map">Uuenda piirkonna kaardiandmeid</string>
     <string name="place_page_too_old_to_edit">Kuna kaardiandmed on liiga vanad, siis OpenStreetMapi muutmise võimalus on lülitatud välja.</string>
     <string name="navigation_start_tts_disabled_message">Hääljuhiste kasutamine on lülitatud välja: kõnesünteesimootorit pole saadaval</string>
+    <string name="download_resources_custom_url_summary_none">Pole määratud</string>
+    <string name="advanced">Täiendavad seadistused</string>
+    <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
+    <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
+    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
 </resources>

android/app/src/main/res/values-fa/strings.xml

@@ -245,16 +245,16 @@
     <string name="downloader_near_me_subtitle">نزدیک من</string>
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">نقشه‌ها</string>
-    <string name="downloader_download_all_button">دانلود همه</string>
-    <string name="downloader_downloading">درحال دانلود:</string>
+    <string name="downloader_download_all_button">بارگیری همه</string>
+    <string name="downloader_downloading">بارگیری می‌شود:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
     <string name="downloader_delete_map_while_routing_dialog">برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند.</string>
     <!-- Context menu item for downloader. -->
-    <string name="downloader_download_map">دانلود نقشه</string>
+    <string name="downloader_download_map">بارگیری نقشه</string>
     <!-- Item status in downloader. -->
-    <string name="downloader_retry">تلاش مجدد</string>
+    <string name="downloader_retry">تلاش دوباره</string>
     <!-- Item in context menu. -->
     <string name="downloader_delete_map">حذف نقشه</string>
     <!-- Item in context menu. -->
@@ -294,11 +294,11 @@
     <!-- deep purple color -->
     <string name="deep_purple">ارغوانی سیر</string>
     <!-- light blue color -->
-    <string name="light_blue">آبی کمرنگ</string>
+    <string name="light_blue">آبی کم‌رنگ</string>
     <!-- cyan color -->
     <string name="cyan">فیروزه‌ای</string>
     <!-- teal color -->
-    <string name="teal">آبی سیر</string>
+    <string name="teal">سبز دودی</string>
     <!-- lime color -->
     <string name="lime">زرد لیمویی</string>
     <!-- deep orange color -->
@@ -330,7 +330,7 @@
     <string name="dialog_routing_select_closer_end">لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید</string>
     <string name="dialog_routing_change_intermediate">ناتوان در تعیین نقطه میانی</string>
     <string name="dialog_routing_intermediate_not_determined">لطفا نقطه میانی را تنظیم کنید</string>
-    <string name="dialog_routing_system_error">خطای سیستم</string>
+    <string name="dialog_routing_system_error">ایرنگ سامانه</string>
     <string name="dialog_routing_application_error">ناتوان در ایجاد مسیر به علت خطای برنامه</string>
     <string name="dialog_routing_try_again">لطفا دوباره تلاش کنید</string>
     <string name="not_now">اکنون خیر</string>
@@ -342,7 +342,7 @@
     <!-- «Show» context menu -->
     <string name="show">نمایش</string>
     <!-- «Hide» context menu -->
-    <string name="hide">مخفی کردن</string>
+    <string name="hide">پنهان کردن</string>
     <string name="categories">دسته‌بندی‌ها</string>
     <string name="history">تاریخچه</string>
     <string name="search_not_found">متاسفانه چیزی پیدا نشد</string>

android/app/src/main/res/values-fi/strings.xml

@@ -504,7 +504,7 @@
     <string name="placepage_edit_bookmark_button">Muokkaa kirjanmerkkiä</string>
     <string name="placepage_personal_notes_hint">Henkilökohtaiset merkinnät (teksti tai html)</string>
     <string name="editor_reset_edits_message">Nollataanko kaikki paikalliset muutokset?</string>
-    <string name="editor_reset_edits_button">Nollaa</string>
+    <string name="editor_reset_edits_button">Hylkää muutokset</string>
     <string name="editor_remove_place_message">Poistetaanko lisätty paikka?</string>
     <string name="editor_remove_place_button">Poista</string>
     <string name="editor_place_doesnt_exist">Paikkaa ei ole olemassa</string>
@@ -815,7 +815,7 @@
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Automaattinen navigointi</string>
     <string name="level_value_generic">Kerros: %s</string>
-    <string name="share_bookmarks_email_body">Hei! \n\nLiitteenä ovat kirjamerkkini; Avaa ne CoMaps -sovelluksessa. Mikäli sinulla ei ole vielä sovellusta asennettuna, voit ladata sen osoitteesta: https://www.comaps.app/download/ \n\nNauti matkustamisesta CoMaps:n kanssa!</string>
+    <string name="share_bookmarks_email_body">Hei!\n\nLiitteenä kirjanmerkkini. Avaa ne CoMaps-sovelluksella. Jos sinulla ei ole vielä sovellusta, voit ladata sen osoitteesta: https://www.comaps.app/download/\n\nNauti matkustamisesta CoMapsin kanssa!</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/fi/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
@@ -911,4 +911,11 @@
     <string name="prefs_speed_cameras_information">Nopeuskameravaroitukset on poistettu käytöstä niissä maissa, missä varoitukset on kielletty lain nojalla.</string>
     <string name="power_management">Virranhallinta</string>
     <string name="navigation_start_tts_message">"Käynnistetään navigointi, ääniohjeistuksen kieli: "</string>
+    <string name="advanced">Lisäasetukset</string>
+    <string name="download_resources_custom_url_title">Mukautettu karttapalvelin</string>
+    <string name="download_resources_custom_url_summary_none">Ei asetettu</string>
+    <string name="download_resources_custom_url_error_scheme">Kirjoita täysi URL-osoite alkaeh https:// ja päättyen /</string>
+    <string name="download_resources_custom_url_message">Ohita karttalatausten oletuspalvelin. Jätä tyhjäksi käyttääksesi CoMapsin oletuspalvelinta.</string>
+    <string name="navigation_start_tts_disabled_message">Ääniohjeistukset pois käytöstä: TTS-moottori ei saatavilla</string>
+    <string name="charge_socket_schuko">EU</string>
 </resources>

android/app/src/main/res/values-fr/strings.xml

@@ -506,7 +506,7 @@
     <string name="placepage_edit_bookmark_button">Modifier le signet</string>
     <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
     <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
-    <string name="editor_reset_edits_button">Ignorer</string>
+    <string name="editor_reset_edits_button">Annuler les modifications</string>
     <string name="editor_remove_place_message">Supprimer le lieu ajouté ?</string>
     <string name="editor_remove_place_button">Supprimer</string>
     <string name="editor_place_doesnt_exist">Ce lieu n’existe pas</string>
@@ -921,4 +921,9 @@
     <string name="prefs_speed_cameras_information">Les avertissements relatifs aux radars de vitesse sont désactivés dans les pays où les alertes sont interdites par la législation locale.</string>
     <string name="navigation_start_tts_message">"Navigation de démarrage, langue des instructions vocales : "</string>
     <string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string>
+    <string name="advanced">Avancé</string>
+    <string name="download_resources_custom_url_summary_none">Non défini</string>
+    <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
+    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string>
+    <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
 </resources>

android/app/src/main/res/values-it/strings.xml

@@ -498,7 +498,7 @@
     <string name="placepage_edit_bookmark_button">Modifica luogo preferito</string>
     <string name="placepage_personal_notes_hint">Note personali (testo o html)</string>
     <string name="editor_reset_edits_message">Cancellare tutte le modifiche locali?</string>
-    <string name="editor_reset_edits_button">Cancella</string>
+    <string name="editor_reset_edits_button">Scarta modifiche</string>
     <string name="editor_remove_place_message">Eliminare il luogo aggiunto?</string>
     <string name="editor_remove_place_button">Elimina</string>
     <string name="editor_place_doesnt_exist">Il luogo non esiste</string>
@@ -906,4 +906,9 @@
     <string name="navigation_start_tts_disabled_message">Istruzioni vocali disabilitate: TTS non disponibile</string>
     <string name="prefs_speed_cameras_information">Gli avvisi di Autovelox sono disabilitati dove proibito dalla legge locale.</string>
     <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
+    <string name="download_resources_custom_url_error_scheme">Aggiungere un URL che inizia con https:// e finisce con /</string>
+    <string name="download_resources_custom_url_summary_none">Non impostato</string>
+    <string name="download_resources_custom_url_message">Sovrascrivi il server da cui scaricare le mappe. Lascia vuoto per usare i server default di CoMaps.</string>
+    <string name="download_resources_custom_url_title">Server mappe personalizzato</string>
+    <string name="advanced">Avanzate</string>
 </resources>

android/app/src/main/res/values-kk/strings.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

android/app/src/main/res/values-lt/strings.xml

@@ -491,7 +491,7 @@
     <string name="placepage_edit_bookmark_button">Taisyti žymę</string>
     <string name="placepage_personal_notes_hint">Asmeninės pastabos (tekstas arba HTML)</string>
     <string name="editor_reset_edits_message">Anuliuoti visus vietinius pakeitimus?</string>
-    <string name="editor_reset_edits_button">Anuliuoti</string>
+    <string name="editor_reset_edits_button">Atsisakyti pakeitimų</string>
     <string name="editor_remove_place_message">Šalinti pridėtą vietą?</string>
     <string name="editor_remove_place_button">Šalinti</string>
     <string name="editor_place_doesnt_exist">Ši vieta neegzistuoja</string>
@@ -804,7 +804,7 @@
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="panoramax">Panoramax vaizdas</string>
-    <string name="saved">Išsaugota</string>
+    <string name="saved">Įrašyta</string>
     <string name="ruler">Liniuotė</string>
     <string name="pref_left_button_title">Kairiojo mygtuko funkcija</string>
     <string name="pref_backup_now_summary_empty_lists">Neturite jokių žymių ar trasų atsarginei kopijai sudaryti</string>
@@ -818,7 +818,7 @@
     <string name="error_enter_correct_level">Įveskite leistiną aukšto numerį</string>
     <string name="error_enter_correct_bluesky_page">Įveskite galiojantį „Bluesky“ paskyros vardą ar tinklalapio adresą</string>
     <string name="error_enter_correct_fediverse_page">Įveskite galiojantį „Mastodon“ paskyros vardą ar tinklalapio adresą</string>
-    <string name="pref_left_button_disable">Mygtukas nerodomas</string>
+    <string name="pref_left_button_disable">Mygtuko nerodyti</string>
     <string name="pref_backup_summary">Automatinis atsarginių kopijų rašymas į pasirinktą aplanką</string>
     <string name="pref_backup_now_title">Įrašyti dabar</string>
     <string name="pref_backup_now_summary_progress">Atsarginė kopija įrašoma…</string>
@@ -888,4 +888,17 @@
     <string name="power_management">Energijos naudojimas</string>
     <string name="charge_socket_schuko">Buitinis ES</string>
     <string name="list_description_empty">Paredaguokite sąrašą ir pridėkite aprašymą</string>
+    <string name="place_page_map_too_old_title">Žemėlapio duomenys pasenę</string>
+    <string name="place_page_map_too_old_description">Jūsų naudojami žemėlapio duomenys senstelėję, prašom atnaujinti žemėlapį.</string>
+    <string name="place_page_app_too_old_description">Jūsų naudojami žemėlapio duomenys stipriai pasenę, prašom atnaujinti „CoMaps“ programą.</string>
+    <string name="place_page_update_too_old_map">Atnaujinti regiono žemėlapį</string>
+    <string name="place_page_too_old_to_edit">„OpenStreetMap“ žemėlapio redagavimas negalimas, nes žemėlapio duomenys per seni.</string>
+    <string name="prefs_speed_cameras_information">Įspėjimai apie greičio matuoklius negalimi šalyse, kuriose tai draudžiama įstatymu.</string>
+    <string name="navigation_start_tts_message">"Pradedama navigacija, balso instrukcijų kalba: "</string>
+    <string name="navigation_start_tts_disabled_message">Balso instrukcijos išjungtos: šnekos sintezės sistema neprieinama</string>
+    <string name="advanced">Kita</string>
+    <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
+    <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
+    <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
+    <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
 </resources>

android/app/src/main/res/values-lv/strings.xml

@@ -499,7 +499,7 @@
     <string name="placepage_edit_bookmark_button">Rediģēt grāmatzīmi</string>
     <string name="placepage_personal_notes_hint">Personīgi pieraksti (teksts vai HTML)</string>
     <string name="editor_reset_edits_message">Vai izmest visas lokāli saglabātās izmaiņas?</string>
-    <string name="editor_reset_edits_button">Noraidīt</string>
+    <string name="editor_reset_edits_button">Atmest izmaiņas</string>
     <string name="editor_remove_place_message">Vai dzēst pievienoto vietu?</string>
     <string name="editor_remove_place_button">Dzēst</string>
     <string name="editor_place_doesnt_exist">Vieta nepastāv</string>
@@ -851,4 +851,14 @@
     <string name="place_page_update_too_old_map">Atjaunināt karšu apgabalu</string>
     <string name="place_page_too_old_to_edit">OpenStreetMap labošana ir atspējota, jo kartes dati ir pārāk veci.</string>
     <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
+    <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
+    <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
+    <string name="download_resources_custom_url_summary_none">Nav iestatīts</string>
+    <string name="download_resources_custom_url_error_scheme">Lūgums ievadīt pilnu URL, kas sākas ar https:// un beidzas ar /</string>
+    <string name="advanced">Iestatījumi: izvērsta kopa</string>
+    <plurals name="minutes_short">
+        <item quantity="zero">%d min.</item>
+        <item quantity="one">%d min.</item>
+        <item quantity="other">%d min.</item>
+    </plurals>
 </resources>

android/app/src/main/res/values-nb/strings.xml

@@ -732,7 +732,7 @@
     <!-- App tip #01 -->
     <string name="app_tip_01">Med dine donasjoner og støtte kan vi lage de beste kartene i verden!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du det ikke ennå? Gi oss beskjed, så fikser vi det!</string>
+    <string name="app_tip_02">Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du den ikke ennå? La oss få vite hvorfor, så fikser vi det!</string>
     <!-- App tip #03 -->
     <string name="app_tip_03">Hvis du kjenner en programvareutvikler, kan du be ham eller henne implementere en funksjon du trenger.</string>
     <!-- App tip #04 -->
@@ -746,7 +746,7 @@
     <!-- App tip #08 -->
     <string name="app_tip_08">Du kan enkelt fikse og forbedre kartdataene.</string>
     <!-- App tip #09 -->
-    <string name="app_tip_09">Vårt hovedmål er å bygge raske, personvernfokuserte, brukervennlige kart som du vil elske.</string>
+    <string name="app_tip_09">Vårt hovedmål er å lage raske, personvernfokuserte, brukervennlige kart som du vil like.</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 bruker nå CoMaps på telefonskjermen</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
@@ -909,7 +909,6 @@
     <string name="advanced">Avansert</string>
     <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
     <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
     <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
     <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
 </resources>

android/app/src/main/res/values-night/themes.xml

@@ -84,10 +84,10 @@
     <item name="transitRulerBackground">@color/white_4</item>
     <item name="transitStepDivider">@drawable/dot_divider</item>
     <item name="accentColorSelector">@color/accent_color_selector</item>
-    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:textAppearanceSmall">@style/MwmTextAppearance.Body4</item>
+    <item name="android:textAppearanceMedium">@style/MwmTextAppearance.Body2</item>
+    <item name="android:textAppearanceLarge">@style/MwmTextAppearance.Body1</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/white_secondary</item>
@@ -150,6 +150,8 @@
     <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+
+    <item name="appBackground">?android:attr/colorBackground</item>
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

android/app/src/main/res/values-nl/strings.xml

@@ -501,7 +501,7 @@
     <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
     <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
     <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
-    <string name="editor_reset_edits_button">Gooi weg</string>
+    <string name="editor_reset_edits_button">Wijzigingen weggooien</string>
     <string name="editor_remove_place_message">Toegevoegde locatie verwijderen?</string>
     <string name="editor_remove_place_button">Verwijder</string>
     <string name="editor_place_doesnt_exist">Locatie bestaat niet</string>
@@ -915,4 +915,9 @@
     <string name="place_page_app_too_old_description">Uw huidige kaartgegevens zijn erg oud. Update de CoMaps-app.</string>
     <string name="place_page_update_too_old_map">Kaart regio bijwerken</string>
     <string name="place_page_too_old_to_edit">Het bewerken van OpenStreetMap is uitgeschakeld omdat de kaartgegevens te oud zijn.</string>
+    <string name="advanced">Geavanceerd</string>
+    <string name="download_resources_custom_url_title">Aangepaste server voor kaarten</string>
+    <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
+    <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
+    <string name="download_resources_custom_url_error_scheme">Voer een volledige URL in, beginnend met https:// en eindigend met /</string>
 </resources>