[android] Fix collor selector issue

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

.forgejo/workflows/android-beta.yaml

@@ -36,6 +36,8 @@ jobs:
   android-google-beta:
     name: Android Google Beta
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     environment: beta
     steps:
       - name: Install build tools and dependencies

.forgejo/workflows/android-check-metadata.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   android-check-metadata:
     name: Check app metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.forgejo/workflows/android-check.yaml

@@ -37,7 +37,9 @@ on:
 jobs:
   lint:
     name: Android Lint
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
+    container:
+      image: runmymind/docker-android-sdk:latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -56,6 +58,8 @@ jobs:
   android-check:
     name: Build Android Debug
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     strategy:
       fail-fast: false
       matrix:

.forgejo/workflows/android-monkey.yaml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   precondition:
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     name: Check preconditions
     steps:
       - name: Checkout sources
@@ -31,6 +31,8 @@ jobs:
   android-google-beta:
     name: Android Google Beta
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     needs: precondition
     if: ${{ needs.precondition.outputs.updated != '' }}
     environment: beta

.forgejo/workflows/android-release-metadata.yaml

@@ -5,7 +5,9 @@ on:
 jobs:
   android-release-metadata:
     name: Upload Google Play metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
+    container:
+      image: runmymind/docker-android-sdk:latest
     environment: production
     steps:
       - name: Checkout sources

.forgejo/workflows/android-release.yaml

@@ -10,6 +10,8 @@ jobs:
   tag:
     name: Tag
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     environment: production
     steps:
       - name: Checkout sources

.forgejo/workflows/appstream-check.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
   validate-appstream:
     name: Validate appstream metadata xml
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

.forgejo/workflows/coverage-check.yaml

@@ -33,7 +33,7 @@ concurrency:
 jobs:
   should-run-check:
     name: Should run coverage
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     outputs:
       run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
       manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}

.forgejo/workflows/dco.yml

@@ -5,4 +5,4 @@ jobs:
   check:
     runs-on: codeberg-tiny
     steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1
+      - uses: https://github.com/KineticCafe/actions-dco@v1

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

@@ -9,7 +9,7 @@ on:
 jobs:
   validate-desktop-file:
     name: Validate .desktop file
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

.forgejo/workflows/ios-check-metadata.yaml

@@ -10,7 +10,7 @@ on:
 jobs:
   ios-check-metadata:
     name: Check app metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     steps:
       - name: Checkout
         uses: actions/checkout@v4

CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.22.1)
-
 project(omim C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -106,7 +105,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
   add_definitions(-DRELEASE)
   if (NOT MSVC)
-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+    add_compile_options(-Ofast $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)  # Also enables -ffast-math
   endif()
 else()
   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})

android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt

@@ -1,7 +0,0 @@
-• Data OpenStreetMap k 4. 8.
-• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
-• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
-• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
-• podpora více zkratek a aliasů pro vyhledávání
-• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
-• plynulejší pohyb šipky pro určení polohy

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

@@ -1,7 +1,9 @@
-• OpenStreetMap-Daten vom 4. August
-• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Der Positionspfeil bewegt sich gleichmässiger
+Wir stellen vor: Das neue CoMaps-Logo!
+• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
+• Links zu Panoramax-Bildern für ausgewählte POIs
+• OpenStreetMap-Daten vom 13. Juli
+• Neue Farben für viele Objekte und Farben werden früher angezeigt
+• Öffnungszeiten werden beim Antippen eines POI angezeigt
+• Verschiedene Arten von Feuchtgebieten
+• Neue Farben für Vegetation und andere Features; einige neue Icons
+• Wandern: bessere Darstellung der Höhenlinien

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

@@ -1,7 +1,10 @@
-• OpenStreetMap data as of August 4
-• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• upgrade altitude contour lines to 20m step for some popular hiking regions
-• support more search abbreviations and aliases
-• add search and bookmark icons for fast food, bicycle and charging stations
-• more smooth position arrow movements
+Introducing CoMaps logo!
+
+• upgrade altitude contour lines for many regions to 20 or 50 meters step
+• add Panoramax Picture links to selected POIs
+• OpenStreetMap data as of July 13
+• add color fills to many features and display fills earlier for existing features
+• display opening hours state when selecting a POI
+• split all wetlands into several distinct types
+• update vegetation and other map colors, update some map icons
+• outdoors: bolder altitude contour lines

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,7 +1,9 @@
-• Datos de OpenStreetMap a fecha 2025.08.04
-• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• Más abreviaturas y alias de búsqueda
-• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• Más fluidez de la flecha de posición
+¡Presentamos el logo de CoMaps!
+• mejora de isolíneas con más detalle para muchas regiones
+• añade enlaces de imágenes de Panoramax a POIs seleccionados
+• datos de OpenStreetMap a 13 de julio
+• añadidos rellenos de color a muchas características
+• se muestra el estado de horarios de apertura al seleccionar un POI
+• se dividen los humedales en tipos distintos
+• se actualiza la vegetación y otros colores del mapa, así como otros iconos
+• exteriores: líneas de contorno de altitud más gruesas

android/app/src/fdroid/play/listings/fa-IR/short-description.txt

@@ -1 +0,0 @@
-ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه

android/app/src/fdroid/play/listings/fa-IR/title.txt

@@ -1 +0,0 @@
-CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -0,0 +1,7 @@
+Présentation du logo CoMaps !
+• Amélioration des courbes d’altitude à une précision de 20 ou 50 mètres pour de nombreuses régions
+• Ajout d'un lien vers les images Panoramax des POI
+• Données OpenStreetMap du 13 juillet
+• Affichage de l’état des heures d’ouverture lors de la sélection d’un POI
+• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
+• Outdoors: Améliorations de la visibilité des courbes d'altitude

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

@@ -1 +1 @@
-Navigation de cartes facile - Découvrez le monde - Propulsé par la communauté
+Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté

android/app/src/fdroid/play/listings/it-IT/release-notes.txt

@@ -1,7 +0,0 @@
-• Dati di OpenStreetMap aggiornati al 4 Agosto
-• Migliorati i colori per acqua, foreste, servizi etc
-• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
-• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
-• Aggiunto il supporto per un maggior numero di alias
-• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
-• Resi più fluidi i movimenti della freccia di posizione

android/app/src/fdroid/play/listings/pl-PL/release-notes.txt

@@ -0,0 +1,9 @@
+Wprowadzamy logo CoMaps!
+• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
+• dodanie linków do zdjęć z Panoramax do wybranych POI
+• aktualizacja danych OpenStreetMap z 13 lipca
+• dodanie wypełnienia kolorem dla wielu typów obiektów
+• wyświetlanie stanu godzin otwarcia przy wyborze POI
+• podział mokradeł na kilka typów
+• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
+• tryb outdoorowy: pogrubione warstwice wysokości

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,7 +1,9 @@
-• Dados OSM de 4/08
-• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Suporte a mais abreviações para busca
-• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Movimentos mais suaves para seta de posição
+Apresentamos o logo do CoMaps!
+• Curvas de nível mais detalhadas em muitas regiões
+• Adicionados links de imagens do Panoramax para pontos de interesse selecionados
+• Dados OSM de 13/07
+• Adicionados preenchimentos de cor a muitos elementos
+• Exibição de horário de funcionamento ao selecionar um ponto de interesse
+• Divididas áreas úmidas em vários tipos distintos
+• Atualizada cores/ícones para vegetação e outros elementos
+• Ar livre: curvas de nível de altitude mais destacadas

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,7 +1,9 @@
-• Карты OpenStreetMap от 4 августа
-• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
-• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
-• Для некоторых популярных туристических регионов добавлены линии высот 20м
-• Поддержка дополнительных поисковых сокращений и синонимов
-• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
-• Более плавное движение стрелки местоположения
+Представляем логотип CoMaps!
+• Линии высот для многих регионов с шагом 20м или 50м
+• Ссылки на изображения Panoramax к выбранным POI
+• Карты OpenStreetMap от 13 июля
+• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
+• Показ часов работы при выборе POI
+• Разные водно-болотные угодья отличаются цветом
+• Обновлены цвета растительности и другие цвета на карте, изменены некоторые иконки
+• В стиле "Активный отдых" более четкие линии высот

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

@@ -1,7 +1,9 @@
-• подаци из OpenStreetMap-а од 4. августа
-• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
-• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
-• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
-• подршка за више скраћеница и алтернативних назива у претрази
-• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• равномерније кретање стрелице која приказује позицију
+Представљамо CoMaps лого!
+• ажуриране изохипсе за многе регионе на кораке од 20 или 50 метара
+• додате везе ка Panoramax сликама за изабране тачке интересовања (POI)
+• подаци са OpenStreetMap-а од 13. јула
+• додате боје за многе елементе и раније приказивање постојећих површина
+• приказ стања радног времена при избору POI-ја
+• мочваре подељене на неколико различитих типова
+• ажуриране боје вегетације и других елемената на мапи, ажуриране поједине иконе
+• на отвореном: наглашеније изохипсе

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.08.13-8-FDroid+25081308
+version: 2025.03.02-7-FDroid+25030207

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/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/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/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/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/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
@@ -51,7 +53,6 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:layout_marginStart="@dimen/margin_half_plus"
       android:text="@string/list"
       android:textAppearance="@style/MwmTextAppearance.Body3" />
     <com.google.android.material.textview.MaterialTextView
@@ -89,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/values-af/types_strings.xml

@@ -763,6 +763,11 @@
     <string name="type.power.substation">Substasie</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Kragmas</string>
+    <string name="type.psurface">Padoppervlak</string>
+    <string name="type.psurface.paved_bad">Geteer</string>
+    <string name="type.psurface.paved_good">Geteer</string>
+    <string name="type.psurface.unpaved_bad">Ongeteer</string>
+    <string name="type.psurface.unpaved_good">Ongeteer</string>
     <string name="type.public_transport">Openbare vervoer</string>
     <string name="type.public_transport.platform">Platform</string>
     <string name="type.railway">Spoorweg</string>
@@ -1310,4 +1315,5 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Sportsaal</string>
     <string name="type.railway.station.subway.qingdao">Moltreinstasie</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1280,4 +1280,5 @@
     <string name="type.amenity.love_hotel">فندق جب</string>
     <string name="type.amenity.studio">معرض</string>
     <string name="type.railway.station.subway.qingdao">محطة مترو</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -158,4 +158,5 @@
     <string name="type.amenity.language_school">Escuela de llingües</string>
     <string name="type.amenity.hospital">Hospital</string>
     <string name="type.craft.confectionery">Confitería</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1328,4 +1328,5 @@
     <string name="type.amenity.dojo">Dojo</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">İdman zalı</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -623,4 +623,6 @@
     <string name="type.amenity.dojo">Додзе</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Спартыўная зала</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -774,6 +774,7 @@
     <string name="type.highway.road">Път</string>
     <string name="type.highway.tertiary">Третостепенен път</string>
     <string name="type.landuse.cemetery">Гробище</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.amenity.studio">Студио</string>
     <string name="type.amenity.college">Колеж</string>
     <string name="type.barrier.guard_rail">Мантинела</string>

android/app/src/main/res/values-bn/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-ca/types_strings.xml

@@ -963,4 +963,5 @@
     <string name="type.amenity.studio">Estudi</string>
     <string name="type.barrier.guard_rail">Barrera de seguretat</string>
     <string name="type.leisure.hackerspace">Hacklab</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1171,8 +1171,11 @@
     <string name="type.amenity.dojo">Dódžó</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Sportovní hala</string>
+    <string name="type.psurface">psurface</string>
     <string name="type.landuse.salt_pond">Solné jezírko</string>
     <string name="type.route">Trasa</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
     <string name="type.power.minor_line">Vedlejší elektrické vedení</string>
     <string name="type.recycling.cans">Plechovky</string>
     <string name="type.aerialway.drag_lift">Vlek</string>
@@ -1201,6 +1204,10 @@
     <string name="type.highway.bridleway.permissive">Hipostezka</string>
     <string name="type.highway.cycleway.permissive">Cyklostezka</string>
     <string name="type.highway.elevator">Výtah</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.junction.roundabout">Kruhový objezd</string>
     <string name="type.landuse.brownfield">Brownfield</string>
@@ -1218,6 +1225,7 @@
     <string name="type.man_made.pipeline.overground">Povrchové potrubí</string>
     <string name="type.man_made.wastewater_plant">Čistírna odpadních vod</string>
     <string name="type.man_made.works">Průmysl</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.military">Armáda</string>
     <string name="type.mountain_pass">Horské sedlo</string>
     <string name="type.power">Energie</string>
@@ -1254,10 +1262,12 @@
     <string name="type.aerialway.cable_car">Visutá lanovka</string>
     <string name="type.landuse.vineyard">Vinice</string>
     <string name="type.leisure.beach_resort">Plážový areál</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.amenity.food_court">Jídelní zóna</string>
     <string name="type.recycling.cardboard">Lepenka</string>
     <string name="type.recycling.shoes">Boty</string>
     <string name="type.building.warehouse">Sklad</string>
+    <string name="type.hwtag">hwtag</string>
     <string name="type.amenity.shelter.lean_to">Otevřený přístřešek</string>
     <string name="type.amenity.vending_machine.coffee">Automat na kávu</string>
     <string name="type.amenity.taxi">Stanoviště taxislužby</string>
@@ -1265,6 +1275,7 @@
     <string name="type.barrier.hedge">Živý plot</string>
     <string name="type.boundary">Hranice</string>
     <string name="type.amenity.vending_machine.newspapers">Automat na noviny</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
     <string name="type.leisure.ice_rink">Ledové kluziště</string>
     <string name="type.railway.construction">Železniční stavba</string>
     <string name="type.landuse">Využití území</string>
@@ -1277,12 +1288,18 @@
     <string name="type.boundary.administrative.3">Hranice oblasti</string>
     <string name="type.landuse.garages">Garáže</string>
     <string name="type.leisure.track.area">Trať</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
     <string name="type.junction.circular">Kruhový objezd</string>
     <string name="type.area_highway.cycleway">Cyklostezka</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
     <string name="type.landuse.commercial">Komerční zóna</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
     <string name="type.organic.only">Přírodní</string>
     <string name="type.railway.abandoned">Zaniklá železnice</string>
     <string name="type.landuse.education">Vzdělávací zařízení</string>
+    <string name="type.hwtag.private">hwtag-private</string>
     <string name="type.sport.bowls">Bowls</string>
     <string name="type.landuse.farmyard">Statek</string>
     <string name="type.man_made.pier">Molo</string>
@@ -1295,8 +1312,10 @@
     <string name="type.railway.crossing">Železniční přejezd</string>
     <string name="type.man_made.silo">Silo</string>
     <string name="type.man_made.survey_point">Topografický bod</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.shop.supermarket">Supermarket</string>
     <string name="type.organic.yes">Přírodní</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
     <string name="type.railway.tram">Tramvajová trať</string>
     <string name="type.railway.light_rail.tunnel">Tunel lehké železnice</string>
     <string name="type.railway.abandoned.bridge">Most zaniklé železnice</string>
@@ -1310,14 +1329,18 @@
     <string name="type.railway.tram.tunnel">Tunel tramvajové trati</string>
     <string name="type.barrier.fence">Plot</string>
     <string name="type.leisure.marina">Přístav</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
     <string name="type.amenity.vending_machine.condoms">Automat na kondomy</string>
     <string name="type.public_transport">Veřejná doprava</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
     <string name="type.leisure.common">Veřejný prostor</string>
     <string name="type.leisure.recreation_ground">Rekreační areál</string>
     <string name="type.boundary.administrative.4">Hranice oblasti</string>
     <string name="type.aerialway">Lanová dráha</string>
     <string name="type.highway.services">Odpočívadlo se službami</string>
     <string name="type.man_made.cutline">Průsek</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
     <string name="type.railway.preserved.bridge">Most zachovalé železnice</string>
     <string name="type.railway.narrow_gauge.tunnel">Tunel úzkorozchodné železnice</string>
     <string name="type.amenity.bar">Bar</string>

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

@@ -1356,6 +1356,7 @@
     <string name="type.piste_type.sled.area">Kælkebane</string>
     <string name="type.piste_type.downhill.novice.area">Meget let pist</string>
     <string name="type.railway.tram.bridge">Sporvejsbro</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.landuse.plant_nursery">Planteskole</string>
     <string name="type.leisure.firepit">Bålplads</string>
     <string name="type.man_made.crane">Kran</string>

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

@@ -1344,17 +1344,40 @@
     <string name="type.man_made.pipeline">Pipeline</string>
     <string name="type.amenity.bar">Bar</string>
     <string name="type.amenity.restaurant">Restaurant</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.leisure.hackerspace">Hackerraum</string>
     <string name="type.sport.yoga">Yoga Studio</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.noexit">Sackgasse</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.shop.kiosk">Kiosk</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
     <string name="type.boundary.administrative.2">Landesgrenze</string>
     <string name="type.building.garage">Garage</string>
     <string name="type.cuisine.fish_and_chips">Fisch und Chips</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
     <string name="type.leisure.beach_resort">Badestrand</string>
     <string name="type.amenity.food_court">Food Court</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.fee.yes">$</string>
     <string name="type.man_made.utility_pole">Versorgungsmast</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>

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

@@ -142,7 +142,7 @@
     <string name="type.amenity.shelter.basic_hut">καταφύγιο bivouac</string>
     <string name="type.amenity.public_bath">Δημόσιο Λουτρό</string>
     <string name="type.amenity.shower">Ντους</string>
-    <string name="type.amenity.stripclub">Στριπτιζάδικο</string>
+    <string name="type.amenity.stripclub">Stripclub</string>
     <string name="type.amenity.taxi">Ταξί</string>
     <string name="type.amenity.telephone">Τηλέφωνο</string>
     <string name="type.amenity.theatre">Θέατρο</string>
@@ -1014,7 +1014,7 @@
     <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.mobile_phone">Κινητή Τηλεφωνία</string>
     <string name="type.shop.money_lender">Δανειστής χρημάτων</string>
     <string name="type.shop.motorcycle">Κατάστημα μοτοσυκλετών</string>
     <string name="type.shop.motorcycle_repair">Επισκευή μοτοσυκλετών</string>
@@ -1183,7 +1183,7 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
     <string name="type.emergency.emergency_ward_entrance">Είσοδος θαλάμου έκτακτης ανάγκης</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Ντότζο</string>
+    <string name="type.amenity.dojo">Dojo</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Αθλητική αίθουσα</string>
     <string name="type.piste_type.downhill.advanced">Προχωρημένη πίστα κατάβασης σκι</string>
@@ -1227,6 +1227,7 @@
     <string name="type.highway.cycleway">Ποδηλατόδρομος</string>
     <string name="type.highway.cycleway.permissive">Ποδηλατόδρομος</string>
     <string name="type.highway.elevator">Ανελκυστήρας</string>
+    <string name="type.highway.world_level">αυτοκινητόδρομος-κόσμος_επίπεδο</string>
     <string name="type.barrier.wall">Τοίχος</string>
     <string name="type.recycling.cans">Κονσερβοκούτια</string>
     <string name="type.barrier">Εμπόδιο</string>
@@ -1246,6 +1247,7 @@
     <string name="type.area_highway.cycleway">Ποδηλατόδρομος</string>
     <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>
@@ -1254,10 +1256,4 @@
     <string name="type.railway.subway.tunnel">Σήραγγα γραμμής μετρό</string>
     <string name="type.man_made.crane">Γερανός</string>
     <string name="type.railway.station.subway.qingdao">Σταθμός μετρό</string>
-    <string name="type.junction.circular">Κυκλικός κόμβος</string>
-    <string name="type.tourism">Τουρισμός</string>
-    <string name="type.attraction.big_wheel">Τροχός</string>
-    <string name="type.attraction.bumper_car">Συγκρουόμενα</string>
-    <string name="type.landuse">Χρήσης γης</string>
-    <string name="type.junction.roundabout">Κυκλικός κόμβος</string>
 </resources>

android/app/src/main/res/values-en-rGB/types_strings.xml

@@ -287,4 +287,5 @@
     <string name="type.power.pole">Power Pole</string>
     <string name="type.man_made.utility_pole">Utility Pole</string>
     <string name="type.railway.station.subway.qingdao">Metro Station</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -554,4 +554,5 @@
     <string name="type.amenity.motorcycle_rental">Renta de motocicletas</string>
     <string name="type.highway.traffic_signals">Semáforo</string>
     <string name="type.cuisine.crepe">Crepas</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -449,10 +449,10 @@
     <string name="add_language">Añadir un idioma</string>
     <string name="street">Calle</string>
     <!-- Editable House Number text field (in address block). -->
-    <string name="house_number">Número de domicilio</string>
+    <string name="house_number">Número de casa</string>
     <string name="details">Detalles</string>
     <string name="social_media">Redes sociales</string>
-    <string name="building">Edificación</string>
+    <string name="building">Edificio</string>
     <!-- Text field to enter non-existing street name, below list of known streets around -->
     <string name="add_street">Añadir una calle</string>
     <!-- Error to display when a new street name is not entered in the New street dialog -->
@@ -671,7 +671,7 @@
     <string name="power_managment_setting_never">Nunca</string>
     <string name="power_managment_setting_auto">Cuando queda poca energía</string>
     <string name="power_managment_setting_manual_max">Siempre</string>
-    <string name="enable_logging_warning_message">Activa esta opción temporalmente para grabar y enviar de forma manual registros para diagnosticar defectos mediante la opción «Informar de un fallo» en el diálogo Ayuda. Los registros pueden incluir ubicaciones.</string>
+    <string name="enable_logging_warning_message">Active esta opción temporalmente para grabar y enviar de forma manual registros para diagnosticar defectos enviados mediante la opción «Informar de un fallo» en el diálogo Ayuda. Los registros pueden incluir ubicaciones.</string>
     <string name="access_rules_author_only">Edición en línea</string>
     <string name="driving_options_title">Opciones de enrutamiento</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -682,7 +682,7 @@
     <string name="avoid_ferry">Evitar ferris</string>
     <string name="avoid_motorways">Evitar autopistas</string>
     <string name="unable_to_calc_alert_title">No se puede calcular la ruta</string>
-    <string name="unable_to_calc_alert_subtitle">No se pudo encontrar una ruta. Quizás se deba a las opciones de enrutamiento o a datos faltantes en OpenStreetMap. Revisa tus opciones de enrutamiento y vuelve a intentarlo.</string>
+    <string name="unable_to_calc_alert_subtitle">No se pudo encontrar una ruta. Quizá se deba a las opciones de enrutamiento o a datos faltantes en OpenStreetMap. Revise sus opciones de enrutamiento y vuelva a intentarlo.</string>
     <string name="define_to_avoid_btn">Defina los caminos para evitar</string>
     <string name="change_driving_options_btn">Opciones de enrutamiento activadas</string>
     <string name="toll_road">Carretera de peaje</string>
@@ -700,7 +700,7 @@
     <string name="capacity">Capacidad: %s</string>
     <!-- To indicate the network of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="network">Red: %s</string>
-    <string name="trip_finished">¡Has llegado!</string>
+    <string name="trip_finished">¡Ha llegado!</string>
     <string name="ok">Aceptar</string>
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Ordenar…</string>
@@ -727,7 +727,7 @@
     <string name="tourist_places">Sitios de interés</string>
     <string name="museums">Museos</string>
     <string name="parks">Parques</string>
-    <string name="swim_places">Nado</string>
+    <string name="swim_places">Natación</string>
     <string name="mountains">Montañas</string>
     <string name="animals">Animales</string>
     <string name="hotels">Hoteles</string>
@@ -738,14 +738,14 @@
     <string name="fuel_places">Gasolineras</string>
     <string name="medicine">Medicina</string>
     <string name="search_in_the_list">Buscar en la lista</string>
-    <string name="religious_places">Lugares religiosos</string>
+    <string name="religious_places">Lugares sagrados</string>
     <string name="select_list">Seleccionar lista</string>
     <string name="transit_not_found">Navegación en Metro aún no disponible en esta región</string>
     <string name="dialog_pedestrian_route_is_long_header">No se encontró ninguna ruta de metro</string>
-    <string name="dialog_pedestrian_route_is_long_message">Elije un punto de inicio o fin de ruta más cercano a una estación de metro</string>
-    <string name="button_layer_isolines">Curvas de nivel</string>
+    <string name="dialog_pedestrian_route_is_long_message">Elija un punto de inicio o fin de ruta más cercano a una estación de metro</string>
+    <string name="button_layer_isolines">Alturas</string>
     <string name="isolines_activation_error_dialog">Para usar las curvas de nivel, actualice o descargue el mapa del área deseada</string>
-    <string name="isolines_location_error_dialog">Las curvas de nivel aún no están disponible en esta región</string>
+    <string name="isolines_location_error_dialog">La altitud de relieve aún no está disponible en esta región</string>
     <string name="elevation_profile_ascent">Ascenso</string>
     <string name="elevation_profile_descent">Descenso</string>
     <string name="elevation_profile_min_elevation">Elevación mín.</string>
@@ -753,7 +753,7 @@
     <string name="elevation_profile_difficulty">Dificultad</string>
     <string name="elevation_profile_distance">Dist.:</string>
     <string name="elevation_profile_time">Tiempo:</string>
-    <string name="isolines_toast_zooms_1_10">Amplíe el mapa para ver las curvas de nivel</string>
+    <string name="isolines_toast_zooms_1_10">Amplíe el mapa para ver las isolíneas</string>
     <string name="downloader_loading_ios">Descargando</string>
     <string name="download_map_title">Descarga el mapa mundial de previsualización</string>
     <!-- Used in DownloadResources startup screen -->
@@ -763,7 +763,7 @@
     <!-- Used in DownloadResources startup screen -->
     <string name="connection_failure">Fallo de conexión</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable_title">Desconecta el cable USB</string>
+    <string name="disconnect_usb_cable_title">Desconecte el cable USB</string>
     <string name="enable_keep_screen_on">Mantener pantalla encendida</string>
     <!-- Description in preferences -->
     <string name="enable_keep_screen_on_description">Cuando está activada, la pantalla siempre estará encendida cuando se muestre el mapa.</string>

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

@@ -11,7 +11,7 @@
     <string name="type.aerialway.gondola">Telecabina</string>
     <string name="type.aerialway.mixed_lift">Telecabina/telesilla</string>
     <string name="type.aerialway.station">Estación de teleférico</string>
-    <string name="type.aeroway">Infraestructura aeronáutica</string>
+    <string name="type.aeroway">Infraestructura aérea</string>
     <string name="type.aeroway.aerodrome">Aeropuerto</string>
     <string name="type.aeroway.aerodrome.international">Aeropuerto internacional</string>
     <string name="type.aeroway.apron">Plataforma de estacionamiento de aviones</string>
@@ -20,7 +20,7 @@
     <string name="type.aeroway.runway">Pista de despegue</string>
     <string name="type.aeroway.taxiway">Pista de rodaje</string>
     <string name="type.aeroway.terminal">Terminal</string>
-    <string name="type.amenity">Instalación</string>
+    <string name="type.amenity">Infraestructura</string>
     <string name="type.amenity.arts_centre">Centro de arte</string>
     <string name="type.amenity.atm">Cajero automático</string>
     <string name="type.amenity.bank">Banco</string>
@@ -42,7 +42,7 @@
     <string name="type.amenity.casino">Casino</string>
     <string name="type.amenity.gambling">Juegos de apuestas</string>
     <string name="type.leisure.adult_gaming_centre">Centro de juegos para adultos</string>
-    <string name="type.leisure.amusement_arcade">Sala de juegos arcade</string>
+    <string name="type.leisure.amusement_arcade">Sala de recreativos</string>
     <string name="type.amenity.charging_station">Estación de carga</string>
     <string name="type.amenity.charging_station.bicycle">Estación de carga de bicicletas</string>
     <string name="type.amenity.charging_station.motorcar">Estación de carga de automóviles</string>
@@ -66,7 +66,7 @@
     <string name="type.amenity.language_school">Escuela de idiomas</string>
     <string name="type.office.diplomatic">Embajada</string>
     <string name="type.amenity.fast_food">Comida rápida</string>
-    <string name="type.amenity.ferry_terminal">Transbordador de ferry</string>
+    <string name="type.amenity.ferry_terminal">Transbordador</string>
     <string name="type.amenity.fire_station">Parque de bomberos</string>
     <string name="type.amenity.food_court">Zona de comidas</string>
     <string name="type.amenity.fountain">Fuente</string>
@@ -515,12 +515,12 @@
     <string name="type.highway.trunk_link.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.trunk_link.tunnel">Túnel</string>
-    <string name="type.highway.unclassified">Carretera menor</string>
-    <string name="type.highway.unclassified.area">Carretera menor</string>
+    <string name="type.highway.unclassified">Carretera sin clasificar</string>
+    <string name="type.highway.unclassified.area">Carretera sin clasificar</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.unclassified.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.unclassified.tunnel">Túnel</string>
+    <string name="type.highway.unclassified.tunnel">Túnel de carretera sin clasificar</string>
     <string name="type.area_highway.cycleway">Ciclovía</string>
     <string name="type.area_highway.footway">Senda</string>
     <string name="type.area_highway.living_street">Calle de prioridad peatonal</string>
@@ -535,10 +535,10 @@
     <string name="type.area_highway.steps">Escaleras</string>
     <string name="type.area_highway.track">Pista</string>
     <string name="type.area_highway.trunk">Vía troncal</string>
-    <string name="type.area_highway.unclassified">Carretera menor</string>
+    <string name="type.area_highway.unclassified">Carretera sin clasificar</string>
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Objeto histórico</string>
-    <string name="type.historic.aircraft">Aeronave histórica</string>
+    <string name="type.historic.aircraft">Avión histórico</string>
     <string name="type.historic.anchor">Ancla histórica</string>
     <string name="type.historic.archaeological_site">Yacimiento arqueológico</string>
     <string name="type.historic.battlefield">Campo de batalla</string>
@@ -1359,6 +1359,29 @@
     <string name="type.man_made.utility_pole">Poste</string>
     <string name="type.railway.abandoned.tunnel">Túnel ferroviario abandonado</string>
     <string name="type.railway.abandoned.bridge">Puente ferroviario abandonado</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.railway.funicular.bridge">Puente de funicular</string>
     <string name="type.railway.funicular.tunnel">Túnel de funicular</string>
     <string name="type.railway.light_rail.tunnel">Túnel de tren ligero</string>

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

@@ -799,6 +799,7 @@
     <string name="type.power.substation">Alajaam</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Kõrgepingemast</string>
+    <string name="type.psurface">Pind</string>
     <string name="type.public_transport">Ühistransport</string>
     <string name="type.public_transport.platform">Ooteplatvorm</string>
     <string name="type.railway">Raudtee</string>
@@ -1368,6 +1369,28 @@
     <string name="type.attraction.bumper_car">Autodroom</string>
     <string name="type.fee.yes">$ / €</string>
     <string name="type.leisure.hackerspace">Häkkerite ühisruum</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
     <string name="type.sport.diving">Vettehüpped</string>
     <string name="type.leisure.firepit">Tulease</string>
     <string name="type.amenity.love_hotel">Armuhotell</string>

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

@@ -1241,6 +1241,7 @@
     <string name="type.highway.bridleway.permissive">Zaldi-bidea</string>
     <string name="type.amenity.bicycle_repair_station">Bizikleta konponketa gunea</string>
     <string name="type.highway.services">Zerbitzugunea</string>
+    <string name="type.highway.world_level">Mundu mailako errepidea</string>
     <string name="type.internet_access.wlan">Wi-Fia</string>
     <string name="type.junction">Bidegurutzea</string>
     <string name="type.landuse.allotments">Baratze komunitatea</string>
@@ -1270,6 +1271,7 @@
     <string name="type.landuse.garages">Garajeak</string>
     <string name="type.railway.narrow_gauge.bridge">Zabalera estuko trenbide-zubia</string>
     <string name="type.landuse">Lurzoruaren erabilera</string>
+    <string name="type.highway.world_towns_level">Herri mailako errepidea</string>
     <string name="type.landuse.commercial">Komertzial-gunea</string>
     <string name="type.landuse.military">Militar-gunea</string>
     <string name="type.leisure.recreation_ground">Parkea</string>
@@ -1337,11 +1339,13 @@
     <string name="type.tourism.zoo">Zoo</string>
     <string name="type.railway.tram">Tranbia bidea</string>
     <string name="type.man_made.survey_point">Markatze-puntua</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made">Artifiziala</string>
     <string name="type.amenity.love_hotel">Maitasun hotela</string>
     <string name="type.noexit">Irteerarik gabeko bidea</string>
     <string name="type.leisure.escape_game">Escape Room</string>
     <string name="type.landuse.religious">Eremu erlijiosoa</string>
+    <string name="type.mapswithme.grid">mapswithme-sareta</string>
     <string name="type.amenity.bicycle_parking.covered">Txirrinduen aparkaleku estalia</string>
     <string name="type.amenity.luggage_locker">Ekipaje-kontsigna</string>
     <string name="type.natural.wetland.saltmarsh">Gatz-padura</string>

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

@@ -9,9 +9,9 @@
     <string name="delete">حذف</string>
     <string name="download_maps">دانلود نقشه‌ها</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">دانلود ناموفق بود، برای تلاش مجدد لمس کنید</string>
+    <string name="download_has_failed">دانلود ناموفق بود. برای تلاش مجدد لمس کنید</string>
     <!-- Settings/Downloader - info for country which started downloading -->
-    <string name="downloading">درحال دانلود…</string>
+    <string name="downloading">درحال دانلود</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">کیلومتر</string>
     <!-- Settings/Downloader - size string, only strings different from English should be translated -->
@@ -22,9 +22,9 @@
     <!-- A text for current gps location point/arrow selected on the map -->
     <string name="core_my_position">مکان من</string>
     <!-- Update maps later button text -->
-    <string name="later">بعدًا</string>
+    <string name="later">بعداً</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
-    <string name="search">جستجو</string>
+    <string name="search">جست‌وجو</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">جست‌وجوی نقشه</string>
     <!-- Location services are disabled by user alert - message -->
@@ -32,26 +32,26 @@
     <!-- 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>
+    <string name="zoom_to_country">بر روی نقشه نمایش بده</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">دانلود با شکست مواجه شد</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">تلاش مجدد</string>
     <string name="about_menu_title">CoMaps درباره‌ی</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• آسان برای استفاده و جلا</string>
+    <string name="about_proposition_1">• بدون تبلیغات ، ردیابی ، جمع آوری داده ها</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• حریم خصوصی متمرکز و بدون تبلیغات</string>
+    <string name="about_proposition_2">• بدون تخلیه باتری، آفلاین کار می کند</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">منبع کاملا باز، نه برای سود، تصمیم گیری شفاف و امور مالی شفاف.</string>
+    <string name="about_developed_by_enthusiasts">برنامه منبع باز ایجاد شده توسط علاقه مندان و داوطلبان.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">تنظیمات مکان</string>
     <string name="close">بستن</string>
-    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
+    <string name="unsupported_phone">نیازمند است. متاسفانه دستگاه شما از آن پشتیبانی نمی‌کندOpenGLبرنامه برای اجرا به</string>
     <string name="download">دانلود</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
@@ -71,7 +71,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">نشانه‌ها</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">نشانه‌ها و مسیر ها</string>
+    <string name="bookmarks_and_tracks">نشانه‌ها و مسیر</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">مکان من</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -149,9 +149,9 @@
     <!-- message title of loading file -->
     <string name="load_kmz_title">در حال بارگیری نشانه‌ها</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.</string>
+    <string name="load_kmz_successful">نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">بارگذاری نشانه‌ها با شکست مواجه شد.ممکن است فایل آسیب دیده یا معیوب باشد.</string>
+    <string name="load_kmz_failed">بارگذاری نشانه‌ها با شکست مواجه شد.ممکن است فایل آسیب دیده یا معیوب باشد</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">نوع فایل توسط برنامه تشخیص داده نمی شود: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -211,9 +211,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">تست دستورالعمل های صوتی</string>
+    <string name="pref_tts_test_voice_title">تست مسیرهای صوتی (TTS، تبدیل متن به گفتار)</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>
@@ -273,7 +273,7 @@
     <!-- Preference title -->
     <string name="google_play_services">خدمات مکان Google Play</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">یک سرویس اختصاصی که GPS، Wi-Fi، شبکه های سلولی و غیره را ترکیب می کند تا مکان شما را دقیق تر مشخص کند. ممکن است به سرورهای گوگل متصل شود.</string>
+    <string name="pref_use_google_play">به سرعت مکان تقریبی خود را با استفاده از بلوتوث، WiFi یا شبکه تلفن همراه تعیین کنید</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -283,7 +283,7 @@
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">فضای کافی موجود نیست</string>
     <!-- location service disabled -->
-    <string name="enable_location_services">لطفا موقعیت مکانی خود را فعال کنید</string>
+    <string name="enable_location_services">لطفا موقعیت مکانی(GPS)خود را فعال کنید.</string>
     <string name="save">ذخیره</string>
     <string name="create">ایجاد</string>
     <!-- red color -->
@@ -326,7 +326,7 @@
     <string name="dialog_routing_disclaimer_borders">—در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر‌هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز‌های کشور‌ها را رد کند که این در بعضی مناطق غیر مجاز است.</string>
     <string name="dialog_routing_disclaimer_beware">لطفا هوشیار و ایمن در جاده بمانید!</string>
     <string name="dialog_routing_check_gps">سیگنال GPS را چک کنید</string>
-    <string name="dialog_routing_error_location_not_found">ناتوان از ایجاد مسیر. موقعیت مکانی شما شناسایی نشد.</string>
+    <string name="dialog_routing_error_location_not_found">ناتوان از ایجاد مسیر.موقعیت مکانی شما شناسایی نشد</string>
     <string name="dialog_routing_location_turn_wifi">لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت‌یابی فعال کنید.</string>
     <string name="dialog_routing_location_turn_on">فعال کردن سرویس موقعیت مکانی (GPS)</string>
     <string name="dialog_routing_location_unknown_turn_on">ناتوان از مشخص کردن موقعیت مکانی شما.لطفا سرویس موقعیت مکانی خود را فعال کنید.</string>
@@ -334,15 +334,15 @@
     <string name="dialog_routing_cant_build_route">ناتوان در ایجاد مسیر</string>
     <string name="dialog_routing_change_start_or_end">لطفا مبدا یا مقصد خود را تنظیم کنید.</string>
     <string name="dialog_routing_change_start">مبدا خود را تنظیم کنید</string>
-    <string name="dialog_routing_start_not_determined">مسیر ایجاد نشد. ناتوان در تعیین نقطه شروع.</string>
+    <string name="dialog_routing_start_not_determined">مسیر ایجاد نشد.ناتوان در تعیین نقطه شروع</string>
     <string name="dialog_routing_select_closer_start">لطفا نقطه شروع را نزدیک‌تر به جاده انتخاب کنید.</string>
     <string name="dialog_routing_change_end">تنظیم مقصد</string>
     <string name="dialog_routing_end_not_determined">مسیر ایجاد نشد.ناتوان در تعیین مقصد.</string>
-    <string name="dialog_routing_select_closer_end">لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید</string>
-    <string name="dialog_routing_change_intermediate">ناتوان در تعیین نقطه میانی</string>
-    <string name="dialog_routing_intermediate_not_determined">لطفا نقطه میانی را تنظیم کنید</string>
+    <string name="dialog_routing_select_closer_end">لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید.</string>
+    <string name="dialog_routing_change_intermediate">ناتوان در تعیین نقطه میانی.</string>
+    <string name="dialog_routing_intermediate_not_determined">لطفا نقطه میانی را تنظیم کنید.</string>
     <string name="dialog_routing_system_error">خطای سیستم</string>
-    <string name="dialog_routing_application_error">ناتوان در ایجاد مسیر به علت خطای برنامه</string>
+    <string name="dialog_routing_application_error">ناتوان در ایجاد مسیر به علت خطای برنامه.</string>
     <string name="dialog_routing_try_again">لطفا دوباره تلاش کنید</string>
     <string name="not_now">اکنون خیر</string>
     <string name="dialog_routing_download_and_build_cross_route">ایا مایل به دانلود نقشه و ایجاد مسیر‌های بهینه بیشتری که نقشه‌های بیشتری را پوشش میدهد هستید؟</string>
@@ -368,7 +368,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>
@@ -435,11 +435,11 @@
     <!-- login text field -->
     <string name="email_or_username">ایمیل یا نام کاربری</string>
     <string name="level">طبقه</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_mwm_migration_dialog">برای ایجاد مسیر شما نیازمند بروزرسانی تمامی نقشه‌ها هستید سپس می توانید دوباره مسیرتان را برنامه ریزی کنید</string>
     <string name="downloader_search_field_hint">یافتن نقشه</string>
-    <string name="common_check_internet_connection_dialog">لطفا تنظیمات خود را بازبینی کنید و مطمئن شوید که ابزار شما به اینترنت متصل است</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>
@@ -459,15 +459,15 @@
     <string name="osm_presentation">داده های OpenStreetMap ایجاد شده توسط انجمن از %s. درباره نحوه ویرایش و به روز رسانی نقشه در OpenStreetMap.org بیشتر بیاموزید</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) یک پروژه اجتماعی برای ساخت یک نقشه رایگان و باز است. این منبع اصلی داده های نقشه در CoMaps است و مشابه ویکی پدیا کار می کند. می توانید مکان ها را اضافه یا ویرایش کنید تا در دسترس میلیون ها کاربر در سراسر جهان قرار گیرند. \nبه انجمن بپیوندید و به ایجاد نقشه بهتر برای همه کمک کنید!</string>
-    <string name="login_to_make_edits_visible">یک حساب OpenStreetMap ایجاد کنید یا وارد شوید تا ویرایش های نقشه خود را در جهان منتشر کنید</string>
+    <string name="login_to_make_edits_visible">یک حساب OpenStreetMap ایجاد کنید یا وارد شوید تا ویرایش های نقشه خود را در جهان منتشر کنید.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d از %2$d</string>
     <string name="download_over_mobile_header">دانلود بر روی یک شبکه دیتای موبایل؟</string>
-    <string name="download_over_mobile_message">این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد</string>
+    <string name="download_over_mobile_message">این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد.</string>
     <string name="error_enter_correct_house_number">وارد کردن شماره ساختمان معتبر</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">تعداد طبقات نباید بیش از %d باشد</string>
-    <string name="editor_zip_code">کد پستی</string>
+    <string name="editor_zip_code">کدپستی</string>
     <string name="error_enter_correct_zip_code">یک کد‌ پستی معتبر وارد کنید</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">نقطه نقشه</string>
@@ -486,8 +486,8 @@
     <string name="editor_category_unsuitable_title">آیا نمی توانید یک دسته بندی مناسب پیدا کنید؟</string>
     <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="downloader_no_downloaded_maps_message">برای جست وجو یک مکان و استفاده از قابلیت ناوبری، نقشه‌ها را دانلود کنید.</string>
+    <string name="current_location_unknown_error_title">مکان فعلیتان ناشناس است.</string>
     <!-- abbreviation for meters -->
     <string name="m">متر</string>
     <!-- abbreviation for kilometers -->
@@ -519,8 +519,8 @@
     <!-- 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_2">ویرایشگران OpenStreetMap ﺗﻐﯿﯿﺮﺍﺕ ﺭﺍ ﺑﺮﺭﺳﯽ ﮐﺮﺩﻩ ﻭ ﺩﺭ ﺻﻮﺭﺕ ﺩﺍﺷﺘﻦ ﻫﺮﮔﻮﻧﻪ ﺳﻮﺍﻝ ﺑﺎ ﺷﻤﺎ ﺗﻤﺎﺱ ﺧﻮﺍﻫﻨﺪ ﮔﺮﻓﺖ</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">توقف</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">ضبط مسیر</string>
@@ -537,7 +537,7 @@
     <string name="mobile_data_description">برای نمایش جزئیات مکان مانند تصاویر قیمت‌ها و بازخورد‌ها به اینترنت همراه نیاز است</string>
     <string name="mobile_data_option_never">هرگز</string>
     <string name="mobile_data_option_ask">همیشه بپرس</string>
-    <string name="traffic_update_maps_text">برای نمایش ترافیک، نقشه می بایستی بروزرسانی شود</string>
+    <string name="traffic_update_maps_text">برای نمایش ترافیک، نقشه می بایستی بروزرسانی شود.</string>
     <string name="big_font">افزایش اندازه متن بر روی نقشه</string>
     <string name="traffic_update_app">لطفا CoMaps را بروزرسانی کنید</string>
     <!-- "traffic" as in "road congestion" -->
@@ -547,7 +547,7 @@
     <string name="feedback_general">\"تنظیمات: دکمه \"ارسال بازخورد کلی</string>
     <string name="prefs_languages_information">ما از TTS سیستم برای دستورالعمل‌های صوتی استفاده می کنیم. بسیاری از دستگاه‌های Android از Google TTS استفاده می کنند، شما می توانید آن را از Google Play دانلود کنید (https://play.google.com/store/apps/details؟id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">برای بعضی از زبان‌ها، شما باید speech synthesizer یا یک بسته زبان دیگر را از فروشگاه برنامه (Google Play, Galaxy Store, App Gallery, FDroid) نصب کنید. \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 -->
@@ -641,7 +641,7 @@
     <string name="avoid_ferry">اجتناب از گذرگاه‌های کشتی</string>
     <string name="avoid_motorways">از بزرگراه دوری کنید</string>
     <string name="unable_to_calc_alert_title">امکان محاسبه مسیر نیست</string>
-    <string name="unable_to_calc_alert_subtitle">متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید.</string>
+    <string name="unable_to_calc_alert_subtitle">متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید</string>
     <string name="define_to_avoid_btn">جاده‌های لغو شده را تعریف نمایید</string>
     <string name="change_driving_options_btn">گزینه‌های مسیریابی فعال شد</string>
     <string name="toll_road">جاده دارای عوارض</string>
@@ -802,7 +802,7 @@
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">مسیر خالی است - چیزی برای ذخیره کردن وجود ندارد</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">امکان نمایش گفتگوی انتخاب پوشه وجود ندارد زیرا برنامه مناسبی روی دستگاه شما نصب نشده است. لطفاً یک برنامه مدیریت فایل نصب کنید و دوباره امتحان کنید.</string>
+    <string name="error_no_file_manager_app">امکان نمایش گفتگوی انتخاب پوشه وجود ندارد زیرا برنامه مناسبی روی دستگاه شما نصب نشده است. لطفاً یک برنامه مدیریت فایل نصب کنید و دوباره امتحان کنید</string>
     <string name="choose_color">انتخاب رنگ</string>
     <string name="edit_track">ویرایش مسیر</string>
     <string name="uri_open_location_failed">هیچ برنامه ای نصب نشده است که بتواند مکان را باز کند</string>
@@ -818,5 +818,4 @@
     <string name="app_site_url">https://comaps.app</string>
     <string name="saved">ذخیره شد</string>
     <string name="bluesky">بلواسکای</string>
-    <string name="about_headline">رایگان برای همه، ساخته شده با عشق</string>
 </resources>

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

@@ -111,7 +111,7 @@
     <string name="type.amenity.police">کلانتری</string>
     <string name="type.amenity.post_box">صندوق پست</string>
     <string name="type.amenity.post_office">دفتر پست</string>
-    <string name="type.amenity.prison">زندان</string>
+    <string name="type.amenity.prison">زندا ن</string>
     <string name="type.amenity.pub">میکده</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">مرکز بازیافت</string>
@@ -1091,9 +1091,6 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">سالن ورزشی</string>
     <string name="type.man_made.silo">سیلو</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.storage_tank">مخازن سیال</string>
-    <string name="type.aerialway.cable_car">ماشین کابلی</string>
-    <string name="type.aerialway.station">ایستگاه راه هوایی</string>
-    <string name="type.aeroway">­زیرساخت هوا و فضا</string>
-    <string name="type.aerialway">راه هوایی</string>
 </resources>

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

@@ -1313,12 +1313,27 @@
     <string name="type.aeroway">Airspace Infrastructure</string>
     <string name="type.aeroway.apron">Lentokentän asemataso</string>
     <string name="type.amenity.vending_machine.excrement_bags">Koirankakkapussiautomaatti</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
     <string name="type.amenity.biergarten">Olutpuutarha</string>
     <string name="type.highway.ladder">Tikapuut</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.landuse.plant_nursery">Kasvitarha</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.cuisine.fish_and_chips">Fish and Chips</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag">hwtag</string>
     <string name="type.amenity.studio">Studio</string>
     <string name="type.barrier.guard_rail">Tiekaide</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
     <string name="type.leisure.firepit">Tulentekopaikka</string>
     <string name="type.leisure">Leisure</string>
     <string name="type.internet_access">Internet</string>
@@ -1335,7 +1350,15 @@
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.man_made">Man Made</string>
     <string name="type.fee.yes">$</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.organic.yes">Luomu</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.leisure.common">Julkinen paikka</string>
     <string name="type.leisure.track">Juoksurata</string>
     <string name="type.leisure.track.area">Juoksurata</string>

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

@@ -1368,13 +1368,36 @@
     <string name="type.wheelchair">Fauteuil roulant</string>
     <string name="type.aerialway.platter">Téléski</string>
     <string name="type.aerialway.rope_tow">Télésiège</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
     <string name="type.route">Itinéraire</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.landuse.village_green">Terrain</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.military.bunker">Bunker</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.shop.bookmaker">Bookmaker</string>
     <string name="type.tourism.attraction">Attraction</string>
+    <string name="type.hwtag">hwtag</string>
     <string name="type.man_made.crane">Grue</string>
     <string name="type.railway.station.subway.qingdao">Station de métro</string>
     <string name="type.landuse.religious">Terre religieuse</string>

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

@@ -474,6 +474,8 @@
     <string name="type.area_highway.track">Pista</string>
     <string name="type.area_highway.trunk">Vía troncal</string>
     <string name="type.area_highway.unclassified">Estrada sen clasificar</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.historic">Obxecto histórico</string>
     <string name="type.historic.aircraft">Avión histórico</string>
     <string name="type.historic.anchor">Ancora histórica</string>
@@ -516,6 +518,19 @@
     <string name="type.historic.wayside_cross">Cruz de termo</string>
     <string name="type.historic.wayside_shrine">Peto de ánimas</string>
     <string name="type.historic.wreck">Naufraxio</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.junction">Cruce</string>
@@ -618,6 +633,8 @@
     <string name="type.man_made.water_well.drinking_water_no">Pozo</string>
     <string name="type.man_made.windmill">Muíño</string>
     <string name="type.man_made.works">Fábrica</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.military">Militar</string>
     <string name="type.military.bunker">Búnker</string>
     <string name="type.mountain_pass">Porto de montaña</string>
@@ -726,6 +743,11 @@
     <string name="type.power.tower">Torre eléctrica</string>
     <string name="type.power.pole">Poste eléctrico</string>
     <string name="type.man_made.utility_pole">Poste</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.public_transport">Transporte público</string>
     <string name="type.railway.abandoned">Vía férrea abandonada</string>
     <string name="type.railway.abandoned.bridge">Puente ferroviario abandonado</string>
@@ -1017,6 +1039,7 @@
     <string name="type.railway.tram_stop">Parada de tranvía</string>
     <string name="type.route">Roteiro</string>
     <string name="type.route.ferry">Roteiro de ferry</string>
+    <string name="type.route.shuttle_train">route-lanzadeira_train</string>
     <string name="type.shop">Tenda</string>
     <string name="type.shop.alcohol">Licorería</string>
     <string name="type.shop.bakery">Panadería</string>

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

@@ -430,6 +430,7 @@
     <string name="type.area_highway.track">Forst-/Feldweg</string>
     <string name="type.area_highway.trunk">Autostrass</string>
     <string name="type.area_highway.unclassified">Näbestrass</string>
+    <string name="type.highway.world_level">highway-world_level</string>
     <string name="type.historic">Historischs Objekt</string>
     <string name="type.historic.aircraft">Historischs Flugzüüg</string>
     <string name="type.historic.anchor">Historische Anker</string>
@@ -468,6 +469,18 @@
     <string name="type.historic.wayside_cross">Wegchrüz</string>
     <string name="type.historic.wayside_shrine">Wegkapelle</string>
     <string name="type.historic.wreck">Schiffswrack</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.junction">Chrüzig</string>
@@ -563,6 +576,8 @@
     <string name="type.man_made.water_well.drinking_water_no">Brunne</string>
     <string name="type.man_made.windmill">Windmühli</string>
     <string name="type.man_made.works">Fabrik</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.military">Militärischs Objekt</string>
     <string name="type.mountain_pass">Gebirgspass</string>
     <string name="type.natural">Natur</string>
@@ -663,6 +678,11 @@
     <string name="type.power.substation">Umspannwerch</string>
     <string name="type.power.tower">Hochspannigsmascht</string>
     <string name="type.power.pole">Strommascht</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.public_transport">Öffentliche Verchehr</string>
     <string name="type.public_transport.platform">Plattform</string>
     <string name="type.railway">Isebahn</string>
@@ -802,6 +822,7 @@
     <string name="type.craft.gardener">Landschaftsgärtner</string>
     <string name="type.entrance.main">Hauptiigang</string>
     <string name="type.highway.steps.tunnel">Tunnel</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.leisure.picnic_table">Picknicktisch</string>
     <string name="type.man_made.communications_tower">Funkturm</string>
     <string name="type.place.hamlet">Wiiler</string>
@@ -837,6 +858,7 @@
     <string name="type.railway.rail.highspeed">Höchgschwindigkeitsisebahn</string>
     <string name="type.area_highway.primary">Hauptstrass</string>
     <string name="type.man_made.cross">Chrüz</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.leisure.swimming_pool">Schwümmbecki</string>
     <string name="type.man_made.survey_point">Vermessigspunkt</string>
     <string name="type.railway.funicular.bridge">Standseilbahnbrugg</string>
@@ -961,6 +983,7 @@
     <string name="type.railway.tram.tunnel">Tramtunnel</string>
     <string name="type.route">Route</string>
     <string name="type.route.ferry">Fähre</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.shop">Gschäft</string>
     <string name="type.shop.alcohol">Spirituosegschäft</string>
     <string name="type.shop.bakery">Bäckerei</string>

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

@@ -665,4 +665,5 @@
     <string name="type.amenity.dojo">डोजो</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">खेल हॉल</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -2,4 +2,5 @@
 <resources>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.man_made.silo">Silo</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1238,6 +1238,9 @@
     <string name="type.highway.elevator">Felvonó</string>
     <string name="type.highway.services">Pihenőhely</string>
     <string name="type.area_highway.cycleway">Kerékpárút</string>
+    <string name="type.hwtag.oneway">egyirányú</string>
+    <string name="type.hwtag.private">magán</string>
+    <string name="type.hwtag.toll">útdíjjas</string>
     <string name="type.internet_access.wlan">Internetcsatlakozás</string>
     <string name="type.landuse">Területhasználat</string>
     <string name="type.landuse.allotments">Kiskertek</string>
@@ -1352,17 +1355,37 @@
     <string name="type.wheelchair">Akadálymentesség</string>
     <string name="type.aerialway.platter">Tányéros sífelvonó</string>
     <string name="type.aerialway.t.bar">Csákányos sífelvonó</string>
+    <string name="type.highway.world_level">út-világszint</string>
+    <string name="type.highway.world_towns_level">út-világvárosok szint</string>
+    <string name="type.hwtag">útcímke</string>
+    <string name="type.hwtag.bidir_bicycle">útcímke-kétirányú_kerékpárút</string>
+    <string name="type.hwtag.onedir_bicycle">útcímke-egyirányú_kerékpárút</string>
+    <string name="type.hwtag.yesbicycle">útcímke-kerékpárral_használható</string>
+    <string name="type.hwtag.yesfoot">útcímke-gyalogosan_használható</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-rács</string>
+    <string name="type.psurface">felület</string>
+    <string name="type.psurface.paved_bad">felület-burkolt_rossz</string>
+    <string name="type.psurface.paved_good">felület-burkolt_jó</string>
+    <string name="type.psurface.unpaved_bad">felület-burkolatlan_rossz</string>
+    <string name="type.psurface.unpaved_good">felület-burkolatlan_jó</string>
     <string name="type.piste_type.downhill">Sípálya</string>
     <string name="type.piste_type.downhill.advanced.area">Sípálya tapasztaltaknak</string>
     <string name="type.piste_type.downhill.expert">Sípálya szakértőknek</string>
     <string name="type.piste_type.downhill.novice">Sípálya kezdőknek</string>
     <string name="type.piste_type.downhill.novice.area">Sípálya kezdőknek</string>
     <string name="type.piste_type.downhill.intermediate">Sípálya középhaladóknak</string>
+    <string name="type.hwtag.yescar">útcímke-személyautóval_használható</string>
+    <string name="type.hwtag.lit">útcímke-megvilágítás</string>
+    <string name="type.hwtag.nobicycle">útcímke-kerékpárral_nem_használható</string>
+    <string name="type.route.shuttle_train">útvonal-ingajáratú_vonat</string>
     <string name="type.piste_type.downhill.area">Sípálya</string>
     <string name="type.piste_type.downhill.advanced">Sípálya tapasztaltaknak</string>
     <string name="type.piste_type.downhill.easy">Sípálya újoncoknak</string>
     <string name="type.piste_type.downhill.expert.area">Sípálya szakértőknek</string>
     <string name="type.piste_type.downhill.intermediate.area">Sípálya középhaladóknak</string>
     <string name="type.piste_type.downhill.easy.area">Sípálya újoncoknak</string>
+    <string name="type.hwtag.nocar">útcímke-személyautóval_nem_használható</string>
+    <string name="type.hwtag.nofoot">útcímke-gyalogosan_nem_használható</string>
     <string name="type.piste_type.downhill.freeride">Természetes eredetű sípálya</string>
 </resources>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.addr_interpolation">Adresse/Bloco</string>
     <string name="type.addr_interpolation.even">Adresse/Bloco</string>
 </resources>

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

@@ -1166,5 +1166,6 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Ruang olahraga</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.silo">Silo</string>
 </resources>

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

@@ -1203,6 +1203,14 @@
     <string name="type.self_service.yes">Sjálfsafgreiðsla tiltæk</string>
     <string name="type.self_service.only">Einungis sjálfsafgreiðsla</string>
     <string name="type.self_service.partially">Sjálfsafgreiðsla að hluta</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.railway.preserved">Varðveitt lestarspor</string>
     <string name="type.railway.preserved.bridge">Varðveitt lestarbrú</string>
     <string name="type.railway.preserved.tunnel">Varðveitt lestargöng</string>
@@ -1216,10 +1224,24 @@
     <string name="type.craft.confectionery">Smáréttagerð</string>
     <string name="type.healthcare.sample_collection">Söfnunarmiðstöð sýna</string>
     <string name="type.healthcare.speech_therapist">Talmeinafræði</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.historic.castle.hillfort">Víggirt hæð</string>
     <string name="type.historic.castle.stately">Kastalasetur</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
     <string name="type.landuse.railway">Járnbrautasvæði</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.natural.water.lock">Skipastigahólf</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.railway.funicular.bridge">Dráttarlestarbrú</string>
     <string name="type.railway.funicular.tunnel">Dráttarlestargöng</string>
     <string name="type.railway.halt">Járnbrautarstopp</string>
@@ -1237,6 +1259,7 @@
     <string name="type.railway.subway_entrance.london">Inngangur í neðanjarðarlest</string>
     <string name="type.railway.tram.bridge">Sporvagnabrú</string>
     <string name="type.railway.tram.tunnel">Sporvagnagöng</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.shop.houseware">Búsáhaldaverslun</string>
     <string name="type.shop.craft">Handverksvöruverslun</string>
     <string name="type.shop.tobacco">Reykingaverslun</string>

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

@@ -784,6 +784,7 @@
     <string name="type.power.substation">Sottostazione elettrica</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Pilone elettrico</string>
+    <string name="type.psurface">Superficie</string>
     <string name="type.public_transport">Trasporto pubblico</string>
     <string name="type.railway">Ferrovia</string>
     <string name="type.railway.abandoned">Ferrovia abbandonata</string>
@@ -1337,6 +1338,8 @@
     <string name="type.man_made.cairn">Tumulo</string>
     <string name="type.railway.funicular.tunnel">Galleria funicolare</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.leisure.recreation_ground">Area divertimento</string>
     <string name="type.railway.subway.bridge">Ponte della metropolitana</string>
@@ -1367,10 +1370,30 @@
     <string name="type.piste_type.downhill.freeride">Pista da sci fuoripista</string>
     <string name="type.amenity.shelter.lean_to">Riparo a capanna</string>
     <string name="type.aerialway.j.bar">Sciovia ad ancora a J</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
     <string name="type.leisure.firepit">Braciere</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
     <string name="type.amenity.studio">Studio</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.landuse.plant_nursery">Vivaio</string>
     <string name="type.man_made.cutline">Cutline</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.amenity.love_hotel">Love hotel</string>
     <string name="type.highway.ladder">Scala a pioli</string>
     <string name="type.sport.diving">Tuffi dalle grandi altezze</string>

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

@@ -579,6 +579,18 @@
     <string name="type.historic.wayside_cross">צלב בצד הדרך</string>
     <string name="type.historic.wayside_shrine">מקדש בצד הדרך</string>
     <string name="type.historic.wreck">ספינה טרופה</string>
+    <string name="type.hwtag.bidir_bicycle">מסלול אופניים דו סיטרי</string>
+    <string name="type.hwtag.onedir_bicycle">מסלול אופניים חד סיטרי</string>
+    <string name="type.hwtag.lit">מואר</string>
+    <string name="type.hwtag.nobicycle">אין כניסה לאופניים</string>
+    <string name="type.hwtag.nocar">אין כניסה לכלי רכב</string>
+    <string name="type.hwtag.nofoot">אין כניסה להולכי רגל</string>
+    <string name="type.hwtag.oneway">חד סיטרי</string>
+    <string name="type.hwtag.private">פרטי</string>
+    <string name="type.hwtag.toll">אגרה</string>
+    <string name="type.hwtag.yesbicycle">הכניסה לאופניים מותרת</string>
+    <string name="type.hwtag.yescar">הכניסה לכלי רכב מותרת</string>
+    <string name="type.hwtag.yesfoot">הכניסה להולכי רגל מותרת</string>
     <string name="type.internet_access">אינטרנט</string>
     <string name="type.internet_access.wlan">אינטרנט אלחוטי</string>
     <string name="type.junction">צומת</string>
@@ -795,6 +807,11 @@
     <string name="type.power.substation">תחנת כוח משנית</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">מגדל קירור</string>
+    <string name="type.psurface">משטח</string>
+    <string name="type.psurface.paved_bad">אספלט במצב גרוע</string>
+    <string name="type.psurface.paved_good">אספלט במצב טוב</string>
+    <string name="type.psurface.unpaved_bad">לא סלול במצב גרוע</string>
+    <string name="type.psurface.unpaved_good">לא סלול במצב טוב</string>
     <string name="type.public_transport">תחבורה ציבורית</string>
     <string name="type.public_transport.platform">רציף תחבורה</string>
     <string name="type.railway">מסילת רכבת</string>
@@ -1039,4 +1056,5 @@
     <string name="type.amenity.dojo">דוג\'ו</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">אולם ספורט</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1334,20 +1334,38 @@
     <string name="type.amenity.vending_machine.excrement_bags">うんち袋の自販機</string>
     <string name="type.amenity.parcel_locker">宅配ロッカー</string>
     <string name="type.amenity.waste_transfer_station">ゴミ処理場</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.utility_pole">ユーティリティポール</string>
+    <string name="type.route.shuttle_train">シャトル列車</string>
     <string name="type.attraction.big_wheel">観覧車</string>
     <string name="type.man_made.crane">クレーン</string>
+    <string name="type.mapswithme.grid">mapswithme-グリッド</string>
     <string name="type.barrier.chain">チェーンポール</string>
     <string name="type.cuisine.bubble_tea">タピオカティー</string>
     <string name="type.piste_type.downhill.area">ダウンヒルスキー場</string>
     <string name="type.railway.subway.bridge">地下鉄路線（橋）</string>
     <string name="type.shop.caravan">RVディーラー</string>
+    <string name="type.highway.world_level">高速道路（世界レベル）</string>
     <string name="type.railway.subway">地下鉄路線</string>
     <string name="type.highway.elevator">エレベーター</string>
+    <string name="type.hwtag.private">私道タグ</string>
     <string name="type.boundary.administrative.3">行政界</string>
     <string name="type.boundary.administrative.4">行政界</string>
     <string name="type.building.warehouse">倉庫</string>
     <string name="type.emergency">緊急サービス</string>
+    <string name="type.highway.world_towns_level">高速道路（町レベル）</string>
+    <string name="type.hwtag">交通特性タグ</string>
+    <string name="type.hwtag.bidir_bicycle">双方向の自転車レーンタグ</string>
+    <string name="type.hwtag.onedir_bicycle">一方通行の自転車レーンタグ</string>
+    <string name="type.hwtag.lit">道路照明タグ</string>
+    <string name="type.hwtag.nobicycle">自転車通行禁止タグ</string>
+    <string name="type.hwtag.nocar">自動車通行禁止タグ</string>
+    <string name="type.hwtag.nofoot">歩行者通行禁止タグ</string>
+    <string name="type.hwtag.oneway">一方通行の道路タグ</string>
+    <string name="type.hwtag.toll">有料道路タグ</string>
+    <string name="type.hwtag.yesbicycle">自転車通行許可タグ</string>
+    <string name="type.hwtag.yescar">自動車通行許可タグ</string>
+    <string name="type.hwtag.yesfoot">歩行者通行許可タグ</string>
     <string name="type.man_made.storage_tank">貯蔵タンク</string>
     <string name="type.leisure.beach_resort">ビーチリゾート</string>
     <string name="type.aerialway.j.bar">Jバーリフト</string>
@@ -1357,6 +1375,11 @@
     <string name="type.aerialway.t.bar">Tバーリフト</string>
     <string name="type.piste_type.nordic">ノルディックスキーコース</string>
     <string name="type.piste_type.sled">トボガンコース</string>
+    <string name="type.psurface">路面</string>
+    <string name="type.psurface.paved_bad">舗装路面（悪い）</string>
+    <string name="type.psurface.paved_good">舗装路面（良い）</string>
+    <string name="type.psurface.unpaved_bad">未舗装路面（悪い）</string>
+    <string name="type.psurface.unpaved_good">未舗装路面（良い）</string>
     <string name="type.railway.subway.tunnel">地下鉄路線（トンネル）</string>
     <string name="type.piste_type.downhill">ダウンヒルスキーコース</string>
     <string name="type.piste_type.downhill.easy.area">初級者向けのダウンヒルスキー場</string>

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

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1187,4 +1187,5 @@
     <string name="type.railway.subway.tunnel">지하철 노선 교량</string>
     <string name="type.railway.station.subway.qingdao">전철역</string>
     <string name="type.man_made.silo">저장탑</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -95,4 +95,5 @@
     <string name="type.addr_interpolation.even">Adresas / blokas</string>
     <string name="type.aerialway">Keltuvas</string>
     <string name="type.addr_interpolation.odd">Adresas / blokas</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -57,4 +57,5 @@
     <string name="type.highway.busway.tunnel">Tunelis</string>
     <string name="type.aeroway.aerodrome.international">Starptautiskā lidosta</string>
     <string name="type.highway.bus_stop">Pietura</string>
+    <string name="type.mapswithme">MapsWithMe</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-mr/types_strings.xml

@@ -1178,4 +1178,5 @@
     <string name="type.amenity.dojo">डोजो</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">क्रीडा हॉल</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1193,4 +1193,5 @@
     <string name="type.leisure.sports_hall">Idrettshall</string>
     <string name="type.leisure.hackerspace">Skaperverksted</string>
     <string name="type.man_made.silo">Silo</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -161,7 +161,7 @@
         <item name="android:textColor">?titleDialogTheme</item>
     </style>
 
-    <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+    <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>

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

@@ -792,6 +792,11 @@
     <string name="type.power.substation">Transformatorstation</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Elektriciteitsmast</string>
+    <string name="type.psurface">Wegdek</string>
+    <string name="type.psurface.paved_bad">Verhard</string>
+    <string name="type.psurface.paved_good">Verhard</string>
+    <string name="type.psurface.unpaved_bad">Onverhard</string>
+    <string name="type.psurface.unpaved_good">Onverhard</string>
     <string name="type.public_transport">Openbaar vervoer</string>
     <string name="type.public_transport.platform">Platform</string>
     <string name="type.railway">Spoorweg</string>
@@ -1359,13 +1364,31 @@
     <string name="type.power.pole">Stroommast</string>
     <string name="type.man_made.utility_pole">Paal</string>
     <string name="type.cuisine.fish_and_chips">Fish and Chips</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.landuse.reservoir">Reservoir</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.tourism.motel">Motel</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.attraction.big_wheel">Reuzenrad</string>
     <string name="type.amenity.shelter.lean_to">Afschotbeschutting</string>
     <string name="type.landuse.brownfield">Braakliggend terrein</string>
     <string name="type.landuse.greenfield">Greenfield</string>
     <string name="type.power.generator">Generator</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.amenity.food_court">Foodcourt</string>
     <string name="type.highway.ladder">ladder</string>

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

@@ -1305,13 +1305,29 @@
     <string name="type.landuse.greenhouse_horticulture">Szklarnia</string>
     <string name="type.fee.yes">$</string>
     <string name="type.leisure.track">Ścieżka</string>
+    <string name="type.hwtag">hwtag</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.leisure.marina">Przystań</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.cuisine.bubble_tea">Herbata bąbelkowa</string>
     <string name="type.power.pole">Słup elektryczny</string>
     <string name="type.man_made.utility_pole">Słup użytkowy</string>
     <string name="type.amenity.vending_machine.fuel">Pompa paliwowa</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.leisure.common">Teren publiczny</string>
     <string name="type.amenity.shelter.lean_to">Schron turystyczny</string>
     <string name="type.leisure.beach_resort">Kurort przy plaży</string>
@@ -1346,7 +1362,14 @@
     <string name="type.waterway.weir">Jaz</string>
     <string name="type.wheelchair">Wózek inwalidzki</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.power">Moc</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.man_made.crane">Dźwig</string>
     <string name="type.highway.ladder">Drabina</string>
     <string name="type.leisure.firepit">Ognisko</string>

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

@@ -1124,7 +1124,13 @@
     <string name="type.amenity.dojo">Dojo</string>
     <string name="type.leisure.resort">Resort</string>
     <string name="type.man_made.mast">Mastro</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.historic.memorial.stolperstein">Pedra memorial</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag">Sinalização de trânsito</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.shop.caravan">Concessionária de trailers</string>
     <string name="type.sport.curling">Curling</string>
     <string name="type.emergency.assembly_point">Ponto de Reunião de Emergência</string>
@@ -1207,6 +1213,7 @@
     <string name="type.railway.rail.utility">Ferrovia Utilitária</string>
     <string name="type.natural.shingle">Telha</string>
     <string name="type.railway.rail.highspeed">Ferrovia de alta velocidade</string>
+    <string name="type.route.shuttle_train">rota-ônibus_trem</string>
     <string name="type.historic.memorial.plaque">Placa Comemorativa</string>
     <string name="type.natural.saddle">Sela de montanha</string>
     <string name="type.place.country">País</string>
@@ -1224,6 +1231,8 @@
     <string name="type.historic.ship">Navio</string>
     <string name="type.historic.tomb">Túmulo</string>
     <string name="type.historic.wayside_shrine">Santuário à beira da estrada</string>
+    <string name="type.hwtag.toll">hwtag-pedágio</string>
+    <string name="type.hwtag.yesbicycle">hwtag-simbicicleta</string>
     <string name="type.leisure.miniature_golf">Minigolfe</string>
     <string name="type.man_made.petroleum_well">Poço de petróleo ou gás</string>
     <string name="type.railway.rail.branch">Ramal Ferroviário</string>
@@ -1287,6 +1296,7 @@
     <string name="type.sport.ice_hockey">Hóquei no gelo</string>
     <string name="type.sport.pelota">Pelota Basca</string>
     <string name="type.barrier.ditch">Fosso</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
     <string name="type.tourism.chalet">Casa de férias</string>
     <string name="type.railway.rail.main.tunnel">Túnel ferroviário</string>
     <string name="type.tourism.attraction">Atração turística</string>
@@ -1296,6 +1306,19 @@
     <string name="type.sport.skateboard">Skate</string>
     <string name="type.tourism.wilderness_hut">Cabana</string>
     <string name="type.tourism.artwork.sculpture">Escultura</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.attraction.big_wheel">Roda-gigante</string>
     <string name="type.attraction.carousel">Carrossel</string>
     <string name="type.attraction.historic">Atração histórica</string>

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

@@ -173,7 +173,7 @@
     <!-- 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 -->
-    <string name="bookmark_share_email_subject">Veja o meu marcador no mapa do CoMaps!</string>
+    <string name="bookmark_share_email_subject">Veja o meu marcador no mapa do CoMaps.</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Veja a minha localização atual no mapa CoMaps!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -337,7 +337,7 @@
     <string name="dialog_routing_disclaimer_priority">— As condições da estrada, as leis de trânsito e os sinais de trânsito têm sempre prioridade sobre as indicações de navegação;</string>
     <string name="dialog_routing_disclaimer_precision">— O mapa pode estar desatualizado e o trajeto indicado pode não ser a melhor para chegar ao destino;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Os trajetos indicados devem ser considerados apenas como sugestões;</string>
-    <string name="dialog_routing_disclaimer_borders">— Use com cautela em rotas de zonas fronteiriças: as rotas criadas pela nossa aplicação podem algumas vezes cruzar fronteiras nacionais em locais não autorizados.</string>
+    <string name="dialog_routing_disclaimer_borders">— Use com cautela em rotas de zonas fronteiriças: as rotas criadas pela nossa aplicação podem algumas vezes cruzar fronteiras nacionais em locais não autorizados;</string>
     <string name="dialog_routing_disclaimer_beware">Fique sempre atento nas estradas!</string>
     <string name="dialog_routing_check_gps">Verifique o sinal do GPS</string>
     <string name="dialog_routing_error_location_not_found">O trajeto não foi criado porque não foi possível identificar as coordenadas do GPS.</string>
@@ -558,7 +558,7 @@
     <!-- Settings: "Send general feedback" button -->
     <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). \nAbra as Configurações do seu dispositivo → Idioma e entrada → Voz → Saída de texto para voz. \nAqui 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">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="transliteration_title">Transliteração para o latim</string>
     <string name="learn_more">Saber mais</string>
@@ -585,7 +585,7 @@
     <string name="bookmark_lists_show_all">Mostrar tudo</string>
     <plurals name="bookmarks_places">
         <item quantity="one">%d favorito</item>
-        <item quantity="many">%d favoritos</item>
+        <item quantity="many"/>
         <item quantity="other">%d favoritos</item>
     </plurals>
     <string name="bookmarks_create_new_group">Criar nova lista</string>
@@ -604,13 +604,13 @@
     <string name="profile">Perfil no OpenStreetMap</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d ficheiro encontrado. Pode vê-lo depois da conversão.</item>
-        <item quantity="many">%d ficheiros encontrados. Pode vê-los depois da conversão.</item>
+        <item quantity="many"/>
         <item quantity="other">%d ficheiros encontrados. Pode vê-los depois da conversão.</item>
     </plurals>
     <string name="restore">Restaurar</string>
     <plurals name="tracks">
         <item quantity="one">%d trajeto</item>
-        <item quantity="many">%d trajetos</item>
+        <item quantity="many"/>
         <item quantity="other">%d trajetos</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
@@ -656,7 +656,7 @@
     <string name="avoid_ferry">Evitar ferribotes</string>
     <string name="avoid_motorways">Evitar autoestradas</string>
     <string name="unable_to_calc_alert_title">Não foi possível calcular a rota</string>
-    <string name="unable_to_calc_alert_subtitle">Uma rota não foi possível ser encontrada. Isto pode ser causado pelas suas opções ou dados incompletos de OpenStreetMap. Por favor, mude as suas opções de rota e tente novamente.</string>
+    <string name="unable_to_calc_alert_subtitle">Infelizmente não foi possível criar o percurso com as opções selecionadas. Altere as opções e tente novamente</string>
     <string name="define_to_avoid_btn">Definir as estradas a evitar</string>
     <string name="change_driving_options_btn">Configurações de direção ativadas</string>
     <string name="toll_road">Estrada com portagem</string>

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

@@ -1346,8 +1346,12 @@
     <string name="type.landuse.plant_nursery">Viveiro de plantas</string>
     <string name="type.recycling.cardboard">Cartão</string>
     <string name="type.highway.ladder">Escada</string>
+    <string name="type.hwtag">hwtag</string>
     <string name="type.amenity.studio">Estúdio</string>
     <string name="type.amenity.vending_machine.sweets">Dispensador de doces</string>
+    <string name="type.psurface.unpaved_bad">psurface-não pavimentado_ruim</string>
+    <string name="type.route.shuttle_train">rota-ônibus_trem</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicicleta</string>
     <string name="type.recycling.cans">Latas</string>
     <string name="type.amenity.love_hotel">Hotel do Amor</string>
     <string name="type.recycling.shoes">Sapato</string>
@@ -1364,6 +1368,11 @@
     <string name="type.barrier.chain">Corrente</string>
     <string name="type.barrier.guard_rail">Guarda-corpo</string>
     <string name="type.fee.yes">$</string>
+    <string name="type.highway.world_level">nível mundial de rodovias</string>
+    <string name="type.highway.world_towns_level">nível_das_cidades_do_mundo_das_rodovias</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicicleta</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.yesbicycle">hwtag-simbicicleta</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.leisure.firepit">Fogueira</string>
     <string name="type.leisure.beach_resort">Resort de praia</string>
@@ -1372,10 +1381,24 @@
     <string name="type.man_made.mast">Mastro</string>
     <string name="type.man_made.silo">Silo</string>
     <string name="type.man_made.storage_tank">Tanque de armazenamento</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grade</string>
     <string name="type.mountain_pass">Passo da Montanha</string>
     <string name="type.man_made.utility_pole">Poste de serviço público</string>
+    <string name="type.psurface">superfície p</string>
+    <string name="type.psurface.paved_bad">superfície pavimentada ruim</string>
+    <string name="type.psurface.paved_good">superfície pavimentada_boa</string>
     <string name="type.shop.caravan">Concessionária de RV</string>
     <string name="type.sport.diving">Mergulho alto</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.landuse.education">Instalação Educativa</string>
     <string name="type.railway.station.subway.qingdao">Estação de metro</string>
     <string name="type.leisure.escape_game">Escape Room</string>

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

@@ -1163,5 +1163,6 @@
     <string name="type.amenity.dojo">Dojo</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Sală de sport</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.silo">Siloz</string>
 </resources>

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

@@ -809,6 +809,11 @@
     <string name="type.power.substation">Подстанция</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Опора ЛЭП</string>
+    <string name="type.psurface">Поверхность</string>
+    <string name="type.psurface.paved_bad">Плохая асфальтированная</string>
+    <string name="type.psurface.paved_good">Хорошая асфальтированная</string>
+    <string name="type.psurface.unpaved_bad">Плохая неасфальтированная</string>
+    <string name="type.psurface.unpaved_good">Хорошая неасфальтированная</string>
     <string name="type.public_transport">Общественный транспорт</string>
     <string name="type.public_transport.platform">Платформа</string>
     <string name="type.railway">Ж/Д</string>
@@ -1375,6 +1380,15 @@
     <string name="type.leisure.sports_hall">Спортивный зал</string>
     <string name="type.man_made.utility_pole">Столб</string>
     <string name="type.power.pole">Столб ЛЭП</string>
+    <string name="type.highway.world_level">Шоссе мирового значения</string>
+    <string name="type.highway.world_towns_level">Шоссе местного значения</string>
+    <string name="type.hwtag.bidir_bicycle">Велосипедная двухсторонняя</string>
+    <string name="type.hwtag.onedir_bicycle">Велосипедная односторонняя</string>
+    <string name="type.hwtag.lit">Освещённая</string>
+    <string name="type.hwtag.nobicycle">Без мотоциклов</string>
+    <string name="type.hwtag.oneway">Одностороннее движение</string>
+    <string name="type.hwtag.toll">Платная</string>
+    <string name="type.hwtag.private">Частная</string>
     <string name="type.fee.yes">$</string>
     <string name="type.barrier.guard_rail">Дорожное ограждение (отбойник)</string>
     <string name="type.landuse.plant_nursery">Садовый питомник</string>
@@ -1384,6 +1398,15 @@
     <string name="type.sport.diving">Высотные прыжки в воду</string>
     <string name="type.amenity.love_hotel">Любовный отель</string>
     <string name="type.man_made.crane">Кран</string>
+    <string name="type.hwtag.nofoot">Не пешая</string>
+    <string name="type.hwtag.nocar">Не для машин</string>
+    <string name="type.hwtag">Дорожный знак</string>
+    <string name="type.hwtag.yesbicycle">Велосипедам можно</string>
+    <string name="type.hwtag.yescar">Машинам можно</string>
+    <string name="type.hwtag.yesfoot">Пешком можно</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-сетка</string>
+    <string name="type.route.shuttle_train">Челночный поезд</string>
     <string name="type.landuse.religious">Церковный двор</string>
     <string name="type.railway.station.subway.qingdao">Станция метро</string>
 </resources>

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

@@ -1320,4 +1320,5 @@
     <string name="type.amenity.dojo">Dojo</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Športová hala</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="type.railway.station.subway.qingdao">Stacion metroje</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
 </resources>

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

@@ -795,6 +795,11 @@
     <string name="type.power.substation">Подстаница</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Далековод</string>
+    <string name="type.psurface">Површина</string>
+    <string name="type.psurface.paved_bad">Лош асфалт</string>
+    <string name="type.psurface.paved_good">Добар асфалт</string>
+    <string name="type.psurface.unpaved_bad">Лош макадам</string>
+    <string name="type.psurface.unpaved_good">Добар макадам</string>
     <string name="type.public_transport">Јавни превоз</string>
     <string name="type.public_transport.platform">Стајалиште јавног превоза</string>
     <string name="type.railway">Железница</string>
@@ -1349,16 +1354,34 @@
     <string name="type.amenity.dojo">Дојо</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Спортска хала</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.place.neighbourhood">Насеље</string>
     <string name="type.amenity.motorcycle_rental">Изнајмљивање мотоцикала</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
     <string name="type.power.pole">Далековод</string>
     <string name="type.man_made.cairn">Громила</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.leisure.recreation_ground">Рекреациони простор</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
     <string name="type.power.minor_line">Мања далеководна линија</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
     <string name="type.leisure.hackerspace">Хакерски простор</string>
     <string name="type.attraction.bumper_car">Аутићи</string>
     <string name="type.attraction.big_wheel">Панорамски точак</string>
     <string name="type.railway.funicular.bridge">Мост успињаче</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.railway.light_rail.tunnel">Тунел лаке железнице</string>
     <string name="type.fee.yes">$</string>
     <string name="type.railway.preserved.tunnel">Очуван железнички тунел</string>

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

@@ -800,7 +800,7 @@
     <!-- Title for the alert when saving a track recording. -->
     <string name="track_recording_alert_title">Spara inspelning i bokmärken och rutter?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Spåret är tomt - inget att spara</string>
+    <string name="track_recording_toast_nothing_to_save">Routen är tom - inget att spara</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Det går inte att visa dialogrutan för val av mapp eftersom ingen lämplig app är installerad på din enhet. Installera en filhanteringsapp och försök igen.</string>
     <string name="choose_color">Välj färg</string>

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

@@ -1252,6 +1252,7 @@
     <string name="type.landuse.vineyard">Vingård</string>
     <string name="type.man_made.mast">Mast</string>
     <string name="type.man_made.pipeline">Pipeline</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.military.bunker">Bunker</string>
     <string name="type.natural.desert">Öken</string>
     <string name="type.internet_access">Internet</string>

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

@@ -661,4 +661,5 @@
     <string name="type.amenity.dojo">Dojo</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Ukumbi wa michezo</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1180,4 +1180,5 @@
     <string name="type.amenity.dojo">โดโจ</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">ห้องกีฬา</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

@@ -1372,6 +1372,7 @@
     <string name="type.leisure.firepit">Ateş çukuru</string>
     <string name="type.landuse.plant_nursery">Fidanlık</string>
     <string name="type.barrier.guard_rail">Korkuluk</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.amenity.love_hotel">Aşk Oteli</string>
     <string name="type.landuse.religious">Dini Toprak</string>
     <string name="type.natural.wetland.saltmarsh">Tuz Bataklığı</string>

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

@@ -1358,9 +1358,24 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Спортивний зал</string>
     <string name="type.emergency">Швидка</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
     <string name="type.barrier.retaining_wall">Підпірна стіна</string>
     <string name="type.fee.yes">$</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
     <string name="type.barrier.hedge">Жива огорожа</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.leisure.hackerspace">Хакерський простір</string>
     <string name="type.man_made.pipeline.overground">Наземний трубопровід</string>
     <string name="type.military">Військові об\'єкти</string>
@@ -1369,6 +1384,14 @@
     <string name="type.public_transport.platform">Платформа</string>
     <string name="type.attraction.bumper_car">Доджем</string>
     <string name="type.attraction.big_wheel">Колесо огляду</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.amenity.studio">Студія</string>
     <string name="type.amenity.luggage_locker">Камера схову</string>
     <string name="type.man_made.crane">Кран</string>

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

@@ -1178,5 +1178,6 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Nhà thi đấu thể thao</string>
     <string name="type.railway.station.subway.qingdao">Ngầm</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.silo">Silo</string>
 </resources>

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

@@ -1280,6 +1280,7 @@
     <string name="type.leisure.sports_hall">體育館</string>
     <string name="type.attraction.bumper_car">碰碰車</string>
     <string name="type.leisure.track">賽道</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.leisure.track.area">賽道</string>
     <string name="type.railway">鐵路要素</string>
     <string name="type.amenity.studio">影樓</string>
@@ -1305,6 +1306,7 @@
     <string name="type.man_made.storage_tank">儲水缸</string>
     <string name="type.man_made.crane">起重機</string>
     <string name="type.man_made.works">工廠</string>
+    <string name="type.mapswithme.grid">mapswithme-網格</string>
     <string name="type.military">軍事</string>
     <string name="type.mountain_pass">山口</string>
     <string name="type.natural.desert">沙漠</string>
@@ -1314,6 +1316,10 @@
     <string name="type.power.line">輸電線</string>
     <string name="type.power.pole">電線桿</string>
     <string name="type.man_made.utility_pole">公用事業桿</string>
+    <string name="type.psurface">路面</string>
+    <string name="type.hwtag.oneway">單行道標籤</string>
+    <string name="type.hwtag.private">私人道路標籤</string>
+    <string name="type.hwtag.toll">收費道路標籤</string>
     <string name="type.man_made.cutline">森林分界線</string>
     <string name="type.man_made.survey_point">測量點</string>
     <string name="type.man_made.pipeline.overground">地上管道</string>
@@ -1323,8 +1329,24 @@
     <string name="type.man_made.breakwater">防波堤</string>
     <string name="type.organic.only">有機</string>
     <string name="type.power.minor_line">小型輸電線</string>
+    <string name="type.highway.world_level">快速公路—世界級</string>
+    <string name="type.highway.world_towns_level">快速公路—鎮級</string>
+    <string name="type.hwtag">交通屬性標籤</string>
+    <string name="type.hwtag.bidir_bicycle">雙向單車徑標籤</string>
+    <string name="type.hwtag.onedir_bicycle">單向單車徑標籤</string>
+    <string name="type.hwtag.lit">照明設備標籤</string>
+    <string name="type.hwtag.nobicycle">禁止單車標籤</string>
+    <string name="type.hwtag.nocar">禁止汽車標籤</string>
+    <string name="type.hwtag.nofoot">禁止行人標籤</string>
+    <string name="type.hwtag.yesbicycle">允許單車標籤</string>
+    <string name="type.hwtag.yescar">允許汽車標籤</string>
+    <string name="type.hwtag.yesfoot">允許行人標籤</string>
     <string name="type.man_made.wastewater_plant">污水處理廠</string>
+    <string name="type.psurface.paved_bad">鋪築路面—較差</string>
+    <string name="type.psurface.unpaved_bad">未鋪築路面—較差</string>
+    <string name="type.psurface.unpaved_good">未鋪築路面—良好</string>
     <string name="type.public_transport">公共交通要素</string>
+    <string name="type.psurface.paved_good">鋪築路面—良好</string>
     <string name="type.public_transport.platform">公共交通月台</string>
     <string name="type.railway.abandoned">鐵路遺跡</string>
     <string name="type.railway.abandoned.bridge">鐵路橋遺跡</string>
@@ -1369,6 +1391,7 @@
     <string name="type.piste_type.downhill.freeride">自由式速降滑雪道</string>
     <string name="type.piste_type.downhill.intermediate">中級速降滑雪道</string>
     <string name="type.piste_type.downhill.intermediate.area">中級速降滑雪區</string>
+    <string name="type.route.shuttle_train">穿梭列車</string>
     <string name="type.piste_type.downhill.advanced">高級速降滑雪道</string>
     <string name="type.piste_type.downhill.expert.area">專家級速降滑雪區</string>
     <string name="type.traffic_calming">交通緩行化</string>

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

@@ -20,12 +20,14 @@
     <string name="type.tourism.information.visitor_centre">旅遊服務中心</string>
     <string name="type.man_made.silo">筒倉</string>
     <string name="type.tourism.viewpoint">觀光景點</string>
+    <string name="type.highway.world_level">高速公路—世界級</string>
     <string name="type.organic.only">有機</string>
     <string name="type.recycling.cardboard">硬紙板</string>
     <string name="type.recycling.cans">金屬罐</string>
     <string name="type.recycling.shoes">鞋子</string>
     <string name="type.recycling.green_waste">綠色垃圾/有機廢棄物</string>
     <string name="type.recycling.cartons">紙盒</string>
+    <string name="type.highway.world_towns_level">高速公路—鎮級</string>
     <string name="type.leisure.track.area">賽道</string>
     <string name="type.organic.yes">有機</string>
     <string name="type.power.pole">電線桿</string>
@@ -33,6 +35,11 @@
     <string name="type.amenity.waste_transfer_station">垃圾轉運站</string>
     <string name="type.amenity.vending_machine.excrement_bags">撿便袋販賣機</string>
     <string name="type.amenity.parcel_locker">智取櫃</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.hwtag.nocar">禁止汽車標籤</string>
+    <string name="type.hwtag.yesfoot">允許行人標籤</string>
+    <string name="type.hwtag">交通屬性標籤</string>
+    <string name="type.hwtag.bidir_bicycle">雙向自行車道標籤</string>
     <string name="type.noexit">死胡同</string>
     <string name="type.railway.subway">捷運路線</string>
     <string name="type.railway.platform">鐵路月台</string>
@@ -40,9 +47,19 @@
     <string name="type.leisure">休閒元素</string>
     <string name="type.power">電力元素</string>
     <string name="type.power.line.underground">地下輸電線</string>
+    <string name="type.psurface.unpaved_bad">未鋪築路面—較差</string>
     <string name="type.railway.funicular.bridge">纜索鐵路橋軌道</string>
     <string name="type.traffic_calming">交通寧靜化</string>
     <string name="type.piste_type.downhill.area">速降滑雪區</string>
+    <string name="type.hwtag.onedir_bicycle">單向自行車道標籤</string>
+    <string name="type.hwtag.nobicycle">禁止自行車標籤</string>
+    <string name="type.hwtag.nofoot">禁止行人標籤</string>
+    <string name="type.hwtag.oneway">單行道標籤</string>
+    <string name="type.hwtag.private">私人道路標籤</string>
+    <string name="type.hwtag.toll">收費道路標籤</string>
+    <string name="type.hwtag.yesbicycle">允許自行車標籤</string>
+    <string name="type.hwtag.yescar">允許汽車標籤</string>
+    <string name="type.hwtag.lit">照明設備標籤</string>
     <string name="type.leisure.slipway">船坡道</string>
     <string name="type.leisure.track">賽道</string>
     <string name="type.man_made.breakwater">防波堤</string>
@@ -61,6 +78,7 @@
     <string name="type.piste_type.downhill">速降滑雪道</string>
     <string name="type.man_made.crane">起重機</string>
     <string name="type.man_made.works">工廠</string>
+    <string name="type.mapswithme.grid">mapswithme-網格</string>
     <string name="type.natural.desert">沙漠</string>
     <string name="type.power.generator">發電機</string>
     <string name="type.power.line">輸電線</string>
@@ -69,6 +87,10 @@
     <string name="type.railway.light_rail.bridge">輕軌軌道橋</string>
     <string name="type.railway.light_rail.tunnel">輕軌隧道</string>
     <string name="type.public_transport.platform">大眾運輸月台</string>
+    <string name="type.psurface">路面</string>
+    <string name="type.psurface.paved_bad">鋪築路面—較差</string>
+    <string name="type.psurface.paved_good">鋪築路面—良好</string>
+    <string name="type.psurface.unpaved_good">未鋪築路面—良好</string>
     <string name="type.railway">鐵路元素</string>
     <string name="type.railway.abandoned">鐵路遺跡</string>
     <string name="type.railway.abandoned.bridge">鐵路橋遺跡</string>
@@ -84,6 +106,7 @@
     <string name="type.railway.preserved.tunnel">保留鐵路隧道</string>
     <string name="type.railway.subway.bridge">捷運線橋</string>
     <string name="type.railway.subway.tunnel">捷運線路隧道</string>
+    <string name="type.route.shuttle_train">巡迴列車</string>
     <string name="type.tourism">観光元素</string>
     <string name="type.attraction.big_wheel">摩天輪</string>
     <string name="type.traffic_calming.bump">減速帶</string>

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

@@ -1327,14 +1327,30 @@
     <string name="type.recycling.cans">金属罐</string>
     <string name="type.recycling.shoes">鞋子</string>
     <string name="type.recycling.cartons">纸盒</string>
+    <string name="type.hwtag.bidir_bicycle">双向自行车道标签</string>
+    <string name="type.hwtag.onedir_bicycle">单向自行车道标签</string>
+    <string name="type.hwtag.lit">照明设施标签</string>
+    <string name="type.hwtag.nobicycle">禁止自行车标签</string>
+    <string name="type.hwtag.nocar">禁止汽车标签</string>
+    <string name="type.hwtag.oneway">单行道标签</string>
+    <string name="type.hwtag.private">私有道路标签</string>
+    <string name="type.hwtag.toll">收费道路标签</string>
+    <string name="type.hwtag.yesbicycle">允许自行车标签</string>
+    <string name="type.hwtag.yesfoot">允许行人标签</string>
     <string name="type.man_made.cairn">堆石标</string>
     <string name="type.man_made.mast">桅杆</string>
     <string name="type.man_made.silo">筒仓</string>
     <string name="type.man_made.storage_tank">储罐</string>
+    <string name="type.mapswithme.grid">mapswithme—网格</string>
     <string name="type.mountain_pass">山口</string>
     <string name="type.natural.desert">沙漠</string>
     <string name="type.organic.yes">有机</string>
     <string name="type.power.pole">电线杆</string>
+    <string name="type.psurface">路面</string>
+    <string name="type.psurface.paved_bad">铺装路面—较差</string>
+    <string name="type.psurface.paved_good">铺装路面—良好</string>
+    <string name="type.psurface.unpaved_bad">未铺装路面—较差</string>
+    <string name="type.psurface.unpaved_good">未铺装路面—良好</string>
     <string name="type.railway.crossing">铁路道口</string>
     <string name="type.railway.preserved.tunnel">保留铁路隧道</string>
     <string name="type.railway.subway.bridge">地铁线路桥</string>
@@ -1359,6 +1375,8 @@
     <string name="type.piste_type.sled.area">雪橇滑道区</string>
     <string name="type.recycling.green_waste">绿色/有机垃圾</string>
     <string name="type.recycling.cardboard">硬纸板</string>
+    <string name="type.highway.world_towns_level">高速公路—城镇级</string>
+    <string name="type.hwtag.nofoot">禁止行人标签</string>
     <string name="type.noexit">死胡同</string>
     <string name="type.organic.only">有机</string>
     <string name="type.railway.preserved">保留铁路</string>
@@ -1366,8 +1384,13 @@
     <string name="type.railway.subway">地铁线路</string>
     <string name="type.traffic_calming">交通稳静化</string>
     <string name="type.piste_type.downhill">速降滑雪道</string>
+    <string name="type.highway.world_level">高速公路—世界级</string>
+    <string name="type.hwtag">交通属性标签</string>
+    <string name="type.hwtag.yescar">允许汽车标签</string>
     <string name="type.man_made.survey_point">测量点</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.utility_pole">公共设施杆</string>
+    <string name="type.route.shuttle_train">穿梭列车</string>
     <string name="type.attraction.bumper_car">碰碰车</string>
     <string name="type.sport.diving">高台跳水</string>
     <string name="type.landuse.plant_nursery">苗圃</string>

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

@@ -67,27 +67,4 @@
   <string name="placepage_behavior" translatable="false">com.google.android.material.bottomsheet.BottomSheetBehavior</string>
 
   <string name="car_notification_channel_name" translatable="false">Car</string>
-  <string name="type.highway.world_level">highway-world_level</string>
-  <string name="type.highway.world_towns_level">highway-world_towns_level</string>
-  <string name="type.hwtag">hwtag</string>
-  <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
-  <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
-  <string name="type.hwtag.lit">hwtag-lit</string>
-  <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
-  <string name="type.hwtag.nocar">hwtag-nocar</string>
-  <string name="type.hwtag.nofoot">hwtag-nofoot</string>
-  <string name="type.hwtag.oneway">hwtag-oneway</string>
-  <string name="type.hwtag.private">hwtag-private</string>
-  <string name="type.hwtag.toll">hwtag-toll</string>
-  <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string> 
-  <string name="type.hwtag.yescar">hwtag-yescar</string>
-  <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
-  <string name="type.mapswithme.grid">mapswithme-grid</string>
-  <string name="type.mapswithme">MapsWithMe</string>
-  <string name="type.psurface">psurface</string>
-  <string name="type.psurface.paved_bad">psurface-paved_bad</string>
-  <string name="type.psurface.paved_good">psurface-paved_good</string>
-  <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
-  <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
-  <string name="type.route.shuttle_train">route-shuttle_train</string>
 </resources>