Removing maxspeed estimate from generator

Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
[generator] Use 72 general threads
2026-01-01 18:44:02 +00:00 · 2026-01-01 23:15:44 +07:00 · 2026-01-01 23:15:44 +07:00 · 2026-01-01 17:11:17 +01:00 · 2026-01-01 15:21:27 +00:00 · 2026-01-01 07:48:38 +01:00
134 changed files with 1435 additions and 1005 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,20 +116,6 @@ endif()

 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})

-if (PLATFORM_LINUX OR PLATFORM_ANDROID)
-  find_program(LLD_FOUND ld.lld)
-  if (LLD_FOUND)
-    message(STATUS "Using ld.lld linker")
-    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld")
-  else()
-    find_program(GOLD_FOUND ld.gold)
-    if (GOLD_FOUND)
-      message(STATUS "Using ld.gold")
-      set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold")
-    endif()
-  endif()
-endif()
-
 if (NOT SKIP_TESTS)
  enable_testing()
  # Enables ctest -T memcheck with valgrind
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 Copyright 2020 My.com B.V. (Mail.Ru Group)
 Copyright 2025 Organic Maps Contributors
-Copyright 2025 CoMaps Contributors
+Copyright 2026 CoMaps Contributors

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -351,6 +351,7 @@ dependencies {
  implementation libs.androidx.recyclerview
  implementation libs.androidx.work.runtime
  implementation libs.androidx.lifecycle.process
+  implementation libs.androidx.documentfile
  implementation libs.android.material
  // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
  // https://github.com/organicmaps/organicmaps/issues/6106
--- a/android/app/src/fdroid/play/listings/de-DE/full-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/full-description.txt
@@ -1,6 +1,6 @@
 Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.

-Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
+Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b> (auf Englisch).
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
@@ -9,9 +9,9 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
 ‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
 ‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
-‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
+‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig viel Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, diese App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source.</b>

 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor

-<b>Entdecke die Unabhängigkeit</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+<b>Freiheit beginnt hier</b>
+Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
--- a/android/app/src/fdroid/play/listings/de-DE/short-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
--- a/android/app/src/google/play/listings/de-DE/full-description.txt
+++ b/android/app/src/google/play/listings/de-DE/full-description.txt
@@ -3,7 +3,7 @@ Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf Op
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
-• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website
+• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap-Webseite

 <i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>

@@ -12,7 +12,7 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Datenschutz ist uns wichtig!</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source.</b>

 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -24,13 +24,13 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Lesezeichen mit einem einzigen Tippen speichern
 • Offline verfügbare Wikipedia-Artikel
 • U- und S-Bahn-Netze
-• Aufzeichnen von GPS Tracks
+• Aufzeichnen von GPS-Tracks
 • Import und Export von Favoriten und Routen im KML-, KMZ- oder GPX-Format
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 • Unterstützung für Android Auto

-Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>
+Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app/de/</i></b>

-<b>Entdecke die Unabhängigkeit</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+<b>Freiheit beginnt hier</b>
+Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
--- a/android/app/src/google/play/listings/de-DE/short-description.txt
+++ b/android/app/src/google/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
@@ -152,7 +152,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
    if (mInputValidator != null)
    {
      final String maybeError = mInputValidator.validate(activity, input);
-      mEtInputLayout.getEditText().setError(maybeError);
+      mEtInputLayout.setError(maybeError);
      mEtInputLayout.requestFocus();
      return maybeError == null;
    }
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -196,10 +196,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      {
        final Context context = mInputBuildingLevels.getContext();
        final boolean isValid = Editor.nativeIsLevelValid(s.toString());
-        UiUtils.setInputError(mInputBuildingLevels,
-                              isValid ? null
-                                      : context.getString(R.string.error_enter_correct_storey_number,
-                                                          Editor.nativeGetMaxEditableBuildingLevels()));
+        mInputBuildingLevels.setError(isValid ? null : context.getString(R.string.error_enter_correct_storey_number,
+                Editor.nativeGetMaxEditableBuildingLevels()));
      }
    });

--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -98,6 +98,11 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);

+    View mTopbar = topFrame.findViewById(R.id.statutbar);
+    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
+        UiUtils.setViewNavigationTopInsetsMargin(v, windowInsets);
+        return windowInsets;
+    });
    // Show a blank view below the navbar to hide the menu content
    final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
    final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);
--- a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
@@ -6,12 +6,10 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;

@@ -44,7 +42,6 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
-    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
    RecyclerView recyclerView = getListView();
    ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
  }
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -24,7 +24,6 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.WindowCompat;
@@ -196,7 +195,7 @@ public final class UiUtils
  public static void showHomeUpButton(MaterialToolbar toolbar)
  {
    toolbar.setNavigationIcon(
-        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
  }

  // this method returns the total height of the display (in pixels) including notch and other touchable areas
@@ -209,15 +208,7 @@ public final class UiUtils
  }
  public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error)
  {
-    setInputError(layout, error == 0 ? null : layout.getContext().getString(error));
-  }
-
-  public static void setInputError(@NonNull TextInputLayout layout, String error)
-  {
-    layout.getEditText().setError(error);
-    layout.getEditText().setTextColor(error == null
-                                          ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary)
-                                          : ContextCompat.getColor(layout.getContext(), R.color.base_red));
+    layout.setError(error == 0 ? null : layout.getContext().getString(error));
  }

  public static void setFullscreen(@NonNull Activity activity, boolean fullscreen)
@@ -281,6 +272,14 @@ public final class UiUtils
    view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
  }

+  public static void setViewNavigationTopInsetsMargin(View view, WindowInsetsCompat windowInsets)
+  {
+      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+      ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+      lp.topMargin = systemInsets.top;
+      view.setLayoutParams(lp);
+  }
+
  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
  {
    View customNavigationButton = toolbar.findViewById(R.id.back);
--- a/android/app/src/main/res/drawable/ic_browse_activity.xml
+++ b/android/app/src/main/res/drawable/ic_browse_activity.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M80,360v-160q0,-33 23.5,-56.5T160,120h640q33,0 56.5,23.5T880,200v160h-80v-160L160,200v160L80,360ZM160,720q-33,0 -56.5,-23.5T80,640v-200h80v200h640v-200h80v200q0,33 -23.5,56.5T800,720L160,720ZM40,840v-80h880v80L40,840ZM480,420ZM80,440v-80h240q11,0 21,6t15,16l47,93 123,-215q5,-9 14,-14.5t20,-5.5q11,0 21,5.5t15,16.5l49,98h235v80L620,440q-11,0 -21,-5.5T584,418l-26,-53 -123,215q-5,10 -15,15t-21,5q-11,0 -20.5,-6T364,578l-69,-138L80,440Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/android/app/src/main/res/drawable/ic_cloud_download.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?colorControlNormal"
+    android:tint="?iconTint"
    android:height="24dp"
    android:width="24dp"
    android:viewportHeight="960"
--- a/android/app/src/main/res/drawable/ic_dark_mode.xml
+++ b/android/app/src/main/res/drawable/ic_dark_mode.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M480,840q-150,0 -255,-105T120,480q0,-150 105,-255t255,-105q14,0 27.5,1t26.5,3q-41,29 -65.5,75.5T444,300q0,90 63,153t153,63q55,0 101,-24.5t75,-65.5q2,13 3,26.5t1,27.5q0,150 -105,255T480,840ZM480,760q88,0 158,-48.5T740,585q-20,5 -40,8t-40,3q-123,0 -209.5,-86.5T364,300q0,-20 3,-40t8,-40q-78,32 -126.5,102T200,480q0,116 82,198t198,82ZM470,490Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_download_st.xml
+++ b/android/app/src/main/res/drawable/ic_download_st.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
    <path
        android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z"
        android:fillColor="#FFF"/>
--- a/android/app/src/main/res/drawable/ic_eco.xml
+++ b/android/app/src/main/res/drawable/ic_eco.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M216,784q-45,-45 -70.5,-104T120,558q0,-63 24,-124.5T222,318q35,-35 86.5,-60t122,-39.5Q501,204 591.5,201t202.5,7q8,106 5,195t-16.5,160.5q-13.5,71.5 -38,125T684,778q-53,53 -112.5,77.5T450,880q-65,0 -127,-25.5T216,784ZM328,768q29,17 59.5,24.5T450,800q46,0 91,-18.5t86,-59.5q18,-18 36.5,-50.5t32,-85Q709,534 716,459.5t2,-177.5q-49,-2 -110.5,-1.5T485,290q-61,9 -116,29t-90,55q-45,45 -62,89t-17,85q0,59 22.5,103.5T262,714q42,-80 111,-153.5T534,440q-72,63 -125.5,142.5T328,768ZM328,768ZM328,768Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_instant_mix.xml
+++ b/android/app/src/main/res/drawable/ic_instant_mix.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M200,800v-280h-80v-80h240v80h-80v280h-80ZM200,360v-200h80v200h-80ZM360,360v-80h80v-120h80v120h80v80L360,360ZM440,800v-360h80v360h-80ZM680,800v-120h-80v-80h240v80h-80v120h-80ZM680,520v-360h80v360h-80Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml
+++ b/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v124q18,7 29,22t11,34v80q0,19 -11,34t-29,22v404q0,33 -23.5,56.5T680,920L280,920ZM280,840h400v-720L280,120v720ZM280,840v-720,720ZM394,640h172q14,0 24,-10t10,-24v-132q0,-14 -10,-24t-24,-10h-6v-40q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400v40h-6q-14,0 -24,10t-10,24v132q0,14 10,24t24,10ZM440,440v-40q0,-17 11.5,-28.5T480,360q17,0 28.5,11.5T520,400v40h-80Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_network_manage.xml
+++ b/android/app/src/main/res/drawable/ic_network_manage.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M339,698q22,-22 49.5,-36t58.5,-19q-5,19 -8,38t-3,39q0,24 3.5,47t11.5,44L339,698ZM254,614 L170,528q62,-62 142,-95t168,-33q49,0 96,10.5t90,30.5q-44,8 -81.5,29T517,522q-9,-1 -18.5,-1.5T480,520q-64,0 -122.5,24.5T254,614ZM84,444 L0,360q95,-97 219.5,-148.5T480,160q136,0 260.5,51.5T960,360l-84,84q-79,-79 -181.5,-121.5T480,280q-112,0 -214.5,42.5T84,444ZM760,520 L772,580q12,5 22.5,10.5T816,604l58,-18 40,68 -46,40q2,12 2,26t-2,26l46,40 -40,68 -58,-18q-11,8 -21.5,13.5T772,860l-12,60h-80l-12,-60q-12,-5 -22.5,-10.5T624,836l-58,18 -40,-68 46,-40q-2,-12 -2,-26t2,-26l-46,-40 40,-68 58,18q11,-8 21.5,-13.5T668,580l12,-60h80ZM720,640q-33,0 -56.5,23.5T640,720q0,33 23.5,56.5T720,800q33,0 56.5,-23.5T800,720q0,-33 -23.5,-56.5T720,640Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_profile.xml
+++ b/android/app/src/main/res/drawable/ic_profile.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_record_voice_over.xml
+++ b/android/app/src/main/res/drawable/ic_record_voice_over.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="m798,638 l-62,-62q44,-41 69,-97t25,-119q0,-63 -25,-118t-69,-96l62,-64q56,53 89,125t33,153q0,81 -33,153t-89,125ZM670,510l-64,-64q18,-17 29,-38.5t11,-47.5q0,-26 -11,-47.5T606,274l64,-64q32,29 50,67.5t18,82.5q0,44 -18,82.5T670,510ZM360,520q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM40,840v-112q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18q77,0 141,18t115,44q30,15 47,44t17,62v112L40,840ZM120,760h480v-32q0,-11 -5.5,-20T580,694q-36,-18 -92.5,-36T360,640q-71,0 -127.5,18T140,694q-9,5 -14.5,14t-5.5,20v32ZM360,440q33,0 56.5,-23.5T440,360q0,-33 -23.5,-56.5T360,280q-33,0 -56.5,23.5T280,360q0,33 23.5,56.5T360,440ZM360,360ZM360,760Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_sd_card.xml
+++ b/android/app/src/main/res/drawable/ic_sd_card.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M360,440h80v-160h-80v160ZM480,440h80v-160h-80v160ZM600,440h80v-160h-80v160ZM240,880q-33,0 -56.5,-23.5T160,800v-480l240,-240h320q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-640L434,160L240,354v446ZM240,800h480,-480Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_search_recent_st.xml
+++ b/android/app/src/main/res/drawable/ic_search_recent_st.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/>
--- a/android/app/src/main/res/drawable/ic_settings_backup_restore.xml
+++ b/android/app/src/main/res/drawable/ic_settings_backup_restore.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,840q-139,0 -241,-91.5T122,520h82q14,104 92.5,172T480,760q117,0 198.5,-81.5T760,480q0,-117 -81.5,-198.5T480,200q-69,0 -129,32t-101,88h110v80L120,400v-240h80v94q51,-64 124.5,-99T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480q0,75 -28.5,140.5t-77,114q-48.5,48.5 -114,77T480,840Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_straighten.xml
+++ b/android/app/src/main/res/drawable/ic_straighten.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M160,720q-33,0 -56.5,-23.5T80,640v-320q0,-33 23.5,-56.5T160,240h640q33,0 56.5,23.5T880,320v320q0,33 -23.5,56.5T800,720L160,720ZM160,640h640v-320L680,320v160h-80v-160h-80v160h-80v-160h-80v160h-80v-160L160,320v320ZM280,480h80,-80ZM440,480h80,-80ZM600,480h80,-80ZM480,480Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_text_fields.xml
+++ b/android/app/src/main/res/drawable/ic_text_fields.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M280,800v-520L80,280v-120h520v120L400,280v520L280,800ZM640,800v-320L520,480v-120h360v120L760,480v320L640,800Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_three_d_rotation.xml
+++ b/android/app/src/main/res/drawable/ic_three_d_rotation.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480h80q0,115 72.5,203T418,794l-58,-58 56,-56L598,862q-29,10 -58.5,14T480,880ZM500,600v-240h120q17,0 28.5,11.5T660,400v160q0,17 -11.5,28.5T620,600L500,600ZM300,600v-60h100v-40h-60v-40h60v-40L300,420v-60h120q17,0 28.5,11.5T460,400v160q0,17 -11.5,28.5T420,600L300,600ZM560,540h40v-120h-40v120ZM800,480q0,-115 -72.5,-203T542,166l58,58 -56,56 -182,-182q29,-10 58.5,-14t59.5,-4q83,0 156,31.5T763,197q54,54 85.5,127T880,480h-80Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_translate.xml
+++ b/android/app/src/main/res/drawable/ic_translate.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125 -202,201ZM628,688h144l-72,-204 -72,204Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_translate_indic.xml
+++ b/android/app/src/main/res/drawable/ic_translate_indic.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM628,688h144l-72,-204 -72,204ZM254,640q-66,0 -123.5,-38.5T44,498l72,-36q21,42 58,70t79,28q38,0 62.5,-23.5T340,480q0,-33 -23.5,-56.5T260,400h-60v-80h60q25,0 42.5,-17.5T320,260q0,-25 -17,-42.5T261,200q-23,0 -41,15t-32,33l-63,-49q26,-32 60,-55.5t77,-23.5q57,0 97.5,40.5T400,259q0,27 -10,52.5T361,357q10,10 18.5,20.5T396,400h124v-200h-80v-80h240v80h-80v116l-61,164L420,480v4q0,63 -46,109.5T254,640Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_wifi_find.xml
+++ b/android/app/src/main/res/drawable/ic_wifi_find.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
+    android:tint="?iconTint">
  <path
      android:pathData="M480,840 L0,359q93,-93 215.5,-146T480,160q142,0 264.5,53T960,359l-56,57q-81,-81 -190,-128.5T480,240q-103,0 -195,32.5T117,363l419,420 -56,57ZM864,800L761,698q-18,11 -38,16.5t-43,5.5q-68,0 -114,-46t-46,-114q0,-68 46,-114t114,-46q68,0 114,46t46,114q0,23 -5.5,43T818,641l102,103 -56,56ZM680,640q34,0 57,-23t23,-57q0,-34 -23,-57t-57,-23q-34,0 -57,23t-23,57q0,34 23,57t57,23ZM480,783Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -5,7 +5,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:clipToPadding="false"
    android:fadeScrollbars="false"
    android:fillViewport="true">
@@ -47,7 +47,7 @@
            android:layout_height="wrap_content"
            android:text="@string/about_headline"
            android:textAlignment="center"
-            android:textAppearance="@style/MwmTextAppearance.Headline"
+            android:textAppearance="@style/MwmTextAppearance.Headline6"
            android:textColor="?android:textColorPrimary"
            app:layout_constraintTop_toTopOf="@id/version" />
        </LinearLayout>
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -13,7 +13,7 @@
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:fadeScrollbars="false"
    android:fillViewport="true"
    android:clipToPadding="false">
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -11,13 +11,12 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="15dp"
+    android:layout_height="1dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="500dp"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
    android:elevation="@dimen/nav_elevation"
@@ -52,7 +51,6 @@
    app:layout_constraintEnd_toStartOf="@+id/street_frame"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginStart="@dimen/margin_quarter"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
--- a/android/app/src/main/res/layout-w1020dp/activity_settings.xml
+++ b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
@@ -3,7 +3,8 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?appBackground">

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

 </FrameLayout>
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:clipToPadding="false"
    android:fadeScrollbars="false"
    android:fillViewport="true">
@@ -42,7 +42,7 @@
        android:layout_marginBottom="@dimen/margin_base"
        android:text="@string/about_headline"
        android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.Headline"
+        android:textAppearance="@style/MwmTextAppearance.Headline6"
        android:textColor="?android:textColorPrimary" />

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

@@ -28,7 +28,7 @@
        android:layout_marginBottom="8dp"
        android:text="@string/aa_connected_title"
        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Headline4"
+        android:textAppearance="@style/MwmTextAppearance.Headline4"
        android:textStyle="bold" />

    <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
        android:layout_height="wrap_content"
        android:text="@string/car_used_on_the_car_screen"
        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Body1" />
+        android:textAppearance="@style/MwmTextAppearance.Body1" />
  </LinearLayout>

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:gravity="center"
    android:orientation="vertical">

@@ -20,7 +20,7 @@
      android:layout_marginStart="32dp"
      android:text="@string/aa_request_permission_activity_text"
      android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.Headline4"
+      android:textAppearance="@style/MwmTextAppearance.Headline4"
      android:textStyle="bold" />

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -3,7 +3,8 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?appBackground">

  <include
    layout="@layout/toolbar_default"/>
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -22,7 +22,7 @@
    android:layout_marginStart="@dimen/margin_base"
    android:maxLines="3"
    android:ellipsize="end"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/MwmTextAppearance.Headline6"
    tools:text="Title" />

  <androidx.recyclerview.widget.RecyclerView
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -12,7 +12,7 @@
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/margin_base"
    android:text="@string/download_country_ask"
-    android:textAppearance="@style/TextAppearance.Body2"
+    android:textAppearance="@style/MwmTextAppearance.Body2"
    android:visibility="gone"
    tools:visibility="visible"/>
  <com.google.android.material.progressindicator.LinearProgressIndicator
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -27,7 +27,7 @@
    android:layout_marginTop="@dimen/margin_base">

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
      android:id="@+id/sort_by_default"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
      android:id="@+id/sort_by_name"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
      android:id="@+id/sort_by_type"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
      android:id="@+id/sort_by_distance"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="@style/MwmTextAppearance.Subtitle1"
      android:id="@+id/sort_by_time"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -17,7 +17,7 @@
      android:layout_marginEnd="@dimen/margin_base"
      android:paddingTop="@dimen/margin_half"
      android:paddingBottom="@dimen/margin_base"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="@style/MwmTextAppearance.Headline6"
      tools:text="Xindian Shitoushan Trail" />
    <include
      layout="@layout/item_divider"
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -2,18 +2,11 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme">
-  </com.google.android.material.appbar.MaterialToolbar>
+  <include layout="@layout/toolbar_default"/>
  <LinearLayout
    android:layout_marginTop="@dimen/margin_half_double_plus"
    android:orientation="horizontal"
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -13,7 +13,7 @@
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?appBackground"
    android:fadeScrollbars="false"
    android:fillViewport="true"
    android:clipToPadding="false">
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -6,7 +6,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:orientation="vertical"
-  android:background="?cardBackground">
+  android:background="?appBackground">
  <com.google.android.material.appbar.MaterialToolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
--- a/android/app/src/main/res/layout/fragment_prefs_storage.xml
+++ b/android/app/src/main/res/layout/fragment_prefs_storage.xml
@@ -5,7 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
-    android:background="?cardBackground">
+    android:background="?appBackground">

  <com.google.android.material.textview.MaterialTextView
      android:id="@+id/header"
--- a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
+++ b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
@@ -16,7 +16,7 @@
      android:layout_marginStart="@dimen/margin_base"
      android:layout_marginTop="@dimen/margin_base"
      android:text="@string/layers_title"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="@style/MwmTextAppearance.Headline6"
      app:layout_constraintStart_toStartOf="parent"
      app:layout_constraintTop_toTopOf="parent" />
    <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -30,7 +30,7 @@
    android:ellipsize="middle"
    android:singleLine="true"
    android:textAlignment="viewStart"
-    android:textAppearance="@style/TextAppearance.Body1"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
    tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
  <LinearLayout
    android:id="@+id/bottom_line_container"
--- a/android/app/src/main/res/layout/item_bookmark_collection.xml
+++ b/android/app/src/main/res/layout/item_bookmark_collection.xml
@@ -25,7 +25,7 @@
      android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
      android:ellipsize="middle"
      android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
      tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/size"
@@ -37,7 +37,7 @@
      android:ellipsize="end"
      android:singleLine="true"
      android:textColor="?android:textColorSecondary"
-      style="@style/TextAppearance.Body2"
+      style="@style/MwmTextAppearance.Body2"
      tools:text="42000000" />
  </LinearLayout>
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
@@ -12,7 +12,7 @@
  android:paddingBottom="@dimen/margin_half_plus">
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/text_message"
-    style="@style/TextAppearance.Headline6"
+    style="@style/MwmTextAppearance.Headline6"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_alignParentStart="true"
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.textview.MaterialTextView
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/text"
-  style="@style/TextAppearance.Headline6"
+  style="@style/MwmTextAppearance.Headline6"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:background="?windowBackgroundForced"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -14,7 +14,7 @@
    android:gravity="center"
    android:maxWidth="500dp"
    android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/MwmTextAppearance.Headline6"
    android:textStyle="bold" />
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/editor_category_unsuitable_text"
--- a/android/app/src/main/res/layout/item_track.xml
+++ b/android/app/src/main/res/layout/item_track.xml
@@ -29,7 +29,7 @@
      android:layout_marginTop="@dimen/margin_base"
      android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
      android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
      tools:text="@string/tracks_title" />
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
      android:layout_marginBottom="@dimen/margin_half_plus"
      android:singleLine="true"
      android:textColor="?android:textColorSecondary"
-      android:textAppearance="@style/TextAppearance.Body2"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
      tools:text="@string/by_distance" />
  </LinearLayout>
  <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -11,13 +11,12 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="25dp"
+    android:layout_height="1dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus"
    android:layout_marginStart="@dimen/nav_street_left"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
@@ -55,7 +54,6 @@
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
    android:layout_marginStart="@dimen/margin_half"
-    android:layout_marginTop="@dimen/margin_half_plus"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
    <LinearLayout
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -82,7 +82,7 @@

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/place_page_last_checked"
-    style="@style/TextAppearance.Caption"
+    style="@style/MwmTextAppearance.Caption"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:paddingBottom="@dimen/margin_half"
--- a/android/app/src/main/res/layout/place_page_map_too_old.xml
+++ b/android/app/src/main/res/layout/place_page_map_too_old.xml
@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
 android:layout_marginTop="@dimen/margin_half"
 app:strokeWidth="1dp"
 app:strokeColor="@color/base_accent"
-app:cardBackgroundColor="@color/bg_cards">
+app:cardBackgroundColor="?cardBackground">

 <LinearLayout
  android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -65,7 +65,7 @@

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/oh_check_date"
-    style="@style/TextAppearance.Caption"
+    style="@style/MwmTextAppearance.Caption"
    android:layout_height="wrap_content"
    android:layout_width="wrap_content"
    android:layout_alignParentEnd="true"
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -30,8 +30,7 @@
            android:layout_alignParentStart="true"
            android:background="?selectableItemBackgroundBorderless"
            app:srcCompat="?homeAsUpIndicator"
-            android:scaleType="center"
-            tools:src="@drawable/ic_expand_more" />
+            android:scaleType="center" />

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

  <View
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/toolbar_search_controls.xml
+++ b/android/app/src/main/res/layout/toolbar_search_controls.xml
@@ -17,7 +17,6 @@
    android:background="?selectableItemBackgroundBorderless"
    app:srcCompat="?homeAsUpIndicator"
    android:scaleType="center"
-    tools:src="@drawable/ic_expand_more"
    android:contentDescription="@string/back"/>

  <com.google.android.material.textfield.TextInputEditText
--- a/android/app/src/main/res/layout/toolbar_transparent.xml
+++ b/android/app/src/main/res/layout/toolbar_transparent.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/toolbar"
-  style="@style/MwmWidget.ToolbarStyle"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:theme="@style/MwmWidget.ToolbarTheme.Transparent"/>
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="back">পিছনে</string>
-    <string name="download_maps">ডাউনলোডকৃত মানচিত্র</string>
-    <string name="delete">মুছো</string>
+    <string name="download_maps">মানচিত্র ডাউনলোড করুন</string>
+    <string name="delete">মুছুন</string>
    <string name="cancel">বাতিল</string>
    <string name="miles">মাইল</string>
    <string name="later">পরে</string>
    <string name="search">খুঁজুন</string>
-    <string name="download_has_failed">ডাউনলোড ব্যর্থ। আবার চেষ্টা করতে টিপ দাও।</string>
+    <string name="download_has_failed">ডাউনলোড ব্যর্থ হয়েছে, আবার চেষ্টা করতে টিপ দিন</string>
    <string name="search_map">ম্যাপ অনুসন্ধান</string>
    <string name="kilometres">কিলোমিটার</string>
    <string name="downloading">ডাউনলোডরত…</string>
@@ -303,4 +303,16 @@
    <string name="editor_report_problem_other_title">আলাদা সমস্যা</string>
    <string name="osm_presentation">কমিউনিটি দ্বারা তৈরি ওপেনস্ট্রিটম্যাপ ডেটা টি %s তারিখ অব্দি সাম্পতিক। মানচিত্রটি সম্পাদনা এবং আপডেট করার সম্পর্কে আরও জানুন OpenStreetMap.org-এ</string>
    <string name="editor_edit_place_category_title">শ্রেণি</string>
+    <string name="opens_at">%s এ খুলবে</string>
+    <string name="closes_at">%s এ বন্ধ হবে</string>
+    <string name="downloader_of">%2$d এর মধ্যে %1$d</string>
+    <string name="error_enter_correct_house_number">সঠিক বিল্ডিং নম্বর দিন</string>
+    <string name="editor_more_about_osm">আরো OpenStreetMap সম্বন্ধে</string>
+    <string name="downloader_no_downloaded_maps_title">আপনি কোনো মানচিত্র ডাউনলোড করেননি</string>
+    <string name="current_location_unknown_error_title">বর্তমান অবস্থান অজানা</string>
+    <string name="editor_place_doesnt_exist">স্থানটি অস্তিত্বই নেই</string>
+    <string name="error_enter_correct_phone">সঠিক ফোন নম্বর দিন</string>
+    <string name="error_enter_correct_web">সঠিক ওয়েব এড্রেস দিন</string>
+    <string name="error_enter_correct_email">সঠিক ইমেইল দিন</string>
+    <string name="placepage_add_place_button">OpenStreetMap এ স্থান যোগ করুন</string>
 </resources>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -923,7 +923,6 @@
    <string name="advanced">Avançat</string>
    <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
    <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">No establert</string>
    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -915,7 +915,6 @@
    <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
    <string name="download_resources_custom_url_title">Vlastní mapový server</string>
    <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
    <string name="advanced">Pokročilé</string>
    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
    <string name="delete">Löschen</string>
    <string name="download_maps">Karten herunterladen</string>
    <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen, Antippen für einen neuen Versuch</string>
+    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen – antippen für einen erneuten Versuch</string>
    <!-- Settings/Downloader - info for country which started downloading -->
    <string name="downloading">Wird heruntergeladen …</string>
    <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -23,11 +23,11 @@
    <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
    <string name="search_map">Auf der Karte suchen</string>
    <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
+    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktiviere diese in den Einstellungen.</string>
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Eingeschränkte Genauigkeit</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktivieren Sie „Genauer Standort“ in den Einstellungen</string>
+    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktiviere „Genauer Standort“ in den Einstellungen</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">Auf der Karte anzeigen</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
@@ -36,7 +36,7 @@
    <string name="try_again">Erneut versuchen</string>
    <string name="about_menu_title">Über CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Offenes Projekt, von der Gemeinschaft entwickelt</string>
+    <string name="about_headline">Freies Projekt, von der Gemeinschaft entwickelt</string>
    <!-- Text in About screen -->
    <string name="about_proposition_1">• Ausgereift und einfach zu bedienen</string>
    <!-- Text in About screen -->
@@ -53,10 +53,10 @@
    <!-- Used in DownloadResources startup screen -->
    <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um CoMaps zu verwenden</string>
    <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen</string>
-    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s Speicherplatz benötigt.</string>
+    <string name="not_enough_free_space_on_sdcard">Bitte zuerst den Speicherplatz auf der SD-Karte/USB-Speicher freigeben, um die Anwendung nutzen zu können</string>
+    <string name="download_resources">Bevor du die App verwendest, lade bitte die weltweite Übersichtskarte herunter. \nEs werden %s des Speicherplatzes benötigt.</string>
    <string name="download_resources_continue">Zur Karte</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. Sie können jetzt \nzur Karte weitergehen.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. \nDu kannst jetzt zur Karte weitergehen.</string>
    <string name="download_country_ask">%1$s herunterladen? (%2$s)</string>
    <string name="update_country_ask">%1$s aktualisieren? (%2$s)</string>
    <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -84,7 +84,7 @@
    <!-- Header of settings activity where user defines storage path -->
    <string name="maps_storage">Karten speichern auf</string>
    <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Wählen Sie den Speicherort für die herunterzuladenden Karten</string>
+    <string name="maps_storage_summary">Wähle den Speicherort für die herunterzuladenden Karten</string>
    <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
    <string name="maps_storage_downloaded">Heruntergeladene Karten</string>
    <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -94,7 +94,7 @@
    <!-- Error moving map files from one storage to another -->
    <string name="move_maps_error">Fehler beim Verschieben der Karten</string>
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
+    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
    <!-- Measurement units title in settings activity -->
    <string name="measurement_units">Maßeinheiten</string>
    <!-- Detailed description of Measurement Units settings button -->
@@ -105,7 +105,7 @@
    <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
    <string name="category_food">Lebensmittel</string>
    <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
-    <string name="category_transport">Verkehr</string>
+    <string name="category_transport">ÖPNV</string>
    <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
    <string name="category_fuel">Tankstelle</string>
    <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
@@ -125,7 +125,7 @@
    <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
    <string name="category_nightlife">Nachtleben</string>
    <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Freizeit mit Kindern</string>
+    <string name="category_children">Familienfreizeit</string>
    <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
    <string name="category_bank">Bank</string>
    <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -137,7 +137,7 @@
    <!-- Search category for post offices; any changes should be duplicated in categories.txt @category_post! -->
    <string name="category_post">Post</string>
    <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
-    <string name="category_police">Polizeistation</string>
+    <string name="category_police">Polizei</string>
    <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
    <string name="category_recycling">Recycling</string>
    <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -148,8 +148,8 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notizen</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit Ihnen geteilt</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps App. Sie können sie mit CoMaps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Reisen mit CoMaps!</string>
+    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen aus der CoMaps-App. Du kannst sie in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie unter https://www.comaps.app/de/download/ herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
    <!-- message title of loading file -->
    <string name="load_kmz_title">Lesezeichen werden geladen</string>
    <!-- Kmz file successful loading -->
@@ -163,15 +163,15 @@
    <!-- resource for context menu -->
    <string name="edit">Bearbeiten</string>
    <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">Ihr Standort konnte noch nicht ermittelt werden</string>
+    <string name="unknown_current_position">Dein Standort konnte noch nicht ermittelt werden</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
    <string name="cant_change_this_setting">Entschuldige, die Einstellungen für die Kartenspeicherung sind aktuell deaktiviert</string>
    <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Die Karte wird heruntergeladen</string>
+    <string name="downloading_is_active">Die Karte wird jetzt heruntergeladen</string>
    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/download/</string>
+    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Du hast CoMaps nicht installiert? Lade die App hier herunter: https://www.comaps.app/de/download/</string>
    <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel auf der CoMaps-Karte an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel in der CoMaps-App an!</string>
    <!-- Subject for emailed position -->
    <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -179,9 +179,9 @@
    <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
    <string name="share">Teilen</string>
    <!-- Share by email button text, also used in editor and About. -->
-    <string name="email">Email</string>
+    <string name="email">E-Mail</string>
    <!-- Text for message when used successfully copied something -->
-    <string name="copied_to_clipboard">In die Zwischenablage kopiert: %s</string>
+    <string name="copied_to_clipboard">Kopiert in der Zwischenablage: %s</string>
    <!-- Used for bookmark editing -->
    <string name="done">Fertig</string>
    <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
@@ -197,7 +197,7 @@
    <string name="prefs_group_information">Information</string>
    <string name="prefs_group_route">Navigation</string>
    <string name="pref_zoom_title">Zoom-Tasten</string>
-    <string name="pref_zoom_summary">Auf der Karte anzeigen</string>
+    <string name="pref_zoom_summary">Zur Anzeige auf der Karte</string>
    <!-- Settings «Map» category: «Night style» title -->
    <string name="pref_map_style_title">Nachtmodus</string>
    <!-- Generic «Off» string -->
@@ -219,9 +219,9 @@
    <!-- Settings «Route» category: «Tts announce street names» description -->
    <string name="pref_tts_street_names_description">Wenn aktiviert, wird der Name der Straße oder Ausfahrt, in die abgebogen werden soll, laut angekündigt.</string>
    <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Sprache für Sprachführung</string>
+    <string name="pref_tts_language_title">Sprache der Sprachführung</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Teste Sprachanweisungen</string>
+    <string name="pref_tts_test_voice_title">Teste die Sprachanweisungen</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
    <string name="pref_tts_playing_test_voice">Überprüfe die Lautstärke oder die Text-To-Speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hören kannst</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -236,11 +236,11 @@
    <!-- Settings: Send feedback button and dialog title -->
    <string name="feedback">Feedback</string>
    <!-- Text in menu -->
-    <string name="rate_the_app">Bewerten Sie die App</string>
+    <string name="rate_the_app">Bewerte die App</string>
    <!-- Text in menu -->
    <string name="help">Hilfe</string>
    <!-- Button in the main Help dialog -->
-    <string name="faq">Häufige Fragen und Antworten</string>
+    <string name="faq">Häufige Fragen und Antworten (FAQ)</string>
    <!-- Button in the main menu -->
    <string name="donate">Spenden</string>
    <!-- Button in the main Help dialog -->
@@ -254,9 +254,9 @@
    <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
    <string name="compass_calibration_required">Bewegen Sie das Telefon in einer Achterbewegung, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
    <!-- Toast text when user hides UI with a long tap anywhere on the map -->
-    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche zu sehen</string>
+    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche wiederzusehen</string>
    <!-- Update all button text -->
-    <string name="downloader_update_all_button">Alle aktualisieren</string>
+    <string name="downloader_update_all_button">Alle Karten aktualisieren</string>
    <!-- Cancel all button text -->
    <string name="downloader_cancel_all">Alle abbrechen</string>
    <!-- Downloaded maps list header -->
@@ -329,23 +329,23 @@
    <!-- blue gray color -->
    <string name="blue_gray">Graublau</string>
    <!-- SECTION: Routing dialogs strings -->
-    <string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
-    <string name="dialog_routing_disclaimer_priority">– Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
-    <string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
+    <string name="dialog_routing_disclaimer_title">Wenn du der Route folgst, beachte bitte:</string>
+    <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
+    <string name="dialog_routing_disclaimer_precision">— Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
    <string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
    <string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
-    <string name="dialog_routing_disclaimer_beware">Bitte fahren Sie aufmerksam und sicher!</string>
+    <string name="dialog_routing_disclaimer_beware">Bitte fahre aufmerksam und sicher!</string>
    <string name="dialog_routing_check_gps">GPS-Signal prüfen</string>
    <string name="dialog_routing_error_location_not_found">Route kann nicht erstellt werden. Aktuelle GPS-Koordinaten konnten nicht ermittelt werden.</string>
-    <string name="dialog_routing_location_turn_wifi">Bitte prüfen Sie Ihr GPS-Signal. WLAN verbessert Ihre Standortgenauigkeit.</string>
+    <string name="dialog_routing_location_turn_wifi">Bitte prüfe dein GPS-Signal. Aktiviertes W-LAN verbessert deine Standortgenauigkeit.</string>
    <string name="dialog_routing_location_turn_on">Standortdienste aktivieren</string>
-    <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktivieren Sie Standortdienste, um die Route zu berechnen.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktiviere die Standortdienste, um die Route zu berechnen.</string>
    <string name="dialog_routing_unable_locate_route">Route kann nicht ermittelt werden</string>
    <string name="dialog_routing_cant_build_route">Route konnte nicht erstellt werden</string>
-    <string name="dialog_routing_change_start_or_end">Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an.</string>
+    <string name="dialog_routing_change_start_or_end">Bitte passe deinen Startpunkt oder Ziel an.</string>
    <string name="dialog_routing_change_start">Startpunkt anpassen</string>
    <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt konnte nicht gefunden werden.</string>
-    <string name="dialog_routing_select_closer_start">Bitte wählen Sie einen Startpunkt, der näher an einer Straße liegt.</string>
+    <string name="dialog_routing_select_closer_start">Bitte wähle einen Startpunkt, der näher an einer Straße liegt.</string>
    <string name="dialog_routing_change_end">Ziel anpassen</string>
    <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel konnte nicht gefunden werden.</string>
    <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher an einer Straße</string>
@@ -353,10 +353,10 @@
    <string name="dialog_routing_intermediate_not_determined">Bitte passen Sie Ihren Zwischenstopp an</string>
    <string name="dialog_routing_system_error">Systemfehler</string>
    <string name="dialog_routing_application_error">Wegen eines Anwendungsfehlers konnte keine Route erstellt werden</string>
-    <string name="dialog_routing_try_again">Bitte versuchen Sie es erneut</string>
+    <string name="dialog_routing_try_again">Bitte versuche es erneut</string>
    <string name="not_now">Nicht jetzt</string>
-    <string name="dialog_routing_download_and_build_cross_route">Möchten Sie die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
-    <string name="dialog_routing_download_cross_route">Laden Sie zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
+    <string name="dialog_routing_download_and_build_cross_route">Möchtest du die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
+    <string name="dialog_routing_download_cross_route">Lade zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
    <!-- SECTION: Strings for downloading map from search -->
    <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, laden Sie bitte die Karte herunter. Sie benötigen danach keine Internetverbindung mehr.</string>
    <string name="search_select_map">Karte auswählen</string>
@@ -368,16 +368,16 @@
    <string name="history">Verlauf</string>
    <string name="search_not_found">Uups, kein Ergebnis gefunden</string>
    <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Laden Sie die Region herunter, in der Sie suchen, oder fügen Sie den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
+    <string name="search_not_found_query">Lade die Region herunter, in der du suchst, oder füge den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
    <string name="search_history_title">Suchverlauf</string>
    <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
    <string name="clear_search">Suchverlauf löschen</string>
-    <string name="p2p_your_location">Ihr Standort</string>
+    <string name="p2p_your_location">Dein Standort</string>
    <string name="p2p_start">Start</string>
-    <string name="p2p_from_here">Von</string>
-    <string name="p2p_to_here">Nach</string>
+    <string name="p2p_from_here">Route von</string>
+    <string name="p2p_to_here">Route nach</string>
    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
-    <string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
+    <string name="p2p_reroute_from_current">Soll eine Route von deinem aktuellen Standort aus berechnet werden?</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Weiter</string>
    <!-- Tab title in the Edit Opening Hours time picker -->
@@ -395,17 +395,17 @@
    <string name="editor_time_advanced">Erweiterter Modus</string>
    <string name="editor_time_simple">Einfacher Modus</string>
    <string name="editor_hours_closed">Schließzeiten</string>
-    <string name="editor_example_values">Beispiele</string>
+    <string name="editor_example_values">Beispielwerte</string>
    <string name="editor_correct_mistake">Fehler korrigieren</string>
    <string name="editor_add_select_location">Standort auswählen</string>
    <string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
-    <string name="editor_report_problem_desription_2">Oder korrigieren Sie es selbst auf https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_desription_2">Oder korrigiere es selbst auf https://www.openstreetmap.org/</string>
    <string name="editor_report_problem_send_button">Senden</string>
    <string name="editor_report_problem_title">Problem</string>
    <string name="editor_report_problem_no_place_title">Dieser Ort existiert nicht</string>
    <string name="editor_report_problem_under_construction_title">Wegen Bauarbeiten geschlossen</string>
    <string name="editor_report_problem_duplicate_place_title">Doppelt vorhanderer Ort</string>
-    <string name="autodownload">Karten automatisch herunterladen</string>
+    <string name="autodownload">Automatisch herunterladen</string>
    <!-- Place Page opening hours text -->
    <string name="daily">Täglich</string>
    <string name="twentyfour_seven">24/7</string>
@@ -427,7 +427,7 @@
    <string name="street">Straße</string>
    <!-- Editable House Number text field (in address block). -->
    <string name="house_number">Hausnummer</string>
-    <string name="details">Details</string>
+    <string name="details">Einzelheiten</string>
    <string name="social_media">Social Media</string>
    <string name="building">Gebäude</string>
    <!-- Text field to enter non-existing street name, below list of known streets around -->
@@ -480,7 +480,7 @@
    <!-- Hint of the input field in the OSM note section of the editor -->
    <string name="editor_note_hint">Beschreiben Sie Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
    <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Ihre Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte tragen Sie keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
+    <string name="editor_about_osm">Deine Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte trage keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
    <string name="editor_more_about_osm">Mehr Informationen über OpenStreetMap</string>
    <string name="editor_osm_history">Ihr Bearbeitungsverlauf</string>
    <string name="editor_osm_notes">Ihre Hinweise zu den Kartendaten</string>
@@ -488,7 +488,7 @@
    <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
    <string name="operator">Betreiber: %s</string>
    <string name="editor_category_unsuitable_title">Keine passende Kategorie gefunden?</string>
-    <string name="editor_category_unsuitable_text">Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
+    <string name="editor_category_unsuitable_text">Mit CoMaps kannst du nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden (auf Englisch)</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
    <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
    <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter</string>
    <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt</string>
@@ -543,11 +543,11 @@
    <string name="big_font">Schrift auf der Karte vergrößern</string>
    <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
    <!-- "traffic" as in "road congestion" -->
-    <string name="traffic_data_unavailable">Verkehrsdaten sind nicht verfügbar</string>
+    <string name="traffic_data_unavailable">Es sind keine Verkehrsdaten verfügbar</string>
    <string name="enable_logging">Protokollierung aktivieren</string>
    <!-- Settings: "Send general feedback" button -->
    <string name="feedback_general">Allgemeines Feedback</string>
-    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können</string>
+    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme (TTS; zu deutsch: Text-zu-Sprache) für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das du bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren kannst</string>
    <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
    <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
    <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
@@ -871,9 +871,9 @@
    <string name="hours_confirmed_time_ago">Bestätigt %s</string>
    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache-Modul gefunden, überprüfe die App-Einstellungen</string>
    <string name="avoid_steps">Treppen vermeiden</string>
-    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
+    <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht, um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
    <string name="offline_explanation_title">Offline-Karten</string>
-    <string name="offline_explanation_text">Um die Gegend anzusehen, muss eine Karte heruntergeladen werden.\nLaden Sie Karten für die Gebiete herunter, die Sie bereisen möchten.</string>
+    <string name="offline_explanation_text">Um die Gegend anzusehen und zu erkunden, musst du eine Karte runterladen.\nLade dir Karten für die Gebiete runter, die du bereisen willst.</string>
    <string name="charge_socket_type2">Typ 2 (ohne Kabel)</string>
    <string name="charge_socket_type2_cable">Typ 2 (mit Kabel)</string>
    <string name="charge_socket_type2_combo">Typ 2 Combo</string>
@@ -898,15 +898,15 @@
    <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
    <string name="closes_day_at">Schließt am %1$s um %2$s</string>
    <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="other">%d min</item>
+        <item quantity="one">(%d min)</item>
+        <item quantity="other">(%d min)</item>
    </plurals>
    <string name="editor_business_vacant_button">Geschäft steht leer</string>
    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
    <string name="editor_submit">Absenden</string>
    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
    <string name="charge_socket_schuko">Schuko</string>
-    <string name="power_management">Energiemanagement</string>
+    <string name="power_management">Stromverbrauch verwalten</string>
    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
    <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
    <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
@@ -919,6 +919,5 @@
    <string name="advanced">Fortgeschritten</string>
    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
-    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// oder http:// anfängt</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -927,5 +927,4 @@
    <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string>
    <string name="download_resources_custom_url_summary_none">No establecido</string>
    <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL completo empezando con https:// y terminando con /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -915,6 +915,5 @@
    <string name="advanced">Täiendavad seadistused</string>
    <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
    <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -923,8 +923,7 @@
    <string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string>
    <string name="advanced">Avancé</string>
    <string name="download_resources_custom_url_summary_none">Non défini</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
-    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string>
+    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
    <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
 </resources>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -908,7 +908,6 @@
    <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
    <string name="download_resources_custom_url_error_scheme">Aggiungere un URL che inizia con https:// e finisce con /</string>
    <string name="download_resources_custom_url_summary_none">Non impostato</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_message">Sovrascrivi il server da cui scaricare le mappe. Lascia vuoto per usare i server default di CoMaps.</string>
    <string name="download_resources_custom_url_title">Server mappe personalizzato</string>
    <string name="advanced">Avanzate</string>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -899,7 +899,6 @@
    <string name="advanced">Kita</string>
    <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
    <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
    <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -853,7 +853,6 @@
    <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
    <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
    <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">Nav iestatīts</string>
    <string name="download_resources_custom_url_error_scheme">Lūgums ievadīt pilnu URL, kas sākas ar https:// un beidzas ar /</string>
    <string name="advanced">Iestatījumi: izvērsta kopa</string>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -732,7 +732,7 @@
    <!-- App tip #01 -->
    <string name="app_tip_01">Med dine donasjoner og støtte kan vi lage de beste kartene i verden!</string>
    <!-- App tip #02 -->
-    <string name="app_tip_02">Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du det ikke ennå? Gi oss beskjed, så fikser vi det!</string>
+    <string name="app_tip_02">Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du den ikke ennå? La oss få vite hvorfor, så fikser vi det!</string>
    <!-- App tip #03 -->
    <string name="app_tip_03">Hvis du kjenner en programvareutvikler, kan du be ham eller henne implementere en funksjon du trenger.</string>
    <!-- App tip #04 -->
@@ -746,7 +746,7 @@
    <!-- App tip #08 -->
    <string name="app_tip_08">Du kan enkelt fikse og forbedre kartdataene.</string>
    <!-- App tip #09 -->
-    <string name="app_tip_09">Vårt hovedmål er å bygge raske, personvernfokuserte, brukervennlige kart som du vil elske.</string>
+    <string name="app_tip_09">Vårt hovedmål er å lage raske, personvernfokuserte, brukervennlige kart som du vil like.</string>
    <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
    <string name="car_used_on_the_phone_screen">Du bruker nå CoMaps på telefonskjermen</string>
    <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
@@ -909,7 +909,6 @@
    <string name="advanced">Avansert</string>
    <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
    <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
    <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
 </resources>
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -150,6 +150,8 @@
    <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
    <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
    <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+
+    <item name="appBackground">?android:attr/colorBackground</item>
  </style>

  <style name="MwmTheme" parent="MwmTheme.Base"/>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -918,7 +918,6 @@
    <string name="advanced">Geavanceerd</string>
    <string name="download_resources_custom_url_title">Aangepaste server voor kaarten</string>
    <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
    <string name="download_resources_custom_url_error_scheme">Voer een volledige URL in, beginnend met https:// en eindigend met /</string>
 </resources>
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -165,7 +165,7 @@
    <!-- Warning message when doing search around current position -->
    <string name="unknown_current_position">Nie określono jeszcze aktualnego położenia</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.</string>
+    <string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone</string>
    <!-- Alert message that downloading is in progress. -->
    <string name="downloading_is_active">Trwa pobieranie mapy</string>
    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
@@ -918,4 +918,16 @@
    <string name="prefs_speed_cameras_information">Ostrzeżenia o fotoradarach są wyłączone w krajach, gdzie takie alerty są zabronione prawnie.</string>
    <string name="navigation_start_tts_message">"Startowanie nawigacji, język komunikatów głosowych: "</string>
    <string name="navigation_start_tts_disabled_message">Komunikaty głosowe są wyłączone: silnik TTS jest niedostępny</string>
+    <string name="download_resources_custom_url_title">Własny serwer map</string>
+    <string name="download_resources_custom_url_message">Zastąp domyślny serwer pobierania map. Zostaw puste, by użyć domyślnego serwera CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Nieustawiony</string>
+    <string name="download_resources_custom_url_error_scheme">Proszę wprowadzić pełny URL zaczynający się od https:// i kończący na /</string>
+    <string name="editor_business_vacant_button">Lokal jest pusty</string>
+    <string name="editor_mark_business_vacant_title">Oznacz lokal jako pusty</string>
+    <string name="place_page_map_too_old_title">Dane mapy nieaktualne</string>
+    <string name="place_page_map_too_old_description">Twoje dane mapy są nieaktualne, proszę zaktualizować mapę.</string>
+    <string name="place_page_app_too_old_description">Twoje dane mapy są nieaktualne, proszę zaktualizować mapę oraz aplikację CoMaps.</string>
+    <string name="place_page_update_too_old_map">Zaktualizuj region mapy</string>
+    <string name="place_page_too_old_to_edit">Edytowanie OpenStreetMap jest wyłączone, ponieważ dane mapy są zbyt stare.</string>
+    <string name="advanced">Zaawansowane</string>
 </resources>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -448,7 +448,7 @@
    <string name="placepage_edit_bookmark_button">Editar favorito</string>
    <string name="placepage_personal_notes_hint">Anotações pessoais (texto ou html)</string>
    <string name="editor_reset_edits_message">Descartar todas as modificações locais?</string>
-    <string name="editor_reset_edits_button">Descartar</string>
+    <string name="editor_reset_edits_button">Descartar alterações</string>
    <string name="editor_remove_place_message">Remover local adicionado?</string>
    <string name="editor_remove_place_button">Remover</string>
    <string name="editor_place_doesnt_exist">O lugar não existe</string>
@@ -893,4 +893,9 @@
    <string name="prefs_speed_cameras_information">Alertas de radar fotográfico de velocidade estão desativados em países onde os alertas são proibidos pelas leis locais.</string>
    <string name="navigation_start_tts_message">"Iniciando navegação, idioma da instrução por voz: "</string>
    <string name="navigation_start_tts_disabled_message">Instrução por voz desativada: nenhum motor de texto para voz disponível</string>
+    <string name="advanced">Avançadas</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapas Personalizado</string>
+    <string name="download_resources_custom_url_message">Substitua o servidor padrão usado para baixar mapas. Deixe em branco para usar o servidor padrão do CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Não definido</string>
+    <string name="download_resources_custom_url_error_scheme">Insira um URL completo começando com https:// e terminando com /</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -912,7 +912,6 @@
    <string name="advanced">Avançadas</string>
    <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">Indefinido</string>
    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
 </resources>
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -662,5 +662,4 @@
    <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
    <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
    <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -917,7 +917,6 @@
    <string name="advanced">Напредно</string>
    <string name="download_resources_custom_url_title">Сопствени сервер мапа</string>
    <string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">Није постављено</string>
    <string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string>
 </resources>
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -503,7 +503,7 @@
    <string name="placepage_edit_bookmark_button">Yer İmini Düzenle</string>
    <string name="placepage_personal_notes_hint">Kişisel notlar (metin veya html)</string>
    <string name="editor_reset_edits_message">Tüm yerel değişiklikler sıfırlansın mı?</string>
-    <string name="editor_reset_edits_button">Sıfırla</string>
+    <string name="editor_reset_edits_button">Değişiklikleri gözden çıkar</string>
    <string name="editor_remove_place_message">Eklenen yer kaldırılsın mı?</string>
    <string name="editor_remove_place_button">Kaldır</string>
    <string name="editor_place_doesnt_exist">Bu yer yok</string>
@@ -894,4 +894,10 @@
    <string name="error_value_must_be_positive">Değer pozitif olmalıdır</string>
    <string name="error_invalid_number">Geçersiz sayı</string>
    <string name="avoid_paved">Asfalt yollardan kaçın</string>
+    <string name="place_page_map_too_old_title">Harita verisi güncel değil</string>
+    <string name="place_page_map_too_old_description">Mevcut harita verileriniz çok eski, lütfen haritayı güncelleyin.</string>
+    <string name="place_page_app_too_old_description">Mevcut harita verileriniz çok eski, lütfen CoMaps uygulamasını güncelleyin.</string>
+    <string name="place_page_update_too_old_map">Bölge haritasını güncelle</string>
+    <string name="place_page_too_old_to_edit">Harita verisi çok eski olduğu için OpenStreetMap düzenleyicisi devre dışı.</string>
+    <string name="prefs_speed_cameras_information">Yerel yasalarca uyarıların yasaklandığı ülkelerde hız kamerası uyarıları devre dışıdır.</string>
 </resources>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -917,9 +917,8 @@
    <string name="place_page_app_too_old_description">您当前的地图数据非常旧，请更新 CoMaps 应用。</string>
    <string name="place_page_update_too_old_map">更新地图区域</string>
    <string name="place_page_too_old_to_edit">由于地图数据太旧，OpenStreetMap 编辑被禁用。</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">未设置</string>
-    <string name="download_resources_custom_url_error_scheme">请输入以 https:// 开头、以 / 结尾的完整 URL</string>
+    <string name="download_resources_custom_url_error_scheme">请输入以 http:// 或 https:// 开头的 URL</string>
    <string name="advanced">高级</string>
    <string name="download_resources_custom_url_title">自定义地图服务器</string>
    <string name="download_resources_custom_url_message">覆盖用于地图下载的默认地图下载服务器。留空则使用 CoMaps 默认服务器。</string>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -64,6 +64,7 @@
  <color name="bg_cards">@android:color/white</color>
  <color name="bg_panel">@color/bg_window</color>
  <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
+  <color name="bg_app">@android:color/white</color>

  <color name="bg_dialog_translucent">#BB000000</color>
  <color name="bg_text_translucent">#99FFFFFF</color>
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -105,4 +105,5 @@
  <string name="count_label" translatable="false">× %d</string>
  <string name="kw_label" translatable="false">%s kW</string>
  <string name="phone_format" translatable="false">+ XX X XX XX XX</string>
+  <string name="download_resources_custom_url_hint" translatable="false">https://cdn-fi-1.comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -971,7 +971,6 @@
    <!-- Custom Download URL -->
    <string name="download_resources_custom_url_title">Custom Map Server</string>
    <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
    <string name="download_resources_custom_url_summary_none">Not set</string>
-    <string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
+    <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
 </resources>
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -15,12 +15,6 @@
    <item name="android:textStyle">bold</item>
  </style>

-  <style name="MwmTextAppearance.Headline">
-    <item name="android:textSize">@dimen/text_size_headline</item>
-    <item name="android:textColor">?android:textColorPrimary</item>
-    <item name="android:fontFamily">@string/robotoMedium</item>
-  </style>
-
  <style name="MwmTextAppearance.Body1" parent="TextAppearance.MaterialComponents.Headline6">
    <item name="android:textSize">@dimen/text_size_body_1</item>
    <item name="android:textColor">?android:textColorPrimary</item>
@@ -176,94 +170,59 @@
    <item name="android:textColor">@color/white_secondary</item>
  </style>

-  <style name="TextAppearance.Headline1"
+  <style name="MwmTextAppearance.Headline1"
    parent="TextAppearance.Material3.DisplayLarge">
    <item name="fontFamily">@string/robotoLight</item>
    <item name="android:fontFamily">@string/robotoLight</item>
    <item name="android:textSize">96sp</item>
  </style>

-  <style name="TextAppearance.Headline2"
+  <style name="MwmTextAppearance.Headline2"
    parent="TextAppearance.Material3.DisplayLarge">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">60sp</item>
  </style>

-  <style name="TextAppearance.Headline3"
+  <style name="MwmTextAppearance.Headline3"
    parent="TextAppearance.Material3.DisplayMedium">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">48sp</item>
  </style>

-  <style name="TextAppearance.Headline4"
+  <style name="MwmTextAppearance.Headline4"
    parent="TextAppearance.Material3.HeadlineLarge">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">34sp</item>
  </style>

-  <style name="TextAppearance.Headline5"
+  <style name="MwmTextAppearance.Headline5"
    parent="TextAppearance.Material3.HeadlineMedium">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">24sp</item>
  </style>

-  <style name="TextAppearance.Headline6"
+  <style name="MwmTextAppearance.Headline6"
    parent="TextAppearance.Material3.HeadlineSmall">
    <item name="fontFamily">@string/robotoMedium</item>
    <item name="android:fontFamily">@string/robotoMedium</item>
    <item name="android:textSize">20sp</item>
  </style>

-  <style name="TextAppearance.Subtitle1"
+  <style name="MwmTextAppearance.Subtitle1"
    parent="TextAppearance.Material3.TitleMedium">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">16sp</item>
  </style>

-  <style name="TextAppearance.Subtitle2"
+  <style name="MwmTextAppearance.Subtitle2"
    parent="TextAppearance.Material3.TitleSmall">
    <item name="fontFamily">@string/robotoMedium</item>
    <item name="android:fontFamily">@string/robotoMedium</item>
    <item name="android:textSize">14sp</item>
  </style>
-
-  <style name="TextAppearance.Body1"
-    parent="TextAppearance.Material3.BodyLarge">
-    <item name="fontFamily">@string/robotoRegular</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:textSize">16sp</item>
-  </style>
-
-  <style name="TextAppearance.Body2"
-    parent="TextAppearance.Material3.BodyMedium">
-    <item name="fontFamily">@string/robotoRegular</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:textSize">14sp</item>
-  </style>
-
-  <style name="TextAppearance.Button"
-    parent="TextAppearance.MaterialComponents.Button">
-    <item name="fontFamily">@string/robotoMedium</item>
-    <item name="android:fontFamily">@string/robotoMedium</item>
-    <item name="android:textSize">14sp</item>
-  </style>
-
-  <style name="TextAppearance.Caption"
-    parent="TextAppearance.Material3.LabelMedium">
-    <item name="fontFamily">@string/robotoRegular</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:textSize">12sp</item>
-  </style>
-
-  <style name="TextAppearance.Overline"
-    parent="TextAppearance.MaterialComponents.Overline">
-    <item name="fontFamily">@string/robotoRegular</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:textSize">10sp</item>
-  </style>
 </resources>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -148,11 +148,6 @@
    <item name="buttonGravity">center_vertical</item>
  </style>

-  <style name="MwmWidget.ToolbarStyle.Light">
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
-  </style>
-
  <style name="MwmWidget.ToolbarStyle.NoElevation">
    <item name="android:elevation">0dp</item>
  </style>
@@ -164,29 +159,6 @@
    <item name="iconTint">@color/white_primary</item>
  </style>

-  <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
-    <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
-    <item name="colorSecondary">#FF32363A</item>
-  </style>
-
-  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
-    <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
-    <item name="colorSecondary">@android:color/white</item>
-    <item name="android:windowActionBarOverlay">true</item>
-    <item name="windowActionBarOverlay">true</item>
-  </style>
-
-  <style
-    name="MwmWidget.ToolbarTheme.DownButton"
-    parent="ThemeOverlay.Material3.Dark.ActionBar">
-    <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
-    <item name="colorSecondary">@android:color/white</item>
-    <item name="android:homeAsUpIndicator">@drawable/ic_expand_more</item>
-  </style>
-
  <style name="MwmWidget.ListView" parent="android:Widget.Material.ListView">
    <item name="android:fadingEdge">none</item>
    <item name="android:divider">@color/divider</item>
--- a/android/app/src/main/res/values/themes-attrs.xml
+++ b/android/app/src/main/res/values/themes-attrs.xml
@@ -6,6 +6,7 @@
    <attr name="textDialogTheme" format="reference" />
    <attr name="windowBackgroundForced" format="reference|color" />
    <attr name="cardBackground" format="reference" />
+    <attr name="appBackground" format="reference|color" />
    <attr name="clickableBackground" format="reference" />
    <attr name="statusBar" format="color" />
    <attr name="secondary" format="color" />
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -158,6 +158,8 @@
    <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
    <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>

+    <item name="appBackground">@color/bg_app</item>
+
  </style>

  <style name="MwmTheme" parent="MwmTheme.Base"/>
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-androidGradlePlugin = "8.11.2"
+androidGradlePlugin = "8.13.2"
 androidxCarApp = "1.7.0"

 [libraries]
 android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
-triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.12.1" }
+triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.13.0" }
 huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
 android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
 microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
 androidx-core = { module = "androidx.core:core", version = "1.17.0" }
-jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.20" }
+jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.21" }
 androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
@@ -21,12 +21,13 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
 androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
 androidx-media = { module = "androidx.media:media", version = "1.7.1" }
+androidx-documentfile= { module = "androidx.documentfile:documentfile", version ="1.1.0" }
 android-material = { module = "com.google.android.material:material", version = "1.12.0" }
-google-guava = { module = "com.google.guava:guava", version = "33.4.8-android" }
+google-guava = { module = "com.google.guava:guava", version = "33.5.0-android" }
 appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
 junit = { module = "junit:junit", version = "4.13.2" }
-mockito-core = { module = "org.mockito:mockito-core", version = "5.20.0" }
+mockito-core = { module = "org.mockito:mockito-core", version = "5.21.0" }

 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -126,6 +126,7 @@ dependencies {
  implementation libs.androidx.recyclerview
  implementation libs.androidx.preference
  implementation libs.android.material
+  implementation libs.androidx.documentfile

  testImplementation libs.junit
 }
--- a/android/sdk/src/main/res/values-bn/strings.xml
+++ b/android/sdk/src/main/res/values-bn/strings.xml
@@ -11,4 +11,11 @@
    <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
    <string name="postal_code">ডাক কোড</string>
    <string name="today">আজকে</string>
+    <string name="km">কিমি</string>
+    <string name="yesterday">গতকাল</string>
+    <string name="days_ago">%s দিন আগে</string>
+    <string name="week_ago">%s সপ্তাহ আগে</string>
+    <string name="month_ago">%s মাস আগে</string>
+    <string name="year_ago">%s বছর আগে</string>
+    <string name="core_entrance">প্রবেশ</string>
 </resources>
--- a/android/sdk/src/main/res/values-bn/types_strings.xml
+++ b/android/sdk/src/main/res/values-bn/types_strings.xml
@@ -17,7 +17,7 @@
    <string name="type.amenity.internet_cafe">ইন্টারনেট ক্যাফে</string>
    <string name="type.amenity.kindergarten">কিন্ডারগার্টেন</string>
    <string name="type.amenity.library">গ্রন্থাগার</string>
-    <string name="type.amenity.marketplace">মার্কেটপ্লেস</string>
+    <string name="type.amenity.marketplace">বাজার</string>
    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং</string>
    <string name="type.amenity.nightclub">নাইটক্লাব</string>
    <string name="type.amenity.nursing_home">নার্সিংহোম</string>
@@ -50,4 +50,93 @@
    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির</string>
    <string name="type.amenity.prison">কারাগার</string>
    <string name="type.barrier.fence">বেড়া</string>
+    <string name="type.waterway.waterfall">ঝর্ণা</string>
+    <string name="type.waterway.river">নদী</string>
+    <string name="type.waterway.dam">বাঁধ</string>
+    <string name="type.attraction.historic">ঐতিহাসিক আকর্ষণ</string>
+    <string name="type.area_highway.steps">সিঁড়ি</string>
+    <string name="type.area_highway.path">পথ</string>
+    <string name="type.amenity.theatre">থিয়েটার</string>
+    <string name="type.sport.soccer">ফুটবল</string>
+    <string name="type.sport.swimming">সাঁতার</string>
+    <string name="type.sport.table_tennis">টেবিল টেনিস</string>
+    <string name="type.sport.yoga">যোগ</string>
+    <string name="type.tourism">পর্যটন</string>
+    <string name="type.tourism.artwork.statue">মূর্তি</string>
+    <string name="type.tourism.attraction">আকর্ষণ</string>
+    <string name="type.tourism.artwork.sculpture">ভাস্কর্য</string>
+    <string name="type.tourism.hostel">হোস্টেল</string>
+    <string name="type.tourism.hotel">হোটেল</string>
+    <string name="type.tourism.zoo">চিড়িয়াখানা</string>
+    <string name="type.tourism.museum">জাদুঘর</string>
+    <string name="type.sport.volleyball">ভলিবল</string>
+    <string name="type.sport.golf">গল্ফ</string>
+    <string name="type.sport.cricket">ক্রিকেট</string>
+    <string name="type.sport.chess">দাবা</string>
+    <string name="type.sport.basketball">বাস্কেটবল</string>
+    <string name="type.sport.badminton">ব্যাডমিন্টন</string>
+    <string name="type.sport">ক্রীড়া</string>
+    <string name="type.sport.multi">বিভিন্ন ক্রীড়া</string>
+    <string name="type.amenity.toilets">শৌচালয়</string>
+    <string name="type.shop.watches">ঘড়ির দোকান</string>
+    <string name="type.shop.paint">রঙের দোকান</string>
+    <string name="type.shop.lottery">লটারি টিকিট</string>
+    <string name="type.shop.boutique">বুটিক</string>
+    <string name="type.shop.bag">ব্যাগের দোকান</string>
+    <string name="type.man_made.water_tower">জলের ট্যাঙ্ক</string>
+    <string name="type.amenity.bench">বেঞ্চ</string>
+    <string name="type.amenity.bus_station">বাস স্টেশন</string>
+    <string name="type.amenity.courthouse">আদালত</string>
+    <string name="type.amenity.dentist">দাঁতের ডাক্তার</string>
+    <string name="type.amenity.doctors">ডাক্তার</string>
+    <string name="type.amenity.pharmacy">ওষুধ দোকান</string>
+    <string name="type.amenity.place_of_worship.christian">গির্জা</string>
+    <string name="type.amenity.school">স্কুল</string>
+    <string name="type.amenity.telephone">টেলিফোন</string>
+    <string name="type.amenity.university">বিশ্ববিদ্যালয়</string>
+    <string name="type.amenity.vending_machine.fuel">পেট্রোল পাম্প</string>
+    <string name="type.barrier">বাঁধা</string>
+    <string name="type.barrier.entrance">প্রবেশদ্বার</string>
+    <string name="type.cuisine.german">জার্মান</string>
+    <string name="type.cuisine.japanese">জাপানি</string>
+    <string name="type.cuisine.pasta">পাস্তা</string>
+    <string name="type.cuisine.tea">চা</string>
+    <string name="type.entrance.exit">প্রস্থান (শুধুমাত্র)</string>
+    <string name="type.fee.no">বিনামূল্যে</string>
+    <string name="type.highway.path">পথ</string>
+    <string name="type.leisure.stadium">স্টেডিয়াম</string>
+    <string name="type.man_made.chimney">চিমনি</string>
+    <string name="type.man_made.water_tap">জলের কল</string>
+    <string name="type.man_made.water_well">পাতকুয়া</string>
+    <string name="type.natural">প্রকৃতি</string>
+    <string name="type.amenity.atm">এটিএম</string>
+    <string name="type.amenity.bank">ব্যাঙ্ক</string>
+    <string name="type.amenity.police">পুলিশ</string>
+    <string name="type.building">বিল্ডিং</string>
+    <string name="type.building.address">ঠিকানা</string>
+    <string name="type.cuisine.croatian">ক্রোয়েসীয়</string>
+    <string name="type.cuisine.french">ফরাসি</string>
+    <string name="type.cuisine.greek">গ্রিক</string>
+    <string name="type.cuisine.ice_cream">আইসক্রিম</string>
+    <string name="type.cuisine.persian">ফারসি</string>
+    <string name="type.cuisine.turkish">তুর্কি</string>
+    <string name="type.internet_access">ইন্টারনেট</string>
+    <string name="type.internet_access.wlan">ইন্টারনেট</string>
+    <string name="type.drinking_water.yes">পানীয় জল</string>
+    <string name="type.cuisine.arab">আরবি</string>
+    <string name="type.natural.sand">বালুকা</string>
+    <string name="type.public_transport.platform">প্ল্যাটফর্ম</string>
+    <string name="type.natural.water.lake">হ্রদ</string>
+    <string name="type.place.continent">মহাদেশ</string>
+    <string name="type.place.state">রাজ্য</string>
+    <string name="type.shop.auction">নিলাম</string>
+    <string name="type.self_service.yes">স্বয়ংসেবা আছে</string>
+    <string name="type.self_service.partially">আংশিক স্বয়ংসেবা</string>
+    <string name="type.self_service.no">স্বয়ংসেবা নেই</string>
+    <string name="type.cuisine.noodles">নুডুলস</string>
+    <string name="type.natural.water">জল</string>
+    <string name="type.place.ocean">সমুদ্র</string>
+    <string name="type.public_transport">গণপরিবহন</string>
+    <string name="type.route.ferry">ফেরি</string>
+    <string name="type.amenity.studio">মিডিয়া স্টুডিও</string>
 </resources>
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -145,7 +145,7 @@
    <string name="type.amenity.vending_machine.cigarettes">Automat na cigarety</string>
    <string name="type.amenity.vending_machine.drinks">Automat na nápoje</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkovací automat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky MHD</string>
    <string name="type.amenity.vehicle_inspection">Kontrola vozidla</string>
    <string name="type.amenity.veterinary">Veterinář</string>
    <string name="type.amenity.waste_basket">Odpadkový koš</string>
@@ -1260,7 +1260,7 @@
    <string name="type.recycling.cardboard">Lepenka</string>
    <string name="type.recycling.shoes">Boty</string>
    <string name="type.building.warehouse">Sklad</string>
-    <string name="type.amenity.shelter.lean_to">Otevřený přístřešek</string>
+    <string name="type.amenity.shelter.lean_to">Otevřený spací přístřešek</string>
    <string name="type.amenity.vending_machine.coffee">Automat na kávu</string>
    <string name="type.amenity.taxi">Stanoviště taxislužby</string>
    <string name="type.amenity.vending_machine">Prodejní automat</string>
--- a/android/sdk/src/main/res/values-de/strings.xml
+++ b/android/sdk/src/main/res/values-de/strings.xml
@@ -11,7 +11,7 @@
    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
    <string name="maps_storage_removable">SD-Karte</string>
    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externer gemeinsamer Speicher</string>
+    <string name="maps_storage_external">Externer geteilter Speicher</string>
    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
    <string name="category_wifi">WLAN</string>
    <string name="postal_code">Postleitzahl</string>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -154,7 +154,7 @@
    <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
    <string name="type.amenity.shelter.basic_hut">Biwakschachtel</string>
    <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Überdachung zum Schlafen</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Schlafunterstand</string>
    <string name="type.amenity.public_bath">Öffentliches Bad</string>
    <string name="type.amenity.shower">Dusche</string>
    <string name="type.amenity.stripclub">Stripclub</string>
@@ -173,7 +173,7 @@
    <string name="type.amenity.vending_machine.food">Essensautomat</string>
    <string name="type.amenity.vending_machine.newspapers">Zeitungsautomat</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkautomat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">5Fahrkartenautomat|4Ticketautomat|4Busticket|4Zugticket|5Bahnticket|4Zugfahrschein|U+1F3AB|U+1F39F|U+1F9FE</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Fahrkartenautomat</string>
    <string name="type.amenity.vending_machine.sweets">Süßigkeitenautomat</string>
    <string name="type.amenity.vending_machine.excrement_bags">Hundekotbeutelspender</string>
    <string name="type.amenity.parcel_locker">Paketstation</string>
@@ -374,9 +374,9 @@
    <string name="type.spherical_buoy.special_purpose">Kugelförmige Spezialboje</string>
    <string name="type.lateral.port">Backbord</string>
    <string name="type.lateral.starboard">Steuerbord</string>
-    <string name="type.cardinal.east">Ost</string>
-    <string name="type.cardinal.north">Nord</string>
-    <string name="type.cardinal.south">Süd</string>
+    <string name="type.cardinal.east">Osten</string>
+    <string name="type.cardinal.north">Norden</string>
+    <string name="type.cardinal.south">Süden</string>
    <string name="type.cardinal.west">Westen</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>
@@ -1499,7 +1499,7 @@
    <string name="type.shop.beauty.day_spa">Tages-Spa</string>
    <string name="type.amenity.give_box">Spendenbox</string>
    <string name="type.xmas.tree">Weihnachtsbaum</string>
-    <string name="type.amenity.mobile_money_agent">Mobile Money Vertretung</string>
+    <string name="type.amenity.mobile_money_agent">Mobile Money Agent</string>
    <string name="type.amenity.food_sharing">Food Sharing</string>
    <string name="type.natural.sand">Sand</string>
    <string name="type.amenity.hydrant">Beregnungshydrant</string>
--- a/android/sdk/src/main/res/values-lt/types_strings.xml
+++ b/android/sdk/src/main/res/values-lt/types_strings.xml
@@ -76,9 +76,9 @@
    <string name="type.waterway.ditch.tunnel">Pralaida</string>
    <string name="type.waterway.drain.tunnel">Pralaida</string>
    <string name="type.piste_type.snow_park">Sniego parkas</string>
-    <string name="type.piste_type.hike">Sniego pėsčiųjų takas</string>
-    <string name="type.piste_type.connection">\"Piste Connection</string>
-    <string name="type.piste_type.skitour">\"Skitour\" takas</string>
+    <string name="type.piste_type.hike">Sniego žygių pėsčiomis trasa</string>
+    <string name="type.piste_type.connection">Jungiamoji trasa</string>
+    <string name="type.piste_type.skitour">Turistinio slidinėjimo trasa</string>
    <string name="type.self_service.yes">Galimybė naudotis savitarnos paslaugomis</string>
    <string name="type.self_service.only">Tik savitarna</string>
    <string name="type.self_service.partially">Dalinė savitarna</string>
@@ -93,7 +93,7 @@
    <string name="type.leisure.sports_hall">Sporto salė</string>
    <string name="type.addr_interpolation">Adresas / blokas</string>
    <string name="type.addr_interpolation.even">Adresas / blokas</string>
-    <string name="type.aerialway">Oro keltuvas</string>
+    <string name="type.aerialway">Keltuvas</string>
    <string name="type.addr_interpolation.odd">Adresas / blokas</string>
    <string name="type.amenity">Paslauga</string>
    <string name="type.aeroway">Oro transporto infrastruktūra</string>
@@ -251,7 +251,7 @@
    <string name="type.amenity.shower">Dušas</string>
    <string name="type.amenity.stripclub">Striptizo klubas</string>
    <string name="type.amenity.taxi">Taksi stovėjimo vieta</string>
-    <string name="type.amenity.telephone">Taksofonas</string>
+    <string name="type.amenity.telephone">Telefonas</string>
    <string name="type.amenity.theatre">Teatras</string>
    <string name="type.amenity.toilets">Tualetas</string>
    <string name="type.toilets.yes">Tualetas</string>
@@ -265,7 +265,7 @@
    <string name="type.amenity.vending_machine.food">Maisto išdavimo automatas</string>
    <string name="type.amenity.vending_machine.newspapers">Spaudos išdavimo automatas</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkomatas</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Bilietomatas</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Viešojo transporto bilietų automatas</string>
    <string name="type.amenity.vending_machine.sweets">Saldainių išdavimo automatas</string>
    <string name="type.amenity.vending_machine.excrement_bags">Išmatų maišelių stovas</string>
    <string name="type.amenity.parcel_locker">Paštomatas</string>
@@ -564,7 +564,7 @@
    <string name="type.area_highway.trunk">Magistralinis kelias</string>
    <string name="type.area_highway.unclassified">Vietinės reikšmės kelias</string>
    <string name="type.historic">Senovinis / istorinis objektas</string>
-    <string name="type.historic.battlefield">Istorinio mūšio laukas</string>
+    <string name="type.historic.battlefield">Mūšio laukas</string>
    <string name="type.historic.boundary_stone">Senovinis riboženklis</string>
    <string name="type.historic.castle">Pilis</string>
    <string name="type.historic.castle.castrum">Romėnų fortas</string>
@@ -1144,7 +1144,7 @@
    <string name="type.route.ferry">Keltas</string>
    <string name="type.shop">Parduotuvė</string>
    <string name="type.shop.alcohol">Alkoholinių gėrimų parduotuvė</string>
-    <string name="type.shop.bakery">Kepykla</string>
+    <string name="type.shop.bakery">Kepyklėlė</string>
    <string name="type.shop.bathroom_furnishing">Vonios įranga</string>
    <string name="type.shop.beauty">Grožio salonas</string>
    <string name="type.shop.beauty.nails">Manikiūro salonas</string>
@@ -1188,11 +1188,11 @@
    <string name="type.shop.greengrocer">Vaisių ir daržovių parduotuvė</string>
    <string name="type.shop.grocery">Maisto prekių parduotuvė</string>
    <string name="type.shop.hairdresser">Kirpykla</string>
-    <string name="type.shop.hardware">Metalo dirbinių parduotuvė</string>
+    <string name="type.shop.hardware">Metalo gaminių parduotuvė</string>
    <string name="type.shop.health_food">Sveiko maisto parduotuvė</string>
    <string name="type.shop.herbalist">Vaistažolių parduotuvė</string>
    <string name="type.shop.hifi">Gero garso aparatūros parduotuvė</string>
-    <string name="type.shop.houseware">Prekių namams parduotuvė</string>
+    <string name="type.shop.houseware">Namų apyvokos prekių parduotuvė</string>
    <string name="type.shop.jewelry">Juvelyrinių dirbinių parduotuvė</string>
    <string name="type.shop.kiosk">Kioskas</string>
    <string name="type.shop.kitchen">Virtuvės studija</string>
@@ -1274,7 +1274,7 @@
    <string name="type.sport.beachvolleyball">Paplūdimo tinklinis</string>
    <string name="type.sport.bowls">Rutulių sportas</string>
    <string name="type.sport.chess">Šachmatai</string>
-    <string name="type.sport.climbing">Alpinizmo centras</string>
+    <string name="type.sport.climbing">Laipiojimo centras</string>
    <string name="type.sport.cricket">Kriketas</string>
    <string name="type.sport.curling">Akmenslydis</string>
    <string name="type.sport.diving">Šuoliai į vandenį</string>
@@ -1363,4 +1363,70 @@
    <string name="type.xmas.tree">Kalėdų eglė</string>
    <string name="type.amenity.luggage_locker">Bagažo pasaugojimo automatas</string>
    <string name="type.amenity.mobile_money_agent">Mobiliųjų pinigų kasa</string>
+    <string name="type.aerialway.gondola">Gondolinis keltuvas</string>
+    <string name="type.aerialway.cable_car">Didysis gondolinis keltuvas</string>
+    <string name="type.aerialway.chair_lift">Krėslinis keltuvas</string>
+    <string name="type.aerialway.drag_lift">Traukiamasis keltuvas</string>
+    <string name="type.aerialway.mixed_lift">Mišrus keltuvas</string>
+    <string name="type.aerialway.station">Keltuvo stotelė</string>
+    <string name="type.amenity.loading_dock">Prievaža (rampa)</string>
+    <string name="type.amenity.car_pooling">Pakeleivių paėmimo / išleidimo punktas</string>
+    <string name="type.post_office.post_partner">Pašto paslaugos</string>
+    <string name="type.emergency">Kritinė situacija</string>
+    <string name="type.beacon.cardinal.east">Kardinalinis navigacinis ženklas</string>
+    <string name="type.beacon.cardinal.north">Kardinalinis navigacinis ženklas</string>
+    <string name="type.beacon.cardinal.south">Kardinalinis navigacinis ženklas</string>
+    <string name="type.beacon.cardinal.west">Kardinalinis navigacinis ženklas</string>
+    <string name="type.beacon.isolated_danger">Pavienės kliūties ženklas</string>
+    <string name="type.beacon.lateral.port">Lateralinis navigacinis ženklas</string>
+    <string name="type.beacon.lateral.starboard">Lateralinis navigacinis ženklas</string>
+    <string name="type.beacon.safe_water">Saugių vandenų navigacinis ženklas</string>
+    <string name="type.beacon.special_purpose">Specialusis navigacinis ženklas</string>
+    <string name="type.buoy.cardinal.east">Kardinalinė buja</string>
+    <string name="type.buoy.cardinal.north">Kardinalinė buja</string>
+    <string name="type.buoy.cardinal.south">Kardinalinė buja</string>
+    <string name="type.buoy.cardinal.west">Kardinalinė buja</string>
+    <string name="type.buoy.isolated_danger">Pavienės kliūties buja</string>
+    <string name="type.buoy.lateral.port">Lateralinė buja</string>
+    <string name="type.buoy.lateral.starboard">Lateralinė buja</string>
+    <string name="type.buoy.safe_water">Saugių vandenų buja</string>
+    <string name="type.buoy.special_purpose">Specialioji buja</string>
+    <string name="type.spherical_buoy.cardinal.east">Kardinalinė sferinė buja</string>
+    <string name="type.spherical_buoy.cardinal.north">Kardinalinė sferinė buja</string>
+    <string name="type.spherical_buoy.cardinal.south">Kardinalinė sferinė buja</string>
+    <string name="type.spherical_buoy.cardinal.west">Kardinalinė sferinė buja</string>
+    <string name="type.spherical_buoy.isolated_danger">Pavienės kliūties sferinė buja</string>
+    <string name="type.spherical_buoy.lateral.port">Lateralinė sferinė buja</string>
+    <string name="type.spherical_buoy.lateral.starboard">Lateralinė sferinė buja</string>
+    <string name="type.spherical_buoy.safe_water">Saugių vandenų sferinė buja</string>
+    <string name="type.spherical_buoy.special_purpose">Specialioji sferinė buja</string>
+    <string name="type.highway.track">Privažiavimo kelias</string>
+    <string name="type.highway.track.area">Privažiavimo kelias</string>
+    <string name="type.highway.track.grade1">Privažiavimo kelias</string>
+    <string name="type.highway.track.no.access">Privažiavimo kelias</string>
+    <string name="type.area_highway.track">Privažiavimo kelias</string>
+    <string name="type.historic.archaeological_site">Archeologinė vietovė</string>
+    <string name="type.aerialway.j.bar">Laktinis keltuvas</string>
+    <string name="type.aerialway.magic_carpet">Keltuvas-konvejeris</string>
+    <string name="type.aerialway.platter">Bugelinis disko formos keltuvas</string>
+    <string name="type.aerialway.rope_tow">Įsikimbamasis keltuvas</string>
+    <string name="type.aerialway.t.bar">Bugelinis „T“ formos keltuvas</string>
+    <string name="type.piste_type.downhill">Kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.area">Kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.advanced">Sudėtinga kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.advanced.area">Sudėtinga kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.easy">Nesudėtinga kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.easy.area">Nesudėtinga kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.expert">Ypač sudėtinga kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.expert.area">Ypač sudėtinga kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.freeride">Laisvojo kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.intermediate">Vidutinio sudėtingumo kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.intermediate.area">Vidutinio sudėtingumo kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.novice">Pradedančiųjų kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.downhill.novice.area">Pradedančiųjų kalnų slidinėjimo trasa</string>
+    <string name="type.piste_type.nordic">Slidinėjimo kroso trasa</string>
+    <string name="type.piste_type.sled">Rogučių trasa</string>
+    <string name="type.piste_type.sled.area">Rogučių trasa</string>
+    <string name="type.leisure.sports_centre">Sporto centras</string>
+    <string name="type.sport.tennis">Lauko tenisas</string>
 </resources>
--- a/android/sdk/src/main/res/values-nb/strings.xml
+++ b/android/sdk/src/main/res/values-nb/strings.xml
@@ -28,7 +28,7 @@
    <!-- A unit of measure -->
    <string name="ft">fot</string>
    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Avslutt</string>
+    <string name="core_exit">Utgang</string>
    <string name="core_entrance">Inngang</string>
    <string name="subway_data_unavailable">T-banekart er utilgjengelig</string>
    <string name="public_access">Offentlig tilgang</string>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -1050,8 +1050,8 @@
    <string name="type.shop.travel_agency">Reisebyrå</string>
    <string name="type.shop.tyres">Dekkforretning</string>
    <string name="type.shop.variety_store">Billigbutikk</string>
-    <string name="type.shop.video">Videobutikken</string>
-    <string name="type.shop.video_games">Videospillbutikken</string>
+    <string name="type.shop.video">Videobutikk</string>
+    <string name="type.shop.video_games">Videospillbutikk</string>
    <string name="type.shop.wine">Alkoholutsalg</string>
    <string name="type.shop.agrarian">Landbruksbutikk</string>
    <string name="type.shop.antiques">Antikviteter</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
matheusgomesms	c5822056f1	Removing maxspeed estimate from generator Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-01 23:15:44 +07:00
Konstantin Pastbin	29b09aca12	[generator] Use 72 general threads Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-01 23:15:44 +07:00
Bastian Greshake Tzovaras	ff51988ddf	[editor] 'correct' tagging of outdoor fitness stations Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>	2026-01-01 17:11:17 +01:00
Codeberg Translate	7f693b9dfd	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Kachelkaiser <kachelkaiser@noreply.codeberg.org> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: RicoElectrico <ricoelectrico@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: astro-ray <astro-ray@noreply.codeberg.org> Co-authored-by: codebergian42 <codebergian42@noreply.codeberg.org> Co-authored-by: fbausch <fbausch@noreply.codeberg.org> Co-authored-by: focaccina <focaccina@noreply.codeberg.org> Co-authored-by: gedankenstuecke <gedankenstuecke@noreply.codeberg.org> Co-authored-by: in-Dev <in-dev@noreply.codeberg.org> Co-authored-by: metehan <metehan@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: rimas <rimas@noreply.codeberg.org> Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/Search synonyms / aliases Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings	2026-01-01 15:21:27 +00:00
Jean-Baptiste	42f0855ec8	[android] Improve error message for custom server dialog Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-01 07:48:38 +01:00
Jean-Baptiste	008a785564	[android] Update Android dependencies Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-01 07:21:26 +01:00
Jean-Baptiste	a62f9470ec	Update copyright of the project Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-01 00:05:22 +01:00
zyphlar	bfe65e0de0	change date format Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-31 19:31:51 +01:00
zyphlar	eee0401a66	update cdn setup for apache Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-12-31 19:31:51 +01:00
Jean-Baptiste	4226e2f999	[android] Fix wrong text style Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-31 19:29:43 +01:00
ldcuof	94bcd5f366	[styles] Replace unpaved warning icon with new one Signed-off-by: ldcuof <ldcuof@noreply.codeberg.org>	2025-12-31 19:28:43 +01:00
x7z4w	1b64151aee	[cmake] Use default linker Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-31 19:12:27 +01:00
Jean-Baptiste	899df496ba	[android] Rework some styles text Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 20:57:03 +01:00
Jean-Baptiste	47f959ec07	[android] Show error message behind text field instead in a floating view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 20:56:46 +01:00
Jean-Baptiste	6e8a0f22e6	[android] Improve color of icons in settings Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 20:47:00 +01:00
Jean-Baptiste	2a2007a473	[android] Move url translations to do not translate file Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 18:06:24 +01:00
Jean-Baptiste	db91e3ea92	[android] Fix camera cutout offset in navigation Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 17:41:10 +01:00
Jean-Baptiste	3705abbbd6	[android] Use M3 background in dark mode Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 17:40:51 +01:00
Bastian Greshake Tzovaras	f33bfffbe6	resolve conflicts Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>	2025-12-30 17:38:05 +01:00
Jean-Baptiste	72eeceb021	[android] Simplify toolbar styles and themes Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-30 17:27:10 +01:00