[android] Fix camera cutout offset in navigation

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

.forgejo/CODEOWNERS

@@ -1,69 +1,55 @@
-# All non-assigned.
-* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @organicmaps/design
-/android/app/src/main/res/font/ @organicmaps/design
-/android/app/src/main/res/mipmap*/ @organicmaps/design
-/data/*.ttf @organicmaps/design
-/data/resources-svg/ @organicmaps/design
-/data/search-icons/ @organicmaps/design
-/iphone/Maps/Images.xcassets/ @organicmaps/design
+/android/app/src/main/res/drawable*/ @comaps/design
+/android/app/src/main/res/font/ @comaps/design
+/android/app/src/main/res/mipmap*/ @comaps/design
+/data/*.ttf @comaps/design
+/data/resources-svg/ @comaps/design
+/data/search-icons/ @comaps/design
+/iphone/Maps/Images.xcassets/ @comaps/design
 # Android.
-/android/ @organicmaps/android
-/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
-/docs/JAVA_STYLE.md @organicmaps/android
+/android/ @comaps/android
+/android/app/src/main/java/app/comaps/car/ @comaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @comaps/android
+/docs/JAVA_STYLE.md @comaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @organicmaps/ios
-/xcode/ @organicmaps/ios
-/docs/OBJC_STYLE.md @organicmaps/ios
+/iphone/ @comaps/ios
+/xcode/ @comaps/ios
+/docs/OBJC_STYLE.md @comaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
-# Qt
-/qt/ @organicmaps/qt
-# Rendering
-/drape/ @organicmaps/rendering
-/drape_frontend/ @organicmaps/rendering
-# Map Data.
-/tools/python/maps_generator/ @organicmaps/data
-/generator/ @organicmaps/data
-/topography_generator/ @organicmaps/data
-/data/borders/ @organicmaps/data
-/data/conf/isolines/ @organicmaps/data
-/docs/SUBWAY_GENERATION.md @organicmaps/data
-/docs/MAPS.md @organicmaps/data
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
 # no owner (changed often to add a new POI)
 /generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-/data/styles/ @organicmaps/styles
-/data/types.txt @organicmaps/styles
-/data/visibility.txt @organicmaps/styles
-/data/mapcss-mapping.csv @organicmaps/styles
-/data/replaced_tags.txt @organicmaps/styles
-/data/classificator.txt @organicmaps/styles
-/data/drules_* @organicmaps/styles
+/data/styles/ @comaps/styles
+/data/types.txt @comaps/styles
+/data/visibility.txt @comaps/styles
+/data/mapcss-mapping.csv @comaps/styles
+/data/replaced_tags.txt @comaps/styles
+/data/classificator.txt @comaps/styles
+/data/drules_* @comaps/styles
 /docs/STYLES.md
-/tools/kothic/ @organicmaps/styles
+/tools/kothic/ @comaps/styles
 # DevOps.
-/.forgejo/workflows @organicmaps/devops
-/android/*gradle* @organicmaps/devops
-/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
-/xcode/fastlane/ @organicmaps/devops
-# Growth.
-README.md @organicmaps/growth
-/.forgejo/FUNDING.yml @organicmaps/growth
-/android/app/src/fdroid/play/ @organicmaps/growth
-/android/app/src/google/play/ @organicmaps/growth
-/iphone/metadata/ @organicmaps/growth
+/.forgejo/workflows @comaps/devops
+/android/*gradle* @comaps/devops
+/docs/RELEASE_MANAGEMENT.md @comaps/devops
+/xcode/fastlane/ @comaps/devops
+/tools/python/maps_generator/ @comaps/devops
+/generator/ @comaps/devops
+/topography_generator/ @comaps/devops
+/data/borders/ @comaps/devops
+/data/conf/isolines/ @comaps/devops
+/docs/SUBWAY_GENERATION.md @comaps/devops
+/docs/MAPS.md @comaps/devops
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @comaps/devops
 # Legal.
-LEGAL @organicmaps/legal
-LICENSE @organicmaps/legal
-NOTICE @organicmaps/legal
-CONTRIBUTORS @organicmaps/legal
-/docs/CODE_OF_CONDUCT.md @organicmaps/legal
-/docs/DCO.md @organicmaps/legal
-/docs/GOVERNANCE.md @organicmaps/legal
+LEGAL @comaps/admins
+LICENSE @comaps/admins
+NOTICE @comaps/admins
+CONTRIBUTORS @comaps/admins
+/docs/CODE_OF_CONDUCT.md @comaps/admins
+/docs/DCO.md @comaps/admins
+/docs/GOVERNANCE.md @comaps/admins

.forgejo/FUNDING.yml

@@ -1 +1,3 @@
 open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]

.forgejo/workflows/map-generator.yml

@@ -105,17 +105,17 @@ jobs:
         run: |
           echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
           cd ~
-          git clone --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
+          git clone --depth 1 --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
       - name: Checkout wikiparser repo
         shell: bash
         run: |
           cd ~
-          git clone https://codeberg.org/comaps/wikiparser.git
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/wikiparser.git
       - name: Checkout subways repo
         shell: bash
         run: |
           cd ~
-          git clone https://codeberg.org/comaps/subways.git
+          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
 
   copy-coasts:
     # if: inputs.run-copy-coasts

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]

CONTRIBUTORS

@@ -1,15 +1,16 @@
 This file contains a list of people who have contributed to this project.
-Its not neccesarily comprehensive.
+It is not necessarily comprehensive as contributors must manually add themselves.
 Feel free to add yourself here along with your first contribution!
 
 --------------------------------------------------------------------------------
 CoMaps contributors:
-(in alphabetic order)
+(in alphabetical order)
 --------------------------------------------------------------------------------
 
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
+thesupertechie
 vikiawv
 Yannik Bloscheck
 

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

@@ -0,0 +1,32 @@
+Una aplicació de mapes gratuïta i de codi obert dirigida per la comunitat basada en dades d'OpenStreetMap i reforçada amb el compromís amb la transparència, la privadesa i la no ànim de lucre. CoMaps és una derivació/fork d'Organic Maps, que al seu torn és una derivació de Maps.ME.
+
+Llegiu sobre els motius del projecte i la seva direcció a <b><i>codeberg.org/comaps</i></b>.
+Uneix-te a la comunitat i ajuda a crear la millor aplicació de mapes
+• Utilitza l'aplicació i difon-la
+• Dona comentaris i informa de problemes
+• Actualitza les dades del mapa a l'aplicació o al lloc web d'OpenStreetMap
+
+‣ <b>Enfocat fora de línia</b>: Planifica i navega pel teu viatge a l'estranger sense necessitat de servei mòbil, cerca punts de referència mentre fas una excursió llunyana, etc. Totes les funcions de l'aplicació estan dissenyades per funcionar fora de línia.
+‣ <b>Respecte a la privadesa</b>: L'aplicació està dissenyada tenint en compte la privadesa: no identifica persones, no fa seguiment i no recopila informació personal. Sense anuncis.
+‣ <b>Senzill i polit</b>: funcions essencials fàcils d'utilitzar que simplement funcionen.
+‣ <b>Estalvia bateria i espai</b>: No consumeix bateria com altres aplicacions de navegació. Els mapes compactes estalvien espai preciós al telèfon.
+‣ <b>Gratuït i creat per la comunitat</b>: Gent com tu ha ajudat a crear l'aplicació afegint llocs a OpenStreetMap, provant i donant comentaris sobre les funcions i aportant les seves habilitats de desenvolupament i diners.
+‣ <b>Presa de decisions i finances obertes i transparents, sense ànim de lucre i de codi obert.</b>
+
+<b>Característiques principals</b>:
+• Mapes detallats descarregables amb llocs que no estan disponibles amb Google Maps
+• Mode exterior amb rutes de senderisme destacades, càmpings, fonts d'aigua, pics, corbes de nivell, etc.
+• Senders per caminar i carrils bici
+• Punts d'interès com restaurants, gasolineres, hotels, botigues, llocs d'interès i molts més
+• Cerca per nom, adreça o categoria de punt d'interès
+• Navegació amb anuncis de veu per caminar, anar amb bicicleta o conduir
+• Marca els teus llocs preferits amb un sol toc
+• Articles de la Viquipèdia fora de línia
+• Capa i indicacions de trànsit de metro
+• Enregistrament de rutes
+• Exporta i importa marcadors i rutes en formats KML, KMZ i GPX
+• Un mode fosc per utilitzar durant la nit
+• Millora les dades del mapa per a tothom mitjançant un editor bàsic integrat
+
+<b>La llibertat és aquí</b>
+Descobreix el teu viatge, navega pel món amb la privadesa i la comunitat al capdavant!

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

@@ -0,0 +1,10 @@
+• OpenStreetMap-Daten vom 9. Dezember
+• Material 3 Design
+• Im OSM-Editor können nun Ladestationen hinzugefügt werden
+• Schuko und Typ E Ladestationen hinzugefügt
+• Verbesserte Suchvorschläge
+• Litauische und lettische Sprachankündigungen
+• Die Fahranweisungen wurden vergrößert
+• Der Zoomlevel passt sich an die Distanz zur nächsten Abbiegung an
+• Neue Anordnung der Einstellungen
+Weitere Einzelheiten auf codeberg.org/comaps/comaps/releases

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

@@ -1,13 +1,10 @@
-• Fixed voice directions pronouncing weird symbols in the beginning
-• OpenStreetMap data as of November 23
-
-Changes in the previous release:
-• Added trees
-• Made bus stop icons smaller and show up earlier
-• Reduce visibility of entrances
-• Added several other POI types
-• Show sand areas on the map
-• Add business is vacant option to the OSM editor
-• Improved road shields in Europe
-• Avoid paved roads routing option
-• Added icons to the settings page
+• OpenStreetMap data as of December 9
+• Use Material 3 themes
+• Support charging sockets in OSM Editor
+• Added schuko/type-E charge sockets
+• Improved search results ranking
+• Enabled Lithuanian and Latvian in voice announcements
+• Improved size of driving indications
+• Base zoom level on distance to next turn
+• Reordered settings
+More details on codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,11 @@
+• Datos de OpenStreetMap a fecha 9/12.
+• Uso de temas Material 3.
+• Compatibilidad con enchufes de recarga en Editor.
+• Se añaden enchufes de recarga schuko/tipo E.
+• Se mejora la búsqueda.
+• Se habilitan el lituano y el letón en las indicaciones de voz.
+• Se aumenta el tamaño de las indicaciones de conducción.
+• Nivel de zoom base según la distancia al siguiente giro.
+• Se han reordenado los ajustes.
+
+Más detalles en codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,10 @@
+• Données OpenStreetMap du 9 Décembre
+• Utilisation de Material 3
+• Support de l'édition des bornes de recharge dans l'éditeur OSM
+• Ajout du type de prise schuko/type-E
+• Amélioration de l'ordre des résultats de recherche
+• Ajout du lituanien et du letton dans le guidage vocal
+• Amélioration de la taille des instructions dans la navigation
+• Niveau de zoom basé sur la distance jusqu’au prochain virage
+• Réorganisation des paramètres
+Plus de détails sur codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,10 @@
+• Podaci OpenStreetMap karte od 9. prosinca
+• Korištenje Material 3 tema
+• Podrška za utičnice za punjenje u OSM Editoru
+• Dodane šuko/tip-E utičnice
+• Poboljšano rangiranje rezultata pretraživanja
+• Omogućeni litvanski i latvijski jezici u glasovnim najavama
+• Povećana veličina indikatora vožnje
+• Razina zumiranja se mijenja ovisno o udaljenosti do sljedećeg skretanja
+• Promijenjen redoslijed postavki
+Više detalja na codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1 @@
+Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės

android/app/src/fdroid/play/listings/lt/title.txt

@@ -0,0 +1 @@
+CoMaps – keliaukite atsijungę ir privačiai

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

@@ -0,0 +1,10 @@
+• Dane OpenStreetMap z 9 grudnia
+• Użycie motywów Material 3
+• Obsługa gniazd ładowania w Edytorze OSM
+• Dodane gniazda ładowania schuko/type-E
+• Poprawiony ranking wyników wyszukiwania
+• Dodane litewskie i łotewskie komunikaty głosowe
+• Poprawiony rozmiar znaków drogowych
+• Poziom powiększenia oparty na odległości do następnego manewru
+• Zmieniona kolejność ustawień
+Więcej szczegółów na codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,10 @@
+• Dados OpenStreetMap atualizados em 9 de dezembro
+• Uso do estilo Material 3
+• Suporte para tomadas de carregamento no Editor OSM
+• Adição de tomadas de carregamento Schuko/Tipo E
+• Melhoria na classificação dos resultados de busca
+• Adição dos idiomas letão e lituano nas orientações por voz
+• Melhoria no tamanho das indicações de direção
+• Nível de zoom baseado em distância até a próxima curva
+• Configurações reordenadas
+Mais detalhes em codeberg.org/comaps/comaps/releases

android/app/src/google/play/listings/es-ES/full-description.txt

@@ -68,4 +68,4 @@ Por favor, informa de errores, sugiere ideas y únete a nuestra comunidad en el
 
 <b>La Libertad Está Aquí</b>
 
-Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.
+¡Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad!

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

@@ -0,0 +1 @@
+Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės

android/app/src/google/play/listings/lt/title.txt

@@ -0,0 +1 @@
+CoMaps – naviguokite privačiai

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

@@ -107,6 +107,7 @@ import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.settings.RoadType;
 import app.organicmaps.sdk.settings.UnitLocale;
+import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.PowerManagment;
@@ -132,7 +133,6 @@ import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textview.MaterialTextView;
-
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -1813,6 +1813,26 @@ public class MwmActivity extends BaseMwmFragmentActivity
     return false;
   }
 
+  private void deliverTtsMessage()
+  {
+    if (Config.isTtsMessageDelivered())
+      return;
+
+    String languageDisplayName = TtsPlayer.INSTANCE.getLanguageDisplayName();
+
+    if (languageDisplayName != null)
+    {
+      String navigationStartMessage = getResources().getString(R.string.navigation_start_tts_message);
+      navigationStartMessage += languageDisplayName;
+      Toast.makeText(this, navigationStartMessage, Toast.LENGTH_LONG).show();
+    }
+    else
+      Toast.makeText(this, getResources().getString(R.string.navigation_start_tts_disabled_message), Toast.LENGTH_LONG)
+          .show();
+
+    Config.setTtsMessageDelivered();
+  }
+
   private boolean showStartPointNotice()
   {
     final RoutingController controller = RoutingController.get();
@@ -2189,6 +2209,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!showRoutingDisclaimer())
       return;
 
+    deliverTtsMessage();
+
     closeFloatingPanels();
     setFullscreen(false);
     RoutingController.get().start();

android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java

@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
@@ -23,6 +22,7 @@ import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.StackedButtonDialogFragment;
 import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.google.android.material.textview.MaterialTextView;
 import java.text.NumberFormat;
 
@@ -50,7 +50,7 @@ public class ProfileFragment extends BaseMwmToolbarFragment
   private MaterialTextView mEditsSent;
   private MaterialTextView mProfileName;
   private ShapeableImageView mProfileImage;
-  private ProgressBar mProfileInfoLoading;
+  private CircularProgressIndicator mProfileInfoLoading;
 
   @Nullable
   @Override

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

@@ -102,7 +102,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
     final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);
     ViewCompat.setOnApplyWindowInsetsListener(mStreetFrame, (v, windowInsets) -> {
-      UiUtils.setViewInsetsPaddingNoBottom(v, windowInsets);
+      UiUtils.setViewNavigationInsetsPaddingNoBottom(v, windowInsets);
 
       final Insets safeDrawingInsets = windowInsets.getInsets(WindowInsetUtils.TYPE_SAFE_DRAWING);
       nextTurnContainer.setPadding(safeDrawingInsets.left, nextTurnContainer.getPaddingTop(),
@@ -113,6 +113,10 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
       navigationBarBackground.getLayoutParams().width = mFrame.findViewById(R.id.nav_bottom_sheet).getWidth();
       return windowInsets;
     });
+      ViewCompat.setOnApplyWindowInsetsListener(turnFrame, (v, windowInsets) -> {
+          UiUtils.setViewNavigationInsetsPaddingNoBottom(v, windowInsets);
+          return windowInsets;
+      });
   }
 
   private void updateVehicle(@NonNull RoutingInfo info)

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

@@ -90,8 +90,7 @@ public enum ThemeSwitcher
     {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
         uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
 
       if (RoutingController.get().isVehicleNavigation())
         style = MapStyle.VehicleDark;
@@ -104,8 +103,7 @@ public enum ThemeSwitcher
     {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
         uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
 
       if (RoutingController.get().isVehicleNavigation())
         style = MapStyle.VehicleClear;

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

@@ -281,6 +281,12 @@ public final class UiUtils
     view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
   }
 
+  public static void setViewNavigationInsetsPaddingNoBottom(View view, WindowInsetsCompat windowInsets)
+  {
+      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+      view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
+  }
+
   public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
   {
     View customNavigationButton = toolbar.findViewById(R.id.back);

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

@@ -154,6 +154,7 @@ public class PlacePageView extends Fragment
   private MaterialTextView mTvLastChecked;
   private View mEditPlace;
   private View mAddPlace;
+  private View mMapTooOld;
   private View mEditTopSpace;
   private ShapeableImageView mColorIcon;
   private MaterialTextView mTvCategory;
@@ -318,6 +319,7 @@ public class PlacePageView extends Fragment
     mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
     mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
     mAddPlace = mFrame.findViewById(R.id.ll__place_add);
+    mMapTooOld = mFrame.findViewById(R.id.cv__map_too_old);
     mEditTopSpace = mFrame.findViewById(R.id.edit_top_space);
     latlon.setOnLongClickListener(this);
     address.setOnLongClickListener(this);
@@ -684,39 +686,73 @@ public class PlacePageView extends Fragment
 
     if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
     {
-      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace);
+      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace, mMapTooOld);
     }
     else
     {
       UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
       UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
+      UiUtils.hide(mMapTooOld);
       MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
       MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);
-      mTvEditPlace.setOnClickListener(this);
-      mTvAddPlace.setOnClickListener(this);
-      mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
-      mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
-      final int editTextButtonColor =
-          Editor.nativeShouldEnableEditPlace()
+
+      boolean shouldEnableEditPlace = Editor.nativeShouldEnableEditPlace();
+
+      if (shouldEnableEditPlace)
+      {
+        mTvEditPlace.setOnClickListener(this);
+        mTvAddPlace.setOnClickListener(this);
+      }
+      else
+      {
+        mTvEditPlace.setOnClickListener((v) -> {
+          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+        });
+        mTvAddPlace.setOnClickListener((v) -> {
+          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+        });
+
+        String countryId = MapManager.nativeGetSelectedCountry();
+
+        if (countryId != null)
+        {
+          CountryItem map = CountryItem.fill(countryId);
+
+          if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
+              || map.status == CountryItem.STATUS_FAILED)
+          {
+            UiUtils.show(mMapTooOld);
+
+            boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
+            MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
+            UiUtils.showIf(canUpdateMap, mTvUpdateTooOldMap);
+
+            MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description);
+            if (canUpdateMap)
+            {
+              mapTooOldDescription.setText(R.string.place_page_map_too_old_description);
+              mTvUpdateTooOldMap.setOnClickListener((v) -> {
+                MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
+                UiUtils.hide(mMapTooOld);
+              });
+            }
+            else
+              mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
+          }
+        }
+      }
+
+      final int editButtonColor =
+          shouldEnableEditPlace
               ? ContextCompat.getColor(
                     getContext(),
                     UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
               : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
-      final ColorStateList editStrokeButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-      },
-              new int[]{
-                      ContextCompat.getColor(
-                              getContext(),
-                              UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)),
-                      ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled)
-              });
-      mTvEditPlace.setTextColor(editTextButtonColor);
-      mTvAddPlace.setTextColor(editTextButtonColor);
-      mTvEditPlace.setStrokeColor(editStrokeButtonColor);
-      mTvAddPlace.setStrokeColor(editStrokeButtonColor);
+
+      mTvEditPlace.setTextColor(editButtonColor);
+      mTvAddPlace.setTextColor(editButtonColor);
+      mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
+      mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
       UiUtils.showIf(
           UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace),
           mEditTopSpace);

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="48dp"
+  android:height="48dp"
+  android:viewportWidth="960"
+  android:viewportHeight="960"
+  android:tint="?colorControlNormal">
+  <path
+    android:fillColor="@android:color/white"
+    android:pathData="M453,680L513,680L513,440L453,440L453,680ZM479.98,366Q494,366 503.5,356.8Q513,347.6 513,334Q513,319.55 503.52,309.78Q494.04,300 480.02,300Q466,300 456.5,309.78Q447,319.55 447,334Q447,347.6 456.48,356.8Q465.96,366 479.98,366ZM480.27,880Q397.53,880 324.77,848.5Q252,817 197.5,762.5Q143,708 111.5,635.16Q80,562.32 80,479.5Q80,396.68 111.5,323.84Q143,251 197.5,197Q252,143 324.84,111.5Q397.68,80 480.5,80Q563.32,80 636.16,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,479.73Q880,562.47 848.5,635.23Q817,708 763,762.32Q709,816.63 636,848.32Q563,880 480.27,880ZM480.5,820Q622,820 721,720.5Q820,621 820,479.5Q820,338 721.19,239Q622.38,140 480,140Q339,140 239.5,238.81Q140,337.62 140,480Q140,621 239.5,720.5Q339,820 480.5,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>

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

@@ -11,13 +11,13 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:id="@+id/statutbar"
-    android:layout_height="15dp"
+    android:layout_height="1dp"
     app:layout_constraintTop_toTopOf="parent" />
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/street_frame"
     android:layout_width="500dp"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
+    android:layout_marginTop="@dimen/margin_quarter"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
     android:elevation="@dimen/nav_elevation"
@@ -33,9 +33,13 @@
         style="@style/MwmWidget.TextView.NavStreet"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:padding="@dimen/margin_quarter_plus"
         android:maxLines="2"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="center_vertical"
         android:gravity="center"
+        android:autoSizeTextType="uniform"
+        android:autoSizeMinTextSize="16sp"
+        android:autoSizeMaxTextSize="25sp"
         android:textColor="@android:color/white"
         tools:text="Sample street name.\nLong looooooooong!!!!"/>
     </RelativeLayout>
@@ -48,7 +52,7 @@
     app:layout_constraintEnd_toStartOf="@+id/street_frame"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
+    android:layout_marginTop="@dimen/margin_quarter"
     android:layout_marginStart="@dimen/margin_quarter"
     android:clickable="true"
     android:elevation="@dimen/nav_elevation">

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

@@ -26,7 +26,7 @@
         app:tint="?colorSecondary"/>
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/head_message"
-        style="?fontHeadline6"
+        style="@style/TextAppearance.Headline6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
@@ -36,7 +36,7 @@
         android:text="@string/download_map_title" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/download_message"
-        style="?fontBody2"
+        style="@style/TextAppearance.Body2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"

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

@@ -28,7 +28,7 @@
         android:layout_marginBottom="8dp"
         android:text="@string/aa_connected_title"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+        android:textAppearance="@style/TextAppearance.Headline4"
         android:textStyle="bold" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:text="@string/car_used_on_the_car_screen"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
+        android:textAppearance="@style/TextAppearance.Body1" />
   </LinearLayout>
 
   <com.google.android.material.button.MaterialButton

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

@@ -20,7 +20,7 @@
       android:layout_marginStart="32dp"
       android:text="@string/aa_request_permission_activity_text"
       android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+      android:textAppearance="@style/TextAppearance.Headline4"
       android:textStyle="bold" />
 
   <com.google.android.material.button.MaterialButton

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

@@ -22,7 +22,7 @@
     android:layout_marginStart="@dimen/margin_base"
     android:maxLines="3"
     android:ellipsize="end"
-    android:textAppearance="?fontHeadline6"
+    android:textAppearance="@style/TextAppearance.Headline6"
     tools:text="Title" />
 
   <androidx.recyclerview.widget.RecyclerView

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

@@ -12,7 +12,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base"
     android:text="@string/download_country_ask"
-    android:textAppearance="?fontBody2"
+    android:textAppearance="@style/TextAppearance.Body2"
     android:visibility="gone"
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator

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

@@ -14,7 +14,6 @@
     android:textAppearance="@style/MwmTextAppearance.Title" />
   <com.google.android.material.textfield.TextInputLayout
     android:id="@+id/et__input_layout"
-    style="?fontBody1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:hintEnabled="false">

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

@@ -27,7 +27,7 @@
     android:layout_marginTop="@dimen/margin_base">
 
     <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
       android:id="@+id/sort_by_default"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
       android:id="@+id/sort_by_name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
       android:id="@+id/sort_by_type"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
       android:id="@+id/sort_by_distance"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
       app:buttonTint="@null"/>
 
     <RadioButton
-      style="?fontSubtitle1"
+      style="@style/TextAppearance.Subtitle1"
       android:id="@+id/sort_by_time"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"

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

@@ -17,7 +17,6 @@
     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:hint="@string/name"
@@ -88,7 +87,6 @@
       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_marginEnd="@dimen/margin_half"

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

@@ -17,7 +17,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:paddingTop="@dimen/margin_half"
       android:paddingBottom="@dimen/margin_base"
-      android:textAppearance="?fontHeadline6"
+      android:textAppearance="@style/TextAppearance.Headline6"
       tools:text="Xindian Shitoushan Trail" />
     <include
       layout="@layout/item_divider"

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

@@ -30,12 +30,14 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_base"
       android:background="?colorPrimary">
-    <ProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/user_profile_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:trackColor="@color/text_light"
+        app:indicatorColor="@color/text_light"
         android:layout_gravity="center"
-        android:indeterminateTint="@color/text_light"
+        android:indeterminate="true"
         android:visibility="invisible"
         tools:visibility="visible" />
     <LinearLayout

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

@@ -10,12 +10,12 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:visibility="gone" />
-    <ProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
       android:id="@+id/progress"
-      style="@style/Widget.AppCompat.ProgressBar"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="center" />
+      android:layout_gravity="center"
+      android:indeterminate="true"/>
     <include
       layout="@layout/feedback_fab"
       android:layout_width="match_parent"

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

@@ -16,7 +16,7 @@
       android:layout_marginStart="@dimen/margin_base"
       android:layout_marginTop="@dimen/margin_base"
       android:text="@string/layers_title"
-      android:textAppearance="?fontHeadline6"
+      android:textAppearance="@style/TextAppearance.Headline6"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
     <com.google.android.material.button.MaterialButton

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

@@ -10,12 +10,12 @@
     android:layout_height="match_parent"
     android:visibility="gone"/>
 
-  <ProgressBar
+  <com.google.android.material.progressindicator.CircularProgressIndicator
     android:id="@+id/progress"
-    style="@style/Widget.AppCompat.ProgressBar"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"/>
+    android:layout_gravity="center"
+    android:indeterminate="true"/>
 
   <include layout="@layout/shadow_top"/>
 </FrameLayout>

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

@@ -24,6 +24,6 @@
     android:layout_gravity="center_vertical"
     android:fontFamily="@string/robotoMedium"
     tools:text="Some text should go here"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
     android:textColor="?colorSecondary"/>
 </LinearLayout>

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

@@ -30,7 +30,7 @@
     android:ellipsize="middle"
     android:singleLine="true"
     android:textAlignment="viewStart"
-    android:textAppearance="?fontBody1"
+    android:textAppearance="@style/TextAppearance.Body1"
     tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
   <LinearLayout
     android:id="@+id/bottom_line_container"

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

@@ -25,7 +25,7 @@
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:ellipsize="middle"
       android:singleLine="true"
-      android:textAppearance="?fontBody1"
+      android:textAppearance="@style/TextAppearance.Body1"
       tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/size"
@@ -37,7 +37,7 @@
       android:ellipsize="end"
       android:singleLine="true"
       android:textColor="?android:textColorSecondary"
-      style="?fontBody2"
+      style="@style/TextAppearance.Body2"
       tools:text="42000000" />
   </LinearLayout>
 </LinearLayout>

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

@@ -12,7 +12,7 @@
   android:paddingBottom="@dimen/margin_half_plus">
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/text_message"
-    style="?fontHeadline6"
+    style="@style/TextAppearance.Headline6"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_alignParentStart="true"

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

@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start|bottom"
-        android:background="@android:color/transparent"
         android:clickable="true"
         android:gravity="start|top"
         android:text="@string/category_desc_more"

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

@@ -2,7 +2,7 @@
 <com.google.android.material.textview.MaterialTextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/text"
-  style="?fontHeadline6"
+  style="@style/TextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="?windowBackgroundForced"

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

@@ -14,7 +14,7 @@
     android:gravity="center"
     android:maxWidth="500dp"
     android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.MdcTypographyStyles.Headline6"
+    android:textAppearance="@style/TextAppearance.Headline6"
     android:textStyle="bold" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"

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

@@ -4,18 +4,16 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/name"
   android:layout_width="match_parent"
-  android:layout_height="@dimen/editor_height_field"
+  android:layout_height="wrap_content"
   android:animateLayoutChanges="true"
   android:gravity="center_vertical"
   android:orientation="horizontal">
   <com.google.android.material.textfield.TextInputLayout
     android:id="@+id/input_layout"
-    style="?fontBody1"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
-    android:hint="@string/editor_edit_place_name_hint"
-    android:textColorHint="?android:textColorSecondary">
+    android:hint="@string/editor_edit_place_name_hint">
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/input"
       style="@style/MwmWidget.Editor.FieldLayout.EditText"
@@ -31,5 +29,5 @@
     android:background="?selectableItemBackgroundBorderless"
     android:padding="@dimen/margin_half_plus"
     app:srcCompat="@drawable/ic_close"
-    app:tint="@color/base_red" />
+    app:tint="?iconTint" />
 </LinearLayout>

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

@@ -147,12 +147,12 @@
     <LinearLayout
       android:id="@+id/allday"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/editor_height_allday"
+      android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
       android:background="?clickableBackground"
       android:gravity="center_vertical"
       android:orientation="horizontal"
-      android:padding="@dimen/margin_half_plus">
+      android:padding="@dimen/margin_half">
 
       <com.google.android.material.textview.MaterialTextView
         android:layout_width="0dp"
@@ -164,7 +164,8 @@
       <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/sw__allday"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_quarter"/>
 
     </LinearLayout>
 

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

@@ -29,7 +29,7 @@
       android:layout_marginTop="@dimen/margin_base"
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:singleLine="true"
-      android:textAppearance="?fontBody1"
+      android:textAppearance="@style/TextAppearance.Body1"
       tools:text="@string/tracks_title" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
       android:layout_marginBottom="@dimen/margin_half_plus"
       android:singleLine="true"
       android:textColor="?android:textColorSecondary"
-      android:textAppearance="?fontBody2"
+      android:textAppearance="@style/TextAppearance.Body2"
       tools:text="@string/by_distance" />
   </LinearLayout>
   <com.google.android.material.imageview.ShapeableImageView

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

@@ -11,13 +11,13 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:id="@+id/statutbar"
-    android:layout_height="25dp"
+    android:layout_height="1dp"
     app:layout_constraintTop_toTopOf="parent" />
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus"
+    android:layout_marginTop="@dimen/margin_quarter"
     android:layout_marginStart="@dimen/nav_street_left"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
@@ -35,6 +35,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxLines="2"
+        android:padding="@dimen/margin_half"
+        android:autoSizeTextType="uniform"
+        android:autoSizeMinTextSize="19sp"
+        android:autoSizeMaxTextSize="24sp"
         android:minHeight="60dp"
         android:layout_gravity="center_vertical"
         android:gravity="center"
@@ -51,7 +55,7 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
     android:layout_marginStart="@dimen/margin_half"
-    android:layout_marginTop="@dimen/margin_half_plus"
+    android:layout_marginTop="@dimen/margin_quarter"
     android:clickable="true"
     android:elevation="@dimen/nav_elevation">
     <LinearLayout

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

@@ -34,8 +34,7 @@
     android:textAppearance="?android:attr/textAppearance"
     android:gravity="start|top"
     android:textColor="?attr/colorSecondary"
-    android:text="@string/category_desc_more"
-    android:background="@android:color/transparent"/>
+    android:text="@string/category_desc_more" />
   <include
     layout="@layout/item_divider"/>
 </LinearLayout>

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

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

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+android:id="@+id/cv__map_too_old"
+android:layout_width="match_parent"
+android:layout_height="wrap_content"
+android:layout_marginHorizontal="@dimen/margin_base"
+android:layout_marginTop="@dimen/margin_half"
+app:strokeWidth="1dp"
+app:strokeColor="@color/base_accent"
+app:cardBackgroundColor="@color/bg_cards">
+
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
+  android:padding="@dimen/margin_base"
+  android:gravity="center_vertical">
+
+  <com.google.android.material.imageview.ShapeableImageView
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_marginEnd="@dimen/margin_base"
+    app:srcCompat="@drawable/info_icon"
+    app:tint="@color/base_accent" />
+
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:orientation="vertical">
+
+    <com.google.android.material.textview.MaterialTextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_quarter"
+      android:text="@string/place_page_map_too_old_title"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      android:textStyle="bold"
+      android:textColor="?android:textColorPrimary" />
+
+    <com.google.android.material.textview.MaterialTextView
+      android:id="@+id/tv__map_too_old_description"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_quarter"
+      android:text="@string/place_page_map_too_old_description"
+      android:fontFamily="@string/robotoRegular"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textColor="?android:textColorPrimary" />
+
+    <com.google.android.material.button.MaterialButton
+      android:id="@+id/mb__update_too_old_map"
+      style="@style/MwmWidget.M3.Button.Primary"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:layout_gravity="end"
+      android:text="@string/place_page_update_too_old_map"/>
+
+  </LinearLayout>
+
+</LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>

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

@@ -65,7 +65,7 @@
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/oh_check_date"
-    style="?fontCaption"
+    style="@style/TextAppearance.Caption"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:layout_alignParentEnd="true"

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

@@ -6,11 +6,10 @@
   android:layout_height="match_parent"
   android:gravity="center"
   android:orientation="vertical">
-  <ProgressBar
-    style="@style/Widget.AppCompat.ProgressBar"
+  <com.google.android.material.progressindicator.CircularProgressIndicator
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@null" />
+    android:indeterminate="true"/>
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

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

@@ -6,9 +6,8 @@
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:contentDescription="@string/search_show_on_map"
-  style="@style/FAB"
+  style="@style/MwmWidget.ExtendedFAB"
   app:icon="@drawable/ic_show_on_map"
   android:text="@string/search_show_on_map"
   android:clickable="true"
-  android:focusable="true"
-  app:fabSize="mini"/>
+  android:focusable="true" />

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ProgressBar
+<com.google.android.material.progressindicator.CircularProgressIndicator
   xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/Widget.AppCompat.ProgressBar"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="@dimen/height_block_base"
   android:layout_height="@dimen/height_block_base"
   android:padding="@dimen/margin_half"
-  android:background="@null"/>
+  android:indeterminate="true"
+  app:trackColor="@color/text_light"
+  app:indicatorColor="@color/text_light" />

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

@@ -34,16 +34,17 @@
     android:singleLine="true"
     android:textCursorDrawable="@drawable/cursor_drawable" />
 
-  <ProgressBar
+  <com.google.android.material.progressindicator.CircularProgressIndicator
     android:id="@+id/progress"
-    style="@style/Widget.AppCompat.ProgressBar"
     android:layout_width="@dimen/search_progress_size"
     android:layout_height="@dimen/search_progress_size"
     android:layout_marginEnd="@dimen/margin_half"
     android:layout_weight="0"
-    android:background="@null"
     android:minHeight="@dimen/search_progress_size"
-    android:minWidth="@dimen/search_progress_size"/>
+    android:minWidth="@dimen/search_progress_size"
+    app:trackColor="@color/text_light"
+    app:indicatorColor="@color/text_light"
+    android:indeterminate="true"/>
 
   <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/clear"

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

@@ -295,7 +295,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Activeu els serveis de geolocalització</string>
     <string name="save">Desa</string>
-    <string name="create">crea</string>
+    <string name="create">Crear</string>
     <!-- red color -->
     <string name="red">Vermell</string>
     <!-- yellow color -->
@@ -473,7 +473,7 @@
     <string name="error_enter_correct_house_number">Introduïu un número d’edifici vàlid</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">El nombre de plantes no pot excedir de %d</string>
-    <string name="editor_zip_code">Codi postal</string>
+    <string name="editor_zip_code">Codi Postal</string>
     <string name="error_enter_correct_zip_code">Introduïu un codi postal vàlid</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota per als voluntaris d\'OpenStreetMap (opcional)</string>
@@ -521,8 +521,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Voleu enviar-ho a tots els usuaris?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal</string>
-    <string name="editor_share_to_all_dialog_message_2">Revisarem els canvis. Si tenim cap pregunta contactem amb vós via correu electrònic</string>
+    <string name="editor_share_to_all_dialog_message_1">Assegureu-vos que no heu introduït cap dada personal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Els editors d\'OpenStreetMap revisaran els canvis. Et contactaran si tenen cap pregunta.</string>
     <string name="navigation_stop_button">Atura</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">S’està enregistrant el recorregut</string>
@@ -875,4 +875,41 @@
     <string name="delete_track_dialog_title">Voleu eliminar %s?</string>
     <string name="pref_tts_no_system_tts_short">No s\'ha trobat cap motor de text a veu, comproveu la configuració de l\'app</string>
     <string name="offline_explanation_title">Mapes sense Connexió</string>
+    <string name="charge_socket_schuko">EU Domèstic</string>
+    <string name="unknown_socket_type">endoll desconegut</string>
+    <string name="edit_socket_info_tooltip">Crea nous endolls o edita els existents.</string>
+    <string name="charging_station_available_sockets">Endolls disponibles</string>
+    <string name="charge_socket_unknown_other">Altres o desconegut</string>
+    <string name="charge_socket_count">Recompte</string>
+    <string name="charge_socket_power">Potència (kW)</string>
+    <string name="editor_socket">Editar endoll</string>
+    <string name="unknown_count">desconegut</string>
+    <string name="error_value_must_be_positive">El valor ha de ser positiu</string>
+    <string name="error_invalid_number">Número invàlid</string>
+    <string name="offline_explanation_text">Un mapa ha de ser desconegut per a veure i navegar l\'àrea.\nDescarrega mapes per a àrees on vulgues viatjar.</string>
+    <string name="list_description_empty">Edita la llista per afegir una descripció</string>
+    <string name="opens_at">Obre a %s</string>
+    <string name="closes_at">Tanca a %s</string>
+    <string name="opens_day_at">Obre els %1$s a %2$s</string>
+    <string name="closes_day_at">Tanca els %1$s a %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="many">%d mins</item>
+        <item quantity="other">%d mins</item>
+    </plurals>
+    <string name="editor_place_doesnt_exist_description">Descriu com és el lloc ara mateix per enviar una nota d\'error a la comunitat d\'OpenStreetMap</string>
+    <string name="editor_business_vacant_button">El negoci està vacant</string>
+    <string name="editor_mark_business_vacant_title">Marcar negoci com a vacant</string>
+    <string name="editor_mark_business_vacant_description">Fes servir aquesta funció si el negoci s\'ha mogut, i l\'espai està buit i llest per a un altre llogater.</string>
+    <string name="editor_submit">Enviar</string>
+    <string name="power_management">Gestió de Potència</string>
+    <string name="avoid_steps">Evita escales</string>
+    <string name="avoid_paved">Evita carreteres asfaltades</string>
+    <string name="unknown_power_output">desconegut</string>
+    <string name="charge_socket_type2">Tipus 2 (sense cable)</string>
+    <string name="charge_socket_type2_cable">Tipus 2 (amb cable)</string>
+    <string name="charge_socket_type2_combo">Tipus 2 comb.</string>
+    <string name="charge_socket_type1">Tipus 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
 </resources>

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

@@ -905,4 +905,6 @@
     </plurals>
     <string name="power_management">Správa výkonu</string>
     <string name="charge_socket_schuko">Domovní EU</string>
+    <string name="prefs_speed_cameras_information">Upozornění na radary jsou vypnuty v zemích, kde je tato funkcionalita zakázána místními zákony.</string>
+    <string name="navigation_start_tts_message">"Spouštím navigaci, jazyk hlasových instrukcí: "</string>
 </resources>

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

@@ -607,7 +607,7 @@
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Undgå betalingsveje</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">Undgå ikke-asfalterede veje</string>
+    <string name="avoid_unpaved">Undgå veje uden fast belægning</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_ferry">Undgå færger</string>
     <string name="avoid_motorways">Undgå motorveje</string>
@@ -894,4 +894,6 @@
     <string name="editor_submit">Indsend</string>
     <string name="power_management">Strømstyring</string>
     <string name="charge_socket_schuko">Europæisk</string>
+    <string name="prefs_speed_cameras_information">Advarsler om hastighedskameraer er deaktiveret i lande, hvor advarsler er forbudt i henhold til lokal lovgivning.</string>
+    <string name="navigation_start_tts_message">"Starter navigation, sprog for stemmeinstruktioner: "</string>
 </resources>

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

@@ -197,7 +197,7 @@
     <string name="prefs_group_information">Información</string>
     <string name="prefs_group_route">Navegación</string>
     <string name="pref_zoom_title">Botones de zoom</string>
-    <string name="pref_zoom_summary">Visualizar en la pantalla</string>
+    <string name="pref_zoom_summary">Ver en el mapa</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Modo nocturno</string>
     <!-- Generic «Off» string -->
@@ -297,7 +297,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Por favor, activa los Servicios de Localización</string>
     <string name="save">Guardar</string>
-    <string name="create">crear</string>
+    <string name="create">Crear</string>
     <!-- red color -->
     <string name="red">Rojo</string>
     <!-- yellow color -->
@@ -493,7 +493,7 @@
     <string name="editor_category_unsuitable_title">¿No halla una categoría adecuada?</string>
     <string name="editor_category_unsuitable_text">CoMaps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añade dichas categorías directamente en <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulta nuestra <a href="https://www.comaps.app/support/advanced-map-editing/">guía</a> para obtener instrucciones detalladas paso a paso.</string>
     <string name="downloader_no_downloaded_maps_title">No has descargado ningún mapa</string>
-    <string name="downloader_no_downloaded_maps_message">Descargue mapas para encontrar la ubicación y navegar sin conexión</string>
+    <string name="downloader_no_downloaded_maps_message">Descarga mapas para buscar ubicaciones y navegar sin conexión</string>
     <string name="current_location_unknown_error_title">Se desconoce la ubicación actual</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
@@ -524,11 +524,11 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal</string>
-    <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta</string>
+    <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Grabando el trayeco</string>
+    <string name="track_recording">Grabando el trayecto</string>
     <!-- For the first routing -->
     <string name="accept">Aceptar</string>
     <!-- For the first routing -->
@@ -539,7 +539,7 @@
     <string name="mobile_data_option_not_today">No usar hoy</string>
     <string name="mobile_data">Internet móvil</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Se requiere Internet móvil para recibir notificaciones de actualización de mapas y cargar ediciones</string>
+    <string name="mobile_data_description">Se requiere conexión a Internet para recibir notificaciones de actualización de mapas y cargar ediciones</string>
     <string name="mobile_data_option_never">No usar nunca</string>
     <string name="mobile_data_option_ask">Preguntar siempre</string>
     <string name="traffic_update_maps_text">Para mostrar los datos de tráfico, deben actualizarse los mapas</string>

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

@@ -903,4 +903,6 @@
     <string name="editor_submit">Saada</string>
     <string name="power_management">Toitehaldus</string>
     <string name="charge_socket_schuko">EU-sisene</string>
+    <string name="prefs_speed_cameras_information">Kiiruskaamerate teavitused on nendes riikides lülitatud välja, kus seda keelab kohalik seadusandlus.</string>
+    <string name="navigation_start_tts_message">"Alustan tee juhatamist, hääljuhiste keel: "</string>
 </resources>

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

@@ -868,4 +868,5 @@
     <string name="opens_day_at">1$s ean %2$s tan irekitzen da</string>
     <string name="closes_day_at">%1$s ean %2$s etan itxiko da</string>
     <string name="editor_place_doesnt_exist_description">Deskribatu nolakoa den lekua orain OpenStreetMap komunitateari errore-ohar bat bidaltzeko.</string>
+    <string name="offline_explanation_title">Lineaz kanpoko mapak</string>
 </resources>

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>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
@@ -21,9 +21,9 @@
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <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>
+    <string name="search_map">جستجوی نقشه</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">سرویس موقعیت مکانی شما غیر فعال است. لطفا جهت کارکرد صحیح نرم افزار آن را فعال کنید.</string>
+    <string name="location_is_disabled_long_text">هم‌اینک، شما همه‌ی سامانه‌های گیاگ‌یابی را برای این دستگاه یا این برنامه ناکارا کرده‌اید. خواهشمند است آن را در پیکربندی‌ها کارا کنید.</string>
     <!-- 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 -->

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

@@ -296,7 +296,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Ota sijaintipalvelut käyttöön</string>
     <string name="save">Tallenna</string>
-    <string name="create">luo</string>
+    <string name="create">Luo</string>
     <!-- red color -->
     <string name="red">Punainen</string>
     <!-- yellow color -->
@@ -523,7 +523,7 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Haluatko lähettää sen kaikille käyttäjille?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Varmista, ettet ole syöttänyt yksityisiä tai henkilökohtaisia tietoja</string>
+    <string name="editor_share_to_all_dialog_message_1">Varmista, ettet syöttänyt henkilökohtaisia tietojasi.</string>
     <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</string>
     <string name="navigation_stop_button">Lopeta</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -894,12 +894,13 @@
     <string name="avoid_paved">Vältä päällystettyjä teitä</string>
     <string name="opens_at">Avautuu %s</string>
     <string name="closes_at">Sulkeutuu %s</string>
-    <string name="opens_day_at">Avautuu %1$s klo %2$s</string>
-    <string name="closes_day_at">Sulkeutuu %1$s klo %2$s</string>
+    <string name="opens_day_at">Avautuu %1$sna klo %2$s</string>
+    <string name="closes_day_at">Sulkeutuu %1$sna klo %2$s</string>
     <plurals name="minutes_short">
         <item quantity="one">%d min</item>
         <item quantity="other">%d min</item>
     </plurals>
     <string name="editor_submit">Lähetä</string>
     <string name="list_description_empty">Muokkaa listaa lisätäksesi kuvauksen</string>
+    <string name="editor_business_vacant_button">Liike on tyhjillään</string>
 </resources>

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

@@ -139,4 +139,126 @@
     <string name="self_service">Samoposluživanje</string>
     <string name="panoramax">Panoramax slika</string>
     <string name="saved">Spremljeno</string>
+    <string name="disconnect_usb_cable">Isključite USB kabel ili umetnite memorijsku karticu za korištenje CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Prvo oslobodite prostor na SD kartici/USB memoriji kako biste mogli koristiti aplikaciju</string>
+    <string name="download_resources">Prije nego što počnete koristiti aplikaciju, preuzmite općenitu kartu svijeta na svoj uređaj.\nZauzeti će %s prostora za pohranu.</string>
+    <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Sada možete\nnastaviti na kartu.</string>
+    <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
+    <string name="add_new_set">Dodaj novu Listu</string>
+    <string name="bookmark_set_name">Označi naziv Liste</string>
+    <string name="bookmarks">Oznake</string>
+    <string name="bookmarks_and_tracks">Oznake i Rute</string>
+    <string name="maps_storage">Spremi karte u</string>
+    <string name="maps_storage_summary">Odaberite mapu u koju želite spremiti karte</string>
+    <string name="maps_storage_downloaded">Preuzete karte</string>
+    <string name="maps_storage_free_size">%1$s slobodno od %2$s</string>
+    <string name="move_maps">Premjesti karte?</string>
+    <string name="move_maps_error">Greška prilikom premještanja datoteka karte</string>
+    <string name="wait_several_minutes">Ovo može potrajati nekoliko minuta.\nMolimo pričekajte…</string>
+    <string name="measurement_units">Mjerne jedinice</string>
+    <string name="measurement_units_summary">Odaberite milje ili kilometre</string>
+    <string name="category_eat">Gdje jesti</string>
+    <string name="category_food">Namirnice</string>
+    <string name="category_transport">Prijevoz</string>
+    <string name="category_fuel">Benzinske stanice</string>
+    <string name="category_shopping">Kupovina</string>
+    <string name="category_secondhand">Rabljena roba</string>
+    <string name="category_tourism">Znamenitosti</string>
+    <string name="category_entertainment">Zabava</string>
+    <string name="category_atm">Bankomat</string>
+    <string name="category_nightlife">Noćni život</string>
+    <string name="category_children">Obiteljski praznici</string>
+    <string name="category_bank">Banka</string>
+    <string name="category_pharmacy">Ljekarna</string>
+    <string name="category_police">Policija</string>
+    <string name="category_water">Voda</string>
+    <string name="category_rv">Objekti za kampere</string>
+    <string name="share_bookmarks_email_subject">CoMaps Oznake su podijeljene s vama</string>
+    <string name="share_bookmarks_email_body">Pozdrav!\n\nU privitku su moje oznake; otvorite ih u CoMaps aplikaciji. Ukoliko ju nemate instaliranu, možete ju preuzeti ovdje: https://www.comaps.app/download/\n\nUživajte u putovanju s CoMapsima!</string>
+    <string name="load_kmz_title">Učitavam Oznake</string>
+    <string name="load_kmz_successful">Oznake su uspješno učitane! Možete ih pronaći na karti ili na zaslonu Upravitelja Oznaka.</string>
+    <string name="load_kmz_failed">Učitavanje Oznaka nije uspjelo. Datoteka je možda oštećena ili neispravna.</string>
+    <string name="unknown_file_type">Aplikacija ne prepoznaje tip datoteke:\n%1$s</string>
+    <string name="failed_to_open_file">Nije moguće otvoriti datoteku %1$s\n \n%2$s</string>
+    <string name="unknown_current_position">Vaša lokacija još nije utvrđena</string>
+    <string name="cant_change_this_setting">Žao nam je, postavke Pohrane karata trenutno su onemogućene</string>
+    <string name="downloading_is_active">Preuzimanje karte je trenutno u tijeku</string>
+    <string name="my_position_share_sms">Pogledajte moju trenutnu lokaciju u CoMapsu! %1$s ili %2$s Nemate offline karte? Preuzmite ih ovdje: https://www.comaps.app/download/</string>
+    <string name="bookmark_share_email_subject">Hej, pogledaj moju oznaku u CoMapsu!</string>
+    <string name="my_position_share_email_subject">Hej, pogledaj moju trenutnu lokaciju na CoMaps karti!</string>
+    <string name="my_position_share_email">Bok,\n\nSada sam ovdje: %1$s. Kliknite na ovu %2$s ili ovu %3$s poveznicu da biste vidjeli lokaciju na karti.\n\nHvala.</string>
+    <string name="copied_to_clipboard">Kopirano u međuspremnik: %s</string>
+    <string name="data_version">OpenStreetMap podaci: %s</string>
+    <string name="tracks_title">Rute</string>
+    <string name="category_hotel">hotel</string>
+    <string name="category_toilet">WC</string>
+    <string name="track_recording">Snimanje Rute</string>
+    <string name="bookmarks_import">Uvoz Oznaka i Ruta</string>
+    <plurals name="tracks">
+        <item quantity="one">%d ruta</item>
+        <item quantity="few">%d rute</item>
+        <item quantity="other">%d ruta</item>
+    </plurals>
+    <string name="bookmarks_export">Izvoz svih Oznaka i Ruta</string>
+    <string name="start_track_recording">Snimi Rutu</string>
+    <string name="stop_track_recording">Zaustavi snimanje Rute</string>
+    <string name="track_recording_alert_title">Spremi u Oznake i Rute?</string>
+    <string name="track_recording_toast_nothing_to_save">Ruta je prazna - nema ništa za spremiti</string>
+    <string name="edit_track">Izmijeni Rutu</string>
+    <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
+    <string name="share_track">Podijeli Rutu</string>
+    <string name="placepage_edit_bookmark_button">Uredi Oznaku</string>
+    <string name="bookmark_lists_hide_all">Sakrij sve</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%d Oznaka</item>
+        <item quantity="few">%d Oznake</item>
+        <item quantity="other">%d Oznaka</item>
+    </plurals>
+    <string name="bookmarks_create_new_group">Kreiraj novu Listu</string>
+    <string name="bookmarks_error_message_share_general">Nije moguće podijeliti zbog greške u aplikaciji</string>
+    <string name="bookmarks_error_message_share_empty">Nije moguće dijeliti praznu Lista</string>
+    <string name="bookmarks_error_title_empty_list_name">Naziv ne može biti prazan</string>
+    <string name="bookmarks_error_message_empty_list_name">Molimo unesite naziv Liste</string>
+    <string name="bookmarks_new_list_hint">Nova Lista</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Taj naziv je već zauzet</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
+    <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
+    <string name="bookmarks_empty_list_message">Za dodavanje Oznake dotaknite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
+    <string name="sort_bookmarks">Sortiraj Oznake</string>
+    <string name="bookmark_color">Boja Oznake</string>
+    <string name="share_my_location">Podijeli moju lokaciju</string>
+    <string name="pref_zoom_title">Gumbi za zumiranje</string>
+    <string name="pref_map_3d_title">Pogled iz perspektive</string>
+    <string name="pref_map_3d_buildings_title">3D zgrade</string>
+    <string name="pref_tts_enable_title">Glasovne najave</string>
+    <string name="pref_tts_street_names_title">Najavi nazive ulica</string>
+    <string name="pref_tts_street_names_description">Kada je omogućeno, naziv ulice ili izlaza gdje koji treba skrenuti bit će izgovoren naglas.</string>
+    <string name="pref_tts_language_title">Jezik glasovnih najava</string>
+    <string name="pref_tts_test_voice_title">Testiranje glasovnih najava</string>
+    <string name="pref_tts_playing_test_voice">Provjerite glasnoću ili sistemske postavke za pretvaranje teksta u govor ako sada ne čujete glas</string>
+    <string name="pref_tts_unavailable">Nije dostupno</string>
+    <string name="pref_map_auto_zoom">Automatsko zumiranje</string>
+    <string name="search_show_on_map">Prikaži na karti</string>
+    <string name="feedback">Povratne informacije</string>
+    <string name="faq">Često postavljana pitanja</string>
+    <string name="how_to_support_us">Volontiraj i poboljšaj CoMaps</string>
+    <string name="compass_calibration_recommended">Poboljšajte preciznost pokazivača smjera gibanja kruženjem telefona u obliku osmice kako biste kalibrirali kompas.</string>
+    <string name="compass_calibration_required">Pomičite telefon u obliku figure osmice kako biste kalibrirali kompas i popravili strelicu indikatora smjera na karti.</string>
+    <string name="long_tap_toast">Ponovno dugo dodirnite kartu da biste prikazali sučelje</string>
+    <string name="downloader_update_all_button">Ažuriraj sve</string>
+    <string name="downloader_cancel_all">Otkaži sve</string>
+    <string name="downloader_near_me_subtitle">U mojoj blizini</string>
+    <string name="downloader_download_all_button">Preuzmi sve</string>
+    <string name="downloader_delete_map_while_routing_dialog">Za brisanje karte, molimo prvo zaustavite navigaciju</string>
+    <string name="routing_failed_cross_mwm_building">Rute se mogu kreirati samo ako su u potpunosti unutar karte jedne regije.</string>
+    <string name="downloader_download_map">Preuzmi kartu</string>
+    <string name="downloader_delete_map">Obriši kartu</string>
+    <string name="downloader_update_map">Ažuriraj kartu</string>
+    <string name="dialog_routing_select_closer_end">Molimo odaberite odredišnu točku koja se nalazi bliže cesti</string>
+    <string name="dialog_routing_change_intermediate">Nije moguće pronaći međutočku</string>
+    <string name="dialog_routing_intermediate_not_determined">Molimo prilagodite svoju međutočku</string>
+    <string name="dialog_routing_system_error">Sistemska greška</string>
+    <string name="dialog_routing_application_error">Nije moguće napraviti rutu zbog greške u aplikaciji</string>
+    <string name="dialog_routing_try_again">Pokušajte ponovno</string>
 </resources>

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

@@ -163,7 +163,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono al momento disabilitate</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Lo scaricamento della mappa è in corso</string>
+    <string name="downloading_is_active">Scaricamento mappa in corso</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Guarda la mia posizione in CoMaps! %1$s o %2$s Non hai scaricato l\'app? La puoi scaricare da qui: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -219,7 +219,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Prova le indicazioni vocali</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se ora non senti la voce</string>
+    <string name="pref_tts_playing_test_voice">Controlla il volume o le impostazioni del sistema di sintesi vocale se non senti la voce</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Non disponibile</string>
     <string name="pref_map_auto_zoom">Zoom automatico</string>
@@ -291,7 +291,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Abilita i servizi di localizzazione</string>
     <string name="save">Salva</string>
-    <string name="create">crea</string>
+    <string name="create">Crea</string>
     <!-- red color -->
     <string name="red">Rosso</string>
     <!-- yellow color -->
@@ -872,7 +872,7 @@
     <string name="delete_track_dialog_title">Eliminare %s?</string>
     <string name="pref_tts_no_system_tts_short">Motore testo - parlato non trovato, controlla le impostazioni dell\'app</string>
     <string name="avoid_steps">Evita scale</string>
-    <string name="unknown_power_output">sconosciuto</string>
+    <string name="unknown_power_output">Sconosciuto</string>
     <string name="charge_socket_type2">Tipo 2 (senza cavo)</string>
     <string name="charge_socket_type2_cable">Tipo 2 (con cavo)</string>
     <string name="charge_socket_type1">Tipo 1</string>
@@ -896,4 +896,6 @@
     <string name="editor_submit">Conferma</string>
     <string name="charge_socket_chademo">CHAdeMO</string>
     <string name="avoid_paved">Evita le strade asfaltate</string>
+    <string name="charge_socket_schuko">Domestico EU</string>
+    <string name="power_management">Risparmio energetico</string>
 </resources>

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

@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Dehweles</string>
+    <string name="cancel">Hedhi</string>
+    <string name="delete">Dilea</string>
+    <string name="download_maps">Iskarga Mappys</string>
+    <string name="kilometres">Kilometrow</string>
+    <string name="miles">Mildiryow</string>
+    <string name="later">Wosa henna</string>
+    <string name="search">Hwilas</string>
+    <string name="search_map">Hwilas Mappa</string>
+    <string name="limited_accuracy">Kewerder Strothys</string>
+    <string name="zoom_to_country">Diskwedhes war dhe mappa</string>
+    <string name="try_again">Assayewgh Arta</string>
+    <string name="about_menu_title">A-dro CoMaps</string>
+    <string name="about_proposition_3">• Dhywarlinen, uskis ha kesstrothys</string>
+    <string name="location_settings">Settyansow GPS</string>
+    <string name="close">Degea</string>
+    <string name="download">Iskarga</string>
+    <string name="download_resources_continue">Mos yn dhe Mappa</string>
+    <string name="download_country_ask">Iskarga %1$s? (%2$s)</string>
+    <string name="update_country_ask">Nowedhi %1$s? (%2$s)</string>
+    <string name="pause">Powes</string>
+    <string name="continue_button">Pesyewgh</string>
+    <string name="bookmarks">Lyververkys</string>
+    <string name="bookmarks_and_tracks">Lyververkys ha Lerghow</string>
+    <string name="name">Hanow</string>
+    <string name="address">Trigva</string>
+    <string name="list">Rol</string>
+    <string name="settings">Settyansow</string>
+    <string name="move_maps">Gwaya mappys?</string>
+    <string name="measurement_units">Systemow musurans</string>
+    <string name="measurement_units_summary">Dewis yntra mildiryow ha kilometrow</string>
+    <string name="category_food">Gwara boos</string>
+    <string name="category_transport">Karyans</string>
+    <string name="category_fuel">Petrol</string>
+    <string name="category_parking">Parkyans</string>
+    <string name="category_hotel">Ostel</string>
+    <string name="category_tourism">Tornyaseth</string>
+    <string name="category_entertainment">Didhan</string>
+    <string name="category_atm">Toll y\'n fos</string>
+    <string name="category_children">Dy\'gol teylu</string>
+    <string name="category_bank">Arghanti</string>
+    <string name="category_pharmacy">Ferylva</string>
+    <string name="category_hospital">Klavji</string>
+    <string name="category_toilet">Attesva</string>
+    <string name="category_post">Post</string>
+    <string name="category_police">Kreslu</string>
+    <string name="category_recycling">Eylgylghyans</string>
+    <string name="category_water">Dowr</string>
+    <string name="category_rv">Komodytys Karavans</string>
+    <string name="description">Notennow</string>
+    <string name="load_kmz_title">Ow Karga Lyververkys</string>
+    <string name="bookmark_share_email_subject">Dydh da, checkyewgh ow pynn yn CoMaps!</string>
+    <string name="my_position_share_email_subject">Dydh da, checkyewgh ow tyller a\'n jydh war an mappa CoMaps!</string>
+    <string name="share">Kevrenna</string>
+    <string name="email">Ebost</string>
+    <string name="done">Gwrys</string>
+    <string name="data_version">Data OpenStreetMap: %s</string>
+    <string name="tracks_title">Lerghow</string>
+    <string name="length">Hys</string>
+    <string name="share_my_location">Kevrennewgh Ow Tyller</string>
+    <string name="prefs_group_general">Settyansow mayni</string>
+    <string name="prefs_group_information">Kedhlow</string>
+    <string name="prefs_group_route">Navygacyon</string>
+    <string name="pref_zoom_summary">Displetya war an mappa</string>
+    <string name="pref_map_style_title">Fordh Nos</string>
+    <string name="auto">Awtomatek</string>
+    <string name="pref_map_3d_title">Gwel gemusur</string>
+    <string name="pref_map_3d_buildings_title">Drehevyansow lymnys tri</string>
+    <string name="pref_tts_enable_title">Danvonadow dre lev</string>
+    <string name="pref_tts_street_names_title">Deklarya Henwyn Stretow</string>
+    <string name="pref_tts_language_title">Tavas Lev</string>
+    <string name="pref_tts_test_voice_title">Prov Tuyow Dre Lev</string>
+    <string name="pref_tts_unavailable">Nakavadow</string>
+    <string name="search_show_on_map">Gweles war mappa</string>
+    <string name="menu">Rol</string>
+    <string name="website">Gwiasva</string>
+    <string name="news">Nowodhow</string>
+    <string name="panoramax">Imach Panoramax</string>
+    <string name="feedback">Dasliv</string>
+    <string name="rate_the_app">Breusyans an app</string>
+    <string name="help">Gweres</string>
+    <string name="faq">Govynnow Kemmyn</string>
+    <string name="donate">Argevri</string>
+    <string name="copyright">Gwirbryntyan</string>
+    <string name="report_a_bug">Reportya unn kudyn</string>
+    <string name="downloader_update_all_button">Nowedhi Oll</string>
+    <string name="downloader_cancel_all">Dilea Oll</string>
+    <string name="downloader_near_me_subtitle">Dhe dhorn</string>
+    <string name="downloader_status_maps">Mappys</string>
+    <string name="downloader_download_all_button">Iskarga Oll</string>
+    <string name="downloader_download_map">Iskarga mappa</string>
+    <string name="downloader_retry">Hwilewgh arta</string>
+    <string name="downloader_delete_map">Dilea Mappa</string>
+    <string name="downloader_update_map">Nowedhi Mappa</string>
+    <string name="google_play_services">Servis GPS gans Google</string>
+    <string name="routing_not_enough_space">Nyns eus lowr dalghuster</string>
+    <string name="enable_location_services">Gallosegi Servisyow GPS mar pleg</string>
+    <string name="create">Gul</string>
+    <string name="red">Rudh</string>
+    <string name="yellow">Melyn</string>
+    <string name="blue">Blou</string>
+    <string name="green">Gwyrdh</string>
+    <string name="purple">Purpur</string>
+    <string name="orange">Melynrudh</string>
+    <string name="brown">Godhlos</string>
+    <string name="pink">Kigliw</string>
+    <string name="deep_purple">Rudhlas</string>
+    <string name="light_blue">Glaswyn</string>
+    <string name="teal">Gwerlas</string>
+    <string name="lime">Gwerwyn</string>
+    <string name="deep_orange">Rudhvelyn</string>
+    <string name="gray">Loos</string>
+    <string name="blue_gray">Glas</string>
+    <string name="dialog_routing_check_gps">Checkya sinell GPS</string>
+    <string name="dialog_routing_location_turn_on">Gallosegi servisyow GPS</string>
+    <string name="dialog_routing_change_end">Desedha destnans</string>
+    <string name="dialog_routing_system_error">Error gans an kevreyth</string>
+    <string name="dialog_routing_try_again">Assayewgh arta mar pleg</string>
+    <string name="not_now">Na Vynnav Lemmyn</string>
+    <string name="search_select_map">Dewis Mappa</string>
+    <string name="show">Showya</string>
+    <string name="hide">Kudha</string>
+    <string name="categories">Klassow</string>
+    <string name="history">Istori</string>
+    <string name="search_history_title">Istori Hwilas</string>
+    <string name="clear_search">Dilea Istori Hwilas</string>
+    <string name="read_in_wikipedia">Wikipedya</string>
+    <string name="wikimedia_commons">Wikimedia Commons</string>
+    <string name="p2p_your_location">Agas Tyller</string>
+    <string name="p2p_start">Dalleth</string>
+    <string name="next_button">Nessa</string>
+    <string name="editor_time_add">Addya Rol Vetyansow</string>
+    <string name="editor_time_delete">Dilea Rol Vetyansow</string>
+    <string name="editor_time_allday">Dres an Jorna (24 ourys)</string>
+    <string name="editor_time_open">Ygor</string>
+    <string name="editor_time_close">Deges</string>
+    <string name="editor_time_add_closed">Addya Ourys Nanegys</string>
+    <string name="editor_time_title">Ourys Negys</string>
+    <string name="editor_time_advanced">Fordh Avonsys</string>
+    <string name="editor_time_simple">Fordh Sempel</string>
+    <string name="editor_hours_closed">Ourys Nanegys</string>
+    <string name="editor_correct_mistake">Ewna kammgemeryans</string>
+    <string name="editor_add_select_location">Dewis Tyller</string>
+    <string name="editor_report_problem_send_button">Danvon</string>
+    <string name="editor_report_problem_title">Kudyn</string>
+    <string name="daily">Dedhyek</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Deges hedhyw</string>
+    <string name="day_off">Deges</string>
+    <string name="closed">Deges</string>
+    <string name="edit_opening_hours">Golegi ourys negys</string>
+    <string name="no_osm_account">Vyth akont OpenStreetMap?</string>
+    <string name="register_at_openstreetmap">Kovskrifa orth OpenStreetMap</string>
+    <string name="login">Omgelmi</string>
+    <string name="login_osm">Omgelmi dhe OpenStreetMap</string>
+    <string name="logout">Omdenna</string>
+    <string name="edit_place">Golegi Le</string>
+    <string name="add_language">Addya unn tavas</string>
+    <string name="street">Stret</string>
+    <string name="house_number">Niver drehevyans</string>
+    <string name="details">Manylyon</string>
+    <string name="social_media">Media Socyal</string>
+    <string name="building">Drehevyans</string>
+    <string name="add_street">Addya unn stret</string>
+    <string name="empty_street_name_error">Ynworra unn hanow street mar pleg</string>
+    <string name="choose_language">Dewis unn tavas</string>
+    <string name="choose_street">Dewis unn stret</string>
+    <string name="editor_add_phone">Addya Niver Fon</string>
+    <string name="level">Leur</string>
+    <string name="level_value_generic">Leur: %s</string>
+    <string name="downloader_update_maps">Nowedhi Mappys</string>
+    <string name="downloader_search_field_hint">Kavos mappa</string>
+    <string name="editor_login_error_dialog">Error dres omgelmi</string>
+    <string name="editor_edit_place_name_hint">Hanow a an le</string>
+    <string name="editor_default_language_hint">Dell yw skrifys yn an tavas teythiek</string>
+    <string name="editor_edit_place_category_title">Klass</string>
+    <string name="detailed_problem_description">Deskrifans manylys a an kudyn</string>
+    <string name="editor_report_problem_other_title">Kudyn dyffrans</string>
+    <string name="download_over_mobile_header">Iskarga dres unn kevren klapkodh?</string>
+    <string name="error_enter_correct_house_number">Ynworra unn niver trigva ewn</string>
+    <string name="editor_building_levels">Leur (ow komprehendya leur a-woles, a-der to)</string>
+    <string name="editor_zip_code">Kod Post</string>
+    <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
+    <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
+    <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
+    <string name="editor_osm_history">Agas istori golegi</string>
+    <string name="editor_osm_notes">Agas notennow mappow</string>
+    <string name="editor_operator">Oberador</string>
+    <string name="operator">Oberador: %s</string>
+    <string name="kilometers_per_hour">kdo</string>
+    <string name="miles_per_hour">mdo</string>
+    <string name="hour">o</string>
+    <string name="minute">mynysen</string>
+    <string name="placepage_more_button">Moy</string>
+    <string name="placepage_edit_bookmark_button">Pennskrifa Lyververk</string>
+    <string name="placepage_personal_notes_hint">Notennow privedh (tekst bo html)</string>
+    <string name="editor_reset_edits_message">Dilea oll chanjyow dhywarlinen?</string>
+    <string name="editor_reset_edits_button">Dilea</string>
+    <string name="editor_remove_place_message">Dilea le keworrys?</string>
+    <string name="editor_remove_place_button">Dilea</string>
+    <string name="editor_place_doesnt_exist">Le na eksistya</string>
+    <string name="delete_place_empty_comment_error">Provia an acheson rag dilea an le mar pleg</string>
+    <string name="editor_business_vacant_button">Negys usi gwag</string>
+    <string name="editor_mark_business_vacant_title">Sin negys dell gwag</string>
+    <string name="editor_submit">Danvon</string>
+    <string name="error_enter_correct_phone">Ynworra unn niver fon ewn</string>
+    <string name="error_enter_correct_web">Ynworra unn trigva gwiasva ewn</string>
+    <string name="error_enter_correct_email">Ynworra unn trigva ebost ewn</string>
+    <string name="editor_level">Leur (0 usi leur a-woles)</string>
+    <string name="error_enter_correct_level">Ynworra unn niver leur ewn</string>
+    <string name="error_enter_correct_facebook_page">Ynworra unn trigva Lyverenep, akont, bo hanow folen ewn</string>
+    <string name="error_enter_correct_instagram_page">Ynworra unn hanow usyer Instagram bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_twitter_page">Ynworra unn hanow usyer Twytter bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_vk_page">Ynworra unn hanow usyer VK bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_line_page">Ynworra unn ID LINE bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_fediverse_page">Ynworra unn hanow usyer Mastodon bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_bluesky_page">Ynworra unn hanow usyer Bluesky bo trigva gwiasva ewn</string>
+    <string name="placepage_add_place_button">Addya Le dhe OpenStreetMap</string>
+    <string name="osm_note_hint">Bo, yn tereylys, skrifa unn noten dhe kemeneth OpenStreetMap, ha orth nebonan yll addya bo ewnhe unn le omma.</string>
+    <string name="osm_note_toast">Noten a vydh danvon dhe OpenStreetMap</string>
+    <string name="editor_share_to_all_dialog_title">A vynn\'ta mos danvon dhe oll usyoryon?</string>
+    <string name="navigation_stop_button">Hedhi</string>
+    <string name="track_recording">Y\'n eur ma rekordya an lergh</string>
+    <string name="accept">Amyttya</string>
+    <string name="decline">Nagha</string>
+    <string name="mobile_data_option_today">Unn Hedhyw</string>
+    <string name="traffic_update_app">Nowedhi CoMaps mar pleg</string>
+    <string name="feedback_general">Dasliv Mayni</string>
+    <string name="learn_more">Dyski moy</string>
+    <string name="button_plan">Devisya</string>
+    <string name="placepage_remove_stop">Dilea Powes</string>
+    <string name="placepage_add_stop">Addya Powes</string>
+    <string name="error_enter_correct_name">Ynworra unn hanow ewn mar pleg</string>
+    <string name="bookmark_lists">Rolyow</string>
+    <string name="bookmark_lists_hide_all">Keles oll</string>
+    <string name="bookmark_lists_show_all">Diskwedhes oll</string>
+    <string name="bookmarks_create_new_group">Gul unn rol nowydh</string>
+    <string name="bookmarks_import">Ynperthi Lyververkys ha Lerghow</string>
+    <string name="bookmarks_error_message_empty_list_name">Ynworra an hanow rol mar pleg</string>
+    <string name="bookmarks_new_list_hint">Rol nowydh</string>
+    <string name="bookmarks_error_title_list_name_already_taken">An hanow ma usi seulabrys yn usyans</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Dewis aral hanow mar pleg</string>
+    <string name="please_wait">Gortos mar pleg…</string>
+    <string name="phone_number">Niver fon</string>
+    <string name="profile">Akont OpenStreetMap</string>
+    <string name="restore">Astiveri</string>
+    <string name="privacy">Privetter</string>
+    <string name="privacy_policy">Polici privetter</string>
+    <string name="power_management">Dyghtyans batri</string>
+    <string name="terms_of_use">Termys usadow</string>
+    <string name="button_layer_traffic">Data daromdak</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Gisyow ha gwiskasow mappow</string>
+    <string name="bookmarks_empty_list_title">An rol ma usi gwag</string>
+    <string name="category_desc_more">…moy</string>
+    <string name="export_file">Esperthi KMZ</string>
+    <string name="export_file_gpx">Esperthi GPX</string>
+    <string name="delete_list">Dilea rol</string>
+    <string name="speedcams_alert_title">Kameras finweth tooth</string>
+    <string name="place_description_title">Deskrifans Le</string>
+    <string name="pref_tts_speedcams_auto">Gwarnya a tothya</string>
+    <string name="define_to_avoid_btn">Styrya fordhow rag avodya</string>
+    <string name="toll_road">Tollfordh</string>
+    <string name="unpaved_road">Fordh dor</string>
+    <string name="ferry_crossing">Kowbalhyns</string>
+    <string name="yes">Ya</string>
+    <string name="no">Na</string>
+    <string name="yes_available">Ya</string>
+    <string name="no_available">Na</string>
+    <string name="capacity">Dalghuster: %s</string>
+    <string name="network">Rosweyth: %s</string>
+    <string name="trip_finished">Hwi re wrug!</string>
+    <string name="ok">Da lowr</string>
+    <string name="sort">Sortya…</string>
+    <string name="sort_bookmarks">Sortya lyververkys</string>
+    <string name="by_default">Dre defowt</string>
+    <string name="by_type">Dre eghen</string>
+    <string name="by_distance">Dre pellder</string>
+    <string name="by_date">Dre dydh</string>
+    <string name="by_name">Dre hanow</string>
+    <string name="near_me_sorttype">Dhe dhorn</string>
+    <string name="others_sorttype">Re erel</string>
+    <string name="food_places">Boos</string>
+    <string name="tourist_places">Tornyaseth</string>
+    <string name="museums">Gwithtiow</string>
+    <string name="parks">Parkow</string>
+    <string name="swim_places">Neuvya</string>
+    <string name="mountains">Menydhyow</string>
+    <string name="animals">Bestes</string>
+    <string name="hotels">Ostelyow</string>
+    <string name="buildings">Drehevyansow</string>
+    <string name="money">Mona</string>
+    <string name="shops">Gwerthjiow</string>
+    <string name="parkings">Parkyans</string>
+    <string name="fuel_places">Petrolva</string>
+    <string name="medicine">Medhegneth</string>
+    <string name="search_in_the_list">Hwilas yn an rol</string>
+    <string name="religious_places">Leow kryjyk</string>
+    <string name="select_list">Dewis rol</string>
+    <string name="transit_not_found">Navygacyon metro yn an pow ma usi nakavadow hwath</string>
+    <string name="button_layer_isolines">Linen kettres</string>
+    <string name="elevation_profile_min_elevation">Ughelder ispoyntel</string>
+    <string name="elevation_profile_max_elevation">Ughelder ughboyntel</string>
+    <string name="elevation_profile_difficulty">Kaletter</string>
+    <string name="elevation_profile_distance">Pellder:</string>
+    <string name="elevation_profile_time">Prys:</string>
+    <string name="isolines_toast_zooms_1_10">Moghhe dhe furya linen kettres</string>
+    <string name="download_map_title">Iskarga an mappa bys simpel</string>
+    <string name="disk_error_title">Error plasen</string>
+    <string name="connection_failure">Defowt kevren</string>
+    <string name="change_map_locale">Tavas mappow</string>
+    <string name="splash_subtitle">Data mappow a OpenStreetMap</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
+    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
+    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
+    <string name="app_tip_01">Gans agas argevrohow ha skoodhyans, ni a yll gul an mappys an gwella yn an Nor!</string>
+    <string name="app_tip_02">Yw da genes a\'gan app? Argevri mar pleg dhe skoodhya an displegyans! Yw na da genes a\'n hwath? Mar pleg, kedhlewgh dhyn prag ha ni a ewnhe a\'n!</string>
+    <string name="app_tip_06">Hwi a yll gweres treylya a\'gan app yn agas tavas.</string>
+    <string name="aa_connected_title">Dha vos lemmyn rosweythys dhe Android Auto</string>
+    <string name="aa_grant_permissions">Grontya grontys</string>
+    <string name="button_layer_outdoor">Yn-mes</string>
+    <string name="browser_not_available">Peurell nakavadow</string>
+    <string name="volume">Ughelder</string>
+    <string name="bookmarks_export">Esperthi oll Lyververkys ha Lerghow</string>
+    <string name="clear_the_search">Dilea an hwithrans</string>
+    <string name="zoom_in">Moghhe</string>
+    <string name="zoom_out">Lehe</string>
+    <string name="website_menu">Kevren Rol Voos</string>
+    <string name="view_menu">Vu Rol Voos</string>
+    <string name="open_in_app">Ygeri yn Aral App</string>
+    <string name="select_option">Dewis dewis</string>
+    <string name="outdoor_seating">Esedhow yn-mes</string>
+    <string name="start_track_recording">Rekordya Lergh</string>
+    <string name="choose_color">Dewis Kolor</string>
+    <string name="edit_track">Golegi Lergh</string>
+    <string name="nav_auto">Awtomatek yn navygacyon</string>
+    <string name="pref_left_button_title">Boton kledh dewisyow</string>
+    <string name="backup_interval_every_day">Dedhyek</string>
+    <string name="backup_interval_every_week">Seythennyek</string>
+    <string name="clear">Dilea</string>
+    <string name="vehicle">Karr</string>
+    <string name="pedestrian">Kerdher</string>
+    <string name="bicycle">Diwros</string>
+    <string name="ruler">Rewlell</string>
+    <string name="bookmark_color">Kolor lyververk</string>
+    <string name="about_help">A-dro ha Gweres</string>
+    <string name="share_track">Kevren Lergh</string>
+    <string name="delete_track_dialog_title">Dilea %s?</string>
+    <string name="unknown_power_output">ankoth</string>
+    <string name="charge_socket_type2">Eghen diw (na fun)</string>
+    <string name="charge_socket_type2_cable">Eghen diw (gans fun)</string>
+    <string name="charge_socket_type2_combo">Eghen diw kesunyans</string>
+    <string name="charge_socket_type1">Eghen unn</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="charge_socket_schuko">Unyans Europek a-bervedh</string>
+    <string name="unknown_socket_type">ankoth kraw</string>
+    <string name="edit_socket_info_tooltip">Gul krawyow nowydh bo golegi krowyow a‑lemmyn.</string>
+    <string name="charging_station_available_sockets">Krawyow kavadow</string>
+    <string name="charge_socket_unknown_other">Aral bo anokth</string>
+    <string name="charge_socket_count">Somm</string>
+    <string name="charge_socket_power">Gallosedh (kW)</string>
+    <string name="editor_socket">Golegi kraw</string>
+    <string name="unknown_count">ankoth</string>
+    <string name="error_value_must_be_positive">Res an niver positiv</string>
+    <string name="error_invalid_number">Niver anewn</string>
+    <string name="offline_explanation_title">Mappys Dhywarlinen</string>
+</resources>

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

@@ -281,7 +281,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Įjunkite vietovės tarnybas</string>
     <string name="save">Įrašyti</string>
-    <string name="create">kurti</string>
+    <string name="create">Kurti</string>
     <!-- red color -->
     <string name="red">Raudonas</string>
     <!-- yellow color -->
@@ -401,8 +401,8 @@
     <string name="twentyfour_seven">24×7</string>
     <string name="day_off_today">Šiandien uždaryta</string>
     <string name="day_off">Uždaryta</string>
-    <string name="opens_in">Atsidaro už %s</string>
-    <string name="closes_in">Užsidaro už %s</string>
+    <string name="opens_in">Atidaroma už %s</string>
+    <string name="closes_in">Uždaroma už %s</string>
     <string name="closed">Uždaryta</string>
     <string name="edit_opening_hours">Taisyti darbo valandas</string>
     <string name="no_osm_account">Neturite „OpenStreetMap“ paskyros?</string>
@@ -510,8 +510,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Ar tikrai norite šiuos pakeitimus paviešinti?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Įsitikinkite, kad neįvedėte jokių asmeninių duomenų</string>
-    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų</string>
+    <string name="editor_share_to_all_dialog_message_1">Įsitikinkite, kad neįvedėte jokių asmeninių duomenų.</string>
+    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktoriai peržiūrės pakeitimus ir su jumis susisieks, jei kiltų klausimų.</string>
     <string name="navigation_stop_button">Stabdyti</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Trasa įrašoma</string>
@@ -870,4 +870,22 @@
     <string name="error_invalid_number">Netinkamas skaičius</string>
     <string name="offline_explanation_title">Žemėlapio parsisiuntimas</string>
     <string name="offline_explanation_text">Kad galėtumėte matyti šios vietovės žemėlapį ir planuoti jame keliones, pirma turite jį atsiųsti.</string>
+    <string name="avoid_paved">Vengti grįstų kelių</string>
+    <string name="opens_at">Atidaroma %s</string>
+    <string name="closes_at">Uždaroma %s</string>
+    <string name="opens_day_at">Atidaroma %1$s , %2$s</string>
+    <string name="closes_day_at">Uždaroma %1$s, %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min.</item>
+        <item quantity="few">%d min.</item>
+        <item quantity="many">%d min.</item>
+        <item quantity="other">%d min.</item>
+    </plurals>
+    <string name="editor_business_vacant_button">Erdvė nenaudojama</string>
+    <string name="editor_mark_business_vacant_title">Pažymėti erdvę kaip nenaudojamą</string>
+    <string name="editor_mark_business_vacant_description">Pasinaudokite šia funkcija, jei šioje erdvėje buvusi įmonė ar įstaiga išsikėlė ir ši erdvė dabar nenaudojama.</string>
+    <string name="editor_submit">Pateikti</string>
+    <string name="power_management">Energijos naudojimas</string>
+    <string name="charge_socket_schuko">Buitinis ES</string>
+    <string name="list_description_empty">Paredaguokite sąrašą ir pridėkite aprašymą</string>
 </resources>

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

@@ -896,4 +896,7 @@
     <string name="editor_submit">Send</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Strømstyring</string>
+    <string name="navigation_start_tts_disabled_message">Taleveiledninger deaktivert: TTS-motor ikke tilgjengelig</string>
+    <string name="navigation_start_tts_message">"Starter navigering, taleveiledningsspråk: "</string>
+    <string name="prefs_speed_cameras_information">Fotoboksvarsler er deaktivert i land hvor varsler er forbudt i henhold til lokal lovgivning.</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <style name="MwmTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
-    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
     <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
     <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
     <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
@@ -88,19 +88,19 @@
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
     <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
     <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.Body2</item>
+    <item name="fontButton">@style/TextAppearance.Button</item>
+    <item name="fontCaption">@style/TextAppearance.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/white_secondary</item>
@@ -111,7 +111,7 @@
     <item name="elevationProfileSelectedPointTriangle">@drawable/ic_ascent</item>
     <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation</item>
     <item name="elevationProfileColor">@color/elevation_profile</item>
-    <item name="android:popupMenuStyle">@style/PopupMenu</item>
+    <item name="android:popupMenuStyle">@style/Widget.Material3.PopupMenu</item>
 
     <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>

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

@@ -907,4 +907,7 @@
     <string name="editor_mark_business_vacant_description">Gebruik dit als het bedrijf is verhuisd en de ruimte leeg is en klaar is voor een nieuwe huurder.</string>
     <string name="power_management">Energiebeheer</string>
     <string name="charge_socket_schuko">Binnenlandse EU</string>
+    <string name="navigation_start_tts_message">"Navigatie starten, taal voor steminstructie: "</string>
+    <string name="prefs_speed_cameras_information">Waarschuwingen voor flitsers zijn uitgeschakeld in landen waar deze wettelijk zijn verboden.</string>
+    <string name="navigation_start_tts_disabled_message">Spraakinstructies uitgeschakeld: TTS-engine niet beschikbaar</string>
 </resources>

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

@@ -915,4 +915,7 @@
     <string name="pref_tts_no_system_tts_short">Nie znaleziono silnika text-to-speech, sprawdź ustawienia aplikacji</string>
     <string name="list_description_empty">Edytuj listę, aby dodać opis</string>
     <string name="editor_submit">Wyślij</string>
+    <string name="prefs_speed_cameras_information">Ostrzeżenia o fotoradarach są wyłączone w krajach, gdzie takie alerty są zabronione prawnie.</string>
+    <string name="navigation_start_tts_message">"Startowanie nawigacji, język komunikatów głosowych: "</string>
+    <string name="navigation_start_tts_disabled_message">Komunikaty głosowe są wyłączone: silnik TTS jest niedostępny</string>
 </resources>

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

@@ -631,4 +631,12 @@
     <string name="bicycle">Kolo</string>
     <string name="unknown_power_output">neznano</string>
     <string name="ruler">Ravnilo</string>
+    <string name="opens_at">Odpre se ob %s</string>
+    <string name="closes_at">Zapre se ob %s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="two">%d min</item>
+        <item quantity="few">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
 </resources>

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

@@ -510,8 +510,8 @@
     <string name="placepage_more_button">更多</string>
     <string name="placepage_edit_bookmark_button">编辑书签</string>
     <string name="placepage_personal_notes_hint">个人注记（文字或 html）</string>
-    <string name="editor_reset_edits_message">重置所有本地更改？</string>
-    <string name="editor_reset_edits_button">重置</string>
+    <string name="editor_reset_edits_message">舍弃所有本地更改？</string>
+    <string name="editor_reset_edits_button">舍弃</string>
     <string name="editor_remove_place_message">删除已添加的地点？</string>
     <string name="editor_remove_place_button">删除</string>
     <string name="editor_place_doesnt_exist">该地点不存在</string>
@@ -907,4 +907,9 @@
     <string name="editor_mark_business_vacant_description">如果商铺已搬离且场地空置待租，请使用此选项。</string>
     <string name="editor_submit">提交</string>
     <string name="avoid_paved">避开铺装道路</string>
+    <string name="power_management">电源管理</string>
+    <string name="charge_socket_schuko">欧盟标准</string>
+    <string name="navigation_start_tts_message">"启动导航，语音指令语言： "</string>
+    <string name="prefs_speed_cameras_information">在当地法律禁止发出警报的国家/地区，测速摄像头警告功能将被禁用。</string>
+    <string name="navigation_start_tts_disabled_message">语音指令已禁用：TTS 引擎不可用</string>
 </resources>

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

@@ -100,7 +100,7 @@
 
   <!-- Nav menu -->
   <dimen name="nav_elevation">6dp</dimen>
-  <dimen name="nav_street_height">44dp</dimen>
+  <dimen name="nav_street_height">50dp</dimen>
   <dimen name="nav_street_left">100dp</dimen>
   <dimen name="nav_next_turn_frame">88dp</dimen>
   <dimen name="nav_next_turn_top">8dp</dimen>
@@ -130,7 +130,6 @@
   <!-- Editor -->
   <dimen name="editor_height_days">72dp</dimen>
   <dimen name="editor_height_closed">72dp</dimen>
-  <dimen name="editor_height_allday">56dp</dimen>
   <dimen name="editor_height_field">64dp</dimen>
   <dimen name="editor_margin_left">56dp</dimen>
   <dimen name="editor_auth_btn_height">@dimen/primary_button_min_height</dimen>

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

@@ -23,6 +23,7 @@
   <string name="pref_tts_info" translatable="false">TtsInfo</string>
   <string name="pref_tts_info_link" translatable="false">TtsInfoLink</string>
   <string name="pref_tts_speed_cameras" translatable="false">SpeedCameras</string>
+  <string name="pref_tts_speed_cameras_info" translatable="false">SpeedCamerasInfo</string>
   <string name="prefs_routing" translatable="false">RoutingOptions</string>
   <string name="pref_autodownload" translatable="false">AutoDownloadMap</string>
   <string name="pref_3d" translatable="false">3D</string>

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

@@ -573,6 +573,16 @@
     <string name="error_enter_correct_fediverse_page">Enter a valid Mastodon username or web address</string>
     <string name="error_enter_correct_bluesky_page">Enter a valid Bluesky username or web address</string>
     <string name="placepage_add_place_button">Add Place to OpenStreetMap</string>
+    <!-- Title of info shown when the map is older than 3 to 6 months -->
+    <string name="place_page_map_too_old_title">Map data outdated</string>
+    <!-- Description of info shown when the map is older than 3 months -->
+    <string name="place_page_map_too_old_description"> Your current map data is very old, please update the map.</string>
+    <!-- Description of info shown when the app and the map are older than 6 months -->
+    <string name="place_page_app_too_old_description"> Your current map data is very old, please update the CoMaps app.</string>
+    <!-- Button to update map region, part of the map too old info -->
+    <string name="place_page_update_too_old_map">Update map region</string>
+    <!-- Toast shown after pressing add place / edit OpenStreetMap when editing is disabled -->
+    <string name="place_page_too_old_to_edit">OpenStreetMap editing is disabled because the map data is too old.</string>
     <string name="osm_note_hint">Or, alternatively, leave a note to OpenStreetMap community so that someone else can add or fix a place here.</string>
     <string name="osm_note_toast">Note will be sent to OpenStreetMap</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
@@ -609,6 +619,7 @@
 \nOpen your device\'s settings → Language and input → Speech → Text to speech output.
 \nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine.</string>
     <string name="prefs_languages_information_off_link">For more information please check this guide</string>
+    <string name="prefs_speed_cameras_information">Speed camera warnings are disabled in countries where alerts are prohibited by local law.</string>
     <string name="transliteration_title">Transliterate into Latin alphabet</string>
     <string name="learn_more">Learn more</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -932,6 +943,8 @@
     <string name="share_track">Share Track</string>
     <string name="delete_track_dialog_title">Delete %s?</string>
     <string name="pref_tts_no_system_tts_short">No text-to-speech engine found, check the app settings</string>
+    <string name="navigation_start_tts_message">"Starting Navigation, voice instruction language: "</string>
+    <string name="navigation_start_tts_disabled_message">"Voice instructions disabled: TTS engine not available"</string>
     <string name="unknown_power_output">unknown</string>
     <string name="charge_socket_type2">Type 2 (no cable)</string>
     <string name="charge_socket_type2_cable">Type 2 (w/ cable)</string>

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

@@ -6,11 +6,6 @@
     <item name="android:textStyle">normal</item>
   </style>
 
-  <style name="MwmTextAppearance.Display1">
-    <item name="android:textSize">@dimen/text_size_display_1</item>
-    <item name="android:textColor">?android:textColorPrimary</item>
-  </style>
-
   <style name="MwmTextAppearance.Title">
     <item name="android:textSize">@dimen/text_size_title</item>
     <item name="android:textColor">?android:textColorPrimary</item>
@@ -190,91 +185,91 @@
     <item name="android:textColor">@color/white_secondary</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline1"
-    parent="TextAppearance.MaterialComponents.Headline1">
+  <style name="TextAppearance.Headline1"
+    parent="TextAppearance.Material3.DisplayLarge">
     <item name="fontFamily">@string/robotoLight</item>
     <item name="android:fontFamily">@string/robotoLight</item>
     <item name="android:textSize">96sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline2"
-    parent="TextAppearance.MaterialComponents.Headline2">
+  <style name="TextAppearance.Headline2"
+    parent="TextAppearance.Material3.DisplayLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">60sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline3"
-    parent="TextAppearance.MaterialComponents.Headline3">
+  <style name="TextAppearance.Headline3"
+    parent="TextAppearance.Material3.DisplayMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">48sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline4"
-    parent="TextAppearance.MaterialComponents.Headline4">
+  <style name="TextAppearance.Headline4"
+    parent="TextAppearance.Material3.HeadlineLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">34sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline5"
-    parent="TextAppearance.MaterialComponents.Headline5">
+  <style name="TextAppearance.Headline5"
+    parent="TextAppearance.Material3.HeadlineMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">24sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline6"
-    parent="TextAppearance.MaterialComponents.Headline6">
+  <style name="TextAppearance.Headline6"
+    parent="TextAppearance.Material3.HeadlineSmall">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">20sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Subtitle1"
-    parent="TextAppearance.MaterialComponents.Subtitle1">
+  <style name="TextAppearance.Subtitle1"
+    parent="TextAppearance.Material3.TitleMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">16sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Subtitle2"
-    parent="TextAppearance.MaterialComponents.Subtitle2">
+  <style name="TextAppearance.Subtitle2"
+    parent="TextAppearance.Material3.TitleSmall">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">14sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Body1"
-    parent="TextAppearance.MaterialComponents.Body1">
+  <style name="TextAppearance.Body1"
+    parent="TextAppearance.Material3.BodyLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">16sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Body2"
-    parent="TextAppearance.MaterialComponents.Body2">
+  <style name="TextAppearance.Body2"
+    parent="TextAppearance.Material3.BodyMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">14sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Button"
+  <style name="TextAppearance.Button"
     parent="TextAppearance.MaterialComponents.Button">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">14sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Caption"
-    parent="TextAppearance.MaterialComponents.Caption">
+  <style name="TextAppearance.Caption"
+    parent="TextAppearance.Material3.LabelMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">12sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Overline"
+  <style name="TextAppearance.Overline"
     parent="TextAppearance.MaterialComponents.Overline">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>

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

@@ -139,12 +139,13 @@
     <item name="cornerSize">50%</item>
   </style>
 
-  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.Material3.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarStyle" parent="Widget.Material3.Toolbar">
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
     <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
     <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="buttonGravity">center_vertical</item>
   </style>
 
   <style name="MwmWidget.ToolbarStyle.Light">
@@ -364,23 +365,13 @@
     <item name="behavior_hideable">false</item>
   </style>
 
-  <style name="FAB" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
+  <style name="MwmWidget.ExtendedFAB" parent="Widget.Material3.ExtendedFloatingActionButton.Primary">
     <item name="android:minHeight">30dp</item>
-    <item name="android:minWidth">30dp</item>
-    <item name="android:paddingTop">7dp</item>
-    <item name="android:paddingBottom">7dp</item>
-    <item name="android:paddingStart">12dp</item>
-    <item name="android:paddingEnd">12dp</item>
-    <item name="android:paddingLeft">12dp</item>
-    <item name="android:paddingRight">12dp</item>
     <item name="iconPadding">4dp</item>
     <item name="iconSize">20dp</item>
     <item name="iconTint">?accentButtonTextColor</item>
     <item name="android:textColor">?accentButtonTextColor</item>
     <item name="backgroundTint">?colorSecondary</item>
-    <item name="android:textSize">14sp</item>
-    <item name="textAllCaps">false</item>
-    <item name="android:textAllCaps">false</item>
   </style>
 
   <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">

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

@@ -93,19 +93,19 @@
     <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
     <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
     <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
     <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.Body2</item>
+    <item name="fontButton">@style/TextAppearance.Button</item>
+    <item name="fontCaption">@style/TextAppearance.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/black_secondary</item>
@@ -116,7 +116,7 @@
     <item name="elevationProfileSelectedPointTriangle">@drawable/ic_ascent</item>
     <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation</item>
     <item name="elevationProfileColor">@color/elevation_profile</item>
-    <item name="android:popupMenuStyle">@style/PopupMenu</item>
+    <item name="android:popupMenuStyle">@style/Widget.Material3.PopupMenu</item>
 
     <!-- Style used for bottom sheet behavior components -->
     <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>

android/app/src/main/res/xml/prefs_voice_instructions.xml

@@ -57,4 +57,11 @@
       android:entryValues="@array/speed_cameras_values"
       android:defaultValue="@string/auto_enum_value"
       app:iconSpaceReserved="false" />
+  <Preference
+      android:enabled="true"
+      android:key="@string/pref_tts_info_link"
+      android:persistent="false"
+      android:selectable="false"
+      android:summary="@string/prefs_speed_cameras_information"
+      app:iconSpaceReserved="false" />
 </androidx.preference.PreferenceScreen>

android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java

@@ -1,6 +1,7 @@
 package app.organicmaps.sdk.sound;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.os.Bundle;
@@ -9,11 +10,14 @@ import android.os.Looper;
 import android.provider.Settings;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
+import android.speech.tts.Voice;
 import android.text.TextUtils;
 import android.util.Pair;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import androidx.core.os.ConfigurationCompat;
+import androidx.core.os.LocaleListCompat;
 import androidx.media.AudioAttributesCompat;
 import androidx.media.AudioFocusRequestCompat;
 import androidx.media.AudioManagerCompat;
@@ -23,6 +27,7 @@ import app.organicmaps.sdk.util.log.Logger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 /**
  * {@code TtsPlayer} class manages available TTS voice languages.
@@ -33,9 +38,9 @@ import java.util.Locale;
  * unsupported voices are excluded.
  * <p>
  * At startup we check whether currently selected language is in our list of supported voices and its data is
- * downloaded. If not, we check system default locale. If failed, the same check is made for English language. Finally,
- * if mentioned checks fail we manually disable TTS, so the user must go to the settings and select preferred voice
- * language by hand. <p> If no core supported languages can be used by the system, TTS is locked down and can not be
+ * downloaded. If not, we check system default locale. If failed, the same check is made for other system locales.
+ * If those fail too, we check for English language. Then, as a final resort, all installed TTS locales are checked.
+ * <p> If no core supported languages can be used by the system, TTS is locked down and can not be
  * enabled and used.
  */
 public enum TtsPlayer
@@ -78,6 +83,8 @@ public enum TtsPlayer
   // TTS is locked down due to absence of supported languages
   private boolean mUnavailable;
 
+  private LocaleListCompat mInstalledSystemLocales;
+
   TtsPlayer() {}
 
   private static @Nullable LanguageData findSupportedLanguage(String internalCode, List<LanguageData> langs)
@@ -126,28 +133,57 @@ public enum TtsPlayer
     return (lang != null && setLanguageInternal(lang));
   }
 
-  private static @Nullable LanguageData getDefaultLanguage(List<LanguageData> langs)
+  public static @Nullable LanguageData getSelectedLanguage(List<LanguageData> langs)
+  {
+    return findSupportedLanguage(Config.TTS.getLanguage(), langs);
+  }
+
+  private @Nullable LanguageData getSystemLanguage(List<LanguageData> langs)
   {
     LanguageData res;
 
+    // Try default system locale
     Locale defLocale = Locale.getDefault();
-    if (defLocale != null)
+    res = findSupportedLanguage(defLocale, langs);
+    if (res != null && res.downloaded)
+      return res;
+
+    // Try other installed system locales
+    for (int i = 0; i < mInstalledSystemLocales.size(); i++)
     {
-      res = findSupportedLanguage(defLocale, langs);
+      Locale loc = mInstalledSystemLocales.get(i);
+      res = findSupportedLanguage(loc, langs);
+      if (res != null && res.downloaded)
+        return res;
+    }
+    return null;
+  }
+
+  private @Nullable LanguageData getTTSLanguage(List<LanguageData> langs)
+  {
+    LanguageData res;
+
+    // Try all TTS installed languages
+    Set<Locale> ttsLocales = mTts.getAvailableLanguages();
+    for (Locale loc : ttsLocales)
+    {
+      res = findSupportedLanguage(loc, langs);
       if (res != null && res.downloaded)
         return res;
     }
 
-    res = findSupportedLanguage(DEFAULT_LOCALE, langs);
-    if (res != null && res.downloaded)
-      return res;
-
     return null;
   }
 
-  public static @Nullable LanguageData getSelectedLanguage(List<LanguageData> langs)
+  private static @Nullable LanguageData getDefaultLanguage(List<LanguageData> langs)
   {
-    return findSupportedLanguage(Config.TTS.getLanguage(), langs);
+    LanguageData res;
+
+    // Try default app locale (en.US)
+    res = findSupportedLanguage(DEFAULT_LOCALE, langs);
+    if (res != null && res.downloaded)
+      return res;
+    return null;
   }
 
   private void lockDown()
@@ -167,6 +203,10 @@ public enum TtsPlayer
     // TextToSpeech.OnInitListener() can be called from a non-main thread
     // on LineageOS '20.0-20231127-RELEASE-thyme' 'Xiaomi/thyme/thyme'.
     // https://github.com/organicmaps/organicmaps/issues/6903
+
+    Configuration config = context.getResources().getConfiguration();
+    mInstalledSystemLocales = ConfigurationCompat.getLocales(config);
+
     mTts = new TextToSpeech(context, status -> UiThread.run(() -> {
       if (status == TextToSpeech.ERROR)
       {
@@ -239,6 +279,20 @@ public enum TtsPlayer
     return (INSTANCE.mTts != null && !INSTANCE.mUnavailable && !INSTANCE.mInitializing);
   }
 
+  public Locale getVoiceLocale()
+  {
+    if (INSTANCE.mTts == null)
+      return null;
+    Voice voice = INSTANCE.mTts.getVoice();
+    return voice != null ? voice.getLocale() : null;
+  }
+
+  public String getLanguageDisplayName()
+  {
+    Locale locale = getVoiceLocale();
+    return locale != null ? locale.getDisplayName(locale) : null;
+  }
+
   public void speak(String textToSpeak)
   {
     if (Config.TTS.isEnabled())
@@ -328,24 +382,49 @@ public enum TtsPlayer
 
     if (outList.isEmpty())
     {
-      // No supported languages found, lock down TTS :(
+      Logger.d("TtsPlayer", "No supported languages found, lock down TTS :( ");
       lockDown();
       return null;
     }
 
     LanguageData res = getSelectedLanguage(outList);
-    if (res == null || !res.downloaded)
-      // Selected locale is not available or not downloaded
-      res = getDefaultLanguage(outList);
-
-    if (res == null || !res.downloaded)
+    if (res != null && res.downloaded)
     {
-      // Default locale can not be used too
-      Config.TTS.setEnabled(false);
-      return null;
+      Logger.d("TtsPlayer", "Selected locale " + res.internalCode + " will be used for TTS");
+      return res;
+    }
+    Logger.d("TtsPlayer", "Selected locale " + Config.TTS.getLanguage()
+                              + " is not available or not downloaded, trying system locales...");
+
+    res = getSystemLanguage(outList);
+    if (res != null && res.downloaded)
+    {
+      Logger.d("TtsPlayer", "System locale " + res.internalCode + " will be used for TTS");
+      return res;
+    }
+    Logger.d("TtsPlayer",
+             "None of the system locales are available, or they are not downloaded, trying default locale...");
+
+    res = getDefaultLanguage(outList);
+    if (res != null && res.downloaded)
+    {
+      Logger.d("TtsPlayer", "Default locale " + res.internalCode + " will be used for TTS");
+      return res;
+    }
+    Logger.d("TtsPlayer",
+             "Default locale " + DEFAULT_LOCALE + " can not be used either, trying all installed TTS locales...");
+
+    res = getTTSLanguage(outList);
+    if (res != null && res.downloaded)
+    {
+      Logger.d("TtsPlayer", "TTS locale " + res.internalCode + " will be used for TTS");
+      return res;
     }
 
-    return res;
+    Logger.d("TtsPlayer",
+             "None of the TTS engine locales are available, or they are not downloaded, disabling TTS :( ");
+    Config.TTS.setEnabled(false);
+    return null;
   }
 
   public @NonNull List<LanguageData> refreshLanguages()

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

@@ -36,6 +36,7 @@ public final class Config
   private static final String KEY_PREF_USE_GS = "UseGoogleServices";
 
   private static final String KEY_MISC_DISCLAIMER_ACCEPTED = "IsDisclaimerApproved";
+  private static final String KEY_MISC_TTS_MESSAGE_DELIVERED = "TtsMessageDelivered";
   private static final String KEY_MISC_LOCATION_REQUESTED = "LocationRequested";
   private static final String KEY_MISC_USE_MOBILE_DATA = "UseMobileData";
   private static final String KEY_MISC_USE_MOBILE_DATA_TIMESTAMP = "UseMobileDataTimestamp";
@@ -237,6 +238,16 @@ public final class Config
     setBool(KEY_MISC_DISCLAIMER_ACCEPTED);
   }
 
+  public static boolean isTtsMessageDelivered()
+  {
+    return getBool(KEY_MISC_TTS_MESSAGE_DELIVERED);
+  }
+
+  public static void setTtsMessageDelivered()
+  {
+    setBool(KEY_MISC_TTS_MESSAGE_DELIVERED);
+  }
+
   public static boolean isLocationRequested()
   {
     return getBool(KEY_MISC_LOCATION_REQUESTED);

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

@@ -228,7 +228,7 @@
     <string name="type.emergency.mountain_rescue">Estació de rescat de muntanya</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Entrada principal</string>
-    <string name="type.entrance.exit">Sortida</string>
+    <string name="type.entrance.exit">Sortida (únicament)</string>
     <string name="type.fee.no">Gratuït</string>
     <!-- SECTION: Types: Roads -->
     <string name="type.highway.busway">Carretera dedicada a l\'autobús</string>
@@ -962,7 +962,7 @@
     <string name="type.place.suburb">Suburbi</string>
     <string name="type.place.state.USA">Estat</string>
     <string name="type.power.line">Línia elèctrica</string>
-    <string name="type.amenity.studio">Estudi</string>
+    <string name="type.amenity.studio">Estudi Media</string>
     <string name="type.barrier.guard_rail">Barrera de seguretat</string>
     <string name="type.leisure.hackerspace">Hacklab</string>
     <string name="type.amenity.bicycle_parking.covered">Aparcament de bicicletes cobert</string>
@@ -1031,4 +1031,77 @@
     <string name="type.area_highway.footway">Sender</string>
     <string name="type.area_highway.pedestrian">Carrer de vianants</string>
     <string name="type.area_highway.residential">Carrer residencial</string>
+    <string name="type.amenity.bench.backless">Banc sense respatller</string>
+    <string name="type.amenity.boat_rental">Lloguer de vaixells</string>
+    <string name="type.amenity.love_hotel">Hotel d\'Amor</string>
+    <string name="type.man_made.telescope">Telescopi</string>
+    <string name="type.man_made.telescope.optical">Telescopi (Òptic)</string>
+    <string name="type.man_made.telescope.radio">Telescopi (Ràdio)</string>
+    <string name="type.man_made.telescope.gamma">Telescopi (Gamma)</string>
+    <string name="type.man_made.observatory">Observatori</string>
+    <string name="type.amenity.charging_station.motorcar.small">Punt de Càrrega de Cotxes</string>
+    <string name="type.amenity.sailing_school">Escola de Navegació</string>
+    <string name="type.amenity.flight_school">Escola de Vol</string>
+    <string name="type.amenity.prep_school">Escola Preparatòria</string>
+    <string name="type.office.security">Oficina de Guàrdies de Seguretat</string>
+    <string name="type.building.guardhouse">Cabina de Seguretat</string>
+    <string name="type.amenity.lounger">Hamaca</string>
+    <string name="type.amenity.mobile_money_agent">Agència d\'efectiu mòbil</string>
+    <string name="type.amenity.car_pooling">Punt de Vehicle Compartit</string>
+    <string name="type.amenity.payment_centre">Centre de pagaments</string>
+    <string name="type.post_office.post_partner">Associat de correu</string>
+    <string name="type.barrier.wicket_gate">Portell</string>
+    <string name="type.craft.metal_construction">Metal·listeria</string>
+    <string name="type.cuisine.beef_bowl">Gyūdon</string>
+    <string name="type.cuisine.diner">Sopar</string>
+    <string name="type.cuisine.fine_dining">Alta cuina</string>
+    <string name="type.emergency.access_point">Punt de rescat d\'emergència</string>
+    <string name="type.emergency.life_ring">Salvavides</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marca cardinal</string>
+    <string name="type.beacon.isolated_danger">Marca de perill aïllat</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.beacon.lateral.starboard">Marca lateral</string>
+    <string name="type.beacon.safe_water">Marca d\'aigües navegables</string>
+    <string name="type.beacon.special_purpose">Marca especial</string>
+    <string name="type.buoy.cardinal.east">Boia cardinal</string>
+    <string name="type.buoy.cardinal.north">Boia cardinal</string>
+    <string name="type.buoy.cardinal.south">Boia cardinal</string>
+    <string name="type.buoy.cardinal.west">Boia cardinal</string>
+    <string name="type.buoy.isolated_danger">Boia de perill aïllat</string>
+    <string name="type.buoy.lateral.port">Boia lateral</string>
+    <string name="type.buoy.lateral.starboard">Boia lateral</string>
+    <string name="type.buoy.safe_water">Boia d\'aigües navegables</string>
+    <string name="type.buoy.special_purpose">Boia d\'ús especial</string>
+    <string name="type.spherical_buoy.cardinal.east">Boia cardinal esfèrica</string>
+    <string name="type.spherical_buoy.cardinal.north">Boia cardinal esfèrica</string>
+    <string name="type.spherical_buoy.cardinal.south">Boia cardinal esfèrica</string>
+    <string name="type.spherical_buoy.cardinal.west">Boia cardinal esfèrica</string>
+    <string name="type.spherical_buoy.isolated_danger">Boia esfèrica de perill aïllat</string>
+    <string name="type.spherical_buoy.lateral.port">Boia esfèrica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boia esfèrica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boia esfèrica d\'aigües navegables</string>
+    <string name="type.spherical_buoy.special_purpose">Boia esfèrica d\'ús especial</string>
+    <string name="type.lateral.port">Babord</string>
+    <string name="type.lateral.starboard">Estribord</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Sud</string>
+    <string name="type.cardinal.west">Oest</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garatge</string>
+    <string name="type.entrance.service">Entrada de servei</string>
+    <string name="type.entrance.entry">Entrada (únicament)</string>
+    <string name="type.entrance.emergency">Sortida d\'emergència</string>
+    <string name="type.healthcare.sample_collection">Centre de recollida de mostres</string>
+    <string name="type.highway.bridleway">Camí eqüestre</string>
+    <string name="type.highway.bridleway.permissive">Camí eqüestre</string>
+    <string name="type.highway.service.driveway">Via d\'entrada</string>
+    <string name="type.highway.service.parking_aisle">Passadís d\'aparcament</string>
+    <string name="type.area_highway.living_street">Carrer de prioritat peatonal</string>
+    <string name="type.area_highway.service">Via de servei</string>
+    <string name="type.area_highway.track">Pista</string>
+    <string name="type.area_highway.unclassified">Carretera menor</string>
 </resources>

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

@@ -4,4 +4,5 @@
     <string name="type.addr_interpolation.even">Adreso/Kvartalo</string>
     <string name="type.aerialway">Aerovojo</string>
     <string name="type.aerialway.cable_car">Funicularo</string>
+    <string name="type.aeroway.gate">Pordego</string>
 </resources>

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

@@ -127,7 +127,7 @@
     <string name="type.amenity.post_box">Buzón de correos</string>
     <string name="type.amenity.post_office">Oficina de correos</string>
     <string name="type.amenity.prison">Prisión</string>
-    <string name="type.amenity.pub">Pub</string>
+    <string name="type.amenity.pub">Taberna</string>
     <string name="type.amenity.public_bookcase">Intercambio de libros</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro de reciclaje</string>
@@ -360,7 +360,7 @@
     <string name="type.entrance">Entrada</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Entrada principal</string>
-    <string name="type.entrance.exit">Salida</string>
+    <string name="type.entrance.exit">Sólo salida</string>
     <string name="type.fee.no">Gratis</string>
     <string name="type.healthcare.laboratory">Laboratorio médico</string>
     <string name="type.healthcare.physiotherapist">Fisioterapeuta</string>
@@ -477,7 +477,7 @@
     <string name="type.highway.service.area">Vía de servicio</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.service.bridge">Puente</string>
-    <string name="type.highway.service.driveway">Vía de servicio</string>
+    <string name="type.highway.service.driveway">Camino de entrada</string>
     <string name="type.highway.service.parking_aisle">Pasillo de aparcamiento</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.service.tunnel">Túnel</string>
@@ -650,8 +650,8 @@
     <string name="type.leisure.sauna">Sauna</string>
     <string name="type.leisure.slipway">Rampa de barcos</string>
     <string name="type.leisure.sports_centre">Complejo deportivo</string>
-    <string name="type.sport.climbing">Centro de escalada</string>
-    <string name="type.sport.yoga">Centro de yoga</string>
+    <string name="type.sport.climbing">Escalada</string>
+    <string name="type.sport.yoga">Yoga</string>
     <string name="type.leisure.stadium">Estadio</string>
     <string name="type.leisure.swimming_pool">Piscina</string>
     <string name="type.leisure.swimming_pool.private">Piscina privada</string>

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

@@ -601,31 +601,29 @@
     <string name="type.railway.monorail">مونوریل</string>
     <string name="type.railway.rail">راه آهن</string>
     <string name="type.railway.rail.highspeed">راه آهن پرسرعت</string>
-    <string name="type.railway.rail.tourism">راه آهن توریستی</string>
-    <string name="type.railway.rail.main">راه آهن</string>
+    <string name="type.railway.rail.tourism">راه‌آهن گردشگرانه</string>
+    <string name="type.railway.rail.main">راه‌آهن</string>
     <!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
-    <string name="type.railway.rail.branch">راه آهن ثانویه</string>
+    <string name="type.railway.rail.branch">اَزگ راه‌آهن</string>
     <!-- Non-passenger utility tracks: industrial, military, test. -->
-    <string name="type.railway.rail.utility">راه آهن شهری</string>
-    <string name="type.railway.rail.spur">خار راه آهن</string>
-    <!-- Short service tracks: siding, yard, crossover. -->
-    <string name="type.railway.rail.service">ریل کمکی</string>
-    <string name="type.railway.rail.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.highspeed.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.tourism.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.main.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.branch.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.utility.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.spur.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.service.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.highspeed.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.tourism.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.main.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.branch.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.utility.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.spur.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.service.tunnel">تونل راه آهن</string>
+    <string name="type.railway.rail.utility">سامانه راه‌آهن برقی</string>
+    <string name="type.railway.rail.spur">شاخک راه‌آهن</string>
+    <string name="type.railway.rail.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.highspeed.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.tourism.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.main.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.branch.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.utility.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.spur.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.service.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.highspeed.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.tourism.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.main.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.branch.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.utility.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.spur.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.service.tunnel">آهون راه‌آهن</string>
     <string name="type.railway.station">ایستگاه قطار</string>
     <string name="type.railway.station.funicular">فونیکولور</string>
     <string name="type.railway.station.light_rail">ایستگاه قطار</string>
@@ -1071,7 +1069,7 @@
     <string name="type.wheelchair.limited">دسترسی کرانمند با رواگ‌صندلی</string>
     <string name="type.wheelchair.no">بدون دسترسی با صندلی چرخ دار</string>
     <string name="type.wheelchair.yes">دسترسی کامل با صندلی چرخ دار</string>
-    <string name="type.piste_type.snow_park">پارک برفی</string>
+    <string name="type.piste_type.snow_park">بوستان برفی</string>
     <string name="type.piste_type.hike">مسیر پیاده روی برفی</string>
     <string name="type.piste_type.connection">اتصال پیست</string>
     <string name="type.piste_type.skitour">مسیر اسکیتور</string>

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

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.addr_interpolation">Trigva</string>
+    <string name="type.addr_interpolation.even">Trigva</string>
+    <string name="type.addr_interpolation.odd">Trigva</string>
+    <string name="type.aerialway.chair_lift">Kador-yskynna</string>
+    <string name="type.aeroway.aerodrome">Ayrborth</string>
+    <string name="type.aeroway.aerodrome.international">Ayrborth Keswlasek</string>
+    <string name="type.aeroway.apron">Ayrborth Apron</string>
+    <string name="type.aeroway.gate">Ayrborth Porth</string>
+    <string name="type.aeroway.helipad">Le Tirans Askel Dro</string>
+    <string name="type.aeroway.runway">Hyns-tira</string>
+    <string name="type.aeroway.terminal">Termynal</string>
+    <string name="type.amenity.arts_centre">Kresen-art</string>
+    <string name="type.amenity.atm">Toll y\'n Fos</string>
+    <string name="type.amenity.bank">Arghanti</string>
+    <string name="type.amenity.bar">Barr</string>
+    <string name="type.amenity.bbq">Rastella Barbakoa</string>
+    <string name="type.amenity.bench">Form</string>
+    <string name="type.amenity.bicycle_parking">Parkyans Diwros</string>
+    <string name="type.amenity.bicycle_parking.covered">Parkyans Kdhys Diwros</string>
+    <string name="type.amenity.boat_rental">Arveth Skath</string>
+    <string name="type.amenity.bicycle_rental">Arveth Diwros</string>
+    <string name="type.amenity.bicycle_repair_station">Ewnansva Diwros</string>
+    <string name="type.amenity.biergarten">Jardin Korev</string>
+    <string name="type.amenity.brothel">Horji</string>
+    <string name="type.amenity.love_hotel">Ostel Karnal</string>
+    <string name="type.amenity.bureau_de_change">Keschanj Arghansedh</string>
+    <string name="type.amenity.bus_station">Gorsav Kyttrin</string>
+    <string name="type.amenity.cafe">Koffiji</string>
+    <string name="type.amenity.car_rental">Arveth Karr</string>
+    <string name="type.amenity.motorcycle_rental">Arveth Jynn Diwros</string>
+    <string name="type.amenity.car_wash">Golghva Gerri</string>
+    <string name="type.man_made.telescope">Pellweler</string>
+    <string name="type.man_made.telescope.radio">Pellweler (Radyo)</string>
+    <string name="type.man_made.observatory">Mirji</string>
+    <string name="type.amenity.childcare">Skol-veythrin</string>
+    <string name="type.amenity.cinema">Cinema</string>
+    <string name="type.amenity.studio">Studhla Media</string>
+    <string name="type.amenity.clinic">Medhegva</string>
+    <string name="type.amenity.college">Kolji</string>
+    <string name="type.amenity.community_centre">Kresen Gemeneth</string>
+    <string name="type.amenity.conference_centre">Kresen Keskussulyans</string>
+    <string name="type.amenity.courthouse">Stevel an Lys</string>
+    <string name="type.amenity.dentist">Medhek Dens</string>
+    <string name="type.amenity.doctors">Medhek</string>
+    <string name="type.amenity.drinking_water">Dowr Evadow</string>
+    <string name="type.drinking_water.yes">Dowr Evadow</string>
+    <string name="type.amenity.exhibition_centre">Kresen Diskwedhyans</string>
+    <string name="type.amenity.money_transfer">Treusworrans Mona</string>
+    <string name="type.amenity.music_school">Skol-ilowek</string>
+    <string name="type.amenity.flight_school">Skol Ayr</string>
+    <string name="type.amenity.language_school">Skol Tavas</string>
+    <string name="type.office.diplomatic">Kanatti</string>
+    <string name="type.office.security">Buro Gwithyas Diogeledh</string>
+    <string name="type.building.guardhouse">Borth Gwithyas Diogeledh</string>
+    <string name="type.power.portal">Portal Tredan</string>
+    <string name="type.amenity.fast_food">Boos Uskis</string>
+    <string name="type.amenity.ferry_terminal">Kowbal</string>
+    <string name="type.amenity.fire_station">Tanlu</string>
+    <string name="type.amenity.fountain">Fenten</string>
+    <string name="type.amenity.fuel">Petrolva</string>
+    <string name="type.amenity.grave_yard">Bedhros</string>
+    <string name="type.amenity.grave_yard.christian">Bedhros Kristyon</string>
+    <string name="type.amenity.hospital">Klavji</string>
+    <string name="type.amenity.ice_cream">Dehen Rew</string>
+    <string name="type.amenity.internet_cafe">Koffiji Kesrosweyth</string>
+    <string name="type.amenity.kindergarten">Floghva</string>
+    <string name="type.amenity.library">Lyverva</string>
+    <string name="type.amenity.loading_dock">Kay Dalgarga</string>
+    <string name="type.amenity.luggage_locker">Amari Fardellow</string>
+    <string name="type.amenity.marketplace">Tyller Marghas</string>
+    <string name="type.amenity.motorcycle_parking">Parkyans Jynn Diwros</string>
+    <string name="type.amenity.nightclub">Kist Nos</string>
+    <string name="type.amenity.parking">Parkyans</string>
+    <string name="type.amenity.parking.fee">Parkyans</string>
+    <string name="type.amenity.parking.multi.storey">Parkyans Liesleur</string>
+    <string name="type.amenity.parking.multi.storey.fee">Parkyans Liesleur</string>
+    <string name="type.amenity.parking.no.access">Parkyans Privedh</string>
+    <string name="type.amenity.parking.permissive">Parkyans Privedh</string>
+    <string name="type.amenity.parking.private">Parkyans Privedh</string>
+    <string name="type.amenity.parking.park_and_ride">Parkyans Parkya hag Ehwias</string>
+    <string name="type.amenity.parking.underground">Parkyans yn-dann dhor</string>
+    <string name="type.amenity.parking.underground.fee">Parkyans yn-dann dhor</string>
+    <string name="type.amenity.parking.underground.private">Parkyans privedh yn-dann dhor</string>
+    <string name="type.amenity.parking_entrance">Entrans Parkyans</string>
+    <string name="type.amenity.parking_entrance.private">Entrans Privedh Parkyans</string>
+    <string name="type.amenity.parking_entrance.permissive">Entrans Parkyans</string>
+    <string name="type.amenity.pharmacy">Ferylva</string>
+    <string name="type.amenity.place_of_worship.buddhist">Eglos Teg Bouddiek</string>
+    <string name="type.amenity.place_of_worship.christian">Eglos</string>
+    <string name="type.amenity.place_of_worship.jewish">Synaga</string>
+    <string name="type.amenity.place_of_worship.muslim">Mosk</string>
+    <string name="type.amenity.police">Kreslu</string>
+    <string name="type.amenity.post_office">Chei Post</string>
+    <string name="type.amenity.prison">Prison</string>
+    <string name="type.amenity.pub">Barr</string>
+    <string name="type.amenity.public_bookcase">Keschanj Lyver</string>
+    <string name="type.amenity.recycling.centre">Kresen Eylgylghyans</string>
+    <string name="type.amenity.recycling">Kofen Eylgylghyans</string>
+    <string name="type.amenity.recycling.container">Kofen Eylgylghyans</string>
+    <string name="type.recycling.batteries">Batriow</string>
+    <string name="type.recycling.clothes">Dillas</string>
+    <string name="type.recycling.glass_bottles">Botellow Gweder</string>
+    <string name="type.recycling.paper">Paper</string>
+    <string name="type.recycling.plastic">Plastek</string>
+    <string name="type.recycling.plastic_bottles">Botellow Plastek</string>
+    <string name="type.recycling.scrap_metal">Wast Alkan</string>
+    <string name="type.recycling.small_appliances">Wast Elektronek</string>
+    <string name="type.recycling.cardboard">Pasbord</string>
+    <string name="type.recycling.cans">Kannys</string>
+    <string name="type.recycling.shoes">Eskisyow</string>
+    <string name="type.recycling.green_waste">Lygennow</string>
+    <string name="type.amenity.restaurant">Bosti</string>
+    <string name="type.amenity.school">Skol</string>
+    <string name="type.amenity.shelter">Skovva</string>
+    <string name="type.amenity.shelter.public_transport">Skovva</string>
+    <string name="type.amenity.public_bath">Bath Poblek</string>
+    <string name="type.amenity.shower">Kowas</string>
+    <string name="type.amenity.telephone">Fon</string>
+    <string name="type.amenity.theatre">Gwariji</string>
+    <string name="type.amenity.toilets">Attesva</string>
+    <string name="type.toilets.yes">Attesva</string>
+    <string name="type.amenity.townhall">Odyans</string>
+    <string name="type.amenity.university">Pennskol</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Jynn Tokyn</string>
+    <string name="type.amenity.parcel_locker">Amari Fardel</string>
+    <string name="type.amenity.vehicle_inspection">Hwithrans Karr</string>
+    <string name="type.amenity.vending_machine.fuel">Pomp Petrol</string>
+    <string name="type.amenity.veterinary">Medhek Bestes</string>
+    <string name="type.amenity.animal_shelter">Gredi</string>
+    <string name="type.amenity.waste_basket">Argh</string>
+    <string name="type.amenity.waste_disposal">Argh Bras</string>
+    <string name="type.barrier">Lett</string>
+    <string name="type.barrier.yes">Lett</string>
+    <string name="type.barrier.block">Stock</string>
+    <string name="type.barrier.border_control">Amalborth</string>
+    <string name="type.barrier.chain">Chayn</string>
+    <string name="type.barrier.city_wall">Fos Cita</string>
+    <string name="type.barrier.cycle_barrier">Lett Diwros</string>
+    <string name="type.waterway.ditch">Kleys</string>
+    <string name="type.barrier.entrance">Entrans</string>
+    <string name="type.barrier.fence">Ke</string>
+    <string name="type.barrier.guard_rail">Kledhren</string>
+    <string name="type.barrier.gate">Porth</string>
+    <string name="type.barrier.hedge">Ke</string>
+    <string name="type.barrier.kissing_gate">Porth Amm</string>
+    <string name="type.barrier.stile">Kammva</string>
+    <string name="type.barrier.wicket_gate">Porth Darasik</string>
+    <string name="type.barrier.toll_booth">Tollva</string>
+    <string name="type.barrier.wall">Fos</string>
+    <string name="type.boundary">Or</string>
+    <string name="type.boundary.administrative">Or Menystrek</string>
+    <string name="type.boundary.administrative.2">Or Kenedhlegi</string>
+    <string name="type.boundary.administrative.3">Or Ranndirek</string>
+    <string name="type.boundary.administrative.4">Or Ranndirek</string>
+    <string name="type.boundary.national_park">Park Kenedhlek</string>
+    <string name="type.boundary.aboriginal_lands">Tir Teythiek</string>
+    <string name="type.building">Drehevyans</string>
+    <string name="type.building.address">Trigva</string>
+    <string name="type.building.has_parts">Drehevyans</string>
+    <string name="type.building_part">Drehevyans</string>
+    <string name="type.building.garage">Karrji</string>
+    <string name="type.building.train_station">Drehevyans Gorsav</string>
+    <string name="type.building.warehouse">Gwaraji</string>
+    <string name="type.cemetery.grave">Bedh</string>
+    <string name="type.craft">Kreft</string>
+    <string name="type.craft.blacksmith">Ferror</string>
+    <string name="type.craft.carpenter">Karpenter</string>
+    <string name="type.craft.electrician">Tredaner</string>
+    <string name="type.craft.electronics_repair">Ewnans Tredanegek</string>
+    <string name="type.craft.gardener">Lowarther</string>
+    <string name="type.craft.handicraft">Dornweyth</string>
+    <string name="type.craft.metal_construction">Gweythor Alkan</string>
+    <string name="type.craft.painter">Payntyer</string>
+    <string name="type.craft.photographer">Skeusenner</string>
+    <string name="type.shop.camera">Gwerthji Kamera</string>
+    <string name="type.craft.plumber">Plommer</string>
+    <string name="type.craft.shoemaker">Ewnans Eskis</string>
+    <string name="type.craft.winery">Gwinyer</string>
+    <string name="type.craft.tailor">Tregher</string>
+    <string name="type.cuisine.african">afrikan</string>
+    <string name="type.cuisine.american">amerikanek</string>
+    <string name="type.cuisine.arab">arabek</string>
+    <string name="type.cuisine.argentinian">arghantinek</string>
+    <string name="type.cuisine.asian">asiek</string>
+    <string name="type.cuisine.austrian">ostrian</string>
+    <string name="type.cuisine.barbecue">Barbakoa</string>
+    <string name="type.cuisine.beef_bowl">Bolla Bewin</string>
+    <string name="type.cuisine.brazilian">brasiliek</string>
+    <string name="type.cuisine.breakfast">Hansel</string>
+    <string name="type.cuisine.bubble_tea">Te Hwethen</string>
+    <string name="type.cuisine.burger">Borger</string>
+    <string name="type.cuisine.cake">Tesen</string>
+    <string name="type.cuisine.chicken">Kig Yar</string>
+    <string name="type.cuisine.chinese">chinek</string>
+    <string name="type.cuisine.coffee_shop">Koffi</string>
+    <string name="type.cuisine.croatian">kroatek</string>
+    <string name="type.cuisine.curry">Kurri</string>
+    <string name="type.cuisine.donut">Knowen Doos</string>
+    <string name="type.cuisine.ethiopian">ethiopek</string>
+    <string name="type.cuisine.fine_dining">Dybri Brav</string>
+    <string name="type.cuisine.fish">Pysk</string>
+    <string name="type.cuisine.fish_and_chips">Asklotti</string>
+    <string name="type.cuisine.french">frynkek</string>
+    <string name="type.cuisine.georgian">jorjiek</string>
+    <string name="type.cuisine.german">almaynek</string>
+    <string name="type.cuisine.greek">grek</string>
+    <string name="type.cuisine.grill">Rastell</string>
+    <string name="type.cuisine.hungarian">hungarek</string>
+    <string name="type.cuisine.ice_cream">Dehen Rew</string>
+</resources>

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

@@ -210,7 +210,7 @@
     <string name="type.craft.electronics_repair">Reparo de eletrônicos</string>
     <string name="type.craft.grinding_mill">Moinho</string>
     <!-- Heating, Ventilation, and Air Conditioning -->
-    <string name="type.craft.hvac">Aquecimento, Ventilação e Ar Condicionado</string>
+    <string name="type.craft.hvac">Climatização</string>
     <string name="type.craft.key_cutter">Chaveiro</string>
     <string name="type.craft.locksmith">Serralheiro (chave)</string>
     <string name="type.shop.camera">Loja de câmeras</string>
@@ -486,16 +486,16 @@
     <string name="type.area_highway.trunk">Via expressa</string>
     <string name="type.area_highway.unclassified">Estrada sem classificação</string>
     <!-- SECTION: Types: Historic -->
-    <string name="type.historic.aircraft">Aeronaves Históricas</string>
-    <string name="type.historic.anchor">Âncora Histórica</string>
+    <string name="type.historic.aircraft">Aeronave histórica</string>
+    <string name="type.historic.anchor">Âncora histórica</string>
     <string name="type.historic.cannon">Canhão</string>
     <string name="type.historic.citywalls">Muro da cidade</string>
     <string name="type.historic.gallows">Galo</string>
-    <string name="type.historic.locomotive">Locomotiva Histórica</string>
+    <string name="type.historic.locomotive">Locomotiva histórica</string>
     <string name="type.historic.memorial.cross">Cruz de memorial</string>
-    <string name="type.historic.stone">Pedra Histórica</string>
-    <string name="type.historic.mine">Mina Histórica</string>
-    <string name="type.historic.tank">Tanque Histórico</string>
+    <string name="type.historic.stone">Pedra histórica</string>
+    <string name="type.historic.mine">Mina histórica</string>
+    <string name="type.historic.tank">Tanque histórico</string>
     <!-- Usually has no historic and sometimes no religious context. E.g. a mountain summit cross. -->
     <string name="type.man_made.cross">Cruz</string>
     <string name="type.historic.wreck">Naufrágio</string>
@@ -937,7 +937,7 @@
     <string name="type.shop.copyshop">Copiadora</string>
     <string name="type.shop.cosmetics">Loja de cosméticos</string>
     <string name="type.shop.curtain">Loja de cortinas</string>
-    <string name="type.shop.deli">Loja Delicatessen</string>
+    <string name="type.shop.deli">Loja de delicatessen</string>
     <string name="type.shop.department_store">Loja de departamentos</string>
     <string name="type.shop.doityourself">Loja de ferramentas e materiais de bricolagem</string>
     <string name="type.shop.dry_cleaning">Lavagem a seco</string>
@@ -986,7 +986,7 @@
     <string name="type.shop.seafood">Peixaria</string>
     <string name="type.shop.second_hand">Loja de segunda mão</string>
     <string name="type.shop.shoes">Sapataria</string>
-    <string name="type.shop.sports">Loga de artigos esportivos</string>
+    <string name="type.shop.sports">Loja de artigos esportivos</string>
     <string name="type.shop.stationery">Papelaria</string>
     <string name="type.shop.supermarket">Supermercado</string>
     <string name="type.shop.tattoo">Estúdio de tatuagens</string>
@@ -1222,7 +1222,7 @@
     <string name="type.historic.memorial.statue">Estátua</string>
     <string name="type.historic.memorial.war_memorial">Memorial de Guerra</string>
     <string name="type.historic.monument">Monumento</string>
-    <string name="type.historic.ruins">Ruínas Históricas</string>
+    <string name="type.historic.ruins">Ruínas históricas</string>
     <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>
@@ -1238,7 +1238,7 @@
     <string name="type.natural.beach.sand">Praia de areia</string>
     <string name="type.natural.beach.gravel">Praia de cascalho</string>
     <string name="type.natural.cape">Cabo</string>
-    <string name="type.natural.cave_entrance">Entrada da Caverna</string>
+    <string name="type.natural.cave_entrance">Entrada de caverna</string>
     <string name="type.natural.cliff">Penhasco</string>
     <string name="type.natural.earth_bank">Banco de Terras</string>
     <string name="type.man_made.embankment">Aterro</string>
@@ -1431,7 +1431,7 @@
     <string name="type.man_made.telescope.radio">Telescópio (rádio)</string>
     <string name="type.man_made.telescope.gamma">Telescópio (gama)</string>
     <string name="type.man_made.observatory">Observatório</string>
-    <string name="type.amenity.mobile_money_agent">Agente de Mobile Money</string>
+    <string name="type.amenity.mobile_money_agent">Agente mobile money</string>
     <string name="type.amenity.car_pooling">Carona</string>
     <string name="type.amenity.payment_centre">Centro de pagamentos</string>
     <string name="type.leisure.indoor_play">Centro de recreação interno</string>

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

@@ -523,7 +523,7 @@
     <string name="type.area_highway.unclassified">Estrada sem classificação</string>
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Objeto histórico</string>
-    <string name="type.historic.aircraft">Aeronaves Históricas</string>
+    <string name="type.historic.aircraft">Aeronave histórica</string>
     <string name="type.historic.anchor">Âncora Histórica</string>
     <string name="type.historic.archaeological_site">Sítio arqueológico</string>
     <string name="type.historic.battlefield">Campo de batalha</string>
@@ -1153,7 +1153,7 @@
     <string name="type.shop.seafood">Peixaria</string>
     <string name="type.shop.second_hand">Loja de segunda mão</string>
     <string name="type.shop.shoes">Sapataria</string>
-    <string name="type.shop.sports">Loga de artigos desportivos</string>
+    <string name="type.shop.sports">Loja de artigos esportivos</string>
     <string name="type.shop.stationery">Papelaria</string>
     <string name="type.shop.supermarket">Supermercado</string>
     <string name="type.shop.tattoo">Estúdio de tatuagens</string>

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

@@ -333,4 +333,23 @@
     <string name="type.barrier.city_wall">Mestno obzidje</string>
     <string name="type.barrier.swing_gate">Nihajna vrata</string>
     <string name="type.craft.brewery">Obrtna pivovarna</string>
+    <string name="type.craft.grinding_mill">Mlin</string>
+    <string name="type.craft.handicraft">Rokodelstvo</string>
+    <string name="type.craft.locksmith">Ključavničar</string>
+    <string name="type.craft.metal_construction">Kovinar</string>
+    <string name="type.craft.painter">Pleskar</string>
+    <string name="type.craft.carpenter">Tesar</string>
+    <string name="type.craft.confectionery">Slaščičar</string>
+    <string name="type.craft.electrician">Električar</string>
+    <string name="type.craft.photographer">Fotograf</string>
+    <string name="type.craft.sawmill">Žaga</string>
+    <string name="type.craft.shoemaker">Popravilo čevljev</string>
+    <string name="type.craft.winery">Vinarstvo</string>
+    <string name="type.craft.tailor">Krojač</string>
+    <string name="type.cuisine.african">Afriška kuhinja</string>
+    <string name="type.cuisine.american">Ameriška kuhinja</string>
+    <string name="type.cuisine.arab">Arabska kuhinja</string>
+    <string name="type.cuisine.argentinian">Argentinska kuhinja</string>
+    <string name="type.cuisine.asian">Azijska kuhinja</string>
+    <string name="type.cuisine.austrian">Avstrijska kuhinja</string>
 </resources>

data/categories-strings/bg.json/localize.json

@@ -186,7 +186,7 @@
 "place-state": "Щат|провинция",
 "place-region": "Район|Регион",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|окръг|квартал|Предградие",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|окръг|квартал|Предградие|Жилищен комплекс|ж.к.|ЖК",
 "place-hamlet": "Село",
 "place-village": "Село",
 "place-locality": "местност|регион|Място",

data/categories-strings/ca.json/localize.json

@@ -10,7 +10,7 @@
 "@category_entertainment": "Entreteniment",
 "@category_nightlife": "Vida nocturna",
 "@category_children": "Oci familiar",
-"@category_atm": "Caixer automàtic",
+"@category_atm": "3Caixer automàtic|Caixer",
 "@category_rv": "Caravanes|Autocaravana",
 "amenity-atm|@category_atm": "diners",
 "@category_bank": "Banc",
@@ -21,7 +21,7 @@
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "Bar|Taverna",
 "amenity-cafe|@category_eat": "Cafè|Cafeteria",
 "amenity-fast_food|@category_eat": "Menjar ràpid",
-"amenity-restaurant|@category_eat": "Restaurant",
+"amenity-restaurant|@category_eat": "Restaurant|Restaurants",
 "@shop": "Botiga|Tenda",
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "Fleca|Forn de pa",
 "shop-cosmetics|@category_shopping|@shop": "Cosmetics",
@@ -29,14 +29,14 @@
 "shop-hearing_aids|@shop": "Audiòfons",
 "shop-hardware|shop-doityourself|@shop": "Ferreteria",
 "shop-houseware|@shop": "Articles de la llar",
-"shop-jewelry|@category_shopping|@shop": "Joieria",
+"shop-jewelry|@category_shopping|@shop": "Joieria|Joies",
 "amenity-marketplace|@category_food": "Mercat",
 "amenity-money_transfer": "Transferència de diners",
 "shop-clothes|@category_shopping|@shop": "Botiga de roba|Roba",
-"shop-caravan|@category_rv|@shop": "Venda de caravanas|Venda de autocaravanas|Venda de motorhomes",
+"shop-caravan|@category_rv|@shop": "Venda de caravanes|Venda de autocaravanes|Venda de motorhomes",
 "shop-car|@shop": "Venda de cotxes|Concesionari|Concessionari de cotxes",
 "shop-bicycle|@shop": "Botiga de bicicletes|4bicicleta|bici",
-"shop-kiosk": "Quiosc",
+"shop-kiosk": "Quiosc|Papereria",
 "highway-bus_stop|@category_transport": "Parada d'autobús|Parada",
 "railway-tram_stop|@category_transport": "Parada de tramvia|Parada",
 "railway-station-funicular": "Funicular",
@@ -59,7 +59,7 @@
 "@category_post": "Oficina postal",
 "amenity-post_box|@category_post": "Bústia de correus|Bústia",
 "amenity-post_office|post_office-post_partner|@category_post": "Oficina de correus",
-"amenity-vehicle_inspection": "Inspecció de vehicles",
+"amenity-vehicle_inspection": "Inspecció de vehicles|ITV",
 "amenity-shelter": "Refugi",
 "amenity-shelter-basic_hut": "Cabana Bivac",
 "amenity-shelter-lean_to": "Rafal|Refugi",
@@ -102,7 +102,7 @@
 "amenity-parcel_locker|@category_post": "Taquiller de paquets",
 "shop-outpost": "Punt de recollida",
 "building-garage": "Garatge",
-"shop-car_parts|@shop": "Peçes de cotxe",
+"shop-car_parts|@shop": "Peces de cotxe|Recanvis",
 "tourism-chalet|@category_hotel": "Casa rural de vacances",
 "leisure-water_park|@category_tourism|@category_children": "Parc aquàtic",
 "amenity-public_bath": "Bany Públic",
@@ -114,7 +114,7 @@
 "shop-nutrition_supplements|@shop": "Suplements nutricionals",
 "shop-paint|@shop": "Pintures",
 "shop-perfumery|@category_shopping|@shop": "Perfumería",
-"shop-sewing|@shop": "Material de costura|Mercería",
+"shop-sewing|@shop": "Material de costura|Merceria",
 "shop-tobacco|@shop": "Tabac",
 "shop-watches|@category_shopping|@shop": "Rellotger|Rellotgeria",
 "shop-wholesale|@shop": "Magatzem de roba al per major",
@@ -133,7 +133,7 @@
 "amenity-food_court": "Zona de restaurants",
 "shop-curtain|@shop": "Cortines",
 "shop-gas|@shop": "Botiga de gas",
-"shop-pet_grooming": "Peluca de mascotes",
+"shop-pet_grooming": "Perruca de mascotes",
 "shop-hifi|@shop": "Àudio HiFi",
 "amenity-conference_centre": "Centre de conferències",
 "shop-herbalist|@shop": "Botiga d'herbes",
@@ -143,5 +143,6 @@
 "amenity-waste_transfer_station": "Estació de transferència de residus",
 "shop-carpet|@shop": "Catifes",
 "shop-pasta|@shop": "Pasta",
-"amenity-luggage_locker": "Armari d'equipatge"
+"amenity-luggage_locker": "Armari d'equipatge",
+"amenity-casino|@category_entertainment|@category_nightlife|@gambling": "Casino"
 }

data/categories-strings/es.json/localize.json

@@ -18,9 +18,9 @@
 "amenity-bank|@category_bank": "dinero",
 "@category_recycling": "4Reciclaje|Reciclaje de residuos|Eliminación de residuos|Materiales reciclables|Recogida selectiva de basura|Clasificación de residuos|Reutilización",
 "amenity-bureau_de_change": "3Cambio de divisas|dinero|Casa de cambio|Cambista",
-"amenity-studio": "Estudio",
+"amenity-studio": "Estudio de media|Estudio",
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2pub|taberna|bebida|beber|4cerveza|cóctel",
-"amenity-cafe|@category_eat": "3Café|3cafetería|3restaurante",
+"amenity-cafe|@category_eat": "3Café|cafetería",
 "amenity-fast_food|@category_eat": "4Comida rápida|restaurante|restaurant|3Restaurante de comida rápida",
 "amenity-restaurant|@category_eat": "3Restaurante|3Café|restaurant|restorán",
 "@shop": "Tienda|Comercio",
@@ -61,7 +61,7 @@
 "shop-toys|@category_children|@shop": "Tienda de juguetes|4Juguetería|juguetes",
 "amenity-marketplace|@category_food": "3Mercado",
 "amenity-money_transfer": "Transferencia de dinero",
-"shop-clothes|@category_shopping|@shop": "Tienda de ropa|3ropa",
+"shop-clothes|@category_shopping|@shop": "Tienda de ropa|3ropa ",
 "shop-caravan|@category_rv|@shop": "Venta de caravanas|Venta de autocaravanas|Venta de motorhomes",
 "shop-car|@shop": "Venta de coches|Venta de autos|Automotora|Automotores|5Concesionaria|Concesionario|Carros|Coches|Automóviles|Autos",
 "shop-bicycle|@shop": "Tienda de bicicletas|Tienda de bicis|bicicleta|4Bicicletas|Bicis|Ciclismo",
@@ -507,7 +507,7 @@
 "amenity-payment_centre": "7Centro de pagos|pago de sevicios|facturas|servicio de pago",
 "shop-telecommunication|@shop": "Telecomunicaciones",
 "leisure-bandstand": "4Tarima|templete|quiosco de música|kiosco de música|kiosko de música|5Glorieta de música",
-"social_facility-soup_kitchen": "4Comedor social|Comedor popular|Comedor comunitario|comida",
+"social_facility-soup_kitchen": "4Comedor social|Comedor popular|Comedor comunitario|comida|olla popular",
 "social_facility-food_bank": "Banco de alimentos|alimento|comida|voluntariado",
 "amenity-fuel|@category_fuel": "3Gasolinera|4Estación de servicio|combustible|gasolina|nafta|diesel|gasóleo|U+26FD",
 "shop-beauty-nails": "4Salón de manicura|salón de belleza|manicure|manicur|maniquiur|pedicure|uñas",

data/categories-strings/pt-BR.json/localize.json

@@ -84,15 +84,15 @@
 "tourism-museum|@category_tourism": "2Museu",
 "waterway-waterfall|@category_tourism": "2Cachoeira|2Queda de água|2Cascata|2Salto|2Catarata",
 "historic-archaeological_site|@category_tourism": "Sítio arqueológico|atração",
-"historic-stone": "Pedra Histórica",
+"historic-stone": "Pedra histórica",
 "historic-memorial-plaque": "Placa comemorativa",
 "historic-cannon": "Canhão",
-"historic-anchor": "Âncora Histórica",
-"historic-mine": "Mina Histórica",
+"historic-anchor": "Âncora histórica",
+"historic-mine": "Mina histórica",
 "historic-wreck": "Naufrágio",
-"historic-locomotive|@category_tourism": "Locomotiva Histórica",
-"historic-tank|@category_tourism": "Tanque Histórico",
-"historic-aircraft|@category_tourism": "Aeronaves Históricas",
+"historic-locomotive|@category_tourism": "Locomotiva histórica",
+"historic-tank|@category_tourism": "Tanque histórico",
+"historic-aircraft|@category_tourism": "Aeronave histórica|Avião histórico",
 "leisure-dog_park": "Parque canino|Parque para cães|Parque para cachorros",
 "leisure-garden": "2Jardim|lazer",
 "amenity-bench|amenity-bench-backless": "Assento|Banco de praça",
@@ -239,7 +239,7 @@
 "craft-brewery": "6Cervejaria",
 "craft-caterer": "Serviço de bufê",
 "craft-electronics_repair": "Reparo de eletrônicos",
-"craft-hvac": "Aquecimento, Ventilação e Ar Condicionado",
+"craft-hvac": "5Climatização|Aquecimento|AC|Ventilação|Ar Condicionado|Calefação",
 "craft-metal_construction": "Serralheiro|metalúrgico",
 "craft-key_cutter": "Chaveiro",
 "craft-locksmith": "Serralheiro",
@@ -305,7 +305,7 @@
 "leisure-water_park|@category_tourism|@category_children": "Parque aquático",
 "man_made-water_tower": "Torre de água|caixa de água",
 "man_made-windmill": "Moinho de vento",
-"natural-cave_entrance": "4Caverna",
+"natural-cave_entrance": "4Caverna|Cova|3Gruta",
 "natural-volcano|@mountain": "4Vulcão",
 "office-estate_agent": "Corretor imobiliário|agente imobiliário",
 "waterway-lock_gate": "Comporta de eclusa",

data/categories-strings/pt.json/localize.json

@@ -111,7 +111,7 @@
 "historic-wreck": "Naufrágio",
 "historic-locomotive|@category_tourism": "Locomotiva Histórica",
 "historic-tank|@category_tourism": "Tanque Histórico",
-"historic-aircraft|@category_tourism": "Aeronaves Históricas",
+"historic-aircraft|@category_tourism": "Aeronave histórica|Avião histórico",
 "historic-tomb|@category_tourism": "Túmulo|2Sepultura|memorial",
 "historic-wayside_cross": "Cruzeiro",
 "historic-wayside_shrine": "Alminhas",

data/categories-strings/ru.json/localize.json

@@ -199,7 +199,7 @@
 "place-state": "Штат|провинция",
 "place-region": "Район",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона|Жилой комплекс|ж.к.|ЖК",
 "place-hamlet": "Посёлок|деревня",
 "place-village": "Деревня|поселок",
 "place-locality": "Местность|регион",

data/categories-strings/uk.json/localize.json

@@ -196,7 +196,7 @@
 "place-state": "Штат|провінція|регіон",
 "place-region": "Район|область",
 "place-island|place-islet": "Острів",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство|Житловий комплекс|ж.к.|ЖК",
 "place-hamlet": "Поселення|селище|село",
 "place-village": "Село|хутір|поселення",
 "place-locality": "Місцевість|регіон|Місце",