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

Signed-off-by: map-per <map-per@gmx.de>
review fixes
2025-12-19 13:03:36 +00:00 · 2025-12-17 15:22:06 +01:00 · 2025-12-17 15:05:09 +01:00 · 2025-12-17 15:05:08 +01:00 · 2025-12-17 15:05:08 +01:00 · 2025-12-17 15:05:08 +01:00
115 changed files with 1951 additions and 411 deletions
--- a/.forgejo/CODEOWNERS
+++ b/.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
--- a/.forgejo/FUNDING.yml
+++ b/.forgejo/FUNDING.yml
@@ -1 +1,3 @@
 open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]
--- a/.gitignore
+++ b/.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

--- a/android/app/src/fdroid/play/listings/lt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/short-description.txt
@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
--- a/android/app/src/fdroid/play/listings/sl/full-description.txt
+++ b/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č
--- a/android/app/src/google/play/listings/lt/short-description.txt
+++ b/android/app/src/google/play/listings/lt/short-description.txt
@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
--- a/android/app/src/google/play/listings/sl/title.txt
+++ b/android/app/src/google/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps - Usmerjajte zasebno
+CoMaps - Usmerjajte se zasebno
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/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;
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -692,6 +692,7 @@ public class PlacePageView extends Fragment
    {
      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);

@@ -711,27 +712,32 @@ public class PlacePageView extends Fragment
          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
        });

-        CountryItem map = CountryItem.fill(MapManager.nativeGetSelectedCountry());
+        String countryId = MapManager.nativeGetSelectedCountry();

-        if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
-            || map.status == CountryItem.STATUS_FAILED)
+        if (countryId != null)
        {
-          mMapTooOld.setVisibility(VISIBLE);
-          MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
-          boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
+          CountryItem map = CountryItem.fill(countryId);

-          if (canUpdateMap)
+          if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
+              || map.status == CountryItem.STATUS_FAILED)
          {
-            mTvUpdateTooOldMap.setOnClickListener((v) -> {
-              MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
-              mMapTooOld.setVisibility(GONE);
-            });
-          }
-          else
-          {
-            mTvUpdateTooOldMap.setVisibility(GONE);
+            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);
-            mapTooOldDescription.setText(R.string.place_page_app_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);
          }
        }
      }
--- a/android/app/src/main/res/drawable/ic_minus.xml
+++ b/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>
--- a/android/app/src/main/res/drawable/ic_plus.xml
+++ b/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>
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/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"
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/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
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/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
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/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
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/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
--- a/android/app/src/main/res/layout/dialog_edit_text.xml
+++ b/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">
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/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"
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/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"
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/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"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/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>
--- a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
+++ b/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
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_bookmark_collection.xml
+++ b/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>
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_localized_name.xml
+++ b/android/app/src/main/res/layout/item_localized_name.xml
@@ -10,7 +10,6 @@
  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"
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/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>

--- a/android/app/src/main/res/layout/item_track.xml
+++ b/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
--- a/android/app/src/main/res/layout/map_buttons_zoom.xml
+++ b/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>
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -82,7 +82,7 @@

  <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"
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/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"
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -912,4 +912,12 @@
    <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>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -907,4 +907,10 @@
    <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>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -896,4 +896,10 @@
    <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>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/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 -->
@@ -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 -->
@@ -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>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -905,4 +905,10 @@
    <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>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -25,44 +25,44 @@
    <!-- Location services are disabled by user alert - message -->
    <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>
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -524,7 +524,7 @@
    <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 syöttänyt henkilökohtaisia tietojasi.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</string>
+    <string name="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>
@@ -903,4 +903,12 @@
    <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>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -261,4 +261,13 @@
    <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>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -898,4 +898,12 @@
    <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>
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -371,4 +371,6 @@
    <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>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -899,4 +899,11 @@
    <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>
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/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>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -910,4 +910,9 @@
    <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>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/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>
@@ -639,4 +639,22 @@
        <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>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -912,4 +912,9 @@
    <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>
--- a/android/app/src/main/res/values/dimens.xml
+++ b/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>
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/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>
--- a/android/app/src/main/res/values/styles.xml
+++ b/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>
--- a/android/app/src/main/res/values/themes.xml
+++ b/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>
--- a/android/sdk/src/main/assets/mapcss-mapping.csv
+++ b/android/sdk/src/main/assets/mapcss-mapping.csv
@@ -0,0 +1 @@
+../../../../../data/mapcss-mapping.csv
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/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>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -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>
@@ -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>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/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>
--- a/android/sdk/src/main/res/values-kw/types_strings.xml
+++ b/android/sdk/src/main/res/values-kw/types_strings.xml
@@ -179,34 +179,686 @@
    <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.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.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.chinese">Chinek</string>
    <string name="type.cuisine.coffee_shop">Koffi</string>
-    <string name="type.cuisine.croatian">kroatek</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.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.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.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>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -352,4 +352,21 @@
    <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>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/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>
--- a/configure.sh
+++ b/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..."
--- a/data/categories-strings/bg.json/localize.json
+++ b/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": "местност|регион|Място",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -384,7 +384,7 @@
 "shop-outpost": "4Pickup Point|4Parcel Pickup",
 "amenity-vending_machine-fuel|@category_fuel": "Fuel Dispenser|Gas Pump",
 "building-garage": "Garage",
-"highway-rest_area|highway-services": "4Rest area|4Service area|station",
+"highway-rest_area|highway-services": "4Rest area|4Service area|station|rest stop",
 "man_made-chimney": "Chimney",
 "man_made-crane": "Crane",
 "man_made-tower|man_made-flare": "Tower",
@@ -435,7 +435,8 @@
 "emergency-assembly_point": "5Emergency assembly point",
 "emergency-life_ring": "5Lifebuoy|6Life Ring|life-ring|lifering|flotation device|floatation device",
 "emergency-defibrillator": "4Defibrillator|AED",
-"emergency-fire_hydrant": "4Fire Hydrant|Fire Plug",
+"emergency-fire_hydrant": "4Fire Hydrant|Fire Plug|Hydrant",
+"amenity-hydrant": "Irrigation Hydrant|Water Hydrant|Cleaning Hydrant|Hydrant",
 "emergency-lifeguard": "Lifeguard|Lifesaver",
 "emergency-mountain_rescue": "Mountain Rescue Station|Search and Rescue|rescue",
 "leisure-fitness_station": "3Fitness Station|street workout|fitness|workout|4Exercise station|Exercise bench|outdoor gym|5Calisthenics park|trim trail",
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -405,7 +405,8 @@
 "amenity-shower": "3Ducha|duchas|4Regadera|regaderas",
 "emergency-assembly_point": "Punto de reunión de emergencia|reunión de emergencia|emergencia",
 "emergency-defibrillator": "4Desfibrilador|defibrilador|socorro|primeros auxilios|auxilio|electroshock|schock|reanimar|reanimación|paro cardíaco|infarto|emergencia",
-"emergency-fire_hydrant": "Boca de incendio|Hidrante",
+"emergency-fire_hydrant": "Boca de incendio|Boca de incendios|Hidrante|Hidrante de incendio|Hidrante de incendios|Hidrante contra incendios|Hidrante de fuego",
+"amenity-hydrant": "Boca de riego|Hidrante de riego|Hidrante de agua|Hidrante técnico|Hidrante de limpieza|Hidrante",
 "emergency-lifeguard": "Socorrista|Salvavidas",
 "emergency-mountain_rescue": "Puesto de rescate de montaña|Búsqueda y rescate|Rescate|rescatista|rescatistas",
 "leisure-fitness_station": "Aparatos de gimnasia|Aparatos de ejercicio|Estación de ejercicios|Gimnasio exterior|Calistenia|Ejercicio",
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -399,7 +399,8 @@
 "amenity-shower": "Douche",
 "emergency-assembly_point": "Point de rassemblement d'urgence",
 "emergency-defibrillator": "4Défibrillateur|DAE",
-"emergency-fire_hydrant": "Bouche d’incendie|borne d'incendie",
+"emergency-fire_hydrant": "Bouche d’incendie|bouche de incendie|borne d’incendie|borne de incendie|Borne hydratante|Poteau d’incendie|Hydrant|Hydrante",
+"amenity-hydrant": "Bouche d’puisage|bouche de puisage|borne d’puisage|bourne de puisage|Hydrant|Hydrante",
 "emergency-lifeguard": "Sauveteur d’urgence|Sauveteur",
 "emergency-mountain_rescue": "Sauveteurs en montagne d’urgence",
 "leisure-fitness_station": "Station de fitness|Parcours de santé",
--- a/data/categories-strings/ru.json/localize.json
+++ b/data/categories-strings/ru.json/localize.json
@@ -199,7 +199,7 @@
 "place-state": "Штат|провинция",
 "place-region": "Район",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона|Жилой комплекс|ж.к.|ЖК",
 "place-hamlet": "Посёлок|деревня",
 "place-village": "Деревня|поселок",
 "place-locality": "Местность|регион",
--- a/data/categories-strings/uk.json/localize.json
+++ b/data/categories-strings/uk.json/localize.json
@@ -196,7 +196,7 @@
 "place-state": "Штат|провінція|регіон",
 "place-region": "Район|область",
 "place-island|place-islet": "Острів",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство|Житловий комплекс|ж.к.|ЖК",
 "place-hamlet": "Поселення|селище|село",
 "place-village": "Село|хутір|поселення",
 "place-locality": "Місцевість|регіон|Місце",
--- a/data/countries-strings/es.json/localize.json
+++ b/data/countries-strings/es.json/localize.json
@@ -1096,7 +1096,7 @@
 "US_New Jersey_South":"Nueva Jersey — Sur",
 "US_New Mexico":"Nuevo México",
 "US_New York_East":"Nueva York — Long Island",
-"US_New York_New York":"Nueva York — Nueva York",
+"US_New York_New York":"Nueva York — Ciudad de Nueva York",
 "US_New York_North":"Nueva York — Norte",
 "US_New York_West":"Nueva York — Oeste",
 "US_North Carolina_Asheville":"Asheville",
@@ -1898,7 +1898,7 @@
 "Japan_Kanto_Kanagawa Description":"Yokohama, Sagamihara, Fujisawa",
 "Japan_Kanto_Saitama Description":"Saitama, Kawaguchi, Hannō",
 "Japan_Kanto_Tochigi Description":"Ashikaga, Kanuma, Sano",
-"Japan_Kanto_Tokyo Description":"Tokio, Hachiōji",
+"Japan_Kanto_Tokyo Description":"Tokio, Setagaya, Hachiōji",
 "Japan_Kinki Region_Mie Description":"Kumano, Tsu, Kameyama",
 "Japan_Kinki Region_Nara Description":"Nara, Kashihara, Ikoma",
 "Japan_Kinki Region_Osaka_Osaka Description":"Osaka, Ashiya, Sennan",
@@ -1961,7 +1961,7 @@
 "Mexico_Mexico Description":"Ciudad de México, Puebla de Zaragoza, Cuautitlán Izcalli",
 "Mexico_Sonora Description":"Hermosillo, Ciudad Obregon, Heroica Nogales",
 "Mexico_South Description":"León, Santiago de Querétaro, Acapulco",
-"Moldova Description":"Chisinau,Tiraspol, Balti",
+"Moldova Description":"Chisinau, Tiraspol, Balti",
 "Monaco Description":"Mónaco, Mónaco",
 "Mongolia Description":"Ulán Bator, Khovd, Erdenet",
 "Montenegro Description":"Podgorica, Niksic, Tuzi",
@@ -2004,7 +2004,7 @@
 "Netherlands_Utrecht_Utrecht Description":"Utrecht, Nieuwegein, Houten",
 "Netherlands_Zeeland Description":"Middelburg, Vlissingen, Goes",
 "New Zealand North_Auckland Description":"Auckland, Hamilton, Tauranga",
-"New Zealand North_Wellington Description":"Wellington, Lower Hutt, Palmerston North",
+"New Zealand North_Wellington Description":"Wellington, Bajo Hutt, Palmerston Norte",
 "New Zealand South_Canterbury Description":"Christchurch, Nelson, Waimate",
 "New Zealand South_Southland Description":"Dunedin, Invercargill, Tuatapere",
 "Nicaragua Description":"Managua, Matagalpa, Bluefields",
@@ -2032,14 +2032,14 @@
 "Palestine Description":"Gaza (Ciudad de Gaza)",
 "Panama Description":"Panamá",
 "Papua New Guinea Description":"Puerto Moresby",
-"Paraguay Description":"Asuncion, San Lorenzo, Ciudad del Este",
-"Peru_Lima Description":"Lima, Ica",
+"Paraguay Description":"Asunción, San Lorenzo, Ciudad del Este",
+"Peru_Lima Description":"Lima, Ica, Nazca",
 "Peru_North Description":"Chiclayo, Iquitos, Piura",
 "Peru_South Description":"Arequipa, Abancay, Moquegua",
 "Philippines_Luzon_Manila Description":"Manila, Quezon City, Pasig",
-"Philippines_Luzon_North Description":"Angeles, Palayan, Malolos",
-"Philippines_Luzon_South Description":"Puerto Princesa, Masbate, Calapan",
-"Philippines_Mindanao Description":"Zamboanga City, General Santos, Koronadal",
+"Philippines_Luzon_North Description":"Ángeles, Palayán, Malolos",
+"Philippines_Luzon_South Description":"Puerto Princesa, Masbate, Calapán",
+"Philippines_Mindanao Description":"Ciudad Zamboanga, General Santos, Koronadal",
 "Philippines_Visayas Description":"Bacólod",
 "Pitcairn Islands Description":"Adamstown",
 "Poland_Greater Poland Voivodeship Description":"Poznan, Kalisz, Piła, Konin",
--- a/data/countries-strings/lt.json/localize.json
+++ b/data/countries-strings/lt.json/localize.json
@@ -17,13 +17,13 @@
 "India":"Indija",
 "Ireland":"Airija",
 "Italy":"Italija",
-"Nauru":"Naurų",
+"Nauru":"Nauru",
 "Poland":"Lenkija",
 "Romania":"Rumunija",
 "Slovakia":"Slovakija",
 "Slovenia":"Slovėnija",
 "Tokelau":"Tokelau",
-"United States of America Short":"USA",
+"United States of America Short":"JAV",
 "United Kingdom Short":"JK",
 "Czech Republic Short":"Čekija",
 "Australia":"Australija",
@@ -55,9 +55,9 @@
 "Azerbaijan":"Azerbaidžanas",
 "Italy_Lombardy":"Lombardija",
 "Jamaica":"Jamaika",
-"Spain_Extremadura":"Ispanų kalbos Ekstremadūros tarmė",
+"Spain_Extremadura":"Estremadūra",
 "US_Georgia":"Džordžija",
-"Spain_Galicia_North Short":"Galisų",
+"Spain_Galicia_North Short":"Galisija",
 "Azerbaijan Region":"Azerbaidžanas",
 "Bolivia":"Bolivija",
 "Canada_Ontario_Bame":"Baris",
@@ -66,16 +66,16 @@
 "Georgia":"Sakartvelas",
 "Indiana":"Indiana",
 "Spain_Galicia":"Galisija",
-"Spain_Galicia_South Short":"Galisų",
+"Spain_Galicia_South Short":"Galisija",
 "Ethiopia":"Etiopija",
 "Germany_Free State of Bavaria":"Bavarija",
 "Italy_Liguria":"Ligūrija",
 "Italy_Sardinia":"Sardinija",
 "Malaysia":"Malaysian",
-"Mongolia":"Mongolų",
+"Mongolia":"Mongolija",
 "Pakistan":"Pakistano",
-"Serbia":"Serbų",
-"Somalia":"Somaliečių",
+"Serbia":"Serbija",
+"Somalia":"Somalis",
 "India_Gujarat":"Gudžaratas",
 "India_Manipur":"Manipuras",
 "India_Punjab":"Pandžabas",
@@ -230,7 +230,7 @@
 "Seychelles":"Seišelės",
 "Sierra Leone":"Siera Leonė",
 "Singapore":"Singapūras",
-"South Georgia and the South Sandwich Islands":"Pietų Džordžija ir Pietų sumuštinių salos",
+"South Georgia and the South Sandwich Islands":"Pietų Džordžija ir Pietų Sandvičo salos",
 "Sudan":"Sudanas",
 "Suriname":"Surinamas",
 "The Gambia":"Gambija",
@@ -403,7 +403,7 @@
 "China_Shanxi":"Šansi",
 "China_Sichuan":"Sičuanas",
 "China_Tibet Autonomous Region":"Tibeto autonominis rajonas",
-"China_Xinjiang":"Sindziango Uigūrų autonominis rajonas",
+"China_Xinjiang":"Sindziango uigūrų autonominis rajonas",
 "China_Yunnan":"Junanas",
 "China_Zhejiang":"Džedziangas",
 "Colombia_East":"Kolumbija – rytinė",
@@ -1782,5 +1782,175 @@
 "India_Haryana Description":"Pančkula, Revaris, Rohtakas",
 "India_Himachal Pradesh Description":"Nurpuras, Mandis, Bharmuras",
 "India_Jammu and Kashmir Description":"Šrynagaras, Džamu, Udampuras",
-"India_Jharkhand Description":"Ranči, Danbadas, Džamšedpuras"
+"India_Jharkhand Description":"Ranči, Danbadas, Džamšedpuras",
+"India_Karnataka_North Description":"Belagavis, Hubalis, Mangaloras",
+"India_Karnataka_South Description":"Bengaloras, Maisūru, Kolaro aukso kasyklos",
+"India_Kerala Description":"Tiruvanantapuramas, Ernakulamas, Tričūras",
+"India_Lakshadweep Description":"Kavaratis, Minikojus, Agatis",
+"India_Madhya Pradesh Description":"Indauras, Bopalas, Gvalijaras",
+"India_Maharashtra Description":"Mumbajus, Punė, Nagpuras",
+"India_Manipur Description":"Impalas, Džiribamas",
+"India_Meghalaya Description":"Šilongas, Garobanda, Betasingas",
+"India_Mizoram Description":"Aizaulas, Lunglėjus, Mamitas",
+"India_Nagaland Description":"Kohyma, Perenas",
+"India_Odisha Description":"Katakas, Raurkela, Brahmapuras",
+"India_Punjab Description":"Džalandaras, Amritsaras, Batinda",
+"India_Rajasthan Description":"Džaipuras, Džodpuras, Kota",
+"India_Sikkim Description":"Gangtokas, Gjalšingas, Džoretangas",
+"India_Tamil Nadu Description":"Čenajus, Kanijakumaris, Namakalas",
+"India_Telangana Description":"Haidarabadas, Varangalas, Kamamas",
+"India_Tripura Description":"Agartala, Bišramgandžas, Belonija",
+"India_Uttar Pradesh Description":"Alahabadas, Laknau, Varanasis",
+"India_Uttarakhand Description":"Dehradūnas, Rūrkis, Haridvaras",
+"India_West Bengal Description":"Kolkata, Siliguris, Asansolas",
+"Indonesia_Central Description":"Makasaras, Samarinda, Pontianakas",
+"Indonesia_East Description":"Sorongas, Timika, Manokvaris",
+"Indonesia_Jawa Barat Description":"Džakarta, Bandungas, Pietų Tangerangas",
+"Indonesia_Jawa Tengah Description":"Semarangas, Džokjakarta, Surakarta",
+"Indonesia_Jawa Timur Description":"Sumenepas, Tulungagungas, Batu",
+"Indonesia_Nusa Tenggara Description":"Denpasaras, Semarapura, Tambolaka",
+"Indonesia_West Description":"Medanas, Siak Sri Indrapura, Lampungas",
+"Iran_East Description":"Mašhadas, Zahedanas, Jazdas",
+"Iran_North Description":"Teheranas, Karadžas, Tebrizas",
+"Iran_South Description":"Isfahanas, Širazas, Ahvazas",
+"Iraq_North Description":"Mosulas, Erbilis, Kirkukas, Tikritas",
+"Iraq_South Description":"Bagdadas, Basra, Hila, Ramadi",
+"Ireland_Connacht Description":"Golvėjus, Svinfordas, Mohilas",
+"Ireland_Leinster Description":"Dublinas, Darou, Prosperosas",
+"Ireland_Munster Description":"Korkas, Kersivynas",
+"Ireland_Northern Counties Description":"Glemkolemkilas, Ardara, Glentisas",
+"Isle of Man Description":"Daglasas, Onkanas",
+"Israel Description":"Tel Avivas-Jafa, Herclija, Modiinas-Makabimas-Reutas",
+"Italy_Abruzzo Description":"Peskara, Rošiolas, Pinetas",
+"Italy_Aosta Valley Description":"Kvartas, Aosta",
+"Italy_Apulia Description":"Baris, Tarantas, Fodža",
+"Italy_Basilicata Description":"Potenca, Matera, Melfis",
+"Italy_Calabria Description":"Kalabrijos Redžas, Katancaras, Kozenca",
+"Italy_Campania Description":"Neapolis, Salernas, Tore del Grekas",
+"Italy_Emilia-Romagna_Bologna Description":"Bolonija, Imola, Kazalekjo di Renas",
+"Italy_Emilia-Romagna_Ferrara Description":"Ferara, Longastrinas, Anita",
+"Italy_Emilia-Romagna_Forli-Cesena Description":"Forli, Čezena, Čezenatikas",
+"Italy_Emilia-Romagna_Modena Description":"Modena, Karpis, Sasuolas",
+"Italy_Emilia-Romagna_Parma Description":"Parma, Fidenca, Salsomadžore Termė",
+"Italy_Emilia-Romagna_Piacenza Description":"Pjačenca, San Nikolo prie Trebijos, Ciano Pjačentinas",
+"Italy_Emilia-Romagna_Ravenna Description":"Ravena, Faenca, Lugas",
+"Italy_Emilia-Romagna_Reggio Emilia Description":"Emilijos Redžas, Skandianas, Kazalgrandė",
+"Italy_Emilia-Romagna_Rimini Description":"Riminis, Ričonė, Santarkandželo di Romanja",
+"Italy_Friuli-Venezia Giulia_Gorizia Description":"Goricija, Monfalkonė, Ronki dei Ledžonaris",
+"Italy_Friuli-Venezia Giulia_Pordenone Description":"Pordenonė, Sačilė, San Vito al Taljamentas",
+"Italy_Friuli-Venezia Giulia_Trieste Description":"Triestas, Mudža, Aurizina",
+"Italy_Friuli-Venezia Giulia_Udine Description":"Udinė, Kodroipas, Červinjano del Friulis",
+"Italy_Lazio Description":"Roma, Latina, Fjumičinas",
+"Italy_Liguria Description":"Genuja, Specija,",
+"Italy_Lombardy_Bergamo Description":"Bergamas, Taljunas, Treviljas",
+"Italy_Lombardy_Brescia Description":"Breša, Bosotis, Lumedzanė",
+"Italy_Lombardy_Como Description":"Komas, Kantu",
+"Italy_Lombardy_Cremona Description":"Kremona, Treskore Kremaskas",
+"Italy_Lombardy_Lecco Description":"Lekas, Meratė, Kalolcjokortė",
+"Italy_Lombardy_Lodi Description":"Lodis, Kodonjas, Kazalpusterlengas",
+"Italy_Lombardy_Mantua Description":"Mantua, Sucara",
+"Italy_Lombardy_Milan Description":"Milanasm Sesto San Džovanis, Činizelo Balzamas",
+"Italy_Lombardy_Monza and Brianza Description":"Monca, Briancos Bezana, Serenjas",
+"Italy_Lombardy_Pavia Description":"Pavija, Vidževanas, Buskarela",
+"Italy_Lombardy_Sondrio Description":"Sondrijus, Morbenjas",
+"Italy_Lombardy_Varese Description":"Busto Arsicijus, Varezė, Galaratė",
+"Italy_Marche Description":"Ankona, Pezaras",
+"Italy_Molise Description":"Kampobasas, Termolis, Izernija",
+"Italy_Piemont_Alessandria Description":"Alesandrija, Kazale Monferatas, Novi Ligūrė",
+"Italy_Piemont_Asti Description":"Astis, Kanelis, Nica Monferatas",
+"Italy_Piemont_Biella Description":"Bjela, Kosatas",
+"Italy_Piemont_Cuneo Description":"Kuneo, Verdunas, Bergolas",
+"Italy_Piemont_Novara Description":"Novara, Borgomaneras, Trekatė",
+"Italy_Piemont_Torino Description":"Turinas, Monkaljeris, Rivolis",
+"Italy_Piemont_Verbano-Cusio-Ossola Description":"Verbanija, Domodosola, Omenja",
+"Italy_Piemont_Vercelli Description":"Verčelis, Borgozezija, Santija",
+"Italy_Sardinia Description":"Kaljaris, Sasaris, Kvartu Sant’Elena",
+"Italy_Sicily Description":"Palermas, Katanija, Mesina",
+"Italy_Trentino-Alto Adige Sudtirol Description":"Trentas, Bolcanas, Roveretas",
+"Italy_Tuscany_Grosseto Description":"Arecas, Grosetas, Siena",
+"Italy_Tuscany_Massa e Carrara Description":"Florencija, Livornas, Luka, Piza, Pratas, Pistoja, Karara, Masa",
+"Italy_Umbria Description":"Perudža, Ternis, Folinjas",
+"Italy_Veneto_Belluno Description":"Belunas, Feltrė, Sedikas",
+"Italy_Veneto_Padova Description":"Paduva, Čitadela, Selvacano Dentras",
+"Italy_Veneto_Rovigo Description":"Rovigas, Badija Polesinė, Adrija",
+"Italy_Veneto_Treviso Description":"Trevizas, Koneljanas, Kastelfranko Venetas",
+"Italy_Veneto_Venezia Description":"Venecija, Mestrė, Kjodža",
+"Italy_Veneto_Verona Description":"Verona, Vilafranka di Verona, Lenjagas",
+"Italy_Veneto_Vicenza Description":"Vičenca, Basano del Grapa, Skijus",
+"Jamaica Description":"Kingstonas, Montego Bėjus, Spaniš Taunas",
+"Japan_Chubu Region_Aichi_Nagoya Description":"Nagoja, Cušima, Kijosu",
+"Japan_Chubu Region_Aichi_Toyohashi Description":"Tahara, Gamagoris, Nišijas",
+"Japan_Chubu Region_Fukui Description":"Obama, Fukujis, Sakajis",
+"Japan_Chubu Region_Gifu Description":"Gifu, Hida, Ena",
+"Japan_Chubu Region_Ishikawa Description":"Kanadzava, Komacu, Hakusanas",
+"Japan_Chubu Region_Nagano Description":"Okaja, Omačis, Naganas",
+"Japan_Chubu Region_Niigata Description":"Niigata, Miokas, Sadas",
+"Japan_Chubu Region_Shizuoka Description":"Hamamacu, Kosajis, Fukurojis",
+"Japan_Chubu Region_Toyama Description":"Tojama, Takaoka, Imidzu",
+"Japan_Chubu Region_Yamanashi Description":"Hokutas, Kofu, Nirasakis",
+"Japan_Chugoku Region_Hiroshima Description":"Hirošima, Otakė, Kurė",
+"Japan_Chugoku Region_Okayama Description":"Okajama, Niimis, Kasaoka",
+"Japan_Chugoku Region_Shimane Description":"Masuda, Gocu, Hamada",
+"Japan_Chugoku Region_Tottori Description":"Sakajis-Minatas, Kurajošis, Jonagas",
+"Japan_Chugoku Region_Yamaguchi Description":"Nagatas, Sanijas-Onoda, Šimonosekis",
+"Japan_Hokkaido Region_East Description":"Kuširas, Nemuras, Obihiras",
+"Japan_Hokkaido Region_North Description":"Asahikava, Furanas, Šibecu",
+"Japan_Hokkaido Region_Sapporo Description":"Saporas, Išikaris, Ivamidzava",
+"Japan_Hokkaido Region_West Description":"Hokutas, Datė, Noboribecu",
+"Japan_Kanto_Chiba Description":"Tatejama, Kamagaja, Minamibosas",
+"Japan_Kanto_Gunma Description":"Fudžioka, Midoris, Numata",
+"Japan_Kanto_Ibaraki Description":"Inašikis, Hokota, Išioka",
+"Japan_Kanto_Kanagawa Description":"Jokohama, Sagamihara, Fudžisava",
+"Japan_Kanto_Saitama Description":"Saitama, Kavagučis, Hanas",
+"Japan_Kanto_Tochigi Description":"Ašikaga, Kanuma, Sanas",
+"Japan_Kanto_Tokyo Description":"Tokijas, Setagaja, Hačiodžis",
+"Japan_Kinki Region_Mie Description":"Kumanas, Cu, Kamejama",
+"Japan_Kinki Region_Nara Description":"Nara, Kašihara, Ikoma",
+"Japan_Kinki Region_Osaka_Osaka Description":"Osaka, Ašija, Senanas",
+"Japan_Kinki Region_Osaka_West Description":"Kobė, Himedžis, Akas",
+"Japan_Kinki Region_Wakayama Description":"Vakajama, Tanabė, Kinokava",
+"Japan_Kyushu Region_Fukuoka Description":"Fukuoka, Kitakiūšiū, Itošima",
+"Japan_Kyushu Region_Kagoshima Description":"Kagošima, Sacumasendajis, Minamisacuma",
+"Japan_Kyushu Region_Kumamoto Description":"Kumamotas, Amakusa, Kamiamakusa",
+"Japan_Kyushu Region_Miyazaki Description":"Ebinas, Kušima, Mijakonodžias",
+"Japan_Kyushu Region_Nagasaki Description":"Nagasakis, Gošima, Hiradas",
+"Japan_Kyushu Region_Oita Description":"Oita, Jufu, Taketa",
+"Japan_Kyushu Region_Okinawa Description":"Naha, Okinava, Uruma",
+"Japan_Kyushu Region_Saga Description":"Imaris, Karacu, Takeo",
+"Japan_Shikoku Region_Ehime Description":"Macujama, Javatahama, Uvadžima",
+"Japan_Shikoku Region_Kagawa Description":"Takamacu, Tadocu, Sakaidė",
+"Japan_Shikoku Region_Kochi Description":"Sukumas, Šimantas, Tosa-Šimidzu",
+"Japan_Shikoku Region_Kyoto Description":"Kiotas, Kiotangas, Fukučijama",
+"Japan_Shikoku Region_Tokushima Description":"Mijošis, Ava, Jošinogava",
+"Japan_Tohoku_Akita Description":"Oga, Nikahas, Daisenas",
+"Japan_Tohoku_Aomori Description":"Hirakava, Tovada, Aomoris",
+"Japan_Tohoku_Fukushima Description":"Kitakata, Sukagava, Širakava",
+"Japan_Tohoku_Iwate Description":"Morioka, Hačimantajis, Ninohė",
+"Japan_Tohoku_Miyagi Description":"Sendajus, Higaši Macušima, Tomė",
+"Japan_Tohoku_Yamagata Description":"Nanijas, Higaši Nė, Obanadzava",
+"Jersey Description":"Sent Heljeris, Sent Seivjoras, Sent Džonas",
+"Jerusalem Description":"Jeruzalė, Anata, al Valadža",
+"Jordan Description":"Amanas, Zarka, Irbidas",
+"Kazakhstan_North Description":"Astana, Karaganda, Pavlodaras",
+"Kazakhstan_South Description":"Almata, Šymkentas, Aktobė",
+"Kenya Description":"Nairobis, Kisumu, Kitalė",
+"Kingdom of Lesotho Description":"Maseru, Buta Butė, Mohales Hukas",
+"Kiribati Description":"Betijas, Kabuna, Bairikis",
+"Kuwait Description":"Kuveitas, Achmadi, Džahra",
+"Kyrgyzstan Description":"Biškekas, Ošas, Balykči",
+"Laos Description":"Vientianas, Paksanas, Udomsajus",
+"Latvia Description":"Ryga, Daugpilis, Liepoja",
+"Lebanon Description":"Beirutas, Zahlė, Sidonas",
+"Liberia Description":"Monrovija, Sanikelis, Fiš Taunas",
+"Libya Description":"Tripolis, Bengazis, Misrata",
+"Liechtenstein Description":"Vaducas, Šanas, Tryzenas",
+"Lithuania_East Description":"Vilnius, Kaunas, Alytus",
+"Lithuania_West Description":"Klaipėda, Šiauliai, Panevėžys",
+"Luxembourg Description":"Liuksemburgas, Mondorf le Benas, Ešas prie Alzeto",
+"Macedonia Description":"Skopjė, Ochridas, Kavadarcis",
+"Madagascar Description":"Antananaryvas, Toamasina, Fianarancoa",
+"Malawi Description":"Lilongvė, Blantairas, Mzuzu",
+"Malaysia Description":"Kvala Lumpūras, Petaling Džaja, Kota Kinabalu",
+"Finland_Southern Finland_West Short":"Pietvakarių Suomija",
+"Palestine Region Short":"Palestina"
 }
--- a/data/editor.config
+++ b/data/editor.config
@@ -394,32 +394,25 @@
      <type id="amenity-pharmacy" group="shop">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-buddhist" can_add="no">
+      <type id="amenity-place_of_worship-buddhist">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-christian" can_add="no">
+      <type id="amenity-place_of_worship-christian">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-hindu" can_add="no">
+      <type id="amenity-place_of_worship-hindu">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-jewish" can_add="no">
+      <type id="amenity-place_of_worship-jewish">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-muslim" can_add="no">
+      <type id="amenity-place_of_worship-muslim">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-shinto" can_add="no">
+      <type id="amenity-place_of_worship-shinto">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-taoist" can_add="no">
+      <type id="amenity-place_of_worship-taoist">
        <include group="poi_internet" />
      </type>
      <type id="amenity-place_of_worship">
@@ -705,6 +698,9 @@
      <type id="leisure-resort">
        <include group="poi_internet" />
      </type>
+      <type id="leisure-sports_centre-sport-swimming">
+        <include group="poi_internet" />
+      </type>
      <type id="leisure-sports_centre">
        <include group="poi_internet" />
      </type>
@@ -1115,6 +1111,7 @@
      <type id="tourism-artwork">
        <include field="name" />
      </type>
+      <!-- Not addable because OSM category is too broad and due to vandalism problems -->
      <type id="tourism-attraction" can_add="no">
        <include group="poi_internet" />
 <!--        <include field="wikipedia" />-->
@@ -1144,26 +1141,22 @@
        <include group="poi_internet" />
        <include field="self_service" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-office" can_add="no">
+      <type id="tourism-information-office">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-visitor_centre" can_add="no">
+      <type id="tourism-information-visitor_centre">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-board" can_add="no">
+      <type id="tourism-information-board">
        <include field="name" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-map" can_add="no">
+      <type id="tourism-information-map">
        <include field="name" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-guidepost" can_add="no">
+      <type id="tourism-information-guidepost">
      </type>
-      <type id="tourism-information">
+      <!-- Too generic to add -->
+      <type id="tourism-information" can_add="no">
        <include group="poi" />
      </type>
      <type id="amenity-ranger_station">
@@ -1509,67 +1502,50 @@
      <type id="leisure-escape_game">
        <include group="poi_internet" />
      </type>
-      <!-- Uncomment this after our editor core supports complex types
+      <type id="amenity-vending_machine-parking_tickets">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-public_transport_tickets">
+        <include field="operator" />
+        <include field="level" />
+      </type>
      <type id="amenity-vending_machine-cigarettes">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="cigarettes" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-vending_machine-coffee">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="coffee" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-vending_machine-condoms">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="condoms" />
        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-drinks">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="drinks" />
        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-excrement_bags">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-coffee">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-condoms">
+        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-food">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="food" />
        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-newspapers">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="newspapers" />
        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-sweets">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="sweets" />
        <include field="operator" />
+        <include field="level" />
      </type>
-      <type id="shop-car_repair-tyres">
-        <tag k="shop" v="car_repair" />
-        <tag k="service" v="tyres" />
-        <include group="poi_internet" />
+      <type id="amenity-vending_machine">
+        <include field="operator" />
+        <include field="level" />
      </type>
-      <type id="leisure-sports_centre-climbing">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="climbing" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-shooting">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="shooting" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-swimming">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="swimming" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-yoga">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="yoga" />
-        <include group="poi_internet" />
-      </type-->
      <!-- Not addable as mapping as a node is uncommon -->
      <type id="natural-beach" can_add="no">
        <include field="name" />
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -5,7 +5,7 @@
 #   highway|bus_stop;[highway=bus_stop];;name;int_name;22;
 # It contains:
 # - type name: "highway|bus_stop" ("|" is converted to "-" internally)
-# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas
+# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas, best practice tagging for OSM editor is listed first
 # - "x" for a deprecated type or an empty cell otherwise
 # - primary title tag (usually "name")
 # - secondary title tag (usually "int_name")
@@ -626,7 +626,7 @@ highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
 drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
 drinking_water|no;505;
 amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
-amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
+amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507;
 amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;
@@ -1232,7 +1232,7 @@ shop|car_parts;1104;
 deprecated|deprecated;1105;x
 deprecated|deprecated;1106;x
 deprecated|deprecated;1107;x
-deprecated|deprecated;1108;x
+amenity|hydrant;1108;
 amenity|public_bookcase;1109;
 tourism|apartment;1110;
 leisure|resort;[leisure=resort],[tourism=resort],[leisure=summer_camp];;name;int_name;1111;
--- a/data/sound-strings/lt.json/localize.json
+++ b/data/sound-strings/lt.json/localize.json
@@ -104,5 +104,5 @@
 "in_1_mile":"Už vienos mylios",
 "in_1_5_miles":"Už pusantros mylios",
 "in_2_miles":"Už dviejų mylių",
-"unknown_camera":"Greičio matuoklis priešakyje"
+"unknown_camera":"Greičio matuoklis priekyje"
 }
--- a/data/styles/default/dark/symbols/firehydrant-m.svg
+++ b/data/styles/default/dark/symbols/firehydrant-m.svg
@@ -1,12 +1,13 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>firehydrant-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="firehydrant-m" fill-rule="nonzero">
-   <g id="fire-hydrant" transform="translate(6 5)" fill="#983E44">
-    <path id="Shape" d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
-    <polygon id="Path" points="5.332 7.6631 6.1523 7.6631 6.1523 8.4834 5.332 8.4834"/>
-    <path id="Shape" d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457h-0.95703zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25v6.6582zm1.7773-2.4063h-0.95703v-1.8457h0.95703v1.8457z"/>
-   </g>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>firehydrant-m</title>
+<g transform="translate(.258 -1.5e-5)" fill="none" fill-rule="evenodd" opacity=".6">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#983e44">
+<path d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
+<polygon points="6.1523 8.4834 5.332 8.4834 5.332 7.6631 6.1523 7.6631"/>
+<path d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25zm1.7773-2.4063h-0.95703v-1.8457h0.95703z"/>
+</g>
+</g>
+</g>
 </svg>
--- a/data/styles/default/dark/symbols/hydrant-m.svg
+++ b/data/styles/default/dark/symbols/hydrant-m.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>hydrant-m</title>
+<g transform="translate(.25781 -.90528)" fill="none" fill-rule="evenodd">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#0a6074">
+<polygon points="6.1523 7.6631 6.1523 8.4834 5.332 8.4834 5.332 7.6631"/>
+<path d="m4.4427 2.5134c-1.0818 0.17522-1.9368 1.0328-2.112 2.1146h-0.6875v0.82031h0.65365l3.72e-5 1.0908h-1.5703v1.125h-0.51823v0.82031h0.51823v1.125h1.5703l-3.72e-5 1.0889c-0.71616 0-1.2995 0.58335-1.2995 1.2995v1.2995h9.4896v-1.2995c0-0.71616-0.58335-1.2995-1.2995-1.2995l3.72e-5 -1.0889h1.5677v-1.125h0.52083v-0.82031h-0.52083v-1.125h-1.5677l-3.72e-5 -1.0908h0.65365v-0.82031h-0.6875c-0.17522-1.0818-1.0302-1.9394-2.112-2.1146zm0.41146 0.78646h1.776c0.81613 0 1.5027 0.56804 1.6875 1.3281h-5.151c0.18482-0.76005 0.87142-1.3281 1.6875-1.3281zm-1.737 2.1484h5.25v5.25h-5.25zm-1.5703 1.9111h0.75v1.4271h-0.75zm7.6406 0h0.7474v1.4271h-0.7474zm-6.8907 4.1592h6.8906c0.26384 0 0.47917 0.21533 0.47917 0.47917v0.47917h-7.849v-0.47917c0-0.26384 0.21533-0.47917 0.47917-0.47917z"/>
+<path d="m5.7421 6.1696a1.8285 1.9033 0 0 0-1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281-1.9036 1.8285 1.9033 0 0 0-1.8281-1.9036zm0 0.83073a1.0311 1.0732 0 0 1 1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312-1.0729 1.0311 1.0732 0 0 1 1.0312-1.0729z"/>
+</g>
+</g>
+</g>
+</svg>
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1135,6 +1135,7 @@ node|z18-[man_made=survey_point],
 node|z18-[man_made=petroleum_well],
 node|z18-[man_made=flare],
 node|z19-[emergency=fire_hydrant],
+node|z19-[amenity=hydrant],
 node|z19-[man_made=cairn],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}

@@ -1699,6 +1700,8 @@ node|z18-[amenity=post_box],
 {icon-image: postbox-m.svg;text: none;}
 node|z19-[emergency=fire_hydrant],
 {icon-image: firehydrant-m.svg;font-size: 11;}
+node|z19-[amenity=hydrant],
+{icon-image: hydrant-m.svg;font-size: 11;}

 node|z18-[emergency=defibrillator],
 {icon-image: defibrillator-m.svg;font-size: 11;}
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -2427,6 +2427,7 @@ emergency-phone                                     # icon z17- (also has captio
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

+amenity-hydrant                                     # icon z19- (also has caption(optional) z19-)
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
 emergency-life_ring                                 # icon z19- (also has caption(optional) z19-)
@@ -2440,6 +2441,7 @@ natural-tree                                        # icon z18-
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
 # amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
 # amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
+# amenity-hydrant                                   # caption(optional) z19- (also has icon z19-)
 amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
 # amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
--- a/data/styles/default/light/symbols/firehydrant-m.svg
+++ b/data/styles/default/light/symbols/firehydrant-m.svg
@@ -1,12 +1,13 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>firehydrant-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="firehydrant-m" fill-rule="nonzero">
-   <g id="fire-hydrant" transform="translate(6 5)" fill="#D85961">
-    <path id="Shape" d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
-    <polygon id="Path" points="5.332 7.6631 6.1523 7.6631 6.1523 8.4834 5.332 8.4834"/>
-    <path id="Shape" d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457h-0.95703zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25v6.6582zm1.7773-2.4063h-0.95703v-1.8457h0.95703v1.8457z"/>
-   </g>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>firehydrant-m</title>
+<g transform="translate(.258 -1.5e-5)" fill="none" fill-rule="evenodd">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#d85961">
+<path d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
+<polygon points="6.1523 8.4834 5.332 8.4834 5.332 7.6631 6.1523 7.6631"/>
+<path d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25zm1.7773-2.4063h-0.95703v-1.8457h0.95703z"/>
+</g>
+</g>
+</g>
 </svg>
--- a/data/styles/default/light/symbols/hydrant-m.svg
+++ b/data/styles/default/light/symbols/hydrant-m.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>hydrant-m</title>
+<g transform="translate(.25781 -.90528)" fill="none" fill-rule="evenodd">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#0797b8">
+<polygon points="6.1523 7.6631 6.1523 8.4834 5.332 8.4834 5.332 7.6631"/>
+<path d="m4.4427 2.5134c-1.0818 0.17522-1.9368 1.0328-2.112 2.1146h-0.6875v0.82031h0.65365l3.72e-5 1.0908h-1.5703v1.125h-0.51823v0.82031h0.51823v1.125h1.5703l-3.72e-5 1.0889c-0.71616 0-1.2995 0.58335-1.2995 1.2995v1.2995h9.4896v-1.2995c0-0.71616-0.58335-1.2995-1.2995-1.2995l3.72e-5 -1.0889h1.5677v-1.125h0.52083v-0.82031h-0.52083v-1.125h-1.5677l-3.72e-5 -1.0908h0.65365v-0.82031h-0.6875c-0.17522-1.0818-1.0302-1.9394-2.112-2.1146zm0.41146 0.78646h1.776c0.81613 0 1.5027 0.56804 1.6875 1.3281h-5.151c0.18482-0.76005 0.87142-1.3281 1.6875-1.3281zm-1.737 2.1484h5.25v5.25h-5.25zm-1.5703 1.9111h0.75v1.4271h-0.75zm7.6406 0h0.7474v1.4271h-0.7474zm-6.8907 4.1592h6.8906c0.26384 0 0.47917 0.21533 0.47917 0.47917v0.47917h-7.849v-0.47917c0-0.26384 0.21533-0.47917 0.47917-0.47917z"/>
+<path d="m5.7421 6.1696a1.8285 1.9033 0 0 0-1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281-1.9036 1.8285 1.9033 0 0 0-1.8281-1.9036zm0 0.83073a1.0311 1.0732 0 0 1 1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312-1.0729 1.0311 1.0732 0 0 1 1.0312-1.0729z"/>
+</g>
+</g>
+</g>
+</svg>
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -2433,6 +2433,7 @@ emergency-phone                                     # icon z17- (also has captio
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

+amenity-hydrant                                     # icon z19- (also has caption(optional) z19-)
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
 emergency-life_ring                                 # icon z19- (also has caption(optional) z19-)
@@ -2446,6 +2447,7 @@ natural-tree                                        # icon z18-
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
 # amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
 # amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
+# amenity-hydrant                                   # caption(optional) z19- (also has icon z19-)
 amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
 # amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -38,7 +38,7 @@ See [translations instructions](TRANSLATIONS.md) for details.
 CoMaps has a strong focus on easy to use UI and smooth user experience. Feel free to join UI/UX discussions in relevant issues. Mockups are very welcome!

 If you're into graphic design then CoMaps needs good, clear and free-to-use icons for hundreds of map features / POIs.
-Check CoMaps' [design principles](https://codeberg.org/comaps/comaps/wiki/Design-Principles). Post your icons onto relevant issues or take a next step and [integrate them](STYLES.md) yourself.
+Check CoMaps' [design principles](https://codeberg.org/comaps/comaps/wiki/Design-Principles) and [color scheme](https://codeberg.org/comaps/Governance/src/branch/main/assets/comaps-color-scheme.png). Post your icons onto relevant issues or take a next step and [integrate them](STYLES.md) yourself.

 Check the [map styling instructions](STYLES.md) and work on adding new map features and other open map styles issues.

--- a/docs/TRANSLATIONS.md
+++ b/docs/TRANSLATIONS.md
@@ -26,6 +26,8 @@ The project consists of multiple components, each with its own translation files

 Components without links haven't been integrated into Weblate and must be translated directly via [Codeberg Pull Requests](CONTRIBUTING.md).

+TTS translations can be improved with [the TTS locale-viewer](https://comaps.codeberg.page/locale-viewer/).
+
 ## Translating

 ### Workflow
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -134,6 +134,8 @@ TagMapping const kDefaultTagMapping = {
    {OsmElement::Tag("access", "agricultural"), RoadAccess::Type::Private},
    {OsmElement::Tag("access", "forestry"), RoadAccess::Type::Private},
    {OsmElement::Tag("locked", "yes"), RoadAccess::Type::Locked},
+    {OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
+    {OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
 };

 // Removed secondary, tertiary from car list. Example https://www.openstreetmap.org/node/8169922700
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -1591,3 +1591,4 @@
 "type.natural.tree" = "Strom";
 "type.xmas.tree" = "Vánoční strom";
 "type.man_made.mast.communication" = "Komunikační stožár";
+"type.amenity.hydrant" = "Hydrant na zavlažování";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -394,6 +394,7 @@
 "type.emergency.life_ring" = "Lifebuoy";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";
+"type.amenity.hydrant" = "Irrigation Hydrant";
 "type.emergency.phone" = "Emergency Phone";

 /* A place where a lifeguard is on duty. */
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -63,7 +63,7 @@
 "add_new_set" = "Agregar una lista nueva";

 /* Add Bookmark list dialog - hint when the list name is empty */
-"bookmark_set_name" = "Nombre del grupo de marcadores";
+"bookmark_set_name" = "Nombre de la lista de marcadores";

 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Lista de marcadores";
@@ -256,7 +256,7 @@
 "pref_tts_test_voice_title" = "Probar indicaciones de voz";

 /* Title for "Other" section in TTS settings. */
-"pref_tts_other_section_title" = "Otro";
+"pref_tts_other_section_title" = "Otros";
 "pref_map_auto_zoom" = "Auto Zoom";
 "placepage_distance" = "Distancia";
 "search_show_on_map" = "Ver en el mapa";
@@ -605,18 +605,18 @@
 /* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
 "editor_default_language_hint" = "Como está escrito en la lengua local";
 "editor_edit_place_category_title" = "Categoría";
-"whatsnew_editor_message_1" = "Añada lugares nuevos al mapa y edite los existentes directamente desde la aplicación.";
+"whatsnew_editor_message_1" = "Añade lugares nuevos al mapa y edite los existentes directamente desde la aplicación.";
 "dialog_incorrect_feature_position" = "Cambiar ubicación";
 "message_invalid_feature_position" = "No se puede ubicar ningún objeto aquí";

 /* Error dialog no space */
-"migration_no_space_message" = "Necesita más espacio para descargar. Elimine los datos innecesarios.";
+"migration_no_space_message" = "Se necesita más espacio para descargar. Elimina los datos innecesarios.";
 "editor_sharing_title" = "He mejorado los mapas de CoMaps";

 /* Downloaded 10 **of** 20 <- it is that "of" */
 "downloader_of" = "%1$d de %2$d";
 "download_over_mobile_header" = "¿Descargar con conexión de red móvil?";
-"download_over_mobile_message" = "Podría ser muy caro con ciertos planes o con itinerancia de datos.";
+"download_over_mobile_message" = "Podría ser muy caro con ciertos planes o en itinerancia de datos.";
 "error_enter_correct_house_number" = "Introducir el número de domicilio correcto";
 "editor_storey_number" = "Número de plantas (máx. %d)";

@@ -725,7 +725,7 @@
 "mobile_data" = "Internet móvil";

 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Se necesita Internet móvil para mostrar información detallada de los lugares, como fotografías, precios y reseñas.";
+"mobile_data_description" = "Se necesita Internet móvil para notificaciones de actualización de mapas y para subir ediciones.";
 "mobile_data_option_never" = "No usar nunca";
 "mobile_data_option_ask" = "Preguntar siempre";
 "traffic_update_maps_text" = "Para mostrar los datos de tráfico, deben actualizarse los mapas.";
@@ -865,12 +865,12 @@
 "dialog_routing_download_files_carplay" = "Para construir una ruta, descargue los mapas faltantes en su dispositivo";
 "dialog_routing_system_error_carplay" = "Ocurrió un error. Reinicie la aplicación";
 "dialog_routing_rebuild_from_current_location_carplay" = "La ruta se reconstruirá desde su ubicación actual";
-"dialog_routing_rebuild_for_vehicle_carplay" = "La ruta se cambiará a coche";
+"dialog_routing_rebuild_for_vehicle_carplay" = "La ruta se cambiará a una de coche";
 "not_all_shown_bookmarks_carplay" = "No se muestran todos los marcadores";
 "switch_to_phone_bookmarks_carplay" = "Cambie al teléfono para ver todos los marcadores";
 "ok" = "Aceptar";
 "speedcams_alert_title_carplay_1" = "Cám.velocidad";
-"speedcams_alert_title_carplay_2" = "Alerta velocidad";
+"speedcams_alert_title_carplay_2" = "Alertas de velocidad";
 "download_map_carplay" = "Descargue los mapas en la aplicación del dispositivo";
 "carplay_roundabout_exit" = "%@ salida";

@@ -936,19 +936,19 @@
 "whats_new_auto_update_button_later" = "Actualizar más tarde de forma manual";

 /* Delete track button on track edit screen */
-"placepage_delete_track_button" = "Eliminar trayecto";
+"placepage_delete_track_button" = "Eliminar traza";

 /* The track deletion confirmaion alert message. */
-"placepage_delete_track_confirmation_alert_message" = "¿Confirma que quiere eliminar este trayecto?";
+"placepage_delete_track_confirmation_alert_message" = "¿Confirma que quiere eliminar esta traza?";

 /* Placeholder for track name input on track edit screen */
-"placepage_track_name_hint" = "Nombre del trayecto";
+"placepage_track_name_hint" = "Nombre de la traza";

 /* move track or bookmark from the list button text */
 "move" = "Mover";

 /* edit track screen title */
-"track_title" = "Trayecto";
+"track_title" = "Traza";

 /* Translated CoMaps site */
 "translated_om_site_url" = "https://www.comaps.app/es/";
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -162,7 +162,7 @@
 "type.amenity.public_bath" = "Baños públicos";
 "type.amenity.shower" = "Ducha";
 "type.amenity.stripclub" = "Club de estriptis";
-"type.amenity.taxi" = "Sitio de taxis";
+"type.amenity.taxi" = "Parada de taxis";
 "type.amenity.telephone" = "Teléfono";
 "type.amenity.theatre" = "Teatro";
 "type.amenity.toilets" = "WC";
@@ -358,6 +358,7 @@
 "type.emergency.assembly_point" = "Punto de reunión de emergencia";
 "type.emergency.defibrillator" = "Desfibrilador";
 "type.emergency.fire_hydrant" = "Boca de incendio";
+"type.amenity.hydrant" = "Boca de riego";
 "type.emergency.phone" = "Teléfono de emergencias";

 /* A place where a lifeguard is on duty. */
@@ -491,7 +492,7 @@
 "type.highway.residential.bridge" = "Puente";

 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.residential.tunnel" = "Túnel de calle residencial";
+"type.highway.residential.tunnel" = "Túnel";
 "type.highway.rest_area" = "Área de descanso";
 "type.highway.road" = "Carretera";

@@ -509,7 +510,7 @@
 "type.highway.secondary.bridge" = "Puente";

 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.secondary.tunnel" = "Túnel de carretera secundaria";
+"type.highway.secondary.tunnel" = "Túnel";
 "type.highway.secondary_link" = "Enlace de carretera secundaria";

 /* These translations are used for all type.highway.*.bridge. */
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -40,7 +40,7 @@
 "country_status_download_without_size" = "دانلود نقشه";

 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "دانلود با شکست مواجه شد";
+"country_status_download_failed" = "بارگیری ناکام بود";

 /* Text in About screen */
 "about_proposition_1" = "آفلاین، سریع و آسان برای استفاده";
@@ -48,13 +48,13 @@
 /* Text in About screen */
 "about_proposition_2" = "متمرکز بر حریم خصوصی و بدون تبلیغات";
 "close" = "بستن";
-"download" = "دانلود";
+"download" = "بارگیری";

 /* REMOVE THIS STRING AFTER REFACTORING */
 "continue_button" = "ادامه";

 /* "Add new bookmark list" dialog title */
-"add_new_set" = "اضافه کردن مجموعه جدید";
+"add_new_set" = "افزودن پهرستی نو";

 /* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Bookmark List Name";
@@ -1085,7 +1085,7 @@
 "edit_track" = "ویرایش مسیر";
 "osm_profile_view_notes" = "مشاهده یادداشت‌ها";
 "osm_profile_view_edit_history" = "مشاهده تاریخچه ویرایش‌ها";
-"about_headline" = "رایگان برای همه، ساخته شده با عشق";
+"about_headline" = "پروژه‌ای باز نیرو گرفته از انجمن";
 "about_proposition_3" = "شفاف و نه برای سود";
 "pref_mapappearance_title" = "ظاهر نقشه";
 "pref_maplanguage_title" = "زبان نقشه";
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -701,7 +701,7 @@

 /* Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "Varmista, ettet syöttänyt henkilökohtaisia tietojasi.";
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap-editorit tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap-muokkaajat tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää.";
 "navigation_stop_button" = "Lopeta";

 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1105,4 +1105,4 @@
 "unknown" = "Inconnu";
 "voice_explanation_before_version26" = "Il est possible de choisir une meilleure voix dans les paramètres système, sous *Accessibilité*, *Contenu vocal*, *Voix*.";
 "voice_explanation" = "Il est possible de choisir une meilleure voix dans les paramètres système, sous *Accessibilité*, *Lecture et prononciation*, *Voix*.";
-"avoid_paved" = "Éviter les routes goudronnées";
+"avoid_paved" = "Éviter les routes pavées";
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -358,6 +358,7 @@
 "type.emergency.assembly_point" = "Point de rassemblement d’urgence";
 "type.emergency.defibrillator" = "Défibrillateur";
 "type.emergency.fire_hydrant" = "Point d’eau incendie";
+"type.amenity.hydrant" = "Borne d’puisage";
 "type.emergency.phone" = "Téléphone d’urgence";

 /* A place where a lifeguard is on duty. */
--- a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
@@ -215,7 +215,7 @@
 "downloader_search_results" = "Found";
 "category_parking" = "Parking";
 "avoid_motorways" = "Avoid freeways";
-"editor_time_delete" = "Delete Schedule";
+"editor_time_delete" = "Izbriši Raspored";
 "parks" = "Parks";
 "p2p_start" = "Start";
 "downloading" = "Downloading…";
@@ -232,7 +232,7 @@
 "closes_in" = "Closes in %@";
 "gray" = "Gray";
 "downloader_downloading" = "Downloading:";
-"p2p_reroute_from_current" = "Do you want to plan a route from your current location?";
+"p2p_reroute_from_current" = "Želite li isplanirati rutu od vaše trenutne lokacije?";
 "pink" = "Pink";
 "app_tip_09" = "Our main goal is to build fast, privacy-focused, easy-to-use maps that you will love.";
 "app_tip_08" = "You can easily fix and improve the map data.";
@@ -268,7 +268,7 @@
 "download_map_carplay" = "Please download maps in the app on your mobile device";
 "mi" = "mi";
 "planning_route_remove_title" = "Drag here to remove";
-"p2p_your_location" = "Your Location";
+"p2p_your_location" = "Vaša lokacija";
 "category_transport" = "Prijevoz";
 "text_more_button" = "…more";
 "downloader_of" = "%1$d of %2$d";
@@ -328,7 +328,7 @@
 "bookmark_share_email_subject" = "Hej, pogledaj moju oznaku u CoMapsu!";
 "editor_operator" = "Operator";
 "enable_icloud_synchronization_title" = "Enable iCloud Syncronization";
-"read_in_wikipedia" = "Wikipedia";
+"read_in_wikipedia" = "Wikipedija";
 "editor_edits_sent_message" = "Your note will be sent to OpenStreetMap";
 "placepage_track_name_hint" = "Track Name";
 "speedcams_alert_title_carplay_2" = "Speed warnings";
@@ -345,7 +345,7 @@
 "dialog_routing_disclaimer_recommendations" = "— Suggested routes should only be understood as recommendations;";
 "download" = "Download";
 "email_error_body" = "The email client has not been set up. Please configure it or contact us at %@";
-"editor_time_allday" = "All Day (24 hours)";
+"editor_time_allday" = "Cijeli dan (24 sata)";
 "downloader_download_map" = "Preuzmi kartu";
 "backup" = "Backup";
 "edit_track" = "Izmijeni Rutu";
@@ -426,7 +426,7 @@
 "keyboard_availability_alert" = "Keyboard is not available while driving";
 "whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date";
 "editor_time_close" = "Closed";
-"editor_time_add" = "Add Schedule";
+"editor_time_add" = "Dodaj Raspored";
 "editor_edit_place_category_title" = "Category";
 "bookmarks_error_title_list_name_already_taken" = "Taj naziv je već zauzet";
 "category_entertainment" = "Zabava";
@@ -546,7 +546,7 @@
 "app_tip_00" = "Thank you for using our community-built maps!";
 "sort_default" = "Sort by default";
 "big_font" = "Increase size for map labels";
-"search_not_found_query" = "Download the region where you are searching or try adding a nearby town/village name.";
+"search_not_found_query" = "Preuzmite regiju u kojoj pretražujete ili pokušajte dodati naziv obližnjeg grada/sela.";
 "load_kmz_title" = "Učitavam Oznake";
 "later" = "Later";
 "button_plan" = "Plan";
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -25,7 +25,7 @@
 "core_my_position" = "Мое местоположение";

 /* Update maps later button text */
-"later" = "Не сейчас";
+"later" = "Позже";

 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
 "search" = "Поиск";
@@ -700,7 +700,7 @@
 "editor_share_to_all_dialog_title" = "Отправить всем пользователям?";

 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Убедитесь, что вы не ввели личные данные.";
+"editor_share_to_all_dialog_message_1" = "Убедитесь, что вы не указали никаких личных данных.";
 "editor_share_to_all_dialog_message_2" = "Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.";
 "navigation_stop_button" = "Cтоп";

--- a/iphone/Maps/LocalizedStrings/sl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sl.lproj/Localizable.strings
@@ -377,7 +377,7 @@
 "placepage_call_button" = "Klic";
 "today" = "Danes";
 "bookmark_sets" = "Seznami zaznamkov";
-"about_proposition_3" = "Transparentno in nedobičkonosno";
+"about_proposition_3" = "Transparentno in nepridobitno";
 "share_bookmarks_email_body" = "Pozdravljen!\n\nV prilogi so moji zaznamki; prosim, odpri jih v CoMapsu. Če ga še nimaš nameščenega, ga lahko preneseš tukaj: https://www.comaps.app/download/\n\nUživj v potovanju s CoMaps!";
 "copy_to_clipboard" = "Kopiraj v odložišče";
 "pref_left_button_type" = "Levi glavni gumb";
@@ -473,3 +473,7 @@
 "last_upload" = "Zadnje nalaganje";
 "thank_you" = "Hvala vam";
 "place_name" = "Ime kraja";
+"common_check_internet_connection_dialog" = "Prosimo, prepričajte se, da je vaša naprava povezana z omrežjem.";
+"editor_share_to_all_dialog_message_1" = "Poskrbite, da niste vnesli nobenih zasebnih ali osebnih podatkov";
+"editor_share_to_all_dialog_message_2" = "Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno.";
+"avoid_paved" = "Izogni se neasfaltiranim cestam";
--- a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
@@ -351,3 +351,20 @@
 "type.cuisine.argentinian" = "Argentinska kuhinja";
 "type.cuisine.asian" = "Azijska kuhinja";
 "type.cuisine.austrian" = "Avstrijska kuhinja";
+"type.cuisine.chinese" = "Kitajska kuhinja";
+"type.cuisine.crepe" = "Krep";
+"type.cuisine.donut" = "Donat";
+"type.cuisine.fish" = "Ribe";
+"type.cuisine.fish_and_chips" = "Riba s krompirčkom";
+"type.cuisine.french" = "Francoska kuhinja";
+"type.cuisine.grill" = "Žar";
+"type.cuisine.hotdog" = "Hot dog";
+"type.craft.electronics_repair" = "Popravilo elektronike";
+"type.craft.gardener" = "Vrtnar";
+"type.craft.hvac" = "Ogrevanje, prezračevanje, klimatizacija";
+"type.craft.key_cutter" = "Ključavničar";
+"type.shop.camera" = "Trgovina s fotoaparati";
+"type.craft.plumber" = "Vodovodar";
+"type.cuisine.bubble_tea" = "Čaj s tapiokinimi kroglicami ('Bubble Tea')";
+"type.cuisine.breakfast" = "Zajtrk";
+"type.cuisine.chicken" = "Piščanec";
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		27AF18562E1DB63000CD41E2 /* PowerSavingMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */; };
 		27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18572E1DB63900CD41E2 /* Appearance.swift */; };
 		27AF185A2E1DB64500CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */; };
+		27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */ = {isa = PBXBuildFile; fileRef = 27FDBF202EEEFC830045621D /* mapcss-mapping.csv */; };
 		3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; };
 		33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; };
 		337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; };
@@ -789,6 +790,7 @@
 		27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerSavingMode.swift; sourceTree = "<group>"; };
 		27AF18572E1DB63900CD41E2 /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncingSpeedTrapsWhileVoiceRouting.swift; sourceTree = "<group>"; };
+		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "/Users/yannikbloscheck/Apps/CoMaps/Code/data/mapcss-mapping.csv"; sourceTree = "<absolute>"; };
 		28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; path = main.mm; sourceTree = "<group>"; tabWidth = 2; };
 		30034C5C2B3F0B74005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -3948,6 +3950,7 @@
 				6B9978341C89A316003B8AA0 /* editor.config */,
 				978D4A30199A11E600D72CA7 /* faq.html */,
 				BB7626B41E8559980031D71C /* icudt75l.dat */,
+				27FDBF202EEEFC830045621D /* mapcss-mapping.csv */,
 				F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
 				451950391B7A3E070085DA05 /* patterns.txt */,
@@ -4201,6 +4204,7 @@
 				34F73F9F1E082FF800AC1FD6 /* Localizable.strings in Resources */,
 				340E1EF21E2F614400CE49BF /* Main.storyboard in Resources */,
 				F6E2FE521E097BA00083EBEC /* MWMActionBarButton.xib in Resources */,
+				27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */,
 				EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */,
 				993DF0CA23F6BD0600AC231A /* ElevationDetailsViewController.xib in Resources */,
 				F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
map-per	21c9a58173	fix: don't return reference to object that goes out of scope Signed-off-by: map-per <map-per@gmx.de>	2025-12-17 15:22:06 +01:00
map-per	8007c0df53	review fixes Signed-off-by: map-per <map-per@gmx.de>	2025-12-17 15:05:09 +01:00
map-per	02ac1d8977	fix vending=public_transport_tickets in editor.config Signed-off-by: map-per <map-per@gmx.de>	2025-12-17 15:05:08 +01:00
Yannik Bloscheck	3c2e77f59e	[iOS] Added new editor files to their Xcode projects Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-12-17 15:05:08 +01:00
map-per	c1760bbc37	[editor] Support complex POI types in the editor (#2855 ) Signed-off-by: map-per <map-per@gmx.de>	2025-12-17 15:05:08 +01:00
map-per	3511dbb692	[android] Adjust margin in editor layout Signed-off-by: map-per <map-per@gmx.de>	2025-12-16 21:35:31 +01:00
Codeberg Translate	e238a317f1	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: ERYpTION <eryption@noreply.codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Juno Takano <jutty@noreply.codeberg.org> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: aoxa <aoxa@noreply.codeberg.org> Co-authored-by: arnyminerz <arnyminerz@noreply.codeberg.org> Co-authored-by: artnay <artnay@noreply.codeberg.org> Co-authored-by: cirilla <cirilla@noreply.codeberg.org> Co-authored-by: demode <demode@noreply.codeberg.org> Co-authored-by: gimse <gimse@noreply.codeberg.org> Co-authored-by: jeanbaptisteC <jeanbaptistec@noreply.codeberg.org> Co-authored-by: ldmpub <ldmpub@noreply.codeberg.org> Co-authored-by: loscati <loscati@noreply.codeberg.org> Co-authored-by: ma12vlad <ma12vlad@noreply.codeberg.org> Co-authored-by: mnalis <mnalis@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: rimas <rimas@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-12-16 18:10:27 +00:00
x7z4w	2e85899fcb	[search] Add synonym Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-16 12:48:48 +01:00
pablogila	ce978d8ede	[styles] Add `amenity=hydrant` Signed-off-by: pablogila <pablo.gila.herranz@gmail.com> Co-authored-by: pablogila <pablo.gila.herranz@gmail.com> Co-committed-by: pablogila <pablo.gila.herranz@gmail.com>	2025-12-16 10:40:18 +01:00
thesupertechie	d56f9700f5	[tts] [routing] further revert out-of-scope changes Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-16 07:27:59 +01:00
thesupertechie	cc042c3d1c	[tts] [routing] revert out-of-scope changes Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-16 07:27:59 +01:00
thesupertechie	4f739d98b0	[tts] Change notification to 400-700 m Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-16 07:27:59 +01:00
Dobri Dabar	4691de7a66	[desktop] Display type names Signed-off-by: Dobri Dabar <dobridabar@noreply.codeberg.org> Co-authored-by: Dobri Dabar <dobridabar@noreply.codeberg.org> Co-committed-by: Dobri Dabar <dobridabar@noreply.codeberg.org>	2025-12-15 19:36:29 +01:00
Jean-Baptiste	3c082b0629	[android] Rework shape of zoom buttons Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-15 18:59:54 +01:00
Jean-Baptiste	a468bd3fab	[docs] Update docs and funding config Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-15 13:09:27 +01:00
x7z4w	fc87316184	[search] Fix apartment blocks search Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-14 20:52:17 +00:00
map-per	298518ae72	[Android] Fix crash when selectedCountry is null Signed-off-by: map-per <map-per@gmx.de>	2025-12-13 22:58:25 +01:00
Jean-Baptiste	3bad6d25f0	[android] Remove usage of attr fonts styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-13 19:28:28 +01:00
Jean-Baptiste	d36361d669	[android] Fix aligment of items in AppBar Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-13 17:08:35 +01:00
Jean-Baptiste	688e20b1a6	[android] Revert M3 changes about main fonts styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-13 10:39:47 +01:00
Jean-Baptiste	85462161b2	[android] Fix theme not apply correctly Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-12 21:11:04 +01:00
Henry Sternberg	b929823f6b	[routing] Avoid using parking aisles Signed-off-by: Henry Sternberg <henry@bluelightmaps.com> Co-authored-by: Henry Sternberg <henry@bluelightmaps.com> Co-committed-by: Henry Sternberg <henry@bluelightmaps.com>	2025-12-12 15:37:21 +01:00
Jean-Baptiste	22dd799585	[android] Remove hardcoded MaterialComponents fonts styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-11 20:33:24 +01:00
Jean-Baptiste	6864d101e2	[android] Migrate text appearance to Material 3 Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-11 19:36:54 +01:00
Jean-Baptiste	4bfb62b373	[android] Fix height of all day view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-11 16:22:22 +01:00