[styles] Only render pedestrian areas as areas and not as lines

Fixes #1265

Signed-off-by: map-per <map-per@gmx.de>

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

@@ -1,32 +0,0 @@
-A CoMaps egy közösség által létrehozott, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap térképadatain alapul, és amelyet az átláthatóság, a magánélet védelme és a nonprofit jelleg iránti elkötelezettség erősít. A CoMaps az Organic Maps villája, amely viszont a Maps.ME villája.
-
-A projekt előzményeiről és az irányáról a <b><i>codeberg.org/comaps</i></b> oldalon olvashatsz.
-Csatlakozz ott a közösséghez, és segíts a legjobb térképalkalmazás elkészítésében.
-• Használd az alkalmazást és terjeszd a hírét
-• Adj visszajelzést és jelentsd a problémákat
-• Frissítsd és javítsd a térképadatokat az alkalmazásban vagy az OpenStreetMap weboldalán.
-
-‣ <b>Offline-fókuszú:</b> Tervezd meg és navigáld külföldi útad mobilszolgáltatás nélkül, keress útpontokat egy távoli túra során stb. Az alkalmazás minden funkcióját úgy terveztük, hogy internetkapcsolat nélkül is működjön.
-‣ <b>A magánélet tiszteletben tartása:</b> Az alkalmazás az adatvédelem szem előtt tartásával készült, nem azonosítja az embereket, nem követi nyomon és nem gyűjt személyes adatokat, és reklámmentes.
-‣ <b>Takarékosdik az akkumulátorral és a tárhellyel:</b> Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A jól összeállítot kis méretű térképek értékes helyet takarítanak meg a telefonon.
-‣ <b>Egyszerű és szép grafikus felület,</b> nagyszerű és könnyen használható funkciók, amelyek egyszerűen működnek.
-‣ <b>Ingyenes és a közösség által készített:</b> A hozzád hasonló emberek segítettek az alkalmazás létrehozásában azáltal, hogy hozzáadtak helyeket az OpenStreetMap térképhez, tesztelték és visszajelzést adtak a funkciókról, valamint hozzájárultak a fejlesztői képességeikkel és a pénzükkel.
-‣ <b>Nyílt és átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.</b>
-
-<b>Főbb jellemzők:</b>
-• Letölthető részletes térképek olyan helyekkel, amelyek sok kereskedelmi térképen nem állnak rendelkezésre.
-• Szabadtéri üzemmód kiemelt túraútvonalakkal, táborhelyekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
-• Sétaútvonalak és kerékpárutak
-• Érdekes pontok, mint például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok minden más
-• Keresés név, cím vagy az érdekes pontok kategóriája alapján
-• Navigáció hangutasításokkal gyalogláshoz, kerékpározáshoz vagy vezetéshez
-• Kedvenc helyeid könyvjelzővel láthatod el egyetlen érintéssel
-• Wikipedia szócikkek internetkapcsolat nélkül
-• Metró tranzit réteg és irányok
-• Útvonal mentése
-• Könyvjelzők és nyomvonalak exportálása és importálása KML, KMZ, GPX formátumokban
-• Sötét üzemmód az éjszakai használathoz
-• Térképadatok javítása mindenki számára egy alapvető beépített szerkesztő segítségével
-
-<b>Itt van a szabadság</b>
-Fedezd fel az utadat, navigálj a világban úgy, hogy a magánélet és a közösség kerüljön előtérbe!

android/app/src/fdroid/play/listings/nl-NL/title.txt

@@ -1 +1 @@
-CoMaps - Wandel, fiets, rijd offline met privacy
+CoMaps - Wandel, fiets, rijdt offline met privacy

android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java

@@ -73,7 +73,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
   public Template onGetTemplate()
   {
     final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
-    builder.setBackgroundColor(Colors.NAVIGATION_TEMPLATE_BACKGROUND);
+    builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT
+                                                                       : Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
     builder.setActionStrip(createActionStrip());
     builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));
 

android/app/src/main/java/app/organicmaps/car/util/Colors.java

@@ -11,7 +11,8 @@ public final class Colors
   public static final CarColor OPENING_HOURS_CLOSES_SOON = CarColor.YELLOW;
   public static final CarColor OPENING_HOURS_CLOSED = CarColor.RED;
   public static final CarColor START_NAVIGATION = CarColor.GREEN;
-  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND = CarColor.GREEN;
+  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_DAY = CarColor.GREEN;
+  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_NIGHT = CarColor.DEFAULT;
   public static final CarColor BUTTON_ACCEPT = CarColor.GREEN;
 
   private Colors() {}

android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java

@@ -29,7 +29,7 @@ public class LayersButton extends FloatingActionButton
   {
     final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
     if (mAreLayersActive)
-      mergeDrawableStates(drawableState, new int[] {R.attr.layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
     return drawableState;
   }
 

android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java

@@ -45,8 +45,6 @@ import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
-
-import com.google.android.material.button.MaterialButton;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.LinkedList;
@@ -155,10 +153,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
     mTransitViewDecorator =
         new DotDividerItemDecoration(dividerDrawable, res.getDimensionPixelSize(R.dimen.margin_base),
                                      res.getDimensionPixelSize(R.dimen.margin_half));
-    MaterialButton manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
+    Button manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
     manageRouteButton.setOnClickListener(this);
 
-    MaterialButton saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
+    Button saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
     saveButton.setOnClickListener(this);
   }
 
@@ -170,7 +168,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
       showRouteAltitudeChart();
     showRoutingDetails();
     UiUtils.show(mAltitudeChartFrame);
-    MaterialButton saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
+    Button saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
     saveButton.setText(R.string.save);
     saveButton.setEnabled(true);
   }

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -220,9 +220,6 @@ public final class UiUtils
                                           : ContextCompat.getColor(layout.getContext(), R.color.base_red));
   }
 
-  /*
-   * Hide the Android UI elements 
-   */
   public static void setFullscreen(@NonNull Activity activity, boolean fullscreen)
   {
     final Window window = activity.getWindow();

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

@@ -675,9 +675,6 @@ public class PlacePageController
     mPlacePageBehavior.addBottomSheetCallback(mDefaultBottomSheetCallback);
     mViewModel.getMapObject().observe(requireActivity(), this);
     mViewModel.getPlacePageDistanceToTop().observe(requireActivity(), mPlacePageDistanceToTopObserver);
-
-    // Re-enable UI when POI tapped if in fullscreen mode
-    UiUtils.setFullscreen(false);
   }
 
   @Override

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

@@ -106,6 +106,7 @@ public class PlacePageView extends Fragment
       Arrays.asList(CoordinatesFormat.LatLonDMS, CoordinatesFormat.LatLonDecimal, CoordinatesFormat.OLCFull,
                     CoordinatesFormat.UTM, CoordinatesFormat.MGRS, CoordinatesFormat.OSMLink);
   private View mFrame;
+  private Context mContext;
 
   // Preview.
   private ViewGroup mPreview;
@@ -143,7 +144,6 @@ public class PlacePageView extends Fragment
   private MaterialTextView mTvOutdoorSeating;
   private View mEntrance;
   private MaterialTextView mTvEntrance;
-  private MaterialTextView mTvLastChecked;
   private View mEditPlace;
   private View mAddOrganisation;
   private View mAddPlace;
@@ -308,7 +308,6 @@ public class PlacePageView extends Fragment
     mTvCuisine = mFrame.findViewById(R.id.tv__place_cuisine);
     mEntrance = mFrame.findViewById(R.id.ll__place_entrance);
     mTvEntrance = mEntrance.findViewById(R.id.tv__place_entrance);
-    mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
     mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
     mEditPlace.setOnClickListener(this);
     mAddOrganisation = mFrame.findViewById(R.id.ll__add_organisation);
@@ -663,14 +662,7 @@ public class PlacePageView extends Fragment
     refreshMetadataOrHide(outdoorSeating.equals("yes") ? getString(R.string.outdoor_seating) : "", mOutdoorSeating,
                           mTvOutdoorSeating);
 
-    final String lastChecked = mMapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE);
-    if (!lastChecked.isEmpty())
-    {
-      String periodSinceCheck = DateUtils.getRelativePeriodString(getResources(), lastChecked);
-      UiUtils.setTextAndShow(mTvLastChecked, requireContext().getString(R.string.existence_confirmed_time_ago, periodSinceCheck));
-    }
-    else
-      UiUtils.hide(mTvLastChecked);
+    //    showTaxiOffer(mapObject);
 
     if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
     {

android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -21,7 +20,6 @@ import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
-import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -38,7 +36,6 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
   private MaterialTextView mTodayOpenTime;
   private MaterialTextView mTodayNonBusinessTime;
   private RecyclerView mFullWeekOpeningHours;
-  private MaterialTextView mLastCheckedDate;
   private PlaceOpeningHoursAdapter mOpeningHoursAdapter;
 
   private PlacePageViewModel mViewModel;
@@ -61,23 +58,10 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
     mTodayOpenTime = view.findViewById(R.id.oh_today_open_time);
     mTodayNonBusinessTime = view.findViewById(R.id.oh_nonbusiness_time);
     mFullWeekOpeningHours = view.findViewById(R.id.rw__full_opening_hours);
-    mLastCheckedDate = view.findViewById(R.id.oh_check_date);
     mOpeningHoursAdapter = new PlaceOpeningHoursAdapter();
     mFullWeekOpeningHours.setAdapter(mOpeningHoursAdapter);
   }
 
-  private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, TextView checkDateView)
-  {
-    final String checkDate = mapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE_OPEN_HOURS);
-    if (!checkDate.isEmpty())
-    {
-      String periodSinceCheck = DateUtils.getRelativePeriodString(resources, checkDate);
-      UiUtils.setTextAndShow(checkDateView, resources.getString(R.string.hours_confirmed_time_ago, periodSinceCheck));
-    }
-    else
-      UiUtils.hide(checkDateView);
-  }
-
   private void refreshTodayNonBusinessTime(Timespan[] closedTimespans)
   {
     final String hoursClosedLabel = getResources().getString(R.string.editor_hours_closed);
@@ -118,9 +102,6 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
 
     final boolean isEmptyTT = (timetables == null || timetables.length == 0);
     final int color = ThemeUtils.getColor(requireContext(), android.R.attr.textColorPrimary);
-    final Resources resources = getResources();
-
-    setOrHideLastCheckedDate(mapObject, resources, mLastCheckedDate);
 
     if (isEmptyTT)
     {
@@ -138,6 +119,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
     else
     {
       UiUtils.show(mFrame);
+      final Resources resources = getResources();
       if (timetables[0].isFullWeek())
       {
         final Timetable tt = timetables[0];
@@ -179,7 +161,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
             else
               openTime = tt.workingTimespan.toWideString();
 
-            refreshTodayOpeningHours(resources.getString(app.organicmaps.sdk.R.string.today), openTime, color);
+            refreshTodayOpeningHours(resources.getString(R.string.today), openTime, color);
             refreshTodayNonBusinessTime(tt.closedTimespans);
 
             break;

android/app/src/main/res/color/accent_color_selector.xml

@@ -9,7 +9,7 @@
       android:state_checked="true"/>
 
   <item android:color="@color/base_accent"
-      app:layers_enabled="true"/>
+      app:state_layers_enabled="true"/>
 
   <item android:color="@color/icon_tint"/>
 </selector>

android/app/src/main/res/color/accent_color_selector_night.xml

@@ -9,7 +9,7 @@
         android:state_checked="true"/>
 
   <item android:color="@color/base_accent_night"
-        app:layers_enabled="true"/>
+        app:state_layers_enabled="true"/>
 
   <item android:color="@color/white_secondary"/>
 </selector>

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

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        app:state_layers_enabled="true"
+        android:drawable="@drawable/ic_layers_clear"/>
+    <item
+        app:state_layers_enabled="false"
+        android:drawable="@drawable/ic_layers_default"/>
+</selector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>

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

@@ -3,7 +3,6 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/altitude_chart_panel"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -64,19 +63,17 @@
       tools:text="5 h 55 min • 1555km"
       tools:visibility="visible" />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
       android:id="@+id/btn__manage_route"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
       style="@style/MwmWidget.Button"
       android:text="@string/planning_route_manage_route"
-      android:textColor="?android:textColorPrimary"
-      app:icon="@drawable/ic_manage_route"
-      app:iconTint="?android:textColorPrimary"
-      app:iconPadding="6dp"/>
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/btn__save"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -85,8 +82,7 @@
         android:layout_marginStart="@dimen/margin_base"
         android:minHeight="@dimen/primary_button_min_height"
         style="@style/MwmWidget.Button"
-        android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:text="@string/save"/>
 
     <Button
       android:id="@+id/start"

android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml

@@ -3,7 +3,6 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/altitude_chart_panel"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -83,27 +82,24 @@
       android:layout_weight="10"
       android:layout_gravity="center_vertical" />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
       android:id="@+id/btn__manage_route"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
       style="@style/MwmWidget.Button"
       android:text="@string/planning_route_manage_route"
-      android:textColor="?android:textColorPrimary"
-      app:icon="@drawable/ic_manage_route"
-      app:iconTint="?android:textColorPrimary"
-      app:iconPadding="6dp"/>
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/btn__save"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"
         style="@style/MwmWidget.Button"
         android:minHeight="@dimen/primary_button_min_height"
-        android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:text="@string/save"/>
 
     <Button
       android:id="@+id/start"

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

@@ -3,7 +3,6 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/altitude_chart_panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -89,20 +88,17 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical" >
-        <com.google.android.material.button.MaterialButton
+        <Button
           android:layout_weight="1"
           android:id="@+id/btn__manage_route"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           style="@style/MwmWidget.Button"
           android:text="@string/planning_route_manage_route"
-          android:textColor="?android:textColorPrimary"
-          android:textAlignment="viewStart"
-          app:icon="@drawable/ic_manage_route"
-          app:iconTint="?android:textColorPrimary"
-          app:iconPadding="@dimen/margin_quarter_plus"/>
+          android:drawableStart="@drawable/ic_manage_route"
+          android:drawablePadding="@dimen/margin_quarter_plus"/>
 
-        <com.google.android.material.button.MaterialButton
+        <Button
           android:layout_weight="0"
           android:id="@+id/btn__save"
           android:layout_width="wrap_content"
@@ -110,8 +106,7 @@
           style="@style/MwmWidget.Button"
           android:layout_marginStart="@dimen/margin_base"
           android:minHeight="@dimen/primary_button_min_height"
-          android:text="@string/save"
-          android:textColor="?android:textColorPrimary"/>
+          android:text="@string/save"/>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -74,15 +74,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"/>
 
-  <com.google.android.material.textview.MaterialTextView
-    android:id="@+id/place_page_last_checked"
-    style="?fontCaption"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/margin_half"
-    android:paddingHorizontal="@dimen/margin_base"
-    tools:text="Existence confirmed 1 month ago"/>
-
   <include android:visibility="gone" layout="@layout/place_page_editor"/>
 
   <include android:visibility="gone" layout="@layout/place_page_add_business"/>

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

@@ -3,7 +3,6 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  tools:visibility="visible"
   style="@style/PlacePageItemFrame">
 
   <com.google.android.material.imageview.ShapeableImageView
@@ -59,21 +58,6 @@
     android:layout_alignStart="@id/oh_nonbusiness_time"
     android:layout_below="@id/oh_nonbusiness_time"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    tools:itemCount="3"
-    tools:listitem="@layout/place_page_opening_hours_item"
     android:layout_marginTop="8dp"/>
 
-  <com.google.android.material.textview.MaterialTextView
-    android:id="@+id/oh_check_date"
-    style="?fontCaption"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:layout_alignParentEnd="true"
-    android:layout_alignStart="@id/oh_today_label"
-    android:layout_below="@id/rw__full_opening_hours"
-    android:textAppearance="@style/MwmTextAppearance.Body4"
-    android:textAlignment="viewStart"
-    android:visibility="gone"
-    tools:visibility="visible"
-    tools:text="Confirmed 2 months ago"/>
 </RelativeLayout>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
-<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/switchWidget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:clickable="false"
-    android:focusable="false" />

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

@@ -397,6 +397,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Vandag gesluit</string>
     <string name="day_off">Gesluit</string>
+    <string name="today">Vandag</string>
     <string name="opens_in">Open oor %s</string>
     <string name="closes_in">Sluit oor %s</string>
     <string name="closed">Gesluit</string>

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

@@ -423,6 +423,7 @@
     <string name="twentyfour_seven">٢٤/٧(ليلاً ونهاراً)</string>
     <string name="day_off_today">مغلق اليوم</string>
     <string name="day_off">مغلق</string>
+    <string name="today">اليوم</string>
     <string name="opens_in">يفتح بعد %s</string>
     <string name="closes_in">يغلق في غضون %s</string>
     <string name="closed">مغلق</string>

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

@@ -31,6 +31,7 @@
     <string name="no_available">Non</string>
     <string name="yes">Sí</string>
     <string name="yes_available">Sí</string>
+    <string name="today">Güei</string>
     <string name="export_file">Esportar KMZ</string>
     <string name="no">Non</string>
     <string name="network">Rede: %s</string>

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

@@ -415,6 +415,7 @@
     <string name="twentyfour_seven">7/24</string>
     <string name="day_off_today">Bu gün bağlıdır</string>
     <string name="day_off">Bağlı</string>
+    <string name="today">Bu gün</string>
     <string name="opens_in">%s sonra açılır</string>
     <string name="closes_in">%s sonra bağlanır</string>
     <string name="closed">Bağlı</string>

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

@@ -409,6 +409,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Сёння закрыта</string>
     <string name="day_off">Закрыта</string>
+    <string name="today">Сёння</string>
     <string name="opens_in">Адчыняецца праз %s</string>
     <string name="closes_in">Зачыняецца праз %s</string>
     <string name="closed">Закрыта</string>

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

@@ -389,6 +389,7 @@
     <string name="twentyfour_seven">24 часа</string>
     <string name="day_off_today">Затворено днес</string>
     <string name="day_off">Затворено</string>
+    <string name="today">Днес</string>
     <string name="closed">Затворено</string>
     <string name="edit_opening_hours">Редакция на работното време</string>
     <string name="no_osm_account">Нямате акаунт в OpenStreetMap?</string>

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

@@ -240,6 +240,7 @@
     <string name="editor_report_problem_under_construction_title">রক্ষণাবেক্ষণের জন্য বন্ধ</string>
     <string name="editor_report_problem_duplicate_place_title">ডুপ্লিকেট জায়গা</string>
     <string name="day_off_today">আজকে বন্ধ</string>
+    <string name="today">আজকে</string>
     <string name="opens_in">%s-এর মধ্যে খুলবে</string>
     <string name="closes_in">%s-এর মধ্যে বন্ধ হবে</string>
     <string name="no_osm_account">আপনার ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট নেই?</string>

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

@@ -415,6 +415,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Avui és tancat</string>
     <string name="day_off">Tancat</string>
+    <string name="today">Avui</string>
     <string name="opens_in">Obre en %s</string>
     <string name="closes_in">Tanca en %s</string>
     <string name="closed">Tancat</string>

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

@@ -408,6 +408,7 @@
     <string name="twentyfour_seven">Nonstop</string>
     <string name="day_off_today">Dnes zavřeno</string>
     <string name="day_off">Zavřeno</string>
+    <string name="today">Dnes</string>
     <string name="closed">Zavřeno</string>
     <string name="edit_opening_hours">Upravit otevírací dobu</string>
     <string name="no_osm_account">Nemáte účet u OpenStreetMap?</string>
@@ -882,6 +883,4 @@
     <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
     <string name="share_track">Sdílet stopu</string>
     <string name="delete_track_dialog_title">Odstranit %s?</string>
-    <string name="hours_confirmed_time_ago">Potvrzeno %s</string>
-    <string name="existence_confirmed_time_ago">Existence potvrzena %s</string>
 </resources>

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

@@ -32,6 +32,7 @@
     <string name="editor_time_close">Ar gau</string>
     <string name="subway">Tanlwybr</string>
     <string name="downloader_retry">Ailgeisio</string>
+    <string name="today">Heddiw</string>
     <string name="button_plan">Cynllunio</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="list">Rhestr</string>

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

@@ -404,6 +404,7 @@
     <string name="twentyfour_seven">Døgnet rundt</string>
     <string name="day_off_today">Lukket i dag</string>
     <string name="day_off">Lukket</string>
+    <string name="today">I dag</string>
     <string name="closed">Lukket</string>
     <string name="edit_opening_hours">Rediger åbningstid</string>
     <string name="no_osm_account">Har du ikke OpenStreetMap-konto?</string>

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

@@ -413,6 +413,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Heute geschlossen</string>
     <string name="day_off">Geschlossen</string>
+    <string name="today">Heute</string>
     <string name="opens_in">Öffnet in %s</string>
     <string name="closes_in">Schließt in %s</string>
     <string name="closed">Geschlossen</string>
@@ -887,6 +888,4 @@
     <string name="osm_note_toast">Ein Hinweis wird zu OpenStreetMap geschickt</string>
     <string name="share_track">Strecke teilen</string>
     <string name="delete_track_dialog_title">%s löschen?</string>
-    <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
-    <string name="hours_confirmed_time_ago">Bestätigt %s</string>
 </resources>

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

@@ -415,6 +415,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Κλειστό σήμερα</string>
     <string name="day_off">Κλειστό</string>
+    <string name="today">Σήμερα</string>
     <string name="opens_in">Ανοίγει σε %s</string>
     <string name="closes_in">Κλείνει σε %s</string>
     <string name="closed">Κλειστό</string>

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

@@ -413,10 +413,11 @@
     <string name="editor_report_problem_duplicate_place_title">Lugar duplicado</string>
     <string name="autodownload">Descarga automática</string>
     <!-- Place Page opening hours text -->
-    <string name="daily">Diariamente</string>
+    <string name="daily">Diario</string>
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Cerrado hoy</string>
     <string name="day_off">Cerrado</string>
+    <string name="today">Hoy</string>
     <string name="opens_in">Abre en %s</string>
     <string name="closes_in">Cierra en %s</string>
     <string name="closed">Cerrado</string>
@@ -539,7 +540,7 @@
     <!-- For the first routing -->
     <string name="accept">Aceptar</string>
     <!-- For the first routing -->
-    <string name="decline">Rechazar</string>
+    <string name="decline">Declinar</string>
     <string name="mobile_data_dialog">¿Usar Internet móvil para mostrar información detallada?</string>
     <string name="mobile_data_option_always">Usar siempre</string>
     <string name="mobile_data_option_today">Sólo hoy</string>
@@ -890,6 +891,4 @@
     <string name="at">a las %s</string>
     <string name="osm_note_hint">O, como alternativa, deja una nota a la comunidad de OpenStreetMap para que alguien lo agregue o arregle.</string>
     <string name="osm_note_toast">Una nota será enviada a OpenStreetMap</string>
-    <string name="delete_track_dialog_title">Eliminar %s?</string>
-    <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
 </resources>

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

@@ -409,6 +409,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Täna suletud</string>
     <string name="day_off">Suletud</string>
+    <string name="today">Täna</string>
     <string name="opens_in">Avatakse %s möödumisel</string>
     <string name="closes_in">Suletakse %s möödumisel</string>
     <string name="closed">Suletud</string>
@@ -882,6 +883,4 @@
     <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
     <string name="share_track">Jaga rada</string>
     <string name="delete_track_dialog_title">Kas kustutame: %s?</string>
-    <string name="existence_confirmed_time_ago">Olemasolu on kontrollitud %s</string>
-    <string name="hours_confirmed_time_ago">Kontrollitud %s</string>
 </resources>

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

@@ -415,6 +415,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Gaur atseden eguna</string>
     <string name="day_off">Itxita</string>
+    <string name="today">Gaur</string>
     <string name="opens_in">%s barru irekiko da</string>
     <string name="closes_in">%s barru itxiko da</string>
     <string name="closed">Itxita</string>

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

@@ -394,6 +394,7 @@
     <string name="twentyfour_seven">شبانه روزی</string>
     <string name="day_off_today">امروز تعطیل است</string>
     <string name="day_off">تعطیل است</string>
+    <string name="today">امروز</string>
     <string name="closed">تعطیل</string>
     <string name="edit_opening_hours">ویرایش ساعت کاری</string>
     <string name="no_osm_account">آیا حساب OpenStreetMap ندارید؟</string>

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

@@ -416,6 +416,7 @@
     <string name="twentyfour_seven">Päivin ja öin</string>
     <string name="day_off_today">Suljettu tänään</string>
     <string name="day_off">Suljettu</string>
+    <string name="today">Tänään</string>
     <string name="opens_in">Avautuu %s kuluttua</string>
     <string name="closes_in">Sulkeutuu %s kuluttua</string>
     <string name="closed">Suljettu</string>

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

@@ -101,7 +101,7 @@
     <string name="measurement_units_summary">Choisir entre miles et kilomètres</string>
     <!-- SECTION: Search categories -->
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
-    <string name="category_eat">Où manger</string>
+    <string name="category_eat">Un endroit pour manger</string>
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
     <string name="category_food">Épiceries</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
@@ -165,13 +165,13 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage dee cartes sont actuellement désactivés.</string>
+    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de carte sont actuellement désactivés.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours</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">Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Téléchargez-les ici : https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hé, regardez ce lieu dans CoMaps !</string>
+    <string name="bookmark_share_email_subject">Hé, regardez mon signet sur la carte CoMaps !</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Hé, regardez ma position actuelle sur la carte CoMaps !</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -187,7 +187,7 @@
     <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
     <string name="data_version">Données OpenStreetMap : %s</string>
     <!-- Confirmation for OpenStreetMap log out. -->
-    <string name="osm_log_out_confirmation">Êtes-vous certain de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
+    <string name="osm_log_out_confirmation">Êtes-vous sûr de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
     <!-- Title for tracks category in bookmarks manager -->
     <string name="tracks_title">Traces</string>
     <!-- Length of track in cell that describes route -->
@@ -221,7 +221,7 @@
     <!-- Settings «Route» category: «Tts announce street names» description -->
     <string name="pref_tts_street_names_description">Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix.</string>
     <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Langue des annonces vocales</string>
+    <string name="pref_tts_language_title">Langue vocale</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Tester les instructions vocales</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
@@ -234,11 +234,11 @@
     <!-- Menu button -->
     <string name="menu">Menu</string>
     <!-- Text in menu -->
-    <string name="website">Site web</string>
+    <string name="website">Site internet</string>
     <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nouvelles</string>
     <!-- Settings: Send feedback button and dialog title -->
-    <string name="feedback">Suggestions</string>
+    <string name="feedback">Feedback</string>
     <!-- Text in menu -->
     <string name="rate_the_app">Évaluer l\'appli</string>
     <!-- Text in menu -->
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Faire un don</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Devenez contributeur et améliorez CoMaps</string>
+    <string name="how_to_support_us">Soutenir le projet</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Tous droits réservés</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -283,11 +283,11 @@
     <!-- Item in context menu. -->
     <string name="downloader_delete_map">Supprimer carte</string>
     <!-- Item in context menu. -->
-    <string name="downloader_update_map">Mettre à jour carte</string>
+    <string name="downloader_update_map">Mise à jour carte</string>
     <!-- Preference title -->
     <string name="google_play_services">Service de localisation Google Fused</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Un service propriétaire qui combine GPS, Wi-Fi, réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs Google.</string>
+    <string name="pref_use_google_play">Un service propriétaire qui combine le GPS, le Wi-Fi, les réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs de Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -334,10 +334,10 @@
     <string name="blue_gray">Gris-bleu</string>
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Lorsque vous suivez l\'itinéraire, gardez à l\'esprit les points suivants :</string>
-    <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;</string>
-    <string name="dialog_routing_disclaimer_precision">— La carte peut être erronée et l\'itinéraire proposé n\'est pas forcément optimal pour arriver à destination ;</string>
+    <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur l\'appareil de navigation ;</string>
+    <string name="dialog_routing_disclaimer_precision">— La carte peut être imprécise et l\'itinéraire proposé n\'est pas forcément le plus direct pour arriver à destination ;</string>
     <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
-    <string name="dialog_routing_disclaimer_borders">— Soyez vigilants à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
+    <string name="dialog_routing_disclaimer_borders">— Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir des frontières étatiques dans des zones interdites ;</string>
     <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
     <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
     <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
@@ -360,10 +360,10 @@
     <string name="dialog_routing_try_again">Veuillez réessayer</string>
     <string name="not_now">Pas maintenant</string>
     <string name="dialog_routing_download_and_build_cross_route">Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte ?</string>
-    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour calculer un meilleur itinéraire sortant des limites de la carte courante.</string>
+    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte.</string>
     <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Commencez par télécharger une carte pour effectuer des recherches et créer des itinéraires. Ensuite vous pourrez utilisez CoMaps sans connexion Internet.</string>
-    <string name="search_select_map">Sélectionnez une carte</string>
+    <string name="search_without_internet_advertisement">Pour commencer à rechercher et à créer des itinéraires, veuillez télécharger la carte. Après cela, vous n\'aurez plus besoin d\'une connexion Internet.</string>
+    <string name="search_select_map">Sélectionner la carte</string>
     <!-- «Show» context menu -->
     <string name="show">Afficher</string>
     <!-- «Hide» context menu -->
@@ -374,7 +374,7 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche</string>
     <string name="search_history_title">Historique de recherche</string>
-    <string name="search_history_text">Affichez vos dernières recherches</string>
+    <string name="search_history_text">Accédez à vos dernières recherches</string>
     <string name="clear_search">Effacer l\'historique de recherche</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipédia</string>
@@ -402,14 +402,14 @@
     <string name="editor_time_simple">Mode simplifié</string>
     <string name="editor_hours_closed">Heures de fermeture</string>
     <string name="editor_example_values">Exemple de valeurs</string>
-    <string name="editor_correct_mistake">Corriger une erreur</string>
+    <string name="editor_correct_mistake">Corriger l\'erreur</string>
     <string name="editor_add_select_location">Sélectionnez un emplacement</string>
     <string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de le résoudre.</string>
     <string name="editor_report_problem_desription_2">Ou faites-le vous-même sur https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Envoyer</string>
     <string name="editor_report_problem_title">Problème</string>
     <string name="editor_report_problem_no_place_title">Ce lieu n\'existe pas</string>
-    <string name="editor_report_problem_under_construction_title">Fermé pour travaux</string>
+    <string name="editor_report_problem_under_construction_title">Fermé pour cause de maintenance</string>
     <string name="editor_report_problem_duplicate_place_title">Lieu en doublon</string>
     <string name="autodownload">Téléchargement automatique des cartes</string>
     <!-- Place Page opening hours text -->
@@ -417,6 +417,7 @@
     <string name="twentyfour_seven">24/24 et 7/7</string>
     <string name="day_off_today">Fermé aujourd\'hui</string>
     <string name="day_off">Fermé</string>
+    <string name="today">Aujourd\'hui</string>
     <string name="opens_in">Ouvert dans %s</string>
     <string name="closes_in">Ferme dans %s</string>
     <string name="closed">Fermé</string>
@@ -452,11 +453,11 @@
     <string name="level">Étage</string>
     <!-- Building level -->
     <string name="level_value_generic">Niveau : %s</string>
-    <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées en même temps qu\'elle</string>
+    <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées avec elle</string>
     <string name="downloader_update_maps">Mettre à jour les cartes</string>
-    <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis replanifier l\'itinéraire.</string>
+    <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire.</string>
     <string name="downloader_search_field_hint">Trouver une carte</string>
-    <string name="common_check_internet_connection_dialog">Veuillez vérifier que votre appareil est connecté à Internet</string>
+    <string name="common_check_internet_connection_dialog">Veuillez vous assurer que votre appareil est connecté à Internet</string>
     <string name="downloader_no_space_title">Espace insuffisant</string>
     <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
     <string name="editor_login_error_dialog">Erreur de connexion</string>
@@ -514,7 +515,7 @@
     <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
     <string name="editor_comment_hint">Commentaire…</string>
     <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
-    <string name="editor_reset_edits_button">Ignorer</string>
+    <string name="editor_reset_edits_button">Réinitialiser</string>
     <string name="editor_remove_place_message">Supprimer le lieu ajouté ?</string>
     <string name="editor_remove_place_button">Supprimer</string>
     <string name="editor_place_doesnt_exist">Ce lieu n\'existe pas</string>
@@ -523,7 +524,7 @@
     <!-- Phone number error message -->
     <string name="error_enter_correct_phone">Saisissez un numéro de téléphone valide</string>
     <string name="error_enter_correct_web">Saisissez une adresse Internet valide</string>
-    <string name="error_enter_correct_email">Saisissez une adresse de courriel valide</string>
+    <string name="error_enter_correct_email">Saisissez un email valide</string>
     <string name="error_enter_correct_facebook_page">Saisissez une adresse web, un compte ou un nom de page Facebook valide</string>
     <string name="error_enter_correct_instagram_page">Saisissez une adresse web, un nom de compte Instagram valide</string>
     <string name="error_enter_correct_twitter_page">Saisissez une adresse web, un nom de compte Twitter valide</string>
@@ -547,7 +548,7 @@
     <string name="mobile_data_option_not_today">Ne pas utiliser aujourd\'hui</string>
     <string name="mobile_data">Internet mobile</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Une connexion Internet est nécessaire pour recevoir les mises à jour de cartes et pour envoyer vos modifications</string>
+    <string name="mobile_data_description">L\'Internet mobile est requis pour les notifications de mise à jour de carte et le téléchargement des modifications.</string>
     <string name="mobile_data_option_never">Ne jamais utiliser</string>
     <string name="mobile_data_option_ask">Toujours demander</string>
     <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour.</string>
@@ -775,9 +776,9 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Afficher dans la voiture</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">CoMaps a besoin d\'accéder à votre position. Vérifiez la notification affichée sur le téléphone.</string>
+    <string name="aa_location_permissions_request">CoMaps a besoin d\'un accès à la localisation. Lorsque c\'est sûr, vérifie la notification sur ton téléphone.</string>
     <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Cette application a besoin de vôtre permission</string>
+    <string name="aa_request_permission_notification">Cette application a besoin de ta permission</string>
     <!-- The text in the activity for location permission request. -->
     <string name="aa_request_permission_activity_text">CoMaps dans Android Auto a besoin des permissions de localisation pour fonctionner efficacement</string>
     <!-- Grant Permissions button. -->
@@ -810,7 +811,7 @@
     <!-- To indicate if restaurant or other place has outdoor seating -->
     <string name="outdoor_seating">Places en terrasse</string>
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
-    <string name="power_save_dialog_summary">Pour une navigation plus précise, nous vous recommandons de désactiver le mode d\'économie d\'énergie dans les paramètres de la batterie du téléphone.</string>
+    <string name="power_save_dialog_summary">Pour une navigation plus précise, nous te recommandons de désactiver le mode d\'économie d\'énergie dans les paramètres de la batterie du téléphone.</string>
     <!-- Prompt to start recording a track. -->
     <string name="start_track_recording">Enregistrer la trace</string>
     <!-- Prompt for stopping a track recording. -->
@@ -826,7 +827,7 @@
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer</string>
     <string name="choose_color">Choisir la couleur</string>
-    <string name="edit_track">Modifier la trace</string>
+    <string name="edit_track">Modifier le trace</string>
     <string name="uri_open_location_failed">Aucune application installée ne permet d\'ouvrir l\'emplacement</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Auto dans la navigation</string>
@@ -844,7 +845,7 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="navigation_stop_button">Stop</string>
-    <string name="telegram_url">https://t.me/CoMapsApp</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="app_site_url">https://comaps.app/fr/</string>
     <string name="codeberg">Codeberg</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
@@ -861,7 +862,7 @@
     <string name="vehicle">Véhicule</string>
     <string name="clear">Effacer</string>
     <string name="pedestrian">À pied</string>
-    <string name="bicycle">À vélo</string>
+    <string name="bicycle">Vélo</string>
     <string name="ruler">Règle</string>
     <string name="bookmark_color">Couleur du marque-page</string>
     <string name="panoramax">Image Panoramax</string>
@@ -890,8 +891,4 @@
     <string name="at">à %s</string>
     <string name="osm_note_hint">Sinon, laissez une note à la communauté OpenStreetMap pour que quelqu\'un d\'autre puisse ajouter ou corriger ce lieu.</string>
     <string name="osm_note_toast">La note va être envoyée à OpenStreetMap</string>
-    <string name="share_track">Partager la trace</string>
-    <string name="delete_track_dialog_title">Supprimer %s ?</string>
-    <string name="existence_confirmed_time_ago">Existance confirmée %s</string>
-    <string name="hours_confirmed_time_ago">Confirmé %s</string>
 </resources>

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

@@ -228,7 +228,7 @@
     <string name="rate_the_app">Valore a aplicación</string>
     <string name="faq">Preguntas frecuentes</string>
     <string name="donate">Doar</string>
-    <string name="how_to_support_us">Voluntariado para mellorar CoMaps</string>
+    <string name="how_to_support_us">Apoie o proxecto</string>
     <string name="copyright">Dereitos de autor</string>
     <string name="report_a_bug">Informar dun fallo</string>
     <string name="compass_calibration_recommended">Mellore a dirección da frecha movendo o teléfono en forma de oito para calibrar o compás.</string>
@@ -489,6 +489,7 @@
     <string name="translated_om_site_url">https://comaps.app/gl/</string>
     <string name="category_shopping">Compras</string>
     <string name="placepage_distance">Distancia</string>
+    <string name="today">Hoxe</string>
     <string name="category_toilet">Baño</string>
     <string name="off">Desactivado</string>
     <string name="cuisine">Cociña</string>
@@ -617,8 +618,4 @@
     <string name="at">ás %s</string>
     <string name="osm_note_hint">Ou, de xeito alternativo, deixarlle unha nota á comunidade OpenStreetMap para que alguén poida engadir ou arranxar a localización.</string>
     <string name="osm_note_toast">Enviarase unha nota a OpenStreetMap</string>
-    <string name="delete_track_dialog_title">Eliminar %s?</string>
-    <string name="hours_confirmed_time_ago">Confirmado %s</string>
-    <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
-    <string name="share_track">Compartir ruta</string>
 </resources>

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

@@ -360,6 +360,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Hüt zue</string>
     <string name="day_off">Zue</string>
+    <string name="today">Hüt</string>
     <string name="opens_in">Öffnet i %s</string>
     <string name="closes_in">Schlüüst i %s</string>
     <string name="closed">Zue</string>

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

@@ -103,6 +103,7 @@
     <string name="privacy">Privatnost</string>
     <string name="power_managment_setting_never">Nikada</string>
     <string name="editor_reset_edits_button">Odbaci</string>
+    <string name="today">Danas</string>
     <string name="password">Lozinka</string>
     <string name="details">Detalji</string>
     <string name="privacy_policy">Politika privatnosti</string>

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

@@ -9,7 +9,7 @@
     <string name="delete">Törlés</string>
     <string name="download_maps">Térképek letöltése</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Nem sikerült letölteni, próbáld meg újra</string>
+    <string name="download_has_failed">Nem sikerült letölteni. Próbálja meg újra.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Letöltés…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Korlátozott pontosság</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">A pontos navigáció érdekében meg kell adni a beállításokban a pontos helymeghatározási engedélyt</string>
+    <string name="precise_location_is_disabled_long_text">A pontos navigáció érdekében engedélyezze a beállításokban a Pontos helymeghatározás opciót.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Megjelenítés a térképen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -82,7 +82,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Térképek mentési helye</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">A térképek letöltéséhez válassza ki a mappát</string>
+    <string name="maps_storage_summary">Válassza ki a mappát a térképek letöltéséhez.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Letöltött térképek</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -162,9 +162,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Az Ön tartózkodási helye még nincs meghatározva</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Sajnos a térképtárolás beállítása jelenleg le van tiltva</string>
+    <string name="cant_change_this_setting">A térképek tárolása jelenleg ki van kapcsolva.</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">A térkép letöltése folyamatban van</string>
+    <string name="downloading_is_active">A térkép letöltése folyamatban van.</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">Tekintse meg a helyzetemet az CoMaps alkalmazásban! %1$s vagy %2$s. Nincs offline térképe? Töltse le innen: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -172,7 +172,7 @@
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Tekintse meg a helyzetemet az CoMaps alkalmazásban!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
-    <string name="my_position_share_email">Üdvözlöm.\n\nJelenleg itt vagyok: %1$s. Kattintson erre a hivatkozásra %2$s, vagy erre %3$s, hogy megtekintse a helyet a térképen.\n\nKöszönöm.</string>
+    <string name="my_position_share_email">Üdvözlöm!\n\nJelenleg itt tartózkodom: %1$s. Kattintson a következő hivatkozásra: %2$s, vagy ide: %3$s, hogy megtekintse a helyzetemet a térképen.\n\nKöszönöm!</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Megosztás</string>
     <!-- Share by email button text, also used in editor and About. -->
@@ -220,7 +220,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Hangutasítások tesztelése</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot</string>
+    <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Nem érhető el</string>
     <string name="pref_map_auto_zoom">Automatikus nagyítás</string>
@@ -237,11 +237,11 @@
     <!-- Text in menu -->
     <string name="help">Súgó</string>
     <!-- Button in the main Help dialog -->
-    <string name="faq">Gyakran ismételt kérdések</string>
+    <string name="faq">GYIK</string>
     <!-- Button in the main menu -->
     <string name="donate">Adományozás</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Önkéntes munka és a CoMaps fejlesztése</string>
+    <string name="how_to_support_us">A projekt támogatása</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Szerzői jogok</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -266,7 +266,7 @@
     <string name="downloader_download_all_button">Összes letöltése</string>
     <string name="downloader_downloading">Letöltés:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">A térkép törléséhez állítsa le a navigációt</string>
+    <string name="downloader_delete_map_while_routing_dialog">Állítsa le a navigációt a térkép törléséhez.</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Útvonalakat csak akkor lehet készíteni, ha teljesen rajta vannak egy térképen.</string>
     <!-- Context menu item for downloader. -->
@@ -278,9 +278,9 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Térkép frissítése</string>
     <!-- Preference title -->
-    <string name="google_play_services">Google helymeghatározási szolgáltatás</string>
+    <string name="google_play_services">Google Play helymeghatározási szolgáltatások</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">A Google szolgáltatása, amely a GPS, a Wi-Fi, a mobilhálózatok stb. kombinálásával határozza meg az Ön tartózkodási helyét. Ez csatlakozik a Google szervereihez, és adatokat gyűjt Önről.</string>
+    <string name="pref_use_google_play">Bluetooth, Wi-Fi vagy mobilhálózat segítségével gyorsan meghatározhatja hozzávetőleges tartózkodási helyét</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -338,18 +338,18 @@
     <string name="dialog_routing_location_turn_on">Engedélyezze a helymeghatározási szolgáltatásokat</string>
     <string name="dialog_routing_location_unknown_turn_on">A jelenlegi GPS-koordináták nem találhatók. Engedélyezze a helymeghatározási szolgáltatásokat az útvonal kiszámításához.</string>
     <string name="dialog_routing_unable_locate_route">Nem sikerült meghatározni az útvonalat</string>
-    <string name="dialog_routing_cant_build_route">Nem lehet létrehozni az útvonalat</string>
+    <string name="dialog_routing_cant_build_route">Nem lehet létrehozni az útvonalat.</string>
     <string name="dialog_routing_change_start_or_end">Pontosítsa a kiindulópontot vagy a célállomást.</string>
     <string name="dialog_routing_change_start">Pontosítsa a kiindulópontot</string>
     <string name="dialog_routing_start_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a kiindulópontot.</string>
     <string name="dialog_routing_select_closer_start">Válasszon egy, az úthoz közelebb eső kiindulópontot.</string>
     <string name="dialog_routing_change_end">Pontosítsa célállomását</string>
     <string name="dialog_routing_end_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a célállomást.</string>
-    <string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást</string>
-    <string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet</string>
-    <string name="dialog_routing_intermediate_not_determined">Kérem, állítsa be a köztes helyet</string>
+    <string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást.</string>
+    <string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet.</string>
+    <string name="dialog_routing_intermediate_not_determined">Módosítsa a köztes helyet.</string>
     <string name="dialog_routing_system_error">Rendszerhiba</string>
-    <string name="dialog_routing_application_error">Az alkalmazás hibája miatt nem lehet létrehozni az útvonalat</string>
+    <string name="dialog_routing_application_error">Nem lehet létrehozni az útvonalat egy alkalmazáshiba miatt.</string>
     <string name="dialog_routing_try_again">Próbálja meg újra</string>
     <string name="not_now">Most nem</string>
     <string name="dialog_routing_download_and_build_cross_route">Szeretné letölteni a térképet, és egynél több térképen átívelő, optimálisabb útvonalat létrehozni?</string>
@@ -363,17 +363,17 @@
     <string name="hide">Elrejtés</string>
     <string name="categories">Kategóriák</string>
     <string name="history">Előzmények</string>
-    <string name="search_not_found">Hoppá, nincs találat</string>
+    <string name="search_not_found">Nincs eredmény.</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg egy közeli város vagy település nevét hozzáadni.</string>
+    <string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg hozzáadni egy közeli város vagy település nevét.</string>
     <string name="search_history_title">Keresési előzmények</string>
-    <string name="search_history_text">Legutóbbi keresések megtekintése</string>
+    <string name="search_history_text">Legutóbbi keresések megtekintése.</string>
     <string name="clear_search">A keresési előzmények törlése</string>
     <string name="p2p_your_location">Saját tartózkodási hely</string>
     <string name="p2p_start">Indítás</string>
     <string name="p2p_from_here">Kiindulópont</string>
     <string name="p2p_to_here">Célpont</string>
-    <string name="p2p_only_from_current">Navigáció csak a jelenlegi tartózkodási helyétől indítható</string>
+    <string name="p2p_only_from_current">A navigáció csak a jelenlegi tartózkodási helyétől érhető el.</string>
     <string name="p2p_reroute_from_current">Szeretne útvonalat tervezni a jelenlegi tartózkodási helyétől?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Következő</string>
@@ -408,6 +408,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Ma zárva</string>
     <string name="day_off">Zárva</string>
+    <string name="today">Ma</string>
     <string name="closed">Zárva</string>
     <string name="edit_opening_hours">Nyitvatartás szerkesztése</string>
     <string name="no_osm_account">Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen?</string>
@@ -436,14 +437,14 @@
     <!-- login text field -->
     <string name="email_or_username">E-mail-cím vagy felhasználónév</string>
     <string name="level">Szint</string>
-    <string name="downloader_delete_map_dialog">A térképpel együtt az Ön összes térképszerkesztése törlődik</string>
+    <string name="downloader_delete_map_dialog">Az összes térképszerkesztés törlődik a térképpel együtt.</string>
     <string name="downloader_update_maps">Térképek frissítése</string>
     <string name="downloader_mwm_migration_dialog">Az útvonal létrehozásához frissítenie kell az összes térképet, majd újra meg kell terveznie az útvonalat.</string>
     <string name="downloader_search_field_hint">Térkép keresése</string>
-    <string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az Ön készüléke csatlakozik az internethez</string>
+    <string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az eszköz csatlakozik az internethez.</string>
     <string name="downloader_no_space_title">Nincs elegendő tárhely</string>
     <string name="downloader_no_space_message">Törölje a felesleges adatokat</string>
-    <string name="editor_login_error_dialog">Bejelentkezési hiba</string>
+    <string name="editor_login_error_dialog">Bejelentkezési hiba.</string>
     <string name="editor_profile_changes">Jóváhagyott módosítások</string>
     <string name="editor_focus_map_on_location">Húzza a térképet, hogy a keresztet a hely vagy üzlet helyére helyezze.</string>
     <string name="editor_edit_place_title">Szerkesztés</string>
@@ -460,7 +461,7 @@
     <string name="osm_presentation">A közösségi OpenStreetMap adatok frissítésének időpontja: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
-    <string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit</string>
+    <string name="login_to_make_edits_visible">Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d / %2$d</string>
     <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
@@ -836,7 +837,4 @@
     <string name="saved">Mentett</string>
     <string name="about_headline">Közösség által működtetett nyílt projekt</string>
     <string name="bluesky">Bluesky</string>
-    <string name="closed_now">Most zárva van</string>
-    <string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve %s</string>
-    <string name="hours_confirmed_time_ago">Ellenőrizve és megerősítve %s</string>
 </resources>

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

@@ -402,6 +402,7 @@
     <string name="twentyfour_seven">siang dan malam</string>
     <string name="day_off_today">Tutup hari ini</string>
     <string name="day_off">Tutup</string>
+    <string name="today">Hari ini</string>
     <string name="closed">Tutup</string>
     <string name="edit_opening_hours">Sunting jam kerja</string>
     <string name="no_osm_account">Tidak ada akun di OpenStreetMap?</string>

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

@@ -45,6 +45,7 @@
     <string name="daily">Daglega</string>
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Lokað í dag</string>
+    <string name="today">Í dag</string>
     <string name="opens_in">Opnar eftir %s</string>
     <string name="closes_in">Lokar eftir %s</string>
     <string name="closed">Lokað</string>

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

@@ -411,6 +411,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Oggi chiuso</string>
     <string name="day_off">Chiuso</string>
+    <string name="today">Oggi</string>
     <string name="opens_in">Apre tra %s</string>
     <string name="closes_in">Chiude tra %s</string>
     <string name="closed">Chiuso</string>

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

@@ -409,6 +409,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">סגור היום</string>
     <string name="day_off">סגור</string>
+    <string name="today">היום</string>
     <string name="opens_in">נפתח עוד %s</string>
     <string name="closes_in">נסגר עוד %s</string>
     <string name="closed">סגור</string>

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

@@ -419,6 +419,7 @@
     <string name="twentyfour_seven">昼と夜</string>
     <string name="day_off_today">本日終業</string>
     <string name="day_off">終業</string>
+    <string name="today">今日は</string>
     <string name="opens_in">あと %s に営業</string>
     <string name="closes_in">あと %s に閉店</string>
     <string name="closed">閉店</string>

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

@@ -402,6 +402,7 @@
     <string name="twentyfour_seven">24 시간</string>
     <string name="day_off_today">오늘 영업 종료됨</string>
     <string name="day_off">종료됨</string>
+    <string name="today">오늘</string>
     <string name="closed">닫음</string>
     <string name="edit_opening_hours">영업일 편집</string>
     <string name="no_osm_account">OpenStreetMap에서 계정이 없습니까?</string>

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

@@ -403,6 +403,7 @@
     <string name="twentyfour_seven">24×7</string>
     <string name="day_off_today">Šiandien uždaryta</string>
     <string name="day_off">Uždaryta</string>
+    <string name="today">Šiandien</string>
     <string name="opens_in">Atsidaro už %s</string>
     <string name="closes_in">Užsidaro už %s</string>
     <string name="closed">Uždaryta</string>

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

@@ -415,6 +415,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Šodien slēgts</string>
     <string name="day_off">Slēgts</string>
+    <string name="today">Šodien</string>
     <string name="opens_in">Atveras pēc %s</string>
     <string name="closes_in">Slēgts pēc %s</string>
     <string name="closed">Slēgts</string>

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

@@ -395,6 +395,7 @@
     <string name="twentyfour_seven">२४/७</string>
     <string name="day_off_today">आज बंद</string>
     <string name="day_off">बंद</string>
+    <string name="today">आज</string>
     <string name="closed">बंद</string>
     <string name="edit_opening_hours">व्यवसायाची वेळ संपादित करा</string>
     <string name="no_osm_account">OpenStreetMap खाते नाही?</string>

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

@@ -474,6 +474,7 @@
     <string name="yes">Iva</string>
     <string name="no">Le</string>
     <string name="editor_osm_notes">In-noti tad-dejta tal-mappa tiegħek</string>
+    <string name="today">Illum</string>
     <string name="social_media">Midja Soċjali</string>
     <string name="downloader_update_maps">Aġġorna l-Mapep</string>
     <string name="error_enter_correct_facebook_page">Daħħal indirizz tal-web, kont, jew isem tal-paġna validu ta ’Facebook</string>

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

@@ -415,6 +415,7 @@
     <string name="twentyfour_seven">Dag og natt</string>
     <string name="day_off_today">Fridag i dag</string>
     <string name="day_off">Fridag</string>
+    <string name="today">I dag</string>
     <string name="opens_in">Åpner om %s</string>
     <string name="closes_in">Stenger om %s</string>
     <string name="closed">Stengt</string>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+</resources>

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

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Night theme -->
+    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+        <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
+        <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
+        <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+        <item name="android:textColorPrimary">@color/text_light</item>
+        <item name="android:textColorPrimaryInverse">@color/text_dark</item>
+        <item name="android:textColorSecondary">@color/text_light_subtitle</item>
+        <item name="android:windowBackground">?windowBackgroundForced</item>
+        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+        <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:fontFamily">@string/robotoRegular</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="clickableBackground">?selectableItemBackground</item>
+        <item name="android:statusBarColor">?colorPrimary</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+
+        <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
+        <item name="windowBackgroundForced">@color/bg_window_night</item>
+        <item name="cardBackground">@color/bg_cards_night</item>
+        <item name="titleDialogTheme">@color/white_primary</item>
+        <item name="textDialogTheme">@color/white_secondary</item>
+        <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="colorControlNormal">?secondary</item>
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
+        <item name="colorAccentTransparent">@color/base_accent_transparent</item>
+        <item name="colorBtnHighlight">@color/white_24</item>
+        <item name="panel">@color/bg_panel_night</item>
+        <item name="colorLogo">@color/base_accent_night</item>
+        <item name="iconTint">@color/white_secondary</item>
+        <item name="iconTintDisabled">@color/white_12</item>
+        <item name="iconTintActive">@color/yellow</item>
+        <item name="iconTintLight">@color/icon_tint_light_night</item>
+
+        <item name="secondary">@color/text_light_hint</item>
+        <item name="dividerHorizontal">@color/divider_night</item>
+
+        <item name="ppBackground">@color/bg_cards_night</item>
+        <item name="ppButtonsBackground">@color/bg_window_night</item>
+        <item name="ppFloatingMarkerIconColor">@color/white_54</item>
+
+        <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
+        <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
+        <item name="navLanesBackgroundColor">@color/base_accent_night</item>
+        <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
+        <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
+
+        <item name="buttonBackground">@drawable/button_night</item>
+        <item name="buttonTextColor">@color/button_text_night</item>
+        <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
+        <item name="buttonDialogTextColor">@color/base_accent_night</item>
+
+        <item name="accentButtonBackground">@drawable/button_accent_night</item>
+        <item name="accentButtonTextColor">@color/button_accent_text_night</item>
+        <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
+                   accentButtonTextColor selector -->
+        <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
+
+        <item name="primaryButtonBackground">@drawable/button_accent_night</item>
+
+        <item name="menuBackground">@color/bg_menu_night</item>
+
+        <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
+        <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
+        <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
+
+        <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
+        <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
+        <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
+        <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
+
+        <item name="routingButtonHint">@color/routing_button_tint</item>
+
+        <item name="android:listDivider">@drawable/list_divider_night</item>
+
+        <item name="transitPedestrianBackground">@color/white_4</item>
+        <item name="transitRulerBackground">@color/white_4</item>
+        <item name="transitStepDivider">@drawable/dot_divider_night</item>
+        <item name="accentColorSelector">@color/accent_color_selector_night</item>
+        <item name="android:textAppearance">@style/TextAppearance</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+        <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+        <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+        <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+        <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+        <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+        <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+        <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+        <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+        <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+        <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+        <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+        <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+        <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+        <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
+        <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
+        <item name="elevationProfilePropIconTint">@color/white_secondary</item>
+        <item name="altitudeBg">@drawable/bg_altitude_night</item>
+        <item name="elevationProfileAxisLabelColor">@color/white_54</item>
+        <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
+        <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
+        <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
+        <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
+        <item name="elevationProfileColor">@color/elevation_profile_dark</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
+
+        <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+        <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
+    </style>
+
+    <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
+
+    <style name="MwmTheme.Night.Splash">
+        <item name="android:windowBackground">@color/bg_primary_night</item>
+        <item name="android:textColorPrimary">@color/white_primary</item>
+        <item name="android:navigationBarColor">@color/bg_primary_night</item>
+        <item name="android:statusBarColor">@color/bg_primary_night</item>
+    </style>
+
+    <!-- Theme is overridden in v27 folder to handle cutouts -->
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+    </style>
+
+    <style name="MwmTheme.Night.CardBg">
+        <item name="android:windowBackground">@color/bg_cards_night</item>
+    </style>
+
+
+    <style name="MwmTheme.Night.WindowBg">
+        <item name="android:windowBackground">@color/bg_window_night</item>
+    </style>
+
+    <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">?buttonDialogTextColor</item>
+        <item name="colorSecondary">?buttonDialogTextColor</item>
+        <item name="colorPrimary">?buttonDialogTextColor</item>
+        <item name="android:background">?cardBackground</item>
+        <!-- Used for the message in the dialog -->
+        <item name="android:textColorPrimary">?textDialogTheme</item>
+        <item name="android:textSize">@dimen/text_size_body_1</item>
+        <!-- Used for the title in the dialog -->
+        <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
+    </style>
+
+    <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
+        <item name="android:textColor">?titleDialogTheme</item>
+    </style>
+
+    <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+        <item name="android:colorPrimaryDark">?statusBar</item>
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="colorPrimaryVariant">?statusBar</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
+        <item name="clickableBackground">?selectableItemBackground</item>
+        <item name="colorControlNormal">@color/text_dark_hint</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:textColorHint">@color/text_light_hint</item>
+        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:fontFamily">@string/robotoRegular</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
+    </style>
+
+    <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
+        <item name="colorPrimary">?buttonDialogTextColor</item>
+        <item name="android:fontFamily">@string/robotoMedium</item>
+        <item name="android:windowBackground">@color/bg_cards_night</item>
+        <item name="android:background">@color/bg_cards_night</item>
+    </style>
+
+    <style name="MwmTheme.Downloader.Night">
+        <item name="status_done">@drawable/downloader_done_night</item>
+        <item name="status_downloadable">@drawable/downloader_download_night</item>
+        <item name="status_folder">@drawable/downloader_folder_night</item>
+        <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
+    </style>
+
+    <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
+        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+    </style>
+
+    <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
+        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
+    </style>
+
+    <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
+        <item name="iconTint">@color/black_primary</item>
+    </style>
+
+    <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
+        <item name="android:popupBackground">?windowBackgroundForced</item>
+    </style>
+</resources>

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

@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Bladwijzers</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
+    <string name="bookmarks_and_tracks">Bladwijzers en tracks</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Naam</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -413,6 +413,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Vandaag gesloten</string>
     <string name="day_off">Gesloten</string>
+    <string name="today">Vandaag</string>
     <string name="opens_in">Opent over %s</string>
     <string name="closes_in">Sluit over %s</string>
     <string name="closed">Gesloten</string>
@@ -886,6 +887,4 @@
     <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
     <string name="share_track">Spoor delen</string>
     <string name="delete_track_dialog_title">%s verwijderen?</string>
-    <string name="existence_confirmed_time_ago">Bestaan bevestigd %s</string>
-    <string name="hours_confirmed_time_ago">Bevestigd %s</string>
 </resources>

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

@@ -417,6 +417,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Dziś nieczynne</string>
     <string name="day_off">Nieczynne</string>
+    <string name="today">Dzisiaj</string>
     <string name="opens_in">Otwarcie za %s</string>
     <string name="closes_in">Zamknięcie za %s</string>
     <string name="closed">Zamknięte</string>

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

@@ -376,6 +376,7 @@
     <string name="twentyfour_seven">24 horas por dia</string>
     <string name="day_off_today">Fechado hoje</string>
     <string name="day_off">Fechado</string>
+    <string name="today">Hoje</string>
     <string name="opens_in">Abre em %s</string>
     <string name="closes_in">Fecha em %s</string>
     <string name="closed">Fechado</string>
@@ -767,7 +768,7 @@
     <string name="app_site_url">https://comaps.app/pt-BR/</string>
     <string name="dialog_routing_change_intermediate">Não foi possível localizar o ponto intermediário</string>
     <string name="editor_time_from">De</string>
-    <string name="how_to_support_us">Voluntarie-se e melhore o CoMaps</string>
+    <string name="how_to_support_us">Apoie o projeto</string>
     <string name="google_play_services">Serviço de localização integrada do Google</string>
     <string name="editor_time_title">Horário de funcionamento</string>
     <string name="long_tap_toast">Dê um toque longo no mapa novamente para ver a interface</string>
@@ -863,6 +864,4 @@
     <string name="osm_note_toast">A nota será enviada ao OpenStreetMap</string>
     <string name="delete_track_dialog_title">Apagar %s?</string>
     <string name="share_track">Compartilhar trilha</string>
-    <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
-    <string name="hours_confirmed_time_ago">Confirmado %s</string>
 </resources>

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

@@ -411,6 +411,7 @@
     <string name="twentyfour_seven">24 horas por dia</string>
     <string name="day_off_today">Fechado hoje</string>
     <string name="day_off">Fechado</string>
+    <string name="today">Hoje</string>
     <string name="closed">Fechado</string>
     <string name="edit_opening_hours">Editar horário de funcionamento</string>
     <string name="no_osm_account">Não tem uma conta no OpenStreetMap?</string>
@@ -879,6 +880,4 @@
     <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
     <string name="share_track">Partilhar Trajeto</string>
     <string name="delete_track_dialog_title">Apagar %s?</string>
-    <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
-    <string name="hours_confirmed_time_ago">Confirmado %s</string>
 </resources>

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

@@ -409,6 +409,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Închis astăzi</string>
     <string name="day_off">Închis</string>
+    <string name="today">Azi</string>
     <string name="opens_in">Deschide în %s</string>
     <string name="closes_in">Închide în %s</string>
     <string name="closed">Închis</string>

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

@@ -417,6 +417,7 @@
     <string name="twentyfour_seven">Круглосуточно</string>
     <string name="day_off_today">Сегодня закрыто</string>
     <string name="day_off">Закрыто</string>
+    <string name="today">Сегодня</string>
     <string name="opens_in">Открывается через %s</string>
     <string name="closes_in">Закроется через %s</string>
     <string name="closed">Закрыто</string>

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

@@ -413,6 +413,7 @@
     <string name="twentyfour_seven">Deň a noc</string>
     <string name="day_off_today">Dnes deň voľna</string>
     <string name="day_off">Zatvorené</string>
+    <string name="today">Dnes</string>
     <string name="opens_in">Otvoria o %s</string>
     <string name="closes_in">Zatvoria o %s</string>
     <string name="closed">Zatvorené</string>

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

@@ -410,6 +410,7 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Данас не ради</string>
     <string name="day_off">Затворено</string>
+    <string name="today">Данас</string>
     <string name="opens_in">Отвара се за %s</string>
     <string name="closes_in">Затвара се за %s</string>
     <string name="closed">Затворено</string>

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

@@ -402,6 +402,7 @@
     <string name="twentyfour_seven">Dygnet runt</string>
     <string name="day_off_today">Stängt idag</string>
     <string name="day_off">Stängt</string>
+    <string name="today">Idag</string>
     <string name="closed">Stängt</string>
     <string name="edit_opening_hours">Redigera öppettider</string>
     <string name="no_osm_account">Inget konto hos OpenStreetMap?</string>

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

@@ -402,6 +402,7 @@
     <string name="twentyfour_seven">ทั้งกลางวันและกลางคืน</string>
     <string name="day_off_today">วันนี้ปิด</string>
     <string name="day_off">ปิด</string>
+    <string name="today">วันนี้</string>
     <string name="closed">ปิด</string>
     <string name="edit_opening_hours">แก้ไขชั่วโมงทำการ</string>
     <string name="no_osm_account">ไม่มีบัญชีใน OpenStreetMap?</string>

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

@@ -413,6 +413,7 @@
     <string name="twentyfour_seven">7/24</string>
     <string name="day_off_today">Bugün kapalı</string>
     <string name="day_off">Kapalı</string>
+    <string name="today">Bugün</string>
     <string name="opens_in">%s sonra açılıyor</string>
     <string name="closes_in">%s sonra kapanıyor</string>
     <string name="closed">Kapalı</string>

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

@@ -417,6 +417,7 @@
     <string name="twentyfour_seven">Цілодобово</string>
     <string name="day_off_today">Сьогодні зачинено</string>
     <string name="day_off">Зачинено</string>
+    <string name="today">Сьогодні</string>
     <string name="opens_in">Відкривається через %s</string>
     <string name="closes_in">Зачиняється через %s</string>
     <string name="closed">Зачинено</string>

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

@@ -9,12 +9,4 @@
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
     <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
   </style>
-  <style name="MwmTheme.Night.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
-    <item name="colorPrimaryVariant">@android:color/black</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-    <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
-    <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-  </style>
 </resources>

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

@@ -402,6 +402,7 @@
     <string name="twentyfour_seven">ngày và đêm</string>
     <string name="day_off_today">Nghỉ hôm nay</string>
     <string name="day_off">Ngày nghỉ</string>
+    <string name="today">Hôm nay</string>
     <string name="closed">Đã đóng</string>
     <string name="edit_opening_hours">Sửa giờ làm việc</string>
     <string name="no_osm_account">Bạn chưa có tài khoản tại OpenStreetMap ư?</string>

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

@@ -423,6 +423,7 @@
     <string name="twentyfour_seven">24/7 全天候營業</string>
     <string name="day_off_today">今天不營業</string>
     <string name="day_off">不營業</string>
+    <string name="today">今天</string>
     <string name="opens_in">將於 %s 後開業</string>
     <string name="closes_in">將於 %s 後歇業</string>
     <string name="closed">已停止營業</string>

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

@@ -252,7 +252,7 @@
     <!-- Button in the main menu -->
     <string name="donate">捐助我们</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">志愿改进 CoMaps</string>
+    <string name="how_to_support_us">支持本项目</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">版权</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -423,6 +423,7 @@
     <string name="twentyfour_seven">24/7 全天候营业</string>
     <string name="day_off_today">今天不营业</string>
     <string name="day_off">不营业</string>
+    <string name="today">今天</string>
     <string name="opens_in">将于 %s 后开业</string>
     <string name="closes_in">将于 %s 后歇业</string>
     <string name="closed">已停止营业</string>
@@ -887,8 +888,4 @@
     <string name="at">%s</string>
     <string name="osm_note_hint">或者，也可以给 OpenStreetMap 社区留言，以便其他人可以在此添加或修复地点。</string>
     <string name="osm_note_toast">注释将发送至 OpenStreetMap</string>
-    <string name="existence_confirmed_time_ago">已于%s确认地点存在</string>
-    <string name="delete_track_dialog_title">是否删除%s？</string>
-    <string name="hours_confirmed_time_ago">已于%s确认</string>
-    <string name="share_track">分享轨迹</string>
 </resources>

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

@@ -28,7 +28,7 @@
   </declare-styleable>
 
   <declare-styleable name="layersButton">
-    <attr name="layers_enabled" format="boolean"/>
+    <attr name="state_layers_enabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="PlacePageView">

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

@@ -128,7 +128,7 @@
   <color name="bg_editor_light">#FFF2F6F6</color>
   <color name="bg_editor_light_pressed">#3D000000</color>
 
-  <color name="notification">@color/base_accent</color>
+  <color name="notification">@color/bg_primary</color>
   <color name="yellow">#FFC800</color>
 
   <color name="elevation_profile_dot_enabled">#FF9600</color>

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

@@ -462,13 +462,10 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Closed today</string>
     <string name="day_off">Closed</string>
+    <string name="today">Today</string>
     <string name="opens_in">Opens in %s</string>
     <string name="closes_in">Closes in %s</string>
     <string name="closed">Closed</string>
-    <!-- Used in the opening_hours fragment for the last checked date, eg. "Confirmed two weeks ago" -->
-    <string name="hours_confirmed_time_ago">Confirmed %s</string>
-    <!-- Used on the place page for the last checked date, eg. "Existence confirmed two weeks ago" -->
-    <string name="existence_confirmed_time_ago">Existence confirmed %s</string>
     <string name="edit_opening_hours">Edit business hours</string>
     <string name="no_osm_account">Don\'t have an OpenStreetMap account?</string>
     <string name="register_at_openstreetmap">Register at OpenStreetMap</string>

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

@@ -379,11 +379,4 @@
     <item name="android:textAllCaps">false</item>
   </style>
 
-  <style name="MwmWidget.Preference">
-    <item name="switchPreferenceCompatStyle">@style/MwmWidget.SwitchPreferenceCompat</item>
-  </style>
-
-  <style name="MwmWidget.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
-    <item name="android:widgetLayout">@layout/preference_switch</item>
-  </style>
 </resources>

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

@@ -134,128 +134,7 @@
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
   </style>
 
-    <!-- Night theme -->
-    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-      <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-      <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
-      <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
-      <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-      <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-      <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
-      <item name="android:textColorPrimary">@color/text_light</item>
-      <item name="android:textColorPrimaryInverse">@color/text_dark</item>
-      <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-      <item name="android:windowBackground">?windowBackgroundForced</item>
-      <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
-      <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
-      <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-      <item name="android:fontFamily">@string/robotoRegular</item>
-      <item name="android:colorBackgroundCacheHint">@null</item>
-      <item name="android:windowActionBarOverlay">true</item>
-      <item name="clickableBackground">?selectableItemBackground</item>
-      <item name="android:statusBarColor">?colorPrimary</item>
-      <item name="android:windowTranslucentNavigation">false</item>
-
-      <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
-      <item name="windowBackgroundForced">@color/bg_window_night</item>
-      <item name="cardBackground">@color/bg_cards_night</item>
-      <item name="titleDialogTheme">@color/white_primary</item>
-      <item name="textDialogTheme">@color/white_secondary</item>
-      <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
-      <item name="colorPrimary">@color/bg_primary_night</item>
-      <item name="colorControlNormal">?secondary</item>
-      <item name="colorAccent">@color/base_accent_night</item>
-      <item name="colorSecondary">@color/base_accent_night</item>
-      <item name="colorAccentTransparent">@color/base_accent_transparent</item>
-      <item name="colorBtnHighlight">@color/white_24</item>
-      <item name="panel">@color/bg_panel_night</item>
-      <item name="colorLogo">@color/base_accent_night</item>
-      <item name="iconTint">@color/white_secondary</item>
-      <item name="iconTintDisabled">@color/white_12</item>
-      <item name="iconTintActive">@color/yellow</item>
-      <item name="iconTintLight">@color/icon_tint_light_night</item>
-
-      <item name="secondary">@color/text_light_hint</item>
-      <item name="dividerHorizontal">@color/divider_night</item>
-
-      <item name="ppBackground">@color/bg_cards_night</item>
-      <item name="ppButtonsBackground">@color/bg_window_night</item>
-      <item name="ppFloatingMarkerIconColor">@color/white_54</item>
-
-      <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
-      <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
-      <item name="navLanesBackgroundColor">@color/base_accent_night</item>
-      <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
-      <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
-
-      <item name="buttonBackground">@drawable/button_night</item>
-      <item name="buttonTextColor">@color/button_text_night</item>
-      <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
-      <item name="buttonDialogTextColor">@color/base_accent_night</item>
-
-      <item name="accentButtonBackground">@drawable/button_accent_night</item>
-      <item name="accentButtonTextColor">@color/button_accent_text_night</item>
-      <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
-                 accentButtonTextColor selector -->
-      <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
-
-      <item name="primaryButtonBackground">@drawable/button_accent_night</item>
-
-      <item name="menuBackground">@color/bg_menu_night</item>
-
-      <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
-      <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-      <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
-
-      <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
-      <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
-      <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
-      <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
-
-      <item name="routingButtonHint">@color/routing_button_tint</item>
-
-      <item name="android:listDivider">@drawable/list_divider_night</item>
-
-      <item name="transitPedestrianBackground">@color/white_4</item>
-      <item name="transitRulerBackground">@color/white_4</item>
-      <item name="transitStepDivider">@drawable/dot_divider_night</item>
-      <item name="accentColorSelector">@color/accent_color_selector_night</item>
-      <item name="android:textAppearance">@style/TextAppearance</item>
-      <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-      <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-      <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-      <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-      <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-      <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-      <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
-      <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-      <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-      <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-      <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-      <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-      <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-      <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-      <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-      <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
-      <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
-      <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
-      <item name="elevationProfilePropIconTint">@color/white_secondary</item>
-      <item name="altitudeBg">@drawable/bg_altitude_night</item>
-      <item name="elevationProfileAxisLabelColor">@color/white_54</item>
-      <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
-      <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
-      <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
-      <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
-      <item name="elevationProfileColor">@color/elevation_profile_dark</item>
-      <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
-
-      <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
-      <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
-    </style>
-
   <style name="MwmTheme" parent="MwmTheme.Base"/>
-  <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
 
   <style name="MwmTheme.Splash">
     <item name="android:windowBackground">@color/bg_primary</item>
@@ -264,13 +143,6 @@
     <item name="android:statusBarColor">@color/bg_primary</item>
   </style>
 
-  <style name="MwmTheme.Night.Splash">
-    <item name="android:windowBackground">@color/bg_primary_night</item>
-    <item name="android:textColorPrimary">@color/white_primary</item>
-    <item name="android:navigationBarColor">@color/bg_primary_night</item>
-    <item name="android:statusBarColor">@color/bg_primary_night</item>
-  </style>
-
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
@@ -279,14 +151,6 @@
     <item name="android:windowTranslucentNavigation">false</item>
   </style>
 
-  <!-- Theme is overridden in v27 folder to handle cutouts -->
-  <style name="MwmTheme.Night.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
-    <item name="colorPrimaryVariant">@android:color/black</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowTranslucentNavigation">false</item>
-  </style>
-
   <style name="MwmTheme.DownloadResourcesLegacy">
     <item name="android:statusBarColor">@android:color/white</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -296,18 +160,10 @@
     <item name="android:windowBackground">@color/bg_cards</item>
   </style>
 
-  <style name="MwmTheme.Night.CardBg">
-    <item name="android:windowBackground">@color/bg_cards_night</item>
-  </style>
-
   <style name="MwmTheme.WindowBg">
     <item name="android:windowBackground">@color/bg_window</item>
   </style>
 
-  <style name="MwmTheme.Night.WindowBg">
-    <item name="android:windowBackground">@color/bg_window_night</item>
-  </style>
-
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
     <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
@@ -318,18 +174,6 @@
     <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Light</item>
   </style>
 
-  <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-    <item name="colorAccent">?buttonDialogTextColor</item>
-    <item name="colorSecondary">?buttonDialogTextColor</item>
-    <item name="colorPrimary">?buttonDialogTextColor</item>
-    <item name="android:background">?cardBackground</item>
-    <!-- Used for the message in the dialog -->
-    <item name="android:textColorPrimary">?textDialogTheme</item>
-    <item name="android:textSize">@dimen/text_size_body_1</item>
-    <!-- Used for the title in the dialog -->
-    <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
-  </style>
-
   <style name="MwmTheme.DialogTitleBase">
     <item name="android:textSize">@dimen/text_size_alert_dialog_title</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
@@ -339,10 +183,6 @@
     <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
-  <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
-    <item name="android:textColor">?titleDialogTheme</item>
-  </style>
-
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
     <item name="android:colorPrimaryDark">?statusBar</item>
     <item name="colorAccent">@color/base_accent</item>
@@ -360,33 +200,11 @@
     <item name="android:statusBarColor">@android:color/transparent</item>
   </style>
 
-  <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
-    <item name="android:colorPrimaryDark">?statusBar</item>
-    <item name="colorAccent">@color/base_accent_night</item>
-    <item name="colorPrimary">@color/bg_primary_night</item>
-    <item name="colorPrimaryVariant">?statusBar</item>
-    <item name="colorSecondary">@color/base_accent_night</item>
-    <item name="clickableBackground">?selectableItemBackground</item>
-    <item name="colorControlNormal">@color/text_dark_hint</item>
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:textColorHint">@color/text_light_hint</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
-    <item name="android:windowTranslucentStatus">true</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-  </style>
-
   <style name="MwmTheme.DialogFragment.NoFullscreen" parent="MwmTheme.DialogFragment.Fullscreen">
     <item name="android:windowTranslucentStatus">false</item>
     <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
   </style>
 
-  <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
-    <item name="android:windowTranslucentStatus">false</item>
-    <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
-  </style>
-
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
@@ -404,15 +222,6 @@
     <item name="android:background">@color/bg_cards</item>
   </style>
 
-  <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-    <item name="colorAccent">@color/base_accent_night</item>
-    <item name="colorSecondary">@color/base_accent_night</item>
-    <item name="colorPrimary">?buttonDialogTextColor</item>
-    <item name="android:fontFamily">@string/robotoMedium</item>
-    <item name="android:windowBackground">@color/bg_cards_night</item>
-    <item name="android:background">@color/bg_cards_night</item>
-  </style>
-
   <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
   </style>
@@ -426,43 +235,19 @@
     <item name="status_folder_done">@drawable/downloader_folder_done</item>
   </style>
 
-  <style name="MwmTheme.Downloader.Night">
-    <item name="status_done">@drawable/downloader_done_night</item>
-    <item name="status_downloadable">@drawable/downloader_download_night</item>
-    <item name="status_folder">@drawable/downloader_folder_night</item>
-    <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
-  </style>
-
   <style name="MwmTheme.NavButtonsRound">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round</item>
   </style>
 
-  <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
-    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
-  </style>
-
   <style name="MwmTheme.NavButtonsRect">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect</item>
   </style>
 
-  <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
-    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
-  </style>
-
-
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
 
-  <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
-    <item name="iconTint">@color/black_primary</item>
-  </style>
-
   <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
-
-  <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
-    <item name="android:popupBackground">?windowBackgroundForced</item>
-  </style>
 </resources>

android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java

@@ -68,9 +68,7 @@ public class Metadata implements Parcelable
     FMD_NETWORK(49),
     FMD_CONTACT_FEDIVERSE(50),
     FMD_CONTACT_BLUESKY(51),
-    FMD_PANORAMAX(52),
-    FMD_CHECK_DATE(53),
-    FMD_CHECK_DATE_OPEN_HOURS(54);
+    FMD_PANORAMAX(52);
     private final int mMetaType;
 
     MetadataType(int metadataType)

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java

@@ -21,6 +21,7 @@ import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
@@ -29,8 +30,10 @@ import org.chromium.base.ObserverList;
 
 public class LocationHelper implements BaseLocationProvider.Listener
 {
-  private static final long INTERVAL_MS = 500;
-  private static final long INTERVAL_TRACK_RECORDING = 1000;
+  private static final long INTERVAL_FOLLOW_MS = 0;
+  private static final long INTERVAL_NOT_FOLLOW_MS = 3000;
+  private static final long INTERVAL_NAVIGATION_MS = 1000;
+  private static final long INTERVAL_TRACK_RECORDING = 0;
 
   private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours
   private static final long LOCATION_UPDATE_TIMEOUT_MS = 30 * 1000; // 30 seconds
@@ -308,10 +311,19 @@ public class LocationHelper implements BaseLocationProvider.Listener
 
   private long calcLocationUpdatesInterval()
   {
+    if (RoutingController.get().isNavigating())
+      return INTERVAL_NAVIGATION_MS;
+
     if (TrackRecorder.nativeIsTrackRecordingEnabled())
       return INTERVAL_TRACK_RECORDING;
 
-    return INTERVAL_MS;
+    final int mode = Map.isEngineCreated() ? LocationState.getMode() : LocationState.NOT_FOLLOW_NO_POSITION;
+    return switch (mode)
+    {
+      case LocationState.PENDING_POSITION, LocationState.FOLLOW, LocationState.FOLLOW_AND_ROTATE -> INTERVAL_FOLLOW_MS;
+      case LocationState.NOT_FOLLOW, LocationState.NOT_FOLLOW_NO_POSITION -> INTERVAL_NOT_FOLLOW_MS;
+      default -> throw new IllegalArgumentException("Unsupported location mode: " + mode);
+    };
   }
 
   /**

android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java

@@ -1,17 +1,11 @@
 package app.organicmaps.sdk.util;
 
 import android.content.Context;
-import android.content.res.Resources;
-
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import java.text.DateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
-import app.organicmaps.sdk.R;
-
 public final class DateUtils
 {
   private DateUtils() {}
@@ -29,29 +23,4 @@ public final class DateUtils
   {
     return android.text.format.DateFormat.is24HourFormat(context);
   }
-
-  /***
-   * @param dateString Date string in the yyyy-MM-dd format
-   * @return Human-readable string of the time that's passed since the date
-   */
-  public static String getRelativePeriodString(Resources resources, String dateString)
-  {
-    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-    int days = (int) (LocalDate.now().toEpochDay() - LocalDate.parse(dateString, formatter).toEpochDay());
-
-    if (days == 0)
-      return resources.getString(R.string.today).toLowerCase();
-    if (days == 1)
-      return resources.getString(R.string.yesterday).toLowerCase();
-    if (days < 7)
-      return  resources.getString(R.string.days_ago, Integer.toString(days));
-    if (days < 30)
-      return resources.getString(days < 14 ? R.string.week_ago : R.string.weeks_ago, Integer.toString(days / 7));
-    if (days < 365)
-      return resources.getString(days < 60 ? R.string.month_ago : R.string.months_ago, Integer.toString(days / 30));
-    if (days > 365)
-      return resources.getString(days < 730 ? R.string.year_ago : R.string.years_ago, Integer.toString(days / 365));
-    else
-      return "";
-  }
 }

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

@@ -36,5 +36,4 @@
     <string name="limited_access">Beperkte toegang</string>
     <string name="not_shared">Privaat</string>
     <string name="access_rules_author_only">Aanlyn wysiging</string>
-    <string name="today">Vandag</string>
 </resources>

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

@@ -36,5 +36,4 @@
     <string name="limited_access">مسموح الوصول بشكل محدود</string>
     <string name="not_shared">خاص</string>
     <string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
-    <string name="today">اليوم</string>
 </resources>

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

@@ -9,5 +9,4 @@
     <string name="km">km</string>
     <string name="gb">GB</string>
     <string name="m">m</string>
-    <string name="today">Güei</string>
 </resources>

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

@@ -35,5 +35,4 @@
     <string name="limited_access">Məhdud giriş</string>
     <string name="not_shared">Gizli</string>
     <string name="access_rules_author_only">Onlayn redaktə</string>
-    <string name="today">Bu gün</string>
 </resources>

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

@@ -36,5 +36,4 @@
     <string name="limited_access">Абмежаваны доступ</string>
     <string name="not_shared">Прыватны</string>
     <string name="access_rules_author_only">Рэдагаванне анлайн</string>
-    <string name="today">Сёння</string>
 </resources>

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

@@ -31,5 +31,4 @@
     <string name="maps_storage_removable">Карта памет</string>
     <string name="maps_storage_external">Външно споделено хранилище</string>
     <string name="maps_storage_shared">Вътрешно споделено хранилище</string>
-    <string name="today">Днес</string>
 </resources>

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

@@ -10,5 +10,4 @@
     <string name="category_wifi">ওয়াইফাই</string>
     <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
     <string name="postal_code">ডাক কোড</string>
-    <string name="today">আজকে</string>
 </resources>

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

@@ -7,7 +7,7 @@
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
     <string name="maps_storage_internal">Emmagatzematge privat intern</string>
     <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Emmagatzematge intern compartit</string>
+    <string name="maps_storage_shared">Emmagatzematge compartit intern</string>
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">Targeta SD</string>
     <!-- Generic external storage type in Maps Storage settings -->
@@ -35,13 +35,4 @@
     <string name="access_rules_author_only">Edició en línia</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
-    <string name="today">Avui</string>
-    <string name="days_ago">Fa %s dies</string>
-    <string name="week_ago">Fa %s setmana</string>
-    <string name="month_ago">Fa %s mes</string>
-    <string name="months_ago">Fa %s mesos</string>
-    <string name="year_ago">Fa %s any</string>
-    <string name="years_ago">Fa %s anys</string>
-    <string name="yesterday">Ahir</string>
-    <string name="weeks_ago">Fa %s setmanes</string>
 </resources>

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

@@ -31,5 +31,4 @@
     <string name="maps_storage_shared">Interní sdílené úložiště</string>
     <string name="maps_storage_internal">Interní soukromé úložiště</string>
     <string name="maps_storage_external">Externí sdílené úložiště</string>
-    <string name="today">Dnes</string>
 </resources>

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

@@ -18,5 +18,4 @@
     <string name="public_access">Mynediad cyhoeddus</string>
     <string name="limited_access">Mynediad cyfyngedig</string>
     <string name="access_rules_author_only">Golygu ar-lein</string>
-    <string name="today">Heddiw</string>
 </resources>

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

@@ -31,5 +31,4 @@
     <string name="maps_storage_shared">Intern delt lagerplads</string>
     <string name="maps_storage_removable">SD-kort</string>
     <string name="maps_storage_external">Ekstern delt lagerplads</string>
-    <string name="today">I dag</string>
 </resources>

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

@@ -35,13 +35,4 @@
     <string name="access_rules_author_only">Online bearbeiten</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
-    <string name="today">Heute</string>
-    <string name="days_ago">vor %s Tagen</string>
-    <string name="week_ago">vor %s Woche</string>
-    <string name="yesterday">Gestern</string>
-    <string name="weeks_ago">vor %s Wochen</string>
-    <string name="month_ago">vor %s Monat</string>
-    <string name="months_ago">vor %s Monaten</string>
-    <string name="year_ago">vor %s Jahr</string>
-    <string name="years_ago">vor %s Jahren</string>
 </resources>

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

@@ -697,7 +697,7 @@
     <string name="type.natural.water.lake">See</string>
     <string name="type.natural.water.lock">Schleusenkammer</string>
     <string name="type.natural.water.pond">Teich</string>
-    <string name="type.natural.water.reservoir">Stausee</string>
+    <string name="type.natural.water.reservoir">Reservoir</string>
     <string name="type.natural.water.basin">Wasserbecken</string>
     <string name="type.natural.water.river">Fluss</string>
     <string name="type.natural.land">Land</string>
@@ -1222,7 +1222,7 @@
     <string name="type.sport.tennis">Tennisplatz</string>
     <string name="type.sport.volleyball">Volleyball</string>
     <string name="type.sport.10pin">Bowling</string>
-    <string name="type.sport.9pin">Kegeln</string>
+    <string name="type.sport.9pin">Bowling</string>
     <string name="type.sport.padel">Padel</string>
     <string name="type.sport.futsal">Futsal</string>
     <string name="type.sport.ice_hockey">Eishockey</string>
@@ -1267,7 +1267,7 @@
     <string name="type.tourism.motel">Motel</string>
     <string name="type.tourism.museum">Museum</string>
     <string name="type.tourism.picnic_site">Picknickplatz</string>
-    <string name="type.leisure.resort">Freizeitanlage</string>
+    <string name="type.leisure.resort">Resort</string>
     <string name="type.tourism.theme_park">Freizeitpark</string>
     <string name="type.tourism.viewpoint">Aussichtspunkt</string>
     <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
@@ -1355,7 +1355,7 @@
     <string name="type.building.garage">Garage</string>
     <string name="type.cuisine.fish_and_chips">Fisch und Chips</string>
     <string name="type.leisure.beach_resort">Badestrand</string>
-    <string name="type.amenity.food_court">Gastronomiebereich</string>
+    <string name="type.amenity.food_court">Food Court</string>
     <string name="type.fee.yes">$</string>
     <string name="type.man_made.utility_pole">Versorgungsmast</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>

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

@@ -34,5 +34,4 @@
     <string name="access_rules_author_only">Online επεξεργασία</string>
     <string name="mb">MB</string>
     <string name="mi">μι</string>
-    <string name="today">Σήμερα</string>
 </resources>

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

@@ -35,13 +35,4 @@
     <string name="access_rules_author_only">Edición en línea</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
-    <string name="today">Hoy</string>
-    <string name="yesterday">Ayer</string>
-    <string name="days_ago">Hace %s días</string>
-    <string name="week_ago">Hace %s semana</string>
-    <string name="weeks_ago">Hace %s semanas</string>
-    <string name="month_ago">Hace %s mes</string>
-    <string name="months_ago">Hace %s meses</string>
-    <string name="year_ago">Hace %s año</string>
-    <string name="years_ago">Hace %s años</string>
 </resources>

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

@@ -600,7 +600,7 @@
     <string name="type.landuse.education">Instalaciones educativas</string>
     <string name="type.landuse.farmland">Tierras agrícolas</string>
     <string name="type.landuse.farmyard">Granja</string>
-    <string name="type.landuse.flowerbed">Parterre</string>
+    <string name="type.landuse.flowerbed">Cama de flores</string>
     <string name="type.landuse.forest">Bosque</string>
     <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
     <string name="type.landuse.forest.deciduous">Bosque caducifolio</string>
@@ -1392,5 +1392,4 @@
     <string name="type.natural.wetland.reedbed">Juncal</string>
     <string name="type.railway.station.subway.qingdao">Estación de Metro</string>
     <string name="type.leisure.escape_game">Sala de Escape</string>
-    <string name="type.amenity.animal_shelter">Refugio de animales</string>
 </resources>

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

@@ -35,13 +35,4 @@
     <string name="access_rules_author_only">Võrgupõhine muutmine</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
-    <string name="today">Täna</string>
-    <string name="days_ago">%s päeva tagasi</string>
-    <string name="month_ago">%s kuu eest</string>
-    <string name="months_ago">%s kuud tagasi</string>
-    <string name="year_ago">%s aasta eest</string>
-    <string name="years_ago">%s aastat tagasi</string>
-    <string name="yesterday">Eile</string>
-    <string name="week_ago">%s nädala eest</string>
-    <string name="weeks_ago">%s nädalat tagasi</string>
 </resources>

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

@@ -296,10 +296,10 @@
     <string name="type.cuisine.georgian">Gruusia</string>
     <string name="type.cuisine.german">Saksa</string>
     <string name="type.cuisine.greek">Kreeka</string>
-    <string name="type.cuisine.grill">Grillroad</string>
+    <string name="type.cuisine.grill">Grill</string>
     <string name="type.cuisine.heuriger">Austria hooajaline veinikõrts (heuriger)</string>
     <string name="type.cuisine.hotdog">Viinersai</string>
-    <string name="type.cuisine.hungarian">Ungari köök</string>
+    <string name="type.cuisine.hungarian">Ungari</string>
     <string name="type.cuisine.ice_cream">Jäätis</string>
     <string name="type.cuisine.indian">India</string>
     <string name="type.cuisine.indonesian">Indoneesia</string>
@@ -321,7 +321,7 @@
     <string name="type.cuisine.noodles">Nuudliroad</string>
     <string name="type.cuisine.oriental">Kaug-Ida</string>
     <string name="type.cuisine.pancake">Pannkoogid</string>
-    <string name="type.cuisine.pasta">Pastaroad</string>
+    <string name="type.cuisine.pasta">Pasta</string>
     <string name="type.cuisine.persian">Pärsia</string>
     <string name="type.cuisine.peruvian">Peruu köök</string>
     <string name="type.cuisine.pizza">Pitsa</string>

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

@@ -35,5 +35,4 @@
     <string name="access_rules_author_only">Sarean editatzen</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
-    <string name="today">Gaur</string>
 </resources>

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

@@ -28,5 +28,4 @@
     <string name="limited_access">دسترسی محدود</string>
     <string name="not_shared">خصوصی</string>
     <string name="access_rules_author_only">ویرایش آنلاین</string>
-    <string name="today">امروز</string>
 </resources>