[search] Add synonyms

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

.forgejo/CODEOWNERS

@@ -1,69 +1,55 @@
-# All non-assigned.
-* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @organicmaps/design
-/android/app/src/main/res/font/ @organicmaps/design
-/android/app/src/main/res/mipmap*/ @organicmaps/design
-/data/*.ttf @organicmaps/design
-/data/resources-svg/ @organicmaps/design
-/data/search-icons/ @organicmaps/design
-/iphone/Maps/Images.xcassets/ @organicmaps/design
+/android/app/src/main/res/drawable*/ @comaps/design
+/android/app/src/main/res/font/ @comaps/design
+/android/app/src/main/res/mipmap*/ @comaps/design
+/data/*.ttf @comaps/design
+/data/resources-svg/ @comaps/design
+/data/search-icons/ @comaps/design
+/iphone/Maps/Images.xcassets/ @comaps/design
 # Android.
-/android/ @organicmaps/android
-/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
-/docs/JAVA_STYLE.md @organicmaps/android
+/android/ @comaps/android
+/android/app/src/main/java/app/comaps/car/ @comaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @comaps/android
+/docs/JAVA_STYLE.md @comaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @organicmaps/ios
-/xcode/ @organicmaps/ios
-/docs/OBJC_STYLE.md @organicmaps/ios
+/iphone/ @comaps/ios
+/xcode/ @comaps/ios
+/docs/OBJC_STYLE.md @comaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
-# Qt
-/qt/ @organicmaps/qt
-# Rendering
-/drape/ @organicmaps/rendering
-/drape_frontend/ @organicmaps/rendering
-# Map Data.
-/tools/python/maps_generator/ @organicmaps/data
-/generator/ @organicmaps/data
-/topography_generator/ @organicmaps/data
-/data/borders/ @organicmaps/data
-/data/conf/isolines/ @organicmaps/data
-/docs/SUBWAY_GENERATION.md @organicmaps/data
-/docs/MAPS.md @organicmaps/data
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
 # no owner (changed often to add a new POI)
 /generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-/data/styles/ @organicmaps/styles
-/data/types.txt @organicmaps/styles
-/data/visibility.txt @organicmaps/styles
-/data/mapcss-mapping.csv @organicmaps/styles
-/data/replaced_tags.txt @organicmaps/styles
-/data/classificator.txt @organicmaps/styles
-/data/drules_* @organicmaps/styles
+/data/styles/ @comaps/styles
+/data/types.txt @comaps/styles
+/data/visibility.txt @comaps/styles
+/data/mapcss-mapping.csv @comaps/styles
+/data/replaced_tags.txt @comaps/styles
+/data/classificator.txt @comaps/styles
+/data/drules_* @comaps/styles
 /docs/STYLES.md
-/tools/kothic/ @organicmaps/styles
+/tools/kothic/ @comaps/styles
 # DevOps.
-/.forgejo/workflows @organicmaps/devops
-/android/*gradle* @organicmaps/devops
-/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
-/xcode/fastlane/ @organicmaps/devops
-# Growth.
-README.md @organicmaps/growth
-/.forgejo/FUNDING.yml @organicmaps/growth
-/android/app/src/fdroid/play/ @organicmaps/growth
-/android/app/src/google/play/ @organicmaps/growth
-/iphone/metadata/ @organicmaps/growth
+/.forgejo/workflows @comaps/devops
+/android/*gradle* @comaps/devops
+/docs/RELEASE_MANAGEMENT.md @comaps/devops
+/xcode/fastlane/ @comaps/devops
+/tools/python/maps_generator/ @comaps/devops
+/generator/ @comaps/devops
+/topography_generator/ @comaps/devops
+/data/borders/ @comaps/devops
+/data/conf/isolines/ @comaps/devops
+/docs/SUBWAY_GENERATION.md @comaps/devops
+/docs/MAPS.md @comaps/devops
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @comaps/devops
 # Legal.
-LEGAL @organicmaps/legal
-LICENSE @organicmaps/legal
-NOTICE @organicmaps/legal
-CONTRIBUTORS @organicmaps/legal
-/docs/CODE_OF_CONDUCT.md @organicmaps/legal
-/docs/DCO.md @organicmaps/legal
-/docs/GOVERNANCE.md @organicmaps/legal
+LEGAL @comaps/admins
+LICENSE @comaps/admins
+NOTICE @comaps/admins
+CONTRIBUTORS @comaps/admins
+/docs/CODE_OF_CONDUCT.md @comaps/admins
+/docs/DCO.md @comaps/admins
+/docs/GOVERNANCE.md @comaps/admins

.forgejo/FUNDING.yml

@@ -1 +1,3 @@
 open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]

.forgejo/workflows/map-generator.yml

@@ -105,17 +105,17 @@ jobs:
         run: |
           echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
           cd ~
-          git clone --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
+          git clone --depth 1 --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
       - name: Checkout wikiparser repo
         shell: bash
         run: |
           cd ~
-          git clone https://codeberg.org/comaps/wikiparser.git
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/wikiparser.git
       - name: Checkout subways repo
         shell: bash
         run: |
           cd ~
-          git clone https://codeberg.org/comaps/subways.git
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
 
   copy-coasts:
     # if: inputs.run-copy-coasts

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]

.gitignore

@@ -155,6 +155,8 @@ android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 ./server/
 iphone/Maps/app.omaps/
+# Generated file
+libs/indexer/localized_types_map.cpp
 
 *.li
 

CONTRIBUTORS

@@ -1,15 +1,17 @@
 This file contains a list of people who have contributed to this project.
-Its not neccesarily comprehensive.
+It is not necessarily comprehensive as contributors must manually add themselves.
 Feel free to add yourself here along with your first contribution!
 
 --------------------------------------------------------------------------------
 CoMaps contributors:
-(in alphabetic order)
+(in alphabetical order)
 --------------------------------------------------------------------------------
 
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
+NoelClick
+thesupertechie
 vikiawv
 Yannik Bloscheck
 

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

@@ -0,0 +1,32 @@
+Una aplicació de mapes gratuïta i de codi obert dirigida per la comunitat basada en dades d'OpenStreetMap i reforçada amb el compromís amb la transparència, la privadesa i la no ànim de lucre. CoMaps és una derivació/fork d'Organic Maps, que al seu torn és una derivació de Maps.ME.
+
+Llegiu sobre els motius del projecte i la seva direcció a <b><i>codeberg.org/comaps</i></b>.
+Uneix-te a la comunitat i ajuda a crear la millor aplicació de mapes
+• Utilitza l'aplicació i difon-la
+• Dona comentaris i informa de problemes
+• Actualitza les dades del mapa a l'aplicació o al lloc web d'OpenStreetMap
+
+‣ <b>Enfocat fora de línia</b>: Planifica i navega pel teu viatge a l'estranger sense necessitat de servei mòbil, cerca punts de referència mentre fas una excursió llunyana, etc. Totes les funcions de l'aplicació estan dissenyades per funcionar fora de línia.
+‣ <b>Respecte a la privadesa</b>: L'aplicació està dissenyada tenint en compte la privadesa: no identifica persones, no fa seguiment i no recopila informació personal. Sense anuncis.
+‣ <b>Senzill i polit</b>: funcions essencials fàcils d'utilitzar que simplement funcionen.
+‣ <b>Estalvia bateria i espai</b>: No consumeix bateria com altres aplicacions de navegació. Els mapes compactes estalvien espai preciós al telèfon.
+‣ <b>Gratuït i creat per la comunitat</b>: Gent com tu ha ajudat a crear l'aplicació afegint llocs a OpenStreetMap, provant i donant comentaris sobre les funcions i aportant les seves habilitats de desenvolupament i diners.
+‣ <b>Presa de decisions i finances obertes i transparents, sense ànim de lucre i de codi obert.</b>
+
+<b>Característiques principals</b>:
+• Mapes detallats descarregables amb llocs que no estan disponibles amb Google Maps
+• Mode exterior amb rutes de senderisme destacades, càmpings, fonts d'aigua, pics, corbes de nivell, etc.
+• Senders per caminar i carrils bici
+• Punts d'interès com restaurants, gasolineres, hotels, botigues, llocs d'interès i molts més
+• Cerca per nom, adreça o categoria de punt d'interès
+• Navegació amb anuncis de veu per caminar, anar amb bicicleta o conduir
+• Marca els teus llocs preferits amb un sol toc
+• Articles de la Viquipèdia fora de línia
+• Capa i indicacions de trànsit de metro
+• Enregistrament de rutes
+• Exporta i importa marcadors i rutes en formats KML, KMZ i GPX
+• Un mode fosc per utilitzar durant la nit
+• Millora les dades del mapa per a tothom mitjançant un editor bàsic integrat
+
+<b>La llibertat és aquí</b>
+Descobreix el teu viatge, navega pel món amb la privadesa i la comunitat al capdavant!

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

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

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

@@ -1,13 +1,10 @@
-• Fixed voice directions pronouncing weird symbols in the beginning
-• OpenStreetMap data as of November 23
-
-Changes in the previous release:
-• Added trees
-• Made bus stop icons smaller and show up earlier
-• Reduce visibility of entrances
-• Added several other POI types
-• Show sand areas on the map
-• Add business is vacant option to the OSM editor
-• Improved road shields in Europe
-• Avoid paved roads routing option
-• Added icons to the settings page
+• OpenStreetMap data as of December 9
+• Use Material 3 themes
+• Support charging sockets in OSM Editor
+• Added schuko/type-E charge sockets
+• Improved search results ranking
+• Enabled Lithuanian and Latvian in voice announcements
+• Improved size of driving indications
+• Base zoom level on distance to next turn
+• Reordered settings
+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

@@ -0,0 +1,10 @@
+• Données OpenStreetMap du 9 Décembre
+• Utilisation de Material 3
+• Support de l'édition des bornes de recharge dans l'éditeur OSM
+• Ajout du type de prise schuko/type-E
+• Amélioration de l'ordre des résultats de recherche
+• Ajout du lituanien et du letton dans le guidage vocal
+• Amélioration de la taille des instructions dans la navigation
+• Niveau de zoom basé sur la distance jusqu’au prochain virage
+• Réorganisation des paramètres
+Plus de détails sur codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1 @@
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės

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

@@ -0,0 +1 @@
+CoMaps – keliaukite atsijungę ir privačiai

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

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

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

@@ -1,20 +1,20 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
+Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
 
-Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preberite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
 Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Uporabljajte orodje in širite glas o njem
 • Dajajte povratne informacije in poročajte o napakah
 • Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap
 
-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
+‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potovanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
 ‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
 ‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
 ‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
 ‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>
 
 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih zemljevidih niso na voljo.
 • Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več

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

@@ -68,4 +68,4 @@ Por favor, informa de errores, sugiere ideas y únete a nuestra comunidad en el
 
 <b>La Libertad Está Aquí</b>
 
-Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.
+¡Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad!

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

@@ -0,0 +1 @@
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės

android/app/src/google/play/listings/lt/title.txt

@@ -0,0 +1 @@
+CoMaps – naviguokite privačiai

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

@@ -1 +1 @@
-CoMaps - Usmerjajte zasebno
+CoMaps - Usmerjajte se zasebno

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

@@ -18,6 +18,7 @@ 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;
@@ -25,7 +26,15 @@ 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;
@@ -38,11 +47,7 @@ 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;
 
@@ -54,6 +59,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   private MaterialTextView mTvMessage;
   private LinearProgressIndicator mProgress;
   private MaterialButton mBtnDownload;
+  private MaterialButton mBtnAdvanced;
   private MaterialCheckBox mChbDownloadCountry;
 
   private String mCurrentCountry;
@@ -267,6 +273,14 @@ 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];
@@ -291,6 +305,11 @@ 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()
@@ -359,6 +378,9 @@ 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.
@@ -428,12 +450,16 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(PAUSE))
+                           .setOnCancelListener((dialog) -> setAction(RESUME))
                            .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/MwmActivity.java

@@ -107,6 +107,7 @@ import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.settings.RoadType;
 import app.organicmaps.sdk.settings.UnitLocale;
+import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.PowerManagment;
@@ -132,7 +133,6 @@ import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textview.MaterialTextView;
-
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -1813,6 +1813,26 @@ public class MwmActivity extends BaseMwmFragmentActivity
     return false;
   }
 
+  private void deliverTtsMessage()
+  {
+    if (Config.isTtsMessageDelivered())
+      return;
+
+    String languageDisplayName = TtsPlayer.INSTANCE.getLanguageDisplayName();
+
+    if (languageDisplayName != null)
+    {
+      String navigationStartMessage = getResources().getString(R.string.navigation_start_tts_message);
+      navigationStartMessage += languageDisplayName;
+      Toast.makeText(this, navigationStartMessage, Toast.LENGTH_LONG).show();
+    }
+    else
+      Toast.makeText(this, getResources().getString(R.string.navigation_start_tts_disabled_message), Toast.LENGTH_LONG)
+          .show();
+
+    Config.setTtsMessageDelivered();
+  }
+
   private boolean showStartPointNotice()
   {
     final RoutingController controller = RoutingController.get();
@@ -2189,6 +2209,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!showRoutingDisclaimer())
       return;
 
+    deliverTtsMessage();
+
     closeFloatingPanels();
     setFullscreen(false);
     RoutingController.get().start();

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

@@ -0,0 +1,86 @@
+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/ProfileFragment.java

@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
@@ -23,6 +22,7 @@ import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.StackedButtonDialogFragment;
 import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.google.android.material.textview.MaterialTextView;
 import java.text.NumberFormat;
 
@@ -50,7 +50,7 @@ public class ProfileFragment extends BaseMwmToolbarFragment
   private MaterialTextView mEditsSent;
   private MaterialTextView mProfileName;
   private ShapeableImageView mProfileImage;
-  private ProgressBar mProfileInfoLoading;
+  private CircularProgressIndicator mProfileInfoLoading;
 
   @Nullable
   @Override

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

@@ -4,16 +4,23 @@ 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;
@@ -35,7 +42,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;
@@ -73,6 +80,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initScreenSleepEnabledPrefsCallbacks();
     initShowOnLockScreenPrefsCallbacks();
     initLeftButtonPrefs();
+    initCustomMapDownloadUrlPrefsCallbacks();
   }
 
   private void initLeftButtonPrefs()
@@ -535,6 +543,34 @@ 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/util/ThemeSwitcher.java

@@ -90,8 +90,7 @@ public enum ThemeSwitcher
     {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
         uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
 
       if (RoutingController.get().isVehicleNavigation())
         style = MapStyle.VehicleDark;
@@ -104,8 +103,7 @@ public enum ThemeSwitcher
     {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
         uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
 
       if (RoutingController.get().isVehicleNavigation())
         style = MapStyle.VehicleClear;

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

@@ -154,6 +154,7 @@ public class PlacePageView extends Fragment
   private MaterialTextView mTvLastChecked;
   private View mEditPlace;
   private View mAddPlace;
+  private View mMapTooOld;
   private View mEditTopSpace;
   private ShapeableImageView mColorIcon;
   private MaterialTextView mTvCategory;
@@ -318,6 +319,7 @@ public class PlacePageView extends Fragment
     mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
     mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
     mAddPlace = mFrame.findViewById(R.id.ll__place_add);
+    mMapTooOld = mFrame.findViewById(R.id.cv__map_too_old);
     mEditTopSpace = mFrame.findViewById(R.id.edit_top_space);
     latlon.setOnLongClickListener(this);
     address.setOnLongClickListener(this);
@@ -684,39 +686,84 @@ public class PlacePageView extends Fragment
 
     if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
     {
-      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace);
+      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace, mMapTooOld);
     }
     else
     {
       UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
       UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
+      UiUtils.hide(mMapTooOld);
       MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
       MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);
-      mTvEditPlace.setOnClickListener(this);
-      mTvAddPlace.setOnClickListener(this);
-      mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
-      mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
-      final int editTextButtonColor =
-          Editor.nativeShouldEnableEditPlace()
+
+      boolean shouldEnableEditPlace = Editor.nativeShouldEnableEditPlace();
+
+      if (shouldEnableEditPlace)
+      {
+        mTvEditPlace.setEnabled(true);
+        mTvAddPlace.setEnabled(true);
+        mTvEditPlace.setOnClickListener(this);
+        mTvAddPlace.setOnClickListener(this);
+      }
+      else
+      {
+        String countryId = MapManager.nativeGetSelectedCountry();
+
+        if (countryId != null && MapManager.nativeIsMapTooOldToEdit(countryId))
+        {
+          // 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
+              || map.status == CountryItem.STATUS_FAILED)
+          {
+            UiUtils.show(mMapTooOld);
+
+            boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
+            MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
+            UiUtils.showIf(canUpdateMap, mTvUpdateTooOldMap);
+
+            MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description);
+            if (canUpdateMap)
+            {
+              mapTooOldDescription.setText(R.string.place_page_map_too_old_description);
+              mTvUpdateTooOldMap.setOnClickListener((v) -> {
+                MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
+                UiUtils.hide(mMapTooOld);
+              });
+            }
+            else
+              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 =
+          shouldEnableEditPlace
               ? ContextCompat.getColor(
                     getContext(),
                     UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
               : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
-      final ColorStateList editStrokeButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-      },
-              new int[]{
-                      ContextCompat.getColor(
-                              getContext(),
-                              UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)),
-                      ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled)
-              });
-      mTvEditPlace.setTextColor(editTextButtonColor);
-      mTvAddPlace.setTextColor(editTextButtonColor);
-      mTvEditPlace.setStrokeColor(editStrokeButtonColor);
-      mTvAddPlace.setStrokeColor(editStrokeButtonColor);
+
+      mTvEditPlace.setTextColor(editButtonColor);
+      mTvAddPlace.setTextColor(editButtonColor);
+      mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
+      mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
       UiUtils.showIf(
           UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace),
           mEditTopSpace);

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_panel"/>
+  <solid android:color="@color/bg_window"/>
   <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_panel"/>
+  <solid android:color="@color/bg_window"/>
 </shape>

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

@@ -0,0 +1,11 @@
+<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/drawable/ic_minus.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h480q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L240,520Z"
+      android:pathData="M19,13H5v-2h14v2z"
       android:fillColor="#ffffff"/>
 </vector>

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

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M440,520L240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h200v-200q0,-17 11.5,-28.5T480,200q17,0 28.5,11.5T520,240v200h200q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L520,520v200q0,17 -11.5,28.5T480,760q-17,0 -28.5,-11.5T440,720v-200Z"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
       android:fillColor="@android:color/white"/>
 </vector>

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="48dp"
+  android:height="48dp"
+  android:viewportWidth="960"
+  android:viewportHeight="960"
+  android:tint="?colorControlNormal">
+  <path
+    android:fillColor="@android:color/white"
+    android:pathData="M453,680L513,680L513,440L453,440L453,680ZM479.98,366Q494,366 503.5,356.8Q513,347.6 513,334Q513,319.55 503.52,309.78Q494.04,300 480.02,300Q466,300 456.5,309.78Q447,319.55 447,334Q447,347.6 456.48,356.8Q465.96,366 479.98,366ZM480.27,880Q397.53,880 324.77,848.5Q252,817 197.5,762.5Q143,708 111.5,635.16Q80,562.32 80,479.5Q80,396.68 111.5,323.84Q143,251 197.5,197Q252,143 324.84,111.5Q397.68,80 480.5,80Q563.32,80 636.16,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,479.73Q880,562.47 848.5,635.23Q817,708 763,762.32Q709,816.63 636,848.32Q563,880 480.27,880ZM480.5,820Q622,820 721,720.5Q820,621 820,479.5Q820,338 721.19,239Q622.38,140 480,140Q339,140 239.5,238.81Q140,337.62 140,480Q140,621 239.5,720.5Q339,820 480.5,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>

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

@@ -33,9 +33,13 @@
         style="@style/MwmWidget.TextView.NavStreet"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:padding="@dimen/margin_quarter_plus"
         android:maxLines="2"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="center_vertical"
         android:gravity="center"
+        android:autoSizeTextType="uniform"
+        android:autoSizeMinTextSize="16sp"
+        android:autoSizeMaxTextSize="25sp"
         android:textColor="@android:color/white"
         tools:text="Sample street name.\nLong looooooooong!!!!"/>
     </RelativeLayout>

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

@@ -11,6 +11,18 @@
     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"
@@ -26,7 +38,7 @@
         app:tint="?colorSecondary"/>
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/head_message"
-        style="?fontHeadline6"
+        style="@style/TextAppearance.Headline6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
@@ -36,7 +48,7 @@
         android:text="@string/download_map_title" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/download_message"
-        style="?fontBody2"
+        style="@style/TextAppearance.Body2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"

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

@@ -28,7 +28,7 @@
         android:layout_marginBottom="8dp"
         android:text="@string/aa_connected_title"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+        android:textAppearance="@style/TextAppearance.Headline4"
         android:textStyle="bold" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:text="@string/car_used_on_the_car_screen"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
+        android:textAppearance="@style/TextAppearance.Body1" />
   </LinearLayout>
 
   <com.google.android.material.button.MaterialButton

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

@@ -20,7 +20,7 @@
       android:layout_marginStart="32dp"
       android:text="@string/aa_request_permission_activity_text"
       android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+      android:textAppearance="@style/TextAppearance.Headline4"
       android:textStyle="bold" />
 
   <com.google.android.material.button.MaterialButton

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

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

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

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

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

@@ -0,0 +1,22 @@
+<?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_edit_text.xml

@@ -14,7 +14,6 @@
     android:textAppearance="@style/MwmTextAppearance.Title" />
   <com.google.android.material.textfield.TextInputLayout
     android:id="@+id/et__input_layout"
-    style="?fontBody1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:hintEnabled="false">

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="?panel">
+    android:background="?windowBackgroundForced">
     <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="?panel"
+    android:background="?windowBackgroundForced"
     android:listSelector="?clickableBackground"
     android:drawSelectorOnTop="true"/>
 

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

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

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

@@ -17,7 +17,6 @@
     android:orientation="vertical">
     <com.google.android.material.textfield.TextInputLayout
       android:id="@+id/edit_bookmark_name_input"
-      style="?fontBody1"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:hint="@string/name"
@@ -61,7 +60,7 @@
       android:layout_below="@id/tv__bookmark_set_title"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?attr/selectableItemBackground"
+      android:background="?selectableItemBackground"
       android:clickable="true"
       android:paddingTop="@dimen/margin_quarter_plus"
       android:paddingBottom="@dimen/margin_half_plus"
@@ -88,7 +87,6 @@
       tools:src="@drawable/ic_bookmark_none" />
   </RelativeLayout>
   <com.google.android.material.textfield.TextInputLayout
-    style="?fontBody1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginEnd="@dimen/margin_half"

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

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

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="?attr/cardBackground"
+  android:background="?cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -11,7 +11,6 @@
     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="?attr/selectableItemBackgroundBorderless"
+        android:background="?selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />

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

@@ -402,11 +402,13 @@
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_half"
             android:fontFamily="@string/robotoMedium"
             android:text="@string/editor_other_info"
             android:textAppearance="@style/MwmTextAppearance.Body3"/>
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/custom_input"
+            android:layout_marginBottom="@dimen/margin_quarter"
             style="@style/MwmWidget.Editor.CustomTextInput"
             android:gravity="center_vertical"
             android:minHeight="74dp"
@@ -416,6 +418,7 @@
               android:id="@+id/input"
               style="@style/MwmWidget.Editor.FieldLayout.EditText"
               android:inputType="textMultiLine"
+              android:gravity="top"
               android:hint="@string/editor_note_hint"/>
         </com.google.android.material.textfield.TextInputLayout>
       </LinearLayout>

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

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

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

@@ -12,7 +12,6 @@
     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
@@ -30,12 +29,14 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_base"
       android:background="?colorPrimary">
-    <ProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/user_profile_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:trackColor="@color/text_light"
+        app:indicatorColor="@color/text_light"
         android:layout_gravity="center"
-        android:indeterminateTint="@color/text_light"
+        android:indeterminate="true"
         android:visibility="invisible"
         tools:visibility="visible" />
     <LinearLayout

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

@@ -10,12 +10,12 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:visibility="gone" />
-    <ProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
       android:id="@+id/progress"
-      style="@style/Widget.AppCompat.ProgressBar"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="center" />
+      android:layout_gravity="center"
+      android:indeterminate="true"/>
     <include
       layout="@layout/feedback_fab"
       android:layout_width="match_parent"

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

@@ -22,8 +22,7 @@
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel">
+    android:layout_height="match_parent">
 
     <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="?attr/colorPrimary"
+      android:background="?colorPrimary"
       android:elevation="@dimen/dp_0"
       app:elevation="@dimen/dp_0">
         <include

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

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

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

@@ -10,12 +10,12 @@
     android:layout_height="match_parent"
     android:visibility="gone"/>
 
-  <ProgressBar
+  <com.google.android.material.progressindicator.CircularProgressIndicator
     android:id="@+id/progress"
-    style="@style/Widget.AppCompat.ProgressBar"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"/>
+    android:layout_gravity="center"
+    android:indeterminate="true"/>
 
   <include layout="@layout/shadow_top"/>
 </FrameLayout>

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

@@ -24,6 +24,6 @@
     android:layout_gravity="center_vertical"
     android:fontFamily="@string/robotoMedium"
     tools:text="Some text should go here"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
     android:textColor="?colorSecondary"/>
 </LinearLayout>

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

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

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

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

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

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

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

@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start|bottom"
-        android:background="@android:color/transparent"
         android:clickable="true"
         android:gravity="start|top"
         android:text="@string/category_desc_more"

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

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

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

@@ -14,7 +14,7 @@
     android:gravity="center"
     android:maxWidth="500dp"
     android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.MdcTypographyStyles.Headline6"
+    android:textAppearance="@style/TextAppearance.Headline6"
     android:textStyle="bold" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"

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

@@ -4,18 +4,16 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/name"
   android:layout_width="match_parent"
-  android:layout_height="@dimen/editor_height_field"
+  android:layout_height="wrap_content"
   android:animateLayoutChanges="true"
   android:gravity="center_vertical"
   android:orientation="horizontal">
   <com.google.android.material.textfield.TextInputLayout
     android:id="@+id/input_layout"
-    style="?fontBody1"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
-    android:hint="@string/editor_edit_place_name_hint"
-    android:textColorHint="?android:textColorSecondary">
+    android:hint="@string/editor_edit_place_name_hint">
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/input"
       style="@style/MwmWidget.Editor.FieldLayout.EditText"
@@ -31,5 +29,5 @@
     android:background="?selectableItemBackgroundBorderless"
     android:padding="@dimen/margin_half_plus"
     app:srcCompat="@drawable/ic_close"
-    app:tint="@color/base_red" />
+    app:tint="?iconTint" />
 </LinearLayout>

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

@@ -147,12 +147,12 @@
     <LinearLayout
       android:id="@+id/allday"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/editor_height_allday"
+      android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
       android:background="?clickableBackground"
       android:gravity="center_vertical"
       android:orientation="horizontal"
-      android:padding="@dimen/margin_half_plus">
+      android:padding="@dimen/margin_half">
 
       <com.google.android.material.textview.MaterialTextView
         android:layout_width="0dp"
@@ -164,7 +164,8 @@
       <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/sw__allday"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_quarter"/>
 
     </LinearLayout>
 

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

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

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

@@ -35,6 +35,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxLines="2"
+        android:padding="@dimen/margin_half"
+        android:autoSizeTextType="uniform"
+        android:autoSizeMinTextSize="19sp"
+        android:autoSizeMaxTextSize="24sp"
         android:minHeight="60dp"
         android:layout_gravity="center_vertical"
         android:gravity="center"

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">
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
       android:layout_width="match_parent"
       android:layout_height="@dimen/divider_height"
       android:background="?dividerHorizontal"/>

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

@@ -11,14 +11,14 @@
     style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_plus"
-    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
-    android:layout_marginBottom="@dimen/margin_half"
+    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
+    android:layout_marginBottom="@dimen/margin_eighth"
     android:contentDescription="@string/zoom_in"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_out"
     style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_minus"
-    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
+    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Plus"
     android:contentDescription="@string/zoom_out"/>
 </LinearLayout>

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

@@ -34,8 +34,7 @@
     android:textAppearance="?android:attr/textAppearance"
     android:gravity="start|top"
     android:textColor="?attr/colorSecondary"
-    android:text="@string/category_desc_more"
-    android:background="@android:color/transparent"/>
+    android:text="@string/category_desc_more" />
   <include
     layout="@layout/item_divider"/>
 </LinearLayout>

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="?panel"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
 
@@ -82,13 +82,15 @@
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/place_page_last_checked"
-    style="?fontCaption"
+    style="@style/TextAppearance.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/margin_half"
     android:paddingHorizontal="@dimen/margin_base"
     tools:text="Existence confirmed 1 month ago"/>
 
+  <include android:visibility="gone" layout="@layout/place_page_map_too_old"/>
+
   <include android:visibility="gone" layout="@layout/place_page_editor"/>
 
   <include android:visibility="gone" layout="@layout/place_page_add"/>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+android:id="@+id/cv__map_too_old"
+android:layout_width="match_parent"
+android:layout_height="wrap_content"
+android:layout_marginHorizontal="@dimen/margin_base"
+android:layout_marginTop="@dimen/margin_half"
+app:strokeWidth="1dp"
+app:strokeColor="@color/base_accent"
+app:cardBackgroundColor="@color/bg_cards">
+
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
+  android:padding="@dimen/margin_base"
+  android:gravity="center_vertical">
+
+  <com.google.android.material.imageview.ShapeableImageView
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_marginEnd="@dimen/margin_base"
+    app:srcCompat="@drawable/info_icon"
+    app:tint="@color/base_accent" />
+
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:orientation="vertical">
+
+    <com.google.android.material.textview.MaterialTextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_quarter"
+      android:text="@string/place_page_map_too_old_title"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      android:textStyle="bold"
+      android:textColor="?android:textColorPrimary" />
+
+    <com.google.android.material.textview.MaterialTextView
+      android:id="@+id/tv__map_too_old_description"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_quarter"
+      android:text="@string/place_page_map_too_old_description"
+      android:fontFamily="@string/robotoRegular"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textColor="?android:textColorPrimary" />
+
+    <com.google.android.material.button.MaterialButton
+      android:id="@+id/mb__update_too_old_map"
+      style="@style/MwmWidget.M3.Button.Primary"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:layout_gravity="end"
+      android:text="@string/place_page_update_too_old_map"/>
+
+  </LinearLayout>
+
+</LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>

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

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

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="?attr/selectableItemBackground"
+        android:background="?selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingStart="@dimen/margin_quarter"

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

@@ -6,11 +6,10 @@
   android:layout_height="match_parent"
   android:gravity="center"
   android:orientation="vertical">
-  <ProgressBar
-    style="@style/Widget.AppCompat.ProgressBar"
+  <com.google.android.material.progressindicator.CircularProgressIndicator
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@null" />
+    android:indeterminate="true"/>
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

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="?panel"
+    android:background="?cardBackground"
     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="?ppButtonsBackground"
+  android:background="?windowBackgroundForced"
   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="?attr/selectableItemBackgroundBorderless"
+            android:background="?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="?attr/drivingOptionsViewBg"
+    android:background="?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="?attr/selectableItemBackgroundBorderless"
+      android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
       <LinearLayout

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

@@ -6,9 +6,8 @@
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:contentDescription="@string/search_show_on_map"
-  style="@style/FAB"
+  style="@style/MwmWidget.ExtendedFAB"
   app:icon="@drawable/ic_show_on_map"
   android:text="@string/search_show_on_map"
   android:clickable="true"
-  android:focusable="true"
-  app:fabSize="mini"/>
+  android:focusable="true" />

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ProgressBar
+<com.google.android.material.progressindicator.CircularProgressIndicator
   xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/Widget.AppCompat.ProgressBar"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="@dimen/height_block_base"
   android:layout_height="@dimen/height_block_base"
   android:padding="@dimen/margin_half"
-  android:background="@null"/>
+  android:indeterminate="true"
+  app:trackColor="@color/text_light"
+  app:indicatorColor="@color/text_light" />

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="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
     tools:src="@drawable/ic_expand_more"
@@ -34,16 +34,17 @@
     android:singleLine="true"
     android:textCursorDrawable="@drawable/cursor_drawable" />
 
-  <ProgressBar
+  <com.google.android.material.progressindicator.CircularProgressIndicator
     android:id="@+id/progress"
-    style="@style/Widget.AppCompat.ProgressBar"
     android:layout_width="@dimen/search_progress_size"
     android:layout_height="@dimen/search_progress_size"
     android:layout_marginEnd="@dimen/margin_half"
     android:layout_weight="0"
-    android:background="@null"
     android:minHeight="@dimen/search_progress_size"
-    android:minWidth="@dimen/search_progress_size"/>
+    android:minWidth="@dimen/search_progress_size"
+    app:trackColor="@color/text_light"
+    app:indicatorColor="@color/text_light"
+    android:indeterminate="true"/>
 
   <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/clear"
@@ -51,7 +52,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@string/clear_the_search"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_close"/>
@@ -62,7 +63,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@null"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_mic_white"

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

@@ -295,7 +295,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Activeu els serveis de geolocalització</string>
     <string name="save">Desa</string>
-    <string name="create">crea</string>
+    <string name="create">Crear</string>
     <!-- red color -->
     <string name="red">Vermell</string>
     <!-- yellow color -->
@@ -473,7 +473,7 @@
     <string name="error_enter_correct_house_number">Introduïu un número d’edifici vàlid</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">El nombre de plantes no pot excedir de %d</string>
-    <string name="editor_zip_code">Codi postal</string>
+    <string name="editor_zip_code">Codi Postal</string>
     <string name="error_enter_correct_zip_code">Introduïu un codi postal vàlid</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota per als voluntaris d\'OpenStreetMap (opcional)</string>
@@ -521,8 +521,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Voleu enviar-ho a tots els usuaris?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal</string>
-    <string name="editor_share_to_all_dialog_message_2">Revisarem els canvis. Si tenim cap pregunta contactem amb vós via correu electrònic</string>
+    <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Els editors d\'OpenStreetMap revisaran els canvis. Et contactaran si tenen cap pregunta.</string>
     <string name="navigation_stop_button">Atura</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">S’està enregistrant el recorregut</string>
@@ -875,4 +875,49 @@
     <string name="delete_track_dialog_title">Voleu eliminar %s?</string>
     <string name="pref_tts_no_system_tts_short">No s\'ha trobat cap motor de text a veu, comproveu la configuració de l\'app</string>
     <string name="offline_explanation_title">Mapes sense Connexió</string>
+    <string name="charge_socket_schuko">EU Domèstic</string>
+    <string name="unknown_socket_type">endoll desconegut</string>
+    <string name="edit_socket_info_tooltip">Crea nous endolls o edita els existents.</string>
+    <string name="charging_station_available_sockets">Endolls disponibles</string>
+    <string name="charge_socket_unknown_other">Altres o desconegut</string>
+    <string name="charge_socket_count">Recompte</string>
+    <string name="charge_socket_power">Potència (kW)</string>
+    <string name="editor_socket">Editar endoll</string>
+    <string name="unknown_count">desconegut</string>
+    <string name="error_value_must_be_positive">El valor ha de ser positiu</string>
+    <string name="error_invalid_number">Número invàlid</string>
+    <string name="offline_explanation_text">Un mapa ha de ser desconegut per a veure i navegar l\'àrea.\nDescarrega mapes per a àrees on vulgues viatjar.</string>
+    <string name="list_description_empty">Edita la llista per afegir una descripció</string>
+    <string name="opens_at">Obre a %s</string>
+    <string name="closes_at">Tanca a %s</string>
+    <string name="opens_day_at">Obre els %1$s a %2$s</string>
+    <string name="closes_day_at">Tanca els %1$s a %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="many">%d mins</item>
+        <item quantity="other">%d mins</item>
+    </plurals>
+    <string name="editor_place_doesnt_exist_description">Descriu com és el lloc ara mateix per enviar una nota d\'error a la comunitat d\'OpenStreetMap</string>
+    <string name="editor_business_vacant_button">El negoci està vacant</string>
+    <string name="editor_mark_business_vacant_title">Marcar negoci com a vacant</string>
+    <string name="editor_mark_business_vacant_description">Fes servir aquesta funció si el negoci s\'ha mogut, i l\'espai està buit i llest per a un altre llogater.</string>
+    <string name="editor_submit">Enviar</string>
+    <string name="power_management">Gestió de Potència</string>
+    <string name="avoid_steps">Evita escales</string>
+    <string name="avoid_paved">Evita carreteres asfaltades</string>
+    <string name="unknown_power_output">desconegut</string>
+    <string name="charge_socket_type2">Tipus 2 (sense cable)</string>
+    <string name="charge_socket_type2_cable">Tipus 2 (amb cable)</string>
+    <string name="charge_socket_type2_combo">Tipus 2 comb.</string>
+    <string name="charge_socket_type1">Tipus 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="place_page_too_old_to_edit">L\'edició de dades d\'OpenStreetMap està deshabilitada perquè les dades del mapa són massa antigues.</string>
+    <string name="place_page_map_too_old_title">Dades del mapa desactualitzades</string>
+    <string name="place_page_map_too_old_description">Les teves dades de mapa son molt antigues, per favor actualitza el mapa.</string>
+    <string name="place_page_app_too_old_description">Les teues dades del mapa son molt antigues, per favor actualitza l\'app de CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualitzar regió del mapa</string>
+    <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>
 </resources>

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

@@ -905,4 +905,12 @@
     </plurals>
     <string name="power_management">Správa výkonu</string>
     <string name="charge_socket_schuko">Domovní EU</string>
+    <string name="prefs_speed_cameras_information">Upozornění na radary jsou vypnuty v zemích, kde je tato funkcionalita zakázána místními zákony.</string>
+    <string name="navigation_start_tts_message">"Spouštím navigaci, jazyk hlasových instrukcí: "</string>
+    <string name="place_page_map_too_old_title">Mapová data jsou zastaralá</string>
+    <string name="place_page_map_too_old_description">Vaše mapová data jsou velmi stará, doporučujeme je aktualizovat.</string>
+    <string name="place_page_app_too_old_description">Vaše aktuální mapová data jsou velmi stará, aktualizujte prosím aplikaci CoMaps.</string>
+    <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>
 </resources>

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

@@ -607,7 +607,7 @@
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Undgå betalingsveje</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">Undgå ikke-asfalterede veje</string>
+    <string name="avoid_unpaved">Undgå veje uden fast belægning</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_ferry">Undgå færger</string>
     <string name="avoid_motorways">Undgå motorveje</string>
@@ -894,4 +894,12 @@
     <string name="editor_submit">Indsend</string>
     <string name="power_management">Strømstyring</string>
     <string name="charge_socket_schuko">Europæisk</string>
+    <string name="prefs_speed_cameras_information">Advarsler om hastighedskameraer er deaktiveret i lande, hvor advarsler er forbudt i henhold til lokal lovgivning.</string>
+    <string name="navigation_start_tts_message">"Starter navigation, sprog for stemmeinstruktioner: "</string>
+    <string name="place_page_map_too_old_title">Kortdata forældet</string>
+    <string name="place_page_map_too_old_description">Dine nuværende kortdata er meget gamle. Opdater kortet.</string>
+    <string name="place_page_app_too_old_description">Dine nuværende kortdata er meget gamle. Opdater CoMaps-appen.</string>
+    <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>
 </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">Verwerfen</string>
+    <string name="editor_reset_edits_button">Änderungen 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,9 +902,17 @@
         <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 als leerstehend markieren</string>
+    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
     <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Wenn das Unternehmen ausgezogen ist und die Fläche leer und bereit für die nächste Miete ist.</string>
+    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Energiemanagement</string>
+    <string name="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>
 </resources>

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

@@ -68,7 +68,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Agregar una lista nueva</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre del grupo de marcadores</string>
+    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Marcadores</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -197,7 +197,7 @@
     <string name="prefs_group_information">Información</string>
     <string name="prefs_group_route">Navegación</string>
     <string name="pref_zoom_title">Botones de zoom</string>
-    <string name="pref_zoom_summary">Visualizar en la pantalla</string>
+    <string name="pref_zoom_summary">Ver en el mapa</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Modo nocturno</string>
     <!-- Generic «Off» string -->
@@ -246,7 +246,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Donar</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Apoya el proyecto</string>
+    <string name="how_to_support_us">Apoya y mejora el proyecto CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Derechos de autor</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -297,7 +297,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Por favor, activa los Servicios de Localización</string>
     <string name="save">Guardar</string>
-    <string name="create">crear</string>
+    <string name="create">Crear</string>
     <!-- red color -->
     <string name="red">Rojo</string>
     <!-- yellow color -->
@@ -493,7 +493,7 @@
     <string name="editor_category_unsuitable_title">¿No halla una categoría adecuada?</string>
     <string name="editor_category_unsuitable_text">CoMaps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añade dichas categorías directamente en <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulta nuestra <a href="https://www.comaps.app/support/advanced-map-editing/">guía</a> para obtener instrucciones detalladas paso a paso.</string>
     <string name="downloader_no_downloaded_maps_title">No has descargado ningún mapa</string>
-    <string name="downloader_no_downloaded_maps_message">Descargue mapas para encontrar la ubicación y navegar sin conexión</string>
+    <string name="downloader_no_downloaded_maps_message">Descarga mapas para buscar ubicaciones y navegar sin conexión</string>
     <string name="current_location_unknown_error_title">Se desconoce la ubicación actual</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
@@ -524,11 +524,11 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal</string>
-    <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta</string>
+    <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Grabando el trayeco</string>
+    <string name="track_recording">Grabando el trayecto</string>
     <!-- For the first routing -->
     <string name="accept">Aceptar</string>
     <!-- For the first routing -->
@@ -539,7 +539,7 @@
     <string name="mobile_data_option_not_today">No usar hoy</string>
     <string name="mobile_data">Internet móvil</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Se requiere Internet móvil para recibir notificaciones de actualización de mapas y cargar ediciones</string>
+    <string name="mobile_data_description">Se requiere conexión a Internet para recibir notificaciones de actualización de mapas y cargar ediciones</string>
     <string name="mobile_data_option_never">No usar nunca</string>
     <string name="mobile_data_option_ask">Preguntar siempre</string>
     <string name="traffic_update_maps_text">Para mostrar los datos de tráfico, deben actualizarse los mapas</string>
@@ -914,4 +914,12 @@
     <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
     <string name="editor_submit">Enviar</string>
     <string name="power_management">Gestión de energía</string>
+    <string name="place_page_map_too_old_title">Datos del mapa anticuados</string>
+    <string name="place_page_map_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza el mapa.</string>
+    <string name="place_page_app_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza la aplicación CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizar mapa de la región</string>
+    <string name="place_page_too_old_to_edit">La edición de OpenStreetMap está deshabilitada porque los datos del mapa están muy anticuados.</string>
+    <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>
 </resources>

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

@@ -903,4 +903,12 @@
     <string name="editor_submit">Saada</string>
     <string name="power_management">Toitehaldus</string>
     <string name="charge_socket_schuko">EU-sisene</string>
+    <string name="prefs_speed_cameras_information">Kiiruskaamerate teavitused on nendes riikides lülitatud välja, kus seda keelab kohalik seadusandlus.</string>
+    <string name="navigation_start_tts_message">"Alustan tee juhatamist, hääljuhiste keel: "</string>
+    <string name="place_page_map_too_old_title">Kaardiandmed on aegunud</string>
+    <string name="place_page_map_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda andmeid.</string>
+    <string name="place_page_app_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda CoMapsi rakendust.</string>
+    <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>
 </resources>

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

@@ -868,4 +868,5 @@
     <string name="opens_day_at">1$s ean %2$s tan irekitzen da</string>
     <string name="closes_day_at">%1$s ean %2$s etan itxiko da</string>
     <string name="editor_place_doesnt_exist_description">Deskribatu nolakoa den lekua orain OpenStreetMap komunitateari errore-ohar bat bidaltzeko.</string>
+    <string name="offline_explanation_title">Lineaz kanpoko mapak</string>
 </resources>

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

@@ -9,9 +9,9 @@
     <string name="delete">سِتُردن</string>
     <string name="download_maps">بارگیری نقشه‌ها</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">دانلود ناموفق بود، برای تلاش مجدد لمس کنید</string>
+    <string name="download_has_failed">بارگیری ناکام بود، برای تلاش دوباره بِپَرماسید</string>
     <!-- Settings/Downloader - info for country which started downloading -->
-    <string name="downloading">درحال دانلود…</string>
+    <string name="downloading">بارگیری می‌شود…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">کیلومتر</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
@@ -21,50 +21,50 @@
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">جستجو</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">جست‌وجوی نقشه</string>
+    <string name="search_map">جستجوی نقشه</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">سرویس موقعیت مکانی شما غیر فعال است. لطفا جهت کارکرد صحیح نرم افزار آن را فعال کنید.</string>
+    <string name="location_is_disabled_long_text">هم‌اینک، شما همه‌ی سامانه‌های گیاگ‌یابی را برای این دستگاه یا این برنامه ناکارا کرده‌اید. خواهشمند است آن را در پیکربندی‌ها کارا کنید.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="limited_accuracy">دقت محدود</string>
+    <string name="limited_accuracy">نزومان ویمندیگ</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">برای اطمینان از دقیق ناوبری ، موقعیت مکانی دقیق را در تنظیمات فعال کنید</string>
+    <string name="precise_location_is_disabled_long_text">برای آسوده‌دل بودن از نزومانی ناوبری، گیاگ‌یابی نزومان را در پیکربندی کارا کنید</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">نمایش بر روی نقشه</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
-    <string name="country_status_download_failed">دانلود با شکست مواجه شد</string>
+    <string name="country_status_download_failed">بارگیری ناکام بود</string>
     <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">تلاش مجدد</string>
-    <string name="about_menu_title">CoMaps درباره‌ی</string>
+    <string name="try_again">تلاش دوباره</string>
+    <string name="about_menu_title">درباره CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• آسان برای استفاده و جلا</string>
+    <string name="about_proposition_1">• بکارگیری آسان اود پیراسته</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• حریم خصوصی متمرکز و بدون تبلیغات</string>
+    <string name="about_proposition_2">• حریم خصوصی متمرکز اود بی‌آگهی</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
+    <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="location_settings">پیکربندی‌های گیاگ</string>
     <string name="close">بستن</string>
-    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
-    <string name="download">دانلود</string>
+    <string name="unsupported_phone">برنامه به OpenGL نیازمند است.شوربختانه، از دستگاه شما پشتیبانی نمی‌شود.</string>
+    <string name="download">بارگیری</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
-    <string name="download_resources">قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم. \nمقدار %s از حافظه شما اشغال می شود.</string>
+    <string name="not_enough_free_space_on_sdcard">لطفا پیش از بکارگیری برنامه، نخست کمی جا در کارت SD/ویر USB آزاد کنید</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>
+    <string name="downloading_country_can_proceed">بارگیری می‌شود %1$s (%2$s). شما اکنون می‌توانید\nبه نقشه بروید.</string>
+    <string name="download_country_ask">بارگیری %1$s؟ (%2$s)</string>
     <string name="update_country_ask">بروزرسانی %1$s؟ (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="pause">درنگ</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="continue_button">ادامه</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
-    <string name="download_country_failed">%s دانلود با شکست مواجه شد</string>
+    <string name="download_country_failed">%s بارگیری ناکام بود</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">اضافه کردن مجموعه جدید</string>
+    <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 -->
@@ -778,10 +778,12 @@
     <string name="panoramax">تصویر Panoramax</string>
     <string name="app_site_url">https://comaps.app</string>
     <string name="saved">ذخیره شد</string>
-    <string name="about_headline">رایگان برای همه، ساخته شده با عشق</string>
+    <string name="about_headline">پروژه‌ای باز نیرو گرفته از انجمن</string>
     <string name="pedestrian">پیاده</string>
     <string name="bicycle">دوچرخه</string>
     <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

@@ -296,7 +296,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Ota sijaintipalvelut käyttöön</string>
     <string name="save">Tallenna</string>
-    <string name="create">luo</string>
+    <string name="create">Luo</string>
     <!-- red color -->
     <string name="red">Punainen</string>
     <!-- yellow color -->
@@ -523,8 +523,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Haluatko lähettää sen kaikille käyttäjille?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Varmista, ettet ole syöttänyt yksityisiä tai henkilökohtaisia tietoja</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</string>
+    <string name="editor_share_to_all_dialog_message_1">Varmista, ettet syöttänyt henkilökohtaisia tietojasi.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaajat tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää.</string>
     <string name="navigation_stop_button">Lopeta</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Reitin kirjaaminen</string>
@@ -894,12 +894,21 @@
     <string name="avoid_paved">Vältä päällystettyjä teitä</string>
     <string name="opens_at">Avautuu %s</string>
     <string name="closes_at">Sulkeutuu %s</string>
-    <string name="opens_day_at">Avautuu %1$s klo %2$s</string>
-    <string name="closes_day_at">Sulkeutuu %1$s klo %2$s</string>
+    <string name="opens_day_at">Avautuu %1$sna klo %2$s</string>
+    <string name="closes_day_at">Sulkeutuu %1$sna klo %2$s</string>
     <plurals name="minutes_short">
         <item quantity="one">%d min</item>
         <item quantity="other">%d min</item>
     </plurals>
     <string name="editor_submit">Lähetä</string>
     <string name="list_description_empty">Muokkaa listaa lisätäksesi kuvauksen</string>
+    <string name="editor_business_vacant_button">Liike on tyhjillään</string>
+    <string name="place_page_map_too_old_title">Karttatiedot vanhentuneet</string>
+    <string name="place_page_map_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä kartta.</string>
+    <string name="place_page_app_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä CoMaps-sovellus.</string>
+    <string name="place_page_update_too_old_map">Päivitä kartta-alue</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-muokkaus on poistettu käytöstä, koska karttadata on liian vanhaa.</string>
+    <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>
 </resources>

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

@@ -897,7 +897,7 @@
     <string name="editor_place_doesnt_exist_description">Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap</string>
     <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
     <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
-    <string name="avoid_paved">Éviter les routes goudronnées</string>
+    <string name="avoid_paved">Éviter les routes pavées</string>
     <string name="opens_at">Ouvre à %s</string>
     <string name="closes_at">Ferme à %s</string>
     <string name="opens_day_at">Ouverture le %1$s à %2$s</string>
@@ -913,4 +913,12 @@
     <string name="editor_submit">Soumettre</string>
     <string name="power_management">Gestion de l\'énergie</string>
     <string name="charge_socket_schuko">Europe</string>
+    <string name="place_page_map_too_old_title">Carte obsolète</string>
+    <string name="place_page_map_too_old_description">Les données de la carte actuelle sont anciennes, pensez à les mettre à jour.</string>
+    <string name="place_page_update_too_old_map">Mettre à jour la carte</string>
+    <string name="place_page_too_old_to_edit">Les modifications OpenStreetMap sont désactivées car les données de la carte sont trop anciennes.</string>
+    <string name="place_page_app_too_old_description">Vos données cartographiques actuelles sont très anciennes, veuillez mettre à jour l\'application CoMaps.</string>
+    <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>
 </resources>

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

@@ -139,4 +139,135 @@
     <string name="self_service">Samoposluživanje</string>
     <string name="panoramax">Panoramax slika</string>
     <string name="saved">Spremljeno</string>
+    <string name="disconnect_usb_cable">Isključite USB kabel ili umetnite memorijsku karticu za korištenje CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Prvo oslobodite prostor na SD kartici/USB memoriji kako biste mogli koristiti aplikaciju</string>
+    <string name="download_resources">Prije nego što počnete koristiti aplikaciju, preuzmite općenitu kartu svijeta na svoj uređaj.\nZauzeti će %s prostora za pohranu.</string>
+    <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Sada možete\nnastaviti na kartu.</string>
+    <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
+    <string name="add_new_set">Dodaj novu Listu</string>
+    <string name="bookmark_set_name">Označi naziv Liste</string>
+    <string name="bookmarks">Oznake</string>
+    <string name="bookmarks_and_tracks">Oznake i Rute</string>
+    <string name="maps_storage">Spremi karte u</string>
+    <string name="maps_storage_summary">Odaberite mapu u koju želite spremiti karte</string>
+    <string name="maps_storage_downloaded">Preuzete karte</string>
+    <string name="maps_storage_free_size">%1$s slobodno od %2$s</string>
+    <string name="move_maps">Premjesti karte?</string>
+    <string name="move_maps_error">Greška prilikom premještanja datoteka karte</string>
+    <string name="wait_several_minutes">Ovo može potrajati nekoliko minuta.\nMolimo pričekajte…</string>
+    <string name="measurement_units">Mjerne jedinice</string>
+    <string name="measurement_units_summary">Odaberite milje ili kilometre</string>
+    <string name="category_eat">Gdje jesti</string>
+    <string name="category_food">Namirnice</string>
+    <string name="category_transport">Prijevoz</string>
+    <string name="category_fuel">Benzinske stanice</string>
+    <string name="category_shopping">Kupovina</string>
+    <string name="category_secondhand">Rabljena roba</string>
+    <string name="category_tourism">Znamenitosti</string>
+    <string name="category_entertainment">Zabava</string>
+    <string name="category_atm">Bankomat</string>
+    <string name="category_nightlife">Noćni život</string>
+    <string name="category_children">Obiteljski praznici</string>
+    <string name="category_bank">Banka</string>
+    <string name="category_pharmacy">Ljekarna</string>
+    <string name="category_police">Policija</string>
+    <string name="category_water">Voda</string>
+    <string name="category_rv">Objekti za kampere</string>
+    <string name="share_bookmarks_email_subject">CoMaps Oznake su podijeljene s vama</string>
+    <string name="share_bookmarks_email_body">Pozdrav!\n\nU privitku su moje oznake; otvorite ih u CoMaps aplikaciji. Ukoliko ju nemate instaliranu, možete ju preuzeti ovdje: https://www.comaps.app/download/\n\nUživajte u putovanju s CoMapsima!</string>
+    <string name="load_kmz_title">Učitavam Oznake</string>
+    <string name="load_kmz_successful">Oznake su uspješno učitane! Možete ih pronaći na karti ili na zaslonu Upravitelja Oznaka.</string>
+    <string name="load_kmz_failed">Učitavanje Oznaka nije uspjelo. Datoteka je možda oštećena ili neispravna.</string>
+    <string name="unknown_file_type">Aplikacija ne prepoznaje tip datoteke:\n%1$s</string>
+    <string name="failed_to_open_file">Nije moguće otvoriti datoteku %1$s\n \n%2$s</string>
+    <string name="unknown_current_position">Vaša lokacija još nije utvrđena</string>
+    <string name="cant_change_this_setting">Žao nam je, postavke Pohrane karata trenutno su onemogućene</string>
+    <string name="downloading_is_active">Preuzimanje karte je trenutno u tijeku</string>
+    <string name="my_position_share_sms">Pogledajte moju trenutnu lokaciju u CoMapsu! %1$s ili %2$s Nemate offline karte? Preuzmite ih ovdje: https://www.comaps.app/download/</string>
+    <string name="bookmark_share_email_subject">Hej, pogledaj moju oznaku u CoMapsu!</string>
+    <string name="my_position_share_email_subject">Hej, pogledaj moju trenutnu lokaciju na CoMaps karti!</string>
+    <string name="my_position_share_email">Bok,\n\nSada sam ovdje: %1$s. Kliknite na ovu %2$s ili ovu %3$s poveznicu da biste vidjeli lokaciju na karti.\n\nHvala.</string>
+    <string name="copied_to_clipboard">Kopirano u međuspremnik: %s</string>
+    <string name="data_version">OpenStreetMap podaci: %s</string>
+    <string name="tracks_title">Rute</string>
+    <string name="category_hotel">hotel</string>
+    <string name="category_toilet">WC</string>
+    <string name="track_recording">Snimanje Rute</string>
+    <string name="bookmarks_import">Uvoz Oznaka i Ruta</string>
+    <plurals name="tracks">
+        <item quantity="one">%d ruta</item>
+        <item quantity="few">%d rute</item>
+        <item quantity="other">%d ruta</item>
+    </plurals>
+    <string name="bookmarks_export">Izvoz svih Oznaka i Ruta</string>
+    <string name="start_track_recording">Snimi Rutu</string>
+    <string name="stop_track_recording">Zaustavi snimanje Rute</string>
+    <string name="track_recording_alert_title">Spremi u Oznake i Rute?</string>
+    <string name="track_recording_toast_nothing_to_save">Ruta je prazna - nema ništa za spremiti</string>
+    <string name="edit_track">Izmijeni Rutu</string>
+    <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
+    <string name="share_track">Podijeli Rutu</string>
+    <string name="placepage_edit_bookmark_button">Uredi Oznaku</string>
+    <string name="bookmark_lists_hide_all">Sakrij sve</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%d Oznaka</item>
+        <item quantity="few">%d Oznake</item>
+        <item quantity="other">%d Oznaka</item>
+    </plurals>
+    <string name="bookmarks_create_new_group">Kreiraj novu Listu</string>
+    <string name="bookmarks_error_message_share_general">Nije moguće podijeliti zbog greške u aplikaciji</string>
+    <string name="bookmarks_error_message_share_empty">Nije moguće dijeliti praznu Lista</string>
+    <string name="bookmarks_error_title_empty_list_name">Naziv ne može biti prazan</string>
+    <string name="bookmarks_error_message_empty_list_name">Molimo unesite naziv Liste</string>
+    <string name="bookmarks_new_list_hint">Nova Lista</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Taj naziv je već zauzet</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
+    <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
+    <string name="bookmarks_empty_list_message">Za dodavanje Oznake dotaknite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
+    <string name="sort_bookmarks">Sortiraj Oznake</string>
+    <string name="bookmark_color">Boja Oznake</string>
+    <string name="share_my_location">Podijeli moju lokaciju</string>
+    <string name="pref_zoom_title">Gumbi za zumiranje</string>
+    <string name="pref_map_3d_title">Pogled iz perspektive</string>
+    <string name="pref_map_3d_buildings_title">3D zgrade</string>
+    <string name="pref_tts_enable_title">Glasovne najave</string>
+    <string name="pref_tts_street_names_title">Najavi nazive ulica</string>
+    <string name="pref_tts_street_names_description">Kada je omogućeno, naziv ulice ili izlaza gdje koji treba skrenuti bit će izgovoren naglas.</string>
+    <string name="pref_tts_language_title">Jezik glasovnih najava</string>
+    <string name="pref_tts_test_voice_title">Testiranje glasovnih najava</string>
+    <string name="pref_tts_playing_test_voice">Provjerite glasnoću ili sistemske postavke za pretvaranje teksta u govor ako sada ne čujete glas</string>
+    <string name="pref_tts_unavailable">Nije dostupno</string>
+    <string name="pref_map_auto_zoom">Automatsko zumiranje</string>
+    <string name="search_show_on_map">Prikaži na karti</string>
+    <string name="feedback">Povratne informacije</string>
+    <string name="faq">Često postavljana pitanja</string>
+    <string name="how_to_support_us">Volontiraj i poboljšaj CoMaps</string>
+    <string name="compass_calibration_recommended">Poboljšajte preciznost pokazivača smjera gibanja kruženjem telefona u obliku osmice kako biste kalibrirali kompas.</string>
+    <string name="compass_calibration_required">Pomičite telefon u obliku figure osmice kako biste kalibrirali kompas i popravili strelicu indikatora smjera na karti.</string>
+    <string name="long_tap_toast">Ponovno dugo dodirnite kartu da biste prikazali sučelje</string>
+    <string name="downloader_update_all_button">Ažuriraj sve</string>
+    <string name="downloader_cancel_all">Otkaži sve</string>
+    <string name="downloader_near_me_subtitle">U mojoj blizini</string>
+    <string name="downloader_download_all_button">Preuzmi sve</string>
+    <string name="downloader_delete_map_while_routing_dialog">Za brisanje karte, molimo prvo zaustavite navigaciju</string>
+    <string name="routing_failed_cross_mwm_building">Rute se mogu kreirati samo ako su u potpunosti unutar karte jedne regije.</string>
+    <string name="downloader_download_map">Preuzmi kartu</string>
+    <string name="downloader_delete_map">Obriši kartu</string>
+    <string name="downloader_update_map">Ažuriraj kartu</string>
+    <string name="dialog_routing_select_closer_end">Molimo odaberite odredišnu točku koja se nalazi bliže cesti</string>
+    <string name="dialog_routing_change_intermediate">Nije moguće pronaći međutočku</string>
+    <string name="dialog_routing_intermediate_not_determined">Molimo prilagodite svoju međutočku</string>
+    <string name="dialog_routing_system_error">Sistemska greška</string>
+    <string name="dialog_routing_application_error">Nije moguće napraviti rutu zbog greške u aplikaciji</string>
+    <string name="dialog_routing_try_again">Pokušajte ponovno</string>
+    <string name="search_not_found_query">Preuzmite regiju u kojoj pretražujete ili pokušajte dodati naziv obližnjeg grada/sela.</string>
+    <string name="search_history_text">Pogledajte svoja nedavna pretraživanja</string>
+    <string name="read_in_wikipedia">Wikipedija</string>
+    <string name="p2p_your_location">Vaša lokacija</string>
+    <string name="p2p_only_from_current">Navigacija je dostupna samo od vaše trenutne lokacije</string>
+    <string name="p2p_reroute_from_current">Želite li isplanirati rutu od vaše trenutne lokacije?</string>
+    <string name="editor_time_add">Dodaj Raspored</string>
+    <string name="editor_time_delete">Izbriši Raspored</string>
+    <string name="editor_time_allday">Cijeli dan (24 sata)</string>
 </resources>

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

@@ -163,7 +163,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono al momento disabilitate</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Lo scaricamento della mappa è in corso</string>
+    <string name="downloading_is_active">Scaricamento mappa in corso</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Guarda la mia posizione in CoMaps! %1$s o %2$s Non hai scaricato l\'app? La puoi scaricare da qui: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -219,7 +219,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Prova le indicazioni vocali</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se ora non senti la voce</string>
+    <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se non senti la voce</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Non disponibile</string>
     <string name="pref_map_auto_zoom">Zoom automatico</string>
@@ -291,7 +291,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Abilita i servizi di localizzazione</string>
     <string name="save">Salva</string>
-    <string name="create">crea</string>
+    <string name="create">Crea</string>
     <!-- red color -->
     <string name="red">Rosso</string>
     <!-- yellow color -->
@@ -872,7 +872,7 @@
     <string name="delete_track_dialog_title">Eliminare %s?</string>
     <string name="pref_tts_no_system_tts_short">Motore testo - parlato non trovato, controlla le impostazioni dell\'app</string>
     <string name="avoid_steps">Evita scale</string>
-    <string name="unknown_power_output">sconosciuto</string>
+    <string name="unknown_power_output">Sconosciuto</string>
     <string name="charge_socket_type2">Tipo 2 (senza cavo)</string>
     <string name="charge_socket_type2_cable">Tipo 2 (con cavo)</string>
     <string name="charge_socket_type1">Tipo 1</string>
@@ -896,4 +896,14 @@
     <string name="editor_submit">Conferma</string>
     <string name="charge_socket_chademo">CHAdeMO</string>
     <string name="avoid_paved">Evita le strade asfaltate</string>
+    <string name="charge_socket_schuko">Domestico EU</string>
+    <string name="power_management">Risparmio energetico</string>
+    <string name="place_page_too_old_to_edit">La modifica di OpenStreetMap è disabilitata perché le mappe sono troppo vecchie.</string>
+    <string name="place_page_update_too_old_map">Aggiorna questa mappa</string>
+    <string name="place_page_app_too_old_description">Le mappe correnti sono molto vecchie, si suggerisce di aggiornare CoMaps.</string>
+    <string name="place_page_map_too_old_description">La mappa corrente è molto vecchia, si suggerisce di aggiornarla.</string>
+    <string name="place_page_map_too_old_title">Mappa obsoleta</string>
+    <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>
 </resources>

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

@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Dehweles</string>
+    <string name="cancel">Hedhi</string>
+    <string name="delete">Dilea</string>
+    <string name="download_maps">Iskarga Mappys</string>
+    <string name="kilometres">Kilometrow</string>
+    <string name="miles">Mildiryow</string>
+    <string name="later">Wosa henna</string>
+    <string name="search">Hwilas</string>
+    <string name="search_map">Hwilas Mappa</string>
+    <string name="limited_accuracy">Kewerder Strothys</string>
+    <string name="zoom_to_country">Diskwedhes war dhe mappa</string>
+    <string name="try_again">Assayewgh Arta</string>
+    <string name="about_menu_title">A-dro CoMaps</string>
+    <string name="about_proposition_3">• Dhywarlinen, uskis ha kesstrothys</string>
+    <string name="location_settings">Settyansow GPS</string>
+    <string name="close">Degea</string>
+    <string name="download">Iskarga</string>
+    <string name="download_resources_continue">Mos yn dhe Mappa</string>
+    <string name="download_country_ask">Iskarga %1$s? (%2$s)</string>
+    <string name="update_country_ask">Nowedhi %1$s? (%2$s)</string>
+    <string name="pause">Powes</string>
+    <string name="continue_button">Pesyewgh</string>
+    <string name="bookmarks">Lyververkys</string>
+    <string name="bookmarks_and_tracks">Lyververkys ha Lerghow</string>
+    <string name="name">Hanow</string>
+    <string name="address">Trigva</string>
+    <string name="list">Rol</string>
+    <string name="settings">Settyansow</string>
+    <string name="move_maps">Gwaya mappys?</string>
+    <string name="measurement_units">Systemow musurans</string>
+    <string name="measurement_units_summary">Dewis yntra mildiryow ha kilometrow</string>
+    <string name="category_food">Gwara boos</string>
+    <string name="category_transport">Karyans</string>
+    <string name="category_fuel">Petrol</string>
+    <string name="category_parking">Parkyans</string>
+    <string name="category_hotel">Ostel</string>
+    <string name="category_tourism">Tornyaseth</string>
+    <string name="category_entertainment">Didhan</string>
+    <string name="category_atm">Toll y\'n fos</string>
+    <string name="category_children">Dy\'gol teylu</string>
+    <string name="category_bank">Arghanti</string>
+    <string name="category_pharmacy">Ferylva</string>
+    <string name="category_hospital">Klavji</string>
+    <string name="category_toilet">Attesva</string>
+    <string name="category_post">Post</string>
+    <string name="category_police">Kreslu</string>
+    <string name="category_recycling">Eylgylghyans</string>
+    <string name="category_water">Dowr</string>
+    <string name="category_rv">Komodytys Karavans</string>
+    <string name="description">Notennow</string>
+    <string name="load_kmz_title">Ow Karga Lyververkys</string>
+    <string name="bookmark_share_email_subject">Dydh da, checkyewgh ow pynn yn CoMaps!</string>
+    <string name="my_position_share_email_subject">Dydh da, checkyewgh ow tyller a\'n jydh war an mappa CoMaps!</string>
+    <string name="share">Kevrenna</string>
+    <string name="email">Ebost</string>
+    <string name="done">Gwrys</string>
+    <string name="data_version">Data OpenStreetMap: %s</string>
+    <string name="tracks_title">Lerghow</string>
+    <string name="length">Hys</string>
+    <string name="share_my_location">Kevrennewgh Ow Tyller</string>
+    <string name="prefs_group_general">Settyansow mayni</string>
+    <string name="prefs_group_information">Kedhlow</string>
+    <string name="prefs_group_route">Navygacyon</string>
+    <string name="pref_zoom_summary">Displetya war an mappa</string>
+    <string name="pref_map_style_title">Fordh Nos</string>
+    <string name="auto">Awtomatek</string>
+    <string name="pref_map_3d_title">Gwel gemusur</string>
+    <string name="pref_map_3d_buildings_title">Drehevyansow lymnys tri</string>
+    <string name="pref_tts_enable_title">Danvonadow dre lev</string>
+    <string name="pref_tts_street_names_title">Deklarya Henwyn Stretow</string>
+    <string name="pref_tts_language_title">Tavas Lev</string>
+    <string name="pref_tts_test_voice_title">Prov Tuyow Dre Lev</string>
+    <string name="pref_tts_unavailable">Nakavadow</string>
+    <string name="search_show_on_map">Gweles war mappa</string>
+    <string name="menu">Rol</string>
+    <string name="website">Gwiasva</string>
+    <string name="news">Nowodhow</string>
+    <string name="panoramax">Imach Panoramax</string>
+    <string name="feedback">Dasliv</string>
+    <string name="rate_the_app">Breusyans an app</string>
+    <string name="help">Gweres</string>
+    <string name="faq">Govynnow Kemmyn</string>
+    <string name="donate">Argevri</string>
+    <string name="copyright">Gwirbryntyan</string>
+    <string name="report_a_bug">Reportya unn kudyn</string>
+    <string name="downloader_update_all_button">Nowedhi Oll</string>
+    <string name="downloader_cancel_all">Dilea Oll</string>
+    <string name="downloader_near_me_subtitle">Dhe dhorn</string>
+    <string name="downloader_status_maps">Mappys</string>
+    <string name="downloader_download_all_button">Iskarga Oll</string>
+    <string name="downloader_download_map">Iskarga mappa</string>
+    <string name="downloader_retry">Hwilewgh arta</string>
+    <string name="downloader_delete_map">Dilea Mappa</string>
+    <string name="downloader_update_map">Nowedhi Mappa</string>
+    <string name="google_play_services">Servis GPS gans Google</string>
+    <string name="routing_not_enough_space">Nyns eus lowr dalghuster</string>
+    <string name="enable_location_services">Gallosegi Servisyow GPS mar pleg</string>
+    <string name="create">Gul</string>
+    <string name="red">Rudh</string>
+    <string name="yellow">Melyn</string>
+    <string name="blue">Blou</string>
+    <string name="green">Gwyrdh</string>
+    <string name="purple">Purpur</string>
+    <string name="orange">Melynrudh</string>
+    <string name="brown">Godhlos</string>
+    <string name="pink">Kigliw</string>
+    <string name="deep_purple">Rudhlas</string>
+    <string name="light_blue">Glaswyn</string>
+    <string name="teal">Gwerlas</string>
+    <string name="lime">Gwerwyn</string>
+    <string name="deep_orange">Rudhvelyn</string>
+    <string name="gray">Loos</string>
+    <string name="blue_gray">Glas</string>
+    <string name="dialog_routing_check_gps">Checkya sinell GPS</string>
+    <string name="dialog_routing_location_turn_on">Gallosegi servisyow GPS</string>
+    <string name="dialog_routing_change_end">Desedha destnans</string>
+    <string name="dialog_routing_system_error">Error gans an kevreyth</string>
+    <string name="dialog_routing_try_again">Assayewgh arta mar pleg</string>
+    <string name="not_now">Na Vynnav Lemmyn</string>
+    <string name="search_select_map">Dewis Mappa</string>
+    <string name="show">Showya</string>
+    <string name="hide">Kudha</string>
+    <string name="categories">Klassow</string>
+    <string name="history">Istori</string>
+    <string name="search_history_title">Istori Hwilas</string>
+    <string name="clear_search">Dilea Istori Hwilas</string>
+    <string name="read_in_wikipedia">Wikipedya</string>
+    <string name="wikimedia_commons">Wikimedia Commons</string>
+    <string name="p2p_your_location">Agas Tyller</string>
+    <string name="p2p_start">Dalleth</string>
+    <string name="next_button">Nessa</string>
+    <string name="editor_time_add">Addya Rol Vetyansow</string>
+    <string name="editor_time_delete">Dilea Rol Vetyansow</string>
+    <string name="editor_time_allday">Dres an Jorna (24 ourys)</string>
+    <string name="editor_time_open">Ygor</string>
+    <string name="editor_time_close">Deges</string>
+    <string name="editor_time_add_closed">Addya Ourys Nanegys</string>
+    <string name="editor_time_title">Ourys Negys</string>
+    <string name="editor_time_advanced">Fordh Avonsys</string>
+    <string name="editor_time_simple">Fordh Sempel</string>
+    <string name="editor_hours_closed">Ourys Nanegys</string>
+    <string name="editor_correct_mistake">Ewna kammgemeryans</string>
+    <string name="editor_add_select_location">Dewis Tyller</string>
+    <string name="editor_report_problem_send_button">Danvon</string>
+    <string name="editor_report_problem_title">Kudyn</string>
+    <string name="daily">Dedhyek</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Deges hedhyw</string>
+    <string name="day_off">Deges</string>
+    <string name="closed">Deges</string>
+    <string name="edit_opening_hours">Golegi ourys negys</string>
+    <string name="no_osm_account">Vyth akont OpenStreetMap?</string>
+    <string name="register_at_openstreetmap">Kovskrifa orth OpenStreetMap</string>
+    <string name="login">Omgelmi</string>
+    <string name="login_osm">Omgelmi dhe OpenStreetMap</string>
+    <string name="logout">Omdenna</string>
+    <string name="edit_place">Golegi Le</string>
+    <string name="add_language">Addya unn tavas</string>
+    <string name="street">Stret</string>
+    <string name="house_number">Niver drehevyans</string>
+    <string name="details">Manylyon</string>
+    <string name="social_media">Media Socyal</string>
+    <string name="building">Drehevyans</string>
+    <string name="add_street">Addya unn stret</string>
+    <string name="empty_street_name_error">Ynworra unn hanow street mar pleg</string>
+    <string name="choose_language">Dewis unn tavas</string>
+    <string name="choose_street">Dewis unn stret</string>
+    <string name="editor_add_phone">Addya Niver Fon</string>
+    <string name="level">Leur</string>
+    <string name="level_value_generic">Leur: %s</string>
+    <string name="downloader_update_maps">Nowedhi Mappys</string>
+    <string name="downloader_search_field_hint">Kavos mappa</string>
+    <string name="editor_login_error_dialog">Error dres omgelmi</string>
+    <string name="editor_edit_place_name_hint">Hanow a an le</string>
+    <string name="editor_default_language_hint">Dell yw skrifys yn an tavas teythiek</string>
+    <string name="editor_edit_place_category_title">Klass</string>
+    <string name="detailed_problem_description">Deskrifans manylys a an kudyn</string>
+    <string name="editor_report_problem_other_title">Kudyn dyffrans</string>
+    <string name="download_over_mobile_header">Iskarga dres unn kevren klapkodh?</string>
+    <string name="error_enter_correct_house_number">Ynworra unn niver trigva ewn</string>
+    <string name="editor_building_levels">Leur (ow komprehendya leur a-woles, a-der to)</string>
+    <string name="editor_zip_code">Kod Post</string>
+    <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
+    <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
+    <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
+    <string name="editor_osm_history">Agas istori golegi</string>
+    <string name="editor_osm_notes">Agas notennow mappow</string>
+    <string name="editor_operator">Oberador</string>
+    <string name="operator">Oberador: %s</string>
+    <string name="kilometers_per_hour">kdo</string>
+    <string name="miles_per_hour">mdo</string>
+    <string name="hour">o</string>
+    <string name="minute">mynysen</string>
+    <string name="placepage_more_button">Moy</string>
+    <string name="placepage_edit_bookmark_button">Pennskrifa Lyververk</string>
+    <string name="placepage_personal_notes_hint">Notennow privedh (tekst bo html)</string>
+    <string name="editor_reset_edits_message">Dilea oll chanjyow dhywarlinen?</string>
+    <string name="editor_reset_edits_button">Dilea</string>
+    <string name="editor_remove_place_message">Dilea le keworrys?</string>
+    <string name="editor_remove_place_button">Dilea</string>
+    <string name="editor_place_doesnt_exist">Le na eksistya</string>
+    <string name="delete_place_empty_comment_error">Provia an acheson rag dilea an le mar pleg</string>
+    <string name="editor_business_vacant_button">Negys usi gwag</string>
+    <string name="editor_mark_business_vacant_title">Sin negys dell gwag</string>
+    <string name="editor_submit">Danvon</string>
+    <string name="error_enter_correct_phone">Ynworra unn niver fon ewn</string>
+    <string name="error_enter_correct_web">Ynworra unn trigva gwiasva ewn</string>
+    <string name="error_enter_correct_email">Ynworra unn trigva ebost ewn</string>
+    <string name="editor_level">Leur (0 usi leur a-woles)</string>
+    <string name="error_enter_correct_level">Ynworra unn niver leur ewn</string>
+    <string name="error_enter_correct_facebook_page">Ynworra unn trigva Lyverenep, akont, bo hanow folen ewn</string>
+    <string name="error_enter_correct_instagram_page">Ynworra unn hanow usyer Instagram bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_twitter_page">Ynworra unn hanow usyer Twytter bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_vk_page">Ynworra unn hanow usyer VK bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_line_page">Ynworra unn ID LINE bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_fediverse_page">Ynworra unn hanow usyer Mastodon bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_bluesky_page">Ynworra unn hanow usyer Bluesky bo trigva gwiasva ewn</string>
+    <string name="placepage_add_place_button">Addya Le dhe OpenStreetMap</string>
+    <string name="osm_note_hint">Bo, yn tereylys, skrifa unn noten dhe kemeneth OpenStreetMap, ha orth nebonan yll addya bo ewnhe unn le omma.</string>
+    <string name="osm_note_toast">Noten a vydh danvon dhe OpenStreetMap</string>
+    <string name="editor_share_to_all_dialog_title">A vynn\'ta mos danvon dhe oll usyoryon?</string>
+    <string name="navigation_stop_button">Hedhi</string>
+    <string name="track_recording">Y\'n eur ma rekordya an lergh</string>
+    <string name="accept">Amyttya</string>
+    <string name="decline">Nagha</string>
+    <string name="mobile_data_option_today">Unn Hedhyw</string>
+    <string name="traffic_update_app">Nowedhi CoMaps mar pleg</string>
+    <string name="feedback_general">Dasliv Mayni</string>
+    <string name="learn_more">Dyski moy</string>
+    <string name="button_plan">Devisya</string>
+    <string name="placepage_remove_stop">Dilea Powes</string>
+    <string name="placepage_add_stop">Addya Powes</string>
+    <string name="error_enter_correct_name">Ynworra unn hanow ewn mar pleg</string>
+    <string name="bookmark_lists">Rolyow</string>
+    <string name="bookmark_lists_hide_all">Keles oll</string>
+    <string name="bookmark_lists_show_all">Diskwedhes oll</string>
+    <string name="bookmarks_create_new_group">Gul unn rol nowydh</string>
+    <string name="bookmarks_import">Ynperthi Lyververkys ha Lerghow</string>
+    <string name="bookmarks_error_message_empty_list_name">Ynworra an hanow rol mar pleg</string>
+    <string name="bookmarks_new_list_hint">Rol nowydh</string>
+    <string name="bookmarks_error_title_list_name_already_taken">An hanow ma usi seulabrys yn usyans</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Dewis aral hanow mar pleg</string>
+    <string name="please_wait">Gortos mar pleg…</string>
+    <string name="phone_number">Niver fon</string>
+    <string name="profile">Akont OpenStreetMap</string>
+    <string name="restore">Astiveri</string>
+    <string name="privacy">Privetter</string>
+    <string name="privacy_policy">Polici privetter</string>
+    <string name="power_management">Dyghtyans batri</string>
+    <string name="terms_of_use">Termys usadow</string>
+    <string name="button_layer_traffic">Data daromdak</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Gisyow ha gwiskasow mappow</string>
+    <string name="bookmarks_empty_list_title">An rol ma usi gwag</string>
+    <string name="category_desc_more">…moy</string>
+    <string name="export_file">Esperthi KMZ</string>
+    <string name="export_file_gpx">Esperthi GPX</string>
+    <string name="delete_list">Dilea rol</string>
+    <string name="speedcams_alert_title">Kameras finweth tooth</string>
+    <string name="place_description_title">Deskrifans Le</string>
+    <string name="pref_tts_speedcams_auto">Gwarnya a tothya</string>
+    <string name="define_to_avoid_btn">Styrya fordhow rag avodya</string>
+    <string name="toll_road">Tollfordh</string>
+    <string name="unpaved_road">Fordh dor</string>
+    <string name="ferry_crossing">Kowbalhyns</string>
+    <string name="yes">Ya</string>
+    <string name="no">Na</string>
+    <string name="yes_available">Ya</string>
+    <string name="no_available">Na</string>
+    <string name="capacity">Dalghuster: %s</string>
+    <string name="network">Rosweyth: %s</string>
+    <string name="trip_finished">Hwi re wrug!</string>
+    <string name="ok">Da lowr</string>
+    <string name="sort">Sortya…</string>
+    <string name="sort_bookmarks">Sortya lyververkys</string>
+    <string name="by_default">Dre defowt</string>
+    <string name="by_type">Dre eghen</string>
+    <string name="by_distance">Dre pellder</string>
+    <string name="by_date">Dre dydh</string>
+    <string name="by_name">Dre hanow</string>
+    <string name="near_me_sorttype">Dhe dhorn</string>
+    <string name="others_sorttype">Re erel</string>
+    <string name="food_places">Boos</string>
+    <string name="tourist_places">Tornyaseth</string>
+    <string name="museums">Gwithtiow</string>
+    <string name="parks">Parkow</string>
+    <string name="swim_places">Neuvya</string>
+    <string name="mountains">Menydhyow</string>
+    <string name="animals">Bestes</string>
+    <string name="hotels">Ostelyow</string>
+    <string name="buildings">Drehevyansow</string>
+    <string name="money">Mona</string>
+    <string name="shops">Gwerthjiow</string>
+    <string name="parkings">Parkyans</string>
+    <string name="fuel_places">Petrolva</string>
+    <string name="medicine">Medhegneth</string>
+    <string name="search_in_the_list">Hwilas yn an rol</string>
+    <string name="religious_places">Leow kryjyk</string>
+    <string name="select_list">Dewis rol</string>
+    <string name="transit_not_found">Navygacyon metro yn an pow ma usi nakavadow hwath</string>
+    <string name="button_layer_isolines">Linen kettres</string>
+    <string name="elevation_profile_min_elevation">Ughelder ispoyntel</string>
+    <string name="elevation_profile_max_elevation">Ughelder ughboyntel</string>
+    <string name="elevation_profile_difficulty">Kaletter</string>
+    <string name="elevation_profile_distance">Pellder:</string>
+    <string name="elevation_profile_time">Prys:</string>
+    <string name="isolines_toast_zooms_1_10">Moghhe dhe furya linen kettres</string>
+    <string name="download_map_title">Iskarga an mappa bys simpel</string>
+    <string name="disk_error_title">Error plasen</string>
+    <string name="connection_failure">Defowt kevren</string>
+    <string name="change_map_locale">Tavas mappow</string>
+    <string name="splash_subtitle">Data mappow a OpenStreetMap</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
+    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
+    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
+    <string name="app_tip_01">Gans agas argevrohow ha skoodhyans, ni a yll gul an mappys an gwella yn an Nor!</string>
+    <string name="app_tip_02">Yw da genes a\'gan app? Argevri mar pleg dhe skoodhya an displegyans! Yw na da genes a\'n hwath? Mar pleg, kedhlewgh dhyn prag ha ni a ewnhe a\'n!</string>
+    <string name="app_tip_06">Hwi a yll gweres treylya a\'gan app yn agas tavas.</string>
+    <string name="aa_connected_title">Dha vos lemmyn rosweythys dhe Android Auto</string>
+    <string name="aa_grant_permissions">Grontya grontys</string>
+    <string name="button_layer_outdoor">Yn-mes</string>
+    <string name="browser_not_available">Peurell nakavadow</string>
+    <string name="volume">Ughelder</string>
+    <string name="bookmarks_export">Esperthi oll Lyververkys ha Lerghow</string>
+    <string name="clear_the_search">Dilea an hwithrans</string>
+    <string name="zoom_in">Moghhe</string>
+    <string name="zoom_out">Lehe</string>
+    <string name="website_menu">Kevren Rol Voos</string>
+    <string name="view_menu">Vu Rol Voos</string>
+    <string name="open_in_app">Ygeri yn Aral App</string>
+    <string name="select_option">Dewis dewis</string>
+    <string name="outdoor_seating">Esedhow yn-mes</string>
+    <string name="start_track_recording">Rekordya Lergh</string>
+    <string name="choose_color">Dewis Kolor</string>
+    <string name="edit_track">Golegi Lergh</string>
+    <string name="nav_auto">Awtomatek yn navygacyon</string>
+    <string name="pref_left_button_title">Boton kledh dewisyow</string>
+    <string name="backup_interval_every_day">Dedhyek</string>
+    <string name="backup_interval_every_week">Seythennyek</string>
+    <string name="clear">Dilea</string>
+    <string name="vehicle">Karr</string>
+    <string name="pedestrian">Kerdher</string>
+    <string name="bicycle">Diwros</string>
+    <string name="ruler">Rewlell</string>
+    <string name="bookmark_color">Kolor lyververk</string>
+    <string name="about_help">A-dro ha Gweres</string>
+    <string name="share_track">Kevren Lergh</string>
+    <string name="delete_track_dialog_title">Dilea %s?</string>
+    <string name="unknown_power_output">ankoth</string>
+    <string name="charge_socket_type2">Eghen diw (na fun)</string>
+    <string name="charge_socket_type2_cable">Eghen diw (gans fun)</string>
+    <string name="charge_socket_type2_combo">Eghen diw kesunyans</string>
+    <string name="charge_socket_type1">Eghen unn</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="charge_socket_schuko">Unyans Europek a-bervedh</string>
+    <string name="unknown_socket_type">ankoth kraw</string>
+    <string name="edit_socket_info_tooltip">Gul krawyow nowydh bo golegi krowyow a‑lemmyn.</string>
+    <string name="charging_station_available_sockets">Krawyow kavadow</string>
+    <string name="charge_socket_unknown_other">Aral bo anokth</string>
+    <string name="charge_socket_count">Somm</string>
+    <string name="charge_socket_power">Gallosedh (kW)</string>
+    <string name="editor_socket">Golegi kraw</string>
+    <string name="unknown_count">ankoth</string>
+    <string name="error_value_must_be_positive">Res an niver positiv</string>
+    <string name="error_invalid_number">Niver anewn</string>
+    <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

@@ -281,7 +281,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Įjunkite vietovės tarnybas</string>
     <string name="save">Įrašyti</string>
-    <string name="create">kurti</string>
+    <string name="create">Kurti</string>
     <!-- red color -->
     <string name="red">Raudonas</string>
     <!-- yellow color -->
@@ -401,8 +401,8 @@
     <string name="twentyfour_seven">24×7</string>
     <string name="day_off_today">Šiandien uždaryta</string>
     <string name="day_off">Uždaryta</string>
-    <string name="opens_in">Atsidaro už %s</string>
-    <string name="closes_in">Užsidaro už %s</string>
+    <string name="opens_in">Atidaroma už %s</string>
+    <string name="closes_in">Uždaroma už %s</string>
     <string name="closed">Uždaryta</string>
     <string name="edit_opening_hours">Taisyti darbo valandas</string>
     <string name="no_osm_account">Neturite „OpenStreetMap“ paskyros?</string>
@@ -510,8 +510,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Ar tikrai norite šiuos pakeitimus paviešinti?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Įsitikinkite, kad neįvedėte jokių asmeninių duomenų</string>
-    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų</string>
+    <string name="editor_share_to_all_dialog_message_1">Įsitikinkite, kad neįvedėte jokių asmeninių duomenų.</string>
+    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų.</string>
     <string name="navigation_stop_button">Stabdyti</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Trasa įrašoma</string>
@@ -870,4 +870,22 @@
     <string name="error_invalid_number">Netinkamas skaičius</string>
     <string name="offline_explanation_title">Žemėlapio parsisiuntimas</string>
     <string name="offline_explanation_text">Kad galėtumėte matyti šios vietovės žemėlapį ir planuoti jame keliones, pirma turite jį atsiųsti.</string>
+    <string name="avoid_paved">Vengti grįstų kelių</string>
+    <string name="opens_at">Atidaroma %s</string>
+    <string name="closes_at">Uždaroma %s</string>
+    <string name="opens_day_at">Atidaroma %1$s , %2$s</string>
+    <string name="closes_day_at">Uždaroma %1$s, %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min.</item>
+        <item quantity="few">%d min.</item>
+        <item quantity="many">%d min.</item>
+        <item quantity="other">%d min.</item>
+    </plurals>
+    <string name="editor_business_vacant_button">Erdvė nenaudojama</string>
+    <string name="editor_mark_business_vacant_title">Pažymėti erdvę kaip nenaudojamą</string>
+    <string name="editor_mark_business_vacant_description">Pasinaudokite šia funkcija, jei šioje erdvėje buvusi įmonė ar įstaiga išsikėlė ir ši erdvė dabar nenaudojama.</string>
+    <string name="editor_submit">Pateikti</string>
+    <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>
 </resources>

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

@@ -845,4 +845,10 @@
     <string name="closed_now">Šobrīd slēgts</string>
     <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
     <string name="editor_submit">Iesniegt</string>
+    <string name="place_page_map_too_old_title">Novecojuši kartes dati</string>
+    <string name="place_page_map_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt karti.</string>
+    <string name="place_page_app_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt CoMaps lietotni.</string>
+    <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>
 </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</string>
+    <string name="editor_reset_edits_button">Forkast endringer</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>
@@ -896,4 +896,20 @@
     <string name="editor_submit">Send</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Strømstyring</string>
+    <string name="navigation_start_tts_disabled_message">Taleveiledninger deaktivert: TTS-motor ikke tilgjengelig</string>
+    <string name="navigation_start_tts_message">"Starter navigering, taleveiledningsspråk: "</string>
+    <string name="prefs_speed_cameras_information">Fotoboksvarsler er deaktivert i land hvor varsler er forbudt i henhold til lokal lovgivning.</string>
+    <string name="place_page_map_too_old_title">Kartdata utdatert</string>
+    <string name="place_page_map_too_old_description">Gjeldende kartdata er gamle, oppdater kartet.</string>
+    <string name="place_page_app_too_old_description">Gjeldende kartdata er gamle, oppdater CoMaps-appen.</string>
+    <string name="place_page_update_too_old_map">Oppdater kartregion</string>
+    <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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <style name="MwmTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
-    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
     <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
     <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
     <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
@@ -88,19 +88,6 @@
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
     <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
-    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.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>
@@ -111,7 +98,7 @@
     <item name="elevationProfileSelectedPointTriangle">@drawable/ic_ascent</item>
     <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation</item>
     <item name="elevationProfileColor">@color/elevation_profile</item>
-    <item name="android:popupMenuStyle">@style/PopupMenu</item>
+    <item name="android:popupMenuStyle">@style/Widget.Material3.PopupMenu</item>
 
     <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>

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

@@ -907,4 +907,12 @@
     <string name="editor_mark_business_vacant_description">Gebruik dit als het bedrijf is verhuisd en de ruimte leeg is en klaar is voor een nieuwe huurder.</string>
     <string name="power_management">Energiebeheer</string>
     <string name="charge_socket_schuko">Binnenlandse EU</string>
+    <string name="navigation_start_tts_message">"Navigatie starten, taal voor steminstructie: "</string>
+    <string name="prefs_speed_cameras_information">Waarschuwingen voor flitsers zijn uitgeschakeld in landen waar deze wettelijk zijn verboden.</string>
+    <string name="navigation_start_tts_disabled_message">Spraakinstructies uitgeschakeld: TTS-engine niet beschikbaar</string>
+    <string name="place_page_map_too_old_title">Kaartgegevens verouderd</string>
+    <string name="place_page_map_too_old_description">Uw huidige kaartgegevens zijn erg oud. Werk de kaart bij.</string>
+    <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>
 </resources>