[android] Fix collor selector issue

Signed-off-by: Andrei Shkrob <github@shkrob.dev>

.forgejo/workflows/appstream-check.yaml

@@ -3,8 +3,8 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.comaps.desktop.metainfo.xml
-      - .forgejo/workflows/appstream-check.yaml  # Run check on self change
+      - packaging/app.comaps.comaps.metainfo.xml
+      - .forgejo/workflows/appstream-check.yaml # Run check on self change
 
 jobs:
   validate-appstream:
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 1
           sparse-checkout: |
-            packaging/app.comaps.desktop.metainfo.xml
+            packaging/app.comaps.comaps.metainfo.xml
 
       - name: Install appstream validator and flatpak Builder
         shell: bash
@@ -29,8 +29,8 @@ jobs:
 
       - name: Lint appstream data with flatpak Builder
         shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.desktop.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
 
       - name: Run appstreamcli in pedantic mode
         shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.desktop.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml

.forgejo/workflows/desktop-file-check.yaml

@@ -3,8 +3,8 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.comaps.desktop.desktop
-      - .forgejo/workflows/desktop-file-check.yaml  # Run check on self change
+      - qt/res/app.comaps.comaps.desktop
+      - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
 
 jobs:
   validate-desktop-file:
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.comaps.desktop.desktop
+            qt/res/app.comaps.comaps.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.comaps.desktop.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"

.gitignore

@@ -14,12 +14,10 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/styles/*/*/out/*
-data/resources-*_design/*
+data/symbols/*/design/
 # symbols png/sdf are now generated at build
-data/resources-*_*/symbols.png
-data/resources-*_*/symbols.sdf
-data/drules_proto_default_design.bin
+data/symbols/**/symbols.png
+data/symbols/**/symbols.sdf
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
@@ -28,6 +26,12 @@ data/World.mwm
 data/WorldCoasts.mwm
 data/world_mwm/*
 data/*_hash
+data/drules_proto*
+data/classificator.txt
+data/types.txt
+data/visibility.txt
+data/colors.txt
+data/patterns.txt
 
 # Compiled Python
 *.pyc
@@ -48,8 +52,7 @@ omim.sdf
 *.rc
 !qt/res/windows.rc
 *.pdb
-out/*
-qt/mapswithme.log
+out/
 
 # XCode
 xcode/keys/*

INSTALL.md

@@ -1 +1 @@
-See [docs/INSTALL.md](docs/INSTALL.md)
+See [docs/INSTALL.md](docs/INSTALL.md) 

README.md

@@ -125,10 +125,8 @@ You can help by donating, contributing code, translating, or by telling others a
 
 - Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
 - Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
-> [!NOTE]  
-> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!
 
-There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)
+There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
 
 ---
 

android/app/src/fdroid/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
+Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté

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

@@ -0,0 +1 @@
+Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével

android/app/src/fdroid/play/listings/pt-PT/short-description.txt

@@ -0,0 +1 @@
+Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos

android/app/src/fdroid/play/listings/pt-PT/title.txt

@@ -0,0 +1 @@
+CoMaps - Mapas e Navegação - Offline e Privada

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

@@ -1 +1 @@
-Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
+Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté

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

@@ -0,0 +1 @@
+Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével

android/app/src/google/play/listings/hu-HU/title.txt

@@ -0,0 +1 @@
+CoMaps - Az adatvédő navigáció

android/app/src/google/play/listings/ml-IN/title.txt

@@ -0,0 +1 @@
+കോമാപ്പ്സ് - സ്വകാര്യതയോടെ സഞ്ചരിക്കൂ

android/app/src/google/play/listings/pl-PL/title.txt

@@ -0,0 +1 @@
+CoMaps - Nawigacja szanująca prywatność

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

@@ -7,12 +7,12 @@ Topluluğa katılın ve en iyi harita uygulamasını oluşturmamıza yardım edi
 
 <i>Geri bildirimleriniz ve 5 yıldızlı yorumlarınız bizim için en iyi destektir!</i>
 
-‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit, işe yarayan özellikler.
-‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası . Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
+‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit ve işe yarayan özellikler.
+‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası. Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
 ‣ <b>Gizliliğe Saygılı</b>: Uygulama gizliliğe saygılı olarak tasarlanmıştır. Kullanıcı profilinizi çıkarmaz, sizi takip etmez ve kişisel bilgi toplamaz. Üstelik tamamen reklamsızdır.
-‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Compact maps değerli depolama alanınızdan tasarruf eder.
-‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
-‣ <b>Açık ve Şeffaf Şekilde Yürütülen Karar Alma ve Fonlama Süreçleri, Kâr Amacı Gütmez ve Tamamen Açık Kaynaklı.</b>
+‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Kompakt harita dosyaları, değerli depolama alanınızdan tasarruf eder.
+‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak bu uygulamanın oluşturulmasına yardımcı oldular.
+‣ <b>Açık ve Şeffaf Bir Şekilde Yürütülen Karar Alma ve Fonlama Süreçlerine Sahip, Kâr Amacı Gütmeyen ve Tamamen Açık Kaynaklı Bir Uygulama.</b>
 
 <b>Ana Özellikler</b>:
 • Google Haritalar'da bulunmayan yerleri içeren, çevrimdışı detaylı haritalar

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

@@ -6,7 +6,6 @@ import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
-import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_MAP_LAYER_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW;
@@ -945,42 +944,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
         drawIcon(left);
       }
     });
-
-    buttonsHolder.registerButton(new LeftToggleButton() {
-      //TODO: hide layers button
-      private boolean isLayerActive = false; //TODO: hook up
-
-      @Override
-      public void setChecked(boolean checked)
-      {
-        isLayerActive = checked;
-      }
-
-      @Override
-      public String getCode()
-      {
-        return BUTTON_MAP_LAYER_CODE;
-      }
-
-      @Override
-      public String getPrefsName()
-      {
-        return getString(R.string.layers_title);
-      }
-
-      @Override
-      public void drawIcon(FloatingActionButton imageView)
-      {
-        imageView.setImageResource(isLayerActive ? R.drawable.ic_layers : R.drawable.ic_layers_clear);
-      }
-
-      @Override
-      public void onClick(FloatingActionButton left)
-      {
-        toggleMapLayerBottomSheet();
-        drawIcon(left);
-      }
-    });
   }
 
   private void initNavigationButtons(MapButtonsController.LayoutMode layoutMode)

android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java

@@ -35,6 +35,7 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
 import app.organicmaps.sdk.bookmarks.data.CategoryDataSource;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.bookmarks.data.KmlFileType;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.SortedBlock;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.search.BookmarkSearchListener;
@@ -592,7 +593,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     if (mTrack == null)
       return;
     final Bundle args = new Bundle();
-    args.putInt(BookmarkColorDialogFragment.ICON_TYPE, Icon.getColorPosition(mTrack.getColor()));
+    args.putInt(BookmarkColorDialogFragment.ICON_TYPE, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
     final FragmentManager manager = getChildFragmentManager();
     String className = BookmarkColorDialogFragment.class.getName();
     final FragmentFactory factory = manager.getFragmentFactory();
@@ -601,7 +602,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     dialogFragment.setArguments(args);
     dialogFragment.setOnColorSetListener((colorPos) -> {
       int from = mTrack.getColor();
-      int to = BookmarkManager.ICONS.get(colorPos).argb();
+      int to = PredefinedColors.getColor(colorPos);
       if (from == to)
         return;
       BookmarkManager.INSTANCE.changeTrackColor(mTrack.getTrackId(), to);

android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java

@@ -7,16 +7,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import app.organicmaps.R;
-import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.util.Graphics;
 import com.google.android.material.imageview.ShapeableImageView;
 import java.util.List;
+import java.util.Objects;
 
-public class IconsAdapter extends ArrayAdapter<Icon>
+public class ColorsAdapter extends ArrayAdapter<Integer>
 {
+  @PredefinedColors.Color
   private int mCheckedIconColor;
 
-  public IconsAdapter(Context context, List<Icon> list)
+  public ColorsAdapter(Context context, List<Integer> list)
   {
     super(context, 0, 0, list);
   }
@@ -35,19 +37,20 @@ public class IconsAdapter extends ArrayAdapter<Icon>
     else
       holder = (SpinnerViewHolder) convertView.getTag();
 
-    final Icon icon = getItem(position);
+    @PredefinedColors.Color
+    final int color = Objects.requireNonNull(getItem(position));
 
     Drawable circle;
-    if (icon.getColor() == mCheckedIconColor)
+    if (color == mCheckedIconColor)
     {
-      circle = Graphics.drawCircleAndImage(getItem(position).argb(), R.dimen.track_circle_size,
+      circle = Graphics.drawCircleAndImage(PredefinedColors.getColor(mCheckedIconColor), R.dimen.track_circle_size,
                                            app.organicmaps.sdk.R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size,
                                            getContext());
     }
     else
     {
-      circle =
-          Graphics.drawCircle(getItem(position).argb(), R.dimen.select_color_circle_size, getContext().getResources());
+      circle = Graphics.drawCircle(PredefinedColors.getColor(color), R.dimen.select_color_circle_size,
+                                   getContext().getResources());
     }
     holder.icon.setImageDrawable(circle);
     return convertView;

android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java

@@ -19,7 +19,6 @@ public class LeftButtonsHolder
   public static final String BUTTON_SETTINGS_CODE = "settings";
   public static final String BUTTON_ADD_PLACE_CODE = "add-place";
   public static final String BUTTON_RECORD_TRACK_CODE = "record-track";
-  public static final String BUTTON_MAP_LAYER_CODE = "map-layer";
   private static final String DEFAULT_BUTTON_CODE = BUTTON_HELP_CODE;
 
   private final String leftButtonPreferenceKey;

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

@@ -9,7 +9,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import app.organicmaps.R;
@@ -19,6 +18,7 @@ import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -93,9 +93,9 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
   {
     @SuppressLint("InflateParams")
     final View countryView = View.inflate(requireActivity(), R.layout.dialog_missed_map, null);
-    ((TextView) countryView.findViewById(R.id.tv__title)).setText(map.name);
+    ((MaterialTextView) countryView.findViewById(R.id.tv__title)).setText(map.name);
 
-    final TextView szView = countryView.findViewById(R.id.tv__size);
+    final MaterialTextView szView = countryView.findViewById(R.id.tv__size);
     szView.setText(StringUtils.getFileSizeString(requireContext(), map.totalSize));
     ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) szView.getLayoutParams();
     lp.rightMargin = 0;

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

@@ -8,11 +8,11 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
@@ -232,16 +232,16 @@ public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.
     public final View mItemView;
 
     @NonNull
-    public final ImageView mImageViewIcon;
+    public final ShapeableImageView mImageViewIcon;
 
     @NonNull
-    public final TextView mTextViewTitle;
+    public final MaterialTextView mTextViewTitle;
 
     @NonNull
-    public final TextView mTextViewSubtitle;
+    public final MaterialTextView mTextViewSubtitle;
 
     @NonNull
-    public final ImageView mImageViewDelete;
+    public final ShapeableImageView mImageViewDelete;
 
     ManageRouteViewHolder(@NonNull View itemView)
     {

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

@@ -4,7 +4,6 @@ import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -28,20 +27,22 @@ import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
 import app.organicmaps.widget.menu.NavMenu;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
 
 public class NavigationController implements TrafficManager.TrafficCallback, NavMenu.NavMenuListener
 {
   private final View mFrame;
 
   private final ImageView mNextTurnImage;
-  private final TextView mNextTurnDistance;
-  private final TextView mCircleExit;
+  private final MaterialTextView mNextTurnDistance;
+  private final MaterialTextView mCircleExit;
 
   private final View mNextNextTurnFrame;
   private final ImageView mNextNextTurnImage;
 
   private final View mStreetFrame;
-  private final TextView mNextStreet;
+  private final MaterialTextView mNextStreet;
 
   @NonNull
   private final LanesView mLanesView;

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

@@ -60,7 +60,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
   @NonNull
   private final View mTransitFrame;
   @NonNull
-  private final TextView mError;
+  private final MaterialTextView mError;
   @NonNull
   private final Button mStart;
   @NonNull
@@ -94,7 +94,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     View altitudeChartFrame = getViewById(activity, frame, R.id.altitude_chart_panel);
     View timeElevationLine = getViewById(activity, frame, R.id.time_elevation_line);
     View transitFrame = getViewById(activity, frame, R.id.transit_panel);
-    TextView error = (TextView) getViewById(activity, frame, R.id.error);
+    MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
     Button start = (Button) getViewById(activity, frame, R.id.start);
     ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
     MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
@@ -117,7 +117,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
   private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                       @NonNull View timeElevationLine, @NonNull View transitFrame,
-                                      @NonNull TextView error, @NonNull Button start, @NonNull ImageView altitudeChart,
+                                      @NonNull MaterialTextView error, @NonNull Button start, @NonNull ImageView altitudeChart,
                                       @NonNull MaterialTextView time, @NonNull MaterialTextView altitudeDifference,
                                       @NonNull TextView timeVehicle, @Nullable MaterialTextView arrival,
                                       @NonNull View actionFrame, @Nullable RoutingBottomMenuListener listener)
@@ -223,7 +223,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     else
       UiUtils.hide(rv); // Show only distance between start and finish
 
-    TextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
+    MaterialTextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
     totalTimeView.setText(mContext.getString(R.string.placepage_distance) + ": " + totalLength.mDistanceStr + " "
                           + totalLength.getUnitsStr(mContext));
 

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

@@ -8,12 +8,12 @@ import android.text.TextUtils;
 import android.util.Pair;
 import android.view.View;
 import android.widget.Button;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
+import com.google.android.material.textview.MaterialTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
@@ -38,7 +38,7 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
 
     if (!TextUtils.isEmpty(titleMessage.first))
     {
-      TextView titleView = new TextView(requireContext());
+      MaterialTextView titleView = new MaterialTextView(requireContext());
       titleView.setText(titleMessage.first);
       titleView.setPadding(65, 32, 32, 16);
       titleView.setTextSize(18);

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

@@ -41,8 +41,6 @@ public enum BookmarkManager {
   // These values have to match the values of kml::CompilationType from kml/types.hpp
   public static final int CATEGORY = 0;
 
-  public static final List<Icon> ICONS = new ArrayList<>();
-
   private static final String[] BOOKMARKS_EXTENSIONS = Framework.nativeGetBookmarksFilesExts();
 
   private static final String TAG = BookmarkManager.class.getSimpleName();
@@ -70,26 +68,6 @@ public enum BookmarkManager {
   @Nullable
   private OnElevationActivePointChangedListener mOnElevationActivePointChangedListener;
 
-  static
-  {
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_RED, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_PINK, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_PURPLE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_DEEPPURPLE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BLUE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_LIGHTBLUE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_CYAN, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_TEAL, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_GREEN, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_LIME, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_YELLOW, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_ORANGE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_DEEPORANGE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BROWN, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_GRAY, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BLUEGRAY, Icon.BOOKMARK_ICON_TYPE_NONE));
-  }
-
   public void toggleCategoryVisibility(@NonNull BookmarkCategory category)
   {
     boolean isVisible = isVisible(category.getId());
@@ -342,7 +320,7 @@ public enum BookmarkManager {
     nativeShowBookmarkCategoryOnMap(catId);
   }
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   public int getLastEditedColor()
   {
     return nativeGetLastEditedColor();
@@ -618,7 +596,7 @@ public enum BookmarkManager {
     return nativeGetBookmarkXY(bookmarkId);
   }
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   public int getBookmarkColor(@IntRange(from = 0) long bookmarkId)
   {
     return nativeGetBookmarkColor(bookmarkId);
@@ -652,7 +630,7 @@ public enum BookmarkManager {
   }
 
   public void setBookmarkParams(@IntRange(from = 0) long bookmarkId, @NonNull String name,
-                                @Icon.PredefinedColor int color, @NonNull String descr)
+                                @PredefinedColors.Color int color, @NonNull String descr)
   {
     nativeSetBookmarkParams(bookmarkId, name, color, descr);
   }
@@ -808,7 +786,7 @@ public enum BookmarkManager {
   @Nullable
   private native Bookmark nativeAddBookmarkToLastEditedCategory(double lat, double lon);
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   private native int nativeGetLastEditedColor();
 
   private static native void nativeLoadBookmarksFile(@NonNull String path, boolean isTemporaryFile);
@@ -874,7 +852,7 @@ public enum BookmarkManager {
   @NonNull
   private static native ParcelablePointD nativeGetBookmarkXY(@IntRange(from = 0) long bookmarkId);
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   private static native int nativeGetBookmarkColor(@IntRange(from = 0) long bookmarkId);
 
   private static native int nativeGetBookmarkIcon(@IntRange(from = 0) long bookmarkId);
@@ -889,12 +867,13 @@ public enum BookmarkManager {
   private static native String nativeEncode2Ge0Url(@IntRange(from = 0) long bookmarkId, boolean addName);
 
   private static native void nativeSetBookmarkParams(@IntRange(from = 0) long bookmarkId, @NonNull String name,
-                                                     @Icon.PredefinedColor int color, @NonNull String descr);
+                                                     @PredefinedColors.Color int color, @NonNull String descr);
 
-  private static native void nativeChangeTrackColor(@IntRange(from = 0) long trackId, @Icon.PredefinedColor int color);
+  private static native void nativeChangeTrackColor(@IntRange(from = 0) long trackId,
+                                                    @PredefinedColors.Color int color);
 
   private static native void nativeSetTrackParams(@IntRange(from = 0) long trackId, @NonNull String name,
-                                                  @Icon.PredefinedColor int color, @NonNull String descr);
+                                                  @PredefinedColors.Color int color, @NonNull String descr);
 
   private static native void nativeChangeBookmarkCategory(@IntRange(from = 0) long oldCatId,
                                                           @IntRange(from = 0) long newCatId,

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

@@ -2,71 +2,13 @@ package app.organicmaps.sdk.bookmarks.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
-import androidx.annotation.IntDef;
 import app.organicmaps.sdk.R;
 import com.google.common.base.Objects;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 public class Icon implements Parcelable
 {
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({PREDEFINED_COLOR_NONE, PREDEFINED_COLOR_RED, PREDEFINED_COLOR_BLUE, PREDEFINED_COLOR_PURPLE,
-           PREDEFINED_COLOR_YELLOW, PREDEFINED_COLOR_PINK, PREDEFINED_COLOR_BROWN, PREDEFINED_COLOR_GREEN,
-           PREDEFINED_COLOR_ORANGE, PREDEFINED_COLOR_DEEPPURPLE, PREDEFINED_COLOR_LIGHTBLUE, PREDEFINED_COLOR_CYAN,
-           PREDEFINED_COLOR_TEAL, PREDEFINED_COLOR_LIME, PREDEFINED_COLOR_DEEPORANGE, PREDEFINED_COLOR_GRAY,
-           PREDEFINED_COLOR_BLUEGRAY})
-  @interface PredefinedColor
-  {}
-
-  static final int PREDEFINED_COLOR_NONE = 0;
-  static final int PREDEFINED_COLOR_RED = 1;
-  static final int PREDEFINED_COLOR_BLUE = 2;
-  static final int PREDEFINED_COLOR_PURPLE = 3;
-  static final int PREDEFINED_COLOR_YELLOW = 4;
-  static final int PREDEFINED_COLOR_PINK = 5;
-  static final int PREDEFINED_COLOR_BROWN = 6;
-  static final int PREDEFINED_COLOR_GREEN = 7;
-  static final int PREDEFINED_COLOR_ORANGE = 8;
-  static final int PREDEFINED_COLOR_DEEPPURPLE = 9;
-  static final int PREDEFINED_COLOR_LIGHTBLUE = 10;
-  static final int PREDEFINED_COLOR_CYAN = 11;
-  static final int PREDEFINED_COLOR_TEAL = 12;
-  static final int PREDEFINED_COLOR_LIME = 13;
-  static final int PREDEFINED_COLOR_DEEPORANGE = 14;
-  static final int PREDEFINED_COLOR_GRAY = 15;
-  static final int PREDEFINED_COLOR_BLUEGRAY = 16;
-
-  private static int shift(int v, int bitCount)
-  {
-    return v << bitCount;
-  }
-  private static int toARGB(int r, int g, int b)
-  {
-    return shift(255, 24) + shift(r, 16) + shift(g, 8) + b;
-  }
-
-  /// @note Important! Should be synced with kml/types.hpp/PredefinedColor
-  /// @todo Values can be taken from Core.
-  private static final int[] ARGB_COLORS = {toARGB(229, 27, 35), // none
-                                            toARGB(229, 27, 35), // red
-                                            toARGB(0, 110, 199), // blue
-                                            toARGB(156, 39, 176), // purple
-                                            toARGB(255, 200, 0), // yellow
-                                            toARGB(255, 65, 130), // pink
-                                            toARGB(121, 85, 72), // brown
-                                            toARGB(56, 142, 60), // green
-                                            toARGB(255, 160, 0), // orange
-                                            toARGB(102, 57, 191), // deeppurple
-                                            toARGB(36, 156, 242), // lightblue
-                                            toARGB(20, 190, 205), // cyan
-                                            toARGB(0, 165, 140), // teal
-                                            toARGB(147, 191, 57), // lime
-                                            toARGB(240, 100, 50), // deeporange
-                                            toARGB(115, 115, 115), // gray
-                                            toARGB(89, 115, 128)}; // bluegray
-
   static final int BOOKMARK_ICON_TYPE_NONE = 0;
 
   /// @note Important! Should be synced with kml/types.hpp/BookmarkIcon
@@ -98,11 +40,16 @@ public class Icon implements Parcelable
       R.drawable.ic_bookmark_none  // FastFood
   };
 
-  @PredefinedColor
+  @PredefinedColors.Color
   private final int mColor;
   private final int mType;
 
-  public Icon(@PredefinedColor int color, int type)
+  public Icon(@PredefinedColors.Color int color)
+  {
+    this(color, BOOKMARK_ICON_TYPE_NONE);
+  }
+
+  public Icon(@PredefinedColors.Color int color, int type)
   {
     mColor = color;
     mType = type;
@@ -127,25 +74,16 @@ public class Icon implements Parcelable
     mType = in.readInt();
   }
 
-  @PredefinedColor
+  @PredefinedColors.Color
   public int getColor()
   {
     return mColor;
   }
 
+  @ColorInt
   public int argb()
   {
-    return ARGB_COLORS[mColor];
-  }
-
-  public static int getColorPosition(int color)
-  {
-    for (int index = 1; index < ARGB_COLORS.length; index++)
-    {
-      if (ARGB_COLORS[index] == color)
-        return index;
-    }
-    return -1;
+    return PredefinedColors.getColor(mColor);
   }
 
   @DrawableRes

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

@@ -0,0 +1,50 @@
+package app.organicmaps.sdk.bookmarks.data;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import dalvik.annotation.optimization.FastNative;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class PredefinedColors
+{
+  @Retention(RetentionPolicy.SOURCE)
+  @IntRange(from = 0)
+  public @interface Color
+  {}
+
+  /// @note Color format: ARGB
+  @ColorInt
+  private static final int[] PREDEFINED_COLORS = nativeGetPredefinedColors();
+
+  @ColorInt
+  public static int getColor(int index)
+  {
+    return PREDEFINED_COLORS[index];
+  }
+
+  @PredefinedColors.Color
+  public static List<Integer> getAllPredefinedColors()
+  {
+    // 0 is reserved for "no color" option.
+    return IntStream.range(1, PREDEFINED_COLORS.length).boxed().toList();
+  }
+
+  public static int getPredefinedColorIndex(@ColorInt int color)
+  {
+    // 0 is reserved for "no color" option.
+    for (int index = 1; index < PREDEFINED_COLORS.length; index++)
+    {
+      if (PREDEFINED_COLORS[index] == color)
+        return index;
+    }
+    return -1;
+  }
+
+  @FastNative
+  @NonNull
+  private static native int[] nativeGetPredefinedColors();
+}

android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java

@@ -240,7 +240,8 @@ public class SearchToolbarController extends ToolbarController implements View.O
   }
 
   @NonNull
-  public OnBackPressedCallback getBackPressedCallback() {
+  public OnBackPressedCallback getBackPressedCallback()
+  {
     return mBackPressedCallback;
   }
 }

android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java

@@ -5,7 +5,6 @@ import android.util.Pair;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
@@ -19,6 +18,7 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.textview.MaterialTextView;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.concurrent.TimeUnit;
@@ -31,15 +31,15 @@ public class NavMenu
 
   private final ImageView mTts;
   private final View mSpeedViewContainer;
-  private final TextView mSpeedValue;
-  private final TextView mSpeedUnits;
-  private final TextView mTimeHourValue;
-  private final TextView mTimeHourUnits;
-  private final TextView mTimeMinuteValue;
-  private final TextView mTimeMinuteUnits;
-  private final TextView mTimeEstimate;
-  private final TextView mDistanceValue;
-  private final TextView mDistanceUnits;
+  private final MaterialTextView mSpeedValue;
+  private final MaterialTextView mSpeedUnits;
+  private final MaterialTextView mTimeHourValue;
+  private final MaterialTextView mTimeHourUnits;
+  private final MaterialTextView mTimeMinuteValue;
+  private final MaterialTextView mTimeMinuteUnits;
+  private final MaterialTextView mTimeEstimate;
+  private final MaterialTextView mDistanceValue;
+  private final MaterialTextView mDistanceUnits;
   private final LinearProgressIndicator mRouteProgress;
 
   private final AppCompatActivity mActivity;

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

@@ -9,9 +9,8 @@ import android.widget.GridView;
 import androidx.annotation.NonNull;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
-import app.organicmaps.bookmarks.IconsAdapter;
-import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.bookmarks.ColorsAdapter;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.List;
 
@@ -19,11 +18,12 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
 {
   public static final String ICON_TYPE = "ExtraIconType";
 
+  @PredefinedColors.Color
   private int mIconColor;
 
   public interface OnBookmarkColorChangeListener
   {
-    void onBookmarkColorSet(int colorPos);
+    void onBookmarkColorSet(@PredefinedColors.Color int color);
   }
 
   private OnBookmarkColorChangeListener mColorSetListener;
@@ -49,19 +49,20 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
     mColorSetListener = listener;
   }
 
+  @NonNull
   private View buildView()
   {
-    final List<Icon> icons = BookmarkManager.ICONS;
-    final IconsAdapter adapter = new IconsAdapter(requireActivity(), icons);
+    final List<Integer> colors = PredefinedColors.getAllPredefinedColors();
+    final ColorsAdapter adapter = new ColorsAdapter(requireActivity(), colors);
     adapter.chooseItem(mIconColor);
 
     @SuppressLint("InflateParams")
     final GridView gView =
         (GridView) LayoutInflater.from(requireActivity()).inflate(R.layout.fragment_color_grid, null);
     gView.setAdapter(adapter);
-    gView.setOnItemClickListener((arg0, who, pos, id) -> {
+    gView.setOnItemClickListener((parent, view, pos, id) -> {
       if (mColorSetListener != null)
-        mColorSetListener.onBookmarkColorSet(pos);
+        mColorSetListener.onBookmarkColorSet(adapter.getItem(pos));
       dismiss();
     });
 

android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.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.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.MwmActivity;
@@ -21,16 +20,17 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.ArrowView;
+import com.google.android.material.textview.MaterialTextView;
 
 public class DirectionFragment extends BaseMwmDialogFragment implements LocationListener, SensorListener
 {
   private static final String EXTRA_MAP_OBJECT = "MapObject";
 
   private ArrowView mAvDirection;
-  private TextView mTvTitle;
-  private TextView mTvSubtitle;
-  private TextView mTvDistance;
-  private TextView mTvAzimuth;
+  private MaterialTextView mTvTitle;
+  private MaterialTextView mTvSubtitle;
+  private MaterialTextView mTvDistance;
+  private MaterialTextView mTvAzimuth;
 
   private MapObject mMapObject;
 

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

@@ -24,6 +24,7 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
@@ -304,7 +305,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
 
     final Bundle args = new Bundle();
     if (mTrack != null)
-      args.putInt(BookmarkColorDialogFragment.ICON_TYPE, mTrack.getColor());
+      args.putInt(BookmarkColorDialogFragment.ICON_TYPE, PredefinedColors.getPredefinedColorIndex(mColor));
     else
       args.putInt(BookmarkColorDialogFragment.ICON_TYPE, mIcon.getColor());
     final FragmentManager manager = getChildFragmentManager();
@@ -317,17 +318,16 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     {
       case TYPE_BOOKMARK ->
         dialogFragment.setOnColorSetListener(colorPos -> {
-          final Icon newIcon = BookmarkManager.ICONS.get(colorPos);
-          if (mIcon.getColor() == newIcon.getColor())
+          if (mIcon != null && mIcon.getColor() == colorPos)
             return;
 
-          mIcon = newIcon;
+          mIcon = new Icon(colorPos);
           refreshColorMarker();
         });
       case TYPE_TRACK ->
         dialogFragment.setOnColorSetListener(colorPos -> {
           int from = mTrack.getColor();
-          int to = BookmarkManager.ICONS.get(colorPos).argb();
+          int to = PredefinedColors.getColor(colorPos);
           if (from == to)
             return;
           mColor = to;
@@ -342,9 +342,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
   {
     if (mIcon != null)
     {
-      Drawable circle =
-          Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size, app.organicmaps.sdk.R.drawable.ic_bookmark_none,
-                                      R.dimen.bookmark_icon_size, requireContext());
+      Drawable circle = Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size,
+                                                    app.organicmaps.sdk.R.drawable.ic_bookmark_none,
+                                                    R.dimen.bookmark_icon_size, requireContext());
       mIvColor.setImageDrawable(circle);
     }
   }

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

@@ -26,6 +26,7 @@ import app.organicmaps.R;
 import app.organicmaps.api.Const;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.ChoosePositionMode;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
@@ -33,7 +34,6 @@ import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType;
 import app.organicmaps.sdk.settings.RoadType;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.sdk.ChoosePositionMode;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;

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

@@ -619,7 +619,7 @@ public class PlacePageView extends Fragment
 
   private void addOrganisation()
   {
-    ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, false);
+    ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, true);
   }
 
   private void addPlace()

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

@@ -14,10 +14,10 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
+import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.OpeningHours;
-import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.UiUtils;

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#2E89B0" />
+            <solid android:color="#427BB8" />
         </shape>
     </item>
     <item>

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

@@ -5,7 +5,7 @@
       <size
         android:width="40dp"
         android:height="40dp" />
-      <solid android:color="#14A0C2" />
+      <solid android:color="#54A3B6" />
     </shape>
   </item>
   <item>

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m15.251,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m16.985,17h-5.848v-1.16l2.76,-2.941q0.568,-0.621 0.838,-1.084 0.275,-0.463 0.275,-0.879 0,-0.568 -0.287,-0.891 -0.287,-0.328 -0.82,-0.328 -0.574,0 -0.908,0.398 -0.328,0.393 -0.328,1.037h-1.699q0,-0.779 0.369,-1.424 0.375,-0.645 1.055,-1.008 0.68,-0.369 1.541,-0.369 1.318,0 2.045,0.633 0.732,0.633 0.732,1.787 0,0.633 -0.328,1.289t-1.125,1.529l-1.939,2.045h3.668z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m12.86,11.984h0.902q0.645,0 0.955,-0.322 0.311,-0.322 0.311,-0.855 0,-0.516 -0.311,-0.803 -0.305,-0.287 -0.844,-0.287 -0.486,0 -0.814,0.27 -0.328,0.264 -0.328,0.691h-1.693q0,-0.668 0.357,-1.195 0.363,-0.533 1.008,-0.832 0.65,-0.299 1.43,-0.299 1.354,0 2.121,0.65 0.768,0.645 0.768,1.781 0,0.586 -0.357,1.078 -0.357,0.492 -0.938,0.756 0.721,0.258 1.072,0.773 0.357,0.516 0.357,1.219 0,1.137 -0.832,1.822 -0.826,0.686 -2.191,0.686 -1.277,0 -2.092,-0.674 -0.809,-0.674 -0.809,-1.781h1.693q0,0.48 0.357,0.785 0.363,0.305 0.891,0.305 0.604,0 0.943,-0.316 0.346,-0.322 0.346,-0.85 0,-1.277 -1.406,-1.277h-0.896z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m16.147,13.789h0.967v1.365h-0.967v1.846h-1.693v-1.846h-3.498l-0.076,-1.066 3.557,-5.619h1.711zM12.567,13.789h1.887v-3.012l-0.111,0.193z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.39,12.805 l0.492,-4.336h4.781v1.412h-3.393l-0.211,1.834q0.604,-0.322 1.283,-0.322 1.219,0 1.91,0.756 0.691,0.756 0.691,2.115 0,0.826 -0.352,1.482 -0.346,0.65 -0.996,1.014 -0.65,0.357 -1.535,0.357 -0.773,0 -1.436,-0.311 -0.662,-0.316 -1.049,-0.885 -0.381,-0.568 -0.404,-1.295h1.676q0.053,0.533 0.369,0.832 0.322,0.293 0.838,0.293 0.574,0 0.885,-0.41 0.311,-0.416 0.311,-1.172 0,-0.727 -0.357,-1.113 -0.357,-0.387 -1.014,-0.387 -0.604,0 -0.979,0.316l-0.164,0.152z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m15.731,8.381v1.395h-0.164q-1.148,0.018 -1.852,0.598 -0.697,0.58 -0.838,1.611 0.68,-0.691 1.717,-0.691 1.113,0 1.77,0.797t0.656,2.098q0,0.832 -0.363,1.506 -0.357,0.674 -1.02,1.049 -0.656,0.375 -1.488,0.375 -1.348,0 -2.18,-0.938 -0.826,-0.938 -0.826,-2.502v-0.609q0,-1.389 0.521,-2.449 0.527,-1.066 1.506,-1.646 0.984,-0.586 2.279,-0.592zM14.079,12.652q-0.41,0 -0.744,0.217 -0.334,0.211 -0.492,0.563v0.516q0,0.85 0.334,1.33 0.334,0.475 0.938,0.475 0.545,0 0.879,-0.428 0.34,-0.434 0.34,-1.119 0,-0.697 -0.34,-1.125 -0.34,-0.428 -0.914,-0.428z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m16.938,9.418 l-3.299,7.582h-1.787l3.305,-7.16h-4.242v-1.371h6.023z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m16.698,10.736q0,0.621 -0.311,1.102 -0.311,0.48 -0.855,0.768 0.621,0.299 0.984,0.826 0.363,0.521 0.363,1.23 0,1.137 -0.773,1.799 -0.773,0.656 -2.103,0.656t-2.109,-0.662 -0.779,-1.793q0,-0.709 0.363,-1.236 0.363,-0.527 0.979,-0.82 -0.545,-0.287 -0.855,-0.768 -0.305,-0.48 -0.305,-1.102 0,-1.09 0.727,-1.734 0.727,-0.65 1.975,-0.65 1.242,0 1.969,0.645 0.732,0.639 0.732,1.74zM15.18,14.539q0,-0.557 -0.322,-0.891 -0.322,-0.334 -0.867,-0.334 -0.539,0 -0.861,0.334 -0.322,0.328 -0.322,0.891 0,0.545 0.316,0.879 0.316,0.334 0.879,0.334 0.551,0 0.861,-0.322 0.316,-0.322 0.316,-0.891zM15.005,10.818q0,-0.498 -0.264,-0.797 -0.264,-0.305 -0.744,-0.305 -0.475,0 -0.738,0.293 -0.264,0.293 -0.264,0.809 0,0.51 0.264,0.82t0.744,0.311q0.48,0 0.738,-0.311 0.264,-0.311 0.264,-0.82z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m15.099,13.59q-0.662,0.65 -1.547,0.65 -1.131,0 -1.811,-0.773 -0.68,-0.779 -0.68,-2.098 0,-0.838 0.363,-1.535 0.369,-0.703 1.025,-1.09 0.656,-0.393 1.477,-0.393 0.844,0 1.5,0.422t1.02,1.213q0.363,0.791 0.369,1.811v0.627q0,2.133 -1.061,3.352t-3.006,1.301l-0.416,0.006v-1.412l0.375,-0.006q2.209,-0.1 2.391,-2.074zM13.968,12.945q0.41,0 0.703,-0.211 0.299,-0.211 0.451,-0.51v-0.697q0,-0.861 -0.328,-1.336 -0.328,-0.475 -0.879,-0.475 -0.51,0 -0.838,0.469 -0.328,0.463 -0.328,1.166 0,0.697 0.316,1.148 0.322,0.445 0.902,0.445z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.323,13.473q0,1.77 -0.732,2.707 -0.732,0.938 -2.145,0.938 -1.395,0 -2.133,-0.92 -0.738,-0.92 -0.756,-2.637v-1.57q0,-1.787 0.738,-2.713 0.744,-0.926 2.139,-0.926 1.395,0 2.133,0.92 0.738,0.914 0.756,2.631zM18.629,11.75q0,-1.061 -0.293,-1.541 -0.287,-0.486 -0.902,-0.486 -0.598,0 -0.885,0.463 -0.281,0.457 -0.299,1.436v2.074q0,1.043 0.281,1.553 0.287,0.504 0.914,0.504 0.621,0 0.896,-0.486 0.275,-0.486 0.287,-1.488z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM18.694,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.428,17h-5.848v-1.16l2.76,-2.941q0.568,-0.621 0.838,-1.084 0.275,-0.463 0.275,-0.879 0,-0.568 -0.287,-0.891 -0.287,-0.328 -0.82,-0.328 -0.574,0 -0.908,0.398 -0.328,0.393 -0.328,1.037h-1.699q0,-0.779 0.369,-1.424 0.375,-0.645 1.055,-1.008 0.68,-0.369 1.541,-0.369 1.318,0 2.045,0.633 0.732,0.633 0.732,1.787 0,0.633 -0.328,1.289t-1.125,1.529l-1.939,2.045h3.668z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM16.303,11.984h0.902q0.645,0 0.955,-0.322 0.311,-0.322 0.311,-0.855 0,-0.516 -0.311,-0.803 -0.305,-0.287 -0.844,-0.287 -0.486,0 -0.814,0.27 -0.328,0.264 -0.328,0.691h-1.693q0,-0.668 0.357,-1.195 0.363,-0.533 1.008,-0.832 0.65,-0.299 1.43,-0.299 1.354,0 2.121,0.65 0.768,0.645 0.768,1.781 0,0.586 -0.357,1.078 -0.357,0.492 -0.938,0.756 0.721,0.258 1.072,0.773 0.357,0.516 0.357,1.219 0,1.137 -0.832,1.822 -0.826,0.686 -2.191,0.686 -1.277,0 -2.092,-0.674 -0.809,-0.674 -0.809,-1.781h1.693q0,0.48 0.357,0.785 0.363,0.305 0.891,0.305 0.604,0 0.943,-0.316 0.346,-0.322 0.346,-0.85 0,-1.277 -1.406,-1.277h-0.896z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM19.59,13.789h0.967v1.365h-0.967v1.846h-1.693v-1.846h-3.498l-0.076,-1.066 3.557,-5.619h1.711zM16.01,13.789h1.887v-3.012l-0.111,0.193z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM14.832,12.805 L15.325,8.469h4.781v1.412h-3.393l-0.211,1.834q0.604,-0.322 1.283,-0.322 1.219,0 1.91,0.756 0.691,0.756 0.691,2.115 0,0.826 -0.352,1.482 -0.346,0.65 -0.996,1.014 -0.65,0.357 -1.535,0.357 -0.773,0 -1.436,-0.311 -0.662,-0.316 -1.049,-0.885 -0.381,-0.568 -0.404,-1.295h1.676q0.053,0.533 0.369,0.832 0.322,0.293 0.838,0.293 0.574,0 0.885,-0.41 0.311,-0.416 0.311,-1.172 0,-0.727 -0.357,-1.113 -0.357,-0.387 -1.014,-0.387 -0.604,0 -0.979,0.316l-0.164,0.152z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM19.174,8.381v1.395h-0.164q-1.148,0.018 -1.852,0.598 -0.697,0.58 -0.838,1.611 0.68,-0.691 1.717,-0.691 1.113,0 1.77,0.797t0.656,2.098q0,0.832 -0.363,1.506 -0.357,0.674 -1.02,1.049 -0.656,0.375 -1.488,0.375 -1.348,0 -2.18,-0.938 -0.826,-0.938 -0.826,-2.502v-0.609q0,-1.389 0.521,-2.449 0.527,-1.066 1.506,-1.646 0.984,-0.586 2.279,-0.592zM17.522,12.652q-0.41,0 -0.744,0.217 -0.334,0.211 -0.492,0.563v0.516q0,0.85 0.334,1.33 0.334,0.475 0.938,0.475 0.545,0 0.879,-0.428 0.34,-0.434 0.34,-1.119 0,-0.697 -0.34,-1.125 -0.34,-0.428 -0.914,-0.428z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.381,9.418 L17.083,17h-1.787l3.305,-7.16h-4.242v-1.371h6.023z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.141,10.736q0,0.621 -0.311,1.102 -0.311,0.48 -0.855,0.768 0.621,0.299 0.984,0.826 0.363,0.521 0.363,1.23 0,1.137 -0.773,1.799 -0.773,0.656 -2.103,0.656 -1.33,0 -2.109,-0.662 -0.779,-0.662 -0.779,-1.793 0,-0.709 0.363,-1.236 0.363,-0.527 0.979,-0.82 -0.545,-0.287 -0.855,-0.768 -0.305,-0.48 -0.305,-1.102 0,-1.09 0.727,-1.734 0.727,-0.65 1.975,-0.65 1.242,0 1.969,0.645 0.732,0.639 0.732,1.74zM18.623,14.539q0,-0.557 -0.322,-0.891 -0.322,-0.334 -0.867,-0.334 -0.539,0 -0.861,0.334 -0.322,0.328 -0.322,0.891 0,0.545 0.316,0.879 0.316,0.334 0.879,0.334 0.551,0 0.861,-0.322 0.316,-0.322 0.316,-0.891zM18.448,10.818q0,-0.498 -0.264,-0.797 -0.264,-0.305 -0.744,-0.305 -0.475,0 -0.738,0.293 -0.264,0.293 -0.264,0.809 0,0.51 0.264,0.82t0.744,0.311q0.48,0 0.738,-0.311 0.264,-0.311 0.264,-0.82z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM18.541,13.59q-0.662,0.65 -1.547,0.65 -1.131,0 -1.811,-0.773 -0.68,-0.779 -0.68,-2.098 0,-0.838 0.363,-1.535 0.369,-0.703 1.025,-1.09 0.656,-0.393 1.477,-0.393 0.844,0 1.5,0.422t1.02,1.213q0.363,0.791 0.369,1.811v0.627q0,2.133 -1.061,3.352 -1.061,1.219 -3.006,1.301l-0.416,0.006v-1.412l0.375,-0.006q2.209,-0.1 2.391,-2.074zM17.411,12.945q0.41,0 0.703,-0.211 0.299,-0.211 0.451,-0.51v-0.697q0,-0.861 -0.328,-1.336 -0.328,-0.475 -0.879,-0.475 -0.51,0 -0.838,0.469 -0.328,0.463 -0.328,1.166 0,0.697 0.316,1.148 0.322,0.445 0.902,0.445z"

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

@@ -11,7 +11,7 @@
   <path
       android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
       android:strokeWidth="2"
-      android:fillColor="#006c35"
+      android:fillColor="#FF37653F"
       android:strokeColor="#fff"/>
   <path
       android:pathData="m8.598,16.168q0,-0.404 0.27,-0.656 0.275,-0.252 0.686,-0.252 0.416,0 0.686,0.252 0.275,0.252 0.275,0.656 0,0.398 -0.27,0.65 -0.27,0.246 -0.691,0.246 -0.416,0 -0.686,-0.246 -0.27,-0.252 -0.27,-0.65zM8.598,11.369q0,-0.404 0.27,-0.656 0.275,-0.252 0.686,-0.252 0.416,0 0.686,0.252 0.275,0.252 0.275,0.656 0,0.398 -0.27,0.65 -0.27,0.246 -0.691,0.246 -0.416,0 -0.686,-0.246 -0.27,-0.252 -0.27,-0.65zM15.195,14.029h-3.299v-1.365h3.299zM19.473,13.666q0,1.324 -0.381,2.549 -0.381,1.225 -1.096,2.162 -0.715,0.938 -1.529,1.289l-0.328,-0.896q0.832,-0.627 1.313,-1.934 0.48,-1.307 0.498,-3.006v-0.311q0,-1.752 -0.48,-3.088 -0.475,-1.336 -1.33,-2.004l0.328,-0.896q0.797,0.346 1.5,1.254 0.709,0.908 1.096,2.115 0.393,1.207 0.41,2.502z"

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

@@ -26,7 +26,7 @@
       android:layout_toEndOf="@id/av__direction"
       android:orientation="vertical">
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__title"
         style="@style/MwmWidget.TextView.Direction"
         android:layout_width="wrap_content"
@@ -35,7 +35,7 @@
         android:textSize="@dimen/text_direction_title"
         tools:text="Some place"/>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__subtitle"
         style="@style/MwmWidget.TextView.Direction"
         android:layout_width="wrap_content"
@@ -44,7 +44,7 @@
         android:textSize="@dimen/text_direction_subtitle"
         tools:text="Some place type"/>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__straight_distance"
         style="@style/MwmWidget.TextView.Direction"
         android:layout_width="wrap_content"
@@ -53,7 +53,7 @@
         android:textSize="@dimen/text_direction_dist"
         tools:text="9000 km"/>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__azimuth"
           style="@style/MwmWidget.TextView.Direction"
           android:layout_width="wrap_content"

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

@@ -20,7 +20,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       tools:ignore="UselessParent">
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/street"
         style="@style/MwmWidget.TextView.NavStreet"
         android:layout_width="match_parent"
@@ -64,7 +64,7 @@
           app:tint="?iconTint"
           tools:background="#400000FF"/>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/circle_exit"
           style="@style/MwmWidget.TextView.NavNextTurn.Exit"
           android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
           tools:text="9"/>
       </FrameLayout>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/distance"
         style="@style/MwmWidget.TextView.NavNextTurn"
         android:layout_width="wrap_content"
@@ -96,7 +96,7 @@
       android:elevation="@dimen/nav_elevation"
       android:visibility="gone"
       tools:visibility="visible">
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         android:id="@id/turn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -5,7 +5,7 @@
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:orientation="vertical">
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__message"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

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

@@ -17,25 +17,27 @@
     android:orientation="vertical">
     <com.google.android.material.textfield.TextInputLayout
       android:id="@+id/edit_bookmark_name_input"
-      style="?fontBody1"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="60dp"
       android:textColorHint="?android:textColorSecondary"
       app:endIconMode="custom"
       app:endIconCheckable="false"
       app:endIconContentDescription="@string/clear"
       app:endIconDrawable="@drawable/ic_clear_rounded"
-      app:endIconTint="?android:textColorSecondary">
+      app:endIconTint="?android:textColorSecondary"
+      app:boxBackgroundMode="filled"
+      app:boxBackgroundColor="@null">
       <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/et__bookmark_name"
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:hint="@string/name"
         android:padding="@dimen/margin_half_double_plus"
         android:textAlignment="viewStart"
         android:inputType="textCapSentences"
-        android:singleLine="true" />
+        android:singleLine="true"
+        android:backgroundTint="@android:color/transparent"/>
     </com.google.android.material.textfield.TextInputLayout>
   </LinearLayout>
   <RelativeLayout
@@ -88,21 +90,23 @@
       tools:src="@drawable/ic_bookmark_none" />
   </RelativeLayout>
   <com.google.android.material.textfield.TextInputLayout
-    style="?fontBody1"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="60dp"
     android:layout_below="@id/rl__bookmark_set"
     android:layout_margin="@dimen/margin_half"
-    android:textColorHint="?android:textColorSecondary">
+    android:textColorHint="?android:textColorSecondary"
+    app:boxBackgroundMode="filled"
+    app:boxBackgroundColor="@null">
 
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/et__description"
       style="@style/MwmWidget.Editor.CustomTextInput"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="match_parent"
       android:padding="@dimen/margin_half_double_plus"
       android:hint="@string/placepage_personal_notes_hint"
       android:inputType="textMultiLine"
-      android:textAlignment="viewStart" />
+      android:textAlignment="viewStart"
+      android:backgroundTint="@android:color/transparent"/>
   </com.google.android.material.textfield.TextInputLayout>
 </RelativeLayout>

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

@@ -16,7 +16,7 @@
     android:layout_marginTop="@dimen/margin_direction_small"
     app:srcCompat="@drawable/ic_direction_fullscreen"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__subtitle"
     style="@style/MwmWidget.TextView.Direction"
     android:layout_width="wrap_content"
@@ -28,7 +28,7 @@
     android:textSize="@dimen/text_direction_subtitle"
     tools:text="Some place type"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__title"
     style="@style/MwmWidget.TextView.Direction"
     android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
     android:textSize="@dimen/text_direction_title"
     tools:text="Place, \n long, \n long"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__straight_distance"
     style="@style/MwmWidget.TextView.Direction"
     android:layout_width="wrap_content"
@@ -51,7 +51,7 @@
     android:layout_marginTop="@dimen/margin_direction_big"
     android:textSize="@dimen/text_direction_dist"
     tools:text="9000 km"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__azimuth"
     style="@style/MwmWidget.TextView.Direction"
     android:layout_width="wrap_content"

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

@@ -23,7 +23,7 @@
     layout="@layout/routing_action_panel"
     android:visibility="gone"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/error"
     android:paddingStart="@dimen/margin_base"
     android:paddingEnd="@dimen/margin_base"

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

@@ -23,7 +23,7 @@
     app:centerDrawable="@android:color/transparent"
     tools:visibility="visible"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__size"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
     android:textAppearance="@style/MwmTextAppearance.Body1"
     tools:text="256 MB"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

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

@@ -23,7 +23,7 @@
     app:centerDrawable="@android:color/transparent"
     tools:visibility="visible"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__size"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
     android:textColor="?colorAccent"
     tools:text="256 MB"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

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

@@ -23,7 +23,7 @@
     android:gravity="center"
     android:minWidth="@dimen/nav_numbers_side_min_width">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/speed_value"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
       tools:text="999" />
 
     <!-- Speed -->
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/speed_dimen"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
       android:layout_height="wrap_content"
       tools:background="#20FF0000">
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time_hour_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
         android:textAppearance="@style/MwmTextAppearance.NavMenu.Time"
         tools:text="999" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time_hour_dimen"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
         android:textAppearance="@style/MwmTextAppearance.NavMenu.Time.Dimension"
         tools:text="h" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time_minute_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
         android:textAppearance="@style/MwmTextAppearance.NavMenu.Time"
         tools:text="99" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time_minute_dimen"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
         tools:text="m" />
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/time_estimate"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -126,7 +126,7 @@
     android:gravity="center"
     android:minWidth="@dimen/nav_numbers_side_min_width">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/distance_value"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
       tools:text="99999" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/distance_dimen"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"

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

@@ -20,7 +20,7 @@
       android:layout_width="match_parent"
       android:layout_height="@dimen/nav_street_height"
       tools:ignore="UselessParent">
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/street"
         style="@style/MwmWidget.TextView.NavStreet"
         android:layout_width="match_parent"
@@ -64,7 +64,7 @@
           app:tint="?iconTint"
           tools:background="#400000FF"/>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/circle_exit"
           style="@style/MwmWidget.TextView.NavNextTurn.Exit"
           android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
           tools:text="9"/>
       </FrameLayout>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/distance"
         style="@style/MwmWidget.TextView.NavNextTurn"
         android:layout_width="wrap_content"
@@ -96,7 +96,7 @@
       android:elevation="@dimen/nav_elevation"
       android:visibility="invisible"
       tools:visibility="visible">
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
         android:id="@id/turn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -20,7 +20,7 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
@@ -28,7 +28,7 @@
       android:textSize="20sp"
       android:textStyle="bold"/>
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/image_my_location"
       android:layout_width="24dp"
       android:layout_height="24dp"
@@ -80,7 +80,7 @@
 
   </androidx.constraintlayout.widget.ConstraintLayout>
 
-  <RelativeLayout
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -94,20 +94,24 @@
       style="@style/MwmWidget.Button"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_centerVertical="true"
-      android:text="@string/cancel"/>
+      android:layout_gravity="center_vertical"
+      android:text="@string/cancel"
+      android:textColor="?android:attr/textColorPrimary"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
 
     <Button
       android:id="@+id/btn__plan"
       style="@style/MwmWidget.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="end|center_vertical"
-      android:layout_alignParentEnd="true"
-      android:layout_centerVertical="true"
-      android:text="@string/button_plan"/>
+      android:layout_gravity="center_vertical"
+      android:text="@string/button_plan"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
 
-  </RelativeLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>

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

@@ -6,7 +6,7 @@
   android:layout_height="60dp"
   android:gravity="center_vertical">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/type_icon"
     android:layout_width="24dp"
     android:layout_height="24dp"
@@ -15,7 +15,7 @@
     app:layout_constraintBottom_toBottomOf="parent"
     app:srcCompat="@drawable/route_point_finish"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
     app:layout_constrainedWidth="true"
     tools:text="Title"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
     app:layout_constrainedWidth="true"
     tools:text="Subtitle"/>
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/delete_icon"
     android:layout_width="24dp"
     android:layout_height="24dp"

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

@@ -10,7 +10,7 @@
 
   <include layout="@layout/routing_bottom_panel_transit"/>
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/error"
     android:paddingStart="@dimen/margin_base"
     android:paddingEnd="@dimen/margin_base"

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

@@ -23,7 +23,7 @@
           android:layout_width="match_parent"
           android:layout_height="?attr/actionBarSize">
 
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/back"
             android:layout_width="?attr/actionBarSize"
             android:layout_height="?attr/actionBarSize"
@@ -157,14 +157,14 @@
       <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/driving_options_btn_img"
           android:layout_width="@dimen/margin_base_plus"
           android:layout_height="@dimen/margin_base_plus"
           android:layout_gravity="center"
           android:layout_marginEnd="@dimen/margin_half_plus_eight"
           app:srcCompat="@drawable/ic_error_white" />
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/driving_options_btn_title"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"

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

@@ -79,7 +79,7 @@
     <string name="type.craft.brewery">Пивоварна</string>
     <string name="type.craft.caterer">Кетъринг</string>
     <string name="type.craft.carpenter">Марангоз</string>
-    <string name="type.craft.confectionery">Сладкарски изделия</string>
+    <string name="type.craft.confectionery">Сладкарница</string>
     <string name="type.craft.electrician">Електротехник</string>
     <string name="type.craft.electronics_repair">Ремонт на електроника</string>
     <string name="type.craft.gardener">Градинар</string>
@@ -354,7 +354,7 @@
     <string name="type.place.country">Страна</string>
     <string name="type.place.county">Графство</string>
     <string name="type.place.farm">Ферма</string>
-    <string name="type.place.hamlet">Cело</string>
+    <string name="type.place.hamlet">Село</string>
     <string name="type.place.island">Остров</string>
     <string name="type.place.islet">Острови</string>
     <string name="type.place.isolated_dwelling">Изолирано жилище</string>
@@ -595,7 +595,7 @@
     <string name="type.recycling.plastic_bottles">Пластмасови бутилки</string>
     <string name="type.recycling.cardboard">Картон</string>
     <string name="type.recycling.shoes">Обувки</string>
-    <string name="type.amenity.restaurant">Заведение</string>
+    <string name="type.amenity.restaurant">Ресторант</string>
     <string name="type.amenity.school">Училище</string>
     <string name="type.amenity.shower">Душ</string>
     <string name="type.amenity.telephone">Телефон</string>
@@ -659,7 +659,7 @@
     <string name="type.shop.car_parts">Магазин за авточасти</string>
     <string name="type.shop.car_repair">Сервиз за коли</string>
     <string name="type.shop.car_repair.tyres">Гумаджия</string>
-    <string name="type.shop.chemist">Химик</string>
+    <string name="type.shop.chemist">Битова химия</string>
     <string name="type.shop.pet">Магазин за животни</string>
     <string name="type.shop.seafood">Риба</string>
     <string name="type.shop.shoes">Магазин за обувки</string>
@@ -1370,4 +1370,6 @@
     <string name="type.piste_type.downhill.advanced.area">Спускане със ски за напреднали</string>
     <string name="type.piste_type.downhill.freeride">Свободно каране спускане със ски</string>
     <string name="type.piste_type.downhill.novice.area">Спускане със ски за начинаещи</string>
+    <string name="type.highway.services">Обслужвана зона</string>
+    <string name="type.landuse.forest">Гора</string>
 </resources>

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

@@ -220,7 +220,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Stemmesprog</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Test stemmeanvisninger (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Test stemmevejledninger</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->

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

@@ -1375,4 +1375,11 @@
     <string name="type.amenity.luggage_locker">Bagageboks</string>
     <string name="type.natural.wetland.saltmarsh">Strandeng</string>
     <string name="type.natural.wetland.saltmarsh.tidal">Tidevandspåvirket strandeng</string>
+    <string name="type.natural.wetland.mangrove">Mangrove</string>
+    <string name="type.natural.wetland.tidalflat">Tidevandsflade</string>
+    <string name="type.man_made.utility_pole">Lygtepæl</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.landuse.religious">Religiøs jord</string>
+    <string name="type.power.pole">Elmast</string>
+    <string name="type.railway.station.subway.qingdao">Undergrundsstation</string>
 </resources>

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

@@ -584,7 +584,7 @@
     <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können</string>
     <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
     <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
-    <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
+    <string name="transliteration_title">Transliteration ins Lateinische alphabet</string>
     <string name="learn_more">Weitere Informationen</string>
     <!-- Subway exits for public transport marks on the map -->
     <string name="core_exit">Ausgang</string>

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

@@ -9,7 +9,7 @@
     <string name="delete">Διαγραφή</string>
     <string name="download_maps">Λήψη χαρτών</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Η λήψη απέτυχε. Πατήστε για να προσπαθήσετε ξανά.</string>
+    <string name="download_has_failed">Η λήψη απέτυχε, πατήστε για να προσπαθήσετε ξανά</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Λήψη…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -30,7 +30,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Περιορισμένη ακρίβεια</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Για να εξασφαλίσετε ακριβή πλοήγηση, ενεργοποιήστε την Ακριβής τοποθεσία στις ρυθμίσεις.</string>
+    <string name="precise_location_is_disabled_long_text">Για να εξασφαλίσετε ακριβή πλοήγηση, ενεργοποιήστε την Ακριβής τοποθεσία στις ρυθμίσεις</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Εμφάνιση στο χάρτη</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -236,7 +236,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Γλώσσα φωνής</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Δοκιμή φωνητικών οδηγιών (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Δοκιμή φωνητικών οδηγιών</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Ελέγξτε την ένταση ήχου ή τις ρυθμίσεις του συστήματος text-to-speech αν δεν ακούτε τη φωνή τώρα.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->

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

@@ -691,9 +691,9 @@
     <string name="type.power.substation">Υποσταθμός</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Πυλώνες μεταφοράς ρεύματος</string>
-    <string name="type.railway.funicular">Μονωτικό τρενάκι</string>
-    <string name="type.railway.halt">Σιδηροδρομικός σταθμός</string>
-    <string name="type.railway.level_crossing">Σιδηροδρομική διέλευση</string>
+    <string name="type.railway.funicular">Τελεφερίκ</string>
+    <string name="type.railway.halt">Σιδηροδρομική στάση</string>
+    <string name="type.railway.level_crossing">Σιδηροδρομική διάβαση</string>
     <string name="type.railway.monorail">Μονοαξονικός σιδηρόδρομος</string>
     <string name="type.railway.rail">Σιδηρόδρομος</string>
     <string name="type.railway.rail.highspeed">Σιδηρόδρομος υψηλής ταχύτητας</string>
@@ -723,126 +723,126 @@
     <string name="type.railway.rail.spur.tunnel">Σιδηροδρομική σήραγγα</string>
     <string name="type.railway.rail.service.tunnel">Σιδηροδρομική σήραγγα</string>
     <string name="type.railway.station">Σιδηροδρομικός σταθμός</string>
-    <string name="type.railway.station.funicular">Μονωτικό τρενάκι</string>
+    <string name="type.railway.station.funicular">Τελεφερίκ</string>
     <string name="type.railway.station.light_rail">Σιδηροδρομικός σταθμός</string>
     <string name="type.railway.station.light_rail.berlin">Σιδηροδρομικός σταθμός</string>
     <string name="type.railway.station.light_rail.london">Σιδηροδρομικός σταθμός</string>
     <string name="type.railway.station.light_rail.porto">Σιδηροδρομικός σταθμός</string>
     <string name="type.railway.station.monorail">Σιδηροδρομικός σταθμός</string>
-    <string name="type.railway.station.subway">Μετρό</string>
-    <string name="type.railway.station.subway.adana">Μετρό</string>
-    <string name="type.railway.station.subway.algiers">Μετρό</string>
-    <string name="type.railway.station.subway.almaty">Μετρό</string>
-    <string name="type.railway.station.subway.amsterdam">Μετρό</string>
-    <string name="type.railway.station.subway.ankara">Μετρό</string>
-    <string name="type.railway.station.subway.athens">Μετρό</string>
-    <string name="type.railway.station.subway.baku">Μετρό</string>
-    <string name="type.railway.station.subway.bangkok">Μετρό</string>
-    <string name="type.railway.station.subway.barcelona">Μετρό</string>
-    <string name="type.railway.station.subway.beijing">Μετρό</string>
-    <string name="type.railway.station.subway.bengalore">Μετρό</string>
-    <string name="type.railway.station.subway.berlin">Μετρό</string>
-    <string name="type.railway.station.subway.bilbao">Μετρό</string>
-    <string name="type.railway.station.subway.brasilia">Μετρό</string>
-    <string name="type.railway.station.subway.brescia">Μετρό</string>
-    <string name="type.railway.station.subway.brussels">Μετρό</string>
-    <string name="type.railway.station.subway.bucharest">Μετρό</string>
-    <string name="type.railway.station.subway.budapest">Μετρό</string>
-    <string name="type.railway.station.subway.buenos_aires">Μετρό</string>
-    <string name="type.railway.station.subway.bursa">Μετρό</string>
-    <string name="type.railway.station.subway.cairo">Μετρό</string>
-    <string name="type.railway.station.subway.caracas">Μετρό</string>
-    <string name="type.railway.station.subway.catania">Μετρό</string>
-    <string name="type.railway.station.subway.changchun">Μετρό</string>
-    <string name="type.railway.station.subway.chengdu">Μετρό</string>
-    <string name="type.railway.station.subway.chicago">Μετρό</string>
-    <string name="type.railway.station.subway.chongqing">Μετρό</string>
-    <string name="type.railway.station.subway.dalian">Μετρό</string>
-    <string name="type.railway.station.subway.delhi">Μετρό</string>
-    <string name="type.railway.station.subway.dnepro">Μετρό</string>
-    <string name="type.railway.station.subway.dubai">Μετρό</string>
-    <string name="type.railway.station.subway.ekb">Μετρό</string>
-    <string name="type.railway.station.subway.fukuoka">Μετρό</string>
-    <string name="type.railway.station.subway.glasgow">Μετρό</string>
-    <string name="type.railway.station.subway.guangzhou">Μετρό</string>
-    <string name="type.railway.station.subway.hamburg">Μετρό</string>
-    <string name="type.railway.station.subway.helsinki">Μετρό</string>
-    <string name="type.railway.station.subway.hiroshima">Μετρό</string>
-    <string name="type.railway.station.subway.hongkong">Μετρό</string>
-    <string name="type.railway.station.subway.isfahan">Μετρό</string>
-    <string name="type.railway.station.subway.istanbul">Μετρό</string>
-    <string name="type.railway.station.subway.izmir">Μετρό</string>
-    <string name="type.railway.station.subway.kazan">Μετρό</string>
-    <string name="type.railway.station.subway.kharkiv">Μετρό</string>
-    <string name="type.railway.station.subway.kiev">Μετρό</string>
-    <string name="type.railway.station.subway.kobe">Μετρό</string>
-    <string name="type.railway.station.subway.kolkata">Μετρό</string>
-    <string name="type.railway.station.subway.kunming">Μετρό</string>
-    <string name="type.railway.station.subway.kyoto">Μετρό</string>
-    <string name="type.railway.station.subway.la">Μετρό</string>
-    <string name="type.railway.station.subway.lausanne">Μετρό</string>
-    <string name="type.railway.station.subway.lille">Μετρό</string>
-    <string name="type.railway.station.subway.lima">Μετρό</string>
-    <string name="type.railway.station.subway.lisboa">Μετρό</string>
-    <string name="type.railway.station.subway.london">Μετρό</string>
-    <string name="type.railway.station.subway.lyon">Μετρό</string>
-    <string name="type.railway.station.subway.madrid">Μετρό</string>
-    <string name="type.railway.station.subway.malaga">Μετρό</string>
-    <string name="type.railway.station.subway.manila">Μετρό</string>
-    <string name="type.railway.station.subway.maracaibo">Μετρό</string>
-    <string name="type.railway.station.subway.mashhad">Μετρό</string>
-    <string name="type.railway.station.subway.mecca">Μετρό</string>
-    <string name="type.railway.station.subway.medellin">Μετρό</string>
-    <string name="type.railway.station.subway.mexico">Μετρό</string>
-    <string name="type.railway.station.subway.milan">Μετρό</string>
-    <string name="type.railway.station.subway.minsk">Μετρό</string>
-    <string name="type.railway.station.subway.montreal">Μετρό</string>
-    <string name="type.railway.station.subway.moscow">Μετρό</string>
-    <string name="type.railway.station.subway.munchen">Μετρό</string>
-    <string name="type.railway.station.subway.nagoya">Μετρό</string>
-    <string name="type.railway.station.subway.newyork">Μετρό</string>
-    <string name="type.railway.station.subway.nnov">Μετρό</string>
-    <string name="type.railway.station.subway.novosibirsk">Μετρό</string>
-    <string name="type.railway.station.subway.osaka">Μετρό</string>
-    <string name="type.railway.station.subway.oslo">Μετρό</string>
-    <string name="type.railway.station.subway.palma">Μετρό</string>
-    <string name="type.railway.station.subway.panama">Μετρό</string>
-    <string name="type.railway.station.subway.paris">Μετρό</string>
-    <string name="type.railway.station.subway.philadelphia">Μετρό</string>
-    <string name="type.railway.station.subway.pyongyang">Μετρό</string>
-    <string name="type.railway.station.subway.rennes">Μετρό</string>
-    <string name="type.railway.station.subway.rio">Μετρό</string>
-    <string name="type.railway.station.subway.roma">Μετρό</string>
-    <string name="type.railway.station.subway.rotterdam">Μετρό</string>
-    <string name="type.railway.station.subway.samara">Μετρό</string>
-    <string name="type.railway.station.subway.santiago">Μετρό</string>
-    <string name="type.railway.station.subway.santo_domingo">Μετρό</string>
-    <string name="type.railway.station.subway.saopaulo">Μετρό</string>
-    <string name="type.railway.station.subway.sapporo">Μετρό</string>
-    <string name="type.railway.station.subway.sendai">Μετρό</string>
-    <string name="type.railway.station.subway.sf">Μετρό</string>
-    <string name="type.railway.station.subway.shanghai">Μετρό</string>
-    <string name="type.railway.station.subway.shenzhen">Μετρό</string>
-    <string name="type.railway.station.subway.shiraz">Μετρό</string>
-    <string name="type.railway.station.subway.singapore">Μετρό</string>
-    <string name="type.railway.station.subway.sofia">Μετρό</string>
-    <string name="type.railway.station.subway.spb">Μετρό</string>
-    <string name="type.railway.station.subway.stockholm">Μετρό</string>
-    <string name="type.railway.station.subway.tabriz">Μετρό</string>
-    <string name="type.railway.station.subway.taipei">Μετρό</string>
-    <string name="type.railway.station.subway.taoyuan">Μετρό</string>
-    <string name="type.railway.station.subway.tashkent">Μετρό</string>
-    <string name="type.railway.station.subway.tbilisi">Μετρό</string>
-    <string name="type.railway.station.subway.tehran">Μετρό</string>
-    <string name="type.railway.station.subway.tianjin">Μετρό</string>
-    <string name="type.railway.station.subway.tokyo">Μετρό</string>
-    <string name="type.railway.station.subway.valencia">Μετρό</string>
-    <string name="type.railway.station.subway.vienna">Μετρό</string>
-    <string name="type.railway.station.subway.warszawa">Μετρό</string>
-    <string name="type.railway.station.subway.washington">Μετρό</string>
-    <string name="type.railway.station.subway.wuhan">Μετρό</string>
-    <string name="type.railway.station.subway.yerevan">Μετρό</string>
-    <string name="type.railway.station.subway.yokohama">Μετρό</string>
+    <string name="type.railway.station.subway">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.adana">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.algiers">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.almaty">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.amsterdam">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.ankara">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.athens">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.baku">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.bangkok">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.barcelona">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.beijing">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.bengalore">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.berlin">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.bilbao">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.brasilia">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.brescia">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.brussels">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.bucharest">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.budapest">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.buenos_aires">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.bursa">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.cairo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.caracas">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.catania">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.changchun">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.chengdu">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.chicago">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.chongqing">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.dalian">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.delhi">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.dnepro">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.dubai">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.ekb">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.fukuoka">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.glasgow">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.guangzhou">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.hamburg">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.helsinki">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.hiroshima">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.hongkong">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.isfahan">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.istanbul">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.izmir">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kazan">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kharkiv">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kiev">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kobe">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kolkata">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kunming">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.kyoto">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.la">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.lausanne">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.lille">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.lima">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.lisboa">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.london">Υπόγειος σταθμός</string>
+    <string name="type.railway.station.subway.lyon">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.madrid">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.malaga">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.manila">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.maracaibo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.mashhad">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.mecca">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.medellin">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.mexico">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.milan">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.minsk">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.montreal">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.moscow">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.munchen">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.nagoya">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.newyork">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.nnov">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.novosibirsk">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.osaka">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.oslo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.palma">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.panama">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.paris">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.philadelphia">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.pyongyang">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.rennes">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.rio">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.roma">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.rotterdam">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.samara">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.santiago">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.santo_domingo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.saopaulo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.sapporo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.sendai">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.sf">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.shanghai">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.shenzhen">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.shiraz">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.singapore">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.sofia">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.spb">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.stockholm">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.tabriz">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.taipei">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.taoyuan">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.tashkent">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.tbilisi">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.tehran">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.tianjin">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.tokyo">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.valencia">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.vienna">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.warszawa">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.washington">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.wuhan">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.yerevan">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway.yokohama">Σταθμός μετρό</string>
     <string name="type.railway.subway_entrance">Είσοδος μετρό</string>
     <string name="type.railway.subway_entrance.adana">Είσοδος μετρό</string>
     <string name="type.railway.subway_entrance.algiers">Είσοδος μετρό</string>
@@ -1197,7 +1197,7 @@
     <string name="type.man_made.silo">Σιλό</string>
     <string name="type.power.pole">Ηλεκτρικός πόλος</string>
     <string name="type.man_made.utility_pole">Πόλος κοινής ωφέλειας</string>
-    <string name="type.railway.narrow_gauge.bridge">Σιδηροδρομική γέφυρα στενής γραμμής</string>
+    <string name="type.railway.narrow_gauge.bridge">Σιδηροδρομική γέφυρα στενού εύρους</string>
     <string name="type.aeroway">Υποδομή εναέριου χώρου</string>
     <string name="type.aeroway.apron">Ποδιά</string>
     <string name="type.aeroway.runway">Αεροδιάδρομος</string>
@@ -1248,4 +1248,12 @@
     <string name="type.aeroway.gate">Πύλη</string>
     <string name="type.amenity.atm">ATM</string>
     <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.railway.platform">Σιδηροδρομική πλατφόρμα</string>
+    <string name="type.railway.narrow_gauge.tunnel">Σιδηροδρομική σήραγγα στενού εύρους</string>
+    <string name="type.railway.subway.bridge">Γέφυρα γραμμής μετρό</string>
+    <string name="type.railway.subway">Γραμμή μετρό</string>
+    <string name="type.highway.ladder">Σκάλα</string>
+    <string name="type.railway.subway.tunnel">Σήραγγα γραμμής μετρό</string>
+    <string name="type.man_made.crane">Γερανός</string>
+    <string name="type.railway.station.subway.qingdao">Σταθμός μετρό</string>
 </resources>

android/app/src/main/res/values-es-rMX/types_strings.xml

@@ -5,7 +5,7 @@
     <string name="type.amenity.bbq">Barbacoa</string>
     <string name="type.amenity.bicycle_parking">Estacionamiento de bicicletas</string>
     <string name="type.amenity.bicycle_rental">Renta de bicicletas</string>
-    <string name="type.amenity.car_rental">Renta de coches</string>
+    <string name="type.amenity.car_rental">Renta de autos</string>
     <string name="type.amenity.car_wash">Autolavado</string>
     <string name="type.amenity.kindergarten">Jardín de niños</string>
     <string name="type.amenity.motorcycle_parking">Estacionamiento de motocicletas</string>

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

@@ -25,7 +25,7 @@
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">Buscar en el mapa</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">No se puede acceder a los servicios de localización en este dispositivo o aplicación. Actívelos en la configuración.</string>
+    <string name="location_is_disabled_long_text">Actualmente tienes desactivados todos los Servicios de Localización para este dispositivo o aplicación. Actívalos en Ajustes.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Precisión limitada</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
@@ -42,7 +42,7 @@
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Fácil de utilizar y depurado</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• Enfocado a la privacidad y sin anuncios</string>
+    <string name="about_proposition_2">• Enfocado en la privacidad y sin anuncios</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• No necesita conexión a internet, rápido y compacto</string>
     <!-- Text in About screen -->
@@ -58,7 +58,7 @@
     <string name="not_enough_free_space_on_sdcard">Libere espacio en la memoria SD o almacenamiento USB para usar la aplicación</string>
     <string name="download_resources">Antes de comenzar, permita que descarguemos en su dispositivo un mapamundi general. \nSe requieren %s de almacenamiento.</string>
     <string name="download_resources_continue">Ir al mapa</string>
-    <string name="downloading_country_can_proceed">Descargando %1$s (%2$s). Puede ahora \nproceder al mapa.</string>
+    <string name="downloading_country_can_proceed">Descargando %1$s (%2$s). Ya puede \nproceder al mapa.</string>
     <string name="download_country_ask">¿Descargar %1$s? (%2$s)</string>
     <string name="update_country_ask">¿Actualizar %1$s? (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -68,7 +68,7 @@
     <!-- Show popup notification on top of the map when country download has failed. -->
     <string name="download_country_failed">No se pudo descargar %s</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Agregar un grupo nuevo</string>
+    <string name="add_new_set">Agregar una lista nueva</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Nombre del grupo de marcadores</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -106,7 +106,7 @@
     <!-- Error moving map files from one storage to another -->
     <string name="move_maps_error">Error al mover los archivos de mapas</string>
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Esto podría tardar varios minutos. \nAguarde un momento…</string>
+    <string name="wait_several_minutes">Esto podría tardar varios minutos.\nAguarda…</string>
     <!-- Measurement units title in settings activity -->
     <string name="measurement_units">Unidades de medida</string>
     <!-- Detailed description of Measurement Units settings button -->
@@ -119,7 +119,7 @@
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
     <string name="category_transport">Transporte</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
-    <string name="category_fuel">Gasolinera</string>
+    <string name="category_fuel">Estación de Servicio</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
     <string name="category_parking">Aparcamiento</string>
     <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
@@ -163,11 +163,11 @@
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
     <string name="share_bookmarks_email_subject">Marcadores de CoMaps compartidos con usted</string>
-    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/download/ \n\n¡Disfrute viajando con CoMaps!</string>
+    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/es/download/ \n\n¡Disfrute viajando con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Cargando marcadores</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores.</string>
+    <string name="load_kmz_successful">¡Los marcadores se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Marcadores.</string>
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">No se pudieron cargar los marcadores. El archivo podría tener daños o defectos.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -177,23 +177,23 @@
     <!-- resource for context menu -->
     <string name="edit">Editar</string>
     <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">Aún no se ha determinado su ubicación</string>
+    <string name="unknown_current_position">Aún no se ha determinado tu ubicación</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Lo sentimos, la configuración del almacenamiento de mapas está desactivada</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">La descarga del mapa está en curso</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">¡Mire mi ubicación actual en CoMaps! %1$s o %2$s ¿No tiene mapas offline? Descárguelos aquí: https://www.comaps.app/download/</string>
+    <string name="my_position_share_sms">¡Mira mi ubicación actual en CoMaps! %1$s o %2$s ¿No tiene mapas offline? Descárgalos aquí: https://www.comaps.app/es/download/</string>
     <!-- Subject for emailed bookmark -->
     <string name="bookmark_share_email_subject">¡Mira mi marcador en el mapa de CoMaps!</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">¡Mira mi ubicación actual en el mapa en CoMaps!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
-    <string name="my_position_share_email">Hola: \n \nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o esta %3$s para verlo en el mapa. \n \nGracias.</string>
+    <string name="my_position_share_email">Hola: \n \nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o este %3$s para verlo en el mapa. \n \nGracias.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Compartir</string>
     <!-- Share by email button text, also used in editor and About. -->
-    <string name="email">Correo</string>
+    <string name="email">Correo electrónico</string>
     <!-- Text for message when used successfully copied something -->
     <string name="copied_to_clipboard">Copiado en el portapapeles: %s</string>
     <!-- Used for bookmark editing -->
@@ -201,9 +201,9 @@
     <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
     <string name="data_version">Datos de OpenStreetMap: %s</string>
     <!-- Confirmation for OpenStreetMap log out. -->
-    <string name="osm_log_out_confirmation">¿Quiere salir de su cuenta de OpenStreetMap?</string>
+    <string name="osm_log_out_confirmation">¿Quieres salir de tu cuenta de OpenStreetMap?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Trayectos</string>
+    <string name="tracks_title">Trazas</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Longitud</string>
     <string name="share_my_location">Compartir mi ubicación</string>
@@ -213,7 +213,7 @@
     <string name="prefs_group_information">Información</string>
     <string name="prefs_group_route">Navegación</string>
     <string name="pref_zoom_title">Botones de zoom</string>
-    <string name="pref_zoom_summary">Visualización en la pantalla</string>
+    <string name="pref_zoom_summary">Visualizar en la pantalla</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Modo nocturno</string>
     <!-- Generic «Off» string -->
@@ -229,7 +229,7 @@
     <!-- A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled -->
     <string name="pref_map_3d_buildings_disabled_summary">Los edificios 3D se desactivan en el modo de ahorro de energía</string>
     <!-- Settings «Route» category: «Tts enabled» title -->
-    <string name="pref_tts_enable_title">Instrucciones de voz</string>
+    <string name="pref_tts_enable_title">Indicaciones por voz</string>
     <!-- Settings «Route» category: «Tts announce street names» title -->
     <string name="pref_tts_street_names_title">Anunciar nombres de calles</string>
     <!-- Settings «Route» category: «Tts announce street names» description -->
@@ -268,9 +268,9 @@
     <!-- Text in menu + Button in the main Help dialog -->
     <string name="report_a_bug">Informar de un fallo</string>
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
-    <string name="compass_calibration_recommended">Mejore la dirección de la flecha moviendo el teléfono en forma de ocho para calibrar la brújula.</string>
+    <string name="compass_calibration_recommended">Mejora la dirección de la flecha moviendo el teléfono en forma de ocho para calibrar la brújula.</string>
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
-    <string name="compass_calibration_required">Mueva el teléfono en forma de ocho para calibrar la brújula y fijar la dirección de la flecha en el mapa.</string>
+    <string name="compass_calibration_required">Mueve el teléfono en forma de ocho para calibrar la brújula y fijar la dirección de la flecha en el mapa.</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
     <string name="long_tap_toast">Vuelva a pulsar prolongadamente sobre el mapa para ver la interfaz</string>
     <!-- Update all button text -->
@@ -305,13 +305,13 @@
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
-    <string name="routing_download_maps_along">Descargue todos los mapas de su ruta</string>
+    <string name="routing_download_maps_along">Descarga todos los mapas de tu ruta</string>
     <!-- Text for routing error dialog -->
     <string name="routing_requires_all_map">Para crear una ruta es necesario descargar y actualizar todos los mapas desde su ubicación a su destino.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">No hay suficiente espacio</string>
     <!-- location service disabled -->
-    <string name="enable_location_services">Por favor, active los servicios de localización</string>
+    <string name="enable_location_services">Por favor, activa los Servicios de Localización</string>
     <string name="save">Guardar</string>
     <string name="create">crear</string>
     <!-- red color -->
@@ -355,15 +355,15 @@
     <string name="dialog_routing_disclaimer_beware">¡Manténgase alerta y a salvo durante el viaje!</string>
     <string name="dialog_routing_check_gps">Verificar la señal del GPS</string>
     <string name="dialog_routing_error_location_not_found">No se puede crear la ruta. No se pudieron identificar las coordenadas actuales del GPS.</string>
-    <string name="dialog_routing_location_turn_wifi">Verifique la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación.</string>
+    <string name="dialog_routing_location_turn_wifi">Verifica la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación.</string>
     <string name="dialog_routing_location_turn_on">Activar servicios de ubicación</string>
-    <string name="dialog_routing_location_unknown_turn_on">No se pueden encontrar las coordenadas del GPS. Active los servicios de ubicación para calcular la ruta.</string>
-    <string name="dialog_routing_unable_locate_route">Imposible de encontrar una ruta</string>
+    <string name="dialog_routing_location_unknown_turn_on">No se pueden encontrar las coordenadas del GPS. Activa los servicios de ubicación para calcular la ruta.</string>
+    <string name="dialog_routing_unable_locate_route">No se pudo encontrar una ruta</string>
     <string name="dialog_routing_cant_build_route">No se puede crear la ruta</string>
-    <string name="dialog_routing_change_start_or_end">Ajuste su punto de inicio o su destino.</string>
+    <string name="dialog_routing_change_start_or_end">Ajusta tu punto de inicio o tu destino.</string>
     <string name="dialog_routing_change_start">Ajustar el punto de inicio</string>
     <string name="dialog_routing_start_not_determined">La ruta no se creó. No se pudo encontrar el punto de inicio.</string>
-    <string name="dialog_routing_select_closer_start">Seleccione un punto de inicio cercano a una carretera.</string>
+    <string name="dialog_routing_select_closer_start">Selecciona un punto de inicio cercano a una carretera.</string>
     <string name="dialog_routing_change_end">Ajustar destino</string>
     <string name="dialog_routing_end_not_determined">La ruta no se creó. No se pudo encontrar el destino.</string>
     <string name="dialog_routing_select_closer_end">Seleccione un punto de destino cercano a una carretera</string>
@@ -371,12 +371,12 @@
     <string name="dialog_routing_intermediate_not_determined">Por favor, ajuste la parada intermedia</string>
     <string name="dialog_routing_system_error">Error del sistema</string>
     <string name="dialog_routing_application_error">No se pudo crear la ruta debido a un error en la aplicación</string>
-    <string name="dialog_routing_try_again">Intentar nuevamente</string>
-    <string name="not_now">No ahora</string>
-    <string name="dialog_routing_download_and_build_cross_route">¿Desea descargar el mapa y crear una ruta mejor que abarque más de un mapa?</string>
-    <string name="dialog_routing_download_cross_route">Descargue mapas adicionales para crear una ruta mejor que cruce los límites de este mapa.</string>
+    <string name="dialog_routing_try_again">Intenta nuevamente</string>
+    <string name="not_now">Ahora no</string>
+    <string name="dialog_routing_download_and_build_cross_route">¿Deseas descargar el mapa y crear una ruta mejor que abarque más de un mapa?</string>
+    <string name="dialog_routing_download_cross_route">Descarga mapas adicionales para crear una ruta mejor que cruce los límites de este mapa.</string>
     <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Para empezar a buscar y crear rutas, descargue el mapa. Después de eso, ya no necesitará una conexión a Internet.</string>
+    <string name="search_without_internet_advertisement">Para empezar a buscar y crear rutas, descarga el mapa. Después de eso, ya no necesitarás una conexión a Internet.</string>
     <string name="search_select_map">Seleccionar mapa</string>
     <!-- «Show» context menu -->
     <string name="show">Mostrar</string>
@@ -386,18 +386,18 @@
     <string name="history">Historial</string>
     <string name="search_not_found">No se encontró ningún resultado</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Descargue la región en la que está buscando o pruebe a añadir el nombre de una ciudad/pueblo cercano.</string>
+    <string name="search_not_found_query">Descarga la región en la que estás buscando o prueba añadir el nombre de una ciudad/pueblo cercano.</string>
     <string name="search_history_title">Historial de búsquedas</string>
     <string name="search_history_text">Ver búsquedas recientes</string>
     <string name="clear_search">Vaciar historial de búsquedas</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipedia</string>
-    <string name="p2p_your_location">Su ubicación</string>
+    <string name="p2p_your_location">Tu ubicación</string>
     <string name="p2p_start">Empezar</string>
     <string name="p2p_from_here">Ruta desde</string>
     <string name="p2p_to_here">Ruta hacia</string>
     <string name="p2p_only_from_current">La navegación solo está disponible desde su ubicación actual</string>
-    <string name="p2p_reroute_from_current">¿Quiere planificar un itinerario desde su ubicación actual?</string>
+    <string name="p2p_reroute_from_current">¿Quieres planificar una ruta desde tu ubicación actual?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Siguiente</string>
     <!-- Tab title in the Edit Opening Hours time picker -->
@@ -408,21 +408,21 @@
     <string name="editor_time_delete">Eliminar horario</string>
     <!-- Text for allday switch. -->
     <string name="editor_time_allday">Todo el día (24 horas)</string>
-    <string name="editor_time_open">Abierto</string>
-    <string name="editor_time_close">Cerrado</string>
-    <string name="editor_time_add_closed">Añadir horas de cierre</string>
+    <string name="editor_time_open">Apertura</string>
+    <string name="editor_time_close">Cierre</string>
+    <string name="editor_time_add_closed">Añadir horas de pausa</string>
     <string name="editor_time_title">Horario de apertura</string>
     <string name="editor_time_advanced">Modo avanzado</string>
     <string name="editor_time_simple">Modo sencillo</string>
-    <string name="editor_hours_closed">Horas de cierre</string>
+    <string name="editor_hours_closed">Horas de pausa</string>
     <string name="editor_example_values">Valores de ejemplo</string>
     <string name="editor_correct_mistake">Corregir error</string>
-    <string name="editor_add_select_location">Seleccione la ubicación</string>
-    <string name="editor_report_problem_desription_1">Por favor, describa el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error.</string>
-    <string name="editor_report_problem_desription_2">O hágalo usted mismo en https://www.openstreetmap.org/</string>
+    <string name="editor_add_select_location">Selecciona la ubicación</string>
+    <string name="editor_report_problem_desription_1">Por favor, describe el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error.</string>
+    <string name="editor_report_problem_desription_2">O hazlo tú mismo en https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Enviar</string>
     <string name="editor_report_problem_title">Problema</string>
-    <string name="editor_report_problem_no_place_title">El lugar no existe</string>
+    <string name="editor_report_problem_no_place_title">Este lugar no existe</string>
     <string name="editor_report_problem_under_construction_title">Сerrado por mantenimiento</string>
     <string name="editor_report_problem_duplicate_place_title">Lugar duplicado</string>
     <string name="autodownload">Descarga automática</string>
@@ -436,14 +436,14 @@
     <string name="closes_in">Cierra en %s</string>
     <string name="closed">Cerrado</string>
     <string name="edit_opening_hours">Editar los horarios de apertura</string>
-    <string name="no_osm_account">¿No tiene cuenta en OpenStreetMap?</string>
+    <string name="no_osm_account">¿No tienes cuenta en OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Registrarse en OpenStreetMap</string>
     <string name="login">Acceder</string>
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">No se ha iniciado sesión</string>
     <string name="login_osm">Acceder a OpenStreetMap</string>
     <string name="password">Contraseña</string>
-    <string name="forgot_password">¿Ha olvidado su contraseña?</string>
+    <string name="forgot_password">¿Has olvidado tu contraseña?</string>
     <string name="logout">Cerrar sesión</string>
     <string name="edit_place">Editar el lugar</string>
     <string name="add_language">Añadir un idioma</string>
@@ -458,7 +458,7 @@
     <!-- Error to display when a new street name is not entered in the New street dialog -->
     <string name="empty_street_name_error">Ingrese un nombre de calle</string>
     <string name="choose_language">Elegir un idioma</string>
-    <string name="choose_street">Elija una calle</string>
+    <string name="choose_street">Elije una calle</string>
     <string name="postal_code">Código postal</string>
     <string name="cuisine">Cocina</string>
     <string name="select_cuisine">Seleccionar cocina</string>
@@ -469,7 +469,7 @@
     <string name="downloader_delete_map_dialog">Todas las ediciones hechas al mapa se eliminarán junto con este</string>
     <string name="downloader_update_maps">Actualizar mapas</string>
     <string name="downloader_mwm_migration_dialog">Para crear una ruta, es necesario actualizar todos los mapas y volver a planificar la ruta.</string>
-    <string name="downloader_search_field_hint">Buscar en el mapa</string>
+    <string name="downloader_search_field_hint">Buscar mapa</string>
     <string name="common_check_internet_connection_dialog">Revise la configuración y asegúrese de que su dispositivo esté conectado a Internet</string>
     <string name="downloader_no_space_title">No hay suficiente espacio</string>
     <string name="downloader_no_space_message">Elimine los datos innecesarios</string>
@@ -489,7 +489,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Datos de OpenStreetMap creados por la comunidad a partir de %s. Más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) es un proyecto comunitario para construir un mapa libre y abierto. Es la principal fuente de datos cartográficos de CoMaps y funciona de forma similar a Wikipedia. Usted puede añadir o editar lugares y estos pasan a estar disponibles para millones de usuarios de todo el mundo.\n¡Únase a la comunidad y ayude a crear un mapa mejor para todos!</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) es un proyecto comunitario para construir un mapa libre y abierto. Es la principal fuente de datos cartográficos de CoMaps y funciona de forma similar a Wikipedia. Puedes añadir o editar lugares y estos pasan a estar disponibles para millones de usuarios en todo el mundo.\n¡Únete a la comunidad y ayuda a crear un mapa mejor para todos!</string>
     <string name="login_to_make_edits_visible">Cree una cuenta OpenStreetMap o inicie sesión para publicar sus ediciones de mapas en todo el mundo</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
@@ -497,7 +497,7 @@
     <string name="download_over_mobile_message">Podría ser muy caro con ciertos planes o con itinerancia de datos</string>
     <string name="error_enter_correct_house_number">Introducir el número de domicilio correcto</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
-    <string name="error_enter_correct_storey_number">El número de plantas no debe superar %d</string>
+    <string name="error_enter_correct_storey_number">El número de niveles no debe superar %d</string>
     <string name="editor_zip_code">Código postal</string>
     <string name="error_enter_correct_zip_code">Introduzca un código postal válido</string>
     <!-- Place Page title for long tap -->
@@ -505,18 +505,18 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota para los voluntarios de OpenStreetMap (opcional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Describa los errores en el mapa o las cosas que no se pueden editar con CoMaps</string>
+    <string name="editor_note_hint">Describe los errores en el mapa o las cosas que no se pueden editar con CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Sus ediciones se cargan en la base de datos pública <a href="https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap">OpenStreetMap</a>. Por favor, no añada información personal o protegida por derechos de autor.</string>
     <string name="editor_more_about_osm">Más acerca de OpenStreetMap</string>
-    <string name="editor_osm_history">Su historial de ediciones</string>
-    <string name="editor_osm_notes">Mis notas de datos cartográficos</string>
+    <string name="editor_osm_history">Tu historial de ediciones</string>
+    <string name="editor_osm_notes">Tus notas de datos cartográficos</string>
     <string name="editor_operator">Operador</string>
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operador: %s</string>
     <string name="editor_category_unsuitable_title">¿No halla una categoría adecuada?</string>
-    <string name="editor_category_unsuitable_text">CoMaps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añada dichas categorías directamente a <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nuestra <a href="https://www.comaps.app/support/advanced-map-editing/">guía</a> para obtener instrucciones detalladas paso a paso.</string>
-    <string name="downloader_no_downloaded_maps_title">No ha descargado ningún mapa</string>
+    <string name="editor_category_unsuitable_text">CoMaps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añade dichas categorías directamente en <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulta nuestra <a href="https://www.comaps.app/support/advanced-map-editing/">guía</a> para obtener instrucciones detalladas paso a paso.</string>
+    <string name="downloader_no_downloaded_maps_title">No has descargado ningún mapa</string>
     <string name="downloader_no_downloaded_maps_message">Descargue mapas para encontrar la ubicación y navegar sin conexión</string>
     <string name="current_location_unknown_error_title">Se desconoce la ubicación actual</string>
     <!-- abbreviation for meters -->
@@ -543,32 +543,32 @@
     <string name="editor_remove_place_button">Eliminar</string>
     <string name="editor_place_doesnt_exist">El lugar no existe</string>
     <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
-    <string name="delete_place_empty_comment_error">Indique la razón para eliminar el lugar</string>
+    <string name="delete_place_empty_comment_error">Indica la razón para eliminar el lugar</string>
     <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Introduzca un número de teléfono válido</string>
-    <string name="error_enter_correct_web">Introduzca una dirección web válida</string>
-    <string name="error_enter_correct_email">Introduzca un correo válido</string>
-    <string name="error_enter_correct_facebook_page">Introduzca una dirección web, una cuenta o un nombre de página de Facebook válidos</string>
+    <string name="error_enter_correct_phone">Introduce un número de teléfono válido</string>
+    <string name="error_enter_correct_web">Introduce una dirección web válida</string>
+    <string name="error_enter_correct_email">Introduce un correo electrónico válido</string>
+    <string name="error_enter_correct_facebook_page">Introduce una dirección web, una cuenta o un nombre de página de Facebook válidos</string>
     <string name="error_enter_correct_instagram_page">Introduzca una dirección web o un nombre de cuenta de Instagram válidos</string>
-    <string name="error_enter_correct_twitter_page">Introduzca una dirección web o un nombre de usuario válido de Twitter</string>
+    <string name="error_enter_correct_twitter_page">Introduce una dirección web o un nombre de usuario válido de Twitter</string>
     <string name="error_enter_correct_vk_page">Introduzca una dirección web o un nombre de cuenta de VK válidos</string>
     <string name="error_enter_correct_line_page">Introduzca una dirección web o ID de LINE válidos</string>
     <string name="placepage_add_place_button">Añadir lugar a OpenStreetMap</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
-    <string name="editor_share_to_all_dialog_title">¿Quiere enviarlo a todos los usuarios?</string>
+    <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal</string>
     <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Grabando el trayecto</string>
+    <string name="track_recording">Grabando el trayeco</string>
     <!-- For the first routing -->
     <string name="accept">Aceptar</string>
     <!-- For the first routing -->
     <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">Solo hoy</string>
+    <string name="mobile_data_option_today">Sólo hoy</string>
     <string name="mobile_data_option_not_today">No usar hoy</string>
     <string name="mobile_data">Internet móvil</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
@@ -577,7 +577,7 @@
     <string name="mobile_data_option_ask">Preguntar siempre</string>
     <string name="traffic_update_maps_text">Para mostrar los datos de tráfico, deben actualizarse los mapas</string>
     <string name="big_font">Aumentar tamaño del texto en el mapa</string>
-    <string name="traffic_update_app">Actualice CoMaps</string>
+    <string name="traffic_update_app">Actualiza CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Los datos de tráfico no están disponibles</string>
     <string name="enable_logging">Activar registros</string>
@@ -616,28 +616,28 @@
     </plurals>
     <string name="bookmarks_create_new_group">Crear nueva lista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar marcadores y trayectos</string>
+    <string name="bookmarks_import">Importar marcadores y trazas</string>
     <string name="bookmarks_error_message_share_general">No se puede compartir debido a un error de la aplicación</string>
     <string name="bookmarks_error_title_share_empty">Error al compartir</string>
     <string name="bookmarks_error_message_share_empty">No se puede compartir una lista vacía</string>
     <string name="bookmarks_error_title_empty_list_name">El nombre no puede quedar vacío</string>
     <string name="bookmarks_error_message_empty_list_name">Proporcione el nombre de la lista</string>
     <string name="bookmarks_new_list_hint">Lista nueva</string>
-    <string name="bookmarks_error_title_list_name_already_taken">Este nombre ya existe</string>
-    <string name="bookmarks_error_message_list_name_already_taken">Elija otro nombre</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Este nombre ya está ocupado</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Elije otro nombre</string>
     <string name="please_wait">Espere…</string>
     <string name="phone_number">Número de teléfono</string>
     <string name="profile">Perfil de OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">Se encontró %d archivo. Lo verá después de la conversión.</item>
-        <item quantity="many">Se han encontrado %d archivos. Los verá después de la conversión.</item>
-        <item quantity="other">Se han encontrado %d archivos. Los verá después de la conversión.</item>
+        <item quantity="one">Se encontró %d archivo. Lo verás después de la conversión.</item>
+        <item quantity="many">Se han encontrado %d archivos. Los verás después de la conversión.</item>
+        <item quantity="other">Se han encontrado %d archivos. Los verás después de la conversión.</item>
     </plurals>
     <string name="restore">Restaurar</string>
     <plurals name="tracks">
-        <item quantity="one">%d trayecto</item>
-        <item quantity="many">%d trayectos</item>
-        <item quantity="other">%d trayectos</item>
+        <item quantity="one">%d traza</item>
+        <item quantity="many">%d trazas</item>
+        <item quantity="other">%d trazas</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Privacidad</string>
@@ -656,7 +656,7 @@
     <string name="public_access">Acceso público</string>
     <string name="limited_access">Acceso limitado</string>
     <string name="not_shared">Privado</string>
-    <string name="speedcams_alert_title">Cámaras de velocidad</string>
+    <string name="speedcams_alert_title">Radares de velocidad</string>
     <string name="place_description_title">Descripción del lugar</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
     <string name="notification_channel_downloader">Descargar mapas</string>

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

@@ -4,7 +4,7 @@
     <string name="type.addr_interpolation">Dirección/manzana</string>
     <string name="type.addr_interpolation.even">Dirección/manzana</string>
     <string name="type.addr_interpolation.odd">Dirección/manzana</string>
-    <string name="type.aerialway">Transporte aéreo</string>
+    <string name="type.aerialway">Transporte por Cable</string>
     <string name="type.aerialway.cable_car">Teleférico</string>
     <string name="type.aerialway.chair_lift">Telesilla</string>
     <string name="type.aerialway.drag_lift">Telesquí</string>
@@ -37,7 +37,7 @@
     <string name="type.amenity.cafe">Café</string>
     <string name="type.amenity.car_rental">Alquiler de coches</string>
     <string name="type.amenity.motorcycle_rental">Alquiler de motocicletas</string>
-    <string name="type.amenity.car_sharing">Compartir coche</string>
+    <string name="type.amenity.car_sharing">Car Sharing</string>
     <string name="type.amenity.car_wash">Lavado de coches</string>
     <string name="type.amenity.casino">Casino</string>
     <string name="type.amenity.gambling">Juegos de apuestas</string>
@@ -50,7 +50,7 @@
     <string name="type.amenity.cinema">Cine</string>
     <string name="type.leisure.bowling_alley">Bolera</string>
     <string name="type.amenity.clinic">Clínica</string>
-    <string name="type.amenity.college">Colegio</string>
+    <string name="type.amenity.college">Facultad</string>
     <string name="type.amenity.community_centre">Centro comunitario</string>
     <string name="type.amenity.compressed_air">Aire comprimido</string>
     <string name="type.amenity.conference_centre">Centro de conferencias</string>
@@ -180,7 +180,7 @@
     <string name="type.amenity.vending_machine.excrement_bags">Maquina expendedora de bolsas para excrementos</string>
     <string name="type.amenity.parcel_locker">Taquilla de paquetes</string>
     <string name="type.amenity.vehicle_inspection">Inspección de vehículos</string>
-    <string name="type.amenity.vending_machine.fuel">Maquina expendedora de combustible</string>
+    <string name="type.amenity.vending_machine.fuel">Surtidor de combustible</string>
     <string name="type.amenity.veterinary">Clínica veterinaria</string>
     <string name="type.amenity.waste_basket">Papelera</string>
     <string name="type.amenity.waste_disposal">Contenedor de basura</string>
@@ -226,11 +226,11 @@
     <string name="type.boundary.protected_area.4">Área protegida</string>
     <string name="type.boundary.protected_area.5">Área protegida</string>
     <string name="type.boundary.protected_area.6">Área protegida</string>
-    <string name="type.building">Edificio</string>
+    <string name="type.building">Edificación</string>
     <!-- Duplicates [address] in strings.txt -->
     <string name="type.building.address">Dirección</string>
-    <string name="type.building.has_parts">Edificio</string>
-    <string name="type.building_part">Edificio</string>
+    <string name="type.building.has_parts">Edificación</string>
+    <string name="type.building_part">Edificación</string>
     <string name="type.building.garage">Garaje</string>
     <string name="type.building.train_station">Edificio de la estación</string>
     <string name="type.building.warehouse">Almacén</string>
@@ -243,22 +243,22 @@
     <string name="type.craft.carpenter">Carpintero</string>
     <string name="type.craft.confectionery">Confitería</string>
     <string name="type.craft.electrician">Electricista</string>
-    <string name="type.craft.electronics_repair">Reparación de aparatos electrónicos</string>
+    <string name="type.craft.electronics_repair">Reparación de electrónicos</string>
     <string name="type.craft.gardener">Paisajista</string>
     <string name="type.craft.grinding_mill">Molino de molienda</string>
     <string name="type.craft.handicraft">Artesanía</string>
     <!-- Heating, Ventilation, and Air Conditioning -->
-    <string name="type.craft.hvac">Calefacción, ventilación y aire acondicionado</string>
+    <string name="type.craft.hvac">Climatización</string>
     <string name="type.craft.key_cutter">Copista de llaves</string>
-    <string name="type.craft.locksmith">Cerrajero</string>
-    <string name="type.craft.metal_construction">Trabajador del metal</string>
+    <string name="type.craft.locksmith">Cerrajería</string>
+    <string name="type.craft.metal_construction">Metalistería</string>
     <string name="type.craft.painter">Pintor</string>
     <string name="type.craft.photographer">Fotógrafo</string>
-    <string name="type.shop.camera">Tienda de cámaras</string>
+    <string name="type.shop.camera">Tienda de fotografía</string>
     <string name="type.craft.plumber">Fontanero</string>
     <string name="type.craft.sawmill">Serrería</string>
     <string name="type.craft.shoemaker">Zapatero</string>
-    <string name="type.craft.winery">Bodega</string>
+    <string name="type.craft.winery">Bodega vinícola</string>
     <string name="type.craft.tailor">Sastre</string>
     <string name="type.cuisine.african">Africana</string>
     <string name="type.cuisine.american">Estadounidense</string>
@@ -266,7 +266,7 @@
     <string name="type.cuisine.argentinian">Argentina</string>
     <string name="type.cuisine.asian">Asiática</string>
     <string name="type.cuisine.austrian">Austriaca</string>
-    <string name="type.cuisine.bagel">Bágel</string>
+    <string name="type.cuisine.bagel">Bagel</string>
     <string name="type.cuisine.balkan">Balcánica</string>
     <string name="type.cuisine.barbecue">Barbacoa</string>
     <string name="type.cuisine.bavarian">Bávara</string>
@@ -275,7 +275,7 @@
     <string name="type.cuisine.breakfast">Desayunos</string>
     <string name="type.cuisine.bubble_tea">Té de burbujas</string>
     <string name="type.cuisine.burger">Hamburguesería</string>
-    <string name="type.cuisine.buschenschank">Buschenschank (especialidad austríaca)</string>
+    <string name="type.cuisine.buschenschank">Buschenschank</string>
     <string name="type.cuisine.cake">Tartas</string>
     <string name="type.cuisine.caribbean">Caribeña</string>
     <string name="type.cuisine.chicken">Pollo</string>
@@ -474,11 +474,11 @@
     <string name="type.highway.service">Vía de servicio</string>
     <string name="type.highway.service.area">Vía de servicio</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
-    <string name="type.highway.service.bridge">Puente de carretera de servicio</string>
+    <string name="type.highway.service.bridge">Puente</string>
     <string name="type.highway.service.driveway">Vía de servicio</string>
     <string name="type.highway.service.parking_aisle">Pasillo de aparcamiento</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.service.tunnel">Túnel de vía de servicio</string>
+    <string name="type.highway.service.tunnel">Túnel</string>
     <string name="type.highway.services">Área de servicio</string>
     <string name="type.highway.speed_camera">Radar de velocidad</string>
     <string name="type.highway.steps">Escaleras</string>

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

@@ -240,7 +240,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Langue vocale</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Teste les instructions vocales (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Tester les instructions vocales</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Vérifiez le volume ou les paramètres de synthèse vocale du système si vous n\'entendez pas la voix maintenant</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -504,7 +504,7 @@
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Le nombre d\'étages ne doit pas dépasser %d</string>
     <string name="editor_zip_code">Code postal</string>
-    <string name="error_enter_correct_zip_code">Entrer un code postal valide</string>
+    <string name="error_enter_correct_zip_code">Saisissez un code postal valide</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">Point sur la carte</string>
     <!-- Title for OSM note section in the editor -->

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

@@ -225,7 +225,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Lingua per la voce</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Prova le indicazioni vocali (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Prova le indicazioni vocali</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se ora non senti la voce</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -913,4 +913,7 @@
     <string name="pref_backup_status_summary_success">Ultimo backup riuscito</string>
     <string name="dialog_report_error_missing_folder">Il percorso di backup selezionato non è disponibile o non ha i permessi in scrittura. Selezionare un percorso differente.</string>
     <string name="panoramax">Immagine Panoramax</string>
+    <string name="open_now">Aperto adesso</string>
+    <string name="closed_now">Chiuso adesso</string>
+    <string name="at">alle %s</string>
 </resources>

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

@@ -594,7 +594,7 @@
     <string name="type.landuse.flowerbed">Aiuola</string>
     <string name="type.landuse.forest">Foresta</string>
     <string name="type.landuse.forest.coniferous">Foresta di conifere</string>
-    <string name="type.landuse.forest.deciduous">Foresta de cidua</string>
+    <string name="type.landuse.forest.deciduous">Foresta decidua</string>
     <string name="type.landuse.forest.mixed">Foresta mista</string>
     <string name="type.landuse.garages">Garage</string>
     <string name="type.landuse.grass">Prato erboso</string>
@@ -1235,7 +1235,7 @@
     <string name="type.attraction.water_slide">Scivolo d\'acqua</string>
     <string name="type.tourism.attraction.specified">Attrattiva</string>
     <string name="type.tourism.camp_site">Campeggio</string>
-    <string name="type.tourism.caravan_site">Area per campeggiatori</string>
+    <string name="type.tourism.caravan_site">Area camper</string>
     <!-- A rentable countryside vacation house. -->
     <string name="type.tourism.chalet">Cottage per le vacanze</string>
     <string name="type.tourism.gallery">Galleria</string>
@@ -1409,6 +1409,6 @@
     <string name="type.natural.wetland.saltmarsh.tidal">Palude Salmastra di Marea</string>
     <string name="type.natural.wetland.reedbed">Giunco</string>
     <string name="type.natural.wetland.tidalflat">Piana di Marea</string>
-    <string name="type.natural.wetland.fen">Paludre</string>
+    <string name="type.natural.wetland.fen">Palude</string>
     <string name="type.leisure.escape_game">Escape Room</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="delete">Šalinti</string>
     <string name="download_maps">Atsiųsti žemėlapius</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Atsiuntimas nepavyko. Bakstelėkite, kad būtų pabandyta dar kartą.</string>
+    <string name="download_has_failed">Atsiuntimas nepavyko, bakstelėkite pabandyti dar kartą</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Atsiunčiama…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -32,7 +32,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Ribotas tikslumas</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">Jeigu norite užtikrinti tikslią navigaciją, nustatymuose įjunkite galimybę nustatyti tikslią vietą.</string>
+    <string name="precise_location_is_disabled_long_text">Jeigu norite užtikrinti tikslią navigaciją, nustatymuose įjunkite galimybę nustatyti tikslią vietą</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Rodyti žemėlapyje</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -49,7 +49,7 @@
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Veikia sparčiai, kompaktiškai ir be interneto</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Atvirojo kodo programėlė, sukurta entuziastų ir savanorių.</string>
+    <string name="about_developed_by_enthusiasts">Visiškai atvirojo kodo programėlė, sukurta nesiekiant pelno, skaidriai priimant sprendimus ir tvarkant finansus.</string>
     <string name="close">Užverti</string>
     <string name="unsupported_phone">Šiai programėlei reikia aparatinio „OpenGL“ spartinimo. Deja, jūsų įrenginys nepalaikomas.</string>
     <string name="download">Atsiųsti</string>
@@ -174,9 +174,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Jūsų vieta dar nenustatyta</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Deja, šiuo metu žemėlapio saugyklos nustatymai negalimi.</string>
+    <string name="cant_change_this_setting">Deja, šiuo metu žemėlapio saugyklos nustatymai negalimi</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Vyksta žemėlapio atsiuntimas.</string>
+    <string name="downloading_is_active">Vyksta žemėlapio atsiuntimas</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">Pažiūrėk, kur dabar esu „CoMaps“ autonominių žemėlapių programėlėje! %1$s arba %2$s . Neturi jos? Atsisiųsk čia: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -274,7 +274,7 @@
     <string name="downloader_download_all_button">Atsiųsti viską</string>
     <string name="downloader_downloading">Atsiunčiama:</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">Jeigu norite pašalinti žemėlapį, sustabdykite navigaciją.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Jeigu norite pašalinti žemėlapį, sustabdykite navigaciją</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Maršrutai gali būti sukurti tik tuomet, kai jie yra vieno regiono žemėlapio ribose.</string>
     <!-- Context menu item for downloader. -->
@@ -286,9 +286,9 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Naujinti žemėlapį</string>
     <!-- Preference title -->
-    <string name="google_play_services">„Google Play“ vietos nustatymo paslaugos</string>
+    <string name="google_play_services">„Google“ jungtinė vietos nustatymo paslauga</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Greitai nustatyti apytikslę jūsų buvimo vietą remiantis pasiekiamais „Bluetooth“ įrenginiais, belaidžiais tinklais ir mobiliojo ryšio siųstuvais</string>
+    <string name="pref_use_google_play">Nuosavybinė paslauga, nustatanti jūsų vietą remdamasi GPS, belaidžio ryšio, mobiliųjų tinklų ir kitais duomenimis. Gali jungtis prie „Google“ serverių.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -346,18 +346,18 @@
     <string name="dialog_routing_location_turn_on">Įjunkite vietovės tarnybas</string>
     <string name="dialog_routing_location_unknown_turn_on">Nepavyko nustatyti dabartinių GPS koordinačių. Maršrutui apskaičiuoti, įjunkite vietovės tarnybas.</string>
     <string name="dialog_routing_unable_locate_route">Nepavyko nustatyti maršruto</string>
-    <string name="dialog_routing_cant_build_route">Nepavyko apskaičiuoti maršruto.</string>
+    <string name="dialog_routing_cant_build_route">Nepavyko apskaičiuoti maršruto</string>
     <string name="dialog_routing_change_start_or_end">Pakoreguokite pradžios tašką arba paskirties vietą.</string>
     <string name="dialog_routing_change_start">Keisti pradžios tašką</string>
     <string name="dialog_routing_start_not_determined">Maršruto nepavyko apskaičiuoti. Nepavyko nustatyti pradžios taško.</string>
     <string name="dialog_routing_select_closer_start">Pasirinkite pradžios tašką, esantį arčiau kelio.</string>
     <string name="dialog_routing_change_end">Keisti paskirties vietą</string>
     <string name="dialog_routing_end_not_determined">Maršruto nepavyko apskaičiuoti. Nepavyko nustatyti paskirties vietos.</string>
-    <string name="dialog_routing_select_closer_end">Pasirinkite paskirties vietą, esančią arčiau kelio.</string>
-    <string name="dialog_routing_change_intermediate">Nepavyko nustatyti tarpinio taško.</string>
-    <string name="dialog_routing_intermediate_not_determined">Pakoreguokite tarpinį tašką.</string>
+    <string name="dialog_routing_select_closer_end">Pasirinkite paskirties vietą, esančią arčiau kelio</string>
+    <string name="dialog_routing_change_intermediate">Nepavyko nustatyti tarpinio taško</string>
+    <string name="dialog_routing_intermediate_not_determined">Pakoreguokite tarpinį tašką</string>
     <string name="dialog_routing_system_error">Sistemos klaida</string>
-    <string name="dialog_routing_application_error">Maršruto nepavyko apskaičiuoti dėl programinės klaidos.</string>
+    <string name="dialog_routing_application_error">Maršruto nepavyko apskaičiuoti dėl programinės klaidos</string>
     <string name="dialog_routing_try_again">Bandykite dar kartą</string>
     <string name="not_now">Ne dabar</string>
     <string name="dialog_routing_download_and_build_cross_route">Ar atsiųsti žemėlapį, kad būtų apskaičiuotas geresnis maršrutas, apimantis daugiau nei vieną žemėlapį?</string>
@@ -371,11 +371,11 @@
     <string name="hide">Nerodyti</string>
     <string name="categories">Kategorijos</string>
     <string name="history">Žurnalas</string>
-    <string name="search_not_found">Deja, rezultatų nerasta.</string>
+    <string name="search_not_found">Deja, rezultatų nerasta</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Atsisiųskite regioną, kuriame ieškote, arba pabandykite įvesti kito netoliese esančio miesto ar kaimo pavadinimą.</string>
     <string name="search_history_title">Paieškų žurnalas</string>
-    <string name="search_history_text">Rodyti paskiausias paieškas.</string>
+    <string name="search_history_text">Rodyti paskiausias paieškas</string>
     <string name="clear_search">Valyti paieškų žurnalą</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Vikipedija</string>
@@ -385,7 +385,7 @@
     <string name="p2p_start">Pradėti</string>
     <string name="p2p_from_here">Maršrutas iš</string>
     <string name="p2p_to_here">Maršrutas į</string>
-    <string name="p2p_only_from_current">Navigacija galima tik iš jūsų dabartinės vietos.</string>
+    <string name="p2p_only_from_current">Navigacija galima tik iš jūsų dabartinės vietos</string>
     <string name="p2p_reroute_from_current">Ar norite, kad būtų apskaičiuotas maršrutas iš jūsų dabartinės vietos?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Toliau</string>
@@ -455,14 +455,14 @@
     <string name="email_or_username">El. paštas arba naudotojo vardas</string>
     <string name="editor_add_phone">Pridėti telefono numerį</string>
     <string name="level">Aukštas</string>
-    <string name="downloader_delete_map_dialog">Visi jūsų žemėlapio pakeitimai bus pašalinti kartu su žemėlapiu.</string>
+    <string name="downloader_delete_map_dialog">Visi jūsų žemėlapio pakeitimai bus pašalinti kartu su žemėlapiu</string>
     <string name="downloader_update_maps">Naujinti žemėlapius</string>
     <string name="downloader_mwm_migration_dialog">Maršrutui apskaičiuoti reikia atnaujinti visus žemėlapius ir suplanuoti maršrutą iš naujo.</string>
     <string name="downloader_search_field_hint">Rasti žemėlapį</string>
-    <string name="common_check_internet_connection_dialog">Įsitikinkite, kad jūsų įrenginys yra prijungtas prie interneto.</string>
+    <string name="common_check_internet_connection_dialog">Įsitikinkite, kad jūsų įrenginys yra prijungtas prie interneto</string>
     <string name="downloader_no_space_title">Nepakanka laisvos vietos</string>
     <string name="downloader_no_space_message">Pašalinkite nereikalingus duomenis</string>
-    <string name="editor_login_error_dialog">Prisijungimo klaida.</string>
+    <string name="editor_login_error_dialog">Prisijungimo klaida</string>
     <string name="editor_profile_changes">Patvirtinti pakeitimai</string>
     <string name="editor_focus_map_on_location">Vilkite žemėlapį, kad kryžiukas atsidurtų ties vieta, kurioje yra pridedama vieta ar įmonė.</string>
     <string name="editor_edit_place_title">Taisoma</string>
@@ -479,11 +479,11 @@
     <string name="osm_presentation">Bendruomenės surinkti „OpenStreetMap“ duomenys %s dienai. Sužinokite, kaip redaguoti ir atnaujinti žemėlapį, apsilankydami OpenStreetMap.org svetainėje</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) – tai bendruomenės projektas, kuriuo siekiama sukurti laisvą ir atvirą žemėlapį. Tai – pagrindinis „CoMaps“ žemėlapių duomenų šaltinis, veikiantis panašiu principu, kaip „Vikipedija“. Galite pridėti ar taisyti vietas, o jos tampa prieinamos milijonams naudotojų visame pasaulyje. \nPrisijunkite prie bendruomenės ir padėkite kurti geresnį žemėlapį visiems!</string>
-    <string name="login_to_make_edits_visible">Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui.</string>
+    <string name="login_to_make_edits_visible">Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d iš %2$d</string>
     <string name="download_over_mobile_header">Atsisiųsti naudojant mobilųjį ryšį?</string>
-    <string name="download_over_mobile_message">Tai gali būti itin brangu, naudojantis kai kuriais planais ar tarptinkliniu ryšiu.</string>
+    <string name="download_over_mobile_message">Tai gali būti itin brangu, naudojantis kai kuriais planais ar tarptinkliniu ryšiu</string>
     <string name="error_enter_correct_house_number">Įveskite leistiną pastato numerį</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Aukštų skaičius negali viršyti %d</string>
@@ -506,8 +506,8 @@
     <string name="editor_category_unsuitable_title">Nerandate tinkamos kategorijos?</string>
     <string name="editor_category_unsuitable_text">„CoMaps“ leidžia pridėti tik paprastų kategorijas taškus – jokių miestų, kelių, ežerų, pastatų kontūrų ir pan. šia programėle pridėti negalima. Šių kategorijų objektus pridėkite naudodamiesi <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> svetaine. Žvilgtelėkite į mūsų <a href="https://www.comaps.app/support/advanced-map-editing/">vadovą</a>, kuriame rasite išsamias pažingsnines instrukcijas.</string>
     <string name="downloader_no_downloaded_maps_title">Nesate atsiuntę jokių žemėlapių</string>
-    <string name="downloader_no_downloaded_maps_message">Atsiųskite žemėlapius, kad galėtumėte ieškoti vietų ir keliauti neprisijungę prie tinklo.</string>
-    <string name="current_location_unknown_error_title">Dabartinė vieta nežinoma.</string>
+    <string name="downloader_no_downloaded_maps_message">Atsiųskite žemėlapius, kad galėtumėte ieškoti vietų ir keliauti neprisijungę prie tinklo</string>
+    <string name="current_location_unknown_error_title">Dabartinė vieta nežinoma</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -537,17 +537,17 @@
     <string name="error_enter_correct_phone">Įveskite galiojantį telefono numerį</string>
     <string name="error_enter_correct_web">Įveskite galiojantį saityno adresą</string>
     <string name="error_enter_correct_email">Įveskite galiojantį el. pašto adresą</string>
-    <string name="error_enter_correct_facebook_page">Įveskite galiojantį „Facebook“ saityno adresą, paskyros vardą ar puslapio pavadinimą</string>
-    <string name="error_enter_correct_instagram_page">Įveskite galiojantį „Instagram“ paskyros vardą ar saityno adresą</string>
-    <string name="error_enter_correct_twitter_page">Įveskite galiojantį „Twitter“ paskyros vardą ar saityno adresą</string>
-    <string name="error_enter_correct_vk_page">Įveskite galiojantį VK paskyros vardą ar saityno adresą</string>
-    <string name="error_enter_correct_line_page">Įveskite galiojantį LINE ID ar saityno adresą</string>
+    <string name="error_enter_correct_facebook_page">Įveskite galiojantį „Facebook“ tinklalapio adresą, paskyros vardą ar puslapio pavadinimą</string>
+    <string name="error_enter_correct_instagram_page">Įveskite galiojantį „Instagram“ paskyros vardą ar tinklalapio adresą</string>
+    <string name="error_enter_correct_twitter_page">Įveskite galiojantį „Twitter“ paskyros vardą ar tinklalapio adresą</string>
+    <string name="error_enter_correct_vk_page">Įveskite galiojantį VK paskyros vardą ar tinklalapio adresą</string>
+    <string name="error_enter_correct_line_page">Įveskite galiojantį LINE ID ar tinklalapio adresą</string>
     <string name="placepage_add_place_button">Pridėti vietą į „OpenStreetMap“</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Ar tikrai norite šiuos pakeitimus paviešinti?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Įsitikinkite, kad neįvedėte jokių asmeninių duomenų.</string>
-    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų.</string>
+    <string name="editor_share_to_all_dialog_message_1">Įsitikinkite, kad neįvedėte jokių asmeninių duomenų</string>
+    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų</string>
     <string name="navigation_stop_button">Stabdyti</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Trasa įrašoma</string>
@@ -561,10 +561,10 @@
     <string name="mobile_data_option_not_today">Šiandien nenaudoti</string>
     <string name="mobile_data">Mobilusis internetas</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Pranešimams apie žemėlapių naujinius ir pataisų įkėlimui reikalingas mobilusis internetas.</string>
+    <string name="mobile_data_description">Pranešimams apie žemėlapių naujinius ir pataisų įkėlimui reikalingas mobilusis internetas</string>
     <string name="mobile_data_option_never">Niekada nenaudoti</string>
     <string name="mobile_data_option_ask">Visada klausti</string>
-    <string name="traffic_update_maps_text">Jeigu norite matyti eismo duomenis, reikia atnaujinti žemėlapius.</string>
+    <string name="traffic_update_maps_text">Jeigu norite matyti eismo duomenis, reikia atnaujinti žemėlapius</string>
     <string name="big_font">Padidinti žemėlapio užrašų šrifto dydį</string>
     <string name="traffic_update_app">Atnaujinkite „CoMaps“</string>
     <!-- "traffic" as in "road congestion" -->
@@ -574,7 +574,7 @@
     <string name="feedback_general">Bendro pobūdžio atsiliepimas</string>
     <string name="prefs_languages_information">Balso instrukcijoms naudojame sistemos šnekos sintezatorių. Dauguma „Android“ įrenginių naudoja „Google“ šnekos sintezatorių, kurį galite atsisiųsti ar atnaujinti iš „Google Play“ parduotuvės (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Kai kurioms kalboms gali tekti įdiegti papildomą šnekos sintezatorių ar kalbos paketą iš programėlių parduotuvės („Google Play“, „Galaxy Store“, „AppGallery“, „FDroid“). \nAtverkite įrenginio nustatymus → Kalbos ir įvestis → Kalba → Teksto į kalbą išvestis. \nČia galite tvarkyti šnekos sintezatoriaus nustatymus (pavyzdžiui, atsisiųsti kalbos paketą naudojimui neprisijungus) ar pasirinkti kitą šnekos sintezės modulį.</string>
-    <string name="prefs_languages_information_off_link">Jei norite išsamesnės informacijos, žvilgtelėkite į šią instrukciją.</string>
+    <string name="prefs_languages_information_off_link">Jei norite išsamesnės informacijos, žvilgtelėkite į šią instrukciją</string>
     <string name="transliteration_title">Transliteruoti užrašus lotyniškais rašmenimis</string>
     <string name="learn_more">Išsamesnė informacija</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -641,7 +641,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Niekada neįspėti</string>
     <string name="power_managment_title">Energijos taupymo veiksena</string>
-    <string name="power_managment_description">Naudojamos elektros energijos tausojimas, aukojant dalį funkcionalumo.</string>
+    <string name="power_managment_description">Naudojamos elektros energijos tausojimas, aukojant dalį funkcionalumo</string>
     <string name="power_managment_setting_never">Niekada</string>
     <string name="power_managment_setting_auto">Esant žemai įkrovai</string>
     <string name="power_managment_setting_manual_max">Visada</string>
@@ -801,7 +801,7 @@
     <string name="nav_auto">Automatinė naviguojant</string>
     <string name="bookmarks_and_tracks">Žymės ir trasos</string>
     <string name="location_settings">Vietos nustatymai</string>
-    <string name="maps_storage_summary">Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti.</string>
+    <string name="maps_storage_summary">Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti</string>
     <string name="category_secondhand">Naudotos prekės</string>
     <string name="pref_tts_street_names_title">Sakyti gatvių pavadinimus</string>
     <string name="pref_tts_street_names_description">Įjungus šią parinktį, bus įvardijamos gatvės ir išvažiavimai, į kuriuos siūloma sukti.</string>
@@ -816,8 +816,8 @@
     <string name="level_value_generic">Aukštas: %s</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="vk">VK</string>
-    <string name="pref_tts_test_voice_title">Išbandyti balso instrukcijas (kalbos sintezę)</string>
-    <string name="pref_tts_playing_test_voice">Patikrinkite sistemos kalbos sintezės garsumo nustatymus, jeigu dabar negirdite balso.</string>
+    <string name="pref_tts_test_voice_title">Išbandyti balso instrukcijas</string>
+    <string name="pref_tts_playing_test_voice">Patikrinkite sistemos kalbos sintezės garsumo nustatymus, jeigu dabar negirdite balso</string>
     <plurals name="tracks">
         <item quantity="one">%d trasa</item>
         <item quantity="few">%d trasos</item>
@@ -861,4 +861,43 @@
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="panoramax">Panoramax vaizdas</string>
     <string name="saved">Išsaugota</string>
+    <string name="codeberg">Codeberg</string>
+    <string name="ruler">Liniuotė</string>
+    <string name="bluesky">Bluesky</string>
+    <string name="pref_left_button_title">Kairiojo mygtuko funkcija</string>
+    <string name="pref_backup_now_summary_empty_lists">Neturite jokių žymių ar trasų atsarginei kopijai sudaryti</string>
+    <string name="pref_backup_interval_title">Automatinis atsarginis kopijavimas</string>
+    <string name="dialog_report_error_missing_folder">Pasirinktas atsarginių kopijų aplankas nepasiekiamas, bent jau rašymui. Pasirinkite kitą aplanką.</string>
+    <string name="dialog_report_error_with_logs">Būsime dėkingi, jei atsiųsti klaidos pranešimą:\n - programos nustatymuose pažymėkite „Įgalinti derinimo žurnalą“\n - atkartokite problemą\n - „Žinyno ir pagalbos“ ekrane bakstelėkite mygtuką „Pranešti apie klaidą“ ir išsiųskite pranešimą el. paštu ar per pokalbių programėlę\n - išjunkite derinimo žurnalą</string>
+    <string name="bicycle">Dviračiu</string>
+    <string name="pref_backup_title">Žymių ir trasų atsarginis kopijavimas</string>
+    <string name="editor_building_levels">Aukštų skaičius (skaičiuojant pirmą aukštą, neskaičiuojant stogo)</string>
+    <string name="editor_level">Aukštas (0 reiškia pirmą aukštą)</string>
+    <string name="error_enter_correct_level">Įveskite leistiną aukšto numerį</string>
+    <string name="error_enter_correct_bluesky_page">Įveskite galiojantį „Bluesky“ paskyros vardą ar tinklalapio adresą</string>
+    <string name="error_enter_correct_fediverse_page">Įveskite galiojantį „Mastodon“ paskyros vardą ar tinklalapio adresą</string>
+    <string name="pref_left_button_disable">Mygtukas nerodomas</string>
+    <string name="pref_backup_summary">Automatinis atsarginių kopijų rašymas į pasirinktą aplanką</string>
+    <string name="pref_backup_now_title">Įrašyti dabar</string>
+    <string name="pref_backup_now_summary_progress">Atsarginė kopija įrašoma…</string>
+    <string name="pref_backup_now_summary_ok">Atsarginė kopija įrašyta</string>
+    <string name="pref_backup_now_summary">Nedelsiant įrašyti atsarginę kopiją</string>
+    <string name="pref_backup_now_summary_failed">Atsarginės kopijos įrašyti nepavyko</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Pasirinktas aplankas nepasiekiamas</string>
+    <string name="pref_backup_status_summary_success">Paskiausia atsarginė kopija</string>
+    <string name="pref_backup_location_summary_initial">Pirma pasirinkite aplanką ir suteikite teises</string>
+    <string name="pref_backup_history_title">Saugotinų atsarginių kopijų skaičius</string>
+    <string name="backup_interval_every_day">Kasdien</string>
+    <string name="backup_interval_every_week">Kas savaitę</string>
+    <string name="backup_interval_manual_only">Išjungtas (tik rankiniu būdu)</string>
+    <string name="pref_backup_location_title">Atsarginių kopijų aplankas</string>
+    <string name="clear">Išvalyti</string>
+    <string name="route_type">Maršruto tipas</string>
+    <string name="vehicle">Automobiliu</string>
+    <string name="pedestrian">Pėsčiomis</string>
+    <string name="bookmark_color">Žymės spalva</string>
+    <string name="about_help">Žinynas ir pagalba</string>
+    <string name="open_now">Dabar atidaryta</string>
+    <string name="closed_now">Dabar uždaryta</string>
+    <string name="at">%s val.</string>
 </resources>

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

@@ -13,4 +13,5 @@
     <string name="saved">സംരക്ഷിച്ചു</string>
     <string name="about_proposition_3">• ഓഫ്‌ലൈൻ, വേഗതയേറിയതും ഒതുക്കമുള്ളതും</string>
     <string name="bluesky">Bluesky</string>
+    <string name="search">തിരയുക</string>
 </resources>

android/app/src/main/res/values-ml/types_strings.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.addr_interpolation">വിലാസം/ബ്ലോക്ക്</string>
 </resources>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@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,214 @@
+<?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="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="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="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="redButtonBackground">@drawable/button_red</item>
+        <item name="redButtonTextColor">@color/button_red_text</item>
+        <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</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="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="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.MaterialComponents">
+        <item name="colorPrimary">@color/bg_primary_night</item>
+        <item name="android:colorPrimaryDark">?statusBar</item>
+        <item name="colorAccent">@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="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

@@ -9,7 +9,7 @@
     <string name="delete">Verwijder</string>
     <string name="download_maps">Download kaarten</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Downloaden is mislukt. Tik om het opnieuw te proberen.</string>
+    <string name="download_has_failed">Downloaden is mislukt, tik om het opnieuw te proberen.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Downloaden…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -29,7 +29,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Beperkte nauwkeurigheid</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">Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen.</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Toon op de kaart</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Kaarten opslaan in</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecteer de map waar kaarten naar gedownload worden.</string>
+    <string name="maps_storage_summary">Selecteer de map waar kaarten naar gedownload worden</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Kaarten</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -179,9 +179,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Je locatie is nog niet vastgesteld</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Sorry, instellingen voor kaartopslag zijn momenteel uitgeschakeld.</string>
+    <string name="cant_change_this_setting">Sorry, instellingen voor kaartopslag zijn momenteel uitgeschakeld</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">De kaart wordt nu gedownload.</string>
+    <string name="downloading_is_active">De kaart wordt nu gedownload</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">Hey, kijk naar mijn huidige locatie op CoMaps! %1$s of %2$s Heeft u geen offline-kaarten? Download ze hier: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -237,9 +237,9 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Gesproken taal</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Test gesproken aanwijzingen (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Test gesproken aanwijzingen</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort.</string>
+    <string name="pref_tts_playing_test_voice">Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Niet beschikbaar</string>
     <string name="pref_map_auto_zoom">Automatisch zoomen</string>
@@ -285,7 +285,7 @@
     <string name="downloader_download_all_button">Download alles</string>
     <string name="downloader_downloading">Aan het downloaden:</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">Stop de navigatie om de kaart te verwijderen.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Stop de navigatie om de kaart te verwijderen</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
     <!-- Context menu item for downloader. -->
@@ -357,18 +357,18 @@
     <string name="dialog_routing_location_turn_on">Schakel locatiediensten in</string>
     <string name="dialog_routing_location_unknown_turn_on">De huidige gps-coördinaten kunnen niet worden gevonden. Schakel locatiediensten in om de route te berekenen.</string>
     <string name="dialog_routing_unable_locate_route">Route vinden mislukt</string>
-    <string name="dialog_routing_cant_build_route">Route samenstellen mislukt.</string>
+    <string name="dialog_routing_cant_build_route">Route samenstellen mislukt</string>
     <string name="dialog_routing_change_start_or_end">Kies een ander startpunt of een andere bestemming.</string>
     <string name="dialog_routing_change_start">Kies ander startpunt</string>
     <string name="dialog_routing_start_not_determined">Route samenstellen mislukt. Startpunt kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_start">Kies een startpunt dat dichter bij een weg ligt.</string>
     <string name="dialog_routing_change_end">Kies andere bestemming</string>
     <string name="dialog_routing_end_not_determined">Route samenstellen mislukt. Bestemming kan niet worden gevonden.</string>
-    <string name="dialog_routing_select_closer_end">Kies een bestemming die dichter bij een weg ligt.</string>
-    <string name="dialog_routing_change_intermediate">Kan de tussenstop niet vinden.</string>
-    <string name="dialog_routing_intermediate_not_determined">Gelieve uw tussenstop aan te passen.</string>
+    <string name="dialog_routing_select_closer_end">Kies een bestemming die dichter bij een weg ligt</string>
+    <string name="dialog_routing_change_intermediate">Kan de tussenstop niet vinden</string>
+    <string name="dialog_routing_intermediate_not_determined">Gelieve uw tussenstop aan te passen</string>
     <string name="dialog_routing_system_error">Systeemfout</string>
-    <string name="dialog_routing_application_error">Route samenstellen mislukt door een applicatiefout.</string>
+    <string name="dialog_routing_application_error">Route samenstellen mislukt door een applicatiefout</string>
     <string name="dialog_routing_try_again">Probeer het opnieuw</string>
     <string name="not_now">Niet nu</string>
     <string name="dialog_routing_download_and_build_cross_route">Wilt u de kaart downloaden en een betere route samenstellen die meer dan één kaart beslaat?</string>
@@ -382,17 +382,17 @@
     <string name="hide">Verberg</string>
     <string name="categories">Categorieën</string>
     <string name="history">Geschiedenis</string>
-    <string name="search_not_found">Sorry, geen resultaten gevonden.</string>
+    <string name="search_not_found">Sorry, geen resultaten gevonden</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen.</string>
     <string name="search_history_title">Zoekgeschiedenis</string>
-    <string name="search_history_text">Snel toegang tot recente zoekopdrachten.</string>
+    <string name="search_history_text">Snel toegang tot recente zoekopdrachten</string>
     <string name="clear_search">Wis zoekgeschiedenis</string>
     <string name="p2p_your_location">Uw locatie</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Van</string>
     <string name="p2p_to_here">Route naar</string>
-    <string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie.</string>
+    <string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie</string>
     <string name="p2p_reroute_from_current">Wilt u een route plannen vanaf uw huidige locatie?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Volgende</string>
@@ -462,14 +462,14 @@
     <string name="email_or_username">E-mailadres of gebruikersnaam</string>
     <string name="editor_add_phone">Voeg telefoonnummer toe</string>
     <string name="level">Verdieping</string>
-    <string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd.</string>
+    <string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd</string>
     <string name="downloader_update_maps">Update kaarten</string>
     <string name="downloader_mwm_migration_dialog">Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen.</string>
     <string name="downloader_search_field_hint">Vind een kaart</string>
-    <string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet.</string>
+    <string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet</string>
     <string name="downloader_no_space_title">Niet genoeg ruimte</string>
     <string name="downloader_no_space_message">Verwijder overbodige gegevens</string>
-    <string name="editor_login_error_dialog">Inlogfout.</string>
+    <string name="editor_login_error_dialog">Inlogfout</string>
     <string name="editor_profile_changes">Gecontroleerde wijzigingen</string>
     <string name="editor_focus_map_on_location">Sleep de kaart om het kruis op de locatie van de plaats of het bedrijf te plaatsen.</string>
     <string name="editor_edit_place_title">Bewerken</string>
@@ -486,11 +486,11 @@
     <string name="osm_presentation">Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %s. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in CoMaps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld. \nSluit u aan bij de gemeenschap en help mee om een betere kaart voor iedereen te maken!</string>
-    <string name="login_to_make_edits_visible">Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren.</string>
+    <string name="login_to_make_edits_visible">Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d van %2$d</string>
     <string name="download_over_mobile_header">Downloaden via een mobiele gegevensverbinding?</string>
-    <string name="download_over_mobile_message">Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn.</string>
+    <string name="download_over_mobile_message">Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn</string>
     <string name="error_enter_correct_house_number">Voer een geldig huisnummer in</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Het gebouw mag niet meer dan %d verdiepingen hebben</string>
@@ -513,8 +513,8 @@
     <string name="editor_category_unsuitable_title">Kun je geen geschikte categorie vinden?</string>
     <string name="editor_category_unsuitable_text">Met CoMaps kun je alleen eenvoudige puntcategorieën toevoegen, dus geen steden, wegen, meren, contouren van gebouwen, enzovoort. Voeg zulke categorieën direct toe aan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Bekijk onze <a href="https://www.comaps.app/support/advanced-map-editing/">gids</a> voor gedetailleerde stap voor stap instructies.</string>
     <string name="downloader_no_downloaded_maps_title">U hebt geen kaarten gedownload</string>
-    <string name="downloader_no_downloaded_maps_message">Download kaarten om een locatie te zoeken en offline te navigeren.</string>
-    <string name="current_location_unknown_error_title">Huidige locatie is onbekend.</string>
+    <string name="downloader_no_downloaded_maps_message">Download kaarten om een locatie te zoeken en offline te navigeren</string>
+    <string name="current_location_unknown_error_title">Huidige locatie is onbekend</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -553,8 +553,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Wil je het naar alle gebruikers sturen?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben.</string>
+    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben</string>
     <string name="navigation_stop_button">Stop</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Het spoor opnemen</string>
@@ -568,10 +568,10 @@
     <string name="mobile_data_option_not_today">Gebruik vandaag niet</string>
     <string name="mobile_data">Mobiel internet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Mobiel internet is vereist voor het weergeven van gedetailleerde informatie over plaatsen, zoals foto\'s, prijzen en beoordelingen.</string>
+    <string name="mobile_data_description">Mobiel internet is vereist voor kaart update notificaties en uploaden van wijzigingen</string>
     <string name="mobile_data_option_never">Gebruik nooit</string>
     <string name="mobile_data_option_ask">Vraag altijd</string>
-    <string name="traffic_update_maps_text">Om verkeersgegevens weer te geven, moeten de kaarten bijgewerkt worden.</string>
+    <string name="traffic_update_maps_text">Om verkeersgegevens weer te geven, moeten de kaarten bijgewerkt worden</string>
     <string name="big_font">Vergroot lettergrootte op de kaart</string>
     <string name="traffic_update_app">Gelieve CoMaps bij te werken</string>
     <!-- "traffic" as in "road congestion" -->
@@ -581,7 +581,7 @@
     <string name="feedback_general">Algemene feedback</string>
     <string name="prefs_languages_information">We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak engine selecteren.</string>
-    <string name="prefs_languages_information_off_link">Gelieve deze handleiding te lezen voor meer informatie.</string>
+    <string name="prefs_languages_information_off_link">Gelieve deze handleiding te lezen voor meer informatie</string>
     <string name="transliteration_title">Transliteratie in het Latijnse alfabet</string>
     <string name="learn_more">Meer informatie</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -660,7 +660,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Waarschuw nooit</string>
     <string name="power_managment_title">Energiebesparende modus</string>
-    <string name="power_managment_description">Probeer batterijgebruik te verminderen ten koste van enkele functionaliteit.</string>
+    <string name="power_managment_description">Probeer batterijgebruik te verminderen ten koste van enkele functionaliteit</string>
     <string name="power_managment_setting_never">Nooit</string>
     <string name="power_managment_setting_auto">Wanneer batterij bijna leeg is</string>
     <string name="power_managment_setting_manual_max">Maximale energiebesparing</string>

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

@@ -1408,4 +1408,9 @@
     <string name="type.natural.wetland.saltmarsh">Zoutmoeras</string>
     <string name="type.natural.wetland.mangrove">Mangrove</string>
     <string name="type.natural.wetland.tidalflat">Wad</string>
+    <string name="type.amenity.luggage_locker">Bagagekluis</string>
+    <string name="type.amenity.bicycle_parking.covered">Overdekte fietsenstalling</string>
+    <string name="type.post_office.post_partner">Post partner</string>
+    <string name="type.leisure.escape_game">Escaperoom</string>
+    <string name="type.amenity.ranger_station">Boswachterkantoor</string>
 </resources>

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

@@ -1408,4 +1408,5 @@
     <string name="type.aerialway.t.bar">Wyciąg T-bar</string>
     <string name="type.barrier.guard_rail">Barierka ochronna</string>
     <string name="type.railway.station.subway.qingdao">Stacja metra</string>
+    <string name="type.amenity.bicycle_parking.covered">Zadaszony parking dla rowerów</string>
 </resources>

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

@@ -23,9 +23,9 @@
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">Buscar</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Procurar mapa</string>
+    <string name="search_map">Buscar no mapa</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Atualmente todos os serviços de localização para este dispositivo ou aplicativo estão desativados. Por favor ative-os em configurações.</string>
+    <string name="location_is_disabled_long_text">No momento, todos os Serviços de Localização deste dispositivo ou aplicativo estão desativados. Ative-os nas Configurações.</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">Para garantir uma navegação precisa, ative a opção \"Melhorar Precisão de local\" nas configurações</string>
     <!-- View and button titles for accessibility -->
@@ -36,7 +36,7 @@
     <string name="try_again">Tentar novamente</string>
     <string name="about_menu_title">Sobre o CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Um projeto aberto, movido pela comunidade</string>
+    <string name="about_headline">Projeto aberto desenvolvido pela comunidade</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Fácil de usar e elegante</string>
     <!-- Text in About screen -->

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

@@ -11,15 +11,15 @@
     <string name="type.aerialway.gondola">Telecabine</string>
     <string name="type.aerialway.mixed_lift">Teleférico híbrido</string>
     <string name="type.aerialway.station">Estação de teleférico</string>
-    <string name="type.aeroway">Via aérea</string>
+    <string name="type.aeroway">Infraestrutura aérea</string>
     <string name="type.aeroway.aerodrome">Aeroporto ou aeródromo</string>
     <string name="type.aeroway.aerodrome.international">Aeroporto internacional</string>
     <string name="type.aeroway.apron">Plataforma de estacionamento de aviões</string>
     <string name="type.aeroway.gate">Portão de embarque</string>
     <string name="type.aeroway.helipad">Heliponto</string>
-    <string name="type.aeroway.runway">Pista de aeroporto ou aeródromo</string>
-    <string name="type.aeroway.taxiway">Pista de rolagem</string>
-    <string name="type.aeroway.terminal">Aerogare de passageiros</string>
+    <string name="type.aeroway.runway">Pista de pouso e decolagem</string>
+    <string name="type.aeroway.taxiway">Pista de táxi</string>
+    <string name="type.aeroway.terminal">Terminal</string>
     <string name="type.amenity">Amenidades</string>
     <string name="type.amenity.atm">Caixa eletrônico</string>
     <string name="type.amenity.bank">Banco</string>
@@ -27,7 +27,7 @@
     <string name="type.amenity.bench">Assento</string>
     <string name="type.amenity.bicycle_parking">Bicicletário</string>
     <string name="type.amenity.bicycle_rental">Aluguel de bicicletas</string>
-    <string name="type.amenity.bicycle_repair_station">Oficina de conserto de bicicletas</string>
+    <string name="type.amenity.bicycle_repair_station">Estação de reparo de bicicletas</string>
     <string name="type.amenity.biergarten">Biergarten</string>
     <string name="type.amenity.brothel">Bordel</string>
     <string name="type.amenity.bureau_de_change">Casa de câmbio</string>

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

@@ -9,7 +9,7 @@
     <string name="delete">Eliminar</string>
     <string name="download_maps">Descarregar mapas</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">O descarregamento falhou, toque novamente para tentar de novo.</string>
+    <string name="download_has_failed">O descarregamento falhou, toque para tentar novamente</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">A descarregar…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -29,7 +29,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Precisão limitada</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">Para garantir uma navegação precisa, active a opção Localização precisa nas definições.</string>
+    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, active a opção Localização precisa nas definições</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostrar no mapa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Guardar mapas em</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecione uma pasta para onde os mapas devem ser descarregados.</string>
+    <string name="maps_storage_summary">Selecione uma pasta para onde os mapas devem ser descarregados</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapas Descarregados</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -167,9 +167,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">A sua localização ainda não foi determinada</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Lamentamos, as definições do armazenamento do mapa estão atualmente desativadas.</string>
+    <string name="cant_change_this_setting">Lamentamos, as definições do armazenamento do mapa estão atualmente desativadas</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">O descarregamento do país está a ser feito neste momento.</string>
+    <string name="downloading_is_active">O descarregamento do país está a ser feito neste momento</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">Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s Não tem um mapa offline instalado? Descarregue em https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -227,7 +227,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Testar Direções por Voz</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Verifica o volume ou as definições de conversão de texto em voz do sistema se não ouvires a voz agora.</string>
+    <string name="pref_tts_playing_test_voice">Verifica o volume ou as definições de conversão de texto em voz do sistema se não ouvires a voz agora</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Não disponível</string>
     <string name="pref_map_auto_zoom">Ampliação automática</string>
@@ -273,7 +273,7 @@
     <string name="downloader_download_all_button">Descarregar tudo</string>
     <string name="downloader_downloading">A descarregar:</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">Para eliminar o mapa, por favor pare a navegação.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Para eliminar o mapa, por favor pare a navegação</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Só podem ser criados trajetos que estejam completamente contidos num único mapa.</string>
     <!-- Context menu item for downloader. -->
@@ -345,18 +345,18 @@
     <string name="dialog_routing_location_turn_on">Ative os serviços de localização</string>
     <string name="dialog_routing_location_unknown_turn_on">Não foi possível localizar as coordenadas do GPS. Ative os serviços de localização para que o trajeto seja criado.</string>
     <string name="dialog_routing_unable_locate_route">Não foi possível encontrar uma rota</string>
-    <string name="dialog_routing_cant_build_route">Não foi possível criar uma rota.</string>
+    <string name="dialog_routing_cant_build_route">Não foi possível criar uma rota</string>
     <string name="dialog_routing_change_start_or_end">Ajuste o ponto de partida ou o ponto de chegada.</string>
     <string name="dialog_routing_change_start">Ajuste o ponto de partida</string>
     <string name="dialog_routing_start_not_determined">A rota não foi criada, porque não foi possível localizar o ponto de partida.</string>
     <string name="dialog_routing_select_closer_start">Selecione um ponto de partida mais perto de uma estrada.</string>
     <string name="dialog_routing_change_end">Ajuste o ponto de chegada</string>
     <string name="dialog_routing_end_not_determined">A rota não foi criada, porque não foi possível localizar o ponto de chegada.</string>
-    <string name="dialog_routing_select_closer_end">Selecione um ponto de chegada mais perto de uma estrada.</string>
-    <string name="dialog_routing_change_intermediate">Não foi possível localizar o ponto intermédio.</string>
-    <string name="dialog_routing_intermediate_not_determined">Ajuste o ponto intermédio.</string>
+    <string name="dialog_routing_select_closer_end">Selecione um ponto de chegada mais perto de uma estrada</string>
+    <string name="dialog_routing_change_intermediate">Não foi possível localizar o ponto intermédio</string>
+    <string name="dialog_routing_intermediate_not_determined">Ajuste o ponto intermédio</string>
     <string name="dialog_routing_system_error">Erro de sistema</string>
-    <string name="dialog_routing_application_error">Não foi possível criar uma rota devido a um erro na aplicação.</string>
+    <string name="dialog_routing_application_error">Não foi possível criar uma rota devido a um erro na aplicação</string>
     <string name="dialog_routing_try_again">Tente novamente</string>
     <string name="not_now">Agora não</string>
     <string name="dialog_routing_download_and_build_cross_route">Quer descarregar o mapa e traçar uma rota melhor, mas que se estenda por mais de um mapa?</string>
@@ -370,11 +370,11 @@
     <string name="hide">Ocultar</string>
     <string name="categories">Categorias</string>
     <string name="history">Histórico</string>
-    <string name="search_not_found">Lamento, mas não foram encontrados resultados.</string>
+    <string name="search_not_found">Lamento, mas não foram encontrados resultados</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Descarregue a região onde está a pesquisar ou tente adicionar o nome de uma cidade ou aldeia próxima.</string>
     <string name="search_history_title">Histórico de pesquisas</string>
-    <string name="search_history_text">Ver as pesquisas recentes.</string>
+    <string name="search_history_text">Ver as pesquisas recentes</string>
     <string name="clear_search">Limpar histórico de pesquisas</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipédia</string>
@@ -382,7 +382,7 @@
     <string name="p2p_start">Iniciar</string>
     <string name="p2p_from_here">De</string>
     <string name="p2p_to_here">Itinerário para</string>
-    <string name="p2p_only_from_current">Só é possível navegar a partir da sua localização atual.</string>
+    <string name="p2p_only_from_current">Só é possível navegar a partir da sua localização atual</string>
     <string name="p2p_reroute_from_current">Quer planear uma rota a partir da sua localização atual?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Próxima</string>
@@ -447,14 +447,14 @@
     <!-- login text field -->
     <string name="email_or_username">Email ou nome de utilizador</string>
     <string name="level">Andar</string>
-    <string name="downloader_delete_map_dialog">Todas as alterações ao mapa serão eliminadas juntamente com o mapa.</string>
+    <string name="downloader_delete_map_dialog">Todas as alterações ao mapa serão eliminadas juntamente com o mapa</string>
     <string name="downloader_update_maps">Atualizar mapas</string>
     <string name="downloader_mwm_migration_dialog">Para criar um itinerário é necessário atualizar todos os mapas e, em seguida, planeá-lo novamente.</string>
     <string name="downloader_search_field_hint">Encontrar o mapa</string>
-    <string name="common_check_internet_connection_dialog">Por favor, verifique as suas opções e certifique-se que o dispositivo está ligado à Internet.</string>
+    <string name="common_check_internet_connection_dialog">Por favor, verifique as suas opções e certifique-se que o dispositivo está ligado à Internet</string>
     <string name="downloader_no_space_title">Não tem espaço suficiente</string>
     <string name="downloader_no_space_message">Por favor, remova os dados desnecessários</string>
-    <string name="editor_login_error_dialog">Erro de início de sessão.</string>
+    <string name="editor_login_error_dialog">Erro de início de sessão</string>
     <string name="editor_profile_changes">Alterações verificadas</string>
     <string name="editor_focus_map_on_location">Mova o mapa para colocar a cruz na localização da empresa ou do local.</string>
     <string name="editor_edit_place_title">Edição</string>
@@ -471,11 +471,11 @@
     <string name="osm_presentation">Dados do OpenStreetMap criados pela comunidade até %s. Sabe mais sobre como editar e atualizar o mapa em OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">O OpenStreetMap.org (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do CoMaps e funciona de forma semelhante à Wikipedia. Pode adicionar ou editar locais e estes ficam disponíveis para milhões de utilizadores no mundo todo. \nJunte-se à comunidade e ajude a criar um mapa melhor para todos!</string>
-    <string name="login_to_make_edits_visible">Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo.</string>
+    <string name="login_to_make_edits_visible">Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
     <string name="download_over_mobile_header">Descarregar utilizando uma conexão de rede de telemóveis?</string>
-    <string name="download_over_mobile_message">Isto pode ser muito caro com alguns planos ou em roaming.</string>
+    <string name="download_over_mobile_message">Isto pode ser muito caro com alguns planos ou em roaming</string>
     <string name="error_enter_correct_house_number">Introduza um número de endereço correto</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">O número de pisos não pode ser maior que %d</string>
@@ -498,8 +498,8 @@
     <string name="editor_category_unsuitable_title">Não encontra uma categoria adequada?</string>
     <string name="editor_category_unsuitable_text">O CoMaps permite-lhe adicionar apenas categorias de pontos simples, ou seja, nada de cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente ao <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte o nosso <a href="https://www.comaps.app/support/advanced-map-editing/">guia</a> para instruções detalhadas passo a passo.</string>
     <string name="downloader_no_downloaded_maps_title">Não descarregou quaisquer mapas</string>
-    <string name="downloader_no_downloaded_maps_message">Descarregar mapas para encontrar a localização e navegar offline.</string>
-    <string name="current_location_unknown_error_title">A localização atual é desconhecida.</string>
+    <string name="downloader_no_downloaded_maps_message">Descarregar mapas para encontrar a localização e navegar offline</string>
+    <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -531,8 +531,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Quer enviar para todos os utilizadores?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Certifique-se que não incluiu nenhuns dados pessoais.</string>
-    <string name="editor_share_to_all_dialog_message_2">Os editores do OpenStreetMap verificarão as alterações e entrarão em contacto consigo se tiverem alguma dúvida.</string>
+    <string name="editor_share_to_all_dialog_message_1">Certifique-se que não incluiu nenhuns dados pessoais</string>
+    <string name="editor_share_to_all_dialog_message_2">Os editores do OpenStreetMap verificarão as alterações e entrarão em contacto consigo se tiverem alguma dúvida</string>
     <string name="navigation_stop_button">Parar</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Registar a pista</string>
@@ -546,10 +546,10 @@
     <string name="mobile_data_option_not_today">Não utilizar hoje</string>
     <string name="mobile_data">Dados móveis</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Para visualizar informações detalhadas sobre os locais, tais como fotografias, preços e avaliações, é necessário acesso à internet móvel.</string>
+    <string name="mobile_data_description">Para visualizar informações detalhadas sobre os locais, tais como fotografias, preços e avaliações, é necessário acesso à internet móvel</string>
     <string name="mobile_data_option_never">Nunca utilizar</string>
     <string name="mobile_data_option_ask">Perguntar sempre</string>
-    <string name="traffic_update_maps_text">Para ver os dados de tráfego, os mapas têm de ser atualizados.</string>
+    <string name="traffic_update_maps_text">Para ver os dados de tráfego, os mapas têm de ser atualizados</string>
     <string name="big_font">Aumentar tamanho da fonte no mapa</string>
     <string name="traffic_update_app">Atualize o CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -559,7 +559,7 @@
     <string name="feedback_general">Opinão geral</string>
     <string name="prefs_languages_information">Utilizamos o sistema TTS para as instruções de voz. Muitos dispositivos Android usam o Google TTS, pode transferir ou atualizá-lo a partir do Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Para alguns idiomas, precisará de instalar outro sintetizador de voz ou um pacote de idiomas adicional a partir da loja de aplicações (Google Play, Galaxy Store, App Gallery, FDroid). Abra as Configurações do seu dispositivo → Idioma e entrada → Voz → Saída de texto para voz. Aqui pode gerir as configurações de síntese de voz (por exemplo, transferir um pacote de idioma para poder utilizá-lo sem estar ligado à Internet) ou selecionar outro motor de texto para voz.</string>
-    <string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia.</string>
+    <string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia</string>
     <string name="transliteration_title">Transliteração para o latim</string>
     <string name="learn_more">Saber mais</string>
     <!-- Subway exits for public transport marks on the map -->

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

@@ -9,7 +9,7 @@
     <string name="delete">Удалить</string>
     <string name="download_maps">Загрузить карты</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Ошибка загрузки. Нажмите, чтобы повторить попытку.</string>
+    <string name="download_has_failed">Ошибка загрузки. Нажмите, чтобы повторить попытку</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Загружается…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -32,7 +32,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Точность местоположения ограничена</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Включите в настройках точное определение местоположения.</string>
+    <string name="precise_location_is_disabled_long_text">Включите точное определение местоположения в настройках</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Показать на карте</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -91,7 +91,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Сохранять карты в</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Выберите папку куда загружать карты.</string>
+    <string name="maps_storage_summary">Выберите место размещения карт</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Загруженные карты</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -182,9 +182,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Ваше местоположение ещё не определено</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Извините, настройки места хранения карт сейчас недоступны.</string>
+    <string name="cant_change_this_setting">Извините, выбор места размещения карт сейчас недоступен</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Идет процесс загрузки карт.</string>
+    <string name="downloading_is_active">Идет процесс загрузки карты.</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">Смотри где я сейчас! Жми %1$s или %2$s Нету автономных карт? Скачай тут https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -240,9 +240,9 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Язык подсказок</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Протестировать голосовые подсказки (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Попробовать голосовые подсказки</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Проверьте громкость или системные настройки преобразования текста в речь, если сейчас ничего не слышно.</string>
+    <string name="pref_tts_playing_test_voice">Проверьте громкость или системные настройки преобразования текста в речь, если сейчас ничего не слышно</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Не доступны</string>
     <string name="pref_map_auto_zoom">Автомасштабирование</string>
@@ -387,11 +387,11 @@
     <string name="hide">Скрыть</string>
     <string name="categories">Категории</string>
     <string name="history">История</string>
-    <string name="search_not_found">К сожалению, мы ничего не нашли.</string>
+    <string name="search_not_found">Ничего не нашлось</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Загрузите регион, в котором ищете, или попробуйте добавить название близлежащего города/деревни.</string>
     <string name="search_history_title">История поиска</string>
-    <string name="search_history_text">Быстрый доступ к последним поисковым запросам.</string>
+    <string name="search_history_text">Быстрый доступ к последним поисковым запросам</string>
     <string name="clear_search">Очистить историю поиска</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Википедия</string>
@@ -399,7 +399,7 @@
     <string name="p2p_start">Начать</string>
     <string name="p2p_from_here">Отсюда</string>
     <string name="p2p_to_here">Сюда</string>
-    <string name="p2p_only_from_current">Навигация возможна только из текущего местоположения.</string>
+    <string name="p2p_only_from_current">Навигация возможна только от текущего местоположения</string>
     <string name="p2p_reroute_from_current">Хотите перестроить маршрут от вашего местоположения?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Далее</string>
@@ -471,14 +471,14 @@
     <string name="level">Этаж</string>
     <!-- Building level -->
     <string name="level_value_generic">Этаж: %s</string>
-    <string name="downloader_delete_map_dialog">Вместе с картой удалятся и внесённые вами правки на этой карте.</string>
+    <string name="downloader_delete_map_dialog">Вместе с картой будут удалены и все внесённые вами правки</string>
     <string name="downloader_update_maps">Обновите карты</string>
     <string name="downloader_mwm_migration_dialog">Для построения маршрутов необходимо обновить все карты и построить маршрут заново.</string>
     <string name="downloader_search_field_hint">Найти карту</string>
     <string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету.</string>
     <string name="downloader_no_space_title">Недостаточно места</string>
     <string name="downloader_no_space_message">Удалите ненужные данные</string>
-    <string name="editor_login_error_dialog">Произошла ошибка при авторизации.</string>
+    <string name="editor_login_error_dialog">Не удалось войти</string>
     <string name="editor_profile_changes">Учтённые правки</string>
     <string name="editor_focus_map_on_location">Перетащите карту, чтобы поместить крестик на место расположения добавляемого объекта или заведения.</string>
     <string name="editor_edit_place_title">Редактирование</string>
@@ -504,7 +504,7 @@
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Количество этажей не должно превышать %d</string>
     <string name="editor_zip_code">Почтовый индекс</string>
-    <string name="error_enter_correct_zip_code">Введите корректный почтовый индекс</string>
+    <string name="error_enter_correct_zip_code">Введите валидный почтовый индекс</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">Точка на карте</string>
     <!-- Title for OSM note section in the editor -->
@@ -523,7 +523,7 @@
     <string name="editor_category_unsuitable_text">CoMaps позволяет добавлять на карту только простые типы объектов, то есть никаких городов, дорог, озер, контуров зданий. Пожалуйста, добавляйте такие категории на сайте <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Также рекомендуем ознакомиться с нашими <a href="https://www.comaps.app/support/advanced-map-editing/">подробными пошаговыми инструкциями и другими приложениями для редактирования карты</a>.</string>
     <string name="downloader_no_downloaded_maps_title">У вас нет загруженных карт</string>
     <string name="downloader_no_downloaded_maps_message">Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета.</string>
-    <string name="current_location_unknown_error_title">Местоположение не найдено.</string>
+    <string name="current_location_unknown_error_title">Текущее местоположение неизвестно</string>
     <!-- abbreviation for meters -->
     <string name="m">м</string>
     <!-- abbreviation for kilometers -->
@@ -562,7 +562,7 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Отправить всем пользователям?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не ввели личные данные.</string>
+    <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных</string>
     <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.</string>
     <string name="navigation_stop_button">Cтоп</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -590,7 +590,7 @@
     <string name="feedback_general">Отправить отзыв</string>
     <string name="prefs_languages_information">Подсказки озвучиваются системным синтезатором речи (TTS). На многих устройствах используется Google TTS, его можно загрузить или обновить в Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Для некоторых языков, возможно, необходимо установить дополнительный синтезатор речи (TTS) из магазина приложений (Google Play, Galaxy Store, App Gallery, FDroid). \nЧтобы настроить синтезатор речи, перейдите в Настройки → Язык и ввод → Синтез речи. \nЗдесь можно установить дополнительные языковые пакеты или выбрать синтезатор речи.</string>
-    <string name="prefs_languages_information_off_link">Более подробная информация — в этом руководстве.</string>
+    <string name="prefs_languages_information_off_link">Ознакомьтесь с подробностями в этом руководстве</string>
     <string name="transliteration_title">Транслитерация в латиницу</string>
     <string name="learn_more">Узнать больше</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -772,7 +772,7 @@
     <string name="connection_failure">Ошибка подключения</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="disconnect_usb_cable_title">Отсоедините USB кабель</string>
-    <string name="enable_keep_screen_on">Держи экран включённым</string>
+    <string name="enable_keep_screen_on">Держать экран включенным</string>
     <!-- Description in preferences -->
     <string name="enable_keep_screen_on_description">Если эта функция включена, то при отображении карты экран будет всегда включен.</string>
     <!-- A preference title; keep short! -->
@@ -897,7 +897,7 @@
     <string name="codeberg">Codeberg</string>
     <string name="saved">Сохранено</string>
     <string name="pref_left_button_disable">Выключить</string>
-    <string name="pref_left_button_title">Настройки левой кнопки</string>
+    <string name="pref_left_button_title">Действие 1-й кнопки</string>
     <string name="editor_building_levels">Этажей (вкл. подвалы искл. крышу)</string>
     <string name="editor_level">Этаж (0 это первый этаж)</string>
     <string name="error_enter_correct_level">Введите правильный номер этажа</string>
@@ -934,4 +934,6 @@
     - отключите запись логов
     </string>
     <string name="panoramax">Panoramax Фото</string>
+    <string name="open_now">Открыто</string>
+    <string name="closed_now">Закрыто</string>
 </resources>

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

@@ -231,7 +231,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Језик гласа</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Тестирај гласовне инструкције (Текст-у-говор)</string>
+    <string name="pref_tts_test_voice_title">Тестирај гласовне инструкције</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Проверите гласноћу или системска подешавања Текста-у-говор ако сада не чујете глас</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -376,7 +376,7 @@
     <string name="hide">Сакриј</string>
     <string name="categories">Категорије</string>
     <string name="history">Историја</string>
-    <string name="search_not_found">Упс, нема резултата.</string>
+    <string name="search_not_found">Упс, нема резултата</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Преузмите регион где вршите претрагу, или пробајте да додате име оближњег насеља.</string>
     <string name="search_history_title">Историја претраге</string>

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

@@ -229,7 +229,7 @@
     <!-- Settings «Map» category: «3D buildings» title -->
     <string name="pref_map_3d_buildings_title">3B yapılar</string>
     <!-- A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled -->
-    <string name="pref_map_3d_buildings_disabled_summary">3B yapılar güç tutum kipindeyken kapatılır</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3B yapılar güç tasarrufu modundayken kapatılır</string>
     <!-- Settings «Route» category: «Tts enabled» title -->
     <string name="pref_tts_enable_title">Sesli Yönlendirme</string>
     <!-- Settings «Route» category: «Tts announce street names» title -->
@@ -272,7 +272,7 @@
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
     <string name="compass_calibration_required">Pusulayı kalibre etmek ve haritadaki ok yönünü düzeltmek için telefonu sekiz şeklinde hareket ettirin.</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
-    <string name="long_tap_toast">Arayüzü görmek için haritaya uzun basın</string>
+    <string name="long_tap_toast">Seçenekleri görmek için haritaya tekrar basılı tutun</string>
     <!-- Update all button text -->
     <string name="downloader_update_all_button">Tümünü Güncelle</string>
     <!-- Cancel all button text -->
@@ -352,10 +352,10 @@
     <string name="dialog_routing_disclaimer_borders">— Sınır bölgelerinde rotalar konusunda dikkatli olun: uygulamamızca oluşturulan rotalar bazen izin verilmeyen yerlerdeki ülke sınırlarından geçebilir.</string>
     <string name="dialog_routing_disclaimer_beware">Lütfen yolda özenli ve güvenli olun!</string>
     <string name="dialog_routing_check_gps">GPS sinyalini denetle</string>
-    <string name="dialog_routing_error_location_not_found">Rota oluşturulamıyor. Şu anki GPS koordinatları tanımlanamadı.</string>
+    <string name="dialog_routing_error_location_not_found">Rota oluşturulamıyor. Mevcut GPS koordinatları belirlenemedi.</string>
     <string name="dialog_routing_location_turn_wifi">Lütfen GPS sinyalinizi denetleyin. Wi-Fi\'ı etkinleştirmek konum doğruluğunu artırır.</string>
     <string name="dialog_routing_location_turn_on">Konum hizmetlerini etkinleştir</string>
-    <string name="dialog_routing_location_unknown_turn_on">Şu anki GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Mevcut GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin.</string>
     <string name="dialog_routing_unable_locate_route">Rota belirlenemiyor</string>
     <string name="dialog_routing_cant_build_route">Rota oluşturulamıyor.</string>
     <string name="dialog_routing_change_start_or_end">Lütfen başlangıç noktanızı veya hedefinizi ayarlayın.</string>
@@ -595,7 +595,7 @@
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Bir hedef noktası eklemek için aramayı kullanın veya haritaya dokunun</string>
     <string name="planning_route_manage_route">Rotayı yönet</string>
-    <string name="button_plan">Plan</string>
+    <string name="button_plan">Hesapla</string>
     <string name="placepage_remove_stop">Durağı Kaldır</string>
     <string name="placepage_add_stop">Ara nokta ekle</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -663,7 +663,7 @@
     <string name="pref_tts_speedcams_always">Her zaman uyar</string>
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Hiçbir zaman uyarma</string>
-    <string name="power_managment_title">Düşük güç modu</string>
+    <string name="power_managment_title">Güç tasarrufu modu</string>
     <string name="power_managment_description">Kimi işlevler pahasına olsa da güç kullanımını düşürmeyi dener.</string>
     <string name="power_managment_setting_never">Asla</string>
     <string name="power_managment_setting_auto">Pil düşükken</string>
@@ -787,7 +787,7 @@
     <!-- App tip #03 -->
     <string name="app_tip_03">Bir yazılım mühendisi / geliştirici tanıyorsanız, ondan ihtiyacınız olan bir özelliği uygulamaya eklemesini isteyebilirsiniz.</string>
     <!-- App tip #04 -->
-    <string name="app_tip_04">Herhangi bir şeyi seçmek için haritaya dokunun. Uzun dokunarak arayüz gizlenip gösterilebilir.</string>
+    <string name="app_tip_04">Herhangi bir şeyi seçmek için haritada üzerine dokunun. Ekrandaki seçenekleri gizlemek ve geri getirmek için ise basılı tutun.</string>
     <!-- App tip #05 -->
     <string name="app_tip_05">Haritada şu anki konumunuzu seçebileceğinizi biliyor musunuz?</string>
     <!-- App tip #06 -->
@@ -915,7 +915,7 @@
     <string name="pref_backup_history_title">Saklanacak yedekleme sayısı</string>
     <string name="ruler">Cetvel</string>
     <string name="bookmark_color">Yer imi rengi</string>
-    <string name="open_now">Şimdi aç</string>
+    <string name="open_now">Şu an açık</string>
     <string name="closed_now">Şimdi kapandı</string>
     <string name="at">%s\'da</string>
     <string name="pref_backup_title">Yer imleri ve izlerin yedeği</string>

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

@@ -1124,7 +1124,7 @@
     <string name="type.shop.department_store">Універмаг</string>
     <string name="type.shop.doityourself">Будівельний магазин</string>
     <string name="type.shop.dry_cleaning">Хімчистка</string>
-    <string name="type.shop.electronics">Електротехнiка</string>
+    <string name="type.shop.electronics">Електротехніка</string>
     <string name="type.shop.erotic">Секс-шоп</string>
     <string name="type.shop.fabric">Магазин тканин</string>
     <string name="type.shop.farm">Магазин фермерських продуктів</string>

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

@@ -8,11 +8,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="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>
+</resources>

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

@@ -1136,8 +1136,8 @@
     <string name="type.shop.laundry">洗衣店</string>
     <string name="type.shop.mall">商场</string>
     <string name="type.shop.massage">按摩院</string>
-    <string name="type.shop.mobile_phone">手机专卖店</string>
-    <string name="type.shop.money_lender">商店</string>
+    <string name="type.shop.mobile_phone">手机店</string>
+    <string name="type.shop.money_lender">借贷机构</string>
     <string name="type.shop.motorcycle">摩托车商店</string>
     <string name="type.shop.motorcycle_repair">摩托车维修</string>
     <string name="type.shop.music">唱片店</string>
@@ -1401,4 +1401,17 @@
     <string name="type.leisure.firepit">火坑</string>
     <string name="type.man_made.crane">起重机</string>
     <string name="type.railway.station.subway.qingdao">地铁车站</string>
+    <string name="type.amenity.bicycle_parking.covered">有顶棚自行车停车处</string>
+    <string name="type.amenity.luggage_locker">行李寄存点</string>
+    <string name="type.landuse.religious">宗教用地</string>
+    <string name="type.natural.wetland.saltmarsh">盐沼</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">潮汐盐沼</string>
+    <string name="type.natural.wetland.fen">湿地</string>
+    <string name="type.natural.wetland.reedbed">芦苇地</string>
+    <string name="type.leisure.escape_game">密室逃脱</string>
+    <string name="type.natural.wetland.swamp">沼泽</string>
+    <string name="type.natural.wetland.mangrove">红树林</string>
+    <string name="type.natural.wetland.tidalflat">潮汐平原</string>
+    <string name="type.amenity.ranger_station">护林站</string>
+    <string name="type.post_office.post_partner">邮政合作点</string>
 </resources>