WIP try 184

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[android] Adjust map buttons margins in route building
2026-01-09 13:54:37 +00:00 · 2026-01-03 23:48:43 +07:00 · 2026-01-03 23:48:41 +07:00 · 2026-01-03 23:15:26 +07:00 · 2026-01-03 23:15:16 +07:00 · 2026-01-03 23:15:16 +07:00
223 changed files with 3570 additions and 5057 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -254,7 +254,6 @@ android {
  androidResources {
    ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
    noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
-    // Some languages not supported by Android require to be specified here to be applied
    localeFilters += [
            "af",
            "ar",
@@ -282,7 +281,6 @@ android {
            "in",
            "it",
            "ja",
-            "kw",
            "ko",
            "lt",
            "lv",
@@ -354,7 +352,6 @@ dependencies {
  implementation libs.androidx.work.runtime
  implementation libs.androidx.lifecycle.process
  implementation libs.androidx.documentfile
-  // 1.13 Material library version doesn't render properly alpha properties on map buttons
  implementation libs.android.material
  // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
  // https://github.com/organicmaps/organicmaps/issues/6106
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,9 +1,8 @@
-• OSM-Daten vom 6. Januar
-• Editor: POI mit mehr als einem Tag, (z.B. Arten von Kunstwerken wie Skulpturen...), mehr POI können als leer/stillgelegt werden
-• Miniatureisenbahnen & Kläranlagen hinzugefügt
-• Material 3-Dialoge & dunklerer Hintergrund im Darkmode
-• Fiktive Geschwindigkeitsbegrenzungen für Verbindungsstraßen entfernt
-• Versatz der Kameraausschnitt in der Navigation behoben
-• Weniger empfindliches langes Antippen
-
-Weitere Details unter codeberg.org/comaps/comaps/releases
+• OpenStreetMap Daten vom 17. Dezember
+• Map download server nun wählbar
+• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
+• Vermeidung von Parkplatzwegen im Routing
+• Neuer Zoombutton
+• Verbesserte Französchische Suchsynonme
+• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
+Mehr auf codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/en-GB/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/full-description.txt
@@ -1,32 +0,0 @@
-A community-led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
-
-Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
-Join the community there and help make the best maps app
-• Use the app and spread the word about it
-• Give feedback and report issues
-• Update map data in the app or on the OpenStreetMap website
-
-‣ <b>Offline-focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
-‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
-‣ <b>Simple and Polished</b>: essential easy to use features that just work.
-‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
-‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
-‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
-
-<b>Main Features</b>:
-• Downloadable detailed maps with places which are not available with Google Maps
-• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
-• Walking paths and cycleways
-• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
-• Search by name or an address or by point of interest category
-• Navigation with voice announcements for walking, cycling, or driving
-• Bookmark your favorite places with a single tap
-• Offline Wikipedia articles
-• Subway transit layer and directions
-• Track recording
-• Export and import bookmarks and tracks in KML, KMZ, GPX formats
-• A dark mode to use during the night
-• Improve map data for everyone using a basic built-in editor
-
-<b>Freedom Is Here</b>
-Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/fdroid/play/listings/en-GB/short-description.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/short-description.txt
@@ -1 +0,0 @@
-Easy map navigation - Discover more of your journey - Powered by the community
--- a/android/app/src/fdroid/play/listings/en-GB/title.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/title.txt
@@ -1 +0,0 @@
-CoMaps - Hike, Bike, Drive Offline with Privacy
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,9 +1,8 @@
-• OpenStreetMap data as of January 6
-• Editor: add POI types with more than one OSM tag, e.g. artwork subtypes sculptures, paintings..; more POI types could be marked as vacant/disused
-• Added miniature railways and wastewater treatment plants
-• Use Material 3 dialogs and darker background in dark mode
-• Removed fictional speed limits for link roads
-• Fixed camera cutout offset in navigation
-• Less sensitive long tap (full-screen mode)
-
+• OpenStreetMap data as of December 17
+• Make map download server configurable
+• Added info about outdated maps and an update button to the selected place info card
+• Avoid using parking aisles for routing
+• Changed shape of zoom buttons
+• Improved French search synonyms
+• OSM editor: check length limit for OSM tags in value validation
 More details on codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,9 +0,0 @@
-• Datos OSM a 06/01
-• Editor: se añaden tipos de POI con más de una etiqueta, ej. esculturas, pinturas...; se podrán marcar más tipos como en desuso
-• Se añaden ferrocarriles mini y plantas de tratamiento de aguas
-• Se utilizan diálogos Material 3 y fondo más oscuro en el modo oscuro
-• Se eliminan límites de velocidad ficticios para enlaces
-• Se corrige desplazamiento en la navegación
-• Toque largo menos sensible (en pantalla completa)
-
-Más detalles en codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,9 +1,8 @@
-• Données OpenStreetMap du 6 janvier
-• Éditeur : support des types de POI avec plus d’un tag OSM, par exemple types d’œuvres d’art sculptures, peintures..
-• Rendu des rails pour trains miniatures et des stations d'épuration
-• Utilisation des pop-ups Material 3 et d'un fond plus sombre en thème sombre
-• Suppression des limites de vitesse fictives sur les bretelles de routes
-• Correction des instructions de navigation sur les appareils avec des encoches
-• Appui long moins sensible (en mode plein écran)
-
-Plus de détails sur codeberg.org/comaps/comaps/releases
+• Données OpenStreetMap du 17 décembre
+• Serveur de téléchargement de cartes configurable
+• Ajout d'un message d'avertissement pour les cartes trop anciennes
+• Évitement des allées de parking dans les itinéraires
+• Mise à jour de l'apparence des boutons de zooms
+• Amélioration des synonymes de recherche en français
+• Editeur OSM: vérification de la taille limite des tags OSM
+Plus d'informations sur codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/hr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/hr/release-notes.txt
@@ -1,7 +0,0 @@
-• OpenStreetMap podaci od 6. siječnja
-• Uređivač: dodane točake interesa s više od jedne OSM oznake, npr. podtipovi umjetnina kao skulpture, slike...; više točaka interesa se sada može označiti kao upražnjene/napuštene
-• Dodane minijaturne željeznice i postrojenja za pročišćavanje otpadnih voda
-• Korištenje Material 3 dijaloga i tamnije pozadine u tamnom načinu rada
-• Uklonjena su izmišljena ograničenja brzine za spojne ceste
-
-Više detalja na codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,9 +1,8 @@
-• Dados OSM de 6/1
-• Editor: adição de POIs com mais de uma etiqueta OSM, por exemplo esculturas e pinturas; mais tipos de POI podem ser marcados como vagos/desativados
-• Adição de ferrovias em miniatura e ETEs
-• Uso de diálogos Material 3 e fundo mais escuro no modo escuro
-• Remoção de limites de velocidade fictícios para vias de ligação
-• Correção de recorte da câmera na navegação
-• Toque longo menos sensível (modo tela cheia)
-
+• Dados OSM de 17/12
+• Servidor de download de mapas configurável
+• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
+• Evita o uso de corredores de estacionamento para roteamento
+• Formato dos botões de zoom alterado
+• Sinônimos de busca em francês aprimorados
+• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
 Mais detalhes em codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,8 +1,8 @@
-• Карты OpenStreetMap от 6 января
-• Редактор: возможность добавления POI, определяемых несколькими тегами, например церквей, мечетей, буддистских храмов..
-• Добавлены миниатюрные железные дороги и очистные сооружения
-• Использование диалогов Material 3 и более тёмного фона в тёмном режиме
-• Удалены фиктивные ограничения скорости для заездов / съездов с шоссе
-• Менее чувствительное длительное нажатие на экран (переход в полноэкранный режим)
-
+• Карты OpenStreetMap от 17 декабря
+• Возможность настройки сервера для скачивания карт
+• Добавлена информация об устаревании карт и кнопка обновления (при выборе места на карте)
+• Парковочные проезды больше не используются для транзитной маршрутизации
+• Изменены кнопки масштабирования карты
+• На карту добавлены ирригационные гидранты
+• Редактор OSM: проверка максимальной длины OSM тегов
 Подробнее на codeberg.org/comaps/comaps/releases
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -446,7 +446,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
      default -> throw new AssertionError("Unexpected result code = " + result);
    };

-        mAlertDialog = new MaterialAlertDialogBuilder(this)
+        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                           .setTitle(titleId)
                           .setMessage(messageId)
                           .setCancelable(true)
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -9,7 +9,8 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW;
-import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
+import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_COMPASS;
+import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_ROUTE;
 import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
 import static app.organicmaps.sdk.util.Utils.dimen;
@@ -432,7 +433,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    }

    dismissLocationErrorDialog();
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog)
                               .setMessage(R.string.unknown_current_position)
                               .setCancelable(true)
                               .setPositiveButton(R.string.ok, null)
@@ -655,7 +656,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
        else
        {
          dismissAlertDialog();
-          mAlertDialog = new MaterialAlertDialogBuilder(this)
+          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                             .setTitle(R.string.message_invalid_feature_position)
                             .setPositiveButton(R.string.ok, null)
                             .setOnDismissListener(dialog -> mAlertDialog = null)
@@ -1155,7 +1156,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

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

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

    final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint());
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.p2p_only_from_current)
        .setMessage(R.string.p2p_reroute_from_current)
        .setCancelable(false)
@@ -1900,7 +1901,8 @@ public class MwmActivity extends BaseMwmFragmentActivity

    locationHelper.restartWithNewMode();

-    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE) && !LocationUtils.checkFineLocationPermission(this))
+    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE_ROUTE || newMode == FOLLOW_AND_ROTATE_COMPASS)
+        && !LocationUtils.checkFineLocationPermission(this))
    {
      // Try to optimistically request FINE permission for FOLLOW and FOLLOW_AND_ROTATE modes.
      Logger.i(LOCATION_TAG, "Requesting ACCESS_FINE_LOCATION permission for " + LocationState.nameOf(newMode));
@@ -2040,7 +2042,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
        {
          mPreciseLocationDialogShown = true;
          final MaterialAlertDialogBuilder builder =
-              new MaterialAlertDialogBuilder(this)
+              new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                  .setTitle("⚠ " + getString(R.string.limited_accuracy))
                  .setMessage(R.string.precise_location_is_disabled_long_text)
                  .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2074,7 +2076,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return;
    }

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

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

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

  private void reportUnsupported()
  {
-    new MaterialAlertDialogBuilder(this)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .setMessage(R.string.unsupported_phone)
        .setCancelable(false)
        .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity
  private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
  {
    mCanceled = true;
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_M3_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .setTitle(titleId)
        .setMessage(messageId)
        .setPositiveButton(
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
@@ -60,14 +60,14 @@ public enum BookmarksSharingHelper
    case BookmarkSharingResult.SUCCESS ->
      SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
    case BookmarkSharingResult.EMPTY_CATEGORY ->
-      new MaterialAlertDialogBuilder(context)
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
          .setTitle(R.string.bookmarks_error_title_share_empty)
          .setMessage(R.string.bookmarks_error_message_share_empty)
          .setPositiveButton(R.string.ok, null)
          .show();
    case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
    {
-      new MaterialAlertDialogBuilder(context)
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
          .setTitle(R.string.dialog_routing_system_error)
          .setMessage(R.string.bookmarks_error_message_share_general)
          .setPositiveButton(R.string.ok, null)
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
@@ -42,7 +42,6 @@ public class ChooseBookmarkCategoryFragment
  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
  {
    View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
-    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
    mRecycler = root.findViewById(R.id.recycler);
    mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
    return root;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -77,7 +77,6 @@ public class ChooseBookmarksSortingTypeFragment
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
-    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    final Bundle args = getArguments();
    if (args == null)
--- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
@@ -183,11 +183,16 @@ public final class UiHelpers
      drawableRes = R.drawable.ic_follow;
      tintColor = Colors.LOCATION_TINT;
    }
-    case LocationState.FOLLOW_AND_ROTATE ->
+    case LocationState.FOLLOW_AND_ROTATE_COMPASS ->
    {
      drawableRes = R.drawable.ic_follow_and_rotate;
      tintColor = Colors.LOCATION_TINT;
    }
+    case LocationState.FOLLOW_AND_ROTATE_ROUTE ->
+    {
+      drawableRes = R.drawable.ic_follow_route;
+      tintColor = Colors.LOCATION_TINT;
+    }
    default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
    }

--- a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
@@ -42,7 +42,7 @@ public final class CustomMapServerDialog
    edit.setText(current);

    MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(context)
+        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.download_resources_custom_url_title)
            .setMessage(R.string.download_resources_custom_url_message)
            .setView(dialogView)
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
@@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
      negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON);
    }

-    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity())
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
                                     .setView(buildView())
                                     .setNegativeButton(negativeButtonText, null)
                                     .setPositiveButton(positiveButtonText, null)
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
  {
    if (RoutingController.get().isNavigating())
    {
-      new MaterialAlertDialogBuilder(adapter.mActivity)
+      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
          .setTitle(R.string.downloader_delete_map)
          .setMessage(R.string.downloader_delete_map_while_routing_dialog)
          .setPositiveButton(R.string.ok, null)
@@ -133,7 +133,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
      return;
    }

-    new MaterialAlertDialogBuilder(adapter.mActivity)
+    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.downloader_delete_map)
        .setMessage(R.string.downloader_delete_map_dialog)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
@@ -49,7 +49,7 @@ public class MapManagerHelper
        return;
    }

-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
                                .setTitle(R.string.country_status_download_failed)
                                .setMessage(getErrorCodeStrRes(errorData.errorCode))
                                .setNegativeButton(R.string.cancel,
@@ -72,7 +72,7 @@ public class MapManagerHelper

  private static void notifyNoSpaceInternal(Activity activity)
  {
-    new MaterialAlertDialogBuilder(activity)
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.downloader_no_space_title)
        .setMessage(R.string.downloader_no_space_message)
        .setPositiveButton(android.R.string.ok, null)
@@ -123,7 +123,7 @@ public class MapManagerHelper
      return false;
    }

-    new MaterialAlertDialogBuilder(activity)
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.download_over_mobile_header)
        .setMessage(R.string.download_over_mobile_message)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -493,7 +493,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      }
    });

-    return new MaterialAlertDialogBuilder(requireActivity())
+    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_socket)
        .setView(dialogView)
        .setPositiveButton(R.string.save,
@@ -997,7 +997,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      message = R.string.editor_reset_edits_message;
    }

-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(message)
        .setPositiveButton(title,
                           (dialog, which) -> {
@@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void placeDisused()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
      .setTitle(R.string.editor_mark_business_vacant_title)
      .setMessage(R.string.editor_mark_business_vacant_description)
      .setPositiveButton(R.string.editor_submit, (dlg, which) -> {
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -352,7 +352,7 @@ public class EditorHostFragment

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

  private void showNoobDialog()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_share_to_all_dialog_title)
        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                    + getString(R.string.editor_share_to_all_dialog_message_2))
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -155,7 +155,7 @@ public class FeatureCategoryFragment
  // Duplicate of showNoobDialog()
  private void showNoteConfirmationDialog(double lat, double lon, String noteText)
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_share_to_all_dialog_title)
        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                    + getString(R.string.editor_share_to_all_dialog_message_2))
--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment

  private void onAuthFail()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_login_error_dialog)
        .setPositiveButton(R.string.ok, null)
        .show();
--- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
@@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment
    FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab);
    feedbackFab.setOnClickListener(
        v
-        -> new MaterialAlertDialogBuilder(requireActivity())
+        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
               .setTitle(R.string.feedback)
               .setNegativeButton(R.string.cancel, null)
               .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)},
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
@@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
    if (mDialog != null && mDialog.isShowing())
      return;

-    mDialog = new MaterialAlertDialogBuilder(mActivity)
+    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
                  .setMessage(R.string.common_check_internet_connection_dialog)
                  .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false))
                  .setCancelable(true)
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
  public Dialog onCreateDialog(Bundle savedInstanceState)
  {
    parseArguments();
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity())
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
                                             .setCancelable(true)
                                             .setNegativeButton(android.R.string.cancel, null);
    beforeDialogCreated(builder);
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -494,7 +494,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    pref.setOnPreferenceClickListener(preference -> {
      if (MapManager.nativeIsDownloading())
      {
-        new MaterialAlertDialogBuilder(requireActivity())
+        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.downloading_is_active)
            .setMessage(R.string.cant_change_this_setting)
            .setPositiveButton(R.string.ok, null)
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
@@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment
    final String oldPath = storages.get(currentIndex).mPath;
    final String newPath = storages.get(newIndex).mPath;

-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setCancelable(false)
        .setTitle(R.string.move_maps)
        .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath))
@@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment

        if (!result)
        {
-          new MaterialAlertDialogBuilder(requireActivity())
+          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
              .setTitle(R.string.move_maps_error)
              .setPositiveButton(
                  R.string.report_a_bug,
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
  @Override
  public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
  {
-    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
+    return new BottomSheetDialog(requireContext(), getTheme()) {
      @Override
      public void onAttachedToWindow()
      {
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
@@ -61,7 +61,6 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
    setCancelable(mCancelable);
    setOnCancelListener(mCancelListener);
    setContentView(R.layout.dialog_stacked_buttons);
-    getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    TextView title = findViewById(R.id.tv__title);
    UiUtils.setTextAndHideIfEmpty(title, mTitle);
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -49,8 +49,8 @@ public class MyPositionButton
    int colorAttr = R.attr.iconTint;
    @DimenRes
    int sizeDimen = R.dimen.map_button_icon_size;
-    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
-        || mode == LocationState.PENDING_POSITION)
+    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE_ROUTE
+        || mode == LocationState.FOLLOW_AND_ROTATE_COMPASS || mode == LocationState.PENDING_POSITION)
    {
      colorAttr = com.google.android.material.R.attr.colorSecondary;
      if (mode == LocationState.PENDING_POSITION)
@@ -69,7 +69,8 @@ public class MyPositionButton
        case LocationState.NOT_FOLLOW_NO_POSITION -> R.drawable.ic_location_off;
        case LocationState.NOT_FOLLOW -> R.drawable.ic_location_crosshair;
        case LocationState.FOLLOW -> R.drawable.ic_follow;
-        case LocationState.FOLLOW_AND_ROTATE -> R.drawable.ic_follow_and_rotate;
+        case LocationState.FOLLOW_AND_ROTATE_COMPASS -> R.drawable.ic_follow_and_rotate;
+        case LocationState.FOLLOW_AND_ROTATE_ROUTE -> R.drawable.ic_follow_route;
        default -> throw new IllegalArgumentException("Invalid button mode: " + mode);
      };
          image = ResourcesCompat.getDrawable(resources, drawableRes, context.getTheme());
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
@@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
        mIconResId = getArguments().getInt(ICON_RES);
    }

-    return new MaterialAlertDialogBuilder(requireActivity())
+    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setView(buildView())
        .setTitle(R.string.choose_color)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -464,7 +464,7 @@ public class PlacePageController
      mAlertDialog.show();
      return;
    }
-    mAlertDialog = new MaterialAlertDialogBuilder(requireContext())
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
                       .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                       .setCancelable(true)
                       .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -428,9 +428,8 @@ public class PlacePageView extends Fragment

  private void updateBookmarkView()
  {
-   boolean enabled = mMapObject.isBookmark() || mMapObject.isTrack();
    updateViewFragment(PlacePageBookmarkFragment.class, BOOKMARK_FRAGMENT_TAG, R.id.place_page_bookmark_fragment,
-                       enabled);
+                       mMapObject.isBookmark());
  }

  private void updateTrackView()
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -23,7 +23,6 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
-import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -42,7 +41,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
  private PlacePageViewModel mViewModel;

  private Bookmark currentBookmark;
-  private Track currentTrack;

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

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

  @Override
@@ -170,11 +152,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
      currentBookmark = (Bookmark) mapObject;
      updateBookmarkDetails();
    }
-    if (mapObject != null && mapObject.isTrack())
-    {
-      currentTrack = (Track) mapObject;
-      updateBookmarkDetails();
-    }
  }

  @Override
--- a/android/app/src/main/res/drawable/bg_clickable_card.xml
+++ b/android/app/src/main/res/drawable/bg_clickable_card.xml
@@ -4,7 +4,7 @@
  android:color="?colorControlHighlight">
  <item>
    <shape>
-      <solid android:color="?appBackground" />
+      <solid android:color="?cardBackground" />
    </shape>
  </item>
  <item android:id="@android:id/mask">
--- a/android/app/src/main/res/drawable/ic_follow_route.xml
+++ b/android/app/src/main/res/drawable/ic_follow_route.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:strokeColor="@android:color/white"
+      android:fillColor="@android:color/white"
+      android:pathData="M15.15 16.92l-7.04 2.8v0.4l2.63 1.07 0.98 2.67h0.39z"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="m 16.25,15.95 c 2.29,-2.29 1.91,-3.87 -4.06,-3.87"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="M8.98 7.43c-2.97 2.96-2.72 4.66 3.24 4.66"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="M8.89 7.51l8.83-8.79"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="M9.2 22.83c-0.64 0.57-2.9 2.5-3.56 3.13"/>
+</vector>
--- a/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Filled"
+  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
-<LinearLayout
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:background="?cardBackground">

  <LinearLayout
    android:orientation="vertical"
@@ -55,4 +49,3 @@
      tools:text="Do not Use Today"/>
  </LinearLayout>
 </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -22,9 +22,12 @@
      android:layout_height="match_parent"
      android:clipChildren="false"
      android:clipToPadding="false"
-      android:baselineAligned="false"
-      android:orientation="horizontal"
+      android:orientation="vertical"
      tools:ignore="ScrollViewSize">
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
        <LinearLayout
          android:layout_width="0dp"
          android:layout_height="match_parent"
@@ -108,5 +111,6 @@
            android:text="@string/register_at_openstreetmap" />
        </LinearLayout>
      </LinearLayout>
+    </LinearLayout>
  </ScrollView>
 </LinearLayout>
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/android/app/src/main/res/layout-land/layout_nav.xml
@@ -41,5 +41,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|start"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?cardBackground"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -17,7 +17,6 @@
    android:id="@+id/street_frame"
    android:layout_width="500dp"
    android:layout_height="wrap_content"
-    style="@style/Widget.Material3.CardView.Filled"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
    android:elevation="@dimen/nav_elevation"
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -11,7 +11,8 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
-    android:background="?menuBackground"
+    android:backgroundTint="?menuBackground"
+    android:background="@drawable/onmap_downloader_background"
    android:padding="@dimen/margin_base"
    android:clipToPadding="false"
    android:clipChildren="false"
--- a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -8,6 +8,7 @@
  android:paddingStart="@dimen/margin_base"
  android:paddingEnd="@dimen/margin_base"
  android:gravity="center_vertical"
+  android:background="?clickableBackground"
  android:orientation="horizontal">

  <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
+++ b/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  style="@style/Widget.Material3.CardView.Filled"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
 <LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
  android:orientation="vertical"
+  android:background="?cardBackground"
  android:minWidth="@dimen/bookmark_purchase_img_width"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">
@@ -27,11 +21,9 @@
    android:layout_marginEnd="@dimen/margin_base_plus"
    android:layout_marginStart="@dimen/margin_base_plus"
    tools:text="Select list"/>
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
+  <include
    android:layout_marginTop="@dimen/margin_base"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    android:scrollbars="vertical"/>
+    layout="@layout/recycler_default"/>
 </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/Widget.Material3.CardView.Filled"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:layout_margin="@dimen/margin_double_and_half"
+  android:background="?cardBackground"
  android:minWidth="@dimen/dialog_min_width"
  android:minHeight="@dimen/dialog_min_height"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
-<LinearLayout
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
  android:orientation="vertical"
  android:padding="@dimen/margin_base_plus">

@@ -82,4 +77,3 @@
      app:buttonTint="@null"/>
  </RadioGroup>
 </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout/dialog_stacked_buttons.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Filled"
+  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
-<LinearLayout
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:background="?cardBackground">

  <LinearLayout
    android:orientation="vertical"
@@ -47,4 +41,3 @@
    style="@style/MwmWidget.Button.StackedButtonsDialog"
    tools:text="Do not Use Today"/>
 </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/downloader_item_header.xml
+++ b/android/app/src/main/res/layout/downloader_item_header.xml
@@ -13,6 +13,7 @@
    android:paddingTop="@dimen/margin_half"
    android:paddingBottom="@dimen/margin_half"
    android:layout_marginEnd="@dimen/margin_base"
+    android:background="?cardBackground"
    android:textAppearance="@style/MwmTextAppearance.Caption"
    tools:text="Downloaded"
    tools:background="#80FF0000"/>
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -6,7 +6,7 @@
  android:id="@+id/rl__bookmark_details"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:padding="@dimen/margin_half">
  <LinearLayout
    android:id="@+id/ll__bookmark_name"
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:orientation="vertical"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
  <com.google.android.material.appbar.MaterialToolbar
@@ -69,6 +69,7 @@
      android:inputType="textMultiLine"/>
    </com.google.android.material.textfield.TextInputLayout>
    <View
+      android:background="?cardBackground"
      android:layout_width="match_parent"
      android:layout_height="match_parent"/>
  </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_categories.xml
+++ b/android/app/src/main/res/layout/fragment_categories.xml
@@ -11,6 +11,5 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:scrollbars="vertical"
-    android:fadeScrollbars="false"
-    android:background="?appBackground"/>
+    android:fadeScrollbars="false" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_downloader.xml
+++ b/android/app/src/main/res/layout/fragment_downloader.xml
@@ -4,7 +4,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  style="@style/MwmWidget.Floating"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
  <include layout="@layout/toolbar_with_search"/>
@@ -17,12 +17,10 @@
    style="@style/MwmWidget.Button.Primary"
    tools:text="@string/downloader_update_all_button"/>

-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
+  <include
+    layout="@layout/recycler_default"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?appBackground"
-    android:scrollbars="vertical"
    android:layout_below="@id/toolbar"
    android:layout_above="@id/action"/>

--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -4,7 +4,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?appBackground">
+  android:background="?cardBackground">
  <com.google.android.material.appbar.MaterialToolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -5,7 +5,6 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?windowBackgroundForced"
  android:orientation="vertical">

  <com.google.android.material.appbar.MaterialToolbar
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -10,7 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:id="@+id/frameLayout"
-        android:background="?windowBackgroundForced">
+        android:background="?cardBackground">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/phones_recycler"
--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -61,12 +61,12 @@
        android:layout_height="match_parent"
        android:clickable="true"
        android:focusable="true"
-        android:background="?appBackground">
+        android:background="?cardBackground">

        <androidx.recyclerview.widget.RecyclerView
          android:id="@+id/recycler"
          android:clipToPadding="false"
-          android:background="?appBackground"
+          android:background="?cardBackground"
          android:layout_width="match_parent"
          android:layout_height="match_parent"
          />
--- a/android/app/src/main/res/layout/fragment_search_categories.xml
+++ b/android/app/src/main/res/layout/fragment_search_categories.xml
@@ -4,10 +4,6 @@
  style="@style/MwmWidget.FrameLayout"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?appBackground"
-    android:scrollbars="vertical"/>
+  <include
+    layout="@layout/recycler_default"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:card_view="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
@@ -16,9 +16,33 @@
    <com.google.android.material.card.MaterialCardView
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_half"
      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      card_view:cardBackgroundColor="?cardBackground"
+      card_view:cardCornerRadius="2dp"
+      card_view:cardElevation="4dp">
+
+      <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/et__timetable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@null"
+        android:gravity="top|start"
+        android:inputType="textMultiLine"
+        android:padding="@dimen/margin_base"
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        tools:hint="hint"
+        tools:text="trololo \ntrololo \ntrololo"/>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/margin_half"
+      card_view:cardBackgroundColor="?cardBackground"
+      card_view:cardCornerRadius="2dp"
+      card_view:cardElevation="4dp">

      <LinearLayout
        android:id="@+id/examples"
@@ -26,26 +50,6 @@
        android:layout_height="match_parent"
        android:orientation="vertical"
        android:animateLayoutChanges="true">
-          <com.google.android.material.textfield.TextInputLayout
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:padding="@dimen/margin_half"
-              android:layout_marginBottom="@dimen/margin_half"
-              app:hintEnabled="false">
-
-          <com.google.android.material.textfield.TextInputEditText
-              android:id="@+id/et__timetable"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_alignParentBottom="true"
-              android:background="@null"
-              android:gravity="top|start"
-              android:inputType="textMultiLine"
-              android:padding="@dimen/margin_base"
-              android:textAppearance="@style/MwmTextAppearance.Body3"
-              tools:hint="hint"
-              tools:text="trololo \ntrololo \ntrololo"/>
-          </com.google.android.material.textfield.TextInputLayout>

        <com.google.android.material.textview.MaterialTextView
          android:id="@+id/tv__examples_title"
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/android/app/src/main/res/layout/item_category_description.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:padding="@dimen/margin_base">

  <LinearLayout
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -5,7 +5,7 @@
  style="@style/MwmTextAppearance.Headline6"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?appBackground"
+  android:background="?windowBackgroundForced"
  android:gravity="start|center_vertical"
  android:paddingStart="@dimen/margin_base"
  android:paddingTop="@dimen/margin_base_plus"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -6,7 +6,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_gravity="center"
  android:orientation="vertical"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:padding="@dimen/margin_base">
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -7,7 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?colorSurfaceContainerHigh"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -7,7 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?colorSurfaceContainerHigh"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -1,14 +1,11 @@
-<com.google.android.material.card.MaterialCardView
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/MwmWidget.M3.Editor.CardView"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_margin="@dimen/margin_eighth"
-    android:layout_height="wrap_content">
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/margin_half"
+    android:layout_height="@dimen/height_item_oneline"
+    android:background="?clickableBackground"
+    android:layout_marginTop="@dimen/margin_half"
    android:paddingStart="@dimen/margin_half_plus"
    android:paddingEnd="@dimen/margin_half_plus">

@@ -28,6 +25,7 @@
        android:layout_marginStart="@dimen/margin_half"
        android:layout_marginEnd="@dimen/margin_half"
        android:layout_toStartOf="@id/delete_icon"
+        android:textColorHint="?android:textColorSecondary"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/delete_icon"
        app:layout_constraintStart_toEndOf="@+id/phone_icon"
@@ -43,6 +41,7 @@
    <com.google.android.material.imageview.ShapeableImageView
      android:id="@+id/delete_icon"
      style="@style/MwmWidget.Editor.MetadataIcon"
+      android:layout_marginStart="@dimen/margin_half"
      app:layout_constraintBottom_toBottomOf="parent"
      app:layout_constraintEnd_toEndOf="parent"
      app:layout_constraintTop_toTopOf="parent"
@@ -50,4 +49,3 @@
      app:srcCompat="@drawable/ic_delete" />

 </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/layout_nav.xml
+++ b/android/app/src/main/res/layout/layout_nav.xml
@@ -40,5 +40,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|center"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?cardBackground"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -17,7 +17,6 @@
    android:id="@+id/street_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    style="@style/Widget.Material3.CardView.Filled"
    android:layout_marginStart="@dimen/nav_street_left"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
--- a/android/app/src/main/res/layout/menu.xml
+++ b/android/app/src/main/res/layout/menu.xml
@@ -4,7 +4,7 @@
  android:id="@+id/menu_frame"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:clickable="true"
  android:visibility="gone"
  tools:visibility="visible">
--- a/android/app/src/main/res/layout/menu_route_plan_line.xml
+++ b/android/app/src/main/res/layout/menu_route_plan_line.xml
@@ -2,7 +2,7 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:orientation="horizontal"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">

--- a/android/app/src/main/res/layout/place_page.xml
+++ b/android/app/src/main/res/layout/place_page.xml
@@ -4,7 +4,6 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:descendantFocusability="blocksDescendants"
-  android:background="?cardBackground"
  android:orientation="vertical">
  <include
    android:id="@+id/pp__preview"
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -29,7 +29,7 @@
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:padding="@dimen/margin_base"
    android:text="@string/editor_focus_map_on_location"
    app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />
--- a/android/app/src/main/res/layout/routing_action_panel.xml
+++ b/android/app/src/main/res/layout/routing_action_panel.xml
@@ -6,7 +6,7 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:minHeight="@dimen/height_block_base"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:baselineAligned="false">
  <LinearLayout
    android:id="@+id/btn__search_point"
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -146,13 +146,16 @@
    android:foreground="@drawable/shadow_top"
    android:visibility="gone"
    tools:visibility="visible">
-    <LinearLayout
+    <RelativeLayout
      android:id="@+id/driving_options_btn"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:background="?selectableItemBackgroundBorderless"
      android:gravity="center"
      android:minHeight="@dimen/height_block_base">
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
        <com.google.android.material.imageview.ShapeableImageView
          android:id="@+id/driving_options_btn_img"
          android:layout_width="@dimen/margin_base_plus"
@@ -171,7 +174,8 @@
          android:textAppearance="?android:attr/textAppearanceSmall"
          android:textColor="@color/text_light"
          tools:text="test" />
-    </LinearLayout>
+      </LinearLayout>
+    </RelativeLayout>
  </FrameLayout>
  <FrameLayout
    style="@style/MwmWidget.FrameLayout.Elevation"
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -315,22 +315,4 @@
    <string name="error_enter_correct_web">সঠিক ওয়েব এড্রেস দিন</string>
    <string name="error_enter_correct_email">সঠিক ইমেইল দিন</string>
    <string name="placepage_add_place_button">OpenStreetMap এ স্থান যোগ করুন</string>
-    <string name="editor_zip_code">ডাক কোড</string>
-    <string name="error_enter_correct_zip_code">সঠিক ডাক কোড প্রদান করুন</string>
-    <string name="editor_reset_edits_button">পরিবর্তনগুলো বাতিল করুন</string>
-    <plurals name="bookmarks_places">
-        <item quantity="one">%dটি বুকমার্ক</item>
-        <item quantity="other">%dটি বুকমার্ক</item>
-    </plurals>
-    <plurals name="bookmarks_detect_message">
-        <item quantity="one">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি এটি দেখতে পারবেন।</item>
-        <item quantity="other">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি সেগুলো দেখতে পারবেন।</item>
-    </plurals>
-    <plurals name="tracks">
-        <item quantity="one">%dটি ট্র্যাক</item>
-        <item quantity="other">%dটি ট্র্যাক</item>
-    </plurals>
-    <string name="app_tip_06">আপনি আমাদের অ্যাপটি আপনার ভাষায় অনুবাদ করতে সাহায্য করতে পারেন।</string>
-    <string name="offline_explanation_title">অফলাইন মানচিত্র</string>
-    <string name="offline_explanation_text">এলাকাটি দেখতে এবং নেভিগেট করতে একটি মানচিত্র ডাউনলোড করতে হবে।\nআপনি যেসব এলাকায় ভ্রমণ করতে চান সেগুলোর মানচিত্র ডাউনলোড করুন।</string>
 </resources>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -924,5 +924,5 @@
    <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
    <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
    <string name="download_resources_custom_url_summary_none">No establert</string>
-    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -915,7 +915,7 @@
    <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
    <string name="download_resources_custom_url_title">Vlastní mapový server</string>
    <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
-    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na http:// nebo https://</string>
+    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
    <string name="advanced">Pokročilé</string>
    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>
--- a/android/app/src/main/res/values-en-rAU/strings.xml
+++ b/android/app/src/main/res/values-en-rAU/strings.xml
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_site_url">https://comaps.app/</string>
-    <string name="back">Back</string>
-    <string name="cancel">Cancel</string>
-    <string name="delete">Delete</string>
-    <string name="download_maps">Download Maps</string>
-    <string name="download_has_failed">Download failed, tap to try again</string>
-    <string name="downloading">Downloading…</string>
-    <string name="kilometres">Kilometres</string>
-    <string name="miles">Miles</string>
-    <string name="later">Later</string>
-    <string name="search">Search</string>
-    <string name="search_map">Search Map</string>
-    <string name="location_is_disabled_long_text">You currently have all Location Services for this device or application disabled. Please enable them in Settings.</string>
-    <string name="limited_accuracy">Limited Accuracy</string>
-    <string name="choose_color">Choose Colour</string>
-    <string name="bookmark_color">Bookmark colour</string>
-    <string name="precise_location_is_disabled_long_text">To ensure accurate navigation enable Precise Location in settings</string>
-    <string name="zoom_to_country">Show on the map</string>
-    <string name="country_status_download_failed">Download failed</string>
-    <string name="try_again">Try Again</string>
-    <string name="about_menu_title">About CoMaps</string>
-    <string name="about_headline">Open project powered by the community</string>
-    <string name="about_proposition_1">• Easy to use and polished</string>
-    <string name="about_proposition_2">• Privacy focused and ad-free</string>
-    <string name="about_proposition_3">• Offline, fast and compact</string>
-    <string name="about_developed_by_enthusiasts">Fully open source, not for profit, transparent decision-making and finances.</string>
-    <string name="location_settings">Location Settings</string>
-    <string name="close">Close</string>
-    <string name="unsupported_phone">The app requires hardware accelerated OpenGL. Unfortunately, your device is not supported.</string>
-    <string name="download">Download</string>
-    <string name="disconnect_usb_cable">Please disconnect USB cable or insert a memory card to use CoMaps</string>
-    <string name="not_enough_free_space_on_sdcard">Please free up some space on the SD card or USB storage first in order to use the app</string>
-    <string name="download_resources">Before you start using the app, please download the world overview map to your device. \nIt will use %s of storage.</string>
-    <string name="download_resources_continue">Go to Map</string>
-    <string name="downloading_country_can_proceed">Downloading %1$s (%2$s). You can now \nproceed to the map.</string>
-    <string name="download_country_ask">Download %1$s? (%2$s)</string>
-    <string name="update_country_ask">Update %1$s? (%2$s)</string>
-    <string name="download_country_failed">%s download has failed</string>
-    <string name="add_new_set">Add a new list</string>
-    <string name="bookmarks">Bookmarks</string>
-    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
-    <string name="name">Name</string>
-    <string name="address">Address</string>
-    <string name="list">List</string>
-    <string name="settings">Settings</string>
-    <string name="maps_storage">Save maps to</string>
-    <string name="maps_storage_summary">Select the folder to download maps to</string>
-    <string name="maps_storage_downloaded">Downloaded maps</string>
-    <string name="maps_storage_free_size">%1$s free of %2$s</string>
-    <string name="move_maps">Move maps?</string>
-    <string name="move_maps_error">Error moving map files</string>
-    <string name="wait_several_minutes">This might take several minutes. \nPlease wait…</string>
-    <string name="measurement_units">Unit of measurement</string>
-    <string name="description">Notes</string>
-    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
-    <string name="share_bookmarks_email_body">Hello! \n \nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/ \n \nEnjoy travelling with CoMaps!</string>
-    <string name="load_kmz_title">Loading Bookmarks</string>
-    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or in the Bookmarks Manager screen.</string>
-    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted.</string>
-    <string name="failed_to_open_file">Failed to open file %1$s \n \n%2$s</string>
-    <string name="edit">Edit</string>
-    <string name="unknown_current_position">Your location hasn\'t been determined yet</string>
-    <string name="cant_change_this_setting">Sorry, Map Storage settings are currently disabled</string>
-    <string name="downloading_is_active">Map download is in progress now</string>
-    <string name="my_position_share_sms">Check out my current location in CoMaps! %1$s or %2$s Don\'t have offline maps? Download here: https://www.comaps.app/download/</string>
-    <string name="share">Share</string>
-    <string name="email">Email</string>
-    <string name="copied_to_clipboard">Copied to clipboard: %s</string>
-    <string name="done">Done</string>
-    <string name="tracks_title">Tracks</string>
-    <string name="length">Length</string>
-    <string name="share_my_location">Share My Location</string>
-    <string name="prefs_group_general">General settings</string>
-    <string name="prefs_group_information">Information</string>
-    <string name="prefs_group_route">Navigation</string>
-    <string name="pref_zoom_title">Zoom buttons</string>
-    <string name="pref_zoom_summary">Display on the map</string>
-    <string name="pref_map_style_title">Night Mode</string>
-    <string name="off">Off</string>
-    <string name="on">On</string>
-    <string name="auto">Auto</string>
-    <string name="pref_map_3d_title">Perspective view</string>
-    <string name="pref_map_3d_buildings_disabled_summary">3D buildings are disabled in power saving mode</string>
-    <string name="pref_tts_enable_title">Voice Instructions</string>
-    <string name="pref_tts_street_names_title">Announce Street Names</string>
-    <string name="pref_tts_street_names_description">When enabled, the name of the street or exit to turn onto will be spoken aloud.</string>
-    <string name="pref_tts_language_title">Voice Language</string>
-    <string name="pref_tts_test_voice_title">Test Voice Directions</string>
-    <string name="pref_tts_playing_test_voice">Check the volume or system Text-To-Speech settings if you don\'t hear the voice now</string>
-    <string name="pref_tts_unavailable">Not Available</string>
-    <string name="pref_map_auto_zoom">Auto zoom</string>
-    <string name="placepage_distance">Distance</string>
-    <string name="search_show_on_map">View on map</string>
-    <string name="menu">Menu</string>
-    <string name="website">Website</string>
-    <string name="news">News</string>
-    <string name="panoramax">Panoramax Picture</string>
-    <string name="feedback">Feedback</string>
-    <string name="rate_the_app">Rate the app</string>
-    <string name="help">Help</string>
-    <string name="faq">Frequently Asked Questions</string>
-    <string name="donate">Donate</string>
-    <string name="how_to_support_us">Volunteer and improve CoMaps</string>
-    <string name="copyright">Copyright</string>
-    <string name="report_a_bug">Report a bug</string>
-    <string name="compass_calibration_recommended">Improve arrow direction by moving the phone in a figure-eight motion to calibrate the compass.</string>
-    <string name="compass_calibration_required">Move the phone in a figure-eight motion to calibrate the compass and fix the arrow direction on the map.</string>
-    <string name="long_tap_toast">Long-tap on the map again to see the interface</string>
-    <string name="downloader_update_all_button">Update All</string>
-    <string name="downloader_cancel_all">Cancel All</string>
-    <string name="downloader_downloaded_subtitle">Downloaded</string>
-    <string name="downloader_queued">Queued</string>
-    <string name="downloader_near_me_subtitle">Near me</string>
-    <string name="downloader_status_maps">Maps</string>
-    <string name="downloader_download_all_button">Download All</string>
-    <string name="downloader_downloading">Downloading:</string>
-    <string name="downloader_delete_map_while_routing_dialog">To delete map, please stop navigation</string>
-    <string name="downloader_download_map">Download map</string>
-    <string name="downloader_retry">Retry</string>
-    <string name="downloader_delete_map">Delete Map</string>
-    <string name="downloader_update_map">Update Map</string>
-    <string name="google_play_services">Google Fused Location Service</string>
-    <string name="pref_use_google_play">A proprietary service that combines GPS, WiFi, cellular networks etc. to determine your location more accurately. It may connect to Google servers.</string>
-    <string name="routing_requires_all_map">In order to create a route, we need to download and update all the maps from your location to your destination.</string>
-    <string name="routing_not_enough_space">Not enough space</string>
-    <string name="enable_location_services">Please enable Location Services</string>
-    <string name="save">Save</string>
-    <string name="create">Create</string>
-    <string name="red">Red</string>
-    <string name="yellow">Yellow</string>
-    <string name="blue">Blue</string>
-    <string name="green">Green</string>
-    <string name="purple">Purple</string>
-    <string name="orange">Orange</string>
-    <string name="brown">Brown</string>
-    <string name="pink">Pink</string>
-    <string name="deep_purple">Deep Purple</string>
-    <string name="light_blue">Light Blue</string>
-    <string name="cyan">Cyan</string>
-    <string name="teal">Teal</string>
-    <string name="lime">Lime</string>
-    <string name="deep_orange">Deep Orange</string>
-    <string name="gray">Grey</string>
-    <string name="blue_gray">Blue Grey</string>
-    <string name="dialog_routing_disclaimer_title">When following the route, please keep in mind:</string>
-    <string name="dialog_routing_disclaimer_priority">— Road conditions, traffic laws, and road signs always take priority over navigation hints;</string>
-    <string name="dialog_routing_disclaimer_precision">— The map might be inaccurate, and the suggested route might not always be the most optimal way to reach the destination;</string>
-    <string name="dialog_routing_disclaimer_recommendations">— Suggested routes should only be understood as recommendations;</string>
-    <string name="dialog_routing_disclaimer_borders">— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.</string>
-    <string name="dialog_routing_disclaimer_beware">Please stay alert and safe on the roads!</string>
-    <string name="dialog_routing_check_gps">Check GPS signal</string>
-    <string name="dialog_routing_error_location_not_found">Unable to create route. Current GPS coordinates could not be identified.</string>
-    <string name="dialog_routing_location_turn_wifi">Please check your GPS signal. Enabling WiFi will improve your location accuracy.</string>
-    <string name="dialog_routing_location_turn_on">Enable location services</string>
-    <string name="dialog_routing_location_unknown_turn_on">Unable to locate current GPS coordinates. Enable location services to calculate route.</string>
-    <string name="dialog_routing_unable_locate_route">Unable to locate route</string>
-    <string name="dialog_routing_cant_build_route">Unable to create route</string>
-    <string name="dialog_routing_change_start_or_end">Please change your starting point or destination.</string>
-    <string name="dialog_routing_change_start">Change starting point</string>
-    <string name="dialog_routing_start_not_determined">Route was not created. Unable to locate starting point.</string>
-</resources>
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -19,8 +19,8 @@
    <string name="editor_zip_code">Postcode</string>
    <string name="error_enter_correct_zip_code">Enter a valid postcode</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d place</item>
-        <item quantity="other">%d places</item>
+        <item quantity="one">%d bookmark</item>
+        <item quantity="other">%d bookmarks</item>
    </plurals>
    <plurals name="bookmarks_detect_message">
        <item quantity="one">%d file was found. You can see it after conversion.</item>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -915,5 +915,5 @@
    <string name="advanced">Täiendavad seadistused</string>
    <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
    <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
-    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on http:// või https://</string>
+    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -31,7 +31,7 @@
    <string name="editor_time_from">De</string>
    <string name="daily">Diario</string>
    <string name="details">Detalles</string>
-    <string name="editor_reset_edits_button">Desbotar cambios</string>
+    <string name="editor_reset_edits_button">Restablecer</string>
    <string name="category_parking">Aparcamento</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>
@@ -57,8 +57,8 @@
    <string name="editor_time_title">Horario de apertura</string>
    <string name="editor_zip_code">Código postal</string>
    <string name="editor_share_to_all_dialog_title">Quere envialo a todos os usuarios?</string>
-    <string name="editor_share_to_all_dialog_message_1">Comproba que non escribiches ningún dato privado ou persoal</string>
-    <string name="editor_share_to_all_dialog_message_2">Desde OpenStreetMap comprobarán os cambios e poñeranse en contacto contigo se teñen algunha pregunta.</string>
+    <string name="editor_share_to_all_dialog_message_1">Comprobe que non escribeu ningún dato privado ou persoal</string>
+    <string name="editor_share_to_all_dialog_message_2">Os editores de OpenStreetMap comprobarán os cambios e poñeranse en contacto con vostede se teñen algunha pregunta</string>
    <string name="navigation_stop_button">Deter</string>
    <string name="mobile_data_option_ask">Preguntar sempre</string>
    <string name="traffic_update_maps_text">Para mostrar os datos de tráfico, deben actualizarse os mapas</string>
@@ -489,7 +489,7 @@
    <string name="help">Axuda</string>
    <string name="downloader_downloaded_subtitle">Descargado</string>
    <string name="kilometers_per_hour">km/h</string>
-    <string name="create">Crear</string>
+    <string name="create">crear</string>
    <string name="brown">Marrón</string>
    <string name="no_available">Non</string>
    <string name="categories">Categorías</string>
@@ -639,19 +639,4 @@
    <string name="avoid_paved">Evitar estradas asfaltadas</string>
    <string name="editor_business_vacant_button">Dispoñible para empresas</string>
    <string name="editor_mark_business_vacant_title">Marcar como dispoñible para negocios</string>
-    <string name="place_page_map_too_old_title">Datos do mapa desactualizados</string>
-    <string name="place_page_map_too_old_description">Os datos do mapa son moi antigos, por favor actualiza o mapa.</string>
-    <string name="place_page_app_too_old_description">Os datos do mapa actual son moi antigos, actualiza a app CoMaps.</string>
-    <string name="place_page_update_too_old_map">Actualizar rexión do mapa</string>
-    <string name="place_page_too_old_to_edit">A edición de OpenStreetMap está desactivada porque o mapa é demasiado antigo.</string>
-    <string name="prefs_speed_cameras_information">Os avisos de radares están desactivados nos paises onde a lei local prohibe estas alertas.</string>
-    <string name="power_management">Xestión da enerxía</string>
-    <string name="navigation_start_tts_message">"Comezando a Navegación, idioma das instruccións por voz: "</string>
-    <string name="navigation_start_tts_disabled_message">Instruccións por voz desactivadas: non hai un motor TTS dispoñible</string>
-    <string name="charge_socket_schuko">Doméstico na UE</string>
-    <string name="advanced">Avanzado</string>
-    <string name="download_resources_custom_url_title">Servidor persoal do mapa</string>
-    <string name="download_resources_custom_url_message">Sobrescribe o servidor predefinido para descargar mapas. Deixar baleiro para usar o servidor por defecto de CoMaps.</string>
-    <string name="download_resources_custom_url_summary_none">Sen establecer</string>
-    <string name="download_resources_custom_url_error_scheme">Escribe un URL que comece por http:// ou https://</string>
 </resources>
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -71,7 +71,7 @@
    <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">Yeth Lev</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>
@@ -158,7 +158,7 @@
    <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 yeth</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>
@@ -166,7 +166,7 @@
    <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 yeth</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>
@@ -175,7 +175,7 @@
    <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 yeth teythiek</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>
@@ -195,10 +195,10 @@
    <string name="hour">o</string>
    <string name="minute">mynysen</string>
    <string name="placepage_more_button">Moy</string>
-    <string name="placepage_edit_bookmark_button">Golegi Lyververk</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 chanjyow</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>
@@ -311,7 +311,7 @@
    <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">Yeth mappow</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>
@@ -321,7 +321,7 @@
    <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">Ty a yll gweres treylya a\'gan app yn dhayeth.</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>
@@ -375,299 +375,4 @@
    <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>
-    <string name="download_has_failed">Y fyllis an iskarg, tava dhe dasassaya</string>
-    <string name="downloading">Iskargaow…</string>
-    <string name="location_is_disabled_long_text">Hwi ungallosegi y\'n eur ma oll Gonisyow GPS rag an devis po app ma. Mar pleg, gallosegi y\'s yn Settyansow.</string>
-    <string name="precise_location_is_disabled_long_text">Rag surhe navygacyon ewn, gallosegi GPS Kewar yn Settyansow</string>
-    <string name="country_status_download_failed">Yn fyllis iskarg</string>
-    <string name="about_headline">Ragdres poblek selys war an kementh</string>
-    <string name="about_proposition_1">• Es y us ha polsys</string>
-    <string name="about_proposition_2">• Fogellys war privetter ha heb argemynnow</string>
-    <string name="about_developed_by_enthusiasts">Kod poblek yn leun, heb budh, erviransow treusweladow ha arghansereth.</string>
-    <string name="unsupported_phone">An app rekwirya OpenGL gans uskisheans kalesweyth. Soweth, gas devis na skoodhys.</string>
-    <string name="disconnect_usb_cable">Mar pleg, unjunya an korsen USB po ynworra kyf kov dhe devnydhya CoMaps</string>
-    <string name="not_enough_free_space_on_sdcard">Mar pleg, gul neb dalghuster yn an karten SD/kyf kov kyns dhe devnydhya an app</string>
-    <string name="download_resources">Dherag hwi dalleth devnydhya an app, mar pleg iskarga an mappa ollvysel sempel dhe gas devis.\nY devnydhya %s a dalghuster.</string>
-    <string name="downloading_country_can_proceed">Iskargaow %1$s (%2$s). Hwi gallos\nprocedya dhe an mappa.</string>
-    <string name="download_country_failed">%s iskarg yw fyllis</string>
-    <string name="add_new_set">Addya unn Rol Nowydh</string>
-    <string name="bookmark_set_name">Hanow Rol Lyververkys</string>
-    <string name="maps_storage">Sawya mappys dhe</string>
-    <string name="maps_storage_summary">Dewis an restrenva dhe iskarga mappys dhe</string>
-    <string name="maps_storage_downloaded">Mappys iskargys</string>
-    <string name="maps_storage_free_size">%1$s kavadow yn-mes a %2$s</string>
-    <string name="move_maps_error">Error dres gwaya restrennow mappa</string>
-    <string name="wait_several_minutes">An argerdh ma re durya meur a mynysen.\nGortewgh mar pleg…</string>
-    <string name="category_eat">Leow rag dybri</string>
-    <string name="category_secondhand">Gwarennow Wortaswerth</string>
-    <string name="category_nightlife">Delit dres Nos</string>
-    <string name="share_bookmarks_email_subject">Lyververkys CoMaps yw kevrennys gans ty</string>
-    <string name="share_bookmarks_email_body">Dydh da!\n\nOw lyververkys yw stag; mar pleg, ygeri y\'s yn CoMaps. A hwi kavos y na leys, hwi gallos iskarga y omma: https://www.comaps.app/download/ \n\nEnjoya travalya gans CoMaps!</string>
-    <string name="load_kmz_successful">Lyververkys kargys yn sewen! Hwi gallos kavos y\'s war an mappa po yn an skrin Dyghtyer Lyververkys.</string>
-    <string name="load_kmz_failed">Y fyllis an karga lyververkys. An restren re bos anewn.</string>
-    <string name="unknown_file_type">An eghen restren yw anaswonys gans an app:\n%1$s</string>
-    <string name="failed_to_open_file">Y fyllis ygeri restren %1$s \n\n%2$s</string>
-    <string name="unknown_current_position">Dhe tyller yw determys na hwath</string>
-    <string name="cant_change_this_setting">Drog yw genev, settyansyow Gwithyans Mappa yw marow y\'n eur ma</string>
-    <string name="downloading_is_active">Iskarg mappa hwarvos lemmyn</string>
-    <string name="my_position_share_sms">Mires orth ow tyller y\'n eur ma yn CoMaps! %1$s po %2$s Na kavos mappys dhywarlinen? Iskarga omma: https://www.comaps.app/download/</string>
-    <string name="my_position_share_email">Hou,\n\nOv omma lemmyn: %1$s. Klyckya an gorgevren ma %2$s po an unn ma %3$s dhe gweles an tyller war an mappa.\n\nMeur ras.</string>
-    <string name="copied_to_clipboard">Kopys dhe astel glypp: %s</string>
-    <string name="pref_zoom_title">Botonyow brashe</string>
-    <string name="off">Marow</string>
-    <string name="on">Byw</string>
-    <string name="pref_map_3d_buildings_disabled_summary">Drehevyansow 3D yw ungallosegi yn fordh erbysyon batri</string>
-    <string name="pref_tts_street_names_description">Pan gallosegys, an hanow a an stret po fordh \'mes rag mos yn-mes yw lenna.</string>
-    <string name="pref_tts_playing_test_voice">Checkya an ughelder po settyansow system Tekst-dhe-Areth a hwi na klewes an lev lemmyn</string>
-    <string name="pref_map_auto_zoom">Brashe yn awtomatek</string>
-    <string name="placepage_distance">Pellder</string>
-    <string name="how_to_support_us">Bodhegi ha gwellhe CoMaps</string>
-    <string name="compass_calibration_recommended">Gwellhe tu seth gans gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh.</string>
-    <string name="compass_calibration_required">Gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh ha ewna an tu seth war an mappa.</string>
-    <string name="long_tap_toast">Tava hir war an mappa arta dhe gweles an ynterfas</string>
-    <string name="downloader_downloaded_subtitle">Iskargys</string>
-    <string name="downloader_queued">Lostys</string>
-    <string name="downloader_downloading">Iskargaow:</string>
-    <string name="downloader_delete_map_while_routing_dialog">Dhe dilea mappa, hedhi navygacyon, mar pleg</string>
-    <string name="routing_failed_cross_mwm_building">Kerdhow gallos gul yw kontaynys yn leun a-berth yn unn mappa a unn pow hepken.</string>
-    <string name="pref_use_google_play">Unn gonis perghenogel may kesunya GPS, Wi-fi, rosweythyow kellgowser h.e. rag determya dhe tyller yn kewar. Y re junya dhe servellow Google.</string>
-    <string name="routing_download_maps_along">Iskarga oll mappys a-hys gas kerdh</string>
-    <string name="routing_requires_all_map">Rag gul unn kerdh, ni res iskarga ha nowedhi oll mappys a gas tyller dhe gas penn an fordh.</string>
-    <string name="save">Sawya</string>
-    <string name="cyan">Blou</string>
-    <string name="dialog_routing_disclaimer_title">Pan holya an hyns, kofhe mar pleg:</string>
-    <string name="dialog_routing_disclaimer_priority">— Studh fordh, laghys traffik, ha arwodhyow kavos ragwir pub eur a-ugh dhe hyntys navygacyon;</string>
-    <string name="dialog_routing_disclaimer_precision">— An mappa re bos ankewar, ha an kussul hyns re na bos an method gwella dhe drehedhes an penn an fordh;</string>
-    <string name="dialog_routing_disclaimer_recommendations">— Kussus kyns yw komendyansow hepken;</string>
-    <string name="dialog_routing_disclaimer_borders">— Gul rach gans hyns ogas emlow: an kerdhow gulys gans agan app re tremena treweythyow emlow keswlasek yn tylleryow anreythhes.</string>
-    <string name="dialog_routing_disclaimer_beware">Mar pleg, gortos hewol ha saw war an fordhow!</string>
-    <string name="dialog_routing_error_location_not_found">Anabel dhe gul kerdh. Kesordenogyon GPS na gallos determys.</string>
-    <string name="dialog_routing_location_turn_wifi">Mar pleg, checkya gas sinell GPS. Gallosegi Wi-Fi re gwellhe gas kewerder GPS.</string>
-    <string name="dialog_routing_location_unknown_turn_on">Anabel dhe desedha kesordenogyon GPS. Gallosegi gonisyow GPS dhe kalkya kerdh.</string>
-    <string name="dialog_routing_unable_locate_route">Anabel dhe desedha kerdh</string>
-    <string name="dialog_routing_cant_build_route">Anabel dhe gul kerdh</string>
-    <string name="dialog_routing_change_start_or_end">Mar pleg, chanjya gas tyller dalleth po penn an fordh.</string>
-    <string name="dialog_routing_change_start">Chanjya tyller dalleth</string>
-    <string name="dialog_routing_start_not_determined">Kerdh na gulys. Anabel dhe desedha tyller dalleth.</string>
-    <string name="dialog_routing_select_closer_start">Mar pleg, dewis unn tyller dalleth yn-nes dhe unn fordh.</string>
-    <string name="dialog_routing_end_not_determined">Kerdh na gulys. Anabel dhe desedha an penn an fordh.</string>
-    <string name="dialog_routing_select_closer_end">Mar pleg, dewis unn penn an fordh yn-nes dhe unn fordh</string>
-    <string name="dialog_routing_change_intermediate">Anabel dhe desedha an tyller kres</string>
-    <string name="dialog_routing_intermediate_not_determined">Mar pleg, chanjya gas tyller kres</string>
-    <string name="dialog_routing_application_error">Anabel dhe gul kerdh drefen unn error app</string>
-    <string name="dialog_routing_download_and_build_cross_route">A vynnsowgh iskarga an mappa ha gul unn kerdh gwell a-dreus moy ages unn mappa?</string>
-    <string name="dialog_routing_download_cross_route">Iskarga mappys keworransel dhe gul unn kerdh gwell a-dreus moy ages unn mappa.</string>
-    <string name="search_without_internet_advertisement">Rag dalleth hwilas ha gul kerdhow, iskarga an mappa, mar pleg. Wosa henna, hwi na fella res unn junyans kesrosweyth.</string>
-    <string name="search_not_found">Soweth, sewyansow kavos vyth</string>
-    <string name="search_not_found_query">Iskarga an pow py tyller hwi hwilas po assaya addya unn hanow tre/gwig yn ogas.</string>
-    <string name="search_history_text">Gweles gas hwithransow a-dhiwedhes</string>
-    <string name="p2p_from_here">Mos dhyworth</string>
-    <string name="p2p_to_here">Mos war-tu</string>
-    <string name="p2p_only_from_current">Navygacyon yw kavadow hepken dhyworth gas tyller a\'n jydh</string>
-    <string name="p2p_reroute_from_current">A vynn\'ta devisya unn kerdh dhyworth gas tyller a\'n jydh?</string>
-    <string name="editor_time_from">Dhyworth</string>
-    <string name="editor_time_to">Bys</string>
-    <string name="editor_example_values">Niverow Ensampel</string>
-    <string name="editor_report_problem_desription_1">Mar pleg, deskrifa an kudyn yn manylyon rag may an kemeneth OpenStreetMap gallos ewnhe y.</string>
-    <string name="editor_report_problem_desription_2">Po gul y dha honan yn https://www.openstreetmap.org/</string>
-    <string name="editor_report_problem_no_place_title">An le ma na eksistya</string>
-    <string name="editor_report_problem_under_construction_title">Deges rag mentons</string>
-    <string name="editor_report_problem_duplicate_place_title">Le dewblek</string>
-    <string name="autodownload">Iskarga mappys yn awtomatek</string>
-    <string name="opens_in">Ygeri yn %s</string>
-    <string name="closes_in">Degea yn %s</string>
-    <string name="opens_at">Ygeri dhe %s</string>
-    <string name="closes_at">Degea dhe %s</string>
-    <string name="opens_day_at">Ygeri war %1$s dhe %2$s</string>
-    <string name="closes_day_at">Degea war %1$s dhe %2$s</string>
-    <plurals name="minutes_short">
-        <item quantity="zero">%d mynysennow</item>
-        <item quantity="one">%d mynysen</item>
-        <item quantity="two">%d mynysennow</item>
-        <item quantity="few">%d mynysennow</item>
-        <item quantity="many">%d mynysennow</item>
-        <item quantity="other">%d mynysennow</item>
-    </plurals>
-    <string name="hours_confirmed_time_ago">Komfirmys %s</string>
-    <string name="existence_confirmed_time_ago">Bosva konfirmys %s</string>
-    <string name="not_signed_in">Na omgelmys</string>
-    <string name="cuisine">Eghen Boos</string>
-    <string name="select_cuisine">Dewis eghen boos</string>
-    <string name="downloader_delete_map_dialog">Oll gas chanjyow mappa a vydh dileys a-barth an mappa</string>
-    <string name="downloader_mwm_migration_dialog">Rag gul unn kerdh, hwi res nowedhi oll mappys ha dhanna devisya an kerdh arta.</string>
-    <string name="common_check_internet_connection_dialog">Mar pleg, surhe gas devis yw rosweythys dhe an kesrosweyth</string>
-    <string name="downloader_no_space_message">Mar pleg, dilea neb data heb res</string>
-    <string name="editor_profile_changes">Chanjyow Gwirhys</string>
-    <string name="editor_focus_map_on_location">Draylya an mappa rag settya an krows yn an tyller a an le po negys.</string>
-    <string name="editor_edit_place_title">Golegi</string>
-    <string name="editor_add_place_title">Addya</string>
-    <string name="message_invalid_feature_position">Tra vyth gallos bos desedhys omma</string>
-    <string name="osm_presentation">Data OpenStreetMap gulys gans an kemeneth dhyworth %s. Dyski moy a-dro fatel golegi ha nowedhi an mappa yn OpenStreetMap.org</string>
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) yw unn ragdres kemeneth dhe byldya unn mappa rydh ha apert. Y yw an devedhyans chif a data mappa yn CoMaps ha oberi haval dhe Wikipedya. Hwi gallos addya po golegi leow ha i bos kavadow dhe milvilyow usyoryon dres oll an bys.\nOmjunya an kemeneth ha gweres gul unn mappa gwell rag keniver!</string>
-    <string name="login_to_make_edits_visible">Gul unn akont OpenStreetMap po omgelmi dhe dyllo gas chanjyow dhe an bys</string>
-    <string name="downloader_of">%1$d a %2$d</string>
-    <string name="download_over_mobile_message">Y re bos kostek meur lowr war nebes towlow po a tramor</string>
-    <string name="error_enter_correct_storey_number">An niver a leuryow res na eksedya %d</string>
-    <string name="editor_note_hint">Deskrifa errors war an mappa po pyth may na golegys yn CoMaps</string>
-    <string name="editor_about_osm">Gas chanjyow yw ughkargys dhe an sel dherivadow <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> poblek. Mar pleg, addya kudhlow privedh po gwirbryntys vyth.</string>
-    <string name="editor_category_unsuitable_title">Na gallos kavos unn klass fytti?</string>
-    <string name="editor_category_unsuitable_text">CoMaps alowa hwi addya klassys sempel hepken, rag henna trevow, fordhow, lynnyn, drehevyansow, h.e. vyth. Mar pleg, addya a\'n par na klassys dhe <a href="https://www.openstreetmap.org">OpenStreetMap</a>. Checkya agan <a href="https://www.openstreetmap.org">kowethlyver</a> rag danvonadow kamm ha kamm manylys.</string>
-    <string name="downloader_no_downloaded_maps_title">Hwi na iskargys neb mappys</string>
-    <string name="downloader_no_downloaded_maps_message">Iskarga mappys dhe hwilas ha viajya dhywarlinen</string>
-    <string name="current_location_unknown_error_title">Tyller a\'n jydh yw ankoth</string>
-    <string name="day">d</string>
-    <string name="editor_place_doesnt_exist_description">Deskrifa an studh lemmyn dhe danvon unn noten error dhe an kemeneth OpenStreetMap</string>
-    <string name="editor_mark_business_vacant_description">Devnydhya ma a an negys re movys ha an spas yw gwag ha parys rag unn gobrener nowydh.</string>
-    <string name="place_page_map_too_old_title">Data mappa anterrus</string>
-    <string name="place_page_map_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an mappa mar pleg.</string>
-    <string name="place_page_app_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an app CoMaps.</string>
-    <string name="place_page_update_too_old_map">Nowedhi pow mappa</string>
-    <string name="place_page_too_old_to_edit">Golegi OpenStreetMap yw ungallosegi dre reson an data mappa yw re koth.</string>
-    <string name="editor_share_to_all_dialog_message_1">Surhe hwi na ynworra neb kudhlow privedh po personel.</string>
-    <string name="editor_share_to_all_dialog_message_2">Pennskriforyon OpenStreetMap a wra checkya an chanjyow ha kestava hwi a i kavos neb kwestyons.</string>
-    <string name="mobile_data_dialog">Devnydhya junyans kellgowser dhe diskwedhes kudhlow manylys?</string>
-    <string name="mobile_data_option_always">Devnydhya Pub Prys</string>
-    <string name="mobile_data_option_not_today">Na Devnydhya Hedhyw</string>
-    <string name="mobile_data">Junyans Kellgowser</string>
-    <string name="mobile_data_description">Junyans kellgowser yw res rag messajys nowedhyans mappa ha ughkarga chanjyow</string>
-    <string name="mobile_data_option_never">Devnydhya Bynner</string>
-    <string name="mobile_data_option_ask">Govyn Pub Prys</string>
-    <string name="traffic_update_maps_text">Rag diskwedhes data daromdak, mappys res bos nowedhys</string>
-    <string name="big_font">Moghhe braster a labelyow mappa</string>
-    <string name="traffic_data_unavailable">Data daromdak ankavadow</string>
-    <string name="enable_logging">Gallosegi kovadhow</string>
-    <string name="prefs_languages_information">Ni devnydhya lev system rag danvonadow a dros. Lies devisyow Android devnydhya TTS Google, hwi gallos iskarga po nowedhi y yn Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Rag nebes yethow, hwi res lea unn synthesyer kows po unn fardel yeth keworransel yn an gwerthji appys (Google Play, Galaxy Store, App Gallery, FDroid). \nYgeri gas settyansyow devis → Yeth ha ynworrans → Areth → Eskorrans tekst dhe areth. \nHwi gallos dyghtya omma settyansow rag synthesyans kows (rag ensampel, iskarga fardel yeth dhe devnydh dhywarlinen) ha dewis jynn tekst-dhe-areth aral.</string>
-    <string name="prefs_languages_information_off_link">Rag moy kudhlow checkya an kowethlyver ma</string>
-    <string name="prefs_speed_cameras_information">Gwarnyans kamera tooth yw marow yn broyow le may gwarnyansow yw difennys erbynn lagha leel.</string>
-    <string name="transliteration_title">Treylya yn lytherennans Latin</string>
-    <string name="routing_add_start_point">Devnydhya hwithrans po tava war an mappa rag addya unn tyller dalleth</string>
-    <string name="routing_add_finish_point">Devnydhya hwithrans po tava war an mappa rag addya unn penn an fordh</string>
-    <string name="planning_route_manage_route">Dyghtya Kerdh</string>
-    <string name="saved">Sawys</string>
-    <string name="dialog_error_storage_title">Kudyn hedhas dalghuster</string>
-    <string name="dialog_error_storage_message">Dalghuster a-ves ankavadow. An karten SD re bos removys, shyndys, po an system restrennow yw redya-hepken. Mar pleg, checkya gas karten SD po kestava ni gans support@comaps.app</string>
-    <string name="setting_emulate_bad_storage">Hevelebya dalghuster drog</string>
-    <plurals name="bookmarks_places">
-        <item quantity="zero">%d lyververkys</item>
-        <item quantity="one">%d lyververk</item>
-        <item quantity="two">%d lyververkys</item>
-        <item quantity="few">%d lyververkys</item>
-        <item quantity="many">%d lyververkys</item>
-        <item quantity="other">%d lyververkys</item>
-    </plurals>
-    <string name="bookmarks_error_message_share_general">Anabel dhe kevrenna awos unn error app</string>
-    <string name="bookmarks_error_title_share_empty">Error dres kevrenna</string>
-    <string name="bookmarks_error_message_share_empty">Na gallos kevrenna unn rol gwag</string>
-    <string name="bookmarks_error_title_empty_list_name">Hanow a res</string>
-    <plurals name="bookmarks_detect_message">
-        <item quantity="zero">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
-        <item quantity="one">%d restrenn kavos. Hwi gallos gweles y wosa treylyans.</item>
-        <item quantity="two">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
-        <item quantity="few">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
-        <item quantity="many">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
-        <item quantity="other">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
-    </plurals>
-    <plurals name="tracks">
-        <item quantity="zero">%d lerghow</item>
-        <item quantity="one">%d lergh</item>
-        <item quantity="two">%d lerghow</item>
-        <item quantity="few">%d lerghow</item>
-        <item quantity="many">%d lerghow</item>
-        <item quantity="other">%d lerghow</item>
-    </plurals>
-    <string name="bookmarks_empty_list_message">Rag addya unn lyververk, tava unn le war an mappa ha tava an arwodik steren</string>
-    <string name="notification_channel_downloader">Iskarger mappa</string>
-    <string name="pref_tts_speedcams_always">Gwarnya pub prys</string>
-    <string name="pref_tts_speedcams_never">Gwarnya bynner</string>
-    <string name="power_managment_title">Fordh erbysyon batri</string>
-    <string name="power_managment_description">Assaya lehe usadow batri yn despit dhe nebes nasyow</string>
-    <string name="power_managment_setting_never">Bynner</string>
-    <string name="power_managment_setting_auto">Pan batri yw isel</string>
-    <string name="power_managment_setting_manual_max">Pub prys</string>
-    <string name="enable_logging_warning_message">Gallosegi yn servadow an dewis ma rag rekordya ha danvon dre dhorn kovadhow manylys a-dro gas kudyn dhe ni gans \"Derivas unn kudyn\" yn an folen Gweres. Kovadhow re komprehendya kudhlow GPS.</string>
-    <string name="driving_options_title">Dewisyow kerdh</string>
-    <string name="avoid_tolls">Goheles tollow</string>
-    <string name="avoid_unpaved">Goheles fordh ankonsys</string>
-    <string name="avoid_ferry">Goheles kowbalow</string>
-    <string name="avoid_motorways">Goheles gorfordhow</string>
-    <string name="avoid_steps">Goheles stayrys</string>
-    <string name="avoid_paved">Goheles fordh konsys</string>
-    <string name="unable_to_calc_alert_title">Anabel kalkya kerdh</string>
-    <string name="unable_to_calc_alert_subtitle">Unn kerdh na gallos kavosys. Ma re bos drefen gas dewisyow kerdh po data OpenStreetMap andhien. Mar pleg chanjya gas dewisyow kerdh ha dasassaya.</string>
-    <string name="change_driving_options_btn">Dewisyow kerdh gallosegys</string>
-    <string name="week_ago_sorttype">Nans yw unn seythen</string>
-    <string name="month_ago_sorttype">Nans yw unn mis</string>
-    <string name="moremonth_ago_sorttype">Moy ages nans yw unn mis</string>
-    <string name="moreyear_ago_sorttype">Moy ages nans yw unn bledhen</string>
-    <string name="dialog_pedestrian_route_is_long_header">Kerdh metro kavosys vyth</string>
-    <string name="dialog_pedestrian_route_is_long_message">Mar pleg, dewis unn tyller dalleth po penn an fordh yn-nes unn gorvas metro</string>
-    <string name="isolines_activation_error_dialog">Bywhe linen kettresow res iskargaow data mappa rag an arenebedh ma</string>
-    <string name="isolines_location_error_dialog">Linen kettresow yw kavadow yn an arenebedh ma na hwath</string>
-    <string name="elevation_profile_ascent">Ascendyans</string>
-    <string name="elevation_profile_descent">Diyskynnys</string>
-    <string name="downloader_loading_ios">Iskargaow</string>
-    <string name="disk_error">Anabel dhe gul restrenva ha gwaya restrennow war devis kov po sdcard</string>
-    <string name="disconnect_usb_cable_title">Unjunya korsen USB</string>
-    <string name="enable_keep_screen_on">Gwitha an skrin byw</string>
-    <string name="enable_keep_screen_on_description">A gallosegys, an skrin yw bos byw pub prys dres diskwedhes an mappa.</string>
-    <string name="enable_show_on_lock_screen">Diskwedhes war an skrin floren</string>
-    <string name="enable_show_on_lock_screen_description">A gallosegys, an app yw diskwedhes war an skrin floren pan an devis yw alhwedhys hwath.</string>
-    <string name="app_tip_03">A hwi aswon unn gwrier medhelweyth, hwi gallos peji ga kowlwul unn nas may hwi res.</string>
-    <string name="app_tip_04">Tava yn neb le war an mappa dhe dewis neb tra. Unn tava hir yw rag kudha ha diskwedhes an ynterfas.</string>
-    <string name="app_tip_05">A wodhowgh gas tyller a\'n jydh war an mappa gallos dewisys?</string>
-    <string name="app_tip_07">Agan app yw gul gans nebes diwysygyon ha an kemeneth.</string>
-    <string name="app_tip_08">Hwi gallos ewnhe ha gwellhe yn es an data map.</string>
-    <string name="app_tip_09">Agan amkan chif yw byldya mappys uskis, privedh, ha es may hwi a wra kara.</string>
-    <string name="car_used_on_the_phone_screen">Hwi devnydhya lemmyn CoMaps war an skrin kellgowser</string>
-    <string name="car_used_on_the_car_screen">Hwi devnydhya lemmyn CoMaps war an skrin karr</string>
-    <string name="car_continue_on_the_phone">Pesya war an kellgowser</string>
-    <string name="car_continue_in_the_car">Dhe an skrin karr</string>
-    <string name="aa_location_permissions_request">CoMaps res hedhas GPS. Pan y yw saw, checkya an messach war gas kellgowser.</string>
-    <string name="aa_request_permission_notification">An app ma res gas gront</string>
-    <string name="aa_request_permission_activity_text">CoMaps yn Android Auto res grontys GPS rag oberyans effeythus</string>
-    <string name="pref_tts_open_system_settings">Settyansow system tekst-dhe-areth</string>
-    <string name="pref_tts_no_system_tts">Settyansow tekst-dhe-areth na kavosys, Os ta sur gas devis skoodhya y?</string>
-    <string name="drive_through">Drivya-dredh</string>
-    <string name="self_service">Omgonis</string>
-    <string name="power_save_dialog_summary">Rag navygacyon moggha, ni komendya ungallosegi fordh batri yn settyansow kellgowser batri.</string>
-    <string name="stop_track_recording">Finsya Rekordyans Lergh</string>
-    <string name="stop_without_saving">Hedhi Rekordyans Lergh</string>
-    <string name="continue_recording">Pesya Rekordya</string>
-    <string name="track_recording_alert_title">Sawya yn Lyververkys ha Lerghow?</string>
-    <string name="track_recording_toast_nothing_to_save">Lergh yw gwag - mann rag sawyans</string>
-    <string name="error_no_file_manager_app">Anabel diskwedhes fenester dewis restrenva dre reson app fytti vyth yw leys war gas devis. Mar pleg, lea unn dyghtyer restrennow ha dasassaya.</string>
-    <string name="uri_open_location_failed">App leys vyth may gallos ygeri an tyller</string>
-    <string name="pref_left_button_disable">Ungallosegi</string>
-    <string name="pref_backup_title">Fardel ewnans gans lyververkys ha lerghow</string>
-    <string name="pref_backup_summary">Gul yn awtomatek unn fardel gans data rag ewnans yn unn restrenva war gas devis</string>
-    <string name="pref_backup_now_title">Gul y lemmyn</string>
-    <string name="pref_backup_now_summary">Gul a\'n par na fardel a-dhesempis</string>
-    <string name="pref_backup_now_summary_progress">Yn avonsyans…</string>
-    <string name="pref_backup_now_summary_ok">Sewena</string>
-    <string name="pref_backup_now_summary_empty_lists">Lyververkys ha lerghow vyth rag gul unn fardel</string>
-    <string name="pref_backup_now_summary_failed">Y fyllis gul unn fardel</string>
-    <string name="pref_backup_now_summary_folder_unavailable">An restrenva dewisys yw ankavadow</string>
-    <string name="pref_backup_status_summary_success">Gwrians sewen a-dhiwedhes</string>
-    <string name="pref_backup_location_title">Tyller</string>
-    <string name="pref_backup_location_summary_initial">Mar pleg, dewis unn restrenva a-dherag ha grontya gront</string>
-    <string name="pref_backup_history_title">Niver a fardellow dhe gwitha</string>
-    <string name="pref_backup_interval_title">Gul fardellow yn awtomatek</string>
-    <string name="backup_interval_manual_only">Marow (dre dhorn hepken)</string>
-    <string name="dialog_report_error_missing_folder">An tyller dewisys yw ankavadow po redya-hepken. Dewis unn tyller aral, mar pleg.</string>
-    <string name="dialog_report_error_with_logs">Mar pleg danvon unn derivas error dhe ni:\n - \"Gallosegi kovadhow\" yn an settyansow\n - Dasleverel yn diogel an kudyn\n - yn an skrin \"A-dro ha Gweres\", levna an boton \"Derivas unn kudyn\" ha danvon der ebost po keskows\n - ungallosegi kovadhow</string>
-    <string name="route_type">Eghen kerdh</string>
-    <string name="open_now">Ygeri lemmyn</string>
-    <string name="closed_now">Degeys lemmyn</string>
-    <string name="at">dhe %s</string>
-    <string name="pref_tts_no_system_tts_short">Jynn tekst-dhe-areth kavosys vyth, checkya an settyansow app</string>
-    <string name="navigation_start_tts_message">"Dalleth navygacyon, yeth lev: "</string>
-    <string name="navigation_start_tts_disabled_message">Lenna danvonadow marow: jynn tekst-dhe-areth ankavadow</string>
-    <string name="offline_explanation_text">Unn mappa res iskargys rag gweles ha viajya an arenebedh.\nIskarga mappys rag arenebedhow may hwi mynnes viajya dhe.</string>
-    <string name="list_description_empty">Golegi an rol rag addya unn deskrifans</string>
-    <string name="advanced">Avonsys</string>
-    <string name="download_resources_custom_url_title">Servell Mappa Personel</string>
-    <string name="download_resources_custom_url_message">Aslea an servell defowt devnydhys rag iskargow mappa. Gwitha gwag rag devnydhya an servell CoMaps defowt.</string>
-    <string name="download_resources_custom_url_summary_none">Anavleythys</string>
-    <string name="download_resources_custom_url_error_scheme">Mar pleg, ynworra unn URL may dalleth gans http:// po https://</string>
 </resources>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -900,5 +900,5 @@
    <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
    <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
    <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
-    <string name="download_resources_custom_url_error_scheme">Įveskite URL adresą, prasidedantį „http://“ arba „https://“</string>
+    <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
 </resources>
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -15,7 +15,6 @@
  <color name="bg_cards">#FF3C4044</color>
  <color name="bg_panel">@color/bg_window</color>
  <color name="bg_primary_dark">#FF588157</color>
-  <color name="bg_app">#10140F</color>

  <color name="bg_menu">#CC2D3237</color>

--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -11,7 +11,7 @@
    <item name="android:textColorPrimary">@color/text_light</item>
    <item name="android:textColorPrimaryInverse">@color/text_dark</item>
    <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-    <item name="android:windowBackground">?appBackground</item>
+    <item name="android:windowBackground">?windowBackgroundForced</item>
    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
@@ -21,7 +21,7 @@
    <item name="android:statusBarColor">?colorPrimary</item>
    <item name="android:windowTranslucentNavigation">false</item>

-    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
    <item name="windowBackgroundForced">@color/bg_window</item>
    <item name="cardBackground">@color/bg_cards</item>
    <item name="titleDialogTheme">@color/white_primary</item>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -897,5 +897,5 @@
    <string name="download_resources_custom_url_title">Servidor de Mapas Personalizado</string>
    <string name="download_resources_custom_url_message">Substitua o servidor padrão usado para baixar mapas. Deixe em branco para usar o servidor padrão do CoMaps.</string>
    <string name="download_resources_custom_url_summary_none">Não definido</string>
-    <string name="download_resources_custom_url_error_scheme">Insira uma URL começando com http:// ou https://</string>
+    <string name="download_resources_custom_url_error_scheme">Insira um URL completo começando com https:// e terminando com /</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -913,5 +913,5 @@
    <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
    <string name="download_resources_custom_url_summary_none">Indefinido</string>
-    <string name="download_resources_custom_url_error_scheme">Por favor, insira um URL começando com http:// ou https://</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
 </resources>
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -120,7 +120,7 @@

  <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
  <dimen name="zoom_buttons_margin">58dp</dimen>
-  <dimen name="map_buttons_bottom_margin">136dp</dimen>
+  <dimen name="map_buttons_bottom_margin">184dp</dimen>
  <dimen name="map_buttons_bottom_max_width">300dp</dimen>

  <dimen name="appbar_elevation">4dp</dimen>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -73,11 +73,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Add a New List</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">List Name</string>
+    <string name="bookmark_set_name">Bookmark List Name</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Places</string>
+    <string name="bookmarks">Bookmarks</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favorites</string>
+    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Name</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -156,18 +156,18 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notes</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">My CoMaps Favorites</string>
+    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
    <string name="share_bookmarks_email_body">Hello!
 \n
-\nAttached are my favorites; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/
+\nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/
 \n
 \nEnjoy travelling with CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Loading Favorites</string>
+    <string name="load_kmz_title">Loading Bookmarks</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Favorites loaded successfully! You can find them on the map or on the Favorites Manager screen.</string>
+    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Failed to load favorites. The file may be corrupted or defective.</string>
+    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted or defective.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">The file type is not recognized by the app:
 \n%1$s</string>
@@ -541,7 +541,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">More</string>
-    <string name="placepage_edit_bookmark_button">Edit Saved Place</string>
+    <string name="placepage_edit_bookmark_button">Edit Bookmark</string>
    <string name="placepage_personal_notes_hint">Personal notes (text or html)</string>
    <string name="editor_reset_edits_message">Discard all local changes?</string>
    <string name="editor_reset_edits_button">Discard changes</string>
@@ -635,17 +635,17 @@
    <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emulate bad storage</string>
    <string name="error_enter_correct_name">Please enter a correct name</string>
-    <string name="bookmark_lists">Favorite Lists</string>
+    <string name="bookmark_lists">Lists</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Hide all</string>
    <string name="bookmark_lists_show_all">Show all</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d saved place</item>
-        <item quantity="other">%d saved places</item>
+        <item quantity="one">%d bookmark</item>
+        <item quantity="other">%d bookmarks</item>
    </plurals>
    <string name="bookmarks_create_new_group">Create a new list</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Import Favorites</string>
+    <string name="bookmarks_import">Import Bookmarks and Tracks</string>
    <string name="bookmarks_error_message_share_general">Unable to share due to an application error</string>
    <string name="bookmarks_error_title_share_empty">Sharing error</string>
    <string name="bookmarks_error_message_share_empty">Cannot share an empty list</string>
@@ -675,7 +675,7 @@
    <string name="subway">Subway</string>
    <string name="layers_title">Map Styles and Layers</string>
    <string name="bookmarks_empty_list_title">This list is empty</string>
-    <string name="bookmarks_empty_list_message">To save a place, tap a place on the map and then tap the star icon</string>
+    <string name="bookmarks_empty_list_message">To add a bookmark, tap a place on the map and then tap the star icon</string>
    <string name="category_desc_more">…more</string>
    <string name="export_file">Export KMZ</string>
    <string name="export_file_gpx">Export GPX</string>
@@ -730,7 +730,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Sort…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sort favorites</string>
+    <string name="sort_bookmarks">Sort bookmarks</string>
    <!-- Android -->
    <string name="by_default">By default</string>
    <!-- Android -->
@@ -811,7 +811,7 @@
    <string name="translated_om_site_url">https://comaps.app/</string>
    <!-- Link to OSM wiki for Editor, Profile and About pages -->
    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
-    <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 saved place, 5 tracks -->
+    <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 bookmark, 5 tracks -->
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <!-- App Tip #00 -->
    <string name="app_tip_00">Thank you for using our community-built maps!</string>
@@ -857,7 +857,7 @@
    <string name="browser_not_available">Web browser is not available</string>
    <string name="volume">Volume</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Export all Places and Tracks</string>
+    <string name="bookmarks_export">Export all Bookmarks and Tracks</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Speech synthesis system settings</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -889,7 +889,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continue Recording</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Save into Favorites?</string>
+    <string name="track_recording_alert_title">Save into Bookmarks and Tracks?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Track is empty - nothing to save</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -903,13 +903,13 @@
    <string name="pref_left_button_disable">Disable</string>

    <!-- Settings "Backup" category: "Backup" title -->
-    <string name="pref_backup_title">Backup favorites</string>
+    <string name="pref_backup_title">Bookmarks and tracks backup</string>
    <string name="pref_backup_summary">Automatically backup to a folder on your device</string>
    <string name="pref_backup_now_title">Backup now</string>
    <string name="pref_backup_now_summary">Create a backup immediately</string>
    <string name="pref_backup_now_summary_progress">Backup in progress…</string>
    <string name="pref_backup_now_summary_ok">Backup completed successfully</string>
-    <string name="pref_backup_now_summary_empty_lists">No places and tracks to backup</string>
+    <string name="pref_backup_now_summary_empty_lists">No bookmarks and tracks to backup</string>
    <string name="pref_backup_now_summary_failed">Backup failed</string>
    <string name="pref_backup_now_summary_folder_unavailable">The backup folder is not available</string>
    <string name="pref_backup_status_summary_success">Last successful backup</string>
@@ -933,7 +933,7 @@
    <string name="pedestrian">Pedestrian</string>
    <string name="bicycle">Bicycle</string>
    <string name="ruler">Ruler</string>
-    <string name="bookmark_color">Color for Favorite</string>
+    <string name="bookmark_color">Bookmark color</string>
    <string name="about_help">About &amp; Help</string>
    <string name="open_now">Open now</string>
    <string name="closed_now">Closed now</string>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -290,13 +290,13 @@
  </style>

  <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?colorSurfaceContainerLow</item>
+    <item name="backgroundTint">?cardBackground</item>
    <item name="elevationOverlayEnabled">false</item>
    <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
  </style>

  <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?colorSurfaceContainerLow</item>
+    <item name="android:background">?cardBackground</item>
    <item name="behavior_hideable">false</item>
  </style>

--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -12,7 +12,7 @@
    <item name="android:textColorPrimary">@color/text_dark</item>
    <item name="android:textColorPrimaryInverse">@color/text_light</item>
    <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
-    <item name="android:windowBackground">?appBackground</item>
+    <item name="android:windowBackground">?windowBackgroundForced</item>
    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
@@ -20,7 +20,7 @@
    <item name="android:windowActionBarOverlay">true</item>
    <item name="clickableBackground">?selectableItemBackground</item>
    <item name="android:statusBarColor">?colorPrimary</item>
-    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
    <item name="windowBackgroundForced">@color/bg_window</item>
    <item name="cardBackground">@color/bg_cards</item>
    <item name="titleDialogTheme">@color/black_primary</item>
@@ -185,11 +185,11 @@
  </style>

  <style name="MwmTheme.CardBg">
-    <item name="android:windowBackground">?appBackground</item>
+    <item name="android:windowBackground">@color/bg_cards</item>
  </style>

  <style name="MwmTheme.WindowBg">
-    <item name="android:windowBackground">?appBackground</item>
+    <item name="android:windowBackground">@color/bg_window</item>
  </style>

  <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -243,7 +243,7 @@

  <style name="MwmTheme.FullScreenDialog">
    <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">?appBackground</item>
+    <item name="android:windowBackground">@android:color/white</item>
  </style>

  <style name="MwmTheme.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
@@ -253,9 +253,8 @@
    <item name="android:fontFamily">@string/robotoMedium</item>
  </style>

-  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.M3.AlertDialog">
+  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
    <item name="android:textColor">?textDialogTheme</item>
-    <item name="android:background">?attr/colorSurfaceContainerHigh</item>
  </style>

  <style name="MwmTheme.Downloader">
@@ -282,11 +281,4 @@
  <style name="PopupMenu" parent="ThemeOverlay.Material3">
    <item name="android:popupBackground">?windowBackgroundForced</item>
  </style>
-    <!-- Theme required to apply M3 dialog style on preference screen -->
-    <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-        <item name="dialogCornerRadius">28dp</item>
-        <item name="cornerFamily">rounded</item>
-        <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
-        <item name="android:layout">@layout/m3_alert_dialog</item>
-    </style>
 </resources>
--- a/android/app/src/main/res/xml/locales_config.xml
+++ b/android/app/src/main/res/xml/locales_config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Some languages not supported by Android require to be specified here to be applied -->
    <locale android:name="en" />
    <locale android:name="af" />
    <locale android:name="ar" />
@@ -27,7 +26,6 @@
    <locale android:name="in" />
    <locale android:name="it" />
    <locale android:name="ja" />
-    <locale android:name="kw" />
    <locale android:name="ko" />
    <locale android:name="lt" />
    <locale android:name="lv" />
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -27,6 +27,8 @@ import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
 import org.chromium.base.ObserverList;

+import java.util.HashMap;
+
 public class LocationHelper implements BaseLocationProvider.Listener
 {
  private static final long INTERVAL_MS = 500;
@@ -56,6 +58,12 @@ public class LocationHelper implements BaseLocationProvider.Listener
  private Handler mHandler;
  private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;

+  private static final double INTERVAL_PROVIDER_DECISION = 3.0; // seconds
+  private final HashMap<String, Integer> mProviderLocationCounts = new HashMap<>();
+  private final HashMap<String, Float> mProviderAccuracyMeans = new HashMap<>();
+  private double mTimeAtLastProviderChange = Double.NaN;
+  private String mCurrentProvider = null;
+
  @NonNull
  private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
    @Override
@@ -187,7 +195,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
  @Override
  public void onLocationChanged(@NonNull Location location)
  {
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);

    if (!isActive())
    {
@@ -201,21 +208,59 @@ public class LocationHelper implements BaseLocationProvider.Listener
      return;
    }

-    if (mSavedLocation != null)
-    {
-      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
-      {
-        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
+    updateProviderDecision(location);
+    if(mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider())) {
+        Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
        return;
-      }
    }

+    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+
    mSavedLocation = location;
    mMyPosition = null;
    notifyLocationUpdated();
  }

-  // Used by GoogleFusedLocationProvider.
+    private void updateProviderDecision(Location location) {
+      if(Double.isNaN(mTimeAtLastProviderChange))
+          mTimeAtLastProviderChange = location.getElapsedRealtimeNanos() * 1.0E-9;
+
+      String provider = location.getProvider();
+      int count = mProviderLocationCounts.getOrDefault(provider, 0);
+      float average = mProviderAccuracyMeans.getOrDefault(provider, 0.0f);
+
+      float accuracy = location.getAccuracy();
+      float newAverage = (count * average + accuracy) / (count + 1);
+
+      mProviderLocationCounts.put(provider, count + 1);
+      mProviderAccuracyMeans.put(provider, newAverage);
+
+      double currentTime = location.getElapsedRealtimeNanos();
+      double timeDiff = (currentTime - mTimeAtLastProviderChange) * 1.0E-9;
+
+      if(timeDiff > INTERVAL_PROVIDER_DECISION) {
+          mCurrentProvider = getMinAccuracyProvider();
+          Logger.d(TAG, "Selected: " + mCurrentProvider + ", with acc. " + mProviderAccuracyMeans.get(mCurrentProvider));
+          mTimeAtLastProviderChange = currentTime;
+          mProviderLocationCounts.clear();
+          mProviderAccuracyMeans.clear();
+      }
+    }
+
+    private String getMinAccuracyProvider() {
+        String minAccuracyProvider = null;
+        float minAccuracy = Float.MAX_VALUE;
+        for(String p : mProviderAccuracyMeans.keySet()) {
+            float pAccuracy = mProviderAccuracyMeans.get(p);
+            if(pAccuracy < minAccuracy) {
+                minAccuracy = pAccuracy;
+                minAccuracyProvider = p;
+            }
+        }
+        return minAccuracyProvider;
+    }
+
+    // Used by GoogleFusedLocationProvider.
  @SuppressWarnings("unused")
  @Override
  @UiThread
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
@@ -20,7 +20,8 @@ public final class LocationState
  }

  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({PENDING_POSITION, NOT_FOLLOW_NO_POSITION, NOT_FOLLOW, FOLLOW, FOLLOW_AND_ROTATE})
+  @IntDef({PENDING_POSITION, NOT_FOLLOW_NO_POSITION, NOT_FOLLOW, FOLLOW, FOLLOW_AND_ROTATE_COMPASS,
+           FOLLOW_AND_ROTATE_ROUTE})
  @interface Value
  {}

@@ -29,7 +30,8 @@ public final class LocationState
  public static final int NOT_FOLLOW_NO_POSITION = 1;
  public static final int NOT_FOLLOW = 2;
  public static final int FOLLOW = 3;
-  public static final int FOLLOW_AND_ROTATE = 4;
+  public static final int FOLLOW_AND_ROTATE_COMPASS = 4;
+  public static final int FOLLOW_AND_ROTATE_ROUTE = 5;

  // These constants should correspond to values defined in platform/location.hpp
  // Leave 0-value as no any error.
@@ -69,7 +71,8 @@ public final class LocationState
      case NOT_FOLLOW_NO_POSITION -> "NOT_FOLLOW_NO_POSITION";
      case NOT_FOLLOW -> "NOT_FOLLOW";
      case FOLLOW -> "FOLLOW";
-      case FOLLOW_AND_ROTATE -> "FOLLOW_AND_ROTATE";
+      case FOLLOW_AND_ROTATE_COMPASS -> "FOLLOW_AND_ROTATE_COMPASS";
+      case FOLLOW_AND_ROTATE_ROUTE -> "FOLLOW_AND_ROTATE_ROUTE";
      default -> "Unknown: " + mode;
    };
  }
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
@@ -81,20 +81,6 @@ public class LocationUtils
    return location.getAccuracy() > 0.0f;
  }

-  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
-  {
-    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
-      return false;
-
-    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
-    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
-      return true;
-
-    double speed = Math.max(DEFAULT_SPEED_MPS, (newLocation.getSpeed() + lastLocation.getSpeed()) / 2.0);
-    double lastAccuracy = lastLocation.getAccuracy() + speed * LocationUtils.getTimeDiff(lastLocation, newLocation);
-    return newLocation.getAccuracy() < lastAccuracy;
-  }
-
  public static boolean areLocationServicesTurnedOn(@NonNull Context context)
  {
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
--- a/android/sdk/src/main/res/values-b+sr+Latn/strings.xml
+++ b/android/sdk/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="mb">MB</string>
-</resources>
+</resources>
--- a/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
+++ b/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
@@ -1,8 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="type.addr_interpolation">Adresa/Blok</string>
-    <string name="type.addr_interpolation.even">Adresa/Blok</string>
-    <string name="type.addr_interpolation.odd">Adresa/Blok</string>
-    <string name="type.aerialway">Vazdušni put</string>
-    <string name="type.aerialway.mixed_lift">Kombinovana žičara</string>
-</resources>
+</resources>
--- a/android/sdk/src/main/res/values-bn/strings.xml
+++ b/android/sdk/src/main/res/values-bn/strings.xml
@@ -18,11 +18,4 @@
    <string name="month_ago">%s মাস আগে</string>
    <string name="year_ago">%s বছর আগে</string>
    <string name="core_entrance">প্রবেশ</string>
-    <string name="core_placepage_unknown_place">মানচিত্র বিন্দু</string>
-    <string name="subway_data_unavailable">সাবওয়ে মানচিত্র অনুপলব্ধ</string>
-    <string name="core_exit">প্রস্থান</string>
-    <string name="weeks_ago">%s সপ্তাহ আগে</string>
-    <string name="months_ago">%s মাস আগে</string>
-    <string name="years_ago">%s বছর আগে</string>
-    <string name="m">মি</string>
 </resources>
--- a/android/sdk/src/main/res/values-bn/types_strings.xml
+++ b/android/sdk/src/main/res/values-bn/types_strings.xml
@@ -139,37 +139,4 @@
    <string name="type.public_transport">গণপরিবহন</string>
    <string name="type.route.ferry">ফেরি</string>
    <string name="type.amenity.studio">মিডিয়া স্টুডিও</string>
-    <string name="type.barrier.gate">গেট</string>
-    <string name="type.barrier.kissing_gate">কিসিঙ্গ গেট</string>
-    <string name="type.barrier.lift_gate">লিফ্ট গেট</string>
-    <string name="type.barrier.wicket_gate">উইকেট গেট</string>
-    <string name="type.barrier.swing_gate">সুইঙ্গ গেট</string>
-    <string name="type.aeroway.helipad">হেলিপ্যাড</string>
-    <string name="type.amenity.bicycle_parking.covered">আচ্ছাদিত সাইকেল পার্কিং</string>
-    <string name="type.amenity.boat_rental">নৌকা ভাড়া</string>
-    <string name="type.amenity.bicycle_rental">সাইকেল ভাড়া</string>
-    <string name="type.man_made.telescope">দূরবিক্ষণ</string>
-    <string name="type.man_made.telescope.optical">দূরবিক্ষণ (আলোক রশ্মি)</string>
-    <string name="type.man_made.telescope.radio">দূরবিক্ষণ (রেডিও রশ্মি)</string>
-    <string name="type.man_made.telescope.gamma">দূরবিক্ষণ (গামা রশ্মি)</string>
-    <string name="type.man_made.observatory">পর্যবেক্ষণাগার</string>
-    <string name="type.amenity.car_rental">গাড়ি ভাড়া</string>
-    <string name="type.amenity.motorcycle_rental">মোটরসাইকেল ভাড়া</string>
-    <string name="type.amenity.cinema">সিনেমা</string>
-    <string name="type.amenity.shelter.public_transport">আশ্রয়</string>
-    <string name="type.amenity.post_office">পোস্ট অফিস</string>
-    <string name="type.amenity.restaurant">রেস্টুরেন্ট</string>
-    <string name="type.amenity.taxi">ট্যাক্সি স্ট্যান্ড</string>
-    <string name="type.shop.mobile_phone">মোবাইল ফোনের দোকান</string>
-    <string name="type.addr_interpolation.even">ঠিকানা/ব্লক</string>
-    <string name="type.addr_interpolation.odd">ঠিকানা/ব্লক</string>
-    <string name="type.natural.water.wastewater">নিকাশী জল</string>
-    <string name="type.man_made.wastewater_plant">নিকাশী জল পরিশোধনাগার</string>
-    <string name="type.man_made.water_tap.drinking_water_no">জলের কল</string>
-    <string name="type.man_made.water_well.drinking_water_no">পাতকুয়া</string>
-    <string name="type.natural.water.reservoir">জলাধার</string>
-    <string name="type.natural.water.basin">অববাহিকা</string>
-    <string name="type.waterway">জলপথ</string>
-    <string name="type.waterway.canal">ক্যানাল</string>
-    <string name="type.waterway.drain">ড্রেন</string>
 </resources>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -1463,5 +1463,4 @@
    <string name="type.entrance.house">Husdør</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Yogastudie</string>
    <string name="type.leisure.sports_centre.sport.climbing">Klatrehal</string>
-    <string name="type.aeroway.gate">Gate</string>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Konstantin Pastbin	f71058f0f5	WIP try 184 Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-03 23:48:43 +07:00
Vraj Shah	b07c22fc91	[android] Adjust map buttons margins in route building Signed-off-by: Vraj Shah <vrajshah006@gmail.com>	2026-01-03 23:48:41 +07:00
Konstantin Pastbin	f5a9973c73	[search] Enable Lithuanian for search categories/synonyms Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-03 23:15:26 +07:00
Konstantin Pastbin	1d6d071c1a	[planet] Update map data to 260101-test Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-03 23:15:16 +07:00
gekeleda	dc259f2b0e	[android] Increase logged info of rejected locations Signed-off-by: gekeleda <git@davidgekeler.eu>	2026-01-03 23:15:16 +07:00
gekeleda	ca6b0286c8	[android] remove previous location quality check	2026-01-03 23:15:16 +07:00
gekeleda	f3fd814d07	[android] Fix most accurate location provider Signed-off-by: gekeleda <mail@davidgekeler.eu>	2026-01-03 23:15:16 +07:00
x7z4w	6073cd1ca3	[drape] Adjust double- and long-tap delays Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-03 23:15:16 +07:00
eisa01	d29afb5b95	[carplay] Add myPositionMode button to iOS <26 workaround See PR #2474 Signed-off-by: eisa01 <eisa01@gmail.com>	2026-01-03 23:15:16 +07:00
eisa01	71cfe12164	[carplay] Use system buttons for better appearance Signed-off-by: eisa01 <eisa01@gmail.com>	2026-01-03 23:15:16 +07:00
Johannes	59a6c6e630	make sure to use the correct myPositionMode terminology	2026-01-03 23:15:16 +07:00
Johannes	374667366b	Add position mode toggle for CarPlay	2026-01-03 23:15:16 +07:00
Yannik Bloscheck	e18e85a49d	[ios] Don't let custom map appearance influence CarPlay Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-03 23:15:16 +07:00
Yannik Bloscheck	c7db4f9c33	[ios] Always use light map appearance by default Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-03 23:15:16 +07:00
Leonardo Bishop	266c38ed78	[ios] Handle distinct FollowAndRotateRoute and FollowAndRotateCompass modes Signed-off-by: Leonardo Bishop <me@leonardobishop.net>	2026-01-03 23:15:16 +07:00
Leonardo Bishop	f4d6e32605	[android] Handle distinct FollowAndRotateRoute and FollowAndRotateCompass modes Signed-off-by: Leonardo Bishop <me@leonardobishop.net>	2026-01-03 23:15:16 +07:00
Leonardo Bishop	1b15810260	[drape] Add FollowAndRotateRoute mode This adds a new mode to rotate the camera towards the route while driving. This is done by looking ahead X number of seconds along the current route, up to the next turn, and calculating the angle between the current position and then. Squashed commits: [drape] Add bearing calculation via route lookahead while navigating [drape] Extract NavigationContext from OnLocationUpdate params [drape] Increase rotation animation duration during navigation [drape] Seperate route and compass rotation into two modes [drape] Reduce route lookahead maximum to 25 seconds [drape] Fix case where rotation was incorrectly considered invalid [drape] Make FollowAndRotateRoute mode only available during driving navigation [drape] Rewrite FollowedPolyline::GetLookaheadPoint [drape] Cleanup Signed-off-by: Leonardo Bishop <me@leonardobishop.net>	2026-01-03 23:15:16 +07:00
thesupertechie	614ea4ec9c	[core] remove random key file Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2026-01-03 23:15:16 +07:00
thesupertechie	f5d3417997	[tts] add tamil TTS translation Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2026-01-03 23:15:16 +07:00
				`@@ -1 +0,0 @@`
				`Easy map navigation - Discover more of your journey - Powered by the community`
				`@@ -1 +0,0 @@`
				`CoMaps - Hike, Bike, Drive Offline with Privacy`