[generator] Use 40 threads for Features stage

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

.forgejo/workflows/process_subways.yml

@@ -1,129 +0,0 @@
-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!'

CONTRIBUTORS

@@ -10,7 +10,6 @@ CoMaps contributors:
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
-NoelClick
 thesupertechie
 vikiawv
 Yannik Bloscheck

SECURITY.md

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

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

@@ -1,8 +1,10 @@
-• OpenStreetMap Daten vom 17. Dezember
+• OpenStreetMap-Daten vom 9. Dezember
-• Map download server nun wählbar
+• Material 3 Design
-• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
+• Im OSM-Editor können nun Ladestationen hinzugefügt werden
-• Vermeidung von Parkplatzwegen im Routing
+• Schuko und Typ E Ladestationen hinzugefügt
-• Neuer Zoombutton
+• Verbesserte Suchvorschläge
-• Verbesserte Französchische Suchsynonme
+• Litauische und lettische Sprachankündigungen
-• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
+• Die Fahranweisungen wurden vergrößert
-Mehr auf codeberg.org/comaps/comaps/releases
+• Der Zoomlevel passt sich an die Distanz zur nächsten Abbiegung an
+• Neue Anordnung der Einstellungen
+Weitere Einzelheiten auf codeberg.org/comaps/comaps/releases

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

@@ -1,8 +1,10 @@
-• OpenStreetMap data as of December 17
+• OpenStreetMap data as of December 9
-• Make map download server configurable
+• Use Material 3 themes
-• Added info about outdated maps and an update button to the selected place info card
+• Support charging sockets in OSM Editor
-• Avoid using parking aisles for routing
+• Added schuko/type-E charge sockets
-• Changed shape of zoom buttons
+• Improved search results ranking
-• Improved French search synonyms
+• Enabled Lithuanian and Latvian in voice announcements
-• OSM editor: check length limit for OSM tags in value validation
+• Improved size of driving indications
+• Base zoom level on distance to next turn
+• Reordered settings
 More details on codeberg.org/comaps/comaps/releases

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

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

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

@@ -1,8 +1,10 @@
-• Données OpenStreetMap du 17 décembre
+• Données OpenStreetMap du 9 Décembre
-• Serveur de téléchargement de cartes configurable
+• Utilisation de Material 3
-• Ajout d'un message d'avertissement pour les cartes trop anciennes
+• Support de l'édition des bornes de recharge dans l'éditeur OSM
-• Évitement des allées de parking dans les itinéraires
+• Ajout du type de prise schuko/type-E
-• Mise à jour de l'apparence des boutons de zooms
+• Amélioration de l'ordre des résultats de recherche
-• Amélioration des synonymes de recherche en français
+• Ajout du lituanien et du letton dans le guidage vocal
-• Editeur OSM: vérification de la taille limite des tags OSM
+• Amélioration de la taille des instructions dans la navigation
-Plus d'informations sur codeberg.org/comaps/comaps/releases
+• Niveau de zoom basé sur la distance jusqu’au prochain virage
+• Réorganisation des paramètres
+Plus de détails sur codeberg.org/comaps/comaps/releases

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

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

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

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

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

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

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

@@ -1,8 +1,10 @@
-• Dados OSM de 17/12
+• Dados OpenStreetMap atualizados em 9 de dezembro
-• Servidor de download de mapas configurável
+• Uso do estilo Material 3
-• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
+• Suporte para tomadas de carregamento no Editor OSM
-• Evita o uso de corredores de estacionamento para roteamento
+• Adição de tomadas de carregamento Schuko/Tipo E
-• Formato dos botões de zoom alterado
+• Melhoria na classificação dos resultados de busca
-• Sinônimos de busca em francês aprimorados
+• Adição dos idiomas letão e lituano nas orientações por voz
-• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
+• Melhoria no tamanho das indicações de direção
+• Nível de zoom baseado em distância até a próxima curva
+• Configurações reordenadas
 Mais detalhes em codeberg.org/comaps/comaps/releases

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

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

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

@@ -19,13 +19,13 @@ Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
 • Iščite po imenu, hišnemu naslovu ali po vrsti
-• Usmerjanje z glasovnimi navodili za hojo, kolesarjenje ali vožnjo avtomobila.
+• Usmerjanje z glasovnimi obvestili 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šajte podatke zemljevida za vse z uporabo vgrajenega urejevalnika
+• Izboljšajtw 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 – Odkrijte več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti

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

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

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

@@ -1,36 +0,0 @@
-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 – Odkrijte več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti

android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java

@@ -18,7 +18,6 @@ import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
-
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
@@ -26,15 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.base.BaseMwmFragmentActivity;
-import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
@@ -47,7 +38,11 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.List;
 import java.util.Objects;
 
@@ -59,7 +54,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   private MaterialTextView mTvMessage;
   private LinearProgressIndicator mProgress;
   private MaterialButton mBtnDownload;
-  private MaterialButton mBtnAdvanced;
   private MaterialCheckBox mChbDownloadCountry;
 
   private String mCurrentCountry;
@@ -273,14 +267,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
     mProgress = findViewById(R.id.progressbar);
     mBtnDownload = findViewById(R.id.btn_download_resources);
     mChbDownloadCountry = findViewById(R.id.chb_download_country);
-    mBtnAdvanced = findViewById(R.id.btn_advanced);
-
-    mBtnAdvanced.setOnClickListener(v -> {
-      CustomMapServerDialog.show(this, url -> {
-        prepareFilesDownload(false);
-      });
-    });
-    mBtnAdvanced.setEnabled(true);
 
     mBtnListeners = new View.OnClickListener[BTN_COUNT];
     mBtnNames = new String[BTN_COUNT];
@@ -305,11 +291,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   {
     mBtnDownload.setOnClickListener(mBtnListeners[action]);
     mBtnDownload.setText(mBtnNames[action]);
-
-    // Allow changing server only when idle or after an error.
-    boolean advancedEnabled = (action == DOWNLOAD || action == TRY_AGAIN || action == RESUME);
-    mBtnAdvanced.setEnabled(advancedEnabled);
-    mBtnAdvanced.setAlpha(advancedEnabled ? 1f : 0.5f);
   }
 
   private void doDownload()
@@ -378,9 +359,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
 
   private void finishFilesDownload(int result)
   {
-    mBtnAdvanced.setEnabled(true);
-    mBtnAdvanced.setAlpha(1f);
-
     if (result == ERR_NO_MORE_FILES)
     {
       // World and WorldCoasts has been downloaded, we should register maps again to correctly add them to the model.
@@ -450,16 +428,12 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(RESUME))
+                           .setOnCancelListener((dialog) -> setAction(PAUSE))
                            .setPositiveButton(R.string.try_again,
                                               (dialog, which) -> {
                                                 setAction(TRY_AGAIN);
                                                 onTryAgainClicked();
                                               })
-                           .setNegativeButton(R.string.cancel,
-                                              (dialog, which) -> {
-                                                setAction(RESUME);
-                                              })
                            .setOnDismissListener(dialog -> mAlertDialog = null)
                            .show();
   }

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

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

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

@@ -948,7 +948,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);
 
-    if (Editor.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
     {
       mReset.setText(R.string.editor_place_doesnt_exist);
       return;
@@ -966,7 +966,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void reset()
   {
-    if (Editor.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
     {
       placeDoesntExist();
       return;

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

@@ -4,23 +4,16 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.LanguagesFragment;
 import app.organicmaps.editor.ProfileActivity;
@@ -42,7 +35,7 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.log.LogsManager;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -80,7 +73,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initScreenSleepEnabledPrefsCallbacks();
     initShowOnLockScreenPrefsCallbacks();
     initLeftButtonPrefs();
-    initCustomMapDownloadUrlPrefsCallbacks();
   }
 
   private void initLeftButtonPrefs()
@@ -543,34 +535,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     });
   }
 
-  private void initCustomMapDownloadUrlPrefsCallbacks()
-  {
-    Preference customUrlPref = getPreference(getString(R.string.pref_custom_map_download_url));
-
-    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
-
-    String current = prefs.getString(getString(R.string.pref_custom_map_download_url), "");
-    String normalizedUrl = Framework.normalizeServerUrl(current);
-
-    // Initial summary
-    customUrlPref.setSummary(normalizedUrl.isEmpty()
-        ? getString(R.string.download_resources_custom_url_summary_none)
-        : normalizedUrl);
-
-    // Sync native
-    Framework.applyCustomMapDownloadUrl(requireContext(), normalizedUrl);
-
-    // Show dialog
-    customUrlPref.setOnPreferenceClickListener(preference -> {
-      CustomMapServerDialog.show(requireContext(), url -> {
-        preference.setSummary(url.isEmpty()
-            ? getString(R.string.download_resources_custom_url_summary_none)
-            : url);
-      });
-      return true;
-    });
-  }
-
   private void removePreference(@NonNull String categoryKey, @NonNull Preference preference)
   {
     final PreferenceCategory category = getPreference(categoryKey);

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -700,27 +700,22 @@ public class PlacePageView extends Fragment
 
       if (shouldEnableEditPlace)
       {
-        mTvEditPlace.setEnabled(true);
-        mTvAddPlace.setEnabled(true);
         mTvEditPlace.setOnClickListener(this);
         mTvAddPlace.setOnClickListener(this);
       }
       else
       {
+        mTvEditPlace.setOnClickListener((v) -> {
+          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+        });
+        mTvAddPlace.setOnClickListener((v) -> {
+          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+        });
+
         String countryId = MapManager.nativeGetSelectedCountry();
 
-        if (countryId != null && MapManager.nativeIsMapTooOldToEdit(countryId))
+        if (countryId != null)
         {
-          // map editing is disabled because the map is too old
-          mTvEditPlace.setEnabled(true);
-          mTvAddPlace.setEnabled(true);
-          mTvEditPlace.setOnClickListener((v) -> {
-            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-          });
-          mTvAddPlace.setOnClickListener((v) -> {
-            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-          });
-
           CountryItem map = CountryItem.fill(countryId);
 
           if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
@@ -745,12 +740,6 @@ public class PlacePageView extends Fragment
               mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
           }
         }
-        else
-        {
-          // map editing is disabled for other reasons
-          mTvEditPlace.setEnabled(false);
-          mTvAddPlace.setEnabled(false);
-        }
       }
 
       final int editButtonColor =

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

@@ -2,6 +2,6 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/bg_window"/>
+  <solid android:color="@color/bg_panel"/>
   <corners android:radius="100dp"/>
 </shape>

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

@@ -2,5 +2,5 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="oval">
-  <solid android:color="@color/bg_window"/>
+  <solid android:color="@color/bg_panel"/>
 </shape>

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

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?colorControlNormal"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="960"
-    android:viewportWidth="960">
-      
-    <path android:fillColor="@android:color/white"
-        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q227,294 295,229Q363,164 440,164Q473,164 496.5,187.5Q520,211 520,244L520,486L584,424L640,480L480,640L320,480L376,424L440,486L440,244Q364,258 322,317.5Q280,377 280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,392 658,350.5Q636,309 600,280L600,187Q674,222 717,290.5Q760,359 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800ZM480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442L480,442Q480,442 480,442Q480,442 480,442Z"/>
-    
-</vector>

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

@@ -11,18 +11,6 @@
     android:layout_height="match_parent"
     android:layout_above="@+id/button_container"
     android:layout_gravity="center">
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_advanced"
-        style="@style/Widget.Material3.Button.IconButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_settings"
-        app:iconTint="?iconTint"
-        android:contentDescription="@string/download_resources_custom_url_title"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_margin="@dimen/margin_half" />
-
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/til_custom_map_server"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/margin_base"
-    android:paddingEnd="@dimen/margin_base"
-    android:paddingTop="@dimen/margin_base"
-    android:paddingBottom="@dimen/margin_half"
-    android:hint="@string/download_resources_custom_url_title"
-    app:placeholderText="@string/download_resources_custom_url_hint"
-    app:endIconMode="clear_text">
-
-  <com.google.android.material.textfield.TextInputEditText
-      android:id="@+id/edit_custom_map_server"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:inputType="textUri"
-      android:singleLine="true" />
-</com.google.android.material.textfield.TextInputLayout>

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

@@ -24,7 +24,7 @@
     android:id="@+id/items_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?windowBackgroundForced">
+    android:background="?panel">
     <include
       layout="@layout/item_missed_map"
       android:layout_width="match_parent"

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

@@ -26,7 +26,7 @@
     android:id="@+id/items_frame"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?windowBackgroundForced"
+    android:background="?panel"
     android:listSelector="?clickableBackground"
     android:drawSelectorOnTop="true"/>
 

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

@@ -60,7 +60,7 @@
       android:layout_below="@id/tv__bookmark_set_title"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?selectableItemBackground"
+      android:background="?attr/selectableItemBackground"
       android:clickable="true"
       android:paddingTop="@dimen/margin_quarter_plus"
       android:paddingBottom="@dimen/margin_half_plus"

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

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?cardBackground"
+  android:background="?attr/cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -11,6 +11,7 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
   </com.google.android.material.appbar.MaterialToolbar>

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

@@ -18,7 +18,7 @@
         app:srcCompat="@drawable/ic_done"
         android:layout_width="?actionBarSize"
         android:layout_height="?actionBarSize"
-        android:background="?selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />

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

@@ -48,6 +48,7 @@
   <FrameLayout
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:background="?panel"/>
 
 </LinearLayout>

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

@@ -12,6 +12,7 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
     <com.google.android.material.imageview.ShapeableImageView

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

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

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

@@ -15,7 +15,7 @@
       android:id="@+id/app_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?colorPrimary"
+      android:background="?attr/colorPrimary"
       android:elevation="@dimen/dp_0"
       app:elevation="@dimen/dp_0">
         <include

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

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

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

@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?windowBackgroundForced"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"

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

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

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

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

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

@@ -45,7 +45,7 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <com.google.android.material.divider.MaterialDivider
+    <View
       android:layout_width="match_parent"
       android:layout_height="@dimen/divider_height"
       android:background="?dividerHorizontal"/>

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

@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?panel"
   android:orientation="vertical">
 
 

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

@@ -155,7 +155,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_half_plus"
         android:layout_marginBottom="@dimen/margin_quarter"
-        android:background="?selectableItemBackground"
+        android:background="?attr/selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingStart="@dimen/margin_quarter"

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

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

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

@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?panel"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />

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

@@ -4,7 +4,7 @@
   android:id="@+id/pp_buttons_layout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?ppButtonsBackground"
   android:orientation="horizontal"
   android:layout_gravity="bottom">
   <include layout="@layout/item_divider" />

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

@@ -28,7 +28,7 @@
             android:layout_width="?attr/actionBarSize"
             android:layout_height="?attr/actionBarSize"
             android:layout_alignParentStart="true"
-            android:background="?selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
             android:scaleType="center"
             tools:src="@drawable/ic_expand_more" />
@@ -143,7 +143,7 @@
     android:id="@+id/driving_options_btn_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?drivingOptionsViewBg"
+    android:background="?attr/drivingOptionsViewBg"
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
@@ -151,7 +151,7 @@
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?selectableItemBackgroundBorderless"
+      android:background="?attr/selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
       <LinearLayout

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

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

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

@@ -14,7 +14,7 @@
     android:id="@+id/back"
     android:layout_width="?attr/actionBarSize"
     android:layout_height="?attr/actionBarSize"
-    android:background="?selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
     tools:src="@drawable/ic_expand_more"
@@ -52,7 +52,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackgroundBorderless"
     android:contentDescription="@string/clear_the_search"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_close"/>
@@ -63,7 +63,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackgroundBorderless"
     android:contentDescription="@null"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_mic_white"

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">Descartar canvis</string>
+    <string name="editor_reset_edits_button">Descarta</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,10 +920,4 @@
     <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_hint">https://cdn-fi-1.comaps.app/</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 změny</string>
+    <string name="editor_reset_edits_button">Zahodit</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,10 +913,4 @@
     <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_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
-    <string name="advanced">Pokročilé</string>
-    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>

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

@@ -489,7 +489,7 @@
     <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
-    <string name="editor_reset_edits_button">Kassér ændringer</string>
+    <string name="editor_reset_edits_button">Kassér</string>
     <string name="editor_remove_place_message">Slet tilføjet sted?</string>
     <string name="editor_remove_place_button">Slet</string>
     <string name="editor_place_doesnt_exist">Stedet eksisterer ikke</string>
@@ -902,9 +902,4 @@
     <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

@@ -502,7 +502,7 @@
     <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
     <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
     <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
-    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
+    <string name="editor_reset_edits_button">Verwerfen</string>
     <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
     <string name="editor_remove_place_button">Löschen</string>
     <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
@@ -902,23 +902,9 @@
         <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_mark_business_vacant_title">Geschäft als leerstehend markieren</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="editor_mark_business_vacant_description">Wenn das Unternehmen ausgezogen ist und die Fläche leer und bereit für die nächste Miete ist.</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Energiemanagement</string>
-    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
-    <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
-    <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
-    <string name="place_page_update_too_old_map">Kartenregion aktualisieren</string>
-    <string name="place_page_too_old_to_edit">OpenStreetMap-Bearbeitung ist deaktiviert, da die Kartendaten zu alt sind.</string>
-    <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
-    <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
-    <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</string>
-    <string name="download_resources_custom_url_title">Benutzerdefinierter Kartenserver</string>
-    <string name="advanced">Fortgeschritten</string>
-    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
-    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
-    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</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,15 +825,4 @@
     <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">Apertura</string>
+    <string name="editor_time_open">Abierto</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">Descartar cambios</string>
+    <string name="editor_reset_edits_button">Restablecer</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,10 +922,4 @@
     <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>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
 </resources>

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

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

@@ -42,15 +42,15 @@
     <!-- Text in About screen -->
     <string name="about_proposition_3">• آفلاین، چابک و جمع و جور</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">ویدابُن بُوَندگ، نه ازبرای سود، وزیریدن اود تیس‌های مالی رو راست.</string>
+    <string name="about_developed_by_enthusiasts">منبع کاملا باز، نه برای سود، تصمیم گیری شفاف و امور مالی شفاف.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">پیکربندی‌های گیاگ</string>
     <string name="close">بستن</string>
-    <string name="unsupported_phone">برنامه به OpenGL نیازمند است.شوربختانه، از دستگاه شما پشتیبانی نمی‌شود.</string>
+    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
     <string name="download">بارگیری</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">لطفا پیش از بکارگیری برنامه، نخست کمی جا در کارت SD/ویر USB آزاد کنید</string>
+    <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
-    <string name="download_resources">پیش از بکارگیری برنامه, لطفا نقشه پیش‌نمایش جهانی را بر روی دستگاه خویش بارگیری کنید.\nاندازه %s از ویر شما را می‌گیرد.</string>
+    <string name="download_resources">قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم. \nمقدار %s از حافظه شما اشغال می شود.</string>
     <string name="download_resources_continue">برو به نقشه</string>
     <string name="downloading_country_can_proceed">بارگیری می‌شود %1$s (%2$s). شما اکنون می‌توانید\nبه نقشه بروید.</string>
     <string name="download_country_ask">بارگیری %1$s؟ (%2$s)</string>
@@ -64,7 +64,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">افزودن پهرستی نو</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">نشانگ‌ها</string>
+    <string name="bookmarks">نشانه‌ها</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">نشانه‌ها و مسیر ها</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -138,7 +138,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">یادداشت‌ها</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">بارگذاری نشانگ‌ها</string>
+    <string name="load_kmz_title">در حال بارگیری نشانه‌ها</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.</string>
     <!-- Kml file loading failed -->
@@ -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_download_all_button">دانلود همه</string>
-    <string name="downloader_downloading">بارگیری می‌شود:</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>
@@ -784,6 +784,4 @@
     <string name="backup_interval_every_week">هفتگی</string>
     <string name="backup_interval_manual_only">خاموش (تنها به شیوه دستی)</string>
     <string name="backup_interval_every_day">روزانه</string>
-    <string name="disconnect_usb_cable">برای بکارگیری CoMaps، لطفا USB را بگسلانید یا کارت‌ویر را اندرون گذارید.</string>
-    <string name="bookmark_set_name">نام پهرست نشانگ‌ها</string>
 </resources>

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">Hylkää muutokset</string>
+    <string name="editor_reset_edits_button">Nollaa</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ä 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="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="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,11 +911,4 @@
     <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">Annuler les modifications</string>
+    <string name="editor_reset_edits_button">Ignorer</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,10 +921,4 @@
     <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_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
-    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string>
-    <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
 </resources>

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

@@ -498,7 +498,7 @@
     <string name="placepage_edit_bookmark_button">Modifica luogo preferito</string>
     <string name="placepage_personal_notes_hint">Note personali (testo o html)</string>
     <string name="editor_reset_edits_message">Cancellare tutte le modifiche locali?</string>
-    <string name="editor_reset_edits_button">Scarta modifiche</string>
+    <string name="editor_reset_edits_button">Cancella</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,10 +906,4 @@
     <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_hint">https://cdn-fi-1.comaps.app/</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

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

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

@@ -373,6 +373,4 @@
     <string name="offline_explanation_title">Mappys Dhywarlinen</string>
     <string name="category_shopping">Gwerthjiow</string>
     <string name="edit">Golegi</string>
-    <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
-    <string name="translated_om_site_url">https://comaps.app/</string>
 </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">Atsisakyti pakeitimų</string>
+    <string name="editor_reset_edits_button">Anuliuoti</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">Įrašyta</string>
+    <string name="saved">Išsaugota</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">Mygtuko nerodyti</string>
+    <string name="pref_left_button_disable">Mygtukas nerodomas</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,18 +888,4 @@
     <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_hint">https://cdn-fi-1.comaps.app/</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">Atmest izmaiņas</string>
+    <string name="editor_reset_edits_button">Noraidīt</string>
     <string name="editor_remove_place_message">Vai dzēst pievienoto vietu?</string>
     <string name="editor_remove_place_button">Dzēst</string>
     <string name="editor_place_doesnt_exist">Vieta nepastāv</string>
@@ -851,15 +851,4 @@
     <string name="place_page_update_too_old_map">Atjaunināt karšu apgabalu</string>
     <string name="place_page_too_old_to_edit">OpenStreetMap labošana ir atspējota, jo kartes dati ir pārāk veci.</string>
     <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
-    <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
-    <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</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

@@ -503,7 +503,7 @@
     <string name="placepage_edit_bookmark_button">Rediger bokmerke</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Forkaste alle lokale endringer?</string>
-    <string name="editor_reset_edits_button">Forkast endringer</string>
+    <string name="editor_reset_edits_button">Forkast</string>
     <string name="editor_remove_place_message">Slette tillagt sted?</string>
     <string name="editor_remove_place_button">Slett</string>
     <string name="editor_place_doesnt_exist">Sted finnes ikke</string>
@@ -906,10 +906,4 @@
     <string name="place_page_too_old_to_edit">OpenStreetMap-redigering er deaktivert fordi kartdataene er for gamle.</string>
     <string name="osm_note_hint">Alternativt, så kan du legge til et notat i OpenStreetMap, slik at noen andre kan redigere eller legge til stedet.</string>
     <string name="osm_note_toast">Notatet vil bli sendt til OpenStreetMap</string>
-    <string name="advanced">Avansert</string>
-    <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
-    <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
-    <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
 </resources>

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

@@ -84,10 +84,23 @@
     <item name="transitRulerBackground">@color/white_4</item>
     <item name="transitStepDivider">@drawable/dot_divider</item>
     <item name="accentColorSelector">@color/accent_color_selector</item>
-    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/MwmTextAppearance.Body4</item>
+    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/MwmTextAppearance.Body2</item>
+    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/MwmTextAppearance.Body1</item>
+    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
+    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.Body2</item>
+    <item name="fontButton">@style/TextAppearance.Button</item>
+    <item name="fontCaption">@style/TextAppearance.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/white_secondary</item>

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">Wijzigingen weggooien</string>
+    <string name="editor_reset_edits_button">Gooi weg</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,10 +915,4 @@
     <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_hint">https://cdn-fi-1.comaps.app/</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-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">Descartar alterações</string>
+    <string name="editor_reset_edits_button">Eliminar</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>
@@ -909,10 +909,4 @@
     <string name="prefs_speed_cameras_information">Avisos de câmaras de velocidade estão desativados em países onde alertas estão proibidos por lei.</string>
     <string name="navigation_start_tts_message">"Iniciando Navegação, idioma das instruções por voz: "</string>
     <string name="navigation_start_tts_disabled_message">Instruções por voz desativadas: nenhum motor de TTS disponível</string>
-    <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

@@ -277,7 +277,7 @@
     <!-- Preference title -->
     <string name="google_play_services">Serviciul de Localizare Fuzionat Google</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precis. Se poate conecta la serverele Google.</string>
+    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precisă. Se poate conecta la serverele Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -457,10 +457,10 @@
     <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 din 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 la 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>
+    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d din %2$d</string>
     <string name="download_over_mobile_header">Vrei să descarci prin rețeaua de telefonie mobilă?</string>
@@ -475,7 +475,7 @@
     <!-- Hint of the input field in the OSM note section of the editor -->
     <string name="editor_note_hint">Descrieți erorile de pe hartă sau lucrurile care nu pot fi editate cu CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Editările dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
+    <string name="editor_about_osm">Edițiile dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
     <string name="editor_more_about_osm">Mai multe despre OpenStreetMap</string>
     <string name="editor_osm_history">Istoricul dvs. de editare</string>
     <string name="editor_osm_notes">Note privind datele hărții dvs</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ță la modificări</string>
+    <string name="editor_reset_edits_button">Renunță</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>
@@ -889,18 +889,4 @@
     <string name="list_description_empty">Editează lista ca să adaugi o descriere</string>
     <string name="charging_station_available_sockets">Conectori</string>
     <string name="charge_socket_unknown_other">Alte tipuri necunoscute</string>
-    <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ă 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 spremembe</string>
+    <string name="editor_reset_edits_button">Zavrzi</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,10 +657,4 @@
     <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>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</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,20 +904,4 @@
     <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_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:// и која се завршава са /</string>
 </resources>

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

@@ -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">Şu anda kapalı</string>
+    <string name="closed_now">Şimdi kapandı</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>
@@ -893,5 +893,4 @@
     <string name="unknown_count">bilinmiyor</string>
     <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>
 </resources>

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

@@ -511,7 +511,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>
@@ -917,10 +917,4 @@
     <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="advanced">高级</string>
-    <string name="download_resources_custom_url_title">自定义地图服务器</string>
-    <string name="download_resources_custom_url_message">覆盖用于地图下载的默认地图下载服务器。留空则使用 CoMaps 默认服务器。</string>
 </resources>

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

@@ -27,9 +27,9 @@
     <item>type2_combo</item>
     <item>nacs</item>
     <item>chademo</item>
-    <item>type2</item>
-    <item>type2_cable</item>
     <item>type1</item>
+    <item>type2_cable</item>
+    <item>type2</item>
     <item>schuko</item>
     <item>unknown</item>
   </string-array>

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

@@ -43,8 +43,6 @@
   <string name="pref_backup" translatable="false">Backup</string>
   <string name="pref_left_button" translatable="false">LeftButton</string>
   <string name="pref_power" translatable="false">pref_power</string>
-  <string name="pref_custom_map_download_url" translatable="false">CustomMapDownloadUrl</string>
-  <string name="pref_advanced" translatable="false">pref_advanced</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

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

@@ -544,7 +544,7 @@
     <string name="placepage_edit_bookmark_button">Edit Bookmark</string>
     <string name="placepage_personal_notes_hint">Personal notes (text or html)</string>
     <string name="editor_reset_edits_message">Discard all local changes?</string>
-    <string name="editor_reset_edits_button">Discard changes</string>
+    <string name="editor_reset_edits_button">Discard</string>
     <string name="editor_remove_place_message">Delete added place?</string>
     <string name="editor_remove_place_button">Delete</string>
     <string name="editor_place_doesnt_exist">Place does not exist</string>
@@ -966,12 +966,4 @@
     <string name="offline_explanation_title">Offline Maps</string>
     <string name="offline_explanation_text">A map needs to be downloaded to view and navigate the area.\nDownload maps for areas you want to travel.</string>
     <string name="list_description_empty">Edit the list to add a description</string>
-    <!-- Settings: Advanced group -->
-    <string name="advanced">Advanced</string>
-    <!-- Custom Download URL -->
-    <string name="download_resources_custom_url_title">Custom Map Server</string>
-    <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_summary_none">Not set</string>
-    <string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
 </resources>

android/app/src/main/res/values/styles-text.xml

@@ -15,6 +15,11 @@
     <item name="android:textStyle">bold</item>
   </style>
 
+  <style name="MwmTextAppearance.Title.Toolbar">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+    <item name="android:fontFamily">@string/robotoMedium</item>
+  </style>
+
   <style name="MwmTextAppearance.Headline">
     <item name="android:textSize">@dimen/text_size_headline</item>
     <item name="android:textColor">?android:textColorPrimary</item>
@@ -116,6 +121,10 @@
     <item name="android:textColor">@color/bg_cards</item>
   </style>
 
+  <style name="MwmTextAppearance.Toolbar.Title.Button">
+    <item name="android:textSize">@dimen/text_size_body_3</item>
+  </style>
+
   <style name="MwmTextAppearance.NavMenu">
     <item name="android:textStyle">bold</item>
   </style>

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

@@ -287,6 +287,13 @@
     <item name="android:textColor">@color/text_light</item>
   </style>
 
+  <style name="MwmWidget.Tab">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:gravity">center</item>
+  </style>
+
   <style name="MwmWidget.TabLayout" parent="Widget.Design.TabLayout">
     <item name="tabMaxWidth">0dp</item>
     <item name="tabTextAppearance">@style/MwmTextAppearance.Tab</item>
@@ -298,6 +305,16 @@
     <item name="tabSelectedTextColor">@color/white_primary</item>
   </style>
 
+  <style name="MwmWidget.Downloader.ToolbarButton">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:gravity">center</item>
+    <item name="android:layout_gravity">end|center_vertical</item>
+    <item name="android:background">?selectableItemBackgroundBorderless</item>
+    <item name="android:padding">@dimen/margin_half</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Toolbar.Title.Button</item>
+  </style>
+
   <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
     parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
     <item name="colorSurface">@color/material_calendar_surface_dark</item>
@@ -308,6 +325,26 @@
     <item name="colorSurface">@color/material_calendar_surface_dark</item>
   </style>
 
+  <style name="TextAppearance" parent="MwmTextAppearance.Body3"/>
+
+  <style name="TextAppearance.Small" parent="MwmTextAppearance.Body4"/>
+
+  <style name="TextAppearance.Medium" parent="MwmTextAppearance.Body2"/>
+
+  <style name="TextAppearance.Large" parent="MwmTextAppearance.Body1">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+  </style>
+
+  <style name="TextAppearance.Inverse" parent="MwmTextAppearance.Body3.Light"/>
+
+  <style name="TextAppearance.Small.Inverse" parent="MwmTextAppearance.Body4.Light"/>
+
+  <style name="TextAppearance.Medium.Inverse" parent="MwmTextAppearance.Body2.Light"/>
+
+  <style name="TextAppearance.Large.Inverse" parent="MwmTextAppearance.Body1.Light">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+  </style>
+
   <style
     name="MwmTheme.BottomSheetDialog"
     parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
@@ -340,6 +377,9 @@
   <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
+    <item name="android:textColor">?accentButtonTextColor</item>
+    <item name="backgroundTint">@null</item>
+    <item name="cornerRadius">20dp</item>
     <item name="android:textSize">16sp</item>
   </style>
 
@@ -349,11 +389,13 @@
 
   <style name="MwmWidget.M3.Button.Secondary" parent="@style/Widget.Material3.Button.OutlinedButton">
     <item name="android:textSize">16sp</item>
+    <item name="strokeColor">?colorSecondary</item>
     <item name="android:textColor">?colorSecondary</item>
   </style>
 
   <style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
     <item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
+    <item name="rippleColor">@null</item>
     <item name="backgroundTint">?colorSecondary</item>
     <item name="tint">?android:textColorPrimaryInverse</item>
   </style>

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

@@ -69,4 +69,19 @@
     <attr name="elevationProfileSelectedPointTriangle" format="reference" />
     <attr name="elevationProfileFloatingTriangle" format="reference" />
   </declare-styleable>
+  <declare-styleable name="ThemeAttrs.Fonts">
+    <attr name="fontHeadline1" format="reference" />
+    <attr name="fontHeadline2" format="reference" />
+    <attr name="fontHeadline3" format="reference" />
+    <attr name="fontHeadline4" format="reference" />
+    <attr name="fontHeadline5" format="reference" />
+    <attr name="fontHeadline6" format="reference" />
+    <attr name="fontSubtitle1" format="reference" />
+    <attr name="fontSubtitle2" format="reference" />
+    <attr name="fontBody1" format="reference" />
+    <attr name="fontBody2" format="reference" />
+    <attr name="fontButton" format="reference" />
+    <attr name="fontCaption" format="reference" />
+    <attr name="fontOverline" format="reference" />
+  </declare-styleable>
 </resources>

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

@@ -85,14 +85,27 @@
     <item name="transitRulerBackground">@color/black_4</item>
     <item name="transitStepDivider">@drawable/dot_divider</item>
     <item name="accentColorSelector">@color/accent_color_selector</item>
-    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/MwmTextAppearance.Body4</item>
+    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/MwmTextAppearance.Body2</item>
+    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/MwmTextAppearance.Body1</item>
+    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="android:textAppearanceInverse">@style/MwmTextAppearance.Body3.Light</item>
+    <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
-    <item name="android:textAppearanceSmallInverse">@style/MwmTextAppearance.Body4.Light</item>
+    <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
-    <item name="android:textAppearanceMediumInverse">@style/MwmTextAppearance.Body2.Light</item>
+    <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
-    <item name="android:textAppearanceLargeInverse">@style/MwmTextAppearance.Body1.Light</item>
+    <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
+    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
+    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.Body2</item>
+    <item name="fontButton">@style/TextAppearance.Button</item>
+    <item name="fontCaption">@style/TextAppearance.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/black_secondary</item>

android/app/src/main/res/xml/prefs_main.xml

@@ -144,8 +144,7 @@
       </intent>
     </PreferenceScreen>
   </androidx.preference.PreferenceCategory>
-
+<PreferenceCategory
-  <PreferenceCategory
     android:key="@string/pref_power"
     android:title="@string/power_management"
     android:order="4">
@@ -191,8 +190,7 @@
         android:defaultValue="true"
         android:widgetLayout="@layout/preference_switch"
         android:order="5"/>
-  </PreferenceCategory>
+</PreferenceCategory>
-
   <androidx.preference.PreferenceCategory
     android:key="@string/pref_privacy"
     android:title="@string/privacy"
@@ -214,18 +212,5 @@
       android:defaultValue="true"
       android:widgetLayout="@layout/preference_switch"
       android:order="2"/>
-
   </androidx.preference.PreferenceCategory>
-
-  <androidx.preference.PreferenceCategory
-    android:key="@string/pref_advanced"
-    android:title="@string/advanced"
-    android:order="6">
-    <Preference
-      android:key="@string/pref_custom_map_download_url"
-      android:title="@string/download_resources_custom_url_title"
-      app:icon="@drawable/ic_cloud_download"
-      android:order="1" />
-  </androidx.preference.PreferenceCategory>
-
 </androidx.preference.PreferenceScreen>

android/sdk/build.gradle

@@ -124,7 +124,6 @@ dependencies {
   implementation libs.androidx.lifecycle.process
   implementation libs.androidx.media
   implementation libs.androidx.recyclerview
-  implementation libs.androidx.preference
   implementation libs.android.material
 
   testImplementation libs.junit
@@ -146,7 +145,7 @@ project.afterEvaluate {
 
   final taskName = gradle.startParameter.taskNames
 
-  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
     exec {
       workingDir '../..'
 

android/sdk/src/main/assets/mapcss-mapping.csv

@@ -1 +0,0 @@
-../../../../../data/mapcss-mapping.csv

android/sdk/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp

@@ -42,16 +42,12 @@ using namespace std::placeholders;
 
 namespace
 {
-std::unique_ptr<MapFilesDownloader> & LegacyDownloader()
-{
-  static auto downloader = storage::GetDownloader();
-  return downloader;
-}
 
 static std::vector<platform::CountryFile> g_filesToDownload;
 static int g_totalDownloadedBytes;
 static int g_totalBytesToDownload;
 static std::shared_ptr<HttpRequest> g_currentRequest;
+
 }  // namespace
 
 extern "C"
@@ -156,11 +152,11 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_
     return ERR_NO_MORE_FILES;
 
   /// @todo One downloader instance with cached servers. All this routine will be refactored some time.
-  auto & downloader = LegacyDownloader();
+  static auto downloader = storage::GetDownloader();
   storage::Storage const & storage = g_framework->GetStorage();
   downloader->SetDataVersion(storage.GetCurrentDataVersion());
 
-  downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener), &downloader]()
+  downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener)]()
   {
     auto const & curFile = g_filesToDownload.back();
     auto const fileName = curFile.GetFileName(MapFileType::Map);
@@ -181,12 +177,4 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_
   LOG(LDEBUG, ("cancelCurrentFile, currentRequest=", g_currentRequest));
   g_currentRequest.reset();
 }
-
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeResetMetaConfig(JNIEnv *,
-                                                                                                      jclass)
-{
-  auto & downloader = LegacyDownloader();
-  if (downloader)
-    downloader->ResetMetaConfig();
-}
 }

android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp

@@ -1505,22 +1505,6 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv
   env->SetBooleanField(result, buildingsField, buildings);
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCustomMapDownloadUrl(JNIEnv * env, jclass, 
-                                                                                        jstring url)
-{
-  std::string nativeUrl = jni::ToNativeString(env, url);
-  GetPlatform().SetCustomMapServerUrl(nativeUrl);
-
-  if (g_framework)
-  {
-    frm()->GetStorage().ResetMapDownloadMetaConfig();
-  }
-  else
-  {
-    LOG(LINFO, ("nativeSetCustomMapDownloadUrl: framework not created yet, skipping ResetMapDownloadMetaConfig"));
-  }
-}
-
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass,
                                                                                    jboolean enabled)
 {

android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp

@@ -587,11 +587,4 @@ JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeG
   storage::CountryId const & res = g_framework->GetPlacePageInfo().GetCountryId();
   return (res == storage::kInvalidCountryId ? nullptr : jni::ToJavaString(env, res));
 }
-
-// static native boolean nativeIsMapTooOldToEdit(String countryId);
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeIsMapTooOldToEdit(JNIEnv *env, jclass clazz,
-                                                                                            jstring country_id)
-{
-  return GetStorage().IsMapTooOldToEdit(jni::ToNativeString(env, country_id));
-}
 }  // extern "C"

android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp

@@ -580,10 +580,10 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObject
   return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID()));
 }
 
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeAreSomeFeatureChangesUploaded(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
 {
-  return osm::Editor::Instance().AreSomeFeatureChangesUploaded(g_editableMapObject.GetID().m_mwmId,
+  return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId,
-                                                               g_editableMapObject.GetID().m_index);
+                                                   g_editableMapObject.GetID().m_index);
 }
 
 // static nativeMakeLocalizedName(String langCode, String name);

android/sdk/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java

@@ -27,5 +27,4 @@ public class DownloadResourcesLegacyActivity
   public static native int nativeGetBytesToDownload();
   public static native int nativeStartNextFileDownload(Listener listener);
   public static native void nativeCancelCurrentFile();
-  public static native void nativeResetMetaConfig();
 }

android/sdk/src/main/java/app/organicmaps/sdk/Framework.java

@@ -1,13 +1,10 @@
 package app.organicmaps.sdk;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Size;
-
 import app.organicmaps.sdk.api.ParsedRoutingData;
 import app.organicmaps.sdk.api.ParsedSearchRequest;
 import app.organicmaps.sdk.api.RequestType;
@@ -26,7 +23,6 @@ import app.organicmaps.sdk.routing.RoutingRecommendationListener;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.sdk.settings.SpeedCameraMode;
 import app.organicmaps.sdk.util.Constants;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -352,20 +348,4 @@ public class Framework
 
   public static native void nativeMemoryWarning();
   public static native void nativeSaveRoute();
-  public static native void nativeSetCustomMapDownloadUrl(String url);
-
-  public static void applyCustomMapDownloadUrl(@NonNull Context context, @Nullable String url)
-  {
-    nativeSetCustomMapDownloadUrl(normalizeServerUrl(url));
-    // Reset the legacy downloader too (world/coasts).
-    app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeResetMetaConfig();
-  }
-
-  public static String normalizeServerUrl(@Nullable String url)
-  {
-    String out = url != null ? url.trim() : "";
-    if (!out.isEmpty() && !out.endsWith("/"))
-      out = out + "/";
-    return out;
-  }
 }

android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java

@@ -2,13 +2,10 @@ package app.organicmaps.sdk;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-
 import androidx.annotation.NonNull;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
-import androidx.preference.PreferenceManager;
-
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
@@ -28,7 +25,6 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.StorageUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
-
 import java.io.IOException;
 
 public final class OrganicMaps implements DefaultLifecycleObserver
@@ -171,11 +167,6 @@ public final class OrganicMaps implements DefaultLifecycleObserver
                        /* isTablet */ false);
     Config.setStoragePath(writablePath);
 
-    // Use the same prefs as SettingsPrefsFragment
-    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-    final String savedUrl = prefs.getString(mContext.getString(R.string.pref_custom_map_download_url), "");
-    Framework.nativeSetCustomMapDownloadUrl(savedUrl.trim());
-
     mPlatformInitialized = true;
     Logger.i(TAG, "Platform initialized");
   }

android/sdk/src/main/java/app/organicmaps/sdk/downloader/MapManager.java

@@ -261,9 +261,4 @@ public final class MapManager
    * Returns country ID which the current PP object points to, or {@code null}.
    */
   public static native @Nullable String nativeGetSelectedCountry();
-
-  /**
-   * Returns true when the map exists and is too old for map editing.
-   */
-  public static native boolean nativeIsMapTooOldToEdit(String countryId);
 }

android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java

@@ -190,5 +190,5 @@ public final class Editor
 
   @FeatureStatus
   public static native int nativeGetMapObjectStatus();
-  public static native boolean nativeAreSomeFeatureChangesUploaded();
+  public static native boolean nativeIsMapObjectUploaded();
 }

android/sdk/src/main/res/values-bn/types_strings.xml

@@ -34,20 +34,4 @@
     <string name="type.amenity.parking.street_side.private">ব্যক্তিগত সড়ক-পার্শ্ববর্তী পার্কিং</string>
     <string name="type.amenity.parking.lane">লেন পার্কিং</string>
     <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং</string>
-    <string name="type.aeroway.aerodrome">বিমানবন্দর</string>
-    <string name="type.aeroway.aerodrome.international">আন্তর্জাতিক বিমানবন্দর</string>
-    <string name="type.amenity.drinking_water">পানীয় জল</string>
-    <string name="type.office.diplomatic">দূতাবাস</string>
-    <string name="type.natural.water.river">নদী</string>
-    <string name="type.natural.tree">গাছ</string>
-    <string name="type.natural.water.pond">পুকুর</string>
-    <string name="type.natural.volcano">আগ্নেয়গিরি</string>
-    <string name="type.natural.desert">মরুভূমি</string>
-    <string name="type.natural.coastline">উপকূলরেখা</string>
-    <string name="type.amenity.college">কলেজ</string>
-    <string name="type.amenity.music_school">গানের স্কুল</string>
-    <string name="type.amenity.place_of_worship.muslim">মসজিদ</string>
-    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির</string>
-    <string name="type.amenity.prison">কারাগার</string>
-    <string name="type.barrier.fence">বেড়া</string>
 </resources>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -154,7 +154,7 @@
     <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
     <string name="type.amenity.shelter.basic_hut">Biwakschachtel</string>
     <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Überdachung zum Schlafen</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Wetterschutz</string>
     <string name="type.amenity.public_bath">Öffentliches Bad</string>
     <string name="type.amenity.shower">Dusche</string>
     <string name="type.amenity.stripclub">Stripclub</string>
@@ -173,7 +173,7 @@
     <string name="type.amenity.vending_machine.food">Essensautomat</string>
     <string name="type.amenity.vending_machine.newspapers">Zeitungsautomat</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkautomat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">5Fahrkartenautomat|4Ticketautomat|4Busticket|4Zugticket|5Bahnticket|4Zugfahrschein|U+1F3AB|U+1F39F|U+1F9FE</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Fahrkartenautomat</string>
     <string name="type.amenity.vending_machine.sweets">Süßigkeitenautomat</string>
     <string name="type.amenity.vending_machine.excrement_bags">Hundekotbeutelspender</string>
     <string name="type.amenity.parcel_locker">Paketstation</string>
@@ -377,7 +377,7 @@
     <string name="type.cardinal.east">Ost</string>
     <string name="type.cardinal.north">Nord</string>
     <string name="type.cardinal.south">Süd</string>
-    <string name="type.cardinal.west">Westen</string>
+    <string name="type.cardinal.west">West</string>
     <!-- A mountain rescue base for search and rescue activities. -->
     <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>
     <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
@@ -1502,5 +1502,4 @@
     <string name="type.amenity.mobile_money_agent">Mobile Money Vertretung</string>
     <string name="type.amenity.food_sharing">Food Sharing</string>
     <string name="type.natural.sand">Sand</string>
-    <string name="type.amenity.hydrant">Beregnungshydrant</string>
 </resources>

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

@@ -35,12 +35,4 @@
     <string name="mb">MB</string>
     <string name="mi">μι</string>
     <string name="today">Σήμερα</string>
-    <string name="yesterday">Χθες</string>
-    <string name="days_ago">%s μέρες πριν</string>
-    <string name="week_ago">%s εβδομάδα πριν</string>
-    <string name="weeks_ago">%s εβδομάδες πριν</string>
-    <string name="month_ago">%s μήνα πριν</string>
-    <string name="months_ago">%s μήνες πριν</string>
-    <string name="year_ago">%s χρόνο πριν</string>
-    <string name="years_ago">%s χρόνια πριν</string>
 </resources>

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

@@ -37,11 +37,11 @@
     <string name="gb">GB</string>
     <string name="today">Hoy</string>
     <string name="yesterday">Ayer</string>
-    <string name="days_ago">hace %s días</string>
+    <string name="days_ago">Hace %s días</string>
-    <string name="week_ago">hace %s semana</string>
+    <string name="week_ago">Hace %s semana</string>
-    <string name="weeks_ago">hace %s semanas</string>
+    <string name="weeks_ago">Hace %s semanas</string>
-    <string name="month_ago">hace %s mes</string>
+    <string name="month_ago">Hace %s mes</string>
-    <string name="months_ago">hace %s meses</string>
+    <string name="months_ago">Hace %s meses</string>
-    <string name="year_ago">hace %s año</string>
+    <string name="year_ago">Hace %s año</string>
-    <string name="years_ago">hace %s años</string>
+    <string name="years_ago">Hace %s años</string>
 </resources>

android/sdk/src/main/res/values-es/types_strings.xml

@@ -50,7 +50,7 @@
     <string name="type.amenity.cinema">Cine</string>
     <string name="type.leisure.bowling_alley">Bolera</string>
     <string name="type.amenity.clinic">Clínica</string>
-    <string name="type.amenity.college">Colegio universitario</string>
+    <string name="type.amenity.college">Facultad</string>
     <string name="type.amenity.community_centre">Centro comunitario</string>
     <string name="type.amenity.compressed_air">Aire comprimido</string>
     <string name="type.amenity.conference_centre">Centro de conferencias</string>
@@ -213,11 +213,11 @@
     <string name="type.boundary">Frontera</string>
     <string name="type.boundary.administrative">Frontera administrativa</string>
     <!-- Borders between countries. -->
-    <string name="type.boundary.administrative.2">Frontera nacional</string>
+    <string name="type.boundary.administrative.2">Frontera de país</string>
     <!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
-    <string name="type.boundary.administrative.3">Frontera regional</string>
+    <string name="type.boundary.administrative.3">Frontera de región</string>
     <!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
-    <string name="type.boundary.administrative.4">Frontera regional</string>
+    <string name="type.boundary.administrative.4">Frontera de región</string>
     <string name="type.boundary.national_park">Parque nacional</string>
     <string name="type.boundary.aboriginal_lands">Tierras indígenas</string>
     <string name="type.boundary.protected_area">Área protegida</string>
@@ -299,7 +299,7 @@
     <string name="type.cuisine.german">Alemana</string>
     <string name="type.cuisine.greek">Griega</string>
     <string name="type.cuisine.grill">Parrilla</string>
-    <string name="type.cuisine.heuriger">Heuriger</string>
+    <string name="type.cuisine.heuriger">Heuriger (especialidad austríaca)</string>
     <string name="type.cuisine.hotdog">Perritos calientes</string>
     <string name="type.cuisine.hungarian">Húngara</string>
     <string name="type.cuisine.ice_cream">Helados</string>
@@ -568,7 +568,7 @@
     <string name="type.historic.memorial.plaque">Placa conmemorativa</string>
     <string name="type.historic.memorial.sculpture">Escultura</string>
     <string name="type.historic.memorial.statue">Estatua</string>
-    <string name="type.historic.memorial.stolperstein">Stolperstein (memorial de las víctimas del nazismo)</string>
+    <string name="type.historic.memorial.stolperstein">Stolperstein (memoriales de las víctimas del nazismo)</string>
     <string name="type.historic.stone">Piedra histórica</string>
     <string name="type.historic.memorial.war_memorial">Memorial de guerra</string>
     <string name="type.historic.mine">Mina histórica</string>
@@ -663,7 +663,7 @@
     <string name="type.man_made">Artificial</string>
     <string name="type.man_made.breakwater">Rompeolas</string>
     <string name="type.man_made.cairn">Mojón</string>
-    <string name="type.man_made.chimney">Chimenea</string>
+    <string name="type.man_made.chimney">Chimenea de fábrica</string>
     <string name="type.man_made.cutline">Línea de corte forestal</string>
     <string name="type.man_made.survey_point">Punto geodésico</string>
     <string name="type.man_made.flagpole">Asta de bandera</string>
@@ -707,7 +707,7 @@
     <string name="type.natural.beach.sand">Playa de arena</string>
     <string name="type.natural.beach.gravel">Playa de grava</string>
     <string name="type.natural.cape">Cabo</string>
-    <string name="type.natural.cave_entrance">Entrada de cueva</string>
+    <string name="type.natural.cave_entrance">Cueva</string>
     <string name="type.natural.cliff">Acantilado</string>
     <string name="type.natural.earth_bank">Talud de tierra</string>
     <string name="type.man_made.embankment">Terraplén</string>
@@ -743,7 +743,7 @@
     <string name="type.natural.wetland.marsh">Ciénaga</string>
     <string name="type.noexit">Sin salida</string>
     <string name="type.office">Oficina</string>
-    <string name="type.office.company">Oficina de compañía</string>
+    <string name="type.office.company">Oficina</string>
     <string name="type.office.estate_agent">Agente inmobiliario</string>
     <string name="type.office.government">Oficina gubernamental</string>
     <string name="type.office.insurance">Oficina de seguros</string>
@@ -784,13 +784,13 @@
     <string name="type.place.state">Estado</string>
     <string name="type.place.state.USA">Estado</string>
     <!-- Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) -->
-    <string name="type.place.suburb">Suburbio</string>
+    <string name="type.place.suburb">Barrio</string>
     <string name="type.place.town">Pueblo</string>
     <string name="type.place.village">Pueblo</string>
     <string name="type.power">Energía</string>
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
-    <string name="type.power.generator.wind">Aerogenerador</string>
+    <string name="type.power.generator.wind">Generador de viento</string>
     <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
     <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
@@ -849,10 +849,10 @@
     <string name="type.railway.station">Estación de tren</string>
     <string name="type.railway.station.funicular">Funicular</string>
     <string name="type.railway.station.light_rail">Estación de tren</string>
-    <string name="type.railway.station.light_rail.berlin">Estación de tren (S-Bahn)</string>
+    <string name="type.railway.station.light_rail.berlin">Estación de tren</string>
     <string name="type.railway.station.light_rail.london">Estación de tren</string>
-    <string name="type.railway.station.light_rail.porto">Metro de Porto</string>
+    <string name="type.railway.station.light_rail.porto">Estación de tren</string>
-    <string name="type.railway.station.monorail">Estación de monoriel</string>
+    <string name="type.railway.station.monorail">Estación de tren</string>
     <string name="type.railway.station.subway">Estación de metro</string>
     <string name="type.railway.station.subway.adana">Estación de metro</string>
     <string name="type.railway.station.subway.algiers">Estación de metro</string>
@@ -1101,28 +1101,28 @@
     <string name="type.shop.books">Librería</string>
     <string name="type.shop.butcher">Carnicería</string>
     <string name="type.shop.cannabis">Tienda de cánnabis</string>
-    <string name="type.shop.car">Concesionario de automóviles</string>
+    <string name="type.shop.car">Concesionario de coches</string>
     <string name="type.shop.car_parts">Piezas de automóvil</string>
-    <string name="type.shop.car_repair">Taller de automóviles</string>
+    <string name="type.shop.car_repair">Taller</string>
     <string name="type.shop.car_repair.tyres">Reparación de neumáticos</string>
     <string name="type.shop.caravan">Concesionario de caravanas</string>
-    <string name="type.shop.carpet">Tienda de alfombras</string>
+    <string name="type.shop.carpet">Alfombras</string>
     <string name="type.shop.chemist">Droguería</string>
     <string name="type.shop.chocolate">Chocolatería</string>
     <string name="type.shop.clothes">Tienda de ropa</string>
     <string name="type.shop.coffee">Tienda de café</string>
     <string name="type.shop.computer">Tienda de informática</string>
-    <string name="type.shop.confectionery">Tienda de dulces</string>
+    <string name="type.shop.confectionery">Confitería</string>
     <string name="type.shop.convenience">Tienda de barrio</string>
-    <string name="type.shop.copyshop">Copistería</string>
+    <string name="type.shop.copyshop">Centro de copiado</string>
     <string name="type.shop.cosmetics">Tienda de cosméticos</string>
-    <string name="type.shop.curtain">Tienda de cortinas</string>
+    <string name="type.shop.curtain">Cortinas</string>
     <string name="type.shop.deli">Tienda de delicatessen</string>
     <string name="type.shop.department_store">Grandes almacenes</string>
     <string name="type.shop.doityourself">Tienda de bricolaje</string>
     <string name="type.shop.dry_cleaning">Tintorería</string>
-    <string name="type.shop.electronics">Tienda de electrónica</string>
+    <string name="type.shop.electronics">Electrónica</string>
-    <string name="type.shop.erotic">Tienda erótica</string>
+    <string name="type.shop.erotic">Sex Shop</string>
     <string name="type.shop.fabric">Tienda de telas</string>
     <string name="type.shop.farm">Tienda de alimentos de granja</string>
     <string name="type.shop.fashion_accessories">Accesorios de moda</string>
@@ -1130,7 +1130,7 @@
     <string name="type.shop.funeral_directors">Funeraria</string>
     <string name="type.shop.furniture">Tienda de muebles</string>
     <string name="type.shop.garden_centre">Vivero</string>
-    <string name="type.shop.gas">Tienda de gas</string>
+    <string name="type.shop.gas">Tienda de gasolina</string>
     <string name="type.shop.gift">Tienda de regalos</string>
     <string name="type.shop.greengrocer">Frutería</string>
     <string name="type.shop.grocery">Tienda de comestibles</string>
@@ -1147,12 +1147,12 @@
     <string name="type.shop.laundry">Lavandería</string>
     <string name="type.shop.mall">Centro comercial</string>
     <string name="type.shop.massage">Salón de masajes</string>
-    <string name="type.shop.mobile_phone">Tienda de móviles</string>
+    <string name="type.shop.mobile_phone">Tienda de Móviles</string>
     <string name="type.shop.money_lender">Prestamista</string>
     <string name="type.shop.motorcycle">Tienda de motos</string>
     <string name="type.shop.motorcycle_repair">Taller de motos</string>
     <string name="type.shop.music">Tienda de discos</string>
-    <string name="type.shop.musical_instrument">Tienda de instrumentos musicales</string>
+    <string name="type.shop.musical_instrument">Instrumentos musicales</string>
     <string name="type.shop.newsagent">Puesto de venta de periódicos</string>
     <string name="type.shop.optician">Óptica</string>
     <string name="type.shop.outdoor">Equipamiento de ocio al aire libre</string>
@@ -1204,10 +1204,10 @@
     <string name="type.shop.perfumery">Perfumería</string>
     <string name="type.shop.sewing">Materiales de costura</string>
     <string name="type.shop.storage_rental">Alquiler de almacenamiento</string>
-    <string name="type.shop.tobacco">Tabaquería</string>
+    <string name="type.shop.tobacco">Tabaco</string>
     <string name="type.shop.trade">Suministros comerciales</string>
-    <string name="type.shop.watches">Relojería</string>
+    <string name="type.shop.watches">Relojes</string>
-    <string name="type.shop.wholesale">Tienda al por mayor</string>
+    <string name="type.shop.wholesale">Almacén al por mayor</string>
     <string name="type.sport">Deporte</string>
     <string name="type.sport.american_football">Fútbol americano</string>
     <string name="type.sport.archery">Tiro al arco</string>
@@ -1247,7 +1247,7 @@
     <string name="type.tourism.aquarium">Acuario</string>
     <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
     <string name="type.tourism.alpine_hut">Albergue de montaña</string>
-    <string name="type.tourism.apartment">Apartamento vacacional</string>
+    <string name="type.tourism.apartment">Apartamento de vacaciones</string>
     <string name="type.tourism.artwork">Obra de arte</string>
     <string name="type.tourism.artwork.architecture">Arte arquitectónico</string>
     <string name="type.tourism.artwork.painting">Pintura</string>
@@ -1341,11 +1341,11 @@
     <string name="type.piste_type.hike">Ruta de senderismo en la nieve</string>
     <string name="type.piste_type.connection">Conexión de pistas</string>
     <string name="type.piste_type.skitour">Sendero Skitour</string>
-    <string name="type.amenity.events_venue">Recinto para eventos</string>
+    <string name="type.amenity.events_venue">Lugar para eventos</string>
     <string name="type.shop.auction">Subasta</string>
     <string name="type.shop.collector">Coleccionables</string>
     <string name="type.self_service.yes">Autoservicio disponible</string>
-    <string name="type.self_service.only">Sólo autoservicio</string>
+    <string name="type.self_service.only">Solo autoservicio</string>
     <string name="type.self_service.partially">Autoservicio parcial</string>
     <string name="type.self_service.no">Sin autoservicio</string>
     <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
@@ -1373,7 +1373,7 @@
     <string name="type.railway.narrow_gauge.tunnel">Túnel de vía férrea estrecha</string>
     <string name="type.railway.light_rail.bridge">Puente de tren ligero</string>
     <string name="type.highway.ladder">Escalera</string>
-    <string name="type.amenity.studio">Estudio multimedia</string>
+    <string name="type.amenity.studio">Estudio</string>
     <string name="type.landuse.plant_nursery">Vivero de plantas</string>
     <string name="type.barrier.guard_rail">Guardarraíl</string>
     <string name="type.sport.diving">Salto de trampolín</string>

android/sdk/src/main/res/values-et/types_strings.xml

@@ -173,7 +173,7 @@
     <string name="type.amenity.vending_machine.food">Toiduautomaat</string>
     <string name="type.amenity.vending_machine.newspapers">Ajalehtede automaat</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkimispiletite automaat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Ühistranspordi piletiautomaat</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Piletiautomaat</string>
     <string name="type.amenity.vending_machine.sweets">Maiustuste automaat</string>
     <string name="type.amenity.vending_machine.excrement_bags">Väljaheitekottide automaat</string>
     <string name="type.amenity.parcel_locker">Pakiautomaat</string>
@@ -1494,5 +1494,4 @@
     <string name="type.spherical_buoy.safe_water">Faarvaatri kerapoi</string>
     <string name="type.man_made.mast.communication">Sidemast</string>
     <string name="type.shop.beauty.nails">Küünestuudio</string>
-    <string name="type.amenity.hydrant">Kastmishüdrant</string>
 </resources>

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

@@ -11,7 +11,7 @@
     <string name="category_wifi">وای‌فای</string>
     <string name="postal_code">کد پستی</string>
     <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">خَجَک نقشه</string>
+    <string name="core_placepage_unknown_place">خَجَکِ نقشه</string>
     <!-- abbreviation for meters -->
     <string name="m">متر</string>
     <!-- abbreviation for kilometers -->