Removing maxspeed estimate from generator

Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>

.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.

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/full-description.txt

@@ -1,6 +1,6 @@
 Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.
 
-Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
+Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b> (auf Englisch).
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
@@ -9,9 +9,9 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
 ‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
 ‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
-‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
+‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig viel Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, diese App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source.</b>
 
 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 
-<b>Entdecke die Unabhängigkeit</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+<b>Freiheit beginnt hier</b>
+Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!

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

@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt

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/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/de-DE/full-description.txt

@@ -3,7 +3,7 @@ Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf Op
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
-• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website
+• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap-Webseite
 
 <i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>
 
@@ -12,7 +12,7 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Datenschutz ist uns wichtig!</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source.</b>
 
 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -24,13 +24,13 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Lesezeichen mit einem einzigen Tippen speichern
 • Offline verfügbare Wikipedia-Artikel
 • U- und S-Bahn-Netze
-• Aufzeichnen von GPS Tracks
+• Aufzeichnen von GPS-Tracks
 • Import und Export von Favoriten und Routen im KML-, KMZ- oder GPX-Format
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 • Unterstützung für Android Auto
 
-Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>
+Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app/de/</i></b>
 
-<b>Entdecke die Unabhängigkeit</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+<b>Freiheit beginnt hier</b>
+Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!

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

@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt

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/BookmarkCategoriesFragment.java

@@ -197,8 +197,10 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
       items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
-      items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
-                                        () -> onDeleteActionSelected(mSelectedCategory)));
+      // Disallow deleting the last category
+      if (getAdapter().getBookmarkCategories().size() > 1)
+        items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
+                                          () -> onDeleteActionSelected(mSelectedCategory)));
     }
     return items;
   }
@@ -295,24 +297,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 
   private void onDeleteActionSelected(@NonNull BookmarkCategory category)
   {
-    // Disallow deleting the last category
-    if ((getAdapter().getBookmarkCategories().size() > 1))
-    {
-        BookmarkManager.INSTANCE.deleteCategory(category.getId());
-        getAdapter().notifyDataSetChanged();
-    }
-    else
-    {
-        new MaterialAlertDialogBuilder(requireActivity())
-                .setMessage(R.string.unable_to_delete_list)
-                .setPositiveButton(android.R.string.yes, ((dialog, which) -> {
-                    onAddButtonClick();
-                    BookmarkManager.INSTANCE.deleteCategory(category.getId());
-                    getAdapter().notifyDataSetChanged();
-                }))
-                .setNegativeButton(android.R.string.no,(dialog, which) -> dialog.dismiss())
-                .show();
-    }
+    BookmarkManager.INSTANCE.deleteCategory(category.getId());
+    getAdapter().notifyDataSetChanged();
   }
 
   private void onSettingsActionSelected(@NonNull BookmarkCategory category)

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()));
       }
     });
 

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_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_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

@@ -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_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/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/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-bn/strings.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="back">পিছনে</string>
-    <string name="download_maps">ডাউনলোডকৃত মানচিত্র</string>
-    <string name="delete">মুছো</string>
+    <string name="download_maps">মানচিত্র ডাউনলোড করুন</string>
+    <string name="delete">মুছুন</string>
     <string name="cancel">বাতিল</string>
     <string name="miles">মাইল</string>
     <string name="later">পরে</string>
     <string name="search">খুঁজুন</string>
-    <string name="download_has_failed">ডাউনলোড ব্যর্থ। আবার চেষ্টা করতে টিপ দাও।</string>
+    <string name="download_has_failed">ডাউনলোড ব্যর্থ হয়েছে, আবার চেষ্টা করতে টিপ দিন</string>
     <string name="search_map">ম্যাপ অনুসন্ধান</string>
     <string name="kilometres">কিলোমিটার</string>
     <string name="downloading">ডাউনলোডরত…</string>
@@ -303,4 +303,16 @@
     <string name="editor_report_problem_other_title">আলাদা সমস্যা</string>
     <string name="osm_presentation">কমিউনিটি দ্বারা তৈরি ওপেনস্ট্রিটম্যাপ ডেটা টি %s তারিখ অব্দি সাম্পতিক। মানচিত্রটি সম্পাদনা এবং আপডেট করার সম্পর্কে আরও জানুন OpenStreetMap.org-এ</string>
     <string name="editor_edit_place_category_title">শ্রেণি</string>
+    <string name="opens_at">%s এ খুলবে</string>
+    <string name="closes_at">%s এ বন্ধ হবে</string>
+    <string name="downloader_of">%2$d এর মধ্যে %1$d</string>
+    <string name="error_enter_correct_house_number">সঠিক বিল্ডিং নম্বর দিন</string>
+    <string name="editor_more_about_osm">আরো OpenStreetMap সম্বন্ধে</string>
+    <string name="downloader_no_downloaded_maps_title">আপনি কোনো মানচিত্র ডাউনলোড করেননি</string>
+    <string name="current_location_unknown_error_title">বর্তমান অবস্থান অজানা</string>
+    <string name="editor_place_doesnt_exist">স্থানটি অস্তিত্বই নেই</string>
+    <string name="error_enter_correct_phone">সঠিক ফোন নম্বর দিন</string>
+    <string name="error_enter_correct_web">সঠিক ওয়েব এড্রেস দিন</string>
+    <string name="error_enter_correct_email">সঠিক ইমেইল দিন</string>
+    <string name="placepage_add_place_button">OpenStreetMap এ স্থান যোগ করুন</string>
 </resources>

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

@@ -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 -->
@@ -23,11 +23,11 @@
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">Auf der Karte suchen</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
+    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktiviere diese in den Einstellungen.</string>
     <!-- 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 du die App verwendest, lade 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. \nDu kannst 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 aus der CoMaps-App. Du kannst sie in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie unter https://www.comaps.app/de/download/ herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
     <!-- 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 Du hast CoMaps nicht installiert? Lade die App hier herunter: 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,9 +179,9 @@
     <!-- 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>
+    <string name="copied_to_clipboard">Kopiert in der Zwischenablage: %s</string>
     <!-- Used for bookmark editing -->
     <string name="done">Fertig</string>
     <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
@@ -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 -->
@@ -236,11 +236,11 @@
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
     <!-- Text in menu -->
-    <string name="rate_the_app">Bewerten Sie die App</string>
+    <string name="rate_the_app">Bewerte die App</string>
     <!-- Text in menu -->
     <string name="help">Hilfe</string>
     <!-- Button in the main Help dialog -->
-    <string name="faq">Häufige Fragen und Antworten</string>
+    <string name="faq">Häufige Fragen und Antworten (FAQ)</string>
     <!-- Button in the main menu -->
     <string name="donate">Spenden</string>
     <!-- Button in the main Help dialog -->
@@ -254,9 +254,9 @@
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
     <string name="compass_calibration_required">Bewegen Sie das Telefon in einer Achterbewegung, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
-    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche zu sehen</string>
+    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche wiederzusehen</string>
     <!-- Update all button text -->
-    <string name="downloader_update_all_button">Alle aktualisieren</string>
+    <string name="downloader_update_all_button">Alle Karten aktualisieren</string>
     <!-- Cancel all button text -->
     <string name="downloader_cancel_all">Alle abbrechen</string>
     <!-- Downloaded maps list header -->
@@ -329,23 +329,23 @@
     <!-- blue gray color -->
     <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_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_title">Wenn du der Route folgst, beachte bitte:</string>
+    <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
+    <string name="dialog_routing_disclaimer_precision">— Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
     <string name="dialog_routing_disclaimer_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>
-    <string name="dialog_routing_disclaimer_beware">Bitte fahren Sie aufmerksam und sicher!</string>
+    <string name="dialog_routing_disclaimer_beware">Bitte fahre aufmerksam und sicher!</string>
     <string name="dialog_routing_check_gps">GPS-Signal prüfen</string>
     <string name="dialog_routing_error_location_not_found">Route kann nicht erstellt werden. Aktuelle GPS-Koordinaten konnten nicht ermittelt werden.</string>
-    <string name="dialog_routing_location_turn_wifi">Bitte prüfen Sie Ihr GPS-Signal. WLAN verbessert Ihre Standortgenauigkeit.</string>
+    <string name="dialog_routing_location_turn_wifi">Bitte prüfe dein GPS-Signal. Aktiviertes W-LAN verbessert deine Standortgenauigkeit.</string>
     <string name="dialog_routing_location_turn_on">Standortdienste aktivieren</string>
-    <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktivieren Sie Standortdienste, um die Route zu berechnen.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktiviere die Standortdienste, um die Route zu berechnen.</string>
     <string name="dialog_routing_unable_locate_route">Route kann nicht ermittelt werden</string>
     <string name="dialog_routing_cant_build_route">Route konnte nicht erstellt werden</string>
-    <string name="dialog_routing_change_start_or_end">Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an.</string>
+    <string name="dialog_routing_change_start_or_end">Bitte passe deinen Startpunkt oder Ziel an.</string>
     <string name="dialog_routing_change_start">Startpunkt anpassen</string>
     <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt konnte nicht gefunden werden.</string>
-    <string name="dialog_routing_select_closer_start">Bitte wählen Sie einen Startpunkt, der näher an einer Straße liegt.</string>
+    <string name="dialog_routing_select_closer_start">Bitte wähle einen Startpunkt, der näher an einer Straße liegt.</string>
     <string name="dialog_routing_change_end">Ziel anpassen</string>
     <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel konnte nicht gefunden werden.</string>
     <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher an einer Straße</string>
@@ -353,10 +353,10 @@
     <string name="dialog_routing_intermediate_not_determined">Bitte passen Sie Ihren Zwischenstopp an</string>
     <string name="dialog_routing_system_error">Systemfehler</string>
     <string name="dialog_routing_application_error">Wegen eines Anwendungsfehlers konnte keine Route erstellt werden</string>
-    <string name="dialog_routing_try_again">Bitte versuchen Sie es erneut</string>
+    <string name="dialog_routing_try_again">Bitte versuche es erneut</string>
     <string name="not_now">Nicht jetzt</string>
-    <string name="dialog_routing_download_and_build_cross_route">Möchten Sie die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
-    <string name="dialog_routing_download_cross_route">Laden Sie zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
+    <string name="dialog_routing_download_and_build_cross_route">Möchtest du die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
+    <string name="dialog_routing_download_cross_route">Lade zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
     <!-- SECTION: Strings for downloading map from search -->
     <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, laden Sie bitte die Karte herunter. Sie benötigen danach keine Internetverbindung mehr.</string>
     <string name="search_select_map">Karte auswählen</string>
@@ -368,16 +368,16 @@
     <string name="history">Verlauf</string>
     <string name="search_not_found">Uups, kein Ergebnis gefunden</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Laden Sie die Region herunter, in der Sie suchen, oder fügen Sie den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
+    <string name="search_not_found_query">Lade die Region herunter, in der du suchst, oder füge den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
     <string name="search_history_title">Suchverlauf</string>
     <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
     <string name="clear_search">Suchverlauf löschen</string>
-    <string name="p2p_your_location">Ihr Standort</string>
+    <string name="p2p_your_location">Dein Standort</string>
     <string name="p2p_start">Start</string>
-    <string name="p2p_from_here">Von</string>
-    <string name="p2p_to_here">Nach</string>
+    <string name="p2p_from_here">Route von</string>
+    <string name="p2p_to_here">Route nach</string>
     <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
-    <string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
+    <string name="p2p_reroute_from_current">Soll eine Route von deinem aktuellen Standort aus berechnet werden?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Weiter</string>
     <!-- Tab title in the Edit Opening Hours time picker -->
@@ -395,17 +395,17 @@
     <string name="editor_time_advanced">Erweiterter Modus</string>
     <string name="editor_time_simple">Einfacher Modus</string>
     <string name="editor_hours_closed">Schließzeiten</string>
-    <string name="editor_example_values">Beispiele</string>
+    <string name="editor_example_values">Beispielwerte</string>
     <string name="editor_correct_mistake">Fehler korrigieren</string>
     <string name="editor_add_select_location">Standort auswählen</string>
     <string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
-    <string name="editor_report_problem_desription_2">Oder korrigieren Sie es selbst auf https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_desription_2">Oder korrigiere es selbst auf https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Senden</string>
     <string name="editor_report_problem_title">Problem</string>
     <string name="editor_report_problem_no_place_title">Dieser Ort existiert nicht</string>
     <string name="editor_report_problem_under_construction_title">Wegen Bauarbeiten geschlossen</string>
     <string name="editor_report_problem_duplicate_place_title">Doppelt vorhanderer Ort</string>
-    <string name="autodownload">Karten automatisch herunterladen</string>
+    <string name="autodownload">Automatisch herunterladen</string>
     <!-- Place Page opening hours text -->
     <string name="daily">Täglich</string>
     <string name="twentyfour_seven">24/7</string>
@@ -427,7 +427,7 @@
     <string name="street">Straße</string>
     <!-- Editable House Number text field (in address block). -->
     <string name="house_number">Hausnummer</string>
-    <string name="details">Details</string>
+    <string name="details">Einzelheiten</string>
     <string name="social_media">Social Media</string>
     <string name="building">Gebäude</string>
     <!-- Text field to enter non-existing street name, below list of known streets around -->
@@ -480,7 +480,7 @@
     <!-- Hint of the input field in the OSM note section of the editor -->
     <string name="editor_note_hint">Beschreiben Sie Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
     <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Ihre Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte tragen Sie keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
+    <string name="editor_about_osm">Deine Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte trage keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
     <string name="editor_more_about_osm">Mehr Informationen über OpenStreetMap</string>
     <string name="editor_osm_history">Ihr Bearbeitungsverlauf</string>
     <string name="editor_osm_notes">Ihre Hinweise zu den Kartendaten</string>
@@ -488,7 +488,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Betreiber: %s</string>
     <string name="editor_category_unsuitable_title">Keine passende Kategorie gefunden?</string>
-    <string name="editor_category_unsuitable_text">Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
+    <string name="editor_category_unsuitable_text">Mit CoMaps kannst du nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden (auf Englisch)</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
     <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
     <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter</string>
     <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt</string>
@@ -543,11 +543,11 @@
     <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>
-    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können</string>
+    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme (TTS; zu deutsch: Text-zu-Sprache) für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das du bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren kannst</string>
     <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
     <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
     <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
@@ -871,9 +871,9 @@
     <string name="hours_confirmed_time_ago">Bestätigt %s</string>
     <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache-Modul gefunden, überprüfe die App-Einstellungen</string>
     <string name="avoid_steps">Treppen vermeiden</string>
-    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
+    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht, um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
     <string name="offline_explanation_title">Offline-Karten</string>
-    <string name="offline_explanation_text">Um die Gegend anzusehen, 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:// oder http:// anfängt</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

@@ -915,6 +915,5 @@
     <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_hint">https://cdn-fi-1.comaps.app/</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 commençant par http:// ou https://</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>
@@ -853,4 +853,12 @@
     <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

@@ -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>

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

@@ -165,7 +165,7 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Nie określono jeszcze aktualnego położenia</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.</string>
+    <string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Trwa pobieranie mapy</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. -->
@@ -918,4 +918,16 @@
     <string name="prefs_speed_cameras_information">Ostrzeżenia o fotoradarach są wyłączone w krajach, gdzie takie alerty są zabronione prawnie.</string>
     <string name="navigation_start_tts_message">"Startowanie nawigacji, język komunikatów głosowych: "</string>
     <string name="navigation_start_tts_disabled_message">Komunikaty głosowe są wyłączone: silnik TTS jest niedostępny</string>
+    <string name="download_resources_custom_url_title">Własny serwer map</string>
+    <string name="download_resources_custom_url_message">Zastąp domyślny serwer pobierania map. Zostaw puste, by użyć domyślnego serwera CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Nieustawiony</string>
+    <string name="download_resources_custom_url_error_scheme">Proszę wprowadzić pełny URL zaczynający się od https:// i kończący na /</string>
+    <string name="editor_business_vacant_button">Lokal jest pusty</string>
+    <string name="editor_mark_business_vacant_title">Oznacz lokal jako pusty</string>
+    <string name="place_page_map_too_old_title">Dane mapy nieaktualne</string>
+    <string name="place_page_map_too_old_description">Twoje dane mapy są nieaktualne, proszę zaktualizować mapę.</string>
+    <string name="place_page_app_too_old_description">Twoje dane mapy są nieaktualne, proszę zaktualizować mapę oraz aplikację CoMaps.</string>
+    <string name="place_page_update_too_old_map">Zaktualizuj region mapy</string>
+    <string name="place_page_too_old_to_edit">Edytowanie OpenStreetMap jest wyłączone, ponieważ dane mapy są zbyt stare.</string>
+    <string name="advanced">Zaawansowane</string>
 </resources>

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -448,7 +448,7 @@
     <string name="placepage_edit_bookmark_button">Editar favorito</string>
     <string name="placepage_personal_notes_hint">Anotações pessoais (texto ou html)</string>
     <string name="editor_reset_edits_message">Descartar todas as modificações locais?</string>
-    <string name="editor_reset_edits_button">Descartar</string>
+    <string name="editor_reset_edits_button">Descartar alterações</string>
     <string name="editor_remove_place_message">Remover local adicionado?</string>
     <string name="editor_remove_place_button">Remover</string>
     <string name="editor_place_doesnt_exist">O lugar não existe</string>
@@ -893,4 +893,9 @@
     <string name="prefs_speed_cameras_information">Alertas de radar fotográfico de velocidade estão desativados em países onde os alertas são proibidos pelas leis locais.</string>
     <string name="navigation_start_tts_message">"Iniciando navegação, idioma da instrução por voz: "</string>
     <string name="navigation_start_tts_disabled_message">Instrução por voz desativada: nenhum motor de texto para voz disponível</string>
+    <string name="advanced">Avançadas</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapas Personalizado</string>
+    <string name="download_resources_custom_url_message">Substitua o servidor padrão usado para baixar mapas. Deixe em branco para usar o servidor padrão do CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Não definido</string>
+    <string name="download_resources_custom_url_error_scheme">Insira um URL completo começando com https:// e terminando com /</string>
 </resources>

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

@@ -494,7 +494,7 @@
     <string name="placepage_edit_bookmark_button">Editar favorito</string>
     <string name="placepage_personal_notes_hint">Notas pessoais (texto ou html)</string>
     <string name="editor_reset_edits_message">Eliminar todas as alterações locais?</string>
-    <string name="editor_reset_edits_button">Eliminar</string>
+    <string name="editor_reset_edits_button">Descartar alterações</string>
     <string name="editor_remove_place_message">Eliminar o local adicionado?</string>
     <string name="editor_remove_place_button">Eliminar</string>
     <string name="editor_place_doesnt_exist">O local não existe</string>
@@ -912,7 +912,6 @@
     <string name="advanced">Avançadas</string>
     <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
     <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
     <string name="download_resources_custom_url_summary_none">Indefinido</string>
     <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
 </resources>

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

@@ -457,7 +457,7 @@
     <string name="editor_report_problem_other_title">Altă problemă</string>
     <string name="message_invalid_feature_position">Niciun obiect nu poate fi poziționat aici</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
-    <string name="osm_presentation">Date OpenStreetMap create de comunitate la data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
+    <string name="osm_presentation">Date OpenStreetMap create de comunitate din data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume. \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!</string>
     <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume</string>
@@ -497,7 +497,7 @@
     <string name="placepage_edit_bookmark_button">Modifică locul preferat</string>
     <string name="placepage_personal_notes_hint">Însemnări personale (text sau html)</string>
     <string name="editor_reset_edits_message">Ștergi toate modificările locale?</string>
-    <string name="editor_reset_edits_button">Renunță</string>
+    <string name="editor_reset_edits_button">Renunță la modificări</string>
     <string name="editor_remove_place_message">Elimini locul adăugat?</string>
     <string name="editor_remove_place_button">Elimină</string>
     <string name="editor_place_doesnt_exist">Locul nu există</string>
@@ -892,10 +892,15 @@
     <string name="place_page_map_too_old_title">Harta este prea veche</string>
     <string name="place_page_map_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați-o.</string>
     <string name="place_page_app_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați CoMaps.</string>
-    <string name="place_page_update_too_old_map">Actualizează harta</string>
+    <string name="place_page_update_too_old_map">Actualizează regiunea</string>
     <string name="place_page_too_old_to_edit">Editarea OpenStreetMap este dezactivată pentru că harta descărcată este prea veche.</string>
     <string name="prefs_speed_cameras_information">Avertizările pentru radare sunt dezactivate unde avertizarea este interzisă de legea locală.</string>
     <string name="navigation_start_tts_disabled_message">Instrucțiuni vocale dezactivate: Nu este disponibil niciun sistem TTS</string>
     <string name="charge_socket_count">Număr</string>
     <string name="unknown_count">Necunoscut</string>
+    <string name="download_resources_custom_url_error_scheme">Introduceți o adresă completă care începe cu https:// și se termină cu /</string>
+    <string name="download_resources_custom_url_summary_none">Nesetat</string>
+    <string name="download_resources_custom_url_title">Server hărți custom</string>
+    <string name="download_resources_custom_url_message">Înlocuiți serverul prestabilit folosit pentru descărcarea hărților. Lăsați liber pentru serverul prestabilit.</string>
+    <string name="advanced">Avansate</string>
 </resources>

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

@@ -507,7 +507,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>

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

@@ -328,7 +328,7 @@
     <string name="placepage_edit_bookmark_button">Uredi zaznamek</string>
     <string name="placepage_personal_notes_hint">Osebne opombe (golo besedilo ali HTML)</string>
     <string name="editor_reset_edits_message">Naj zavržem vse krajevne spremembe?</string>
-    <string name="editor_reset_edits_button">Zavrzi</string>
+    <string name="editor_reset_edits_button">Zavrzi spremembe</string>
     <string name="editor_remove_place_message">Naj izbrišem dodane kraje?</string>
     <string name="editor_remove_place_button">Izbriši</string>
     <string name="editor_place_doesnt_exist">Kraj ne obstaja</string>
@@ -657,4 +657,9 @@
     <string name="navigation_start_tts_disabled_message">Glasovni napotki so onemogočeni: ustvarjalec glasu (TTS) ni na voljo</string>
     <string name="charge_socket_schuko">standardna evropska vtičnica (Schuko)</string>
     <string name="list_description_empty">Uredite seznam, da dodate opis</string>
+    <string name="advanced">Napredno</string>
+    <string name="download_resources_custom_url_title">Strežnik zemljevida po meri</string>
+    <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
+    <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
 </resources>

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

@@ -494,7 +494,7 @@
     <string name="placepage_more_button">Више</string>
     <string name="placepage_edit_bookmark_button">Измени маркер</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>
@@ -904,4 +904,19 @@
     <string name="editor_mark_business_vacant_title">Означи пословни простор као празан</string>
     <string name="editor_mark_business_vacant_description">Користите да бисте назначили да се фирма иселила и да је пословни простор празан и спреман да прими новог закупца.</string>
     <string name="editor_submit">Пошаљи</string>
+    <string name="place_page_map_too_old_title">Мапе су застареле</string>
+    <string name="place_page_map_too_old_description">Мапе су старе, преузмите нове.</string>
+    <string name="place_page_app_too_old_description">Мапе су веома старе, преузмите нову везију CoMaps апликације.</string>
+    <string name="place_page_update_too_old_map">Ажурирање регионалних мапа</string>
+    <string name="place_page_too_old_to_edit">Уређивање OpenStreetMap-а је онемогућено јер су подаци мапе сувише стари.</string>
+    <string name="prefs_speed_cameras_information">Упозорења о прекршајним камерама за брзину су онемогућена у земљама у којима су упозорења забрањена законом.</string>
+    <string name="power_management">Управљање напајањем</string>
+    <string name="navigation_start_tts_message">"Покретање навигације, језик гласовних инструкција: "</string>
+    <string name="navigation_start_tts_disabled_message">Гласовне инструкције онемогућене: ТТС мотор није доступан</string>
+    <string name="charge_socket_schuko">Шухо</string>
+    <string name="advanced">Напредно</string>
+    <string name="download_resources_custom_url_title">Сопствени сервер мапа</string>
+    <string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string>
+    <string name="download_resources_custom_url_summary_none">Није постављено</string>
+    <string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string>
 </resources>

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

@@ -503,7 +503,7 @@
     <string name="placepage_edit_bookmark_button">Yer İmini Düzenle</string>
     <string name="placepage_personal_notes_hint">Kişisel notlar (metin veya html)</string>
     <string name="editor_reset_edits_message">Tüm yerel değişiklikler sıfırlansın mı?</string>
-    <string name="editor_reset_edits_button">Sıfırla</string>
+    <string name="editor_reset_edits_button">Değişiklikleri gözden çıkar</string>
     <string name="editor_remove_place_message">Eklenen yer kaldırılsın mı?</string>
     <string name="editor_remove_place_button">Kaldır</string>
     <string name="editor_place_doesnt_exist">Bu yer yok</string>
@@ -858,7 +858,7 @@
     <string name="ruler">Cetvel</string>
     <string name="bookmark_color">Yer imi rengi</string>
     <string name="open_now">Şu an açık</string>
-    <string name="closed_now">Şimdi kapandı</string>
+    <string name="closed_now">Şu anda kapalı</string>
     <string name="at">%s\'da</string>
     <string name="pref_backup_title">Yer imleri ve izlerin yedeği</string>
     <string name="dialog_report_error_with_logs">Lütfen bize hata raporu yollayın:\n - Ayarlardan \"Günlüğe kaydetmeyi etkinleştir\" \n - hatayı tekrarlayın\n - \"Hakkında ve Yardım\" ekranında \"Hata Bildir\" düğmesine basın ve e-posta veya sohbet yoluyla gönderin\n - günlüğe kaydetmeyi devre dışı bırak</string>
@@ -894,4 +894,10 @@
     <string name="error_value_must_be_positive">Değer pozitif olmalıdır</string>
     <string name="error_invalid_number">Geçersiz sayı</string>
     <string name="avoid_paved">Asfalt yollardan kaçın</string>
+    <string name="place_page_map_too_old_title">Harita verisi güncel değil</string>
+    <string name="place_page_map_too_old_description">Mevcut harita verileriniz çok eski, lütfen haritayı güncelleyin.</string>
+    <string name="place_page_app_too_old_description">Mevcut harita verileriniz çok eski, lütfen CoMaps uygulamasını güncelleyin.</string>
+    <string name="place_page_update_too_old_map">Bölge haritasını güncelle</string>
+    <string name="place_page_too_old_to_edit">Harita verisi çok eski olduğu için OpenStreetMap düzenleyicisi devre dışı.</string>
+    <string name="prefs_speed_cameras_information">Yerel yasalarca uyarıların yasaklandığı ülkelerde hız kamerası uyarıları devre dışıdır.</string>
 </resources>

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

@@ -917,9 +917,8 @@
     <string name="place_page_app_too_old_description">您当前的地图数据非常旧，请更新 CoMaps 应用。</string>
     <string name="place_page_update_too_old_map">更新地图区域</string>
     <string name="place_page_too_old_to_edit">由于地图数据太旧，OpenStreetMap 编辑被禁用。</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
     <string name="download_resources_custom_url_summary_none">未设置</string>
-    <string name="download_resources_custom_url_error_scheme">请输入以 https:// 开头、以 / 结尾的完整 URL</string>
+    <string name="download_resources_custom_url_error_scheme">请输入以 http:// 或 https:// 开头的 URL</string>
     <string name="advanced">高级</string>
     <string name="download_resources_custom_url_title">自定义地图服务器</string>
     <string name="download_resources_custom_url_message">覆盖用于地图下载的默认地图下载服务器。留空则使用 CoMaps 默认服务器。</string>

android/app/src/main/res/values/attrs.xml

@@ -66,13 +66,4 @@
   </declare-styleable>
 
   <attr name="accentColorSelector" format="color"/>
-  <attr name="bookingFilterTitleColor" format="color"/>
-  <attr name="adsRemovalOptionsBg" format="reference"/>
-  <attr name="adsRemovalOptionsDivider" format="color"/>
-  <attr name="icClearRounded" format="reference"/>
-  <attr name="bookmarkSubscriptionScreenBg" format="reference"/>
-  <attr name="bookmarkSubscriptionCardEdge" format="reference"/>
-  <attr name="bookmarkSubscriptionCardBg" format="color"/>
-  <attr name="bookmarkSubscriptionCardTextColor" format="color"/>
-  <attr name="imgPromoBookingTitle" format="reference"/>
 </resources>

android/app/src/main/res/values/colors.xml

@@ -64,6 +64,7 @@
   <color name="bg_cards">@android:color/white</color>
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
+  <color name="bg_app">@android:color/white</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>