fix: don't return reference to object that goes out of scope

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

.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/"]

.gitignore

@@ -155,6 +155,8 @@ android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 ./server/
 iphone/Maps/app.omaps/
+# Generated file
+libs/indexer/localized_types_map.cpp
 
 *.li
 

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 – Turiningesnės 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/fdroid/play/listings/sl/full-description.txt

@@ -1,20 +1,20 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
+Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
 
-Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preberite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
 Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Uporabljajte orodje in širite glas o njem
 • Dajajte povratne informacije in poročajte o napakah
 • Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap
 
-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
+‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potovanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
 ‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
 ‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
 ‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
 ‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>
 
 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih zemljevidih niso na voljo.
 • Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več

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 – Turiningesnės kelionės – Vystoma bendruomenės

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

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

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

@@ -1 +1 @@
-CoMaps - Usmerjajte zasebno
+CoMaps - Usmerjajte se zasebno

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/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/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/ic_minus.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h480q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L240,520Z"
+      android:pathData="M19,13H5v-2h14v2z"
       android:fillColor="#ffffff"/>
 </vector>

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

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M440,520L240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h200v-200q0,-17 11.5,-28.5T480,200q17,0 28.5,11.5T520,240v200h200q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L520,520v200q0,17 -11.5,28.5T480,760q-17,0 -28.5,-11.5T440,720v-200Z"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
       android:fillColor="@android:color/white"/>
 </vector>

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/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_editor.xml

@@ -402,11 +402,13 @@
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_half"
             android:fontFamily="@string/robotoMedium"
             android:text="@string/editor_other_info"
             android:textAppearance="@style/MwmTextAppearance.Body3"/>
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/custom_input"
+            android:layout_marginBottom="@dimen/margin_quarter"
             style="@style/MwmWidget.Editor.CustomTextInput"
             android:gravity="center_vertical"
             android:minHeight="74dp"
@@ -416,6 +418,7 @@
               android:id="@+id/input"
               style="@style/MwmWidget.Editor.FieldLayout.EditText"
               android:inputType="textMultiLine"
+              android:gravity="top"
               android:hint="@string/editor_note_hint"/>
         </com.google.android.material.textfield.TextInputLayout>
       </LinearLayout>

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/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

@@ -35,10 +35,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxLines="2"
-        android:padding="@dimen/margin_quarter"
+        android:padding="@dimen/margin_half"
         android:autoSizeTextType="uniform"
         android:autoSizeMinTextSize="19sp"
-        android:autoSizeMaxTextSize="25sp"
+        android:autoSizeMaxTextSize="24sp"
         android:minHeight="60dp"
         android:layout_gravity="center_vertical"
         android:gravity="center"

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

@@ -11,14 +11,14 @@
     style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_plus"
-    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
-    android:layout_marginBottom="@dimen/margin_half"
+    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
+    android:layout_marginBottom="@dimen/margin_eighth"
     android:contentDescription="@string/zoom_in"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_out"
     style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_minus"
-    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
+    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Plus"
     android:contentDescription="@string/zoom_out"/>
 </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/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,49 @@
     <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>
+    <string name="place_page_too_old_to_edit">L\'edició de dades d\'OpenStreetMap està deshabilitada perquè les dades del mapa són massa antigues.</string>
+    <string name="place_page_map_too_old_title">Dades del mapa desactualitzades</string>
+    <string name="place_page_map_too_old_description">Les teves dades de mapa son molt antigues, per favor actualitza el mapa.</string>
+    <string name="place_page_app_too_old_description">Les teues dades del mapa son molt antigues, per favor actualitza l\'app de CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualitzar regió del mapa</string>
+    <string name="prefs_speed_cameras_information">Les advertències de càmeres radar estan deshabilitades als països on estan prohibides per llei.</string>
+    <string name="navigation_start_tts_message">"Iniciant Navegació, idioma d\'instruccions de veu: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruccions de veu desactivades: motor TTS no disponible</string>
 </resources>

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

@@ -905,4 +905,12 @@
     </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>
+    <string name="place_page_map_too_old_title">Mapová data jsou zastaralá</string>
+    <string name="place_page_map_too_old_description">Vaše mapová data jsou velmi stará, doporučujeme je aktualizovat.</string>
+    <string name="place_page_app_too_old_description">Vaše aktuální mapová data jsou velmi stará, aktualizujte prosím aplikaci CoMaps.</string>
+    <string name="place_page_update_too_old_map">Aktualizovat oblast mapy</string>
+    <string name="place_page_too_old_to_edit">Úprava OpenStreetMap je zakázaná, protože mapová data jsou příliš stará.</string>
+    <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</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,12 @@
     <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>
+    <string name="place_page_map_too_old_title">Kortdata forældet</string>
+    <string name="place_page_map_too_old_description">Dine nuværende kortdata er meget gamle. Opdater kortet.</string>
+    <string name="place_page_app_too_old_description">Dine nuværende kortdata er meget gamle. Opdater CoMaps-appen.</string>
+    <string name="place_page_update_too_old_map">Opdater kortregion</string>
+    <string name="place_page_too_old_to_edit">Redigering af OpenStreetMap er deaktiveret, fordi kortdataene er for gamle.</string>
+    <string name="navigation_start_tts_disabled_message">Stemmeinstruktioner deaktiveret: TTS-motor ikke tilgængelig</string>
 </resources>

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

@@ -68,7 +68,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Agregar una lista nueva</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre del grupo de marcadores</string>
+    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Marcadores</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -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 -->
@@ -246,7 +246,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Donar</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Apoya el proyecto</string>
+    <string name="how_to_support_us">Apoya y mejora el proyecto CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Derechos de autor</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -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>
@@ -914,4 +914,12 @@
     <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
     <string name="editor_submit">Enviar</string>
     <string name="power_management">Gestión de energía</string>
+    <string name="place_page_map_too_old_title">Datos del mapa anticuados</string>
+    <string name="place_page_map_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza el mapa.</string>
+    <string name="place_page_app_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza la aplicación CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizar mapa de la región</string>
+    <string name="place_page_too_old_to_edit">La edición de OpenStreetMap está deshabilitada porque los datos del mapa están muy anticuados.</string>
+    <string name="prefs_speed_cameras_information">Las advertencias de radares de velocidad están deshabilitadas en países donde las alertas están prohibidas por ley.</string>
+    <string name="navigation_start_tts_message">"Iniciando Navegación, idioma de las instrucciones por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instrucciones por voz deshabilitadas: Motor de TTS no disponible</string>
 </resources>

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

@@ -903,4 +903,12 @@
     <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>
+    <string name="place_page_map_too_old_title">Kaardiandmed on aegunud</string>
+    <string name="place_page_map_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda andmeid.</string>
+    <string name="place_page_app_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda CoMapsi rakendust.</string>
+    <string name="place_page_update_too_old_map">Uuenda piirkonna kaardiandmeid</string>
+    <string name="place_page_too_old_to_edit">Kuna kaardiandmed on liiga vanad, siis OpenStreetMapi muutmise võimalus on lülitatud välja.</string>
+    <string name="navigation_start_tts_disabled_message">Hääljuhiste kasutamine on lülitatud välja: kõnesünteesimootorit pole saadaval</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,48 +21,48 @@
     <!-- 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>
+    <string name="limited_accuracy">نزومان ویمندیگ</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">برای اطمینان از دقیق ناوبری ، موقعیت مکانی دقیق را در تنظیمات فعال کنید</string>
+    <string name="precise_location_is_disabled_long_text">برای آسوده‌دل بودن از نزومانی ناوبری، گیاگ‌یابی نزومان را در پیکربندی کارا کنید</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">نمایش بر روی نقشه</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
-    <string name="country_status_download_failed">دانلود با شکست مواجه شد</string>
+    <string name="country_status_download_failed">بارگیری ناکام بود</string>
     <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">تلاش مجدد</string>
-    <string name="about_menu_title">CoMaps درباره‌ی</string>
+    <string name="try_again">تلاش دوباره</string>
+    <string name="about_menu_title">درباره CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• آسان برای استفاده و جلا</string>
+    <string name="about_proposition_1">• بکارگیری آسان اود پیراسته</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• حریم خصوصی متمرکز و بدون تبلیغات</string>
+    <string name="about_proposition_2">• حریم خصوصی متمرکز اود بی‌آگهی</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
+    <string name="about_proposition_3">• آفلاین، چابک و جمع و جور</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">منبع کاملا باز، نه برای سود، تصمیم گیری شفاف و امور مالی شفاف.</string>
     <!-- The button that opens system location settings -->
-    <string name="location_settings">تنظیمات مکان</string>
+    <string name="location_settings">پیکربندی‌های گیاگ</string>
     <string name="close">بستن</string>
     <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
-    <string name="download">دانلود</string>
+    <string name="download">بارگیری</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
     <string name="download_resources">قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم. \nمقدار %s از حافظه شما اشغال می شود.</string>
     <string name="download_resources_continue">برو به نقشه</string>
-    <string name="downloading_country_can_proceed">درحال دانلود %1$s (%2$s). شما اکنون می توانید \nبه نقشه بروید.</string>
-    <string name="download_country_ask">دانلود %1$s؟ (%2$s)</string>
+    <string name="downloading_country_can_proceed">بارگیری می‌شود %1$s (%2$s). شما اکنون می‌توانید\nبه نقشه بروید.</string>
+    <string name="download_country_ask">بارگیری %1$s؟ (%2$s)</string>
     <string name="update_country_ask">بروزرسانی %1$s؟ (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="pause">درنگ</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="continue_button">ادامه</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
-    <string name="download_country_failed">%s دانلود با شکست مواجه شد</string>
+    <string name="download_country_failed">%s بارگیری ناکام بود</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">اضافه کردن مجموعه جدید</string>
+    <string name="add_new_set">افزودن پهرستی نو</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">نشانه‌ها</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -778,7 +778,7 @@
     <string name="panoramax">تصویر Panoramax</string>
     <string name="app_site_url">https://comaps.app</string>
     <string name="saved">ذخیره شد</string>
-    <string name="about_headline">رایگان برای همه، ساخته شده با عشق</string>
+    <string name="about_headline">پروژه‌ای باز نیرو گرفته از انجمن</string>
     <string name="pedestrian">پیاده</string>
     <string name="bicycle">دوچرخه</string>
     <string name="backup_interval_every_week">هفتگی</string>

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,8 +523,8 @@
     <!-- 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_2">OpenStreetMap-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</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-muokkaajat tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää.</string>
     <string name="navigation_stop_button">Lopeta</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Reitin kirjaaminen</string>
@@ -894,12 +894,21 @@
     <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>
+    <string name="place_page_map_too_old_title">Karttatiedot vanhentuneet</string>
+    <string name="place_page_map_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä kartta.</string>
+    <string name="place_page_app_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä CoMaps-sovellus.</string>
+    <string name="place_page_update_too_old_map">Päivitä kartta-alue</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-muokkaus on poistettu käytöstä, koska karttadata on liian vanhaa.</string>
+    <string name="prefs_speed_cameras_information">Nopeuskameravaroitukset on poistettu käytöstä niissä maissa, missä varoitukset on kielletty lain nojalla.</string>
+    <string name="power_management">Virranhallinta</string>
+    <string name="navigation_start_tts_message">"Käynnistetään navigointi, ääniohjeistuksen kieli: "</string>
 </resources>

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

@@ -897,7 +897,7 @@
     <string name="editor_place_doesnt_exist_description">Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap</string>
     <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
     <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
-    <string name="avoid_paved">Éviter les routes goudronnées</string>
+    <string name="avoid_paved">Éviter les routes pavées</string>
     <string name="opens_at">Ouvre à %s</string>
     <string name="closes_at">Ferme à %s</string>
     <string name="opens_day_at">Ouverture le %1$s à %2$s</string>
@@ -913,4 +913,12 @@
     <string name="editor_submit">Soumettre</string>
     <string name="power_management">Gestion de l\'énergie</string>
     <string name="charge_socket_schuko">Europe</string>
+    <string name="place_page_map_too_old_title">Carte obsolète</string>
+    <string name="place_page_map_too_old_description">Les données de la carte actuelle sont anciennes, pensez à les mettre à jour.</string>
+    <string name="place_page_update_too_old_map">Mettre à jour la carte</string>
+    <string name="place_page_too_old_to_edit">Les modifications OpenStreetMap sont désactivées car les données de la carte sont trop anciennes.</string>
+    <string name="place_page_app_too_old_description">Vos données cartographiques actuelles sont très anciennes, veuillez mettre à jour l\'application CoMaps.</string>
+    <string name="prefs_speed_cameras_information">Les avertissements relatifs aux radars de vitesse sont désactivés dans les pays où les alertes sont interdites par la législation locale.</string>
+    <string name="navigation_start_tts_message">"Navigation de démarrage, langue des instructions vocales : "</string>
+    <string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string>
 </resources>

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

@@ -139,4 +139,135 @@
     <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>
+    <string name="search_not_found_query">Preuzmite regiju u kojoj pretražujete ili pokušajte dodati naziv obližnjeg grada/sela.</string>
+    <string name="search_history_text">Pogledajte svoja nedavna pretraživanja</string>
+    <string name="read_in_wikipedia">Wikipedija</string>
+    <string name="p2p_your_location">Vaša lokacija</string>
+    <string name="p2p_only_from_current">Navigacija je dostupna samo od vaše trenutne lokacije</string>
+    <string name="p2p_reroute_from_current">Želite li isplanirati rutu od vaše trenutne lokacije?</string>
+    <string name="editor_time_add">Dodaj Raspored</string>
+    <string name="editor_time_delete">Izbriši Raspored</string>
+    <string name="editor_time_allday">Cijeli dan (24 sata)</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,14 @@
     <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>
+    <string name="place_page_too_old_to_edit">La modifica di OpenStreetMap è disabilitata perché le mappe sono troppo vecchie.</string>
+    <string name="place_page_update_too_old_map">Aggiorna questa mappa</string>
+    <string name="place_page_app_too_old_description">Le mappe correnti sono molto vecchie, si suggerisce di aggiornare CoMaps.</string>
+    <string name="place_page_map_too_old_description">La mappa corrente è molto vecchia, si suggerisce di aggiornarla.</string>
+    <string name="place_page_map_too_old_title">Mappa obsoleta</string>
+    <string name="navigation_start_tts_disabled_message">Istruzioni vocali disabilitate: TTS non disponibile</string>
+    <string name="prefs_speed_cameras_information">Gli avvisi di Autovelox sono disabilitati dove proibito dalla legge locale.</string>
+    <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
 </resources>

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

@@ -0,0 +1,376 @@
+<?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>
+    <string name="category_shopping">Gwerthjiow</string>
+    <string name="edit">Golegi</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-lv/strings.xml

@@ -845,4 +845,10 @@
     <string name="closed_now">Šobrīd slēgts</string>
     <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
     <string name="editor_submit">Iesniegt</string>
+    <string name="place_page_map_too_old_title">Novecojuši kartes dati</string>
+    <string name="place_page_map_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt karti.</string>
+    <string name="place_page_app_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt CoMaps lietotni.</string>
+    <string name="place_page_update_too_old_map">Atjaunināt karšu apgabalu</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap labošana ir atspējota, jo kartes dati ir pārāk veci.</string>
+    <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
 </resources>

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

@@ -896,4 +896,14 @@
     <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>
+    <string name="place_page_map_too_old_title">Kartdata utdatert</string>
+    <string name="place_page_map_too_old_description">Gjeldende kartdata er gamle, oppdater kartet.</string>
+    <string name="place_page_app_too_old_description">Gjeldende kartdata er gamle, oppdater CoMaps-appen.</string>
+    <string name="place_page_update_too_old_map">Oppdater kartregion</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-redigering er deaktivert fordi kartdataene er for gamle.</string>
+    <string name="osm_note_hint">Alternativt, så kan du legge til et notat i OpenStreetMap, slik at noen andre kan redigere eller legge til stedet.</string>
+    <string name="osm_note_toast">Notatet vil bli sendt til OpenStreetMap</string>
 </resources>

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

@@ -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>

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

@@ -907,4 +907,12 @@
     <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>
+    <string name="place_page_map_too_old_title">Kaartgegevens verouderd</string>
+    <string name="place_page_map_too_old_description">Uw huidige kaartgegevens zijn erg oud. Werk de kaart bij.</string>
+    <string name="place_page_app_too_old_description">Uw huidige kaartgegevens zijn erg oud. Update de CoMaps-app.</string>
+    <string name="place_page_update_too_old_map">Kaart regio bijwerken</string>
+    <string name="place_page_too_old_to_edit">Het bewerken van OpenStreetMap is uitgeschakeld omdat de kaartgegevens te oud zijn.</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-pt-rBR/strings.xml

@@ -885,4 +885,12 @@
     <string name="editor_submit">Enviar</string>
     <string name="power_management">Gerenciamento de energia</string>
     <string name="charge_socket_schuko">Doméstica UE</string>
+    <string name="place_page_map_too_old_title">Dados do mapa desatualizados</string>
+    <string name="place_page_map_too_old_description">Os seus dados do mapa atuais são muito antigos, por favor atualize o mapa.</string>
+    <string name="place_page_app_too_old_description">Seus dados do mapa atuais são muito antigos, por favor atualize o aplicativo CoMaps.</string>
+    <string name="place_page_update_too_old_map">Atualizar região do mapa</string>
+    <string name="place_page_too_old_to_edit">A edição do OpenStreetMap está desativada porque os dados do mapa são antigos demais.</string>
+    <string name="prefs_speed_cameras_information">Alertas de radar fotográfico de velocidade estão desativados em países onde os alertas são proibidos pelas leis locais.</string>
+    <string name="navigation_start_tts_message">"Iniciando navegação, idioma da instrução por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instrução por voz desativada: nenhum motor de texto para voz disponível</string>
 </resources>

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

@@ -901,4 +901,12 @@
     <string name="list_description_empty">Edite a lista para adicionar uma descrição</string>
     <string name="power_management">Gestão de Energia</string>
     <string name="charge_socket_schuko">Doméstica UE</string>
+    <string name="place_page_map_too_old_title">Dados do mapa desatualizados</string>
+    <string name="place_page_map_too_old_description">O seu mapa atual tem dados demasiado antigos, por favor atualize-o.</string>
+    <string name="place_page_app_too_old_description">O seu mapa atual tem dados demasiado antigos, por favor atualize a aplicação do CoMaps.</string>
+    <string name="place_page_update_too_old_map">Atualizar região do mapa</string>
+    <string name="place_page_too_old_to_edit">Edição OpenStreetMap está desativada, pois os dados do mapa são demasiado antigos.</string>
+    <string name="prefs_speed_cameras_information">Avisos de câmaras de velocidade estão desativados em países onde alertas estão proibidos por lei.</string>
+    <string name="navigation_start_tts_message">"Iniciando Navegação, idioma das instruções por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruções por voz desativadas: nenhum motor de TTS disponível</string>
 </resources>

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

@@ -17,7 +17,7 @@
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Мили</string>
     <!-- Update maps later button text -->
-    <string name="later">Не сейчас</string>
+    <string name="later">Позже</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">Поиск</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Точность местоположения ограничена</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Для обеспечения точной навигации включите определение точного местоположения в настройках</string>
+    <string name="precise_location_is_disabled_long_text">Включите в настройках определение точного местоположения</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Показать на карте</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -297,7 +297,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Пожалуйста, включите геолокацию</string>
     <string name="save">Сохранить</string>
-    <string name="create">создать</string>
+    <string name="create">Создать</string>
     <!-- red color -->
     <string name="red">Красный</string>
     <!-- yellow color -->
@@ -526,8 +526,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Отправить всем пользователям?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных</string>
-    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы</string>
+    <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных.</string>
+    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.</string>
     <string name="navigation_stop_button">Cтоп</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Запись трека</string>
@@ -918,4 +918,9 @@
     <string name="list_description_empty">Отредактируйте список, чтобы добавить описание</string>
     <string name="pref_tts_no_system_tts_short">Не найден движок синтезатора речи, проверьте настройки приложения</string>
     <string name="unknown_power_output">неизвестно</string>
+    <string name="opens_day_at">Откроется %1$s на %2$s</string>
+    <string name="closes_day_at">Закроется %1$s на %2$s</string>
+    <string name="place_page_map_too_old_title">Данные карты устарели</string>
+    <string name="place_page_update_too_old_map">Обновить регион карты</string>
+    <string name="place_page_too_old_to_edit">Редактирование OpenStreetMap отключено, так как данные карты слишком старые.</string>
 </resources>

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

@@ -349,8 +349,8 @@
     <string name="osm_note_hint">Ali pa pusti sporočilo skupnosti OpenStreetMap, da bo nekdo drug dodal ali popravil ta kraj.</string>
     <string name="osm_note_toast">Sporočilo bo poslano na OpenStreetMap</string>
     <string name="editor_share_to_all_dialog_title">Ali to želite poslati vsem uporabnikom?</string>
-    <string name="editor_share_to_all_dialog_message_1">Poskrbite, da niste vnesli nobenih zasebnih podatkov</string>
-    <string name="editor_share_to_all_dialog_message_2">Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno</string>
+    <string name="editor_share_to_all_dialog_message_1">Poskrbite, da niste vnesli nobenih zasebnih ali osebnih podatkov</string>
+    <string name="editor_share_to_all_dialog_message_2">Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno.</string>
     <string name="navigation_stop_button">Ustavi</string>
     <string name="track_recording">Snemam pot</string>
     <string name="accept">Potrdi</string>
@@ -631,4 +631,30 @@
     <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>
+    <string name="opens_day_at">Odpre se %1$s, ob %2$s</string>
+    <string name="closes_day_at">Zapre se %1$s, ob %2$s</string>
+    <string name="editor_business_vacant_button">Podjetje ni zakupljeno</string>
+    <string name="editor_mark_business_vacant_title">Označi, da je podjetje nezakupljeno</string>
+    <string name="editor_mark_business_vacant_description">To uporabite, če se je podjetje izselilo in so prostori prazni in pripravljeni za novega zakupnika.</string>
+    <string name="editor_submit">Potrdi</string>
+    <string name="place_page_map_too_old_title">Podatki zemljevida so zastareli</string>
+    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite zemljevid.</string>
+    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite orodje CoMaps.</string>
+    <string name="place_page_update_too_old_map">Posodobi področje zemljevida</string>
+    <string name="place_page_too_old_to_edit">Urejanje OpenStreetMap je onemogočeno, ker so podatki zemljevida prestari.</string>
+    <string name="prefs_speed_cameras_information">Opozorila o merilnikih hitrosti so onemogočena v državah, kjer so prepovedana s tamkajšnjimi zakoni.</string>
+    <string name="power_management">Energetsko upravljanje</string>
+    <string name="avoid_paved">Izogni se neasfaltiranim cestam</string>
+    <string name="navigation_start_tts_message">"Začenjanje potnega usmerjanja, jezik glasovnih napotkov: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovni napotki so onemogočeni: ustvarjalec glasu (TTS) ni na voljo</string>
+    <string name="charge_socket_schuko">standardna evropska vtičnica (Schuko)</string>
+    <string name="list_description_empty">Uredite seznam, da dodate opis</string>
 </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,14 @@
     <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>
+    <string name="place_page_map_too_old_title">地图数据已过时</string>
+    <string name="place_page_map_too_old_description">您当前的地图数据非常旧，请更新地图。</string>
+    <string name="place_page_app_too_old_description">您当前的地图数据非常旧，请更新 CoMaps 应用。</string>
+    <string name="place_page_update_too_old_map">更新地图区域</string>
+    <string name="place_page_too_old_to_edit">由于地图数据太旧，OpenStreetMap 编辑被禁用。</string>
 </resources>

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

@@ -119,7 +119,7 @@
   <dimen name="nav_menu_landscape_width">360dp</dimen>
 
   <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
-  <dimen name="zoom_buttons_margin">64dp</dimen>
+  <dimen name="zoom_buttons_margin">58dp</dimen>
   <dimen name="map_buttons_bottom_margin">136dp</dimen>
   <dimen name="map_buttons_bottom_max_width">300dp</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">
@@ -424,4 +425,17 @@
     <item name="android:maxWidth">@dimen/map_buttons_bottom_max_width</item>
     <item name="android:padding">@dimen/nav_frame_padding</item>
   </style>
+
+    <style name="ShapeAppearance.MapButton.Zoom.Plus" parent="">
+        <item name="cornerSizeTopLeft">10%</item>
+        <item name="cornerSizeTopRight">10%</item>
+        <item name="cornerSizeBottomRight">50%</item>
+        <item name="cornerSizeBottomLeft">50%</item>
+    </style>
+    <style name="ShapeAppearance.MapButton.Zoom.Minus" parent="">
+        <item name="cornerSizeBottomLeft">10%</item>
+        <item name="cornerSizeBottomRight">10%</item>
+        <item name="cornerSizeTopLeft">50%</item>
+        <item name="cornerSizeTopRight">50%</item>
+    </style>
 </resources>

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>

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/assets/mapcss-mapping.csv

@@ -0,0 +1 @@
+../../../../../data/mapcss-mapping.csv

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-cs/types_strings.xml

@@ -1497,4 +1497,5 @@
     <string name="type.shop.beauty.nails">Nehtový salón</string>
     <string name="type.xmas.tree">Vánoční strom</string>
     <string name="type.man_made.mast.communication">Komunikační stožár</string>
+    <string name="type.amenity.hydrant">Hydrant na zavlažování</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>
@@ -160,7 +160,7 @@
     <string name="type.amenity.public_bath">Baños públicos</string>
     <string name="type.amenity.shower">Ducha</string>
     <string name="type.amenity.stripclub">Club de estriptis</string>
-    <string name="type.amenity.taxi">Sitio de taxis</string>
+    <string name="type.amenity.taxi">Parada de taxis</string>
     <string name="type.amenity.telephone">Teléfono</string>
     <string name="type.amenity.theatre">Teatro</string>
     <string name="type.amenity.toilets">WC</string>
@@ -351,6 +351,7 @@
     <string name="type.emergency.assembly_point">Punto de reunión de emergencia</string>
     <string name="type.emergency.defibrillator">Desfibrilador</string>
     <string name="type.emergency.fire_hydrant">Boca de incendio</string>
+    <string name="type.amenity.hydrant">Boca de riego</string>
     <string name="type.emergency.phone">Teléfono de emergencias</string>
     <!-- A place where a lifeguard is on duty. -->
     <string name="type.emergency.lifeguard">Socorrista</string>
@@ -360,7 +361,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>
@@ -454,7 +455,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.residential.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.residential.tunnel">Túnel de calle residencial</string>
+    <string name="type.highway.residential.tunnel">Túnel</string>
     <string name="type.highway.rest_area">Área de descanso</string>
     <string name="type.highway.road">Carretera</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -467,7 +468,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary.tunnel">Túnel de carretera secundaria</string>
+    <string name="type.highway.secondary.tunnel">Túnel</string>
     <string name="type.highway.secondary_link">Enlace de carretera secundaria</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary_link.bridge">Puente</string>
@@ -477,7 +478,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 +651,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-fr/types_strings.xml

@@ -337,6 +337,7 @@
     <string name="type.emergency.assembly_point">Point de rassemblement d’urgence</string>
     <string name="type.emergency.defibrillator">Défibrillateur</string>
     <string name="type.emergency.fire_hydrant">Point d’eau incendie</string>
+    <string name="type.amenity.hydrant">Borne d’puisage</string>
     <string name="type.emergency.phone">Téléphone d’urgence</string>
     <!-- A place where a lifeguard is on duty. -->
     <string name="type.emergency.lifeguard">Sauveteur</string>

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

@@ -0,0 +1,864 @@
+<?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>
+    <string name="type.cuisine.indian">Eyndek</string>
+    <string name="type.cuisine.indonesian">Indonesek</string>
+    <string name="type.cuisine.international">Keswlasek</string>
+    <string name="type.cuisine.irish">Iwerdhonek</string>
+    <string name="type.cuisine.italian">Italek</string>
+    <string name="type.cuisine.italian_pizza">Italek, Pitsa</string>
+    <string name="type.cuisine.japanese">Japanek</string>
+    <string name="type.cuisine.korean">Koreek</string>
+    <string name="type.cuisine.lao">Laosek</string>
+    <string name="type.cuisine.lebanese">Lebanek</string>
+    <string name="type.cuisine.local">Leel</string>
+    <string name="type.cuisine.malaysian">Malaysiek</string>
+    <string name="type.cuisine.mediterranean">Kresvorek</string>
+    <string name="type.cuisine.mexican">Meksikan</string>
+    <string name="type.cuisine.moroccan">Morockek</string>
+    <string name="type.cuisine.noodles">Noudlys</string>
+    <string name="type.cuisine.oriental">Asiek Est</string>
+    <string name="type.cuisine.pancake">Krampothennow</string>
+    <string name="type.cuisine.pasta">Pasta</string>
+    <string name="type.cuisine.persian">Persi</string>
+    <string name="type.cuisine.peruvian">Peruvianek</string>
+    <string name="type.cuisine.pizza">Pitsa</string>
+    <string name="type.cuisine.polish">Polonek</string>
+    <string name="type.cuisine.portuguese">Portyngalek</string>
+    <string name="type.cuisine.regional">Ranndirek</string>
+    <string name="type.cuisine.russian">Russek</string>
+    <string name="type.cuisine.sandwich">Baramanyn</string>
+    <string name="type.cuisine.sausage">Selsigen</string>
+    <string name="type.cuisine.spanish">Spaynek</string>
+    <string name="type.cuisine.steak_house">Bosti Tregh Kig</string>
+    <string name="type.cuisine.sushi">Sushi</string>
+    <string name="type.cuisine.tea">Te</string>
+    <string name="type.cuisine.thai">Tai</string>
+    <string name="type.cuisine.turkish">Turkek</string>
+    <string name="type.cuisine.vegan">Vegan</string>
+    <string name="type.cuisine.vegetarian">Losowek</string>
+    <string name="type.cuisine.vietnamese">Vietnamek</string>
+    <string name="type.emergency">Goredhom</string>
+    <string name="type.emergency.access_point">Tyller Sawyans Goredhom</string>
+    <string name="type.emergency.assembly_point">Tyller Kuntelles Goredhom</string>
+    <string name="type.emergency.life_ring">Grugys-Sawya</string>
+    <string name="type.emergency.phone">Fon Goredhom</string>
+    <string name="type.emergency.lifeguard">Tyller Gwithyades-Sawya</string>
+    <string name="type.lateral.port">Porth</string>
+    <string name="type.lateral.starboard">Lew</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">North</string>
+    <string name="type.cardinal.south">Soth</string>
+    <string name="type.cardinal.west">West</string>
+    <string name="type.emergency.mountain_rescue">Sawyansva Menydh</string>
+    <string name="type.entrance">Entrans</string>
+    <string name="type.entrance.main">Entrans Chif</string>
+    <string name="type.entrance.house">Entrans Chi</string>
+    <string name="type.entrance.garage">Entrans Karrji</string>
+    <string name="type.entrance.service">Entrans Gonis</string>
+    <string name="type.entrance.entry">Entrans (Unsel)</string>
+    <string name="type.entrance.exit">Fordh \'Mes (Unsel)</string>
+    <string name="type.entrance.emergency">Daras Goredhom</string>
+    <string name="type.fee.yes">£</string>
+    <string name="type.fee.no">Heb Kost</string>
+    <string name="type.healthcare.laboratory">Arbrovji Medhegel</string>
+    <string name="type.healthcare.physiotherapist">Yaghheans Fisio</string>
+    <string name="type.healthcare.alternative">Medhegneth Euvergryjyk</string>
+    <string name="type.healthcare.audiologist">Medhek Klew</string>
+    <string name="type.healthcare.blood_donation">Kres Argevrians Goos</string>
+    <string name="type.healthcare.optometrist">Medhek Golok</string>
+    <string name="type.healthcare.podiatrist">Medhek Troos</string>
+    <string name="type.healthcare.psychotherapist">Yaghheans Brysoniethel</string>
+    <string name="type.healthcare.sample_collection">Kres Kuntel Sampel</string>
+    <string name="type.healthcare.speech_therapist">Pathologydh Kows ha Tavas</string>
+    <string name="type.highway">Fordh Veur</string>
+    <string name="type.highway.bridleway">Marghlergh</string>
+    <string name="type.highway.bridleway.bridge">Pons</string>
+    <string name="type.highway.bridleway.permissive">Marghlergh</string>
+    <string name="type.highway.bridleway.tunnel">Kowfordh</string>
+    <string name="type.highway.busway">Fordh rag Kyttrinyow yn Unsel</string>
+    <string name="type.highway.busway.bridge">Pons</string>
+    <string name="type.highway.busway.tunnel">Kowfordh</string>
+    <string name="type.highway.bus_stop">Kyttrinva</string>
+    <string name="type.highway.construction">Fordh y\'n Drehevyans</string>
+    <string name="type.highway.cycleway">Hyns rag Diwrosow</string>
+    <string name="type.highway.cycleway.bridge">Pons</string>
+    <string name="type.highway.cycleway.permissive">Hyns rag Diwrosow</string>
+    <string name="type.highway.cycleway.tunnel">Kowfordh</string>
+    <string name="type.highway.elevator">Yskynnell</string>
+    <string name="type.highway.footway">Kerdhva</string>
+    <string name="type.highway.footway.sidewalk">Kons</string>
+    <string name="type.highway.footway.crossing">Treusva Gerdhoryon</string>
+    <string name="type.highway.footway.area">Arenebedh Gerdhoryon</string>
+    <string name="type.highway.footway.bridge">Pons Gerdhoryon</string>
+    <string name="type.highway.footway.tunnel">Kowfordh Gerdhoryon</string>
+    <string name="type.highway.ford">Res</string>
+    <string name="type.highway.living_street">Stret Pur Byghan</string>
+    <string name="type.highway.living_street.bridge">Pons</string>
+    <string name="type.highway.living_street.tunnel">Kowfordh</string>
+    <string name="type.highway.motorway">Gorfordh</string>
+    <string name="type.highway.motorway.bridge">Pons Gorfordh</string>
+    <string name="type.highway.motorway.tunnel">Kowfordh Gorfordh</string>
+    <string name="type.highway.motorway_junction">Fordh \'Mes</string>
+    <string name="type.highway.motorway_link">Rybfordh</string>
+    <string name="type.highway.motorway_link.bridge">Pons</string>
+    <string name="type.highway.motorway_link.tunnel">Kowfordh</string>
+    <string name="type.highway.path">Hyns</string>
+    <string name="type.highway.path.difficult">Ol Kales bo Andhiblans</string>
+    <string name="type.highway.path.expert">Ol Anweladow</string>
+    <string name="type.highway.path.bicycle">Hyns rag Kerdhoryon ha Diwrosow</string>
+    <string name="type.highway.footway.bicycle">Hyns rag Kerdhoryon ha Diwrosow</string>
+    <string name="type.highway.path.bridge">Pons</string>
+    <string name="type.highway.path.horse">Marghlergh</string>
+    <string name="type.highway.path.tunnel">Kowfordh</string>
+    <string name="type.highway.pedestrian">Stret Gerdhoryon yn Unsel</string>
+    <string name="type.highway.pedestrian.area">Arenebedh Gerdhoryon</string>
+    <string name="type.highway.pedestrian.bridge">Pons Gerdhoryon</string>
+    <string name="type.highway.pedestrian.square">Plen</string>
+    <string name="type.highway.pedestrian.tunnel">Kowfordh Gerdhoryon</string>
+    <string name="type.highway.primary">Fordh Kynsa</string>
+    <string name="type.highway.primary.bridge">Pons</string>
+    <string name="type.highway.primary.tunnel">Kowfordh</string>
+    <string name="type.highway.primary_link">Rybfordh Kynsa</string>
+    <string name="type.highway.primary_link.bridge">Pons</string>
+    <string name="type.highway.primary_link.tunnel">Kowfordh</string>
+    <string name="type.highway.residential">Stret Anedhel</string>
+    <string name="type.highway.residential.area">Stret Anedhel</string>
+    <string name="type.highway.residential.bridge">Pons</string>
+    <string name="type.highway.residential.tunnel">Kowfordh</string>
+    <string name="type.highway.rest_area">Powesva</string>
+    <string name="type.highway.road">Fordh</string>
+    <string name="type.highway.road.bridge">Pons</string>
+    <string name="type.man_made.bridge">Pons</string>
+    <string name="type.highway.road.tunnel">Kowfordh</string>
+    <string name="type.highway.secondary">Fordh Nessa</string>
+    <string name="type.highway.secondary.bridge">Pons</string>
+    <string name="type.highway.secondary.tunnel">Kowfordh</string>
+    <string name="type.highway.secondary_link">Rybfordh Nessa</string>
+    <string name="type.highway.secondary_link.bridge">Pons</string>
+    <string name="type.highway.secondary_link.tunnel">Kowfordh</string>
+    <string name="type.highway.service">Fordh Gonis</string>
+    <string name="type.highway.service.area">Fordh Gonis</string>
+    <string name="type.highway.service.bridge">Pons</string>
+    <string name="type.highway.service.driveway">Fordh dhe Chi</string>
+    <string name="type.highway.service.parking_aisle">Fordh Parkyans</string>
+    <string name="type.highway.service.tunnel">Kowfordh</string>
+    <string name="type.highway.services">Edhommva</string>
+    <string name="type.highway.speed_camera">Kamera Skavder</string>
+    <string name="type.highway.steps">Grisyow</string>
+    <string name="type.highway.ladder">Skeul</string>
+    <string name="type.highway.steps.bridge">Pons</string>
+    <string name="type.highway.steps.tunnel">Kowfordh</string>
+    <string name="type.highway.tertiary">Fordh Tryja</string>
+    <string name="type.highway.tertiary.bridge">Pons</string>
+    <string name="type.highway.tertiary.tunnel">Kowfordh</string>
+    <string name="type.highway.tertiary_link">Rybfordh Tryja</string>
+    <string name="type.highway.tertiary_link.bridge">Pons</string>
+    <string name="type.highway.tertiary_link.tunnel">Kowfordh</string>
+    <string name="type.highway.track">Ol</string>
+    <string name="type.highway.track.area">Ol</string>
+    <string name="type.highway.track.bridge">Pons</string>
+    <string name="type.highway.track.grade1">Ol</string>
+    <string name="type.highway.track.no.access">Ol</string>
+    <string name="type.highway.track.tunnel">Kowfordh</string>
+    <string name="type.highway.traffic_signals">Sinell Traffik</string>
+    <string name="type.highway.trunk">Fordh Chif</string>
+    <string name="type.highway.trunk.bridge">Pons</string>
+    <string name="type.highway.trunk.tunnel">Kowfordh</string>
+    <string name="type.highway.trunk_link">Rybfordh Chif</string>
+    <string name="type.highway.trunk_link.bridge">Pons</string>
+    <string name="type.highway.trunk_link.tunnel">Kowfordh</string>
+    <string name="type.highway.unclassified">Fordh Le</string>
+    <string name="type.highway.unclassified.area">Fordh Le</string>
+    <string name="type.highway.unclassified.bridge">Pons</string>
+    <string name="type.highway.unclassified.tunnel">Kowfordh</string>
+    <string name="type.area_highway.cycleway">Hyns rag Diwrosow</string>
+    <string name="type.area_highway.footway">Kerdhva</string>
+    <string name="type.area_highway.living_street">Stret pur Byghan</string>
+    <string name="type.area_highway.motorway">Gorfordh</string>
+    <string name="type.area_highway.path">Hyns</string>
+    <string name="type.area_highway.pedestrian">Stret Gerdhoryon yn Unsel</string>
+    <string name="type.area_highway.primary">Fordh Kynsa</string>
+    <string name="type.area_highway.residential">Stret Anedhel</string>
+    <string name="type.area_highway.secondary">Fordh Nessa</string>
+    <string name="type.area_highway.service">Fordh Gonis</string>
+    <string name="type.area_highway.tertiary">Fordh Tryja</string>
+    <string name="type.area_highway.steps">Grisyow</string>
+    <string name="type.area_highway.track">Ol</string>
+    <string name="type.area_highway.trunk">Fordh Chif</string>
+    <string name="type.area_highway.unclassified">Fordh Le</string>
+    <string name="type.historic">Taklen Istorek</string>
+    <string name="type.historic.aircraft">Ayren Istorek</string>
+    <string name="type.historic.anchor">Ankor Istorek</string>
+    <string name="type.historic.archaeological_site">Tyller Hendhyskoniethel</string>
+    <string name="type.historic.battlefield">Tyller Batel Istorek</string>
+    <string name="type.historic.boundary_stone">Men Or</string>
+    <string name="type.historic.cannon">Kanon</string>
+    <string name="type.historic.castle">Kastel</string>
+    <string name="type.historic.castle.castrum">Dinas Romanek</string>
+    <string name="type.historic.castle.defensive">Kastel Krev</string>
+    <string name="type.historic.castle.fortified_church">Eglos rag Skons</string>
+    <string name="type.historic.castle.fortress">Skons</string>
+    <string name="type.historic.castle.hillfort">Ker</string>
+    <string name="type.historic.castle.kremlin">Kastel Europek a\'n Est</string>
+    <string name="type.historic.castle.manor">Manerji</string>
+    <string name="type.historic.castle.palace">Palys</string>
+    <string name="type.historic.castle.shiro">Kastel Japanek</string>
+    <string name="type.historic.castle.stately">Kastel Maner</string>
+    <string name="type.historic.city_gate">Porth Cita</string>
+    <string name="type.historic.citywalls">Fos Cita</string>
+    <string name="type.historic.fort">Dinas</string>
+    <string name="type.historic.gallows">Krogbren</string>
+    <string name="type.historic.locomotive">Tren Istorek</string>
+    <string name="type.historic.memorial">Men Kov</string>
+    <string name="type.historic.memorial.cross">Krows Men Kov</string>
+    <string name="type.historic.memorial.plaque">Leghen Men Kov</string>
+    <string name="type.historic.memorial.sculpture">Gravyans</string>
+    <string name="type.historic.memorial.statue">Delow</string>
+    <string name="type.historic.memorial.stolperstein">Men Kov rag Fethesigow a an Naziow</string>
+    <string name="type.historic.stone">Men Istorek</string>
+    <string name="type.historic.memorial.war_memorial">Men Kov Bell</string>
+    <string name="type.historic.mine">Hwel Istorek</string>
+    <string name="type.historic.monument">Men Kov Bras</string>
+    <string name="type.historic.pillory">Karghar Prenn</string>
+    <string name="type.historic.ruins">Kryllasow Istorek</string>
+    <string name="type.historic.ship">Gorhel</string>
+    <string name="type.historic.tank">Tank Istorek</string>
+    <string name="type.historic.tomb">Bedh</string>
+    <string name="type.man_made.cross">Krows</string>
+    <string name="type.historic.wayside_cross">Krows amal an Fordh</string>
+    <string name="type.historic.wayside_shrine">Krerva amal an Fordh</string>
+    <string name="type.historic.wreck">Gwreck</string>
+    <string name="type.internet_access">Kesrosweyth</string>
+    <string name="type.internet_access.wlan">Kesrosweyth</string>
+    <string name="type.junction">Fordh Dhibarth</string>
+    <string name="type.junction.circular">Fordh A-Dro</string>
+    <string name="type.junction.roundabout">Fordh A-Dro</string>
+    <string name="type.landuse">Devnydh Tir</string>
+    <string name="type.landuse.allotments">Pastellow Tir</string>
+    <string name="type.landuse.basin">Bason</string>
+    <string name="type.landuse.brownfield">Tir Ragdevnydhys</string>
+    <string name="type.landuse.cemetery">Korflan</string>
+    <string name="type.landuse.cemetery.christian">Korflan Kristyon</string>
+    <string name="type.landuse.religious">Tir Kryjyk</string>
+    <string name="type.landuse.commercial">Tir Kenwerthel</string>
+    <string name="type.landuse.construction">Tir Drehevyans</string>
+    <string name="type.landuse.education">Komodyta Adhyskansel</string>
+    <string name="type.landuse.farmland">Tir Ammeth</string>
+    <string name="type.landuse.farmyard">Garth an Dre</string>
+    <string name="type.landuse.flowerbed">Bleujyowek</string>
+    <string name="type.landuse.forest">Koos</string>
+    <string name="type.landuse.forest.coniferous">Koos Bydhlas</string>
+    <string name="type.landuse.forest.deciduous">Koos Kolldhel</string>
+    <string name="type.landuse.forest.mixed">Koos Gemyskys</string>
+    <string name="type.landuse.garages">Karrjiow</string>
+    <string name="type.landuse.grass">Gwels</string>
+    <string name="type.landuse.greenfield">Tir Gwyrgh</string>
+    <string name="type.landuse.greenhouse_horticulture">Chi Gweder</string>
+    <string name="type.landuse.industrial">Hwelbark</string>
+    <string name="type.landuse.landfill">Tirlanow</string>
+    <string name="type.landuse.meadow">Pras</string>
+    <string name="type.landuse.military">Selva</string>
+    <string name="type.landuse.orchard">Avalennek</string>
+    <string name="type.landuse.quarry">Mengleudh</string>
+    <string name="type.landuse.railway">Yyns Horn</string>
+    <string name="type.landuse.recreation_ground">Park</string>
+    <string name="type.landuse.reservoir">Kreun</string>
+    <string name="type.landuse.residential">Tir Anedhel</string>
+    <string name="type.landuse.retail">Tir Daskwerthans</string>
+    <string name="type.landuse.salt_pond">Poll Holan</string>
+    <string name="type.landuse.village_green">Plen Glas Gwig</string>
+    <string name="type.landuse.vineyard">Gwinlan</string>
+    <string name="type.leisure">Tir rag Termyn Syger</string>
+    <string name="type.leisure.bandstand">Gwariva Poblek</string>
+    <string name="type.leisure.common">Tir Poblek</string>
+    <string name="type.leisure.dog_park">Park rag Keun</string>
+    <string name="type.leisure.fitness_centre">Hel Sport</string>
+    <string name="type.leisure.dance">Hel Donsya</string>
+    <string name="type.leisure.garden">Jardin</string>
+    <string name="type.leisure.garden.residential">Jardin Anedhel</string>
+    <string name="type.leisure.golf_course">Gwel Golf</string>
+    <string name="type.leisure.miniature_golf">Gwel Golf Munys</string>
+    <string name="type.leisure.indoor_play">Garth-Gwari Pervedhek</string>
+    <string name="type.leisure.marina">Porth</string>
+    <string name="type.leisure.nature_reserve">Gwithva Natur</string>
+    <string name="type.leisure.outdoor_seating">Esedhow yn-mes</string>
+    <string name="type.leisure.firepit">Oles</string>
+    <string name="type.leisure.park">Park</string>
+    <string name="type.leisure.park.no.access">Park Privedh</string>
+    <string name="type.leisure.park.permissive">Park</string>
+    <string name="type.leisure.park.private">Park Privedh</string>
+    <string name="type.leisure.picnic_table">Bordh Kroust</string>
+    <string name="type.leisure.pitch">Len Sportys</string>
+    <string name="type.leisure.playground">Garth-Gwari</string>
+    <string name="type.leisure.recreation_ground">Park</string>
+    <string name="type.leisure.sauna">Sawna</string>
+    <string name="type.leisure.sports_centre">Kres Sportya</string>
+    <string name="type.leisure.sports_centre.sport.multi">Kres Sportya Liesek</string>
+    <string name="type.leisure.sports_centre.sport.american_football">Kres Pel Droos Amerikanek</string>
+    <string name="type.leisure.sports_centre.sport.archery">Kres Gwaregieth</string>
+    <string name="type.leisure.sports_centre.sport.athletics">Kres Athletek</string>
+    <string name="type.leisure.sports_centre.sport.australian_football">Kres Pel Droos Ostralek</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Kres Badminton</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Kres Pel Vas</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Kres Pel Ganstel</string>
+    <string name="type.leisure.sports_centre.sport.beachvolleyball">Kres Pel Volli war an Treth</string>
+    <string name="type.leisure.sports_centre.sport.bowls">Kres Gwari Pelyow</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Kres Krambla</string>
+    <string name="type.leisure.sports_centre.sport.cricket">Kres Krycket</string>
+    <string name="type.leisure.sports_centre.sport.curling">Kres Hurlya</string>
+    <string name="type.leisure.sports_centre.sport.equestrian">Kres Marghek</string>
+    <string name="type.leisure.sports_centre.sport.field_hockey">Kres Hocki</string>
+    <string name="type.leisure.sports_centre.sport.futsal">Kres Futsal</string>
+    <string name="type.leisure.sports_centre.sport.golf">Kres Golf</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Kres Gymnastek</string>
+    <string name="type.leisure.sports_centre.sport.handball">Kres Pel Dhorn</string>
+    <string name="type.leisure.sports_centre.sport.ice_hockey">Kres Hocki Rew</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Kres Rostell</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Kres Skia</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Kres Pel Droos</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Kres Poll-Neuvya</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Kres Tennis Moos</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Kres Tennis</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Kres Pel Volli</string>
+    <string name="type.leisure.stadium">Sportva</string>
+    <string name="type.leisure.swimming_pool">Poll-Neuvya</string>
+    <string name="type.leisure.swimming_pool.private">Poll-Neuvya Privedh</string>
+    <string name="type.leisure.track">Ol Athletek</string>
+    <string name="type.leisure.track.area">Ol Athletek</string>
+    <string name="type.leisure.beach_resort">Tyller-Havi war an Treth</string>
+    <string name="type.man_made">Dornwrys</string>
+    <string name="type.man_made.cairn">Karnedh</string>
+    <string name="type.man_made.chimney">Chymbla</string>
+    <string name="type.man_made.survey_point">Bleyn Arhwithra</string>
+    <string name="type.man_made.flagpole">Gwelen Baner</string>
+    <string name="type.man_made.lighthouse">Golowji</string>
+    <string name="type.man_made.mast">Gwern</string>
+    <string name="type.man_made.pier">Kay</string>
+    <string name="type.man_made.pipeline">Gooth</string>
+    <string name="type.man_made.pipeline.overground">Gooth a-ugh dhe Leur</string>
+    <string name="type.man_made.surveillance">Kamera Aspians</string>
+    <string name="type.man_made.tower">Tour</string>
+    <string name="type.man_made.communications_tower">Tour Keskomunyans</string>
+    <string name="type.man_made.tower.communication">Tour Keskomunyans</string>
+    <string name="type.man_made.mast.communication">Tour Keskomunyans</string>
+    <string name="type.man_made.petroleum_well">Fenten Oyl bo Petrol</string>
+    <string name="type.man_made.crane">Garan</string>
+    <string name="type.man_made.wastewater_plant">Komodyta Karth Karthyon</string>
+    <string name="type.man_made.water_tap">Tapp</string>
+    <string name="type.man_made.water_tap.drinking_water_no">Tapp</string>
+    <string name="type.man_made.water_tower">Tour Dowrargh</string>
+    <string name="type.man_made.water_well">Fenten</string>
+    <string name="type.man_made.water_well.drinking_water_no">Fenten</string>
+    <string name="type.man_made.windmill">Melin Wyns</string>
+    <string name="type.man_made.works">Tir Gonis</string>
+    <string name="type.military">Selva</string>
+    <string name="type.natural">Natur</string>
+    <string name="type.natural.bare_rock">Karrek</string>
+    <string name="type.natural.shingle">Biliennow</string>
+    <string name="type.natural.scree">Radel</string>
+    <string name="type.natural.bay">Pleg Mor</string>
+    <string name="type.natural.beach">Treth</string>
+    <string name="type.natural.beach.sand">Treth Tewesek</string>
+    <string name="type.natural.beach.gravel">Treth Growan</string>
+    <string name="type.natural.cape">Pennrynn</string>
+    <string name="type.natural.cave_entrance">Entrans Fow</string>
+    <string name="type.natural.cliff">Als</string>
+    <string name="type.natural.earth_bank">Banken</string>
+    <string name="type.man_made.embankment">Bour</string>
+    <string name="type.natural.coastline">Kost</string>
+    <string name="type.natural.desert">Difeyth</string>
+    <string name="type.natural.sand">Tewes</string>
+    <string name="type.natural.geyser">Fenten Gnasek</string>
+    <string name="type.natural.glacier">Rewiva</string>
+    <string name="type.natural.grassland">Tonn</string>
+    <string name="type.natural.heath">Grug</string>
+    <string name="type.natural.hot_spring">Fenten Pooth</string>
+    <string name="type.natural.water.lake">Lynn</string>
+    <string name="type.natural.water.lock">Poll Yet Dhowr</string>
+    <string name="type.natural.water.pond">Poll</string>
+    <string name="type.natural.water.reservoir">Kreun</string>
+    <string name="type.natural.water.basin">Bason</string>
+    <string name="type.natural.water.river">Avon</string>
+    <string name="type.natural.land">Tir</string>
+    <string name="type.natural.meadow">Pras</string>
+    <string name="type.natural.orchard">Avalennek</string>
+    <string name="type.natural.peak">Topp</string>
+    <string name="type.natural.rock">Men</string>
+    <string name="type.natural.scrub">Krann</string>
+    <string name="type.natural.spring">Fenten</string>
+    <string name="type.natural.spring.drinking_water_no">Fenten</string>
+    <string name="type.natural.tree">Gwedhen</string>
+    <string name="type.natural.tree_row">Rew a Gwedhennow</string>
+    <string name="type.natural.vineyard">Gwinlan</string>
+    <string name="type.natural.volcano">Loskvenydh</string>
+    <string name="type.natural.water">Dowr</string>
+    <string name="type.natural.wetland.bog">Keunegen</string>
+    <string name="type.natural.wetland.marsh">Keunek</string>
+    <string name="type.natural.wetland.saltmarsh">Keunek Sall</string>
+    <string name="type.natural.wetland.fen">Gwern</string>
+    <string name="type.natural.wetland.reedbed">Keunegen</string>
+    <string name="type.natural.wetland.swamp">Gwern</string>
+    <string name="type.natural.wetland.mangrove">Koos Liva</string>
+    <string name="type.noexit">Fordh Dhal</string>
+    <string name="type.office">Buro</string>
+    <string name="type.office.company">Buro Kowethyans</string>
+    <string name="type.office.government">Buro Governans</string>
+    <string name="type.office.insurance">Buro Surheans</string>
+    <string name="type.office.lawyer">Laghyas</string>
+    <string name="type.office.ngo">Buro Aluseneth</string>
+    <string name="type.office.telecommunication">Kowethyans Pellgomunyans</string>
+    <string name="type.organic.only">Organek</string>
+    <string name="type.organic.yes">Organek</string>
+    <string name="type.place.city">Cita</string>
+    <string name="type.place.city.capital">Chifcita</string>
+    <string name="type.place.city.capital.10">Cita</string>
+    <string name="type.place.city.capital.11">Cita</string>
+    <string name="type.place.city.capital.2">Chifcita</string>
+    <string name="type.place.city.capital.3">Cita</string>
+    <string name="type.place.city.capital.4">Cita</string>
+    <string name="type.place.city.capital.5">Cita</string>
+    <string name="type.place.city.capital.6">Cita</string>
+    <string name="type.place.city.capital.7">Cita</string>
+    <string name="type.place.city.capital.8">Cita</string>
+    <string name="type.place.city.capital.9">Cita</string>
+    <string name="type.place.continent">Brastir</string>
+    <string name="type.place.country">Bro</string>
+    <string name="type.place.county">Konteth</string>
+    <string name="type.place.farm">Amethva</string>
+    <string name="type.place.hamlet">Gwigbian</string>
+    <string name="type.place.island">Enys</string>
+    <string name="type.place.islet">Enesik</string>
+    <string name="type.place.isolated_dwelling">Tre Enyshes</string>
+    <string name="type.place.locality">Tyller</string>
+    <string name="type.place.quarter">Kwarter</string>
+    <string name="type.place.neighbourhood">Kentreveth</string>
+    <string name="type.place.ocean">Keynvor</string>
+    <string name="type.place.region">Pow</string>
+    <string name="type.place.sea">Mor</string>
+    <string name="type.place.square">Plen</string>
+    <string name="type.place.state">Gwlas</string>
+    <string name="type.place.state.USA">Gwlas Amerikanek</string>
+    <string name="type.place.suburb">Mestrev</string>
+    <string name="type.place.town">Tre</string>
+    <string name="type.place.village">Gwig</string>
+    <string name="type.power">Tredan</string>
+    <string name="type.power.generator">Dinythell Dredan</string>
+    <string name="type.power.generator.solar">Dinythell an Howl</string>
+    <string name="type.power.generator.wind">Dinythell an Awel</string>
+    <string name="type.power.line">Linen Tredanek</string>
+    <string name="type.power.line.underground">Linen Tredanek yn-dann Dhor</string>
+    <string name="type.power.minor_line">Linen Tredanek Le</string>
+    <string name="type.power.plant">Dinythva Dredan</string>
+    <string name="type.power.plant.coal">Tredanva Glow</string>
+    <string name="type.power.plant.gas">Tredanva Gass</string>
+    <string name="type.power.plant.hydro">Tredanva Dowr</string>
+    <string name="type.power.plant.solar">Tredanva an Howl</string>
+    <string name="type.power.plant.wind">Tredanva an Awel</string>
+    <string name="type.power.tower">Tour Tredanek</string>
+    <string name="type.power.pole">Gwelen Tredanek</string>
+    <string name="type.man_made.utility_pole">Gwelen Les</string>
+    <string name="type.public_transport">Karyans Poblek</string>
+    <string name="type.public_transport.platform">Kay</string>
+    <string name="type.railway">Hyns Horn</string>
+    <string name="type.railway.abandoned">Hyns Horn Gesys</string>
+    <string name="type.railway.abandoned.bridge">Pons Hyns Horn Gesys</string>
+    <string name="type.railway.abandoned.tunnel">Kowfordh Hyns Horn Gesys</string>
+    <string name="type.railway.construction">Hyns Horn Drehevyans</string>
+    <string name="type.railway.crossing">Treusva Hyns Horn</string>
+    <string name="type.railway.disused">Hyns Horn Undevnydhys</string>
+    <string name="type.railway.halt">Savla Tren</string>
+    <string name="type.railway.level_crossing">Treusva Hyns Horn</string>
+    <string name="type.railway.light_rail">Hyns Horn Byghan</string>
+    <string name="type.railway.light_rail.bridge">Pons Hyns Horn Byghan</string>
+    <string name="type.railway.light_rail.tunnel">Kowfordh Hyns Horn Byghan</string>
+    <string name="type.railway.monorail">Tren Ungledhren</string>
+    <string name="type.railway.monorail.bridge">Pons Tren Ungledhren</string>
+    <string name="type.railway.monorail.tunnel">Kowfordh Tren Ungledhren</string>
+    <string name="type.railway.platform">Kay</string>
+    <string name="type.railway.rail">Hyns Horn</string>
+    <string name="type.railway.rail.highspeed">Hyns Horn Tooth</string>
+    <string name="type.railway.rail.tourism">Hyns Horn Tourystek</string>
+    <string name="type.railway.rail.main">Hyns Horn</string>
+    <string name="type.railway.rail.branch">Hyns Horn Skorr</string>
+    <string name="type.railway.rail.utility">Hyns Horn Gonis</string>
+    <string name="type.railway.rail.bridge">Pons Hyns Horn</string>
+    <string name="type.railway.rail.highspeed.bridge">Pons Hyns Horn Tooth</string>
+    <string name="type.railway.rail.tourism.bridge">Pons Hyns Horn Tourystek</string>
+    <string name="type.railway.rail.main.bridge">Pons Hyns Horn</string>
+    <string name="type.railway.rail.branch.bridge">Pons Hyns Horn Skorr</string>
+    <string name="type.railway.rail.tunnel">Kowfordh Hyns Horn</string>
+    <string name="type.railway.rail.highspeed.tunnel">Kowfordh Hyns Horn Tooth</string>
+    <string name="type.railway.rail.tourism.tunnel">Kowfordh Hyns Horn Tourystek</string>
+    <string name="type.railway.rail.main.tunnel">Kowfordh Hyns Horn</string>
+    <string name="type.railway.rail.branch.tunnel">Kowfordh Hyns Horn Skorr</string>
+    <string name="type.railway.station">Gorsav</string>
+    <string name="type.railway.station.light_rail">Gorsav</string>
+    <string name="type.railway.station.light_rail.berlin">Gorsav S-Bahn</string>
+    <string name="type.railway.station.light_rail.london">Gorsav DLR</string>
+    <string name="type.railway.station.light_rail.porto">Gorsav Metro Porto</string>
+    <string name="type.railway.station.monorail">Gorsav Tren Ungledhren</string>
+    <string name="type.railway.station.subway">Gorsav Metro</string>
+    <string name="type.railway.station.subway.adana">Gorsav Metro</string>
+    <string name="type.railway.station.subway.algiers">Gorsav Metro</string>
+    <string name="type.railway.station.subway.almaty">Gorsav Metro</string>
+    <string name="type.railway.station.subway.amsterdam">Gorsav Metro</string>
+    <string name="type.railway.station.subway.ankara">Gorsav Metro</string>
+    <string name="type.railway.station.subway.athens">Gorsav Metro</string>
+    <string name="type.railway.station.subway.baku">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bangkok">Gorsav Metro</string>
+    <string name="type.railway.station.subway.barcelona">Gorsav Metro</string>
+    <string name="type.railway.station.subway.beijing">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bengalore">Gorsav Metro</string>
+    <string name="type.railway.station.subway.berlin">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bilbao">Gorsav Metro</string>
+    <string name="type.railway.station.subway.brasilia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.brescia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.brussels">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bucharest">Gorsav Metro</string>
+    <string name="type.railway.station.subway.budapest">Gorsav Metro</string>
+    <string name="type.railway.station.subway.buenos_aires">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bursa">Gorsav Metro</string>
+    <string name="type.railway.station.subway.cairo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.caracas">Gorsav Metro</string>
+    <string name="type.railway.station.subway.catania">Gorsav Metro</string>
+    <string name="type.railway.station.subway.changchun">Gorsav Metro</string>
+    <string name="type.railway.station.subway.chengdu">Gorsav Metro</string>
+    <string name="type.railway.station.subway.chicago">Gorsav Metro</string>
+    <string name="type.railway.station.subway.chongqing">Gorsav Metro</string>
+    <string name="type.railway.station.subway.dalian">Gorsav Metro</string>
+    <string name="type.railway.station.subway.delhi">Gorsav Metro</string>
+    <string name="type.railway.station.subway.dnepro">Gorsav Metro</string>
+    <string name="type.railway.station.subway.dubai">Gorsav Metro</string>
+    <string name="type.railway.station.subway.ekb">Gorsav Metro</string>
+    <string name="type.railway.station.subway.fukuoka">Gorsav Metro</string>
+    <string name="type.railway.station.subway.glasgow">Gorsav Metro</string>
+    <string name="type.railway.station.subway.guangzhou">Gorsav Metro</string>
+    <string name="type.railway.station.subway.hamburg">Gorsav Metro</string>
+    <string name="type.railway.station.subway.helsinki">Gorsav Metro</string>
+    <string name="type.railway.station.subway.hiroshima">Gorsav Metro</string>
+    <string name="type.railway.station.subway.hongkong">Gorsav Metro</string>
+    <string name="type.railway.station.subway.isfahan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.istanbul">Gorsav Metro</string>
+    <string name="type.railway.station.subway.izmir">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kazan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kharkiv">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kiev">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kobe">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kolkata">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kunming">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kyoto">Gorsav Metro</string>
+    <string name="type.railway.station.subway.la">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lausanne">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lille">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lima">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lisboa">Gorsav Metro</string>
+    <string name="type.railway.station.subway.london">Gorsav Tube</string>
+    <string name="type.railway.station.subway.lyon">Gorsav Metro</string>
+    <string name="type.railway.station.subway.madrid">Gorsav Metro</string>
+    <string name="type.railway.station.subway.malaga">Gorsav Metro</string>
+    <string name="type.railway.station.subway.manila">Gorsav Metro</string>
+    <string name="type.railway.station.subway.maracaibo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.mashhad">Gorsav Metro</string>
+    <string name="type.railway.station.subway.mecca">Gorsav Metro</string>
+    <string name="type.railway.station.subway.medellin">Gorsav Metro</string>
+    <string name="type.railway.station.subway.mexico">Gorsav Metro</string>
+    <string name="type.railway.station.subway.milan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.minsk">Gorsav Metro</string>
+    <string name="type.railway.station.subway.montreal">Gorsav Metro</string>
+    <string name="type.railway.station.subway.moscow">Gorsav Metro</string>
+    <string name="type.railway.station.subway.munchen">Gorsav Metro</string>
+    <string name="type.railway.station.subway.nagoya">Gorsav Metro</string>
+    <string name="type.railway.station.subway.newyork">Gorsav Metro</string>
+    <string name="type.railway.station.subway.nnov">Gorsav Metro</string>
+    <string name="type.railway.station.subway.novosibirsk">Gorsav Metro</string>
+    <string name="type.railway.station.subway.osaka">Gorsav Metro</string>
+    <string name="type.railway.station.subway.oslo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.palma">Gorsav Metro</string>
+    <string name="type.railway.station.subway.panama">Gorsav Metro</string>
+    <string name="type.railway.station.subway.paris">Gorsav Metro</string>
+    <string name="type.railway.station.subway.philadelphia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.pyongyang">Gorsav Metro</string>
+    <string name="type.railway.station.subway.qingdao">Gorsav Metro</string>
+    <string name="type.railway.station.subway.rennes">Gorsav Metro</string>
+    <string name="type.railway.station.subway.rio">Gorsav Metro</string>
+    <string name="type.railway.station.subway.roma">Gorsav Metro</string>
+    <string name="type.railway.station.subway.rotterdam">Gorsav Metro</string>
+    <string name="type.railway.station.subway.samara">Gorsav Metro</string>
+    <string name="type.railway.station.subway.santiago">Gorsav Metro</string>
+    <string name="type.railway.station.subway.santo_domingo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.saopaulo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sapporo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sendai">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sf">Gorsav Metro</string>
+    <string name="type.railway.station.subway.shanghai">Gorsav Metro</string>
+    <string name="type.railway.station.subway.shenzhen">Gorsav Metro</string>
+    <string name="type.railway.station.subway.shiraz">Gorsav Metro</string>
+    <string name="type.railway.station.subway.singapore">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sofia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.spb">Gorsav Metro</string>
+    <string name="type.railway.station.subway.stockholm">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tabriz">Gorsav Metro</string>
+    <string name="type.railway.station.subway.taipei">Gorsav Metro</string>
+    <string name="type.railway.station.subway.taoyuan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tashkent">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tbilisi">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tehran">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tianjin">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tokyo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.valencia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.vienna">Gorsav Metro</string>
+    <string name="type.railway.station.subway.warszawa">Gorsav Metro</string>
+    <string name="type.railway.station.subway.washington">Gorsav Metro</string>
+    <string name="type.railway.station.subway.wuhan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.yerevan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.yokohama">Gorsav Metro</string>
+    <string name="type.railway.subway">Gorsav Metro</string>
+    <string name="type.railway.subway_entrance">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.adana">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.algiers">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.almaty">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.amsterdam">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.ankara">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.athens">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.baku">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bangkok">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.barcelona">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.beijing">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bengalore">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.berlin">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bilbao">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.brasilia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.brescia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.brussels">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bucharest">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.budapest">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.buenos_aires">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bursa">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.cairo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.caracas">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.catania">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.changchun">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.chengdu">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.chicago">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.chongqing">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.dalian">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.delhi">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.dnepro">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.dubai">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.ekb">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.fukuoka">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.glasgow">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.guangzhou">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.hamburg">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.helsinki">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.hiroshima">Entrans Metro</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,40 @@
     <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>
+    <string name="type.cuisine.chinese">Kitajska kuhinja</string>
+    <string name="type.cuisine.crepe">Krep</string>
+    <string name="type.cuisine.donut">Donat</string>
+    <string name="type.cuisine.fish">Ribe</string>
+    <string name="type.cuisine.fish_and_chips">Riba s krompirčkom</string>
+    <string name="type.cuisine.french">Francoska kuhinja</string>
+    <string name="type.cuisine.grill">Žar</string>
+    <string name="type.cuisine.hotdog">Hot dog</string>
+    <string name="type.craft.electronics_repair">Popravilo elektronike</string>
+    <string name="type.craft.gardener">Vrtnar</string>
+    <string name="type.craft.hvac">Ogrevanje, prezračevanje, klimatizacija</string>
+    <string name="type.craft.key_cutter">Ključavničar</string>
+    <string name="type.shop.camera">Trgovina s fotoaparati</string>
+    <string name="type.craft.plumber">Vodovodar</string>
+    <string name="type.cuisine.breakfast">Zajtrk</string>
+    <string name="type.cuisine.bubble_tea">Čaj s tapiokinimi kroglicami (\'Bubble Tea\')</string>
+    <string name="type.cuisine.chicken">Piščanec</string>
 </resources>

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

@@ -379,6 +379,7 @@
     <string name="type.emergency.life_ring">Lifebuoy</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
     <string name="type.emergency.fire_hydrant">Fire Hydrant</string>
+    <string name="type.amenity.hydrant">Irrigation Hydrant</string>
     <string name="type.emergency.phone">Emergency Phone</string>
     <!-- A place where a lifeguard is on duty. -->
     <string name="type.emergency.lifeguard">Lifeguard</string>

configure.sh

@@ -116,6 +116,9 @@ fi
 echo "Generating search categories / synonyms..."
 ./tools/unix/generate_categories.sh
 
+echo "Generating Desktop UI strings..."
+./tools/unix/generate_desktop_ui_strings.sh
+
 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
   if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
     echo "Generating symbols..."

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"
+}