[drape] Adjust double- and long-tap delays

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
[carplay] Add myPositionMode button to iOS <26 workaround
2025-12-30 17:44:07 +00:00 · 2025-12-29 23:26:05 +07:00 · 2025-12-29 23:12:23 +07:00 · 2025-12-29 23:12:23 +07:00 · 2025-12-29 23:12:23 +07:00 · 2025-12-29 23:12:23 +07:00
145 changed files with 2660 additions and 4898 deletions
--- a/.forgejo/workflows/process_subways.yml
+++ b/.forgejo/workflows/process_subways.yml
@@ -1,129 +0,0 @@
-name: process_subways
-on:
-  workflow_dispatch: # Manual trigger
-
-env:
-  PLANET: /home/planet/planet/planet.o5m
-  TMPDIR: /tmp
-  HTML_DIR: "/mnt/4tbexternal/osm-planet/subway/validator"
-  DUMP: "$HTML_DIR"
-  SKIP_PLANET_UPDATE: "1"
-  DEBIAN_FRONTEND: nonnteractive
-  TZ: Etc/UTC
-
-# /var/www/html/subways is mapped as a volume on cdn-fi-1
-# as is /tmp/planet
-jobs:
-  clone-repos:
-    name: Clone Git Repos
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal:/mnt/4tbexternal
-    concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Checkout subways repo
-        shell: bash
-        run: |
-          cd ~
-          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
-
-  update-planet-o5m:
-    name: Update O5M Planet
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Check for O5M Planet File
-        shell: bash
-        run: |
-          if [ ! -f /home/planet/planet/planet.o5m ]; then
-          echo "WARN: No file at /home/planet/planet/planet.o5m"
-
-          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
-          echo "ERROR: No file at /home/planet/planet/planet-latest.osm.pbf"
-          ls -al /home/planet/
-          ls -al /home/planet/planet/
-          exit 1
-          fi
-
-          echo "Converting planet-latest.osm.pbf to planet.o5m"
-          cd /home/planet/planet/
-          osmconvert -v --drop-author --drop-version --hash-memory=4000 planet-latest.osm.pbf -o=planet.o5m
-          echo "Conversion is done."
-          fi
-      - name: Update O5M planet
-        run: |
-          echo "Starting..."
-          cd /home/planet/planet/
-          rm -f planet-new.o5m
-          osmupdate -v --drop-author --drop-version --hash-memory=4000  --max-merge=32 --out-o5m planet.o5m planet-new.o5m
-          mv planet-new.o5m planet.o5m
-          echo "Done."
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=O5M planet update is done!'
-
-  update-subways:
-    if: inputs.run-subways
-    name: Update Subways
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Update Subways
-        shell: bash
-        run: |
-          cd ~/comaps/
-          cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
-          ./tools/unix/maps/generate_subways.sh
-      - name: Compare with VK validation
-        shell: bash
-        run: |
-          cd ~/subways
-          if [ -f "$HTML_DIR/index.html" ]; then
-            echo "Comparing local validation with VK's validation..."
-            python3 ./scripts/compare_html_validation.py "$HTML_DIR/index.html" \
-              --vk-url "https://maps.vk.com/osm/tools/subways/latest/index.html"
-          else
-            echo "Local index.html not found at $HTML_DIR/index.html"
-            exit 1
-          fi
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Subways are done!'
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -351,6 +351,7 @@ dependencies {
  implementation libs.androidx.recyclerview
  implementation libs.androidx.work.runtime
  implementation libs.androidx.lifecycle.process
+  implementation libs.androidx.documentfile
  implementation libs.android.material
  // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
  // https://github.com/organicmaps/organicmaps/issues/6106
--- a/android/app/src/fdroid/play/listings/lt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/full-description.txt
@@ -1,32 +0,0 @@
-Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą. „CoMaps“ programa yra kilusi iš „Organic Maps“, o pastaroji – iš programos „Maps.ME“.
-
-Apie šio projekto kilmę, jos priežastis ir palaikomą kryptį galite paskaityti adresu <b><i>codeberg.org/comaps</i></b>.
-Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
-• Naudokitės programa ir paskleiskite žinią apie ją
-• Teikite atsiliepimus ir praneškite apie problemas
-• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
-
-‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
-‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
-‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
-‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
-‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
-‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
-
-<b>Pagrindinės funkcijos</b>:
-• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
-• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
-• Pėsčiųjų ir dviračių takai;
-• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
-• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
-• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
-• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
-• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
-• Kelionių metro sluoksnis ir maršrutai;
-• Trasų įrašymas;
-• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
-• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
-• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi.
-
-<b>Laisvė yra čia</b>
-Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!
--- a/android/app/src/fdroid/play/listings/sl/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/full-description.txt
@@ -19,13 +19,13 @@ Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
 • Iščite po imenu, hišnemu naslovu ali po vrsti
-• Usmerjanje z glasovnimi navodili za hojo, kolesarjenje ali vožnjo avtomobila.
+• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
 • Zaznamujte svoje najljubše kraje s preprostim dotikom
 • Wikipedijini članki brez povezave
 • Prometna plast podzemne železnice z usmerjanjem
 • Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
 • Temni prikaz za uporabo ponoči
-• Izboljšajte podatke zemljevida za vse z uporabo vgrajenega urejevalnika
+• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika

 <b>Svoboda je tu</b>
 Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!
--- a/android/app/src/fdroid/play/listings/sl/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/short-description.txt
@@ -1 +1 @@
-Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
--- a/android/app/src/fdroid/play/listings/sl/title.txt
+++ b/android/app/src/fdroid/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps – hodi in vozi brez povezave, zasebno
+CoMaps–Hodi, kolesari, vozi brez povezave, zasebno
--- a/android/app/src/google/play/listings/lt/full-description.txt
+++ b/android/app/src/google/play/listings/lt/full-description.txt
@@ -1,36 +0,0 @@
-Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą.
-
-Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
-• Naudokitės programa ir paskleiskite žinią apie ją
-• Teikite atsiliepimus ir praneškite apie problemas
-• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
-
-<i>Jūsų atsiliepimai ir 5 žvaigždučių vertinimai yra geriausias palaikymas mums!</i>
-
-‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
-‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
-‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
-‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
-‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
-‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
-
-<b>Pagrindinės funkcijos</b>:
-• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
-• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
-• Pėsčiųjų ir dviračių takai;
-• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
-• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
-• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
-• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
-• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
-• Kelionių metro sluoksnis ir maršrutai;
-• Trasų įrašymas;
-• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
-• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
-• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi;
-• „Android Auto“ palaikymas.
-
-Praneškite apie programos problemas, siūlykite idėjas ir prisijunkite prie mūsų bendruomenės svetainėje <b><i>comaps.app</i></b>.
-
-<b>Laisvė yra čia</b>
-Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!
--- a/android/app/src/google/play/listings/sl/short-description.txt
+++ b/android/app/src/google/play/listings/sl/short-description.txt
@@ -1 +1 @@
-Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -9,7 +9,8 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW;
-import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
+import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_COMPASS;
+import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_ROUTE;
 import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
 import static app.organicmaps.sdk.util.Utils.dimen;
@@ -1900,7 +1901,8 @@ public class MwmActivity extends BaseMwmFragmentActivity

    locationHelper.restartWithNewMode();

-    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE) && !LocationUtils.checkFineLocationPermission(this))
+    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE_ROUTE || newMode == FOLLOW_AND_ROTATE_COMPASS)
+        && !LocationUtils.checkFineLocationPermission(this))
    {
      // Try to optimistically request FINE permission for FOLLOW and FOLLOW_AND_ROTATE modes.
      Logger.i(LOCATION_TAG, "Requesting ACCESS_FINE_LOCATION permission for " + LocationState.nameOf(newMode));
--- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
@@ -183,11 +183,16 @@ public final class UiHelpers
      drawableRes = R.drawable.ic_follow;
      tintColor = Colors.LOCATION_TINT;
    }
-    case LocationState.FOLLOW_AND_ROTATE ->
+    case LocationState.FOLLOW_AND_ROTATE_COMPASS ->
    {
      drawableRes = R.drawable.ic_follow_and_rotate;
      tintColor = Colors.LOCATION_TINT;
    }
+    case LocationState.FOLLOW_AND_ROTATE_ROUTE ->
+    {
+      drawableRes = R.drawable.ic_follow_route;
+      tintColor = Colors.LOCATION_TINT;
+    }
    default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
    }

--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -98,6 +98,11 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);

+    View mTopbar = topFrame.findViewById(R.id.statutbar);
+    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
+        UiUtils.setViewNavigationTopInsetsMargin(v, windowInsets);
+        return windowInsets;
+    });
    // Show a blank view below the navbar to hide the menu content
    final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
    final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -281,6 +281,14 @@ public final class UiUtils
    view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
  }

+  public static void setViewNavigationTopInsetsMargin(View view, WindowInsetsCompat windowInsets)
+  {
+      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+      ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+      lp.topMargin = systemInsets.top;
+      view.setLayoutParams(lp);
+  }
+
  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
  {
    View customNavigationButton = toolbar.findViewById(R.id.back);
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -49,8 +49,8 @@ public class MyPositionButton
    int colorAttr = R.attr.iconTint;
    @DimenRes
    int sizeDimen = R.dimen.map_button_icon_size;
-    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
-        || mode == LocationState.PENDING_POSITION)
+    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE_ROUTE
+        || mode == LocationState.FOLLOW_AND_ROTATE_COMPASS || mode == LocationState.PENDING_POSITION)
    {
      colorAttr = com.google.android.material.R.attr.colorSecondary;
      if (mode == LocationState.PENDING_POSITION)
@@ -69,7 +69,8 @@ public class MyPositionButton
        case LocationState.NOT_FOLLOW_NO_POSITION -> R.drawable.ic_location_off;
        case LocationState.NOT_FOLLOW -> R.drawable.ic_location_crosshair;
        case LocationState.FOLLOW -> R.drawable.ic_follow;
-        case LocationState.FOLLOW_AND_ROTATE -> R.drawable.ic_follow_and_rotate;
+        case LocationState.FOLLOW_AND_ROTATE_COMPASS -> R.drawable.ic_follow_and_rotate;
+        case LocationState.FOLLOW_AND_ROTATE_ROUTE -> R.drawable.ic_follow_route;
        default -> throw new IllegalArgumentException("Invalid button mode: " + mode);
      };
          image = ResourcesCompat.getDrawable(resources, drawableRes, context.getTheme());
--- a/android/app/src/main/res/drawable/ic_follow_route.xml
+++ b/android/app/src/main/res/drawable/ic_follow_route.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:strokeColor="@android:color/white"
+      android:fillColor="@android:color/white"
+      android:pathData="M15.15 16.92l-7.04 2.8v0.4l2.63 1.07 0.98 2.67h0.39z"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="m 16.25,15.95 c 2.29,-2.29 1.91,-3.87 -4.06,-3.87"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="M8.98 7.43c-2.97 2.96-2.72 4.66 3.24 4.66"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="M8.89 7.51l8.83-8.79"/>
+  <path
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineJoin="miter"
+      android:pathData="M9.2 22.83c-0.64 0.57-2.9 2.5-3.56 3.13"/>
+</vector>
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -11,13 +11,12 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="15dp"
+    android:layout_height="1dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="500dp"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
    android:elevation="@dimen/nav_elevation"
@@ -52,7 +51,6 @@
    app:layout_constraintEnd_toStartOf="@+id/street_frame"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
-    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginStart="@dimen/margin_quarter"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -11,13 +11,12 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="25dp"
+    android:layout_height="1dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus"
    android:layout_marginStart="@dimen/nav_street_left"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
@@ -55,7 +54,6 @@
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
    android:layout_marginStart="@dimen/margin_half"
-    android:layout_marginTop="@dimen/margin_half_plus"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
    <LinearLayout
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -502,7 +502,7 @@
    <string name="placepage_edit_bookmark_button">Edita el marcador</string>
    <string name="placepage_personal_notes_hint">Notes personals (text o html)</string>
    <string name="editor_reset_edits_message">Voleu descartar tots els canvis locals?</string>
-    <string name="editor_reset_edits_button">Descartar canvis</string>
+    <string name="editor_reset_edits_button">Descarta</string>
    <string name="editor_remove_place_message">Voleu suprimir el lloc afegit?</string>
    <string name="editor_remove_place_button">Suprimeix</string>
    <string name="editor_place_doesnt_exist">El lloc no existeix</string>
@@ -920,10 +920,4 @@
    <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>
-    <string name="advanced">Avançat</string>
-    <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
-    <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_summary_none">No establert</string>
-    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -493,7 +493,7 @@
    <string name="placepage_edit_bookmark_button">Upravit záložku</string>
    <string name="placepage_personal_notes_hint">Vlastní poznámka (text nebo HTML)</string>
    <string name="editor_reset_edits_message">Vymazat všechny místní změny?</string>
-    <string name="editor_reset_edits_button">Zahodit změny</string>
+    <string name="editor_reset_edits_button">Zahodit</string>
    <string name="editor_remove_place_message">Odstranit přidané místo?</string>
    <string name="editor_remove_place_button">Odstranit</string>
    <string name="editor_place_doesnt_exist">Místo neexistuje</string>
@@ -913,10 +913,4 @@
    <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>
-    <string name="download_resources_custom_url_title">Vlastní mapový server</string>
-    <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
-    <string name="advanced">Pokročilé</string>
-    <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -902,9 +902,4 @@
    <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>
-    <string name="advanced">Avanceret</string>
-    <string name="download_resources_custom_url_title">Brugerdefineret kortserver</string>
-    <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
-    <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
-    <string name="download_resources_custom_url_error_scheme">Indtast en fuld URL, der starter med https:// og ender med /</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -915,10 +915,4 @@
    <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
    <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
    <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</string>
-    <string name="download_resources_custom_url_title">Benutzerdefinierter Kartenserver</string>
-    <string name="advanced">Fortgeschritten</string>
-    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
-    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
-    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -450,7 +450,7 @@
    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet.</string>
    <string name="downloader_no_space_title">Δεν υπάρχει αρκετός χώρος</string>
    <string name="downloader_no_space_message">Διαγράψτε μη απαραίτητα δεδομένα</string>
-    <string name="editor_login_error_dialog">Σφάλμα σύνδεσης</string>
+    <string name="editor_login_error_dialog">Σφάλμα σύνδεσης.</string>
    <string name="editor_profile_changes">Επαληθευμένες αλλαγές</string>
    <string name="editor_focus_map_on_location">Σύρετε το χάρτη για να τοποθετήσετε το σταυρό στη θέση του τόπου ή της επιχείρησης.</string>
    <string name="editor_edit_place_title">Επεξεργασία</string>
@@ -466,9 +466,9 @@
    <string name="osm_presentation">Δεδομένα OpenStreetMap που δημιουργήθηκαν από την κοινότητα στις %s. Μάθετε περισσότερα για τον τρόπο επεξεργασίας και ενημέρωσης του χάρτη στο OpenStreetMap.org</string>
    <!-- OSM explanation on Android login screen -->
    <string name="login_osm_presentation">Το OpenStreetMap.org (OSM) είναι ένα κοινοτικό έργο για τη δημιουργία ενός ελεύθερου και ανοικτού χάρτη. Είναι η κύρια πηγή δεδομένων χάρτη στους CoMaps και λειτουργεί παρόμοια με τη Wikipedia. Μπορείτε να προσθέσετε ή να επεξεργαστείτε τοποθεσίες και αυτές γίνονται διαθέσιμες σε εκατομμύρια χρήστες σε όλο τον κόσμο. \nΕνταχθείτε στην κοινότητα και βοηθήστε να φτιάξουμε έναν καλύτερο χάρτη για όλους!</string>
-    <string name="login_to_make_edits_visible">Δημιουργήστε έναν λογαριασμό OpenStreetMap ή συνδεθείτε για να δημοσιεύσετε τις επεξεργασίες του χάρτη σας στον κόσμο</string>
+    <string name="login_to_make_edits_visible">Δημιουργήστε έναν λογαριασμό OpenStreetMap ή συνδεθείτε για να δημοσιεύσετε τις επεξεργασίες του χάρτη σας στον κόσμο.</string>
    <!-- Downloaded 10 **of** 20 <- it is that "of" -->
-    <string name="downloader_of">%1$d από %2$d</string>
+    <string name="downloader_of">%1$d/%2$d</string>
    <string name="download_over_mobile_header">Να γίνει λήψη μέσω δικτύου κινητής τηλεφωνίας;</string>
    <string name="download_over_mobile_message">Αυτό μπορεί να είναι πολύ ακριβό για μερικά πακέτα ή στην περίπτωση roaming.</string>
    <string name="error_enter_correct_house_number">Εισαγάγετε έναν έγκυρο αριθμό κτιρίου</string>
@@ -491,7 +491,7 @@
    <string name="editor_category_unsuitable_title">Δεν μπορείτε να βρείτε την κατάλληλη κατηγορία;</string>
    <string name="editor_category_unsuitable_text">Οι CoMaps επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://www.comaps.app/support/advanced-map-editing/">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
    <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
-    <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να κάνετε αναζήτηση και να πλοηγηθείτε χωρίς σύνδεση</string>
+    <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να αναζητήσετε μια τοποθεσία και να χρησιμοποιήσετε την πλοήγησης χωρίς σύνδεση.</string>
    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
    <!-- abbreviation for kilometers per hour -->
    <string name="kilometers_per_hour">χμ/ω</string>
@@ -499,7 +499,7 @@
    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένου</string>
    <string name="placepage_personal_notes_hint">Προσωπικές σημειώσεις (κείμενο ή html)</string>
    <string name="editor_reset_edits_message">Απόρριψη όλων των τοπικών αλλαγών;</string>
-    <string name="editor_reset_edits_button">Απόρριψη αλλαγών</string>
+    <string name="editor_reset_edits_button">Απόρριψη</string>
    <string name="editor_remove_place_message">Διαγραφή της τοποθεσίας που προστέθηκε;</string>
    <string name="editor_remove_place_button">Διαγραφή</string>
    <string name="editor_place_doesnt_exist">Η τοποθεσία δεν υπάρχει</string>
@@ -825,15 +825,4 @@
    <string name="panoramax">εικόνα Panoramax</string>
    <string name="app_site_url">https://comaps.app/</string>
    <string name="saved">Αποθηκεύτηκε</string>
-    <string name="opens_at">Ανοίγει στις %s</string>
-    <string name="closes_at">Κλείνει στις %s</string>
-    <string name="opens_day_at">Ανοίγει στις %1$s στις %2$s</string>
-    <string name="closes_day_at">Κλείνει στις %1$s στις %2$s</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%d λεπ</item>
-        <item quantity="other">%d λεπ</item>
-    </plurals>
-    <string name="hours_confirmed_time_ago">Επιβεβαιώθηκε %s</string>
-    <string name="existence_confirmed_time_ago">Ύπαρξη επιβεβαιώθηκε %s</string>
-    <string name="editor_building_levels">Όροφοι (με το ισόγειο, χωρίς την ταράτσα)</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -392,7 +392,7 @@
    <string name="editor_time_delete">Eliminar horario</string>
    <!-- Text for allday switch. -->
    <string name="editor_time_allday">Todo el día (24 horas)</string>
-    <string name="editor_time_open">Apertura</string>
+    <string name="editor_time_open">Abierto</string>
    <string name="editor_time_close">Cierre</string>
    <string name="editor_time_add_closed">Añadir horas de pausa</string>
    <string name="editor_time_title">Horario de apertura</string>
@@ -505,7 +505,7 @@
    <string name="placepage_edit_bookmark_button">Editar marcador</string>
    <string name="placepage_personal_notes_hint">Notas personales (texto o html)</string>
    <string name="editor_reset_edits_message">¿Restablecer todos los cambios locales?</string>
-    <string name="editor_reset_edits_button">Descartar cambios</string>
+    <string name="editor_reset_edits_button">Restablecer</string>
    <string name="editor_remove_place_message">¿Eliminar el lugar añadido?</string>
    <string name="editor_remove_place_button">Eliminar</string>
    <string name="editor_place_doesnt_exist">El lugar no existe</string>
@@ -922,10 +922,4 @@
    <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>
-    <string name="advanced">Avanzado</string>
-    <string name="download_resources_custom_url_title">Servidor de mapas personalizado</string>
-    <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string>
-    <string name="download_resources_custom_url_summary_none">No establecido</string>
-    <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL completo empezando con https:// y terminando con /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -245,16 +245,16 @@
    <string name="downloader_near_me_subtitle">نزدیک من</string>
    <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
    <string name="downloader_status_maps">نقشه‌ها</string>
-    <string name="downloader_download_all_button">بارگیری همه</string>
-    <string name="downloader_downloading">بارگیری می‌شود:</string>
+    <string name="downloader_download_all_button">دانلود همه</string>
+    <string name="downloader_downloading">درحال دانلود:</string>
    <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
    <string name="downloader_delete_map_while_routing_dialog">برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید</string>
    <!-- PointsInDifferentMWM -->
    <string name="routing_failed_cross_mwm_building">تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند.</string>
    <!-- Context menu item for downloader. -->
-    <string name="downloader_download_map">بارگیری نقشه</string>
+    <string name="downloader_download_map">دانلود نقشه</string>
    <!-- Item status in downloader. -->
-    <string name="downloader_retry">تلاش دوباره</string>
+    <string name="downloader_retry">تلاش مجدد</string>
    <!-- Item in context menu. -->
    <string name="downloader_delete_map">حذف نقشه</string>
    <!-- Item in context menu. -->
@@ -294,11 +294,11 @@
    <!-- deep purple color -->
    <string name="deep_purple">ارغوانی سیر</string>
    <!-- light blue color -->
-    <string name="light_blue">آبی کم‌رنگ</string>
+    <string name="light_blue">آبی کمرنگ</string>
    <!-- cyan color -->
    <string name="cyan">فیروزه‌ای</string>
    <!-- teal color -->
-    <string name="teal">سبز دودی</string>
+    <string name="teal">آبی سیر</string>
    <!-- lime color -->
    <string name="lime">زرد لیمویی</string>
    <!-- deep orange color -->
@@ -330,7 +330,7 @@
    <string name="dialog_routing_select_closer_end">لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید</string>
    <string name="dialog_routing_change_intermediate">ناتوان در تعیین نقطه میانی</string>
    <string name="dialog_routing_intermediate_not_determined">لطفا نقطه میانی را تنظیم کنید</string>
-    <string name="dialog_routing_system_error">ایرنگ سامانه</string>
+    <string name="dialog_routing_system_error">خطای سیستم</string>
    <string name="dialog_routing_application_error">ناتوان در ایجاد مسیر به علت خطای برنامه</string>
    <string name="dialog_routing_try_again">لطفا دوباره تلاش کنید</string>
    <string name="not_now">اکنون خیر</string>
@@ -342,7 +342,7 @@
    <!-- «Show» context menu -->
    <string name="show">نمایش</string>
    <!-- «Hide» context menu -->
-    <string name="hide">پنهان کردن</string>
+    <string name="hide">مخفی کردن</string>
    <string name="categories">دسته‌بندی‌ها</string>
    <string name="history">تاریخچه</string>
    <string name="search_not_found">متاسفانه چیزی پیدا نشد</string>
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -504,7 +504,7 @@
    <string name="placepage_edit_bookmark_button">Muokkaa kirjanmerkkiä</string>
    <string name="placepage_personal_notes_hint">Henkilökohtaiset merkinnät (teksti tai html)</string>
    <string name="editor_reset_edits_message">Nollataanko kaikki paikalliset muutokset?</string>
-    <string name="editor_reset_edits_button">Hylkää muutokset</string>
+    <string name="editor_reset_edits_button">Nollaa</string>
    <string name="editor_remove_place_message">Poistetaanko lisätty paikka?</string>
    <string name="editor_remove_place_button">Poista</string>
    <string name="editor_place_doesnt_exist">Paikkaa ei ole olemassa</string>
@@ -815,7 +815,7 @@
    <!-- preference string for using auto theme only in navigation mode -->
    <string name="nav_auto">Automaattinen navigointi</string>
    <string name="level_value_generic">Kerros: %s</string>
-    <string name="share_bookmarks_email_body">Hei!\n\nLiitteenä kirjanmerkkini. Avaa ne CoMaps-sovelluksella. Jos sinulla ei ole vielä sovellusta, voit ladata sen osoitteesta: https://www.comaps.app/download/\n\nNauti matkustamisesta CoMapsin kanssa!</string>
+    <string name="share_bookmarks_email_body">Hei! \n\nLiitteenä ovat kirjamerkkini; Avaa ne CoMaps -sovelluksessa. Mikäli sinulla ei ole vielä sovellusta asennettuna, voit ladata sen osoitteesta: https://www.comaps.app/download/ \n\nNauti matkustamisesta CoMaps:n kanssa!</string>
    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
    <string name="translated_om_site_url">https://comaps.app/fi/</string>
    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
@@ -911,11 +911,4 @@
    <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>
-    <string name="advanced">Lisäasetukset</string>
-    <string name="download_resources_custom_url_title">Mukautettu karttapalvelin</string>
-    <string name="download_resources_custom_url_summary_none">Ei asetettu</string>
-    <string name="download_resources_custom_url_error_scheme">Kirjoita täysi URL-osoite alkaeh https:// ja päättyen /</string>
-    <string name="download_resources_custom_url_message">Ohita karttalatausten oletuspalvelin. Jätä tyhjäksi käyttääksesi CoMapsin oletuspalvelinta.</string>
-    <string name="navigation_start_tts_disabled_message">Ääniohjeistukset pois käytöstä: TTS-moottori ei saatavilla</string>
-    <string name="charge_socket_schuko">EU</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -506,7 +506,7 @@
    <string name="placepage_edit_bookmark_button">Modifier le signet</string>
    <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
    <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
-    <string name="editor_reset_edits_button">Annuler les modifications</string>
+    <string name="editor_reset_edits_button">Ignorer</string>
    <string name="editor_remove_place_message">Supprimer le lieu ajouté ?</string>
    <string name="editor_remove_place_button">Supprimer</string>
    <string name="editor_place_doesnt_exist">Ce lieu n’existe pas</string>
@@ -921,10 +921,4 @@
    <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>
-    <string name="advanced">Avancé</string>
-    <string name="download_resources_custom_url_summary_none">Non défini</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
-    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string>
-    <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
 </resources>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -498,7 +498,7 @@
    <string name="placepage_edit_bookmark_button">Modifica luogo preferito</string>
    <string name="placepage_personal_notes_hint">Note personali (testo o html)</string>
    <string name="editor_reset_edits_message">Cancellare tutte le modifiche locali?</string>
-    <string name="editor_reset_edits_button">Scarta modifiche</string>
+    <string name="editor_reset_edits_button">Cancella</string>
    <string name="editor_remove_place_message">Eliminare il luogo aggiunto?</string>
    <string name="editor_remove_place_button">Elimina</string>
    <string name="editor_place_doesnt_exist">Il luogo non esiste</string>
@@ -906,10 +906,4 @@
    <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>
-    <string name="download_resources_custom_url_error_scheme">Aggiungere un URL che inizia con https:// e finisce con /</string>
-    <string name="download_resources_custom_url_summary_none">Non impostato</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_message">Sovrascrivi il server da cui scaricare le mappe. Lascia vuoto per usare i server default di CoMaps.</string>
-    <string name="download_resources_custom_url_title">Server mappe personalizzato</string>
-    <string name="advanced">Avanzate</string>
 </resources>
--- a/android/app/src/main/res/values-kk/strings.xml
+++ b/android/app/src/main/res/values-kk/strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -491,7 +491,7 @@
    <string name="placepage_edit_bookmark_button">Taisyti žymę</string>
    <string name="placepage_personal_notes_hint">Asmeninės pastabos (tekstas arba HTML)</string>
    <string name="editor_reset_edits_message">Anuliuoti visus vietinius pakeitimus?</string>
-    <string name="editor_reset_edits_button">Atsisakyti pakeitimų</string>
+    <string name="editor_reset_edits_button">Anuliuoti</string>
    <string name="editor_remove_place_message">Šalinti pridėtą vietą?</string>
    <string name="editor_remove_place_button">Šalinti</string>
    <string name="editor_place_doesnt_exist">Ši vieta neegzistuoja</string>
@@ -804,7 +804,7 @@
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">Panoramax vaizdas</string>
-    <string name="saved">Įrašyta</string>
+    <string name="saved">Išsaugota</string>
    <string name="ruler">Liniuotė</string>
    <string name="pref_left_button_title">Kairiojo mygtuko funkcija</string>
    <string name="pref_backup_now_summary_empty_lists">Neturite jokių žymių ar trasų atsarginei kopijai sudaryti</string>
@@ -818,7 +818,7 @@
    <string name="error_enter_correct_level">Įveskite leistiną aukšto numerį</string>
    <string name="error_enter_correct_bluesky_page">Įveskite galiojantį „Bluesky“ paskyros vardą ar tinklalapio adresą</string>
    <string name="error_enter_correct_fediverse_page">Įveskite galiojantį „Mastodon“ paskyros vardą ar tinklalapio adresą</string>
-    <string name="pref_left_button_disable">Mygtuko nerodyti</string>
+    <string name="pref_left_button_disable">Mygtukas nerodomas</string>
    <string name="pref_backup_summary">Automatinis atsarginių kopijų rašymas į pasirinktą aplanką</string>
    <string name="pref_backup_now_title">Įrašyti dabar</string>
    <string name="pref_backup_now_summary_progress">Atsarginė kopija įrašoma…</string>
@@ -888,18 +888,4 @@
    <string name="power_management">Energijos naudojimas</string>
    <string name="charge_socket_schuko">Buitinis ES</string>
    <string name="list_description_empty">Paredaguokite sąrašą ir pridėkite aprašymą</string>
-    <string name="place_page_map_too_old_title">Žemėlapio duomenys pasenę</string>
-    <string name="place_page_map_too_old_description">Jūsų naudojami žemėlapio duomenys senstelėję, prašom atnaujinti žemėlapį.</string>
-    <string name="place_page_app_too_old_description">Jūsų naudojami žemėlapio duomenys stipriai pasenę, prašom atnaujinti „CoMaps“ programą.</string>
-    <string name="place_page_update_too_old_map">Atnaujinti regiono žemėlapį</string>
-    <string name="place_page_too_old_to_edit">„OpenStreetMap“ žemėlapio redagavimas negalimas, nes žemėlapio duomenys per seni.</string>
-    <string name="prefs_speed_cameras_information">Įspėjimai apie greičio matuoklius negalimi šalyse, kuriose tai draudžiama įstatymu.</string>
-    <string name="navigation_start_tts_message">"Pradedama navigacija, balso instrukcijų kalba: "</string>
-    <string name="navigation_start_tts_disabled_message">Balso instrukcijos išjungtos: šnekos sintezės sistema neprieinama</string>
-    <string name="advanced">Kita</string>
-    <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
-    <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
-    <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -499,7 +499,7 @@
    <string name="placepage_edit_bookmark_button">Rediģēt grāmatzīmi</string>
    <string name="placepage_personal_notes_hint">Personīgi pieraksti (teksts vai HTML)</string>
    <string name="editor_reset_edits_message">Vai izmest visas lokāli saglabātās izmaiņas?</string>
-    <string name="editor_reset_edits_button">Atmest izmaiņas</string>
+    <string name="editor_reset_edits_button">Noraidīt</string>
    <string name="editor_remove_place_message">Vai dzēst pievienoto vietu?</string>
    <string name="editor_remove_place_button">Dzēst</string>
    <string name="editor_place_doesnt_exist">Vieta nepastāv</string>
@@ -853,13 +853,4 @@
    <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
    <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
    <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_summary_none">Nav iestatīts</string>
-    <string name="download_resources_custom_url_error_scheme">Lūgums ievadīt pilnu URL, kas sākas ar https:// un beidzas ar /</string>
-    <string name="advanced">Iestatījumi: izvērsta kopa</string>
-    <plurals name="minutes_short">
-        <item quantity="zero">%d min.</item>
-        <item quantity="one">%d min.</item>
-        <item quantity="other">%d min.</item>
-    </plurals>
 </resources>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -501,7 +501,7 @@
    <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
    <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
    <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
-    <string name="editor_reset_edits_button">Wijzigingen weggooien</string>
+    <string name="editor_reset_edits_button">Gooi weg</string>
    <string name="editor_remove_place_message">Toegevoegde locatie verwijderen?</string>
    <string name="editor_remove_place_button">Verwijder</string>
    <string name="editor_place_doesnt_exist">Locatie bestaat niet</string>
@@ -915,10 +915,4 @@
    <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>
-    <string name="advanced">Geavanceerd</string>
-    <string name="download_resources_custom_url_title">Aangepaste server voor kaarten</string>
-    <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
-    <string name="download_resources_custom_url_error_scheme">Voer een volledige URL in, beginnend met https:// en eindigend met /</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -494,7 +494,7 @@
    <string name="placepage_edit_bookmark_button">Editar favorito</string>
    <string name="placepage_personal_notes_hint">Notas pessoais (texto ou html)</string>
    <string name="editor_reset_edits_message">Eliminar todas as alterações locais?</string>
-    <string name="editor_reset_edits_button">Descartar alterações</string>
+    <string name="editor_reset_edits_button">Eliminar</string>
    <string name="editor_remove_place_message">Eliminar o local adicionado?</string>
    <string name="editor_remove_place_button">Eliminar</string>
    <string name="editor_place_doesnt_exist">O local não existe</string>
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -457,7 +457,7 @@
    <string name="editor_report_problem_other_title">Altă problemă</string>
    <string name="message_invalid_feature_position">Niciun obiect nu poate fi poziționat aici</string>
    <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
-    <string name="osm_presentation">Date OpenStreetMap create de comunitate din data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
+    <string name="osm_presentation">Date OpenStreetMap create de comunitate la data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
    <!-- OSM explanation on Android login screen -->
    <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume. \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!</string>
    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume</string>
@@ -497,7 +497,7 @@
    <string name="placepage_edit_bookmark_button">Modifică locul preferat</string>
    <string name="placepage_personal_notes_hint">Însemnări personale (text sau html)</string>
    <string name="editor_reset_edits_message">Ștergi toate modificările locale?</string>
-    <string name="editor_reset_edits_button">Renunță la modificări</string>
+    <string name="editor_reset_edits_button">Renunță</string>
    <string name="editor_remove_place_message">Elimini locul adăugat?</string>
    <string name="editor_remove_place_button">Elimină</string>
    <string name="editor_place_doesnt_exist">Locul nu există</string>
@@ -892,15 +892,10 @@
    <string name="place_page_map_too_old_title">Harta este prea veche</string>
    <string name="place_page_map_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați-o.</string>
    <string name="place_page_app_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați CoMaps.</string>
-    <string name="place_page_update_too_old_map">Actualizează regiunea</string>
+    <string name="place_page_update_too_old_map">Actualizează harta</string>
    <string name="place_page_too_old_to_edit">Editarea OpenStreetMap este dezactivată pentru că harta descărcată este prea veche.</string>
    <string name="prefs_speed_cameras_information">Avertizările pentru radare sunt dezactivate unde avertizarea este interzisă de legea locală.</string>
    <string name="navigation_start_tts_disabled_message">Instrucțiuni vocale dezactivate: Nu este disponibil niciun sistem TTS</string>
    <string name="charge_socket_count">Număr</string>
    <string name="unknown_count">Necunoscut</string>
-    <string name="download_resources_custom_url_error_scheme">Introduceți o adresă completă care începe cu https:// și se termină cu /</string>
-    <string name="download_resources_custom_url_summary_none">Nesetat</string>
-    <string name="download_resources_custom_url_title">Server hărți custom</string>
-    <string name="download_resources_custom_url_message">Înlocuiți serverul prestabilit folosit pentru descărcarea hărților. Lăsați liber pentru serverul prestabilit.</string>
-    <string name="advanced">Avansate</string>
 </resources>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -507,7 +507,7 @@
    <string name="placepage_edit_bookmark_button">Редактировать метку</string>
    <string name="placepage_personal_notes_hint">Примечание (текст или html)</string>
    <string name="editor_reset_edits_message">Сбросить все локальные правки?</string>
-    <string name="editor_reset_edits_button">Отменить изменения</string>
+    <string name="editor_reset_edits_button">Сбросить</string>
    <string name="editor_remove_place_message">Удалить добавленный вами объект?</string>
    <string name="editor_remove_place_button">Удалить</string>
    <string name="editor_place_doesnt_exist">Места не существует</string>
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -328,7 +328,7 @@
    <string name="placepage_edit_bookmark_button">Uredi zaznamek</string>
    <string name="placepage_personal_notes_hint">Osebne opombe (golo besedilo ali HTML)</string>
    <string name="editor_reset_edits_message">Naj zavržem vse krajevne spremembe?</string>
-    <string name="editor_reset_edits_button">Zavrzi spremembe</string>
+    <string name="editor_reset_edits_button">Zavrzi</string>
    <string name="editor_remove_place_message">Naj izbrišem dodane kraje?</string>
    <string name="editor_remove_place_button">Izbriši</string>
    <string name="editor_place_doesnt_exist">Kraj ne obstaja</string>
@@ -657,10 +657,4 @@
    <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>
-    <string name="advanced">Napredno</string>
-    <string name="download_resources_custom_url_title">Strežnik zemljevida po meri</string>
-    <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
-    <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
-    <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -494,7 +494,7 @@
    <string name="placepage_more_button">Више</string>
    <string name="placepage_edit_bookmark_button">Измени маркер</string>
    <string name="editor_reset_edits_message">Брисање свих измена које нису послате?</string>
-    <string name="editor_reset_edits_button">Одбаци промене</string>
+    <string name="editor_reset_edits_button">Обриши</string>
    <string name="editor_remove_place_message">Брисање додатог места?</string>
    <string name="editor_remove_place_button">Обриши</string>
    <string name="editor_place_doesnt_exist">Место не постоји</string>
@@ -904,20 +904,4 @@
    <string name="editor_mark_business_vacant_title">Означи пословни простор као празан</string>
    <string name="editor_mark_business_vacant_description">Користите да бисте назначили да се фирма иселила и да је пословни простор празан и спреман да прими новог закупца.</string>
    <string name="editor_submit">Пошаљи</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>
-    <string name="prefs_speed_cameras_information">Упозорења о прекршајним камерама за брзину су онемогућена у земљама у којима су упозорења забрањена законом.</string>
-    <string name="power_management">Управљање напајањем</string>
-    <string name="navigation_start_tts_message">"Покретање навигације, језик гласовних инструкција: "</string>
-    <string name="navigation_start_tts_disabled_message">Гласовне инструкције онемогућене: ТТС мотор није доступан</string>
-    <string name="charge_socket_schuko">Шухо</string>
-    <string name="advanced">Напредно</string>
-    <string name="download_resources_custom_url_title">Сопствени сервер мапа</string>
-    <string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string>
-    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
-    <string name="download_resources_custom_url_summary_none">Није постављено</string>
-    <string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string>
 </resources>
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -858,7 +858,7 @@
    <string name="ruler">Cetvel</string>
    <string name="bookmark_color">Yer imi rengi</string>
    <string name="open_now">Şu an açık</string>
-    <string name="closed_now">Şu anda kapalı</string>
+    <string name="closed_now">Şimdi kapandı</string>
    <string name="at">%s\'da</string>
    <string name="pref_backup_title">Yer imleri ve izlerin yedeği</string>
    <string name="dialog_report_error_with_logs">Lütfen bize hata raporu yollayın:\n - Ayarlardan \"Günlüğe kaydetmeyi etkinleştir\" \n - hatayı tekrarlayın\n - \"Hakkında ve Yardım\" ekranında \"Hata Bildir\" düğmesine basın ve e-posta veya sohbet yoluyla gönderin\n - günlüğe kaydetmeyi devre dışı bırak</string>
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -66,4 +66,13 @@
  </declare-styleable>

  <attr name="accentColorSelector" format="color"/>
+  <attr name="bookingFilterTitleColor" format="color"/>
+  <attr name="adsRemovalOptionsBg" format="reference"/>
+  <attr name="adsRemovalOptionsDivider" format="color"/>
+  <attr name="icClearRounded" format="reference"/>
+  <attr name="bookmarkSubscriptionScreenBg" format="reference"/>
+  <attr name="bookmarkSubscriptionCardEdge" format="reference"/>
+  <attr name="bookmarkSubscriptionCardBg" format="color"/>
+  <attr name="bookmarkSubscriptionCardTextColor" format="color"/>
+  <attr name="imgPromoBookingTitle" format="reference"/>
 </resources>
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-androidGradlePlugin = "8.11.2"
+androidGradlePlugin = "8.13.2"
 androidxCarApp = "1.7.0"

 [libraries]
 android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
-triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.12.1" }
+triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.13.0" }
 huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
 android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
 microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
 androidx-core = { module = "androidx.core:core", version = "1.17.0" }
-jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.20" }
+jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.21" }
 androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
@@ -21,12 +21,13 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
 androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
 androidx-media = { module = "androidx.media:media", version = "1.7.1" }
+androidx-documentfile= { module = "androidx.documentfile:documentfile", version ="1.1.0" }
 android-material = { module = "com.google.android.material:material", version = "1.12.0" }
-google-guava = { module = "com.google.guava:guava", version = "33.4.8-android" }
+google-guava = { module = "com.google.guava:guava", version = "33.5.0-android" }
 appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
 junit = { module = "junit:junit", version = "4.13.2" }
-mockito-core = { module = "org.mockito:mockito-core", version = "5.20.0" }
+mockito-core = { module = "org.mockito:mockito-core", version = "5.21.0" }

 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -126,6 +126,7 @@ dependencies {
  implementation libs.androidx.recyclerview
  implementation libs.androidx.preference
  implementation libs.android.material
+  implementation libs.androidx.documentfile

  testImplementation libs.junit
 }
@@ -146,7 +147,7 @@ project.afterEvaluate {

  final taskName = gradle.startParameter.taskNames

-  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
    exec {
      workingDir '../..'

--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
@@ -20,7 +20,8 @@ public final class LocationState
  }

  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({PENDING_POSITION, NOT_FOLLOW_NO_POSITION, NOT_FOLLOW, FOLLOW, FOLLOW_AND_ROTATE})
+  @IntDef({PENDING_POSITION, NOT_FOLLOW_NO_POSITION, NOT_FOLLOW, FOLLOW, FOLLOW_AND_ROTATE_COMPASS,
+           FOLLOW_AND_ROTATE_ROUTE})
  @interface Value
  {}

@@ -29,7 +30,8 @@ public final class LocationState
  public static final int NOT_FOLLOW_NO_POSITION = 1;
  public static final int NOT_FOLLOW = 2;
  public static final int FOLLOW = 3;
-  public static final int FOLLOW_AND_ROTATE = 4;
+  public static final int FOLLOW_AND_ROTATE_COMPASS = 4;
+  public static final int FOLLOW_AND_ROTATE_ROUTE = 5;

  // These constants should correspond to values defined in platform/location.hpp
  // Leave 0-value as no any error.
@@ -69,7 +71,8 @@ public final class LocationState
      case NOT_FOLLOW_NO_POSITION -> "NOT_FOLLOW_NO_POSITION";
      case NOT_FOLLOW -> "NOT_FOLLOW";
      case FOLLOW -> "FOLLOW";
-      case FOLLOW_AND_ROTATE -> "FOLLOW_AND_ROTATE";
+      case FOLLOW_AND_ROTATE_COMPASS -> "FOLLOW_AND_ROTATE_COMPASS";
+      case FOLLOW_AND_ROTATE_ROUTE -> "FOLLOW_AND_ROTATE_ROUTE";
      default -> "Unknown: " + mode;
    };
  }
--- a/android/sdk/src/main/res/values-bn/types_strings.xml
+++ b/android/sdk/src/main/res/values-bn/types_strings.xml
@@ -34,20 +34,4 @@
    <string name="type.amenity.parking.street_side.private">ব্যক্তিগত সড়ক-পার্শ্ববর্তী পার্কিং</string>
    <string name="type.amenity.parking.lane">লেন পার্কিং</string>
    <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং</string>
-    <string name="type.aeroway.aerodrome">বিমানবন্দর</string>
-    <string name="type.aeroway.aerodrome.international">আন্তর্জাতিক বিমানবন্দর</string>
-    <string name="type.amenity.drinking_water">পানীয় জল</string>
-    <string name="type.office.diplomatic">দূতাবাস</string>
-    <string name="type.natural.water.river">নদী</string>
-    <string name="type.natural.tree">গাছ</string>
-    <string name="type.natural.water.pond">পুকুর</string>
-    <string name="type.natural.volcano">আগ্নেয়গিরি</string>
-    <string name="type.natural.desert">মরুভূমি</string>
-    <string name="type.natural.coastline">উপকূলরেখা</string>
-    <string name="type.amenity.college">কলেজ</string>
-    <string name="type.amenity.music_school">গানের স্কুল</string>
-    <string name="type.amenity.place_of_worship.muslim">মসজিদ</string>
-    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির</string>
-    <string name="type.amenity.prison">কারাগার</string>
-    <string name="type.barrier.fence">বেড়া</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -154,7 +154,7 @@
    <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
    <string name="type.amenity.shelter.basic_hut">Biwakschachtel</string>
    <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Überdachung zum Schlafen</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Wetterschutz</string>
    <string name="type.amenity.public_bath">Öffentliches Bad</string>
    <string name="type.amenity.shower">Dusche</string>
    <string name="type.amenity.stripclub">Stripclub</string>
@@ -173,7 +173,7 @@
    <string name="type.amenity.vending_machine.food">Essensautomat</string>
    <string name="type.amenity.vending_machine.newspapers">Zeitungsautomat</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkautomat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">5Fahrkartenautomat|4Ticketautomat|4Busticket|4Zugticket|5Bahnticket|4Zugfahrschein|U+1F3AB|U+1F39F|U+1F9FE</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Fahrkartenautomat</string>
    <string name="type.amenity.vending_machine.sweets">Süßigkeitenautomat</string>
    <string name="type.amenity.vending_machine.excrement_bags">Hundekotbeutelspender</string>
    <string name="type.amenity.parcel_locker">Paketstation</string>
@@ -377,7 +377,7 @@
    <string name="type.cardinal.east">Ost</string>
    <string name="type.cardinal.north">Nord</string>
    <string name="type.cardinal.south">Süd</string>
-    <string name="type.cardinal.west">Westen</string>
+    <string name="type.cardinal.west">West</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
@@ -1502,5 +1502,4 @@
    <string name="type.amenity.mobile_money_agent">Mobile Money Vertretung</string>
    <string name="type.amenity.food_sharing">Food Sharing</string>
    <string name="type.natural.sand">Sand</string>
-    <string name="type.amenity.hydrant">Beregnungshydrant</string>
 </resources>
--- a/android/sdk/src/main/res/values-el/strings.xml
+++ b/android/sdk/src/main/res/values-el/strings.xml
@@ -35,12 +35,4 @@
    <string name="mb">MB</string>
    <string name="mi">μι</string>
    <string name="today">Σήμερα</string>
-    <string name="yesterday">Χθες</string>
-    <string name="days_ago">%s μέρες πριν</string>
-    <string name="week_ago">%s εβδομάδα πριν</string>
-    <string name="weeks_ago">%s εβδομάδες πριν</string>
-    <string name="month_ago">%s μήνα πριν</string>
-    <string name="months_ago">%s μήνες πριν</string>
-    <string name="year_ago">%s χρόνο πριν</string>
-    <string name="years_ago">%s χρόνια πριν</string>
 </resources>
--- a/android/sdk/src/main/res/values-es/strings.xml
+++ b/android/sdk/src/main/res/values-es/strings.xml
@@ -37,11 +37,11 @@
    <string name="gb">GB</string>
    <string name="today">Hoy</string>
    <string name="yesterday">Ayer</string>
-    <string name="days_ago">hace %s días</string>
-    <string name="week_ago">hace %s semana</string>
-    <string name="weeks_ago">hace %s semanas</string>
-    <string name="month_ago">hace %s mes</string>
-    <string name="months_ago">hace %s meses</string>
-    <string name="year_ago">hace %s año</string>
-    <string name="years_ago">hace %s años</string>
+    <string name="days_ago">Hace %s días</string>
+    <string name="week_ago">Hace %s semana</string>
+    <string name="weeks_ago">Hace %s semanas</string>
+    <string name="month_ago">Hace %s mes</string>
+    <string name="months_ago">Hace %s meses</string>
+    <string name="year_ago">Hace %s año</string>
+    <string name="years_ago">Hace %s años</string>
 </resources>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -50,7 +50,7 @@
    <string name="type.amenity.cinema">Cine</string>
    <string name="type.leisure.bowling_alley">Bolera</string>
    <string name="type.amenity.clinic">Clínica</string>
-    <string name="type.amenity.college">Colegio universitario</string>
+    <string name="type.amenity.college">Facultad</string>
    <string name="type.amenity.community_centre">Centro comunitario</string>
    <string name="type.amenity.compressed_air">Aire comprimido</string>
    <string name="type.amenity.conference_centre">Centro de conferencias</string>
@@ -213,11 +213,11 @@
    <string name="type.boundary">Frontera</string>
    <string name="type.boundary.administrative">Frontera administrativa</string>
    <!-- Borders between countries. -->
-    <string name="type.boundary.administrative.2">Frontera nacional</string>
+    <string name="type.boundary.administrative.2">Frontera de país</string>
    <!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
-    <string name="type.boundary.administrative.3">Frontera regional</string>
+    <string name="type.boundary.administrative.3">Frontera de región</string>
    <!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
-    <string name="type.boundary.administrative.4">Frontera regional</string>
+    <string name="type.boundary.administrative.4">Frontera de región</string>
    <string name="type.boundary.national_park">Parque nacional</string>
    <string name="type.boundary.aboriginal_lands">Tierras indígenas</string>
    <string name="type.boundary.protected_area">Área protegida</string>
@@ -299,7 +299,7 @@
    <string name="type.cuisine.german">Alemana</string>
    <string name="type.cuisine.greek">Griega</string>
    <string name="type.cuisine.grill">Parrilla</string>
-    <string name="type.cuisine.heuriger">Heuriger</string>
+    <string name="type.cuisine.heuriger">Heuriger (especialidad austríaca)</string>
    <string name="type.cuisine.hotdog">Perritos calientes</string>
    <string name="type.cuisine.hungarian">Húngara</string>
    <string name="type.cuisine.ice_cream">Helados</string>
@@ -568,7 +568,7 @@
    <string name="type.historic.memorial.plaque">Placa conmemorativa</string>
    <string name="type.historic.memorial.sculpture">Escultura</string>
    <string name="type.historic.memorial.statue">Estatua</string>
-    <string name="type.historic.memorial.stolperstein">Stolperstein (memorial de las víctimas del nazismo)</string>
+    <string name="type.historic.memorial.stolperstein">Stolperstein (memoriales de las víctimas del nazismo)</string>
    <string name="type.historic.stone">Piedra histórica</string>
    <string name="type.historic.memorial.war_memorial">Memorial de guerra</string>
    <string name="type.historic.mine">Mina histórica</string>
@@ -663,7 +663,7 @@
    <string name="type.man_made">Artificial</string>
    <string name="type.man_made.breakwater">Rompeolas</string>
    <string name="type.man_made.cairn">Mojón</string>
-    <string name="type.man_made.chimney">Chimenea</string>
+    <string name="type.man_made.chimney">Chimenea de fábrica</string>
    <string name="type.man_made.cutline">Línea de corte forestal</string>
    <string name="type.man_made.survey_point">Punto geodésico</string>
    <string name="type.man_made.flagpole">Asta de bandera</string>
@@ -851,7 +851,7 @@
    <string name="type.railway.station.light_rail">Estación de tren</string>
    <string name="type.railway.station.light_rail.berlin">Estación de tren (S-Bahn)</string>
    <string name="type.railway.station.light_rail.london">Estación de tren</string>
-    <string name="type.railway.station.light_rail.porto">Metro de Porto</string>
+    <string name="type.railway.station.light_rail.porto">Estación de metro</string>
    <string name="type.railway.station.monorail">Estación de monoriel</string>
    <string name="type.railway.station.subway">Estación de metro</string>
    <string name="type.railway.station.subway.adana">Estación de metro</string>
@@ -1101,27 +1101,27 @@
    <string name="type.shop.books">Librería</string>
    <string name="type.shop.butcher">Carnicería</string>
    <string name="type.shop.cannabis">Tienda de cánnabis</string>
-    <string name="type.shop.car">Concesionario de automóviles</string>
+    <string name="type.shop.car">Concesionario de coches</string>
    <string name="type.shop.car_parts">Piezas de automóvil</string>
-    <string name="type.shop.car_repair">Taller de automóviles</string>
+    <string name="type.shop.car_repair">Taller</string>
    <string name="type.shop.car_repair.tyres">Reparación de neumáticos</string>
    <string name="type.shop.caravan">Concesionario de caravanas</string>
-    <string name="type.shop.carpet">Tienda de alfombras</string>
+    <string name="type.shop.carpet">Alfombras</string>
    <string name="type.shop.chemist">Droguería</string>
    <string name="type.shop.chocolate">Chocolatería</string>
    <string name="type.shop.clothes">Tienda de ropa</string>
    <string name="type.shop.coffee">Tienda de café</string>
    <string name="type.shop.computer">Tienda de informática</string>
-    <string name="type.shop.confectionery">Tienda de dulces</string>
+    <string name="type.shop.confectionery">Confitería</string>
    <string name="type.shop.convenience">Tienda de barrio</string>
-    <string name="type.shop.copyshop">Copistería</string>
+    <string name="type.shop.copyshop">Centro de copiado</string>
    <string name="type.shop.cosmetics">Tienda de cosméticos</string>
-    <string name="type.shop.curtain">Tienda de cortinas</string>
+    <string name="type.shop.curtain">Cortinas</string>
    <string name="type.shop.deli">Tienda de delicatessen</string>
    <string name="type.shop.department_store">Grandes almacenes</string>
    <string name="type.shop.doityourself">Tienda de bricolaje</string>
    <string name="type.shop.dry_cleaning">Tintorería</string>
-    <string name="type.shop.electronics">Tienda de electrónica</string>
+    <string name="type.shop.electronics">Electrónica</string>
    <string name="type.shop.erotic">Tienda erótica</string>
    <string name="type.shop.fabric">Tienda de telas</string>
    <string name="type.shop.farm">Tienda de alimentos de granja</string>
@@ -1130,7 +1130,7 @@
    <string name="type.shop.funeral_directors">Funeraria</string>
    <string name="type.shop.furniture">Tienda de muebles</string>
    <string name="type.shop.garden_centre">Vivero</string>
-    <string name="type.shop.gas">Tienda de gas</string>
+    <string name="type.shop.gas">Tienda de gasolina</string>
    <string name="type.shop.gift">Tienda de regalos</string>
    <string name="type.shop.greengrocer">Frutería</string>
    <string name="type.shop.grocery">Tienda de comestibles</string>
@@ -1147,12 +1147,12 @@
    <string name="type.shop.laundry">Lavandería</string>
    <string name="type.shop.mall">Centro comercial</string>
    <string name="type.shop.massage">Salón de masajes</string>
-    <string name="type.shop.mobile_phone">Tienda de móviles</string>
+    <string name="type.shop.mobile_phone">Tienda de Móviles</string>
    <string name="type.shop.money_lender">Prestamista</string>
    <string name="type.shop.motorcycle">Tienda de motos</string>
    <string name="type.shop.motorcycle_repair">Taller de motos</string>
    <string name="type.shop.music">Tienda de discos</string>
-    <string name="type.shop.musical_instrument">Tienda de instrumentos musicales</string>
+    <string name="type.shop.musical_instrument">Instrumentos musicales</string>
    <string name="type.shop.newsagent">Puesto de venta de periódicos</string>
    <string name="type.shop.optician">Óptica</string>
    <string name="type.shop.outdoor">Equipamiento de ocio al aire libre</string>
@@ -1204,9 +1204,9 @@
    <string name="type.shop.perfumery">Perfumería</string>
    <string name="type.shop.sewing">Materiales de costura</string>
    <string name="type.shop.storage_rental">Alquiler de almacenamiento</string>
-    <string name="type.shop.tobacco">Tabaquería</string>
+    <string name="type.shop.tobacco">Tabaco</string>
    <string name="type.shop.trade">Suministros comerciales</string>
-    <string name="type.shop.watches">Relojería</string>
+    <string name="type.shop.watches">Relojes</string>
    <string name="type.shop.wholesale">Tienda al por mayor</string>
    <string name="type.sport">Deporte</string>
    <string name="type.sport.american_football">Fútbol americano</string>
@@ -1341,11 +1341,11 @@
    <string name="type.piste_type.hike">Ruta de senderismo en la nieve</string>
    <string name="type.piste_type.connection">Conexión de pistas</string>
    <string name="type.piste_type.skitour">Sendero Skitour</string>
-    <string name="type.amenity.events_venue">Recinto para eventos</string>
+    <string name="type.amenity.events_venue">Lugar para eventos</string>
    <string name="type.shop.auction">Subasta</string>
    <string name="type.shop.collector">Coleccionables</string>
    <string name="type.self_service.yes">Autoservicio disponible</string>
-    <string name="type.self_service.only">Sólo autoservicio</string>
+    <string name="type.self_service.only">Solo autoservicio</string>
    <string name="type.self_service.partially">Autoservicio parcial</string>
    <string name="type.self_service.no">Sin autoservicio</string>
    <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
@@ -1373,7 +1373,7 @@
    <string name="type.railway.narrow_gauge.tunnel">Túnel de vía férrea estrecha</string>
    <string name="type.railway.light_rail.bridge">Puente de tren ligero</string>
    <string name="type.highway.ladder">Escalera</string>
-    <string name="type.amenity.studio">Estudio multimedia</string>
+    <string name="type.amenity.studio">Estudio</string>
    <string name="type.landuse.plant_nursery">Vivero de plantas</string>
    <string name="type.barrier.guard_rail">Guardarraíl</string>
    <string name="type.sport.diving">Salto de trampolín</string>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -173,7 +173,7 @@
    <string name="type.amenity.vending_machine.food">Toiduautomaat</string>
    <string name="type.amenity.vending_machine.newspapers">Ajalehtede automaat</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkimispiletite automaat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Ühistranspordi piletiautomaat</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Piletiautomaat</string>
    <string name="type.amenity.vending_machine.sweets">Maiustuste automaat</string>
    <string name="type.amenity.vending_machine.excrement_bags">Väljaheitekottide automaat</string>
    <string name="type.amenity.parcel_locker">Pakiautomaat</string>
--- a/android/sdk/src/main/res/values-fa/strings.xml
+++ b/android/sdk/src/main/res/values-fa/strings.xml
@@ -11,7 +11,7 @@
    <string name="category_wifi">وای‌فای</string>
    <string name="postal_code">کد پستی</string>
    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">خَجَک نقشه</string>
+    <string name="core_placepage_unknown_place">خَجَکِ نقشه</string>
    <!-- abbreviation for meters -->
    <string name="m">متر</string>
    <!-- abbreviation for kilometers -->
--- a/android/sdk/src/main/res/values-fa/types_strings.xml
+++ b/android/sdk/src/main/res/values-fa/types_strings.xml
@@ -399,16 +399,16 @@
    <string name="type.historic.battlefield">میدان جنگ</string>
    <string name="type.historic.boundary_stone">نشانگر مرز</string>
    <string name="type.historic.cannon">توپ</string>
-    <string name="type.historic.castle">کوشک</string>
-    <string name="type.historic.castle.castrum">کلاته رومی</string>
-    <string name="type.historic.castle.defensive">کوشک کوت</string>
+    <string name="type.historic.castle">قلعه</string>
+    <string name="type.historic.castle.castrum">قلعه رومی</string>
+    <string name="type.historic.castle.defensive">قلعه</string>
    <string name="type.historic.castle.fortified_church">کلیسای مستحکم</string>
-    <string name="type.historic.castle.fortress">دژ</string>
-    <string name="type.historic.castle.hillfort">دژتپه</string>
+    <string name="type.historic.castle.fortress">قلعه</string>
+    <string name="type.historic.castle.hillfort">تپه‌قلعه</string>
    <string name="type.historic.castle.kremlin">کرملین</string>
    <string name="type.historic.castle.manor">خانه ارباب یا صاحب تیول</string>
    <string name="type.historic.castle.palace">کاخ</string>
-    <string name="type.historic.castle.shiro">کوشک ژاپنی</string>
+    <string name="type.historic.castle.shiro">قلعه ژاپنی</string>
    <string name="type.historic.castle.stately">گردشگری</string>
    <string name="type.historic.city_gate">دروازه شهر</string>
    <string name="type.historic.citywalls">دیوار شهر</string>
--- a/android/sdk/src/main/res/values-fi/types_strings.xml
+++ b/android/sdk/src/main/res/values-fi/types_strings.xml
@@ -1450,13 +1450,4 @@
    <string name="type.natural.tree">Puu</string>
    <string name="type.shop.beauty.nails">Kynsistudio</string>
    <string name="type.xmas.tree">Joulukuusi</string>
-    <string name="type.social_facility.food_bank">Ruokapankki</string>
-    <string name="type.social_facility.soup_kitchen">Keittokeittiö</string>
-    <string name="type.disusedbusiness">Tyhjä liiketila</string>
-    <string name="type.shop.lighting">Valaistusliike</string>
-    <string name="type.shop.telecommunication">Puhelinliike</string>
-    <string name="type.shop.beauty.day_spa">Kylpylä</string>
-    <string name="type.man_made.mast.communication">Tietoliikennemasto</string>
-    <string name="type.leisure.bandstand">Esiintymislava</string>
-    <string name="type.leisure.indoor_play">Sisäleikkipuisto</string>
 </resources>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -337,7 +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 de puisage</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>
@@ -1326,7 +1326,7 @@
    <string name="type.railway.narrow_gauge.bridge">Pont ferroviaire à voie étroite</string>
    <string name="type.leisure.recreation_ground">Aire de jeux</string>
    <string name="type.amenity.place_of_worship.hindu">Temple hindou</string>
-    <string name="type.amenity.shelter.lean_to">Abri-lit en appentis</string>
+    <string name="type.amenity.shelter.lean_to">Abri en appentis</string>
    <string name="type.tourism.attraction.specified">Attraction</string>
    <string name="type.traffic_calming">Ralentisseur de vitesse</string>
    <string name="type.amenity.place_of_worship.buddhist">Temple bouddhiste</string>
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -1437,5 +1437,4 @@
    <string name="type.leisure.sports_centre.sport.tennis">Centro sportivo</string>
    <string name="type.leisure.sports_centre.sport.volleyball">Centro sportivo</string>
    <string name="type.leisure.sports_centre.sport.yoga">Centro sportivo</string>
-    <string name="type.amenity.hydrant">Idrante per irrigazione</string>
 </resources>
--- a/android/sdk/src/main/res/values-kk/strings.xml
+++ b/android/sdk/src/main/res/values-kk/strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/sdk/src/main/res/values-kk/types_strings.xml
+++ b/android/sdk/src/main/res/values-kk/types_strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/sdk/src/main/res/values-lt/types_strings.xml
+++ b/android/sdk/src/main/res/values-lt/types_strings.xml
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -134,7 +134,7 @@
    <!-- Weather shelter (including sun shelters and natural rock shelters). -->
    <string name="type.amenity.shelter">Ly</string>
    <!-- A weather shelter by the public transport stop. -->
-    <string name="type.amenity.shelter.public_transport">Leskur</string>
+    <string name="type.amenity.shelter.public_transport">Ly</string>
    <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
    <string name="type.amenity.shelter.basic_hut">Bivuakkhytte</string>
    <string name="type.amenity.public_bath">Offentlig bad</string>
@@ -150,7 +150,7 @@
    <string name="type.amenity.vending_machine.cigarettes">Sigarettautomat</string>
    <string name="type.amenity.vending_machine.drinks">Drikkeautomat</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkeringsautomat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Billettautomat for offentlig transport</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Billettmaskin for offentlig transport</string>
    <string name="type.amenity.vehicle_inspection">Inspeksjon av kjøretøy</string>
    <string name="type.amenity.veterinary">Veterinær</string>
    <string name="type.amenity.waste_basket">Søppelbøtte</string>
@@ -1144,7 +1144,7 @@
    <string name="type.tourism.hotel">Hotell</string>
    <string name="type.tourism.information">Turistinformasjon</string>
    <string name="type.tourism.information.board">Informasjonstavle</string>
-    <string name="type.tourism.information.guidepost">Turskilt</string>
+    <string name="type.tourism.information.guidepost">Guidepost</string>
    <string name="type.tourism.information.map">Turistkart</string>
    <string name="type.tourism.information.office">Turistkontor</string>
    <string name="type.tourism.information.visitor_centre">Besøkssenter</string>
--- a/android/sdk/src/main/res/values-ro/types_strings.xml
+++ b/android/sdk/src/main/res/values-ro/types_strings.xml
@@ -142,7 +142,7 @@
    <string name="type.amenity.vending_machine.public_transport_tickets">Automat de vânzare a biletelor pentru transportul public</string>
    <string name="type.amenity.vehicle_inspection">Inspecția vehiculului</string>
    <string name="type.amenity.veterinary">Cabinet veterinar</string>
-    <string name="type.amenity.waste_basket">Coș de gunoi</string>
+    <string name="type.amenity.waste_basket">Pubelă</string>
    <string name="type.amenity.waste_disposal">Gunoi</string>
    <string name="type.amenity.water_point">Punct de alimentare cu apă</string>
    <string name="type.amenity.water_point.drinking_water_no">Punct de alimentare cu apă</string>
@@ -222,7 +222,7 @@
    <string name="type.cuisine.cake">Tort</string>
    <string name="type.cuisine.caribbean">Bucătărie caraibă</string>
    <string name="type.cuisine.chicken">Pui</string>
-    <string name="type.cuisine.chinese">Bucătărie chinezească</string>
+    <string name="type.cuisine.chinese">Bucătărie chineză</string>
    <string name="type.cuisine.coffee_shop">Cafenea</string>
    <string name="type.cuisine.crepe">Clătite</string>
    <string name="type.cuisine.croatian">Bucătărie croată</string>
@@ -285,7 +285,7 @@
    <string name="type.cuisine.tapas">Tapas</string>
    <string name="type.cuisine.tea">Ceai</string>
    <string name="type.cuisine.thai">Bucătărie tailandeză</string>
-    <string name="type.cuisine.turkish">Bucătărie turcească</string>
+    <string name="type.cuisine.turkish">Bucătărie turcă</string>
    <string name="type.cuisine.vegan">Bucătărie vegană</string>
    <string name="type.cuisine.vegetarian">Bucătărie vegetariană</string>
    <string name="type.cuisine.vietnamese">Bucătărie vietnameză</string>
@@ -300,7 +300,7 @@
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
    <string name="type.entrance">Intrare</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
-    <string name="type.entrance.main">Intrarea principală</string>
+    <string name="type.entrance.main">Intrarea principala</string>
    <string name="type.entrance.exit">Ieșire</string>
    <string name="type.fee.no">Gratuit</string>
    <string name="type.healthcare.laboratory">Laborator medical</string>
@@ -473,7 +473,7 @@
    <string name="type.area_highway.unclassified">Stradă</string>
    <!-- SECTION: Types: Historic -->
    <string name="type.historic">Obiect istoric</string>
-    <string name="type.historic.aircraft">Avion istoric</string>
+    <string name="type.historic.aircraft">Avioane istorice</string>
    <string name="type.historic.anchor">Ancoră istorică</string>
    <string name="type.historic.archaeological_site">Sit arheologic</string>
    <string name="type.historic.battlefield">Câmpul de luptă</string>
@@ -529,7 +529,7 @@
    <string name="type.landuse.forest.mixed">Pădure</string>
    <string name="type.landuse.grass">Iarbă</string>
    <string name="type.landuse.landfill">Groapă de gunoi</string>
-    <string name="type.landuse.railway">Zonă feroviară</string>
+    <string name="type.landuse.railway">Domeniul feroviar</string>
    <string name="type.landuse.reservoir">Lac de acumulare</string>
    <string name="type.leisure.dog_park">Parc pentru câini</string>
    <string name="type.leisure.fitness_centre">Centru fitness</string>
@@ -975,7 +975,7 @@
    <string name="type.shop.dry_cleaning">Curățătorie chimică</string>
    <string name="type.shop.electronics">Magazin de Electronice</string>
    <string name="type.shop.erotic">Magazin erotic</string>
-    <string name="type.shop.fabric">Magazin de stofe</string>
+    <string name="type.shop.fabric">Magazin de țesături</string>
    <string name="type.shop.farm">Magazin alimentar la fermă</string>
    <string name="type.shop.fashion_accessories">Acesorii de modă</string>
    <string name="type.shop.florist">Florărie</string>
@@ -1184,7 +1184,7 @@
    <string name="type.amenity.bicycle_repair_station">Stație Reparații Biciclete</string>
    <string name="type.amenity.car_sharing">Car Sharing</string>
    <string name="type.amenity.dentist">Dentist</string>
-    <string name="type.office.security">Firmă de pază</string>
+    <string name="type.office.security">Biroul agenților de securitate</string>
    <string name="type.building.guardhouse">Cabină de pază</string>
    <string name="type.power.portal">Stație de distribuție</string>
    <string name="type.amenity.food_court">Food Court</string>
@@ -1454,5 +1454,4 @@
    <string name="type.social_facility.soup_kitchen">Cantină socială</string>
    <string name="type.social_facility.food_bank">Bancă de alimente</string>
    <string name="type.xmas.tree">Brad de Crăciun</string>
-    <string name="type.amenity.hydrant">Hidrant Irigații</string>
 </resources>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -465,144 +465,4 @@
    <string name="type.highway.footway.area">Površina za pešce</string>
    <string name="type.highway.footway.bridge">Most za pešce</string>
    <string name="type.highway.footway.tunnel">Predor za pešce</string>
-    <string name="type.area_highway.track">Kolovoz</string>
-    <string name="type.cuisine.bagel">Bagel</string>
-    <string name="type.cuisine.beef_bowl">Goveja skleda</string>
-    <string name="type.cuisine.fine_dining">Prestižna kuhinja</string>
-    <string name="type.cuisine.friture">Cvrtje</string>
-    <string name="type.cuisine.georgian">Gruzijska kuhinja</string>
-    <string name="type.cuisine.german">Nemška kuhinja</string>
-    <string name="type.cuisine.heuriger">Vinotoč (Heuriger)</string>
-    <string name="type.cuisine.kebab">Kebab</string>
-    <string name="type.cuisine.malagasy">Madagaskarska kuhinja</string>
-    <string name="type.cuisine.ramen">Kuhinja ramen</string>
-    <string name="type.buoy.isolated_danger">Osamljen opozorilni plovec</string>
-    <string name="type.buoy.lateral.port">Stranski plovec</string>
-    <string name="type.buoy.lateral.starboard">Stranski plovec</string>
-    <string name="type.buoy.safe_water">Plovec varne vode</string>
-    <string name="type.buoy.special_purpose">Plovec posebnega namena</string>
-    <string name="type.spherical_buoy.cardinal.east">Kroglasti glavni plovec</string>
-    <string name="type.spherical_buoy.cardinal.north">Kroglasti glavni plovec</string>
-    <string name="type.spherical_buoy.cardinal.south">Kroglasti glavni plovec</string>
-    <string name="type.spherical_buoy.cardinal.west">Kroglasti glavni plovec</string>
-    <string name="type.spherical_buoy.isolated_danger">Kroglasti plovec osamljene nevarnosti</string>
-    <string name="type.spherical_buoy.lateral.port">Kroglasti stranski plovec</string>
-    <string name="type.spherical_buoy.lateral.starboard">Kroglasti stranski plovec</string>
-    <string name="type.spherical_buoy.safe_water">Kroglasti plovec varne vode</string>
-    <string name="type.spherical_buoy.special_purpose">Kroglasti plovec posebnega namena</string>
-    <string name="type.healthcare.sample_collection">Središče za zbiranje vzorcev</string>
-    <string name="type.healthcare.speech_therapist">Logopedija</string>
-    <string name="type.highway">Avtocesta</string>
-    <string name="type.highway.bridleway">Jahalna pot</string>
-    <string name="type.highway.bridleway.bridge">Most</string>
-    <string name="type.highway.bridleway.permissive">Jahalna pot</string>
-    <string name="type.highway.bridleway.tunnel">Predor</string>
-    <string name="type.highway.busway">Cesta namenjena avtobusom</string>
-    <string name="type.highway.busway.bridge">Most</string>
-    <string name="type.highway.busway.tunnel">Predor</string>
-    <string name="type.highway.bus_stop">Avtobusno postajališče</string>
-    <string name="type.highway.construction">Cesta v gradnji</string>
-    <string name="type.highway.cycleway">Kolesarska steza</string>
-    <string name="type.highway.cycleway.bridge">Most</string>
-    <string name="type.highway.cycleway.permissive">Kolesarska steza</string>
-    <string name="type.highway.ford">Plitvina</string>
-    <string name="type.highway.living_street">Ulica z umirjenim prometom</string>
-    <string name="type.highway.living_street.bridge">Most</string>
-    <string name="type.highway.living_street.tunnel">Predor</string>
-    <string name="type.highway.motorway">Avtocesta</string>
-    <string name="type.highway.motorway.bridge">Avtocestni most</string>
-    <string name="type.highway.motorway.tunnel">Avtocestni predor</string>
-    <string name="type.highway.motorway_junction">Izvoz</string>
-    <string name="type.highway.motorway_link">Avtocestni priključek</string>
-    <string name="type.highway.motorway_link.bridge">Most</string>
-    <string name="type.highway.motorway_link.tunnel">Predor</string>
-    <string name="type.highway.path">Pot</string>
-    <string name="type.highway.path.difficult">Neprehodna ali težko prepoznavna pot</string>
-    <string name="type.highway.path.expert">Zelo zahtevna ali neoznačena pot</string>
-    <string name="type.highway.path.bicycle">Pot za pešce in kolesarje</string>
-    <string name="type.highway.footway.bicycle">Pot za pešce in kolesarje</string>
-    <string name="type.highway.path.bridge">Most</string>
-    <string name="type.highway.path.horse">Jahalna pot</string>
-    <string name="type.highway.path.tunnel">Predor</string>
-    <string name="type.highway.pedestrian">Ulica za pešce</string>
-    <string name="type.highway.pedestrian.area">Površina za pešce</string>
-    <string name="type.highway.pedestrian.bridge">Most za pešce</string>
-    <string name="type.highway.pedestrian.square">Trg</string>
-    <string name="type.highway.pedestrian.tunnel">Predor za pešce</string>
-    <string name="type.highway.primary">Glavna cesta</string>
-    <string name="type.highway.primary.bridge">Most</string>
-    <string name="type.highway.primary.tunnel">Predor</string>
-    <string name="type.highway.primary_link">Priključek glavne ceste</string>
-    <string name="type.highway.primary_link.bridge">Most</string>
-    <string name="type.highway.primary_link.tunnel">Predor</string>
-    <string name="type.highway.raceway">Dirkalna steza</string>
-    <string name="type.highway.residential">Stanovanjska ulica</string>
-    <string name="type.highway.residential.area">Stanovanjska ulica</string>
-    <string name="type.highway.residential.bridge">Most</string>
-    <string name="type.highway.residential.tunnel">Predor</string>
-    <string name="type.highway.rest_area">Počivališče</string>
-    <string name="type.highway.road">Cesta</string>
-    <string name="type.highway.road.bridge">Most</string>
-    <string name="type.man_made.bridge">Most</string>
-    <string name="type.highway.road.tunnel">Predor</string>
-    <string name="type.highway.secondary">Regionalna cesta</string>
-    <string name="type.highway.secondary.bridge">Most</string>
-    <string name="type.highway.secondary.tunnel">Predor</string>
-    <string name="type.highway.secondary_link">Priključek regionalne ceste</string>
-    <string name="type.highway.secondary_link.bridge">Most</string>
-    <string name="type.highway.secondary_link.tunnel">Predor</string>
-    <string name="type.highway.service">Servisna cesta</string>
-    <string name="type.highway.service.area">Servisna cesta</string>
-    <string name="type.highway.service.bridge">Most</string>
-    <string name="type.highway.service.driveway">Dovoz</string>
-    <string name="type.highway.service.parking_aisle">Dovoz do parkirnega mesta</string>
-    <string name="type.highway.service.tunnel">Predor</string>
-    <string name="type.highway.services">Servisna površina</string>
-    <string name="type.highway.speed_camera">Hitrostna kamera</string>
-    <string name="type.highway.steps">Stopnice</string>
-    <string name="type.highway.ladder">Lestev</string>
-    <string name="type.highway.steps.bridge">Most</string>
-    <string name="type.highway.steps.tunnel">Predor</string>
-    <string name="type.highway.tertiary">Lokalna cesta</string>
-    <string name="type.highway.tertiary.bridge">Most</string>
-    <string name="type.highway.tertiary.tunnel">Predor</string>
-    <string name="type.highway.tertiary_link">Priljuček lokalne ceste</string>
-    <string name="type.highway.tertiary_link.bridge">Most</string>
-    <string name="type.highway.tertiary_link.tunnel">Predor</string>
-    <string name="type.highway.track">Kolovoz</string>
-    <string name="type.highway.track.area">Kolovoz</string>
-    <string name="type.highway.track.bridge">Most</string>
-    <string name="type.highway.track.grade1">Kolovoz</string>
-    <string name="type.highway.track.no.access">Kolovoz</string>
-    <string name="type.highway.track.tunnel">Predor</string>
-    <string name="type.highway.traffic_signals">Semafor</string>
-    <string name="type.highway.trunk">Hitra cesta</string>
-    <string name="type.highway.trunk.bridge">Most</string>
-    <string name="type.highway.trunk.tunnel">Predor</string>
-    <string name="type.highway.trunk_link">Priključek hitre ceste</string>
-    <string name="type.highway.trunk_link.bridge">Most</string>
-    <string name="type.highway.trunk_link.tunnel">Predor</string>
-    <string name="type.highway.unclassified">Cesta manjšega pomena</string>
-    <string name="type.highway.unclassified.area">Cesta manjšega pomena</string>
-    <string name="type.highway.unclassified.bridge">Most</string>
-    <string name="type.highway.unclassified.tunnel">Predor</string>
-    <string name="type.area_highway.cycleway">Kolesarska steza</string>
-    <string name="type.area_highway.footway">Pešpot</string>
-    <string name="type.area_highway.living_street">Ulica z umirjenim prometom</string>
-    <string name="type.area_highway.motorway">Avtocesta</string>
-    <string name="type.area_highway.path">Pot</string>
-    <string name="type.area_highway.pedestrian">Ulica za pešce</string>
-    <string name="type.area_highway.primary">Glavna cesta</string>
-    <string name="type.area_highway.residential">Stanovanjska ulica</string>
-    <string name="type.area_highway.secondary">Regionalna cesta</string>
-    <string name="type.area_highway.service">Servisna cesta</string>
-    <string name="type.area_highway.tertiary">Lokalna cesta</string>
-    <string name="type.area_highway.steps">Stopnice</string>
-    <string name="type.area_highway.trunk">Hitra cesta</string>
-    <string name="type.area_highway.unclassified">Cesta manjšega pomena</string>
-    <string name="type.historic">Zgodovinski predmet</string>
-    <string name="type.historic.aircraft">Zgodovinsko letalo</string>
-    <string name="type.historic.anchor">Zgodovinsko sidro</string>
-    <string name="type.historic.battlefield">Zgodovinsko bojišče</string>
-    <string name="type.historic.archaeological_site">Arheološko najdišče</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -155,7 +155,7 @@
    <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
    <string name="type.amenity.shelter.basic_hut">Колиба за ноћење</string>
    <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Отворена шупа</string>
+    <string name="type.amenity.shelter.lean_to">Склониште типа шупе</string>
    <string name="type.amenity.public_bath">Јавно купатило</string>
    <string name="type.amenity.shower">Туш</string>
    <string name="type.amenity.stripclub">Стриптиз клуб</string>
@@ -1500,5 +1500,4 @@
    <string name="type.xmas.tree">Божићна јелка</string>
    <string name="type.shop.beauty.nails">Салон за нокте</string>
    <string name="type.man_made.mast.communication">Антенски стуб</string>
-    <string name="type.amenity.hydrant">Хидрант за наводњавање</string>
 </resources>
--- a/android/sdk/src/main/res/values-zh-rTW/strings.xml
+++ b/android/sdk/src/main/res/values-zh-rTW/strings.xml
@@ -37,12 +37,4 @@
    <string name="not_shared">私人</string>
    <string name="access_rules_author_only">線上編輯</string>
    <string name="today">今天</string>
-    <string name="yesterday">昨天</string>
-    <string name="days_ago">%s 天前</string>
-    <string name="week_ago">%s 週前</string>
-    <string name="weeks_ago">%s 週前</string>
-    <string name="month_ago">%s 個月前</string>
-    <string name="months_ago">%s 個月前</string>
-    <string name="year_ago">%s 年前</string>
-    <string name="years_ago">%s 年前</string>
 </resources>
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -7,7 +7,7 @@
 "@category_shopping": "4Einkaufen|Laden|2Läden|Bummeln",
 "@category_hotel": "Hotel|Hotels|Übernachtung|übernachten|Schlaf|schlafen",
 "@category_tourism": "4Sehenswürdigkeit|4Attraktion|4Tourismus|Touristenattraktion|Sehenswürdigkeiten|Wahrzeichen|Attraktionen",
-"@category_entertainment": "4Unterhaltung",
+"@category_entertainment": "Unterhaltung",
 "@category_nightlife": "Nachtleben",
 "@category_children": "Freizeit mit Kindern|Familienurlaub|Familie|Kinder|Babies|Babys|kinderfreundlich|familienfreundlich",
 "@category_atm": "3Geldautomat|4Bankautomat|7Bargeldautomat|3Geldscheinautomat",
@@ -22,117 +22,114 @@
 "amenity-cafe|@category_eat": "3Café|6Kaffeehaus|Kaffeebar|Cafeteria",
 "amenity-fast_food|@category_eat": "4Fast Food|Mitnahme|3Imbiss|Essen zum Mitnehmen|Junkfood|7Schnellimbiss",
 "amenity-restaurant|@category_eat": "3Restaurant|4Gasthaus|Gaststube|6Speiselokal|Gastwirtschaft",
-"amenity-fuel|@category_fuel": "7Tankstation|3Tankstelle",
+"amenity-fuel|@category_fuel": "Tankstation|3Tankstelle",
 "@shop": "3Verbrauchermarkt|5Geschäft|5Laden",
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|Bäckerladen|Bäcker|4Konditorei|Konditor",
-"shop-cosmetics|@category_shopping|@shop": "9Kosmetikgeschäft|Kosmetik|Schönheitspflege|5Make Up|Make-Up|5Makeup",
+"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|Kosmetik|Schönheitspflege|Make Up|Make-Up|Makeup",
 "shop-convenience|@category_food|@shop": "5Gemischtwarenladen|Lebensmittelhändler|Lebensmittelhandlung|Lebensmittelgeschäft|4Greißler|4Tante-Emma-Laden",
 "shop-deli|@category_food|@shop": "4Feinkostladen|Feinkostgeschäft",
 "shop-farm|@category_food|@shop": "4Hofladen|4Bauernhofladen",
 "shop-garden_centre|@shop": "4Gartencenter|Gärtnerei",
 "shop-grocery|@category_food|@shop": "Lebensmittelkonserven",
-"shop-health_food|@category_food|@shop": "4Reformhaus|5Naturkostladen|5Bioladen",
-"shop-hearing_aids|@shop": "4Hörgeräte",
+"shop-health_food|@category_food|@shop": "4Reformhaus|5Naturkostladen|4Bioladen",
+"shop-hearing_aids|@shop": "Hörgeräte",
 "shop-mobile_phone|@shop": "4Handyladen|Eletronikgeschäft|Mobiltelefone",
 "shop-florist|@shop": "4Florist|Gestecke|Blumengeschäft|4Blumenladen|Blumenhändler|Blumen|Blumenstrauß|Taggleiche Blumen",
-"shop-butcher|@category_food|@shop": "5Metzgerei|3Metzger|5Schlachter|4Fleischhauer",
+"shop-butcher|@category_food|@shop": "5Metzgerei|Metzger|Schlachter|4Fleischhauer",
 "shop-furniture|@shop": "5Möbelhaus|Möbelgeschäft",
-"shop-kitchen|@shop": "6Küchenstudio|2Küchengeschäft",
+"shop-kitchen|@shop": "6Küchenstudio|Küchengeschäft",
 "shop-alcohol|@category_food|@shop": "5Spirituosengeschäft|Spirituosen",
 "shop-books|@shop": "Büchergeschäft|4Buchhandlung|Buchladen|Bücher",
 "shop-shoes|@category_shopping|@shop": "4Schuhgeschäft|Schuhe|Schuhladen|Schuhhandlung|Fußbekleidung",
 "shop-electronics|@shop": "4Elektrofachgeschäft|Elektronikgeschäft|Elektrofachhandel",
-"shop-hardware|shop-doityourself|@shop": "4Eisenwarengeschäft|3Baumarkt|4Heimwerkermarkt|4Eisenwarenhandlung|3DIY",
+"shop-hardware|shop-doityourself|@shop": "5Eisenwarengeschäft|3Baumarkt|4Heimwerkermarkt|Eisenwarenhandlung",
 "shop-houseware|@shop": "4Haushaltswaren",
 "shop-jewelry|@category_shopping|@shop": "4Juwelier|Juweliergeschäft|Schmuck",
 "shop-optician|@shop": "4Optiker|5Brillengeschäft|5Augenoptiker",
-"shop-gift|@category_shopping|@shop": "7Geschenkeladen|5Geschenke|6Geschenkartikelladen|5Andenkenladen|3Andenken|3Präsente|4Mitbringsel|4Souvenirladen",
+"shop-gift|@category_shopping|@shop": "5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen",
 "shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Kosmetikstudio|Kosmetiksalon",
 "shop-beauty-nails": "5Nagelstudio|Nagelsalon|Fingernägel|Fußnägel|Nägel",
 "shop-greengrocer|@category_food|@shop": "5Gemüseladen|Gemüsehändler",
 "shop-sports|@category_shopping|@shop": "4Sportgeschäft|Sportartikel|Fitnessgeschäft",
 "shop-supermarket|@category_food|@shop": "3Supermarkt",
-"shop-mall|@category_shopping|@shop": "5Einkaufszentrum|5Ladenstraße|4Einkaufsgalerie|4Einkaufen|4Einkaufspassage|3Kaufhalle|8Vergnügungszentrum|4Einzelhandel",
-"shop-department_store|@category_shopping|@shop": "4Kaufhaus|4Einkaufen|4Einkaufszentrum|4Einkaufspassage",
+"shop-mall|@category_shopping|@shop": "5Einkaufszentrum|Ladenstraße|Einkaufsgalerie|Einkaufen|Einkaufspassage|Kaufhalle|Vergnügungszentrum|Einzelhandel",
+"shop-department_store|@category_shopping|@shop": "4Kaufhaus|Einkaufen|Einkaufszentrum|Einkaufspassage",
 "shop-beverages|@category_food|@shop": "5Getränkemarkt",
-"shop-computer|@shop": "4Computerfachgeschäft|4Computer|4Computergeschäft",
+"shop-computer|@shop": "4Computerfachgeschäft",
 "shop-confectionery|craft-confectionery|@category_food|@shop": "3Süßwarenladen|Süßwarengeschäft|Süßwaren|4Süßigkeiten|4Konfiserie",
 "shop-laundry": "5Wäscherei|5Waschsalon",
 "shop-toys|@category_children|@shop": "5Spielwarengeschäft|Spielzeuggeschäft",
 "amenity-marketplace|@category_food": "3Marktplatz|Markt",
-"amenity-money_transfer": "4Geldtransfer|5Geldtransferbüro|4Wechselstube|5Geldwechsel|5Geldwechselbüro",
-"shop-clothes|@category_shopping|@shop": "5Bekleidungsgeschäft|4Kleidung|5Bekleidung|4Kleidungsgeschäft|5Kleiderladen|5Einkaufen|4Shoppen ",
-"shop-caravan|@category_rv|@shop": "5Wohnmobilhändler|5Wohnwagenhändler|6Wohnmobilgeschäft|6Wohnmobilshop|6Wohnwagenshop|6Wohnwagengeschäft|5Wohnwagen|5Wohnmobil",
-"shop-car|@shop": "4Autohaus|4Autohändler|5Autoladen|5Autofachgeschäft|5Autogeschäft|5Automobil",
-"shop-bicycle|@shop": "3Fahrradladen|4Fahrrad|3Velo|4Radladen|5Fahrradshop|6Radlerladen|5Fahrradfachgeschäft|3Bikeshop",
+"amenity-money_transfer": "Geldtransfer",
+"shop-clothes|@category_shopping|@shop": "5Bekleidungsgeschäft|Kleidung|Bekleidung|Kleidungsgeschäft|5Kleiderladen|Einkaufen",
+"shop-caravan|@category_rv|@shop": "5Wohnmobilhändler|5Wohnwagenhändler",
+"shop-car|@shop": "4Autohaus|Autohändler",
+"shop-bicycle|@shop": "3Fahrradladen|Fahrrad|Velo|Radladen",
 "shop-kiosk": "3Kiosk",
 "highway-bus_stop|@category_transport": "3Bushaltestelle|Haltestelle|2Bus|Autobus|ÖPNV|Omnibushaltestelle",
 "railway-tram_stop|@category_transport": "4Straßenbahnhaltestelle|4Tramhaltestelle|3Haltestelle|Tram|ÖPNV",
 "amenity-bus_station|@category_transport": "3Busbahnhof|Bushaltestelle|Haltestelle|Bus|Autobus|ÖPNV",
 "railway-station|railway-halt|building-train_station|@category_transport": "4Bahnhof|3Haltepunkt|3Station|Zug|Bahn|ÖPNV|Hbf",
-"railway-station-funicular": "5Standseilbahn|6Seilbahn",
-"railway-station-subway|@category_transport": "2U-Bahn|3Metro|2ÖPNV|4Ubahn|5Underground|4Subway|3U Bahn|5Untergrundbahn|4Nahverkehr",
+"railway-station-funicular": "Standseilbahn",
+"railway-station-subway|@category_transport": "2U-Bahn|3Metro|ÖPNV|4Ubahn",
 "amenity-ferry_terminal|@category_transport": "2Fähre|Fähranleger|Terminal",
-"amenity-taxi|@category_transport": "3Taxi|3Taxistand|4Taxe|2ÖPNV|4Nahverkehr",
+"amenity-taxi|@category_transport": "3Taxi|Taxistand|Taxe|ÖPNV",
 "amenity-townhall": "3Rathaus|4Gemeindeamt",
 "tourism-attraction|@category_tourism": "3Attraktion|3Sehenswürdigkeit",
 "tourism-artwork": "3Kunstwerk|4Skulptur|4Gemälde|Statue",
-"tourism-artwork-sculpture": "Skulptur|Kunstwerk",
-"tourism-artwork-statue": "Statue|Kunstwerk",
-"tourism-artwork-painting": "Gemälde|Kunstwerk",
 "tourism-viewpoint|@category_tourism": "3Panorama|Ausblick|4Aussichtspunkt",
 "tourism-information": "4Tourist-Information|Information|7Touristeninformation",
-"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picknickplatz|5Grillplatz|3Picknicktisch|3BBQ",
-"amenity-place_of_worship": "4Anbetungsstätte|3Tempel|3Gotteshaus",
-"amenity-place_of_worship-christian": "4Kirche|2Dom|3Kathedrale|4Münster|4Anbetungsstätte|5Christentum|U+1F64F|U+26EA|U+271D|U+2626",
-"amenity-place_of_worship-muslim": "4Moschee|3Tekke|4Anbetungsstätte|4Gebetstempel|3Islam|4Tempel|U+1F64F|U+262A|U+1F54B|U+1F54C|U+262A",
-"amenity-place_of_worship-buddhist": "3Buddhistischer Tempel|4Tempel|4Anbetungsstätte|3Buddhismus|U+1F64F|U+26EA|U+2638",
-"amenity-place_of_worship-hindu": "4Hinduistischer Tempel|4Tempel|4Anbetungsstätte|4Hinduismus|U+1F64F|U+1F549",
-"amenity-place_of_worship-shinto": "4Schrein|4Anbetungsstätte|4Tempel|4Shintoismus|Shinto|U+1F64F|U+26E9",
-"amenity-place_of_worship-jewish": "4Synagoge|4Anbetungsstätte|4Tempel|4Judentum|U+1F64F|U+1F54D|U+2721",
-"amenity-place_of_worship-taoist": "4Tempel|4Anbetungsstätte|4Taoismus|U+1F64F|U+262F",
+"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picknickplatz|5Grillplatz|Picknicktisch",
+"amenity-place_of_worship": "3Anbetungsstätte|Tempel|Gotteshaus",
+"amenity-place_of_worship-christian": "4Kirche|Dom|3Kathedrale|4Münster|Anbetungsstätte|",
+"amenity-place_of_worship-muslim": "4Moschee|Tekke|Anbetungsstätte",
+"amenity-place_of_worship-buddhist": "Buddhistischer Tempel|Tempel|Anbetungsstätte",
+"amenity-place_of_worship-hindu": "Hinduistischer Tempel|Tempel|Anbetungsstätte",
+"amenity-place_of_worship-shinto": "Schrein|Anbetungsstätte|Tempel",
+"amenity-place_of_worship-jewish": "4Synagoge|Anbetungsstätte|Tempel",
+"amenity-place_of_worship-taoist": "Tempel|Anbetungsstätte",
 "tourism-museum|@category_tourism": "2Museum|Ausstellung|3Galerie|Sehenswürdigkeit",
 "waterway-waterfall|@category_tourism": "2Wasserfall",
 "historic-archaeological_site|@category_tourism": "Ausgrabungen|4Ausgrabungsstätte|4Archäologische Stätte",
 "historic-battlefield": "4Schlachtfeld",
-"historic-stone": "4Historischer Stein|4Sühnestein|5Ruhebank|5Gruhe|4Stein|5Geschichte|5Historik|5historisch|U+1FAA8",
-"historic-boundary_stone": "4Grenzstein|4Markstein|4Historischer Grenzstein|U+1FAA8|U+1FAA6",
+"historic-stone": "Historischer Stein",
+"historic-boundary_stone": "4Grenzstein|4Markstein",
 "historic-castle|@category_tourism": "3Burg|4Schloss|Festung|3Palast|Wallburg|Kreml|4Herrenhaus|Palais|3Ruine",
-"historic-city_gate|@category_tourism": "4Stadttor|4Historisches Stadttor|U+1F3DB|U+1F3F0",
-"historic-citywalls|@category_tourism": "4Stadtmauer|4Historische Stadtmauer|U+1F9F1",
+"historic-city_gate|@category_tourism": "4Stadttor",
+"historic-citywalls|@category_tourism": "4Stadtmauer",
 "historic-fort|@category_tourism": "Fort",
 "historic-gallows|@category_tourism": "3Galgen",
 "historic-memorial|@category_tourism": "4Denkmal|3Gedenkstätte",
 "historic-memorial-cross": "3Gedenkkreuz",
 "historic-memorial-plaque": "3Gedenktafel",
-"historic-memorial-sculpture|@category_tourism": "4Skulptur|U+1F5FF|U+1F5FD",
-"historic-memorial-statue|@category_tourism": "4Statue|U+1F5FD",
+"historic-memorial-sculpture|@category_tourism": "4Skulptur",
+"historic-memorial-statue|@category_tourism": "4Statue",
 "historic-memorial-stolperstein": "3Stolperstein",
 "historic-memorial-war_memorial|@category_tourism": "4Kriegerdenkmal|Kriegsdenkmal",
 "historic-monument|@category_tourism": "4Monument",
 "historic-pillory|@category_tourism": "Pranger",
 "historic-cannon": "Kanone",
-"historic-anchor": "4Historischer Anker|4Anker|6Schiffsanker|U+2693",
-"historic-ruins|@category_tourism": "4Historische Ruine|3Ruine|U+1F3DA|U+1F3F0",
-"historic-mine": "4Historische Mine|4Mine|U+1FAA8|U+2692|U+1FA8F|U+1F4A3|U+1F6D8",
+"historic-anchor": "Historischer Anker",
+"historic-ruins|@category_tourism": "4Historische Ruine|3Ruine",
+"historic-mine": "Historische Mine",
 "historic-ship|@category_tourism": "4Schiff|Boot",
 "historic-wreck": "Schiffswrack",
-"historic-locomotive|@category_tourism": "4Historische Lokomotive|4Lokomotive|4Historische Eisenbahn|6Eisenbahn|3Lok|4Historische Lok|U+1F682",
-"historic-tank|@category_tourism": "4Historischer Panzer|4Panzer",
-"historic-aircraft|@category_tourism": "4Historisches Flugzeug|6Flugzeug|U+2708|U+1F6E9|U+1F6EB|U+1F6EC",
+"historic-locomotive|@category_tourism": "Historische Lokomotive",
+"historic-tank|@category_tourism": "Historischer Panzer",
+"historic-aircraft|@category_tourism": "Historisches Flugzeug",
 "historic-tomb|@category_tourism": "Historische Grabstätte|Grab",
 "historic-wayside_cross": "4Wegkreuz|4Flurkreuz",
 "historic-wayside_shrine": "4Bildstock|4Marterl|4Wegstock|4Helgenstöckli",
-"leisure-dog_park": "4Hundezone|4Hundeauslaufzone|4Hundeauslauffläche|5Hunde|5Hundepark|U+1F436|U+1F415|U+1F9AE|U+1F429",
+"leisure-dog_park": "4Hundezone|Hundeauslaufzone|Hundeauslauffläche",
 "leisure-garden": "2Garten",
 "amenity-bench|amenity-bench-backless": "4Sitzbank|4Parkbank",
-"amenity-bicycle_rental": "4Fahrradverleih|4Fahrrad|4Fahrradvermietung|4Radfahren|4Radverleih|3Velo|5Verleih|5Vermietung|U+1F6B2|U+1F510|U+1F6B4|U+1F6B5",
-"amenity-bicycle_repair_station": "4Fahrradreparatur|4Radservicestation|4Radreparatur|U+1F6B2|U+1F527|U+1F529|U+26D3|U+1FA9B|U+1F6DE",
-"amenity-car_sharing": "4Carsharing|4Car-Sharing|4Carsharing-Dienste|5Auto teilen|4Auto|5Fahrgemeinschaft|4Mitfahrzentrale|U+1F690|U+1F697|U+1F698|U+1F699|U+1F6FB|U+1F46B|U+1F465",
-"amenity-car_rental": "5Autovermietung|5Autoverleih|4Mietauto|4Auto|5Fahrzeug mieten|5Verleih|4KFZ-Vermietung|5Fahrzeugvermietung|U+1F697|U+1F698|U+1F699",
-"amenity-motorcycle_rental": "5Motorradvermietung|5Motorrad|5Motorrad mieten|5Mofa mieten|5Motorroller mieten|U+1F3CD|U+1F6F5",
-"amenity-cinema|@category_entertainment": "3Kino|4Cinema|4Filmtheater|5Lichtspielhaus|U+1F3A6|U+1F3AC",
-"leisure-bowling_alley|@category_entertainment": "3Bowlingbahn|3Bowlen|3Bowling|3Bowlingcenter|3Bowling-Center|3Bowling Center|3Bowling-Bahn|3Bowling Bahn|U+1F3B3",
+"amenity-bicycle_rental": "4Fahrradverleih|Fahrrad|Fahrradvermietung|Radfahren|Radverleih|Velo|3Verleih",
+"amenity-bicycle_repair_station": "4Fahrradreparatur|Radservicestation|Radreparatur",
+"amenity-car_sharing": "3Carsharing|Car-Sharing|Carsharing-Dienste|Auto teilen|Auto|Teilen|Fahrgemeinschaft|Mitfahrzentrale",
+"amenity-car_rental": "3Autovermietung|Autoverleih|Mietauto|Auto|Fahrzeug Mieten|Verleih|KFZ-Vermietung|Fahrzeugvermietung",
+"amenity-motorcycle_rental": "Motorradvermietung",
+"amenity-cinema|@category_entertainment": "3Kino|Cinema|Filmtheater|Lichtspielhaus",
+"leisure-bowling_alley|@category_entertainment": "Bowlingbahn",
 "amenity-theatre|@category_entertainment": "3Theater",
 "amenity-nightclub|@category_entertainment|@category_nightlife": "3Nachtclub|Nachtklub|Nachtbar|Nachtlokal|Disko|Tanzen|Club",
 "amenity-brothel": "Bordell",
@@ -160,10 +157,10 @@
 "healthcare-psychotherapist": "4Psychotherapie|Psychotherapeutin|Psychotherapeut",
 "healthcare-sample_collection": "Probenahme",
 "healthcare-speech_therapist": "4Logopädie|Logopädin|Logopäde",
-"amenity-hunting_stand": "4Hochsitz|4Anstand|4Jägerstand|4Ansitzeinrichtung|4Jagd|5Jäger|4Jagdeinrichtung|4Erdsitz|6Geschlossene Kanzel|4Kanzel|4Leitersitz|4Jagdschirm|U+1F3F9|U+1F52B|U+1F920",
+"amenity-hunting_stand": "4Hochsitz|Anstand|4Jägerstand",
 "amenity-kindergarten": "5Kindergarten|Kinderkrippe|Krippe|Tagesstätte|Hort|Kinderbetreuung|Kinderbetreuungseinrichtung|Vorschule",
-"amenity-library": "3Bibliothek|4Bücherei|5Stadtbibliothek|3Bib|3Uni-Bib|4Uni-Bibliothek|U+1F4D6|U+1F4DA|U+1F3DB|U+1F3E2",
-"amenity-parking|amenity-parking_entrance|@category_parking": "4Parkplatz|4Parken|4Parkhaus|4Tiefgarage|4Parkgarage|4Garage|5Autoparkplatz|U+1F697|U+1F17F|U+1F698|U+1F699",
+"amenity-library": "3Bibliothek|4Bücherei",
+"amenity-parking|amenity-parking_entrance|@category_parking": "3Parkplatz|Parking|Parkhaus|Tiefgarage",
 "@category_pharmacy": "3Apotheke|Pharmazie",
 "amenity-pharmacy|@category_pharmacy": "Apotheke|Drogerie",
 "@category_post": "3Post",
@@ -181,15 +178,15 @@
 "recycling-plastic_bottles|@category_recycling": "Plastikflaschen",
 "recycling-scrap_metal|@category_recycling": "4Altmetall|Schrott",
 "recycling-small_appliances|@category_recycling": "Elektroschrott",
-"amenity-sanitary_dump_station|@category_rv": "3VE-Station|4Entsorgungsstation|4Versorgungsstation|2RV Dump|U+1F6BE|U+1F690|U+1F4A9",
+"amenity-sanitary_dump_station|@category_rv": "3VE-Station|4Entsorgungsstation|4Versorgungsstation|2RV Dump",
 "amenity-school": "3Schule|Schulgebäude",
 "amenity-shelter": "5Unterstand|Wetterschutz|Schutzhütte",
-"amenity-shelter-basic_hut": "4Biwakschachtel|4Schutzhütte|6Schlafunterkunft|U+1F634|U+1F4A4|U+1F6D6|U+1F6CF|U+1F6CC",
-"amenity-shelter-lean_to": "3Lean-to|3A-Frame Shelter|4Wetterschutz|4Schutzhütte|U+1F6D6",
-"amenity-stripclub": "5Stripclub|5Striptease|5Strip Club|4Tabledance|5Striplokal|5Strip Lokal|5Nachtklub|5Stripklub|5Nachtclub|U+1F46F|U+1F459|U+1F460|U+1F51E",
+"amenity-shelter-basic_hut": "4Biwakschachtel",
+"amenity-shelter-lean_to": "Lean-to Wetterschutz|Wetterschutz|Schutzhütte",
+"amenity-stripclub": "Stripclub",
 "amenity-telephone": "2Telefon|Fernsprecher",
-"@category_toilet": "3Toilette|WC|3Klosett|Pissoir|Null-Null|00",
-"amenity-toilets|toilets-yes|@category_toilet": "3Toilette|2WC|5Stilles Örtchen|5Gäste-WC|6Wasserkloset|00|3Klo",
+"@category_toilet": "3Toilette",
+"amenity-toilets|toilets-yes|@category_toilet": "WC",
 "amenity-university": "4Universität|Uni|Hochschule|Institut",
 "place-continent": "Kontinent|Festland",
 "place-country": "Land|Staat",
@@ -201,8 +198,8 @@
 "place-region": "Region",
 "place-island|place-islet": "Insel",
 "place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Stadtteil|Stadtviertel|Wohnviertel|Wohnbezirk|Siedlung|Wohngebiet",
-"place-hamlet": "3Weiler|4Dorf|4Siedlung|U+1F3D8",
-"place-village": "3Dorf|5Weiler|4Siedlung|U+1F3D8",
+"place-hamlet": "Weiler|Dorf",
+"place-village": "Dorf|Weiler",
 "place-locality": "Örtlichkeit|Lokalität|Region|Ort",
 "place-farm": "4Bauernhof|Farm",
 "highway-raceway": "Rennstrecke|Rennbahn",
@@ -219,18 +216,18 @@
 "tourism-guest_house|@category_hotel": "3Pension|Unterkunft|Herberge|Wohnheim|Gästehaus",
 "tourism-motel|@category_hotel": "3Motel|Gasthaus|Wohnheim",
 "tourism-alpine_hut|@category_hotel": "4Berghütte|Almhütte|Berghotel|Hotel|Unterkunft|Bergunterkunft|Herberge|Lager",
-"shop-hairdresser": "3Friseur|3Frisiersalon|3Frisör|3Friseursalon|3Frisörsalon|4Coiffeur|4Haare schneiden|4Haarschnitt|4Haarstyling|U+1FAAE|U+1F487|U+1F488|U+2702",
-"aeroway-aerodrome": "3Flughafen|4Flugzeug|3Flugplatz|U+1F6EB|U+1F6EC|U+2708|U+1F6E9|U+1F681",
-"leisure-stadium": "4Stadion|5Sport|4Olympiastadion|5Sportanlage|5Sportstadion|5Sportkomplex|5Sporthalle|3Arena|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|U+1F3DF",
+"shop-hairdresser": "3Friseur|Frisiersalon|Frisör|4Coiffeur",
+"aeroway-aerodrome": "3Flughafen|4Flugzeug|Flugplatz",
+"leisure-stadium": "4Stadion|4Sport|Olympiastadion|Sportstadion|Sportkomplex|Arena",
 "leisure-playground|@category_children": "Spielplatz",
-"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportzentrum|4Sport|4Fitness-Zentrum|4Fitness-Center|4Sportkomplex|5Sportforum|5Sporthalle|4Sportanlage|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportzentrum|Sport|Fitness-Zentrum|Fitness-Center",
 "leisure-sports_centre-sport-swimming": "4Schwimmmbad|Freibad|Hallenbad|Schwimmhalle",
 "leisure-fitness_centre-sport-yoga": "Yoga-Studio",
-"leisure-golf_course": "3Golfplatz|Golf|U+26F3|U+1F3CC",
-"leisure-miniature_golf": "4Minigolf|5Miniaturgolf|4Golf|U+26F3|U+1F3CC",
+"leisure-golf_course": "Golfplatz",
+"leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escape room",
-"leisure-pitch": "4Sportplatz|4Feld|3Sport|4Platz|U+1F3BE|U+1F3C0|U+1F3C8|U+1F3C9|U+1F3C3",
-"leisure-swimming_pool": "4Schwimmbecken|4Schwimmen|5Sport|U+1F3CA",
+"leisure-pitch": "4Sportplatz|Feld|Sport",
+"leisure-swimming_pool": "4Schwimmbecken|Sport",
 "sport-american_football": "Amerikanischer Fußball",
 "sport-archery": "Bogenschießen",
 "sport-athletics": "Leichtathletik",
@@ -246,13 +243,13 @@
 "sport-golf": "Golf",
 "sport-gymnastics": "Gymnastik",
 "sport-handball": "Handball",
-"sport-scuba_diving": "4Gerätetauchen|3Tauchen|U+1F93F",
-"sport-shooting": "5Schießanlage|5Sportschießen|4Schießen|5Schützenschießanlage|5Schützenschießstand|5Schießstand|U+1F52B|U+1F3AF",
+"sport-scuba_diving": "Gerätetauchen",
+"sport-shooting": "Schießanlage",
 "sport-skateboard": "Skateboarding|Skateboard",
 "sport-skiing": "Skifahren",
 "sport-soccer": "Fußball",
 "sport-swimming": "Schwimmen",
-"sport-table_tennis": "5Tischtennis|4Ping Pong|4Pingpong|U+1F3D3",
+"sport-table_tennis": "Tischtennis",
 "sport-tennis": "Tennis",
 "sport-padel": "Padel",
 "sport-volleyball": "Volleyball",
@@ -261,16 +258,16 @@
 "building": "Gebäude",
 "building-address": "Adresse",
 "@category_police": "Polizeistation|4Polizei",
-"amenity-police|@category_police": "4Polizeiwache|4Polizeistation|4Polizeirevier|4Polizei|U+1F693|U+1F46E|U+1F694|U+1F482|U+1F6A8",
-"office-diplomatic": "4Botschaft|4Konsulat|4Verbindungsbüro|U+1F3E2|U+1F3DB",
+"amenity-police|@category_police": "Polizeiwache|Polizei",
+"office-diplomatic": "4Botschaft|4Konsulat|4Verbindungsbüro",
 "natural-bay": "Bucht|Bai",
 "@category_water": "3Wasser",
 "amenity-drinking_water|drinking_water-yes|@category_water": "4Trinkwasser",
 "natural-hot_spring|@category_water": "Heiße Quelle|Thermalquelle",
 "natural-spring|@category_water": "Quelle",
 "man_made-water_well|@category_water": "Brunnen",
-"amenity-water_point|@category_water|@category_rv": "6Wassertank-Auffüllstation|5Wasseranschluss|U+1F4A7|U+1F6B0|U+1F6BF",
-"man_made-water_tap|@category_water": "5Wasserhahn|U+1F6B0",
+"amenity-water_point|@category_water|@category_rv": "6Wassertank-Auffüllstation|Wasseranschluss",
+"man_made-water_tap|@category_water": "6Wasserhahn",
 "@waterbody": "Wasserfläche|Gewässer",
 "natural-water-basin|landuse-basin|@waterbody": "Wasserbecken",
 "natural-water-pond|@waterbody": "Teich|Wasserbecken",
@@ -278,18 +275,18 @@
 "natural-water-reservoir|landuse-reservoir|@waterbody": "5Reservoir",
 "waterway-river|waterway-stream|natural-water-river": "Fluss|Strom",
 "waterway-canal": "Kanal",
-"shop-car_repair": "3Autowerkstatt|3Kfz-Werkstatt|4Reparaturwerkstatt|4Auto|4Werkstatt|5Reparieren|U+1F527",
-"tourism-camp_site|@category_hotel": "4Campingplatz|4Camping|4Zeltplatz|4Zelten|U+26FA|U+1F3D5",
+"shop-car_repair": "3Autowerkstatt|Kfz|Reparaturwerkstatt|Auto|4Werkstatt",
+"tourism-camp_site|@category_hotel": "4Campingplatz|Camping|Zeltplatz|Zelten",
 "tourism-caravan_site|@category_rv||@category_hotel": "4Wohnmobilstellplatz|Wohnmobilpark|Wohnwagenstellplatz|Wohnwagenplatz|Campingplatz",
 "office": "Büro|Amt|Unternehmen|Agentur|Dienststelle|Firma|Geschäft|Gesellschaft",
 "office-company": "Firmenbüro|Niederlassung",
-"office-government": "3Regierungsstelle|3Amt|3Behörde|4Verwaltung|U+1F3E2|U+1F3DB",
-"office-lawyer": "5Anwaltskanzlei|4Anwaltsbüro|4Anwalt|4Rechtsanwalt|3Jurist|4Gerichtsanwalt|4Rechtsbeistand|4Rechtsberater|4Verteidiger|U+2696",
-"office-telecommunication": "5Mobilfunkbetreiber|5Mobilfunkanbieter|5Telekommunikationsanbieter|5Telefonabieter|6Internetanbieter|5Telekommunikation|U+1F4F1|U+260E|U+1F4DE|U+1F4E1|U+1F4E7",
+"office-government": "3Regierungsstelle|Amt|3Behörde|4Verwaltung",
+"office-lawyer": "5Anwaltskanzlei|Anwaltsbüro|Anwalt|Rechtsanwalt|Jurist|Gerichtsanwalt|Rechtsbeistand|Rechtsberater|Verteidiger",
+"office-telecommunication": "5Mobilfunkbetreiber|Mobilfunkanbieter",
 "craft-beekeeper": "3Imker",
 "craft-blacksmith": "Schmied",
 "craft-brewery": "4Brauerei|Brauhaus|Hausbrauerei|Bier|Bierausschank|Hausbräu",
-"craft-caterer": "4Caterer|3Catering|5Partyservice|U+1F973|U+1F371",
+"craft-caterer": "Caterer|Partyservice",
 "craft-carpenter": "4Zimmermann",
 "craft-confectionery": "Süßwarenladen",
 "craft-electrician": "4Elektriker",
@@ -297,7 +294,7 @@
 "craft-gardener": "Landschaftsgärtner|4Gärtnerei",
 "craft-grinding_mill": "Mühle",
 "craft-handicraft": "4Kunsthandwerk",
-"craft-hvac": "4Heizung|4Lüftung|4Kühlung|4Klimatisierung|U+1F32C|U+1F975|U+1F976|U+2668|U+2744|U+1F525|U+1F321",
+"craft-hvac": "4Heizung, Lüftung und Klimatisierung",
 "craft-metal_construction": "5Metallverarbeitung|4Schlosser",
 "craft-key_cutter": "4Schlüssel-Nachmachdienst",
 "craft-locksmith": "4Schlüsseldienst",
@@ -348,7 +345,6 @@
 "amenity-community_centre": "5Gemeinschaftszentrum|Bürgerhaus",
 "amenity-compressed_air": "Druckluft|Pressluft",
 "amenity-courthouse": "Justizgebäude|Gerichtsgebäude",
-"amenity-vending_machine": "Verkaufsautomat|Automat",
 "amenity-vending_machine-cigarettes": "5Zigarettenautomat",
 "amenity-vending_machine-coffee": "6Kaffeeautomat",
 "amenity-vending_machine-condoms": "6Kondomautomat",
@@ -375,7 +371,6 @@
 "tourism-chalet|@category_hotel": "Ferienhäuschen|Ferienhaus",
 "tourism-information-board": "Informationstafel",
 "tourism-information-map": "Touristenkarte",
-"tourism-information-guidepost": "Wegweiser",
 "aerialway-station": "Seilbahn|Liftstation",
 "aeroway-helipad": "Hubschrauberlandeplatz",
 "barrier-border_control": "Grenzkontrolle",
@@ -466,7 +461,6 @@
 "leisure-track": "Laufbahn",
 "leisure-bandstand": "6Musikpavillon|8Konzertpavillon|Konzertmuschel|Musikmuschel|Kurpavillon|Kurmuschel",
 "power-plant": "Kraftwerk",
-"power-generator-wind": "Windgenerator|Windrad|Windkraftanlage",
 "shop-auction|@category_secondhand": "Auktion",
 "shop-collector|@category_shopping|@category_secondhand": "Sammlerartikel|Sammlerstücke",
 "man_made-cairn": "Steinmännchen",
@@ -499,7 +493,7 @@
 "leisure-dance|@category_entertainment": "4Tanz|Tanzschule",
 "leisure-firepit": "5Feuerstelle",
 "amenity-love_hotel": "4Liebes Hotel|3Sex Hotel|4Hotel für Erwachsene",
-"leisure-hackerspace": "4Hackspace|4Hackerspace|4Hacker Space|4Hacklab|U+1F913|U+1F5A5|U+1F4BB",
+"leisure-hackerspace": "Hackspace|Hackerspace",
 "natural-peak|@mountain": "Gipfel",
 "man_made-crane": "Stationärer Kran",
 "amenity-food_court": "Gastronomiebereich",
@@ -532,6 +526,5 @@
 "amenity-payment_centre": "Zahlungszentrum",
 "social_facility-food_bank": "Tafel|Lebensmitteltafel|Essen|Freier Kühlschrank",
 "amenity-food_sharing": "Food Sharing|Essen|Spenden",
-"amenity-give_box": "Spendenbox|spenden",
-"amenity-hydrant": "5Hydrant|5Wasserhydrant|4Nutzwasser"
+"amenity-give_box": "Spendenbox|spenden"
 }
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -242,7 +242,7 @@
 "leisure-stadium": "4Stadium|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|olympic stadium|sports stadium|sports complex|arena|sports arena",
 "leisure-playground|@category_children": "4Playground",
 "leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sports Center|sport|sports|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum",
-"leisure-sports_centre-sport-swimming": "4Swimming Centre",
+"leisure-sports_centre-sport-swimming": "4Swimmming Centre",
 "leisure-golf_course": "4Golf Course|golf|U+26F3",
 "leisure-miniature_golf": "4Minigolf|Miniature Golf|Putt Putt|mini golf|mini-golf",
 "leisure-escape_game": "4Escape Room|Escape Game|quest",
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -21,7 +21,7 @@
 "amenity-studio": "Estudio de media|Estudio",
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2pub|taberna|bebida|beber|4cerveza|cóctel",
 "amenity-cafe|@category_eat": "3Café|cafetería",
-"amenity-fast_food|@category_eat": "4Comida rápida|restaurante|restaurant|3Restaurante de comida rápida|comida para llevar|comida basura",
+"amenity-fast_food|@category_eat": "4Comida rápida|restaurante|restaurant|3Restaurante de comida rápida",
 "amenity-restaurant|@category_eat": "3Restaurante|3Café|restaurant|restorán",
 "@shop": "Tienda|Comercio",
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Panadería|pan|panificadora|4pastelería|5repostería|4confitería|4bollería",
@@ -130,7 +130,7 @@
 "amenity-car_sharing": "Coche compartido|4carsharing",
 "amenity-car_rental": "3Coche de alquiler|alquiler|rentadora|alquiladora|3alquiler de coches|alquiler de autos|alquiler de carros",
 "amenity-motorcycle_rental": "3Alquiler de motos|moto|motos|motocicleta|motocicletas|scooter",
-"amenity-cinema|@category_entertainment": "3Cine|películas|película|pelis|U+1F3A6|U+1F3AC|sala de cine",
+"amenity-cinema|@category_entertainment": "3Cine|películas",
 "leisure-bowling_alley|@category_entertainment": "Bolera|bowling",
 "amenity-theatre|@category_entertainment": "3Teatro",
 "amenity-nightclub|@category_entertainment|@category_nightlife": "3Discoteca|boliche|antro|club nocturno",
@@ -180,9 +180,9 @@
 "recycling-small_appliances|@category_recycling": "Residuos electrónicos|Chatarra electrónica|10Reciclaje de electrónica|Reciclaje de dispositivos electrónicos",
 "recycling-cardboard|@category_recycling": "Cartón|Cartones|10Reciclaje de cartón|cartón",
 "recycling-cans|@category_recycling": "Latas de aluminio|Latas|10Reciclaje de latas|latas",
-"recycling-shoes|@category_recycling": "Reciclaje de zapatos|4Reciclaje de calzado",
-"recycling-green_waste|@category_recycling": "4Reciclaje de residuos orgánicos|4Reciclaje de restos de comida|4Reciclaje de restos de poda|orgánico",
-"recycling-cartons|@category_recycling": "4Reciclaje de envases|Reciclaje de cartones|Reciclaje de tetrapack|Envases",
+"recycling-shoes|@category_recycling": "Reciclaje de zapatos",
+"recycling-green_waste|@category_recycling": "10Reciclaje de residuos orgánicos|Reciclaje de residuos vegetales|Orgánico",
+"recycling-cartons|@category_recycling": "10Reciclaje de envases|Reciclaje de envases de bebidas|Reciclaje de tetrapack|Envases",
 "amenity-sanitary_dump_station|@category_rv": "4Desagüe|Estación de vaciado para caravanas|Estación de desagüe para caravanas",
 "amenity-school": "3Escuela|colegio|liceo|4Instituto|Academia|Plantel",
 "amenity-shelter": "4Refugio|resguardo",
@@ -213,7 +213,7 @@
 "highway-elevator": "Ascensor|Elevador",
 "@mountain": "montaña|monte|cerro",
 "natural-peak|@mountain": "Cima|Pico|Cumbre",
-"natural-saddle|mountain_pass": "5Collado|4Paso de montaña|puerto de montaña",
+"natural-saddle|mountain_pass": "4Collado|4Paso de montaña|Puerto de montaña",
 "natural-strait": "Estrecho",
 "landuse-forest": "Bosque",
 "leisure-park": "4Parque",
@@ -512,13 +512,13 @@
 "social_facility-food_bank": "Banco de alimentos|alimento|comida|voluntariado",
 "amenity-fuel|@category_fuel": "3Gasolinera|4Estación de servicio|combustible|gasolina|nafta|diesel|gasóleo|U+26FD",
 "shop-beauty-nails": "4Salón de manicura|salón de belleza|manicure|manicur|maniquiur|pedicure|uñas",
-"amenity-college": "colegio universtitario|universidad|College|U+1F3EB",
+"amenity-college": "College|U+1F3EB",
 "amenity-hospital|@category_hospital": "4Hospital|emergencia|emergencias|primeros auxilios",
-"amenity-parking|amenity-parking_entrance|@category_parking": "Entrada de parking|Parking|Estacionamiento|Aparcadero|aparcamiento",
+"amenity-parking|amenity-parking_entrance|@category_parking": "Entrada de parking|Parking|Estacionamiento|Aparcadero",
 "amenity-toilets|toilets-yes|@category_toilet": "wc",
 "leisure-sports_centre-sport-swimming": "4Centro de natación",
 "amenity-police|@category_police": "Estación de policía|policía",
-"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Cargador de autos|cargador de coches|cargador de carros|4Estación de carga|3Estación de carga|Cargador",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Cargador de autos|cargador de coches|cargador de carros",
 "amenity-sailing_school": "Escuela de vela|Escuela de navegación",
 "amenity-flight_school": "Escuela de aviación|Escuela de aeronáutica|Escuela de pilotos|aeronáutica|vuelo|aviación",
 "amenity-prep_school": "Propedéutico|Tutoría",
@@ -526,6 +526,6 @@
 "emergency-life_ring": "Salvavidas|Aro salavidas",
 "shop-beauty-day_spa": "3Spa diurno|spa|wellness",
 "leisure-indoor_play": "parque interior|parque infantil interior|parque indoor|parque recreativo interior",
-"amenity-food_sharing": "Comida compartida|compartir comida|rescate de comida|Alimentos compartidos|Alimentos",
+"amenity-food_sharing": "Comida compartida|compartir comida|rescate de comida",
 "amenity-give_box": "Caja de donación|caja de donar|donar"
 }
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -494,7 +494,5 @@
 "shop-money_lender": "Prêteur d'argent",
 "attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraction|Labyrinthe",
 "amenity-animal_shelter": "Refuge pour animaux|Refuge Animalier",
-"amenity-vending_machine-fuel|@category_fuel": "Pompe à gaz",
-"natural-peak|@mountain": "Sommet",
-"shop-cannabis|@shop": "Cannabis"
+"amenity-vending_machine-fuel|@category_fuel": "Pompe à gaz"
 }
--- a/data/categories-strings/ro.json/localize.json
+++ b/data/categories-strings/ro.json/localize.json
@@ -5,14 +5,14 @@
 "@category_fuel": "4Benzinărie|Benzină|Gaz|Peco",
 "@category_parking": "4Parcare",
 "@category_shopping": "4Shopping|3Cumpărături|Magazine",
-"@category_hotel": "3Hotel|Hoteluri|Cazare",
+"@category_hotel": "Hotel|Hoteluri",
 "@category_tourism": "5Obiective turistice|4Turism",
-"@category_entertainment": "4Divertisment|3Distracție",
-"@category_nightlife": "Viața nocturnă|cu prietenii|petrecere|Viață de noapte",
+"@category_entertainment": "Divertisment",
+"@category_nightlife": "Viața nocturnă|cu prietenii|petrecere",
 "@category_children": "Divertisment cu copiii|Divertisment cu familia|Vacanță cu copiii|Pentru copii|Copii|Pentru familie",
 "@category_atm": "3Bancomat|ATM",
-"@category_rv": "Pentru rulote|3Rulotă|RV|Rulote",
-"amenity-atm|@category_atm": "bani|cash",
+"@category_rv": "Pentru rulote|3Rulotă|RV",
+"amenity-atm|@category_atm": "bani",
 "@category_bank": "3Bancă",
 "@category_secondhand": "La mâna a doua|3Second Hand|Secondhand",
 "amenity-bank|@category_bank": "bani",
@@ -22,14 +22,14 @@
 "amenity-cafe|@category_eat": "3Cafenea",
 "amenity-fast_food|@category_eat": "4Fast food|3restaurant",
 "amenity-restaurant|@category_eat": "3Restaurant",
-"amenity-fuel|@category_fuel": "3Benzinărie|peco",
+"amenity-fuel|@category_fuel": "3Benzinărie",
 "@shop": "4Magazin",
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Brutărie|Patiserie",
 "shop-cosmetics|@category_shopping|@shop": "4Cosmetică|centru de îngrijire|4machiaj|4machiaje",
 "shop-convenience|@category_food|@shop": "4Magazin mixt|minimarket|magazin",
 "shop-deli|@category_food|@shop": "Deli|Delicatese",
 "shop-garden_centre|@shop": "Pepinieră|magazin cu articole de grădinărit",
-"shop-hearing_aids|@shop": "5Aparate auditive",
+"shop-hearing_aids|@shop": "Aparate auditive",
 "shop-mobile_phone|@shop": "Magazin de telefoane mobile|magazin de electronice",
 "shop-florist|@shop": "4Florărie",
 "shop-butcher|@category_food|@shop": "4Măcelărie",
@@ -44,21 +44,21 @@
 "shop-jewelry|@category_shopping|@shop": "4Bijutier",
 "shop-optician|@shop": "4Optică|Ochelari",
 "shop-gift|@category_shopping|@shop": "Magazin de suveniruri|Magazin de cadouri|Cadou|Cadouri|Daruri|Suveniruri",
-"shop-beauty": "Salon de înfrumusețare|4Salon Înfrumusețare|5Înfrumusețare|Beauty|4Beauty salon",
+"shop-beauty": "Salon de înfrumusețare",
 "shop-greengrocer|@category_food|@shop": "Aprozar|fructe|legume",
 "shop-sports|@category_shopping|@shop": "Articole sportive",
 "shop-supermarket|@category_food|@shop": "3Supermarket",
 "shop-mall|@category_shopping|@shop": "Mall",
 "shop-department_store|@category_shopping|@shop": "Magazin universal",
 "shop-beverages|@category_food|@shop": "Băuturi",
-"shop-computer|@shop": "Magazin de calculatoare|4Calculatoare|Computere|PC",
+"shop-computer|@shop": "Magazin de calculatoare",
 "shop-confectionery|craft-confectionery|@category_food|@shop": "Cofetărie|dulciuri|Cofetar",
 "shop-laundry": "Spălătorie",
 "shop-toys|@category_children|@shop": "Magazin de jucării",
 "amenity-money_transfer": "Transfer de bani",
 "shop-clothes|@category_shopping|@shop": "Magazin de haine",
-"shop-car|@shop": "Dealer Auto|4Dealership Auto|Mașini|Automobile",
-"shop-bicycle|@shop": "Magazin de 3biciclete",
+"shop-car|@shop": "Magazin auto",
+"shop-bicycle|@shop": "3Bicicletă|Magazin biciclete",
 "highway-bus_stop|@category_transport": "3Stație de autobuz",
 "railway-tram_stop|@category_transport": "3Stație de tramvai",
 "amenity-bus_station|@category_transport": "3Gara de autobuz",
@@ -73,14 +73,14 @@
 "tourism-viewpoint|@category_tourism": "3Punct de vedere",
 "tourism-information": "3Informații turistice",
 "tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Locații picnic|Grătar",
-"amenity-place_of_worship": "3Lăcaș de cult|3templu",
-"amenity-place_of_worship-christian": "Biserică|lăcaș de cult|templu",
-"amenity-place_of_worship-muslim": "4Moschee|lăcaș de cult|templu",
-"amenity-place_of_worship-buddhist": "Templu|lăcaș de cult|templu budist",
-"amenity-place_of_worship-hindu": "Templu|lăcaș de cult|Templu hindus",
-"amenity-place_of_worship-shinto": "Sanctuar|templu|lăcaș de cult|templu șintoinst|templu shinto||shinto",
-"amenity-place_of_worship-jewish": "4Sinagogă|templu|lăcaș de cult",
-"amenity-place_of_worship-taoist": "Templu|loc de cult|templu taoist",
+"amenity-place_of_worship": "3Loc de cult|3templu",
+"amenity-place_of_worship-christian": "Biserică|loc de cult|templu",
+"amenity-place_of_worship-muslim": "4Moschee|loc de cult|templu",
+"amenity-place_of_worship-buddhist": "Templu|loc de cult",
+"amenity-place_of_worship-hindu": "Templu|loc de cult",
+"amenity-place_of_worship-shinto": "Sanctuar|templu|loc de cult",
+"amenity-place_of_worship-jewish": "4Sinagogă|templu|loc de cult",
+"amenity-place_of_worship-taoist": "Templu|loc de cult",
 "tourism-museum|@category_tourism": "3Muzeu",
 "waterway-waterfall|@category_tourism": "3Cascadă",
 "historic-archaeological_site|@category_tourism": "Sit arheologic",
@@ -88,15 +88,15 @@
 "historic-stone": "Piatră istorica",
 "historic-boundary_stone": "Piatră de hotar",
 "historic-castle|@category_tourism": "4Castel|Castru|Biserică fortificată|Cetate|Castrul de deal|Kremlin|Conac|Palat",
-"historic-city_gate|@category_tourism": "Poartă a orașului",
-"historic-citywalls|@category_tourism": "Zid al orașului",
+"historic-city_gate|@category_tourism": "Poarta orașului",
+"historic-citywalls|@category_tourism": "Zidurile orașului",
 "historic-fort|@category_tourism": "Fort",
 "historic-gallows|@category_tourism": "Spânzurătoare",
 "historic-memorial|@category_tourism": "3Comemorare",
 "historic-memorial-cross": "Cruce comemorativă",
 "historic-memorial-plaque": "Comemorare",
-"historic-memorial-sculpture|@category_tourism": "Comemorare|sculptură",
-"historic-memorial-statue|@category_tourism": "Statuie|Comemorare",
+"historic-memorial-sculpture|@category_tourism": "Comemorare",
+"historic-memorial-statue|@category_tourism": "Comemorare",
 "historic-memorial-stolperstein": "Blocaj de poticnire",
 "historic-memorial-war_memorial|@category_tourism": "Memorial de război",
 "historic-monument|@category_tourism": "4Monument",
@@ -104,17 +104,17 @@
 "historic-cannon": "Tun",
 "historic-anchor": "Ancoră istorică",
 "historic-ruins|@category_tourism": "3Ruine",
-"historic-mine": "Mină istorică",
+"historic-mine": "Mina istorică",
 "historic-ship|@category_tourism": "Navă",
 "historic-wreck": "Naufragiu",
-"historic-locomotive|@category_tourism": "Locomotivă istorică",
+"historic-locomotive|@category_tourism": "Locomotiva istorică",
 "historic-tank|@category_tourism": "Tanc istoric",
-"historic-aircraft|@category_tourism": "Avion Istoric",
+"historic-aircraft|@category_tourism": "Avioane istorice",
 "historic-tomb|@category_tourism": "Mormânt",
 "historic-wayside_cross": "Troiță",
 "historic-wayside_shrine": "Altarul de la marginea drumului",
 "amenity-bench|amenity-bench-backless": "Banchetă|Bancă|Bancă parc",
-"amenity-bicycle_rental": "4Închiriere biciclete|4Biciclete",
+"amenity-bicycle_rental": "Închiriere de biciclete|Bicicletă",
 "amenity-car_sharing": "3Car Sharing",
 "amenity-car_rental": "Închiriere mașini",
 "amenity-motorcycle_rental": "Închiriere motociclete",
@@ -166,11 +166,11 @@
 "recycling-small_appliances|@category_recycling": "Deșeuri electrice",
 "amenity-school": "3Școală",
 "amenity-shelter": "Adăpost",
-"amenity-shelter-basic_hut": "Baracă|bivac",
-"amenity-shelter-lean_to": "4Adăpost",
-"amenity-stripclub": "Stripclub|Strip club|club de striptease",
+"amenity-shelter-basic_hut": "Baracă de Bivuac",
+"amenity-shelter-lean_to": "Adăpost",
+"amenity-stripclub": "Stripclub",
 "amenity-telephone": "3Telefon",
-"@category_toilet": "3Toaletă|WC|grup sanitar|baie|veceu",
+"@category_toilet": "3Toaletă",
 "amenity-university": "4Universitate",
 "place-continent": "Continent",
 "place-country": "Continent",
@@ -182,8 +182,8 @@
 "place-region": "Regiune",
 "place-island|place-islet": "Insulă|Insult",
 "place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Suburbie|Cartier",
-"place-hamlet": "Cătun|așezare|sat",
-"place-village": "Sat|așezare",
+"place-hamlet": "Cătun",
+"place-village": "Sat",
 "place-locality": "Localitate",
 "place-farm": "Fermă",
 "highway-raceway": "Pistă de curse",
@@ -200,12 +200,12 @@
 "tourism-motel|@category_hotel": "Motel",
 "tourism-alpine_hut|@category_hotel": "Cabană de munte|hotel",
 "shop-hairdresser": "Coafor",
-"aeroway-aerodrome": "3Aeroport|Aerodrom",
+"aeroway-aerodrome": "3Aeroport",
 "leisure-stadium": "4Stadion",
 "leisure-playground|@category_children": "Loc de joacă",
-"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sport|Sporturi",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sport",
 "leisure-golf_course": "Teren de golf",
-"leisure-miniature_golf": "Minigolf|mini golf|mini-golf",
+"leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Cameră de evadare",
 "leisure-pitch": "Teren de sport|gazon",
 "leisure-swimming_pool": "Piscină",
@@ -223,7 +223,7 @@
 "sport-gymnastics": "Gimnastică",
 "sport-handball": "Handbal",
 "sport-scuba_diving": "Scufundări",
-"sport-shooting": "Tragere",
+"sport-shooting": "Tir",
 "sport-skateboard": "Skateboarding|skateboard",
 "sport-skiing": "Schi",
 "sport-soccer": "Fotbal",
@@ -250,18 +250,18 @@
 "natural-water-reservoir|landuse-reservoir|@waterbody": "5Lac de Acumulare",
 "waterway-river|waterway-stream|natural-water-river": "Râu",
 "waterway-canal": "Canal",
-"shop-car_repair": "Atelier de reparații auto|service|reparații auto",
-"tourism-camp_site|@category_hotel": "4Camping|Loc de campare",
+"shop-car_repair": "Atelier de reparații auto",
+"tourism-camp_site|@category_hotel": "4Camping",
 "tourism-caravan_site|@category_rv||@category_hotel": "Teren pentru campare",
 "office": "Birou",
 "office-company": "Sediu companei",
 "office-government": "Birou guvernamental",
 "office-lawyer": "Firmă de avocatură|3Avocat|Notar",
-"office-telecommunication": "Operator de telecomunicații",
+"office-telecommunication": "Operator de telefonie mobilă",
 "craft-beekeeper": "Apicultor",
 "craft-blacksmith": "Fierar",
 "craft-brewery": "Berărie",
-"craft-caterer": "Catering|Firmă de catering",
+"craft-caterer": "Catering",
 "craft-carpenter": "Tâmplar",
 "craft-confectionery": "Cofetar",
 "craft-electrician": "4Electrician",
@@ -269,16 +269,16 @@
 "craft-gardener": "Peisagist",
 "craft-grinding_mill": "Moara",
 "craft-handicraft": "Tehnici de lucru manual",
-"craft-hvac": "Încălzire, ventilație și aer condiționat|HVAC|AC|Aer condiționat",
+"craft-hvac": "Încălzire, ventilație și aer condiționat",
 "craft-metal_construction": "5Metalurgist",
-"craft-key_cutter": "Copiere chei|copiat chei",
+"craft-key_cutter": "Tăierea cheilor",
 "craft-locksmith": "Lăcătuș",
 "craft-painter": "Pictor",
 "craft-photographer": "4Fotograf|studio de fotografie",
 "craft-plumber": "Instalator",
 "craft-sawmill": "Fabrica de cherestea",
 "craft-shoemaker": "Reparații încălțăminte",
-"craft-winery": "Vinărie|Cramă|Crame|Vin",
+"craft-winery": "Vinărie",
 "craft-tailor": "Croitor",
 "area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "Piață|Spațiu",
 "place-sea": "Mare",
@@ -288,22 +288,22 @@
 "natural-beach|natural-beach-sand|natural-beach-gravel|leisure-beach_resort": "Plajă|Plaja cu pietriș",
 "man_made-lighthouse": "Far",
 "man_made-communications_tower|man_made-tower-communication": "Turnul de comunicații",
-"man_made-petroleum_well": "Puț de petrol|Sondă de petrol",
+"man_made-petroleum_well": "4Puț de petrol",
 "organic-only|organic-yes": "eco|bio|sănătos|biologic|ambiental|natural|organic",
-"shop-copyshop": "Centru copiere|4Imprimare|Xerox|Copiere|Fotocopiere",
+"shop-copyshop": "Centru copiere|4Imprimare",
 "shop-photo|@shop": "Centru fotografii|cadre",
-"shop-camera|@shop": "Magazin de aparate foto|Foto|Magazin foto|Camere",
+"shop-camera|@shop": "Magazin de aparate foto",
 "shop-travel_agency": "Agenție de voiaj|tururi",
 "shop-outdoor|@shop": "Echipament de exterior|trekking|cățărare|campare",
 "shop-dry_cleaning": "Curățătorie chimică|curățătorie",
-"shop-tyres|@shop": "Magazin de anvelope|anvelope|cauciucuri",
+"shop-tyres|@shop": "Magazin anvelope",
 "amenity-car_wash": "Spălătorie auto",
-"amenity-veterinary": "Cabinet veterinar|Veterinar",
+"amenity-veterinary": "Cabinet veterinar",
 "@charging_station": "Stație încărcare|încărcare",
 "amenity-charging_station-bicycle|@charging_station": "Încărcarea bicicletelor",
 "amenity-childcare": "De îngrijire a copilului|Grădiniță|Îngrijire copii",
 "amenity-bicycle_parking": "Parcare biciclete",
-"amenity-waste_basket": "Coș de gunoi|pubelă|coș|gunoi",
+"amenity-waste_basket": "Pubelă",
 "emergency-phone": "3Telefon de urgență",
 "leisure-fitness_centre": "Centru fitness",
 "leisure-sauna": "3Saună",
@@ -323,11 +323,11 @@
 "amenity-vending_machine-public_transport_tickets|@category_transport": "Automat de vânzare a biletelor pentru transportul public",
 "shop-outpost": "Punct de ridicare",
 "building-garage": "Garaj",
-"highway-rest_area|highway-services": "Zonă de odihnă|Loc de odihnă|Spațiu servicii|Refugiu",
-"man_made-chimney": "Coș de fum",
+"highway-rest_area|highway-services": "Zonă de odihnă",
+"man_made-chimney": "Coș de fabrică",
 "man_made-tower|man_made-flare": "Turn",
 "shop-bookmaker|@gambling": "Casă de pariuri",
-"shop-seafood|@category_food|@shop": "3Pescărie|Pește|Pești",
+"shop-seafood|@category_food|@shop": "Pescărie",
 "shop-second_hand|@category_shopping|@shop|@category_secondhand": "Magazin second-hand",
 "shop-charity|@shop|@category_secondhand": "Magazin de caritate",
 "shop-ticket": "Casă de bilete",
@@ -377,7 +377,7 @@
 "shop-motorcycle_repair": "Reparatie motociclete",
 "shop-newsagent": "Chioșc cu ziare",
 "shop-pawnbroker": "Amanet",
-"shop-stationery|@shop": "Magazin de papetărie|4Papetărie",
+"shop-stationery|@shop": "Magazin de papetărie",
 "shop-tattoo": "Salon de tatuaje",
 "shop-variety_store|@category_shopping|@shop": "Magazin universal",
 "shop-video|@shop": "Magazin video",
@@ -459,37 +459,5 @@
 "man_made-mast": "Stâlp",
 "man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "Telescop",
 "man_made-observatory": "4Observator astronomic",
-"man_made-cross": "Cruce",
-"amenity-hydrant": "Hidrant",
-"man_made-crane": "Macara",
-"amenity-studio": "Studio|Studio media",
-"office-security": "3Firmă de pază|Pază|Firmă de securitate|Pază și protecție|",
-"shop-caravan|@category_rv|@shop": "Dealer Rulote|4Dealership Rulote|Rulote",
-"leisure-firepit": "Foc",
-"amenity-love_hotel": "Hotel love",
-"recycling-cardboard|@category_recycling": "Reciclare carton",
-"recycling-cans|@category_recycling": "Reciclare aluminiu|Reciclare doze",
-"recycling-shoes|@category_recycling": "Reciclare pantofi",
-"amenity-sanitary_dump_station|@category_rv": "Stație de golire rulotă|stație de golire rulotă|Golire rulotă|golire rulote",
-"tourism-hotel|@category_hotel": "motel",
-"leisure-sports_centre-sport-swimming": "Înot|Centru de înot",
-"leisure-hackerspace": "Heckerspace|hacker space",
-"amenity-police|@category_police": "Poliție|Poliția|Stație de poliție|",
-"sport-bowls": "\t",
-"amenity-bicycle_repair_station": "4Reparații biciclete|stație reparații biciclete|stație reparare biciclete",
-"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Încărcare|Încărcare mașini|Încărcare mașini electrice|stație de încărcare",
-"amenity-vending_machine-coffee": "Cafea|4automat de cafea|tonomat de cafea",
-"amenity-vending_machine-condoms": "Automat prezervative",
-"amenity-vending_machine-food|@category_food": "Automat de gustări|Automt de mâncare|gustări|tonomat de gustări|tonomat|automat cu gustări",
-"amenity-vending_machine-newspapers": "4Ziare|Automt ziare|tononat ziare",
-"amenity-vending_machine-sweets": "Dulciuri|Automat de dulciuri|tonomat de dulciuri|automat cu dulciuri",
-"amenity-parcel_locker|@category_post": "Locker colete|Dulap colete",
-"amenity-sailing_school": "Școală de navigație",
-"amenity-flight_school": "Școală de zbor",
-"amenity-car_pooling|@category_parking": "4carpooling|car pooling",
-"amenity-payment_centre": "4Centru de plăți|Centru de plată|Plată",
-"leisure-indoor_play": "3Loc de joacă interior",
-"shop-fabric|@shop": "Magazin de stofă|Magazin de stofe|Magzin de țesături",
-"shop-musical_instrument|@shop": "Magzin de muzică|Magazin de instrumente|Instrumente muzicale|Magazin de instrumente muzicale",
-"shop-lighting|@shop": "Magazin de iluminat|Magazin de corpuri de iluminat"
+"man_made-cross": "Cruce"
 }
--- a/data/countries-strings/es.json/localize.json
+++ b/data/countries-strings/es.json/localize.json
--- a/data/countries-strings/fa.json/localize.json
+++ b/data/countries-strings/fa.json/localize.json
@@ -497,6 +497,5 @@
 "Norway_Hordaland":"هوردالاند",
 "Norway_Nordland":"نوردلاند",
 "Peru_Lima":"لیما",
-"Portugal_Islands":"گزیرگ‌های پرتغال",
-"US_Virginia_Alexandria":"الکساندریه"
+"Portugal_Islands":"گزیرگ‌های پرتغال"
 }
--- a/data/countries-strings/lt.json/localize.json
+++ b/data/countries-strings/lt.json/localize.json
@@ -184,7 +184,7 @@
 "Yemen":"Jemenas",
 "Zambia":"Zambija",
 "Zimbabwe":"Zimbabvė",
-"Congo-Kinshasa Short":"Kongo DR",
+"Congo-Kinshasa Short":"Kongo",
 "Barbados":"Barbadosas",
 "Belarus":"Baltarusija",
 "Burundi":"Burundis",
@@ -1952,601 +1952,5 @@
 "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",
-"Mali Description":"Bamakas, Kulikoras, Segu",
-"Malta Description":"Valeta, Viktorija, Zebudžas",
-"Marshall Islands Description":"Madžūras, Dželteris, Ebejė",
-"Martinique Description":"For de Fransas, Sent Espri, Šelšeras",
-"Mauritania Description":"Nuakšotas, Alegas, Ajun al Atrusas",
-"Mauritius Description":"Port Luisas, Flik en Flak, Roz Hilas",
-"Mexico_California Description":"Tichuana, Meksikalis, La Pasas",
-"Mexico_Central_East Description":"Monterėjus, Saltilas, Toreonas",
-"Mexico_Central_West Description":"Gvadalachara, Agvaskaljentesas, Sapopanas",
-"Mexico_Chihuahua Description":"Siudad Chuaresas, Čihuahua, Siudad Akunja",
-"Mexico_East Description":"Merida, Viljahermosa, Kankūnas",
-"Mexico_Mexico Description":"Meksikas, Puebla, Kvautitlan Iskaljis",
-"Mexico_Sonora Description":"Hermosiljas, Siudad Obregonas, Heroika Nogalesas",
-"Mexico_South Description":"Leonas, Keretaras, Akapulkas",
-"Moldova Description":"Kišiniovas, Tiraspolis, Belcis",
-"Monaco Description":"Monakas",
-"Mongolia Description":"Ulan Batoras, Chovdas, Erdenetas",
-"Montenegro Description":"Podgorica, Nikšičius, Tuzai",
-"Montserrat Description":"Breidsas, Salemas",
-"Morocco_Doukkala-Abda Description":"Kasablanka, Marakešas, Safis",
-"Morocco_Rabat-Sale-Zemmour-Zaer Description":"Fesas, Rabatas, Salė",
-"Morocco_Southern Description":"Meknesas, Agadyras, Udžda",
-"Morocco_Western Sahara Description":"Ajūnas, Gelmimas, Asa",
-"Mozambique Description":"Maputu, Matola, Praka do Bilenė",
-"Myanmar Description":"Jangonas, Neipidas, Mandalėjus",
-"Nagorno-Karabakh Description":"Chankendi, Šuša, Lačinas",
-"Namibia Description":"Vindhukas, Opuvas, Enhana",
-"Nauru Description":"Jarenas, Buada, Oro",
-"Nepal_Kathmandu Description":"Katmandu, Patanas",
-"Nepal_Madhyamanchal Description":"Baratpuras, Birgandžas",
-"Nepal_West Description":"Butvalas, Pokara, Nepalgandžas",
-"Netherlands_Drenthe Description":"Asenas, Emenas, Hogevenas",
-"Netherlands_Flevoland Description":"Almerė, Lelistadas, Drontenas",
-"Netherlands_Friesland Description":"Leuvardenas, Drachtenas, Snekas",
-"Netherlands_Gelderland_Nijmegen Description":"Neimegenas, Grusbekas, Tilis",
-"Netherlands_Gelderland_North Description":"Apeldornas, Arnhemas, Edė",
-"Netherlands_Gelderland_Zutphen Description":"Dutinchemas, Ziutfenas, Vintersveikas",
-"Netherlands_Groningen Description":"Groningenas, Lekas, Bediumas",
-"Netherlands_Limburg Description":"Mastrichtas, Venlas, Herlenas",
-"Netherlands_North Brabant_Eindhoven Description":"Hertogenbosas, Eindhovenas, Helmondas",
-"Netherlands_North Brabant_Roosendaal Description":"Stenbergenas, Rozendalis, Bergenas prie Zomo",
-"Netherlands_North Brabant_Tiburg Description":"Tilburgas, Breda, Barle-Hertogas",
-"Netherlands_North Brabant_Uden Description":"Osas, Udenas, Dernė",
-"Netherlands_North Holland_Alkmaar Description":"Alkmaras, Hornas, Den Helderis",
-"Netherlands_North Holland_Amsterdam Description":"Amsterdamas, Harlemas, Hilversiumas",
-"Netherlands_North Holland_Zaandam Description":"Piurmerendas, Zandamas, Beverveikas",
-"Netherlands_Overijssel_Enschede Description":"Enschedė, Hengelas, Almelas",
-"Netherlands_Overijssel_Zwolle Description":"Zvolė, Deventeris, Kampenas",
-"Netherlands_South Holland_Brielle Description":"Speikenisė, Helevutsleisas, Senasis Bejerlandas",
-"Netherlands_South Holland_Den Haag Description":"Haga, Zutermeras, Delftas",
-"Netherlands_South Holland_Leiden Description":"Leidenas, Alfenas prie Reino, Leiderdorpas",
-"Netherlands_South Holland_Rotterdam Description":"Roterdamas, Dordrechtas, Schidamas",
-"Netherlands_Utrecht_Amersfoort Description":"Amersfortas, Venendalis, Zeistas",
-"Netherlands_Utrecht_Utrecht Description":"Utrechtas, Nivegeinas, Hautenas",
-"Netherlands_Zeeland Description":"Midelburgas, Vlisingenas, Gusas",
-"New Zealand North_Auckland Description":"Oklandas, Hamiltonas, Tauranga",
-"New Zealand North_Wellington Description":"Velingtonas, Žemutinis Hatas, Šiaurės Palmerstonas",
-"New Zealand South_Canterbury Description":"Kraistčerčas, Nelsonas, Vaimatė",
-"New Zealand South_Southland Description":"Danidinas, Inverkargilis, Tuataperė",
-"Nicaragua Description":"Managva, Matagalpa, Blufildsas",
-"Niger Description":"Niamėjus, Maradis, Zinderas",
-"Nigeria_North Description":"Kanas, Maidugūris, Sokotas",
-"Nigeria_South Description":"Lagosas, Ibadanas, Abudža",
-"Niue Description":"Alofis, Liku, Lakepa",
-"North Korea Description":"Pchenjanas, Hamhingas, Nampas",
-"Norway_Central Description":"Oslas, Sandvika, Dramenas",
-"Norway_Hedmark Description":"Briumiundalis, Hamaras, Elveriumas",
-"Norway_Hordaland Description":"Bergenas, Leirvikas, Vosevangenas",
-"Norway_Jan Mayen Description":"Olonkinbienas",
-"Norway_Nordland Description":"Budė, Brionioisiundas, Mušioenas",
-"Norway_North Trondelag Description":"Kolvereidas, Stjordalis, Steincheris",
-"Norway_Northern Description":"Trumsė, Finsnesas, Hamerfestas",
-"Norway_Oppland Description":"Lomas, Raufosas, Jovikas",
-"Norway_Rogaland Description":"Stavangeris, Sandnesas, Haugesiundas",
-"Norway_South Trondelag Description":"Trondheimas, Riorusas, Titranas",
-"Norway_Southern Description":"Fredrikstadas, Kristiansandas, Sarpsborgas",
-"Norway_Svalbard Description":"Griumantbienas, Piramidė, Longjyrbienas",
-"Norway_Western Description":"Olesiundas, Moldė",
-"Oman Description":"Maskatas, al Chasalas, as Suvaikas",
-"Pakistan Description":"Karačis, Lahoras, Faisalabadas",
-"Palau Description":"Melekeokas, Palau, Oreoras",
-"Palestine Description":"Gaza, Modiin Ilitas, Nablusas",
-"Panama Description":"Panama, Santjago de Veragvasas, Kolonas",
-"Papua New Guinea Description":"Port Morsbis, Lajė, Vanimas",
-"Paraguay Description":"Asunsjonas, San Lorenzas, Siudad del Estė",
-"Peru_Lima Description":"Lima, Ika, Naska",
-"Peru_North Description":"Čiklajas, Ikitosas, Pjūra",
-"Peru_South Description":"Arekipa, Abankajus, Mokegva",
-"Philippines_Luzon_Manila Description":"Manila, Kesonas, Pasigas",
-"Philippines_Luzon_North Description":"Anchelesas, Palajanas, Malolosas",
-"Philippines_Luzon_South Description":"Puerto Prinsesa, Masbatė, Kalapanas",
-"Philippines_Mindanao Description":"Zamboanga, Cheneral Santosas, Koronadalis",
-"Philippines_Visayas Description":"Bakolodas, Sebu, Tagbilaranas",
-"Pitcairn Islands Description":"Adamstaunas",
-"Poland_Greater Poland Voivodeship Description":"Poznanė, Kališas, Koninas",
-"Poland_Kuyavian-Pomeranian Voivodeship Description":"Bydgoščius, Torunė, Vloclavekas, Grudziondzas",
-"Poland_Lesser Poland Voivodeship Description":"Krokuva, Tarnuvas, Naujasis Sončas, Osvencimas",
-"Poland_Lodz Voivodeship Description":"Lodzė, Petrakavas, Pabianicės, Mazovijos Tomašuvas",
-"Poland_Lower Silesian Voivodeship Description":"Vroclavas, Valbžychas, Legnica, Jelenia Gura",
-"Poland_Lublin Voivodeship Description":"Liublinas, Chelmas, Zamoscis",
-"Poland_Lubusz Voivodeship Description":"Gožuvas, Zeliona Gura, Liubnevicės",
-"Poland_Masovian Voivodeship Description":"Varšuva, Radomas, Plockas",
-"Poland_Opole Voivodeship Description":"Opolė, Kendzežynas-Kozlis, Nysa, Bžegas",
-"Poland_Podlaskie Voivodeship Description":"Balstogė, Čyževas, Suvalkai",
-"Poland_Pomeranian Voivodeship Description":"Gdanskas, Gdynė, Slupskas",
-"Poland_Silesian Voivodeship Description":"Katovicai, Čenstakava, Sosnovecas",
-"Poland_Subcarpathian Voivodeship Description":"Žešuvas, Jedličius, Dynuvas",
-"Poland_Swietokrzyskie Voivodeship Description":"Kelcai, Švento Kryžiaus Ostrovecas, Starachovicės",
-"Poland_Warmian-Masurian Voivodeship Description":"Olštynas, Elbingas, Elkas",
-"Poland_West Pomeranian Voivodeship Description":"Ščecinas, Košalinas, Redlas",
-"Portugal_Islands Description":"Funšalis, Madalena, Kaljeta",
-"Portugal_Porto Description":"Vila Nova de Gaja, Portas, Braga",
-"Portugal_South Description":"Lisabona, Odivelasas, Setubalis",
-"Portugal_Viseu Description":"Vizėjus, Vizela, Felgeirasas",
-"Qatar Description":"Doha, al Rajanas, Barva",
-"Republic of Kosovo Description":"Priština, Mitrovica, Ferizajus",
-"Romania_Centre Description":"Brašovas, Sibiu, Tirgu Murešas",
-"Romania_North_East Description":"Jasai, Bakeu, Botošanis",
-"Romania_North_West Description":"Klužas-Napoka, Dežas, Oradia",
-"Romania_South Description":"Bukareštas, Ploještis, Piteštis",
-"Romania_South_East Description":"Konstanta, Galacis, Breila",
-"Romania_South_West Description":"Krajova, Slatina, Rimniku Vilča",
-"Romania_West Description":"Timišoara, Aradas, Rešica",
-"Russia_Altai Krai Description":"Barnaulas, Bijskas, Rubcovskas",
-"Russia_Altai Republic Description":"Gorno Altaiskas, Maima, Koš Agašas",
-"Russia_Amur Oblast Description":"Blagoveščenskas, Belogorskas, Svobodnas",
-"Russia_Arkhangelsk Oblast_Central Description":"Archangelskas, Severodvinskas, Novodvinskas",
-"Russia_Arkhangelsk Oblast_North Description":"Kotlasas, Koriažma, Vyčegodskis",
-"Russia_Astrakhan Oblast Description":"Astrachanė, Gospitomnikas, Achtubinskas",
-"Russia_Bashkortostan Description":"Ufa, Sterlitamakas, Salavatas",
-"Russia_Belgorod Oblast Description":"Belgorodas, Senasis Oskolas, Gubkinas",
-"Russia_Bryansk Oblast Description":"Brianskas, Novozybkovas, Klincai",
-"Russia_Buryatia Description":"Ulan Udė, Selenduma, Džida",
-"Russia_Chechen Republic Description":"Groznas, Urus Martanas, Šali",
-"Russia_Chelyabinsk Oblast Description":"Čeliabinskas, Magnitogorskas, Zlatoustas",
-"Russia_Chukotka Autonomous Okrug Description":"Anadyris, Bilibinas, Pevekas",
-"Russia_Chuvashia Description":"Čeboksarai, Novočeboksarskas, Kanašas",
-"Russia_Ingushetia Description":"Nazranė, Ordžonikidzevskis, Karabulakas",
-"Russia_Irkutsk Oblast Description":"Irkutskas, Bratskas, Angarskas",
-"Russia_Ivanovo Oblast Description":"Ivanovas, Kinešma,",
-"Russia_Jewish Autonomous Oblast Description":"Birobidžanas, Oblučė, Nikolajevka",
-"Russia_Kabardino-Balkaria Description":"Nalčikas, Prochladnas, Baksanas",
-"Russia_Kaliningrad Oblast Description":"Kaliningradas, Sovetskas. Černiachovskas",
-"Russia_Kaluga Oblast Description":"Kaluga, Obninskas, Babyninas",
-"Russia_Kamchatka Krai Description":"Kamčiatkos Petropavlovskas, Jelizovas, Viliučinskas",
-"Russia_Karachay-Cherkessia Description":"Čerkeskas, Pregradnaja, Ust Džeguta",
-"Russia_Kemerov Oblast Description":"Kemerovas, Novokuzneckas, Prokopjevskas",
-"Russia_Khabarovsk Krai Description":"Chabarovskas, Komsomolskas prie Amūro, Amurskas",
-"Russia_Khakassia Description":"Abakanas, Černogorskas, Sajanogorskas",
-"Russia_Kirov Oblast Description":"Kirovas, Kirovo Čepeckas, Slobodskojus",
-"Russia_Komi Republic Description":"Syktyvkaras, Uchta, Vorkuta",
-"Russia_Kostroma Oblast Description":"Kostroma, Bujus, Šarja",
-"Russia_Krasnodar Krai Description":"Krasnodaras, Novorosijskas, Armaviras",
-"Russia_Krasnodar Krai_Adygeya Description":"Sočis, Maikopas, Gelendžikas",
-"Russia_Krasnoyarsk Krai_North Description":"Norilskas, Dudinka, Severo Jeniseiskis",
-"Russia_Krasnoyarsk Krai_South Description":"Krasnojarskas, Ačinskas, Kanskas",
-"Russia_Kurgan Oblast Description":"Kurganas, Šadrinskas, Vargaši",
-"Russia_Kursk Oblast Description":"Kurskas, Železnogorskas, Kurčiatovas",
-"Russia_Leningradskaya Oblast_Karelsky Description":"Vyborgas, Vsevoložskas, Sertolovas",
-"Russia_Leningradskaya Oblast_Southeast Description":"Gatčina, Sosnovyj Boras, Tichvinas",
-"Russia_Lipetsk Oblast Description":"Lipeckas, Jelecas, Griaziai",
-"Russia_Magadan Oblast Description":"Magadanas, Ola, Susumanas",
-"Russia_Mari El Description":"Joškar Ola, Volžskas, Kozmodemjanskas",
-"Russia_Moscow Description":"Maskva, Chimkai, Troickas",
-"Russia_Moscow Oblast_East Description":"Balašicha, Podolskas, Koroliovas",
-"Russia_Moscow Oblast_West Description":"Zelenogradas, Odincovas, Krasnogorskas",
-"Russia_Murmansk Oblast Description":"Murmanskas, Apatitai, Severomorskas",
-"Russia_Nenets Autonomous Okrug Description":"Krasnojė, Narjan Maras, Iskatelei",
-"Russia_Nizhny Novgorod Oblast Description":"Žemutinis Naugardas, Dzeržinskas, Arzamasas",
-"Russia_North Ossetia-Alania Description":"Vladikaukazas, Mozdokas, Beslanas",
-"Russia_Novgorod Oblast Description":"Didysis Naugardas, Borovičiai, Senoji Rusa",
-"Russia_Novosibirsk Oblast Description":"Novosibirskas, Berdskas, Iskitimas",
-"Russia_Omsk Oblast Description":"Omskas, Tara, Isilkulis",
-"Russia_Orenburg Oblast Description":"Orenburgas, Orskas, Novotroickas",
-"Russia_Oryol Oblast Description":"Oriolas, Livnos, Mcenskas",
-"Russia_Penza Oblast Description":"Penza, Kuzneckas, Zarečnas",
-"Russia_Perm Krai_North Description":"Bereznikai, Solikamskas, Lysva",
-"Russia_Perm Krai_South Description":"Permė, Čaikovskis, Kungūras",
-"Russia_Primorsky Krai Description":"Vladivostokas, Usurijskas, Nachodka",
-"Russia_Pskov Oblast Description":"Pskovas, Didieji Lukai, Ostrovas",
-"Russia_Republic of Dagestan Description":"Machačkala, Chasaviurtas, Derbentas",
-"Russia_Republic of Kalmykia Description":"Elista, Laganas, Cagan Amanas",
-"Russia_Republic of Karelia_North Description":"Kostomukša, Segeža, Kemė",
-"Russia_Republic of Karelia_South Description":"Petrozavodskas, Kondopoga, Sortavala",
-"Russia_Republic of Mordovia Description":"Saranskas, Ruzajevka, Kovylkinas",
-"Russia_Rostov Oblast Description":"Rostovas prie Dono, Taganrogas, Šachtos",
-"Russia_Ryazan Oblast Description":"Riazanė, Kasimovas, Skopinas",
-"Russia_Saint Petersburg Description":"Sankt Peterburgas, Kolpinas, Puškinas",
-"Russia_Sakha Republic Description":"Jakutskas, Neriungris, Mirnas",
-"Russia_Sakhalin Oblast Description":"Južno Sachalinskas, Korsakovas, Cholmskas",
-"Russia_Samara Oblast Description":"Samara, Toljatis, Syzranė",
-"Russia_Saratov Oblast Description":"Saratovas, Engelsas. Balakovas",
-"Russia_Smolensk Oblast Description":"Smolenskas, Viazma, Roslavlis",
-"Russia_Stavropol Krai Description":"Stavropolis, Piatigorskas, Kislovodskas",
-"Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Jekaterinburgas, Uralo Kamenskas, Pervouralskas",
-"Russia_Sverdlovsk Oblast_North Description":"Žemutinis Tagilas, Serovas, Novouralskas",
-"Russia_Tambov Oblast Description":"Tambovas, Mičiurinskas, Raskazovas",
-"Russia_Tatarstan Description":"Kazanė, Naberežnyje Čelnai, Nižnekamskas",
-"Russia_Tomsk Oblast Description":"Tomskas, Severskas, Streževojus",
-"Russia_Tula Oblast Description":"Tula, Novomoskovskas, Donskojus",
-"Russia_Tuva Description":"Kyzylas, Ka Chemas, Ak Dovurakas",
-"Russia_Tver Oblast Description":"Tverė, Rževas, Vyšnij Voločiokas",
-"Russia_Tyumen Oblast Description":"Tiumenė, Tobolskas, Išimas",
-"Russia_Udmurt Republic Description":"Iževskas, Sarapulas, Votkinskas",
-"Russia_Ulyanovsk Oblast Description":"Uljanovskas, Dimitrovgradas, Inza",
-"Russia_Vladimir Oblast Description":"Vladimiras, Kovrovas, Muromas",
-"Russia_Volgograd Oblast Description":"Volgogradas, Volžskis, Kamyšinas",
-"Russia_Vologda Oblast Description":"Vologda, Čerepovecas, Sokolas",
-"Russia_Voronezh Oblast Description":"Voronežas, Borisoglebskas, Rosošė",
-"Russia_Yamalo-Nenets Autonomous Okrug Description":"Naujasis Urengojus, Nojabrskas, Salechardas",
-"Russia_Yaroslavl Oblast Description":"Jaroslavlis, Rybinskas, Pereslavlis Zaleskis",
-"Russia_Yugra_Khanty Description":"Chanty Mansijskas, Niaganė, Urajus",
-"Russia_Yugra_Surgut Description":"Surgutas, Nižnevartovskas, Neftejuganskas",
-"Russia_Zabaykalsky Krai Description":"Čita, Krasnokamenskas, Borzia",
-"Rwanda Description":"Kigalis, Gisenis, Hujė",
-"Saint Barthelemy Description":"Gustavija",
-"Saint Helena Ascension and Tristan da Cunha Description":"Džeimstaunas, Half Tri Holou, Džordžtaunas",
-"Saint Kitts and Nevis Description":"Basteras, Čarlstaunas, Niukaslas",
-"Saint Lucia Description":"Kastris, Sufrieras",
-"Saint Martin Description":"Filipsburgas, Kul de Sakas, Kol Bėjus",
-"Saint Vincent and the Grenadines Description":"Kingstaunas, Kliftonas, Aštonas",
-"Samoa Description":"Apija, Salelolonga, Asau",
-"San Marino Description":"San Marinas, Seravalė, Borgo Madžorė",
-"Sao Tome and Principe Description":"San Tomė, Nevesas, San Žouan dos Angolarės",
-"Saudi Arabia_North Description":"Džida, Meka, Medina",
-"Saudi Arabia_South Description":"Rijadas, Hufufas, Damamas",
-"Senegal Description":"Dakaras, Pikinė, Fatikas",
-"Serbia Description":"Belgradas, Novi Sadas, Nišas",
-"Seychelles Description":"Viktorija, Por Lonė, Bel Ombras",
-"Sierra Leone Description":"Fritaunas, Bo, Kambija",
-"Singapore Description":"Singapūras, Ladangas, Roki Hilas",
-"Slovakia_Region of Banska Bystrica Description":"Banska Bistrica, Zvolenas, Lučenecas",
-"Slovakia_Region of Bratislava Description":"Bratislava, Petržalka, Ružinovas",
-"Slovakia_Region of Kosice Description":"Košicė, Gelnica, Michalovcė",
-"Slovakia_Region of Nitra Description":"Nitra, Nove Zamkai",
-"Slovakia_Region of Presov Description":"Prešovas, Popradas, Humenė",
-"Slovakia_Region of Trencin Description":"Trenčynas, Prievidza, Považska Bistrica",
-"Slovakia_Region of Trnava Description":"Trnava, Pieštianai",
-"Slovakia_Region of Zilina Description":"Žilina, Martinas, Liptovsky Mikulašas",
-"Slovenia_East Description":"Mariboras, Dobova, Kisovecas",
-"Slovenia_West Description":"Liubliana, Jagodė, Naklas",
-"Solomon Islands Description":"Buala, Lata, Honiara",
-"Somalia Description":"Mogadišas, Barderė, Baidoa",
-"South Africa_Eastern Cape Description":"Port Elizabetas, Greihamstaunas, Mtata",
-"South Africa_Free State Description":"Bočabelas, Taba Nčo, Velkomas",
-"South Africa_Gauteng Description":"Johanesburgas, Pretorija, Sovetas",
-"South Africa_KwaZulu-Natal Description":"Durbanas, Leidismitas, Pitermaricburgas",
-"South Africa_Limpopo Description":"Mokopanė, Luis Trichartas, Polokvanė",
-"South Africa_Mpumalanga Description":"Emalahlenis, Nelspreitas, Sekunda",
-"South Africa_North West Description":"Mafikengas, Rustenburgas, Klerksdorpas",
-"South Africa_Northern Cape Description":"Apingtonas, Kimberlis, Pofaderis",
-"South Africa_Western Cape Description":"Keiptaunas, Mitchels Pleinas, Kajeliča",
-"Maldives Description":"Feridu, Malė, Digiri",
-"South Georgia and the South Sandwich Islands Description":"Hasvikas, King Edvard Pointas, Gritvikenas",
-"South Korea_North Description":"Seulas, Inčonas, Dedžonas",
-"South Korea_South Description":"Busanas, Degu, Čangvonas",
-"South Ossetia Description":"Cchinvalis, Chumsarta, Čitianis",
-"South Sudan Description":"Džuba, Jambijus, Leras",
-"Spain_Andalusia_Granada Description":"Granada, Almerija, Chaenas",
-"Spain_Andalusia_Sevilla Description":"Malaga, Sevilija, Kordoba, Huelva, Kadisas",
-"Spain_Aragon Description":"Saragosa, Teruelis, Hueska",
-"Spain_Balearic Islands Description":"Maljorkos Palma, Ibisa, Santa Eularija des Riu",
-"Spain_Basque Country Description":"Bilbao, Vitorija-Gasteisas, Donostija-San Sebastianas",
-"Spain_Canary Islands Description":"Gran Kanarijos Las Palmas, Tenerifės Santa Krusas, Aresifė",
-"Spain_Cantabria Description":"Santanderas, Torelavega, Kastro Urdialesas",
-"Spain_Castile and Leon_East Description":"Burgosas, Valjadolidas, Palensija, Sorija, Segovija",
-"Spain_Castile and Leon_West Description":"Salamanka, Leonas, Zamora, Avila",
-"Spain_Castile-La Mancha Description":"Albasetė, Gvadalachara, Toledas, Siudad Realis, Kuenka",
-"Spain_Catalonia_Provincia de Barcelona Description":"Barselona, Ljobregato l’Hospitaletas, Badalona",
-"Spain_Catalonia_Provincia de Girona Description":"Žirona, Figeresas, Blanesas",
-"Spain_Catalonia_Provincia de Lleida Description":"Lerida, Moljerusa, Balageras",
-"Spain_Catalonia_Provincia de Tarragona Description":"Taragona, Reusas, el Vendrelis",
-"Spain_Ceuta Description":"Seuta",
-"Spain_Community of Madrid Description":"Madridas, Mostolesas, Alkala del Henaresas",
-"Spain_Comunidad Foral de Navarra Description":"Pamplona, Tudela, Estelja",
-"Spain_Extremadura Description":"Badachosas, Merida, Kaseresas",
-"Spain_Galicia_North Description":"A Korunja, Lugas, Santjago de Kompostela",
-"Spain_Galicia_South Description":"Vigas, Ourensė, Pontevedra",
-"Spain_La Rioja Description":"Logronjas, Arnedas, Kalahora",
-"Spain_Melilla Description":"Melilja",
-"Spain_Principado de Asturias Description":"Ovjedas, Chichonas, Avilesas",
-"Spain_Region de Murcia Description":"Mursija, Kartachena, Lorka",
-"Spain_Valencian Community Description":"Valensija, Alikantė, Kasteljon de la Plana",
-"Sri Lanka Description":"Kolombas, Kandis, Rambukana",
-"Sudan_East Description":"Port Sudanas, Kasala, al Chavata",
-"Sudan_West Description":"Chartumas, Omdurmanas, Niala",
-"Suriname Description":"Paramaribas, Groningenas, Brokopondas",
-"Swaziland Description":"Mbabanė, Sidvokodvas, Bulembu",
-"Sweden_Bergslagen Description":"Erebru, Jevlė, Karlstadas",
-"Sweden_Malardalen Description":"Upsala, Vesterosas, Eskilstiuna",
-"Sweden_Mellannorrland Description":"Sundsvalis, Estešundas, Ernšioldsvikas",
-"Sweden_Norra Sverige Description":"Umeo, Liuleo, Piteo",
-"Sweden_Ostra Gotaland Description":"Linšiopingas, Noršiopingas, Jonšiopingas",
-"Sweden_Sodra Gotaland Description":"Malmė, Helsingborgas, Lundas",
-"Sweden_Stockholm Description":"Stokholmas, Hudingė, Naka",
-"Sweden_Vastra Gotaland Description":"Gotenbergas, Burosas, Miolndalis",
-"Switzerland_Central Description":"Liucerna, Cugas, Zarnenas, Štansas, Altdorfas, Švicas",
-"Switzerland_Eastern Description":"Kūras, Sankt Galenas, Herizau, Apencelis, Frauenfeldas, Glarusas, Šafhauzenas",
-"Switzerland_Espace Mittelland_Bern Description":"Bernas, Fribūras, Zoloturnas, Nešatelis, Delemonas, Bylis, Oltenas",
-"Switzerland_Espace Mittelland_East Description":"Tunas, Interlakenas, Langentalis",
-"Switzerland_Lake Geneva region Description":"Ženeva, Lozana, Sionas",
-"Switzerland_Northwestern Description":"Bazelis, Lystalis, Arau",
-"Switzerland_Ticino Description":"Belincona, Luganas, Lokarnas",
-"Switzerland_Zurich Description":"Ciurichas, Vintertūras",
-"Syria Description":"Damaskas, Alepas, Chomsas",
-"Taiwan_North Description":"Taibėjus, Taojuanas, Taidžongas",
-"Taiwan_South Description":"Gaosiongas, Tainanas, Dziaji",
-"Tajikistan Description":"Dušanbė, Chudžandas, Šahrinavas",
-"Tanzania Description":"Dar es Salamas, Dodoma, Kigoma",
-"Thailand_Central Description":"Nam Somas, Nakon Ratčasima, Udon Tanis",
-"Thailand_North Description":"Čiang Majus, Santi Sukas, Me Ai",
-"Thailand_South Description":"Bankokas, Nontabūris, Čau Praja Surasakas",
-"The Bahamas Description":"Nasau, Friportas, Tarpum Bėjus",
-"The Gambia Description":"Bandžulis, Serekunda, Vasu",
-"Togo Description":"Lomė, Dapaongas, Niamtugu",
-"Tonga Description":"Nukualofa, Maufanga, Nejafu",
-"Trinidad and Tobago Description":"Port of Speinas, San Fernandas, Čaguanasas",
-"Tunisia Description":"Tunisas, Sfaksas, Arjana",
-"Turkey_Aegean Region Description":"Izmyras, Denizlis, Muhla",
-"Turkey_Black Sea Region Description":"Bolu, Samsūnas, Trabzonas",
-"Turkey_Central Anatolia Region_Ankara Description":"Ankara, Eskišechyras, Konija",
-"Turkey_Central Anatolia Region_Kayseri Description":"Kiršechyras, Sivasas, Nevšechyras",
-"Turkey_Eastern Anatolia Region Description":"Mušas, Ahris, Vanas",
-"Turkey_Marmara Region_Bursa Description":"Bursa, Čanakalė, Jalova",
-"Turkey_Marmara Region_Istanbul Description":"Stambulas, Edirnė, Tekirdahas",
-"Turkey_Mediterranean Region Description":"Antalija, Burdūras, Antakija",
-"Turkey_Southeastern Anatolia Region Description":"Gaziantepas, Šanliurfa, Adijamanas",
-"Turkmenistan Description":"Ašchabadas, Dašogūzas, Tiurkmenabatas",
-"Turks and Caicos Islands Description":"Kokbern Taunas, Providensialesas, Kokbern Harboras",
-"Tuvalu Description":"Funafutis, Vajaku, Tokelau",
-"UK_England_East Midlands Description":"Notingamas, Lesteris, Derbis",
-"UK_England_East of England_Essex Description":"Lutonas, Kolčesteris, Pajūrio Sautendas",
-"UK_England_East of England_Norfolk Description":"Norvičas, Piterboras, Kembridžas",
-"UK_England_Greater London Description":"Londonas, Kroidonas, Ilfordas",
-"UK_England_North East England Description":"Sanderlandas, Niukaslas prie Taino",
-"UK_England_North West England_Lancaster Description":"Blakpulas, Vaitheivenas, Egremontas",
-"UK_England_North West England_Manchester Description":"Mančesteris, Liverpulis, Salfordas",
-"UK_England_South East_Brighton Description":"Braitonas, Rojal Tanbridž Velsas, Meidstonas",
-"UK_England_South East_Oxford Description":"Sautamptonas, Milton Keinsas, Portsmutas",
-"UK_England_South West England_Bristol Description":"Bristolis, Batas, Bornmutas",
-"UK_England_South West England_Cornwall Description":"Plimutas, Ekseteris, Sent Aivsas",
-"UK_England_West Midlands Description":"Birmingamas, Koventris, Vulverhamptonas",
-"UK_England_Yorkshire and the Humber Description":"Šefildas, Veikfildas, Bradfordas",
-"UK_Northern Ireland Description":"Niūris, Belfastas, Londonderis/Deris",
-"UK_Scotland_North Description":"Aberdynas, Dandi, Tobermoris",
-"UK_Scotland_South Description":"Glazgas, Edinburgas, Milportas",
-"UK_Wales Description":"Kardifas,Svonsis, Niuportas",
-"US_Alabama_Birmingham Description":"Vorioras, Vesteivia Hilsas, Skotsboras",
-"US_Alabama_Montgomery Description":"Kreola, Sentervilis, Valis",
-"US_Alaska Description":"Skamon Bėjus, Makgratas, Fort Veinraitas",
-"US_Arizona_Flagstaff Description":"Kotonvudas, Holbrukas, Šou Lou",
-"US_Arizona_Phoenix Description":"Finiksas, Mesa",
-"US_Arizona_Tucson Description":"Tusonas, Saut Tusonas, Bisbis",
-"US_Arkansas_North Description":"Vordas, Kabotas, Des Arkas",
-"US_Arkansas_South Description":"Stampsas, Rokportas",
-"US_California_Bakersfield_Bakersfield Description":"Arojo Grandė, Pismo Bičas, Marikopa",
-"US_California_Bakersfield_Lancaster Description":"Hespirija, Big Ber Leikas, Holtvilis",
-"US_California_Chico Description":"Teheima, Kloverdeilis",
-"US_California_LA Description":"Los Andželas, Long Bičas, Rosmidas",
-"US_California_LA North Description":"Santa Barbara, Ohajus, Avalonas",
-"US_California_Redding Description":"Ferndeilis, Rio Delis, Arkeita",
-"US_California_Sacramento_Fresno Description":"Fresnas, Selma, Bišopas",
-"US_California_Sacramento_Sacramento Description":"Sakramentas, Vakarų Sakramentas, Plaservilis",
-"US_California_Sacramento_Stockton Description":"Siresas, Ajounas, Treisis",
-"US_California_San Diego Description":"San Diegas, San Markosas, Baningas",
-"US_California_Santa_Clara_Palo Alto Description":"San Chosė, San Fransiskas, Los Altosas",
-"US_California_Santa_Clara_Santa Cruz Description":"Sisaidas, Gonsalesas",
-"US_Colorado_Aspen Description":"Sentral Sitis, Blak Hokas, Vudland Parkas",
-"US_Colorado_Denver Description":"Denveris, Kolorado Springsas, Komers Sitis",
-"US_Colorado_South Description":"Salaida, Volsenbergas, Las Animasas",
-"US_Connecticut Description":"Ist Heivenas, Grotonas, Tomastonas",
-"US_Delaware Description":"Sifordas, Rehobet Bičas, Milfordas",
-"US_Florida_Gainesville Description":"Geinsvilis, Palm Bėjus, Melburnas",
-"US_Florida_Jacksonville Description":"Džeksonvilis, Panama Siti Bičas, Lin Heivenas",
-"US_Florida_Miami Description":"Majamis, Marko Ailandas, Fort Loderdeilis",
-"US_Florida_Orlando Description":"Orlandas, Deltona, Kisimis",
-"US_Florida_Tampa Description":"Oldsmaras, Tampa, Sent Pitersbergas",
-"US_Georgia_Atlanta Description":"Atlanta, Čamblis, Volnat Grovas",
-"US_Georgia_Macon Description":"Grovtaunas, Peris, Baironas",
-"US_Georgia_North Description":"Emersonas, Džefersonas, Kartersvilis",
-"US_Georgia_South Description":"De Sotas, Santa Klausas, Pirsonas",
-"US_Guam Description":"Dededas, Tumonas, San Chosė",
-"US_Hawaii Description":"Hilas, Kailua-Kona, Kahulujis",
-"US_Idaho_North Description":"Hiuteris, Pekas, Heidenas",
-"US_Idaho_South Description":"Arkas, Midltonas, Grinlifas",
-"US_Illinois_Chickago Description":"Čikaga, Palos Hilsas, Park Sitis",
-"US_Illinois_Elgin Description":"Dženyva, Kantri Klab Hilsas, Vitonas",
-"US_Illinois_Rockford Description":"Prinstonas, Profetstaunas, Molinas",
-"US_Illinois_South Description":"Keisis, Vamakas, Maunt Vernonas",
-"US_Illinois_Springfield Description":"Maunt Pulaskis, Leikonas, Kevanis",
-"US_Indiana_Evansville Description":"Rokportas, Niu Olbanis, Prinstonas",
-"US_Indiana_Indianapolis Description":"Indianapolis, Konersvilis, Grinsbergas",
-"US_Indiana_North Description":"Elvudas, Kokomas, Vaitingas",
-"US_Iowa_Des Moines Description":"Indianola, Sleiteris, Martensdeilas",
-"US_Iowa_Waterloo Description":"Diksonas, Floidas, Elma",
-"US_Iowa_West Description":"Čerdenas, Orindž Sitis, Patonas",
-"US_Kansas_East Description":"Benediktas, Kofivilis, Severansas",
-"US_Kansas_West Description":"Bar Oukas, Hanteris, Randolfas",
-"US_Kansas_Wichita Description":"Vaitvoteris, Sidar Pointas, Sabletas",
-"US_Kentucky_East Description":"Haidenas, Stantonas, Painvilis",
-"US_Kentucky_Louisville Description":"Luisvilis, Fordvilis, Sent Matjusas",
-"US_Kentucky_West Description":"Marionas, Koridonas, Barlou",
-"US_Louisiana_Central Description":"Painvilis, Marksvilis, Bankis",
-"US_Louisiana_New Orleans Description":"Bogalusa, Gonsalesas, Plakminas",
-"US_Maine Description":"Vestbrukas, Brueris, Saut Portlandas",
-"US_Maryland_Baltimore Description":"Baltimorė, Pokomok Sitis, Krisfildas",
-"US_Maryland_and_DC Description":"Vašingtonas, Geitersbergas, Bovis",
-"US_Massachusetts_Boston Description":"Bostonas, Louelis, Keimbridžas",
-"US_Massachusetts_Central Description":"Fičbergas, Sautbridžas, Leminsteris",
-"US_Massachusetts_Plymouth Description":"Broktonas, Niu Bedfordas, Fol Riveris",
-"US_Massachusetts_Southeastern Description":"Barnstablis, Falmutas, Jarmutas",
-"US_Massachusetts_West Description":"Grinfildas, Springfildas",
-"US_Michigan_Detroit Description":"Detroitas, Hemtremikas, Kigo Harboras",
-"US_Michigan_Grand Rapids Description":"Mantonas, Vaitholas, Maskigonas",
-"US_Michigan_Lansing Description":"Bertonas, Lapyras, Tovas Sitis",
-"US_Michigan_North Description":"Kaspianas, Airon Mauntinas, Gastra",
-"US_Minnesota_Minneapolis Description":"Lindstromas, Forest Leikas, Grinfildas",
-"US_Minnesota_North Description":"Erskinas, Galis, Hakensakas",
-"US_Minnesota_Rochester Description":"Arkas, Niu Obernas, Velkamas",
-"US_Minnesota_Saint Cloud Description":"Brutenas, Santa Roza, Dženoula",
-"US_Mississippi_Gulfport Description":"D'Ibervilis, Ošen Springsas, Lusdeilis",
-"US_Mississippi_North Description":"Roling Forkas, Lilandas, Kolinsas",
-"US_Missouri_East Description":"Skot Sitis, Elingtonas, Vaibernemas",
-"US_Missouri_Kansas Description":"Kanzas Sitis, Beltonas, Galatinas",
-"US_Missouri_Springfield Description":"Konvėjus, Oseola, Batlfildas",
-"US_Missouri_St Louis Description":"Kvin Sitis, La Greindžas, Fultonas",
-"US_Montana_East Description":"Harlemas, Hobsonas, Kolstripas",
-"US_Montana_West Description":"Kat Bankas, Kalispelis, Šelbis",
-"US_Nebraska_East Description":"Omaha, Stantonas, Poni Sitis",
-"US_Nebraska_West Description":"Basetas, Long Painas, Blumfildas",
-"US_Nevada Description":"Las Vegasas, Vinemaka, Kaljentė",
-"US_New Hampshire Description":"Somersvertas, Lakonija, Franklinas",
-"US_New Jersey_North Description":"Hakensakas, Garfildas, Lambertvilis",
-"US_New Jersey_South Description":"Absikonas, Long Brančas, Margeit Sitis",
-"US_New Mexico_Albuquerque Description":"Albukerkė, Ratonas, Blumfildas",
-"US_New Mexico_Roswell Description":"Junisas, Sokoras, Džalas",
-"US_New York_East Description":"Brukheivenas, Niu Rošelis, Maunt Vernonas",
-"US_New York_New York Description":"Niujorkas, Invudas",
-"US_New York_North Description":"Kohousas, Skenektadis, Bikonas",
-"US_New York_West Description":"Osvigas, Džeimstaunas, Nort Tonavanda",
-"US_North Carolina_Asheville Description":"Morgantonas, Brevardas, Marionas",
-"US_North Carolina_Charlotte Description":"Šarlotė, Šelbis, Steitsvilis",
-"US_North Carolina_Greensboro Description":"Tomasvilis, Hamletas, Albemarlas",
-"US_North Carolina_Raleigh Description":"Rolis, Roksboras, Greihamas",
-"US_North Carolina_Wilmington Description":"Klintonas, Boiling Spring Leiksas, Lorinbergas",
-"US_North Carolina_Wilson Description":"Niu Bernas, Havlokas, Elizabet Sitis",
-"US_North Dakota_Bismarck Description":"Zapas, Ryderis, Stantonas",
-"US_North Dakota_East Description":"Harvudas, Kavalyras, Lakota",
-"US_North Dakota_Minot Description":"Makotis, Boudonas, Kreimeris",
-"US_Ohio_Cincinnati Description":"Sent Bernardas, Sentervilis, Madeira",
-"US_Ohio_Cleveland Description":"Stritsboras, Vilebi Hilsas, Eivon Leikas",
-"US_Ohio_Columbus Description":"Kolambusas, Pikeringtonas, Renoldsbergas",
-"US_Ohio_Toledo Description":"Bjusairusas, Krestlainas, Momi",
-"US_Oklahoma_East Description":"Ada, Koulgeitas, Konova",
-"US_Oklahoma_Oklahoma Description":"Oklahoma Sitis, Noblas, Del Sitis",
-"US_Oklahoma_Tulsa Description":"Šidleris, Pragas, Begsas",
-"US_Oklahoma_West Description":"Čerokis, Tomasas, Peris",
-"US_Oregon_Eugene Description":"Olbanis, Medfordas, Kus Bėjus",
-"US_Oregon_Portland Description":"Seilemas, Niuportas, Gaverment Kampas",
-"US_Oregon_West Description":"Bendas, Dalsas, Klamat Folsas",
-"US_Pennsylvania_Central Description":"Du Boisas, Sent Merisas, Latroubas",
-"US_Pennsylvania_Pittsburgh Description":"Niu Kensingtonas, Junjontaunas, Monongahila",
-"US_Pennsylvania_Reading Description":"Filadelfija, Koutsvilis, Redingas",
-"US_Pennsylvania_Scranton Description":"Karbondeilis, Pitstonas, Viljamsportas",
-"US_Puerto Rico Description":"San Chuanas, Majagvesas, Ponsė",
-"US_Rhode Island Description":"Naragansetas, Providensas, Vorikas",
-"US_South Carolina_Charleston Description":"Barnvelis, GusKrikas, Foli Bičas",
-"US_South Carolina_Columbia Description":"Beltonas, Travelers Restas, Valhala",
-"US_South Carolina_Florence Description":"Tega Kėjus, Bišopvilis, Džonsonvilis",
-"US_South Dakota Description":"Airinė, Sentervilis, Boltikas",
-"US_Tennessee_East Description":"Pidžen Fordžas, Selaina, Frendsvilis",
-"US_Tennessee_West Description":"Memfis, Našvilis, Medaina",
-"US_Texas_Amarillo Description":"Pampa, Džolis, Hauardvikas",
-"US_Texas_Austin Description":"Ostinas, Hato, Beltonas",
-"US_Texas_Dallas Description":"Dalasas, Fort Vertas, Rouletas",
-"US_Texas_Houston Description":"Hjustonas, Sibrukas, Plam Grovas",
-"US_Texas_Lubbock Description":"Sudanas, Rolsas, Goris",
-"US_Texas_San Antonio Description":"San Antonijus, Rokportas, Matisas",
-"US_Texas_Southwest Description":"Likis, Kamp Vudas, Karizo Springsas",
-"US_Texas_Tyler Description":"Trupas, Kotonvudas, Feitas",
-"US_Texas_Victoria Description":"Nidervaldas, Lokhartas, Palasjosas",
-"US_Texas_Wako Description":"Kalvertas, Golinda, Brusvilis-Edis",
-"US_Texas_West Description":"El Pasas, Vestbrukas, Stantonas",
-"US_United States Minor Outlying Islands Description":"Lulu Taunas, Milersvilis",
-"US_Utah_North Description":"Holadėjus, Saut, Ogdenas, Maris",
-"US_Utah_South Description":"Parovanas, Hildeilis, Inokas",
-"US_Vermont Description":"Sent Olbansas, Baris, Saut Berlingtonas",
-"US_Virginia_Alexandria Description":"Ferfaksas, Frederiksbergas, Fols Čerčas",
-"US_Virginia_Lynchburg Description":"Linčbergas, Bedfordas, Stantonas",
-"US_Virginia_Norfolk Description":"Virdžinija Bičas, Pokosonas, Franklinas",
-"US_Virginia_Richmond Description":"Emporija, Kolonial Haitsas, Ričmondas",
-"US_Virginia_Roanoke Description":"Geilaksas, Nortonas, Radfordas",
-"US_Washington_Coast Description":"Reimondas, Kamasas, Port Taunsendas",
-"US_Washington_Seattle Description":"Sietlas, Edmondsas, Saltanas",
-"US_Washington_Yakima Description":"Pulmanas, Grand Kuli, Vait Salmonas",
-"US_West Virginia Description":"Stounvudas, Blufildas, Malensas",
-"US_Wisconsin_Eau Claire Description":"Djurandas, Fountin Sitis, River Folsas",
-"US_Wisconsin_Madison Description":"Edžertonas, Mineral Pointas, Brodhedas",
-"US_Wisconsin_Milwaukee Description":"Milvokis, Leik Milsas, Briljonas",
-"US_Wisconsin_North Description":"Monrealis, Tomahokas, Marinetas",
-"US_Wyoming Description":"Vorlandas, Rolinsas, Kemereris",
-"Uganda Description":"Kampala, Jumbė, Kanonis",
-"Ukraine_Cherkasy Oblast Description":"Čerkasai, Umanė, Smila",
-"Ukraine_Chernihiv Oblast Description":"Černihivas, Nižynas, Prylukai",
-"Ukraine_Chernivtsi Oblast Description":"Černivciai, Storožynecis, Zastavna",
-"Ukraine_Dnipropetrovsk Oblast Description":"Dniepras, Kryvyj Rihas, Kamjanskė",
-"Ukraine_Donetsk Oblast Description":"Doneckas, Mariupolis, Makijivka",
-"Ukraine_Ivano-Frankivsk Oblast Description":"Ivano Frankivskas, Kalušas, Kolomyja",
-"Ukraine_Kharkiv Oblast Description":"Charkivas, Lozova, Kupjanskas",
-"Ukraine_Kherson Oblast Description":"Chersonas, Naujoji Kachovka, Naddniprianskė",
-"Ukraine_Khmelnytskyi Oblast Description":"Chmelnyckis, Podolės Kamenecas, Šepetivka",
-"Ukraine_Kirovohrad Oblast Description":"Kropyvnyckis, Oleksandrija, Svitlovodskas",
-"Ukraine_Kyiv Oblast Description":"Kyjivas, Bila Cerkva, Brovarai",
-"Ukraine_Luhansk Oblast Description":"Luhanskas, Alčevskas, Siverskodoneckas",
-"Ukraine_Lviv Oblast Description":"Lvivas, Sambiras, Drohobyčas",
-"Ukraine_Mykolaiv Oblast Description":"Mykolajivas, Pervomaiskas, Južnoukrajinskas",
-"Ukraine_Odessa Oblast Description":"Odesa, Izmajilas, Čornomorskas",
-"Ukraine_Poltava Oblast Description":"Poltava, Kremenčukas, Komsomolskas",
-"Ukraine_Rivne Oblast Description":"Rivnė, Varašas (Kuznecovskas), Dubnas",
-"Ukraine_Sumy Oblast Description":"Sumai, Konotopas, Šostka",
-"Ukraine_Ternopil Oblast Description":"Ternopilis, Čortkivas, Kremenecis",
-"Ukraine_Vinnytsia Oblast Description":"Vinycia, Vorošylivka, Žmerynka",
-"Ukraine_Volyn Oblast Description":"Luckas, Kovelis, Novovolynskas",
-"Ukraine_Zakarpattia Oblast Description":"Užhorodas, Mukačevė, Chustas",
-"Ukraine_Zaporizhia Oblast Description":"Zaporižia, Melitopolis, Berdianskas",
-"Ukraine_Zhytomyr Oblast Description":"Žytomyras, Berdyčivas, Korostenis",
-"United Arab Emirates Description":"Abu Dabis, Dubajus, Adžmanas",
-"United States Virgin Islands Description":"Frederikstedas, Krisčenstedas",
-"Uruguay Description":"Montevidėjas, Siudad de la Kosta, Saltas",
-"Uzbekistan Description":"Taškentas, Kukonas, Namanganas",
-"Vanuatu Description":"Port Vila, Vao, Saratamata",
-"Venezuela_North Description":"Valensija, Barkisimetas, Marakajus",
-"Venezuela_South Description":"Marakaibas, Siudad Gvajana, San Kristobalis",
-"Vietnam Description":"Hanojus, Hošiminas, Vung Tau",
-"Wallis and Futuna Description":"Mata Utu, Fiua, Tavai",
-"Yemen Description":"Sana, Adenas",
-"Zambia Description":"Lusaka, Kitvė, Ndola",
-"Zimbabwe Description":"Hararė, Hvangė, Masvingas",
-"Bosnia and Herzegovina Short":"Bosnija ir Hercogovina",
-"Argentina_Buenos Aires_North Short":"Buenos Airės",
-"Argentina_Buenos Aires_South Short":"Buenos Airės",
-"Austria_Lower Austria_West Short":"Žemutinė Austrija",
-"Brazil_Southeast Region_Minas Gerais_North Short":"Minas Žeraisas",
-"Brazil_Southeast Region_Sao Paulo_West Short":"San Paulas",
-"Czech_Stredni Cechy_East Short":"Vidurio Čekijos kraštas",
-"Czech_Stredni Cechy_West Short":"Vidurio Čekijos kraštas",
-"Germany_Brandenburg_North Short":"Brandenburgas",
-"Germany_Brandenburg_South Short":"Brandenburgas",
-"Germany_Rhineland-Palatinate_South Short":"Reino kraštas-Pfalcas",
-"Mexico_Central_East Short":"Nuevo Leonas",
-"Mexico_Central_West Short":"Najaritas",
-"Netherlands_Gelderland_North Short":"Gelderlandas",
-"Norway_Central Short":"Oslas",
-"Philippines_Luzon_North Short":"Lusonas",
-"Philippines_Luzon_South Short":"Lusonas",
-"Romania_North_East Short":"Šiaurės rytų regionas",
-"Romania_North_West Short":"Šiaurės vakarų regionas",
-"Romania_South Short":"Pietų regionas",
-"Romania_South_East Short":"Pietryčių regionas",
-"Romania_South_West Short":"Pietvakarių regionas",
-"Romania_West Short":"Vakarų regionas",
-"Russia_Arkhangelsk Oblast_Central Short":"Archangelsko sritis",
-"Russia_Arkhangelsk Oblast_North Short":"Archangelsko sritis",
-"Switzerland_Central Short":"Vidurio Šveicarija",
-"UK_Scotland_North Short":"Škotija",
-"UK_Scotland_South Short":"Škotija",
-"Brazil_Goias_North Short":"Gojasas",
-"Brazil_North Region_East Short":"Šiaurės regionas",
-"Brazil_North Region_West Short":"Šiaurės regionas",
-"Brazil_Northeast Region_East Short":"Šiaurės rytų regionas",
-"Brazil_Northeast Region_West Short":"Šiaurės rytų regionas",
-"Brazil_Parana_East Short":"Parana",
-"Brazil_Parana_West Short":"Parana",
-"Brazil_South Region_East Short":"Pietų regionas",
-"Brazil_South Region_West Short":"Pietų regionas",
-"Finland_Eastern Finland_North Short":"Rytų Suomija",
-"Finland_Eastern Finland_South Short":"Rytų Suomija",
-"France_Free County_North Short":"Franš Kontė",
-"France_Free County_South Short":"Franš Kontė",
-"India_Karnataka_North Short":"Karnataka",
-"India_Karnataka_South Short":"Karnataka",
-"Russia_Krasnoyarsk Krai_North Short":"Krasnojarsko kraštas",
-"Russia_Krasnoyarsk Krai_South Short":"Krasnojarsko kraštas",
-"Russia_Moscow Oblast_East Short":"Maskvos sritis",
-"Russia_Moscow Oblast_West Short":"Maskvos sritis",
-"Russia_Perm Krai_North Short":"Permės sritis",
-"Russia_Perm Krai_South Short":"Permės sritis",
-"Russia_Republic of Karelia_North Short":"Karelija",
-"Russia_Republic of Karelia_South Short":"Karelija",
-"Russia_Sverdlovsk Oblast_North Short":"Sverdlovsko sritis",
-"Spain_Castile and Leon_East Short":"Kastilija ir Leonas",
-"Spain_Castile and Leon_West Short":"Kastilija ir Leonas",
-"Switzerland_Espace Mittelland_East Short":"Vidurio erdvė",
-"Anguilla Description":"Valis, Džordž Hilis, Stounei Graundas",
-"Cook Islands Description":"Rarotonga, Avarua, Kimiangatau",
-"Sahrawi Arab Democratic Republic Description":"La Guyra, Tfaritis, Mijekas"
+"Palestine Region Short":"Palestina"
 }
--- a/data/countries-strings/nb.json/localize.json
+++ b/data/countries-strings/nb.json/localize.json
@@ -9,7 +9,7 @@
 "Andorra":"Andorra",
 "Angola":"Angola",
 "Anguilla":"Anguilla",
-"Antarctica":"Antarktis",
+"Antarctica":"Antarktika",
 "Antigua and Barbuda":"Antigua og Barbuda",
 "Argentina":"Argentina",
 "Argentina_Buenos Aires_North":"Buenos Aires — Nord",
--- a/data/countries-strings/ro.json/localize.json
+++ b/data/countries-strings/ro.json/localize.json
@@ -568,8 +568,8 @@
 "Italy_Sardinia":"Sardinia",
 "Italy_Sicily":"Sicilia",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Tirolul de Sud",
-"Italy_Tuscany_Grosseto":"Toscana — Sud-Est",
-"Italy_Tuscany_Massa e Carrara":"Toscana — Nord-Vest",
+"Italy_Tuscany_Grosseto":"Toscana — Provincia Grosseto",
+"Italy_Tuscany_Massa e Carrara":"Toscana — Provincia Massa-Carrara",
 "Italy_Umbria":"Umbria",
 "Italy_Veneto":"Veneto",
 "Italy_Veneto_Belluno":"Provincia Belluno",
@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Kathmandu",
-"Nepal_Madhyamanchal":"Regiunea de dezvoltare centrală",
-"Nepal_Purwanchal":"Regiunea de dezvoltare estică",
+"Nepal_Madhyamanchal":"Regiunea centrală",
+"Nepal_Purwanchal":"Regiunea estică",
 "Nigeria_North":"Nigeria — Nord",
 "Nigeria_South":"Nigeria — Sud",
 "Norway_Hordaland":"Hordaland",
@@ -1582,7 +1582,7 @@
 "Egypt Description":"Cairo",
 "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate",
 "Equatorial Guinea Description":"Malabo, Mongomo, Bata",
-"Eritrea Description":"Asmara, Keren, Omhajer",
+"Eritrea Description":"ኣስመራ, Keren, Omhajer",
 "Estonia_East Description":"Põltsamaa linn, Võru, Tartu",
 "Estonia_West Description":"Tallinn, Pärnu, Maardu",
 "Ethiopia Description":"Addis Abeba",
@@ -1781,7 +1781,7 @@
 "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru",
 "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields",
 "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur",
-"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti",
+"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center",
 "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior",
 "India_Maharashtra Description":"Mumbai, Pune, Nagpur",
 "India_Manipur Description":"Imphal, Imphal, Jiribam",
@@ -1817,7 +1817,7 @@
 "Isle of Man Description":"Douglas, Onchan",
 "Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut",
 "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto",
-"Italy_Aosta Valley Description":"Quart, Aosta",
+"Italy_Aosta Valley Description":"Quart, Aosta, Aosta",
 "Italy_Apulia Description":"Bari, Taranto, Foggia",
 "Italy_Basilicata Description":"Potenza, Matera, Melfi",
 "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza",
@@ -1839,21 +1839,21 @@
 "Italy_Liguria Description":"Genoa, La Spezia, La Spezia",
 "Italy_Lombardy_Bergamo Description":"Bergamo, Tagliuno, Treviglio",
 "Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane",
-"Italy_Lombardy_Como Description":"Como, Cantù",
-"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco",
+"Italy_Lombardy_Como Description":"Como, Como, Cantù",
+"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco",
 "Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte",
 "Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo",
-"Italy_Lombardy_Mantua Description":"Mantua, Suzzara",
+"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara",
 "Italy_Lombardy_Milan Description":"Milan, Sesto San Giovanni, Cinisello Balsamo",
 "Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno",
 "Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella",
-"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno",
+"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno",
 "Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate",
 "Italy_Marche Description":"Ancona, Pesaro",
 "Italy_Molise Description":"Campobasso, Termoli, Isernia",
 "Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure",
 "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato",
-"Italy_Piemont_Biella Description":"Biella, Cossato",
+"Italy_Piemont_Biella Description":"Biella, Biella, Cossato",
 "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo",
 "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate",
 "Italy_Piemont_Torino Description":"Turin, Moncalieri, Rivoli",
@@ -1862,8 +1862,8 @@
 "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena",
 "Italy_Sicily Description":"Palermo, Catania, Messina",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto",
-"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena",
-"Italy_Tuscany_Massa e Carrara Description":"Florența, Livorno, Lucca, Pisa, Prato, Pistoia, Carrara, Massa",
+"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto",
+"Italy_Tuscany_Massa e Carrara Description":"Lucca, Florence, Prato",
 "Italy_Umbria Description":"Perugia, Terni, Foligno",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
 "Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro",
@@ -1975,7 +1975,7 @@
 "Nagorno-Karabakh Description":"Khankendi, Shusha, Lachin",
 "Namibia Description":"Windhoek, Opuwo, Eenhana",
 "Nauru Description":"Yaren, Buada, Orro",
-"Nepal_Kathmandu Description":"Kathmandu, Patan",
+"Nepal_Kathmandu Description":"Kathmandu, Kathmandu, Patan",
 "Nepal_Madhyamanchal Description":"Bharatpur, Birganj",
 "Nepal_Purwanchal Description":"Sarang pada, Campa bazzar, Kerkha bajar",
 "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City",
@@ -2079,8 +2079,8 @@
 "Russia_Astrakhan Oblast Description":"Astrahan",
 "Russia_Bashkortostan Description":"Ufa",
 "Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin",
-"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klințî",
-"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida",
+"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы",
+"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида",
 "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali",
 "Russia_Chelyabinsk Oblast Description":"Celiabinsk",
 "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek",
@@ -2088,7 +2088,7 @@
 "Russia_Ingushetia Description":"Karabulak",
 "Russia_Irkutsk Oblast Description":"Irkutsk",
 "Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya",
-"Russia_Jewish Autonomous Oblast Description":"Birobidjan, Obluchye, Nikolayevka",
+"Russia_Jewish Autonomous Oblast Description":"Birobidjan",
 "Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan",
 "Russia_Kaliningrad Oblast Description":"Kaliningrad, Sovetsk, Chernyakhovsk",
 "Russia_Kaluga Oblast Description":"Obninsk",
@@ -2102,9 +2102,9 @@
 "Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya",
 "Russia_Krasnodar Krai Description":"Krasnodar",
 "Russia_Krasnodar Krai_Adygeya Description":"Soci, Maykop, Gelendjik",
-"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy",
+"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский",
 "Russia_Krasnoyarsk Krai_South Description":"Krasnoiarsk",
-"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargași",
+"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши",
 "Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov",
 "Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo",
 "Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin",
@@ -2120,7 +2120,7 @@
 "Russia_North Ossetia-Alania Description":"Vladikavkaz",
 "Russia_Novgorod Oblast Description":"Veliky Novgorod, Borovichi, Staraya Russa",
 "Russia_Novosibirsk Oblast Description":"Novosibirsk",
-"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul",
+"Russia_Omsk Oblast Description":"Omsk",
 "Russia_Orenburg Oblast Description":"Orenburg",
 "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk",
 "Russia_Penza Oblast Description":"Penza",
@@ -2140,7 +2140,7 @@
 "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk",
 "Russia_Samara Oblast Description":"Samara, Toliatti",
 "Russia_Saratov Oblast Description":"Saratov",
-"Russia_Smolensk Oblast Description":"Smolensk, Vyazma, Roslavl",
+"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl",
 "Russia_Stavropol Krai Description":"Stavropol, Piatigorsk",
 "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Ekaterinburg",
 "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk",
@@ -2300,7 +2300,7 @@
 "US_Alabama_Montgomery Description":"Creola, Centreville, Valley",
 "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright",
 "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low",
-"US_Arizona_Phoenix Description":"Phoenix, Mesa",
+"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa",
 "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee",
 "US_Arkansas_North Description":"Ward, Cabot, Des Arc",
 "US_Arkansas_South Description":"Stamps, Rockport",
@@ -2470,13 +2470,13 @@
 "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno",
 "Ukraine_Sumy Oblast Description":"Sumî",
 "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets",
-"Ukraine_Vinnytsia Oblast Description":"Vinița, Voroșilovca, Jmerînka",
+"Ukraine_Vinnytsia Oblast Description":"Vinnița",
 "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk",
 "Ukraine_Zakarpattia Oblast Description":"Ujhorod, Muncaci, Hust",
 "Ukraine_Zaporizhia Oblast Description":"Melitopol",
 "Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten",
 "United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman",
-"United States Virgin Islands Description":"Frederiksted, Christiansted»",
+"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted",
 "Uruguay Description":"Montevideo, Ciudad de la Costa, Salto",
 "Uzbekistan Description":"Tașkent",
 "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal",
 "Vietnam Description":"Hanoi, Ho Chi Minh City, Vung Tau",
 "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai",
-"Yemen Description":"Sana'a, Aden",
+"Yemen Description":"Sana'a",
 "Zambia Description":"Lusaka, Kitwe, Ndola",
 "Zimbabwe Description":"Harare, Hwange, Masvingo",
 "United States of America Short":"USA",
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -45,9 +45,8 @@
 #
 # A C++ parser implementation used by the generator is in generator/utils.cpp::ParseMapCSS().
 # A python parser implementation used to compile *.mapcss style files is in tools/kothic/src/libkomwm.py::komap_mapswithme().
-# The rendering engine in the app doesn't use this file directly, it loads a data/types.txt
+# The app doesn't use this file directly, it loads a data/types.txt
 # which is derived from this file during style files compilation.
-# A C++ parser for matching types to OSM tags is implemented in editor/feature_type_to_osm.cpp.
 #
 # Types that don't have any style defined are discarded by the generator.
 # To prevent discarding, add them to the exceptions in indexer/feature_visibility.cpp::IsUsefulNondrawableType()
@@ -1362,7 +1361,7 @@ historic|memorial|plaque;[historic=memorial][memorial=plaque],[historic=memorial
 historic|castle|defensive;[historic=castle][castle_type=defensive];;name;int_name;1234;
 historic|castle|stately;[historic=castle][castle_type=stately];;name;int_name;1235;
 attraction|animal;1236;
-disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar],[disused:amenity=ice_cream],[disused:amenity=pharmacy],[disused:amenity=post_office],[disused:amenity=bank],[disused:amenity=bureau_de_change],[disused:amenity=car_rental],[disused:amenity=motorcycle_rental],[disused:amenity=casino],[disused:amenity=gambling],[disused:amenity=internet_cafe],[disused:craft=confectionery],[disused:craft=electronics_repair],[disused:craft=shoemaker],[disused:craft=tailor],[disused:craft=key_cutter],[disused:craft=locksmith],[disused:office=estate_agent],[disused:office=insurance];;;;1237;
+disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar];;;;1237;
 cuisine|regional;1238;
 cuisine|pizza;1239;
 cuisine|burger;1240;
--- a/data/sound-strings/lt.json/localize.json
+++ b/data/sound-strings/lt.json/localize.json
@@ -25,7 +25,7 @@
 "go_straight":"Važiuokite tiesiai.",
 "exit":"Išvažiuokite.",
 "onto":"į",
-"take_exit_number":"Išvažiuokite į nuovažą numeris",
+"take_exit_number":"Išvažiuokite į",
 "take_exit_number_street_verb":"NULL",
 "route_recalculating":"Maršrutas perskaičiuojamas",
 "destination":"Pasieksite kelionės tikslą.",
--- a/data/sound-strings/nl.json/localize.json
+++ b/data/sound-strings/nl.json/localize.json
@@ -24,7 +24,7 @@
 "go_straight":"Rij rechtdoor.",
 "exit":"Verlaat.",
 "onto":"naar",
-"take_exit_number":"Neem de afslag",
+"take_exit_number":"Verlaat naar",
 "take_exit_number_street_verb":"Neem",
 "route_recalculating":"Route herberekenen",
 "destination":"Arriveert u.",
--- a/data/sound-strings/ta.json/localize.json
+++ b/data/sound-strings/ta.json/localize.json
@@ -0,0 +1,108 @@
+{
+"make_a_slight_right_turn":"லேசாக வலதுபுறம் திரும்புங்கள்.",
+"make_a_slight_right_turn_street":"NULL",
+"make_a_slight_right_turn_street_verb":"NULL",
+"make_a_right_turn":"வலதுபுறமாக திரும்புங்கள்.",
+"make_a_right_turn_street":"NULL",
+"make_a_sharp_right_turn":"கூர்மையாக வலதுபுறம் திரும்புங்கள்.",
+"make_a_sharp_right_turn_street":"NULL",
+"enter_the_roundabout":"ரவுண்டபௌட்டை நுழையுங்கள்.",
+"enter_the_roundabout_street":"NULL",
+"enter_the_roundabout_street_verb":"NULL",
+"leave_the_roundabout":"ரவுண்டபௌட்டை வெளியேறுங்கள்.",
+"leave_the_roundabout_street":"NULL",
+"leave_the_roundabout_street_verb":"NULL",
+"make_a_slight_left_turn":"லேசாக இடதுபுறம் திரும்புங்கள்.",
+"make_a_slight_left_turn_street":"NULL",
+"make_a_slight_left_turn_street_verb":"NULL",
+"make_a_left_turn":"இடதுபுறமாக திரும்புங்கள்.",
+"make_a_left_turn_street":"NULL",
+"make_a_sharp_left_turn":"கூர்மையாக இடதுபுறம் திரும்புங்கள்.",
+"make_a_sharp_left_turn_street":"NULL",
+"make_a_u_turn":"U-வழியில் திரும்புங்கள்.",
+"make_a_u_turn_street":"NULL",
+"make_a_u_turn_street_verb":"NULL",
+"go_straight":"நேரா போங்க.",
+"exit":"வெளியேறுங்கள்.",
+"onto":"நோக்கி",
+"take_exit_number":"வெளியேறும் வழி எடுங்கள்",
+"take_exit_number_street_verb":"NULL",
+"route_recalculating":"வழி மறுபடி கணிக்கிறது",
+"destination":"நீங்கள் வருவீர்கள்.",
+"you_have_reached_the_destination":"நீங்கள் வந்துவிட்டீர்கள்..",
+"in_50_meters":"ஐம்பது மீட்டரில்",
+"in_100_meters":"நூறு மீட்டரில்",
+"in_200_meters":"இருநூறு மீட்டரில்",
+"in_250_meters":"இருநூற்று ஐம்பது மீட்டரில்",
+"in_300_meters":"முன்னூறு மீட்டரில்",
+"in_400_meters":"நானூறு மீட்டரில்",
+"in_500_meters":"ஐநூறு மீட்டரில்",
+"in_600_meters":"அறுநூறு மீட்டரில்",
+"in_700_meters":"எழுநூறு மீட்டரில்",
+"in_750_meters":"எழுநூறு ஐம்பது மீட்டரில்",
+"in_800_meters":"எண்ணூறு மீட்டரில்",
+"in_900_meters":"தொள்ளாயிரம் மீட்டரில்",
+"in_1_kilometer":"ஒரு கிலோமீட்டரில்",
+"in_1_5_kilometers":"ஒன்றரை கிலோமீட்டரில்",
+"in_2_kilometers":"இரண்டு கிலோமீட்டரில்",
+"in_2_5_kilometers":"இரண்டரை கிலோமீட்டரில்",
+"in_3_kilometers":"மூன்று கிலோமீட்டரில்",
+"then":"அடுத்தது",
+"dist_direction_onto_street":"%1$s %4$s %3$s %5$s %2$s",
+"take_the_1_exit":"ஒன்றாம் வெளியேறும் வழி எடுங்கள்.",
+"take_the_1_exit_street":"NULL",
+"take_the_1_exit_street_verb":"NULL",
+"take_the_2_exit":"இரண்டாம் வெளியேறும் வழி எடுங்கள்.",
+"take_the_2_exit_street":"NULL",
+"take_the_2_exit_street_verb":"NULL",
+"take_the_3_exit":"மூன்றாம் வெளியேறும் வழி எடுங்கள்.",
+"take_the_3_exit_street":"NULL",
+"take_the_3_exit_street_verb":"NULL",
+"take_the_4_exit":"நான்காவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_4_exit_street":"NULL",
+"take_the_4_exit_street_verb":"NULL",
+"take_the_5_exit":"ஐந்தாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_5_exit_street":"NULL",
+"take_the_5_exit_street_verb":"NULL",
+"take_the_6_exit":"ஆறாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_6_exit_street":"NULL",
+"take_the_6_exit_street_verb":"NULL",
+"take_the_7_exit":"ஏழாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_7_exit_street":"NULL",
+"take_the_7_exit_street_verb":"NULL",
+"take_the_8_exit":"எட்டாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_8_exit_street":"NULL",
+"take_the_8_exit_street_verb":"NULL",
+"take_the_9_exit":"ஒன்பதாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_9_exit_street":"NULL",
+"take_the_9_exit_street_verb":"NULL",
+"take_the_10_exit":"பத்தாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_10_exit_street":"NULL",
+"take_the_10_exit_street_verb":"NULL",
+"take_the_11_exit":"பதினொன்றாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_11_exit_street":"NULL",
+"take_the_11_exit_street_verb":"NULL",
+"in_50_feet":"ஐம்பது அடியில்",
+"in_100_feet":"நூறு அடியில்",
+"in_200_feet":"இருநூறு அடியில்",
+"in_300_feet":"முன்னூறு அடியில்",
+"in_400_feet":"நானூறு அடியில்",
+"in_500_feet":"ஐநூறு அடியில்",
+"in_600_feet":"அறுநூறு அடியில்",
+"in_700_feet":"எழுநூறு அடியில்",
+"in_800_feet":"எண்ணூறு அடியில்",
+"in_900_feet":"தொள்ளாயிரம் அடியில்",
+"in_1000_feet":"ஆயிரம் அடியில்",
+"in_1500_feet":"ஆயிரம் ஐநூறு அடியில்",
+"in_2000_feet":"இரண்டு ஆயிரம் அடியில்",
+"in_2500_feet":"இரண்டு ஆயிரம் ஐநூறு அடியில்",
+"in_3000_feet":"மூன்று ஆயிரம் அடியில்",
+"in_3500_feet":"மூன்று ஆயிரம் ஐநூறு அடியில்",
+"in_4000_feet":"நான்கு ஆயிரம் அடியில்",
+"in_4500_feet":"நான்கு ஆயிரம் ஐநூறு அடியில்",
+"in_5000_feet":"ஐந்து ஆயிரம் அடியில்",
+"in_1_mile":"ஒன்று மைலில்",
+"in_1_5_miles":"ஒன்றரை மைலில்",
+"in_2_miles":"இரண்டு மைலில்",
+"unknown_camera":"கேமரா முன்னால் இருக்கிறது"
+}
--- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift
+++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
@@ -239,7 +239,7 @@ final class CarPlayService: NSObject {
    MapTemplateBuilder.configureBaseUI(mapTemplate: mapTemplate)
    if currentPositionMode == .pendingPosition {
      mapTemplate.leadingNavigationBarButtons = []
-    } else if currentPositionMode == .follow || currentPositionMode == .followAndRotate {
+    } else if currentPositionMode == .follow || currentPositionMode == .followAndRotateCompass || currentPositionMode == .followAndRotateRoute {
      MapTemplateBuilder.setupDestinationButton(mapTemplate: mapTemplate)
    } else {
      MapTemplateBuilder.setupRecenterButton(mapTemplate: mapTemplate)
@@ -623,22 +623,32 @@ extension CarPlayService: CarPlayRouterListener {
 extension CarPlayService: LocationModeListener {
  func processMyPositionStateModeEvent(_ mode: MWMMyPositionMode) {
    currentPositionMode = mode
-    guard let rootMapTemplate = rootMapTemplate,
-      let info = rootMapTemplate.userInfo as? MapInfo,
-      info.type == CPConstants.TemplateType.main else {
+    
+    // make sure we have a rootMapTemplate
+    guard let rootMapTemplate = rootMapTemplate else {
+      return
+    }
+    
+    // exit if we're navigating
+    guard let info = rootMapTemplate.userInfo as? MapInfo,
+              info.type == CPConstants.TemplateType.main else {
+        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
        return
    }
    switch mode {
-    case .follow, .followAndRotate:
+    case .follow, .followAndRotateCompass, .followAndRotateRoute:
      if !rootMapTemplate.isPanningInterfaceVisible {
        MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
+        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
      }
    case .notFollow:
      if !rootMapTemplate.isPanningInterfaceVisible {
        MapTemplateBuilder.setupRecenterButton(mapTemplate: rootMapTemplate)
+        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
      }
    case .pendingPosition, .notFollowNoPosition:
      rootMapTemplate.leadingNavigationBarButtons = []
+      MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
    }
  }
 }
--- a/iphone/Maps/Classes/CarPlay/Template
+++ b/iphone/Maps/Classes/CarPlay/Template
@@ -5,6 +5,7 @@ final class MapTemplateBuilder {
    case startPanning
    case zoomIn
    case zoomOut
+    case myPositionMode
  }
  enum BarButtonType {
    case dismissPaning
@@ -28,7 +29,7 @@ final class MapTemplateBuilder {
    configureBaseUI(mapTemplate: mapTemplate)
    if positionMode == .pendingPosition {
      mapTemplate.leadingNavigationBarButtons = []
-    } else if positionMode == .follow || positionMode == .followAndRotate {
+    } else if positionMode == .follow || positionMode == .followAndRotateCompass || positionMode == .followAndRotateRoute {
      setupDestinationButton(mapTemplate: mapTemplate)
    } else {
      setupRecenterButton(mapTemplate: mapTemplate)
@@ -69,7 +70,10 @@ final class MapTemplateBuilder {
    let zoomOutButton = buildMapButton(type: .zoomOut) { _ in
      FrameworkHelper.zoomMap(.out)
    }
-    mapTemplate.mapButtons = [panningButton, zoomInButton, zoomOutButton]
+    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
+      FrameworkHelper.switchMyPositionMode()
+    }
+    mapTemplate.mapButtons = [myPositionModeButton, panningButton, zoomInButton, zoomOutButton]
    
    let settingsButton = buildBarButton(type: .settings) { _ in
      let gridTemplate = SettingsTemplateBuilder.buildGridTemplate()
@@ -99,7 +103,10 @@ final class MapTemplateBuilder {
    let panningButton = buildMapButton(type: .startPanning) { _ in
      mapTemplate.showPanningInterface(animated: true)
    }
-    mapTemplate.mapButtons = [panningButton]
+    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
+      FrameworkHelper.switchMyPositionMode()
+    }
+    mapTemplate.mapButtons = [myPositionModeButton, panningButton]
    setupMuteAndRedirectButtons(template: mapTemplate)
    let endButton = buildBarButton(type: .endRoute) { _ in
      CarPlayService.shared.cancelCurrentTrip()
@@ -117,6 +124,28 @@ final class MapTemplateBuilder {
    mapTemplate.leadingNavigationBarButtons = [destinationButton]
  }
  
+  class func updateMyPositionModeButton(mapTemplate: CPMapTemplate, newMode: MWMMyPositionMode) {
+    let button = CPMapButton(handler: { _ in
+      FrameworkHelper.switchMyPositionMode()
+    })
+    
+    switch newMode {
+    case .pendingPosition:
+      button.image = UIImage(systemName: "location.fill")
+    case .notFollowNoPosition:
+      button.image = UIImage(systemName: "location")
+    case .notFollow:
+      button.image = UIImage(systemName: "location")
+    case .follow:
+      button.image = UIImage(systemName: "location.fill")
+    case .followAndRotate:
+      button.image = UIImage(systemName: "location.north.line.fill")
+    }
+    if mapTemplate.mapButtons.count > 0 {
+      mapTemplate.mapButtons[0] = button
+    }
+  }
+  
  class func setupRecenterButton(mapTemplate: CPMapTemplate) {
    let recenterButton = buildBarButton(type: .recenter) { _ in
      FrameworkHelper.switchMyPositionMode()
@@ -166,6 +195,8 @@ final class MapTemplateBuilder {
      button.image = UIImage(systemName: "plus")
    case .zoomOut:
      button.image = UIImage(systemName: "minus")
+    case .myPositionMode:
+      button.image = UIImage(systemName: "location")
    }
    // Remove code below once Apple has fixed its issue with the button background
    if #unavailable(iOS 26) {
@@ -176,6 +207,8 @@ final class MapTemplateBuilder {
        button.focusedImage = UIImage(systemName: "plus.circle.fill")
      case .zoomOut:
        button.focusedImage = UIImage(systemName: "minus.circle.fill")
+      case .myPositionMode:
+        button.image = UIImage(systemName: "location.fill")
      }
    }
    return button
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
@@ -91,7 +91,8 @@ NSString * const kUDDidShowLongTapToShowSideButtonsToast = @"kUDDidShowLongTapTo
    case MWMMyPositionModeNotFollow:
    case MWMMyPositionModeNotFollowNoPosition: [locBtn setStyleNameAndApply: @"ButtonGetPosition"]; break;
    case MWMMyPositionModeFollow: [locBtn setStyleNameAndApply: @"ButtonFollow"]; break;
-    case MWMMyPositionModeFollowAndRotate: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotate"]; break;
+    case MWMMyPositionModeFollowAndRotateCompass: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotateCompass"]; break;
+    case MWMMyPositionModeFollowAndRotateRoute: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotateRoute"]; break;
  }
 }

--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -632,7 +632,8 @@ NSString *const kAboutSegue = @"Map2About";
    case MWMMyPositionModeNotFollow:
      break;
    case MWMMyPositionModeFollow:
-    case MWMMyPositionModeFollowAndRotate:
+    case MWMMyPositionModeFollowAndRotateCompass:
+    case MWMMyPositionModeFollowAndRotateRoute:
      self.disableStandbyOnLocationStateMode = YES;
      break;
  }
--- a/iphone/Maps/Core/Location/MWMLocationHelpers.h
+++ b/iphone/Maps/Core/Location/MWMLocationHelpers.h
@@ -32,7 +32,8 @@ static inline MWMMyPositionMode mwmMyPositionMode(location::EMyPositionMode mode
  case location::EMyPositionMode::NotFollowNoPosition: return MWMMyPositionModeNotFollowNoPosition;
  case location::EMyPositionMode::NotFollow: return MWMMyPositionModeNotFollow;
  case location::EMyPositionMode::Follow: return MWMMyPositionModeFollow;
-  case location::EMyPositionMode::FollowAndRotate: return MWMMyPositionModeFollowAndRotate;
+  case location::EMyPositionMode::FollowAndRotateCompass: return MWMMyPositionModeFollowAndRotateCompass;
+  case location::EMyPositionMode::FollowAndRotateRoute: return MWMMyPositionModeFollowAndRotateRoute;
  }
 }
 } // namespace location_helpers
--- a/iphone/Maps/Core/Location/MWMLocationManager.mm
+++ b/iphone/Maps/Core/Location/MWMLocationManager.mm
@@ -50,7 +50,8 @@ std::string DebugPrint(MWMMyPositionMode mode) {
    case MWMMyPositionModeNotFollowNoPosition: return "MWMMyPositionModeNotFollowNoPosition";
    case MWMMyPositionModeNotFollow: return "MWMMyPositionModeNotFollow";
    case MWMMyPositionModeFollow: return "MWMMyPositionModeFollow";
-    case MWMMyPositionModeFollowAndRotate: return "MWMMyPositionModeFollowAndRotate";
+    case MWMMyPositionModeFollowAndRotateCompass: return "MWMMyPositionModeFollowAndRotateCompass";
+    case MWMMyPositionModeFollowAndRotateRoute: return "MWMMyPositionModeFollowAndRotateRoute";
  }
  CHECK(false, ("Unsupported value", static_cast<int>(mode)));
 }
@@ -367,7 +368,8 @@ void setShowLocationAlert(BOOL needShow) {
    case MWMMyPositionModeNotFollowNoPosition:
    case MWMMyPositionModeNotFollow: manager.geoMode = GeoMode::NotInPosition; break;
    case MWMMyPositionModeFollow: manager.geoMode = GeoMode::InPosition; break;
-    case MWMMyPositionModeFollowAndRotate: manager.geoMode = GeoMode::FollowAndRotate; break;
+    case MWMMyPositionModeFollowAndRotateCompass:
+    case MWMMyPositionModeFollowAndRotateRoute: manager.geoMode = GeoMode::FollowAndRotate; break;
    }
  }
 }
--- a/iphone/Maps/Core/Location/MWMLocationPredictor.mm
+++ b/iphone/Maps/Core/Location/MWMLocationPredictor.mm
@@ -30,7 +30,7 @@ NSUInteger constexpr kMaxPredictionCount = 20;

 - (void)setMyPositionMode:(MWMMyPositionMode)mode
 {
-  self.isLastPositionModeValid = (mode == MWMMyPositionModeFollowAndRotate);
+  self.isLastPositionModeValid = (mode == MWMMyPositionModeFollowAndRotateCompass);
  [self restart];
 }

--- a/iphone/Maps/Core/Location/MWMMyPositionMode.h
+++ b/iphone/Maps/Core/Location/MWMMyPositionMode.h
@@ -3,5 +3,6 @@ typedef NS_CLOSED_ENUM(NSUInteger, MWMMyPositionMode) {
  MWMMyPositionModeNotFollowNoPosition,
  MWMMyPositionModeNotFollow,
  MWMMyPositionModeFollow,
-  MWMMyPositionModeFollowAndRotate
+  MWMMyPositionModeFollowAndRotateCompass,
+  MWMMyPositionModeFollowAndRotateRoute
 };
--- a/iphone/Maps/Core/Theme/Core/ThemeManager.swift
+++ b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
@@ -41,13 +41,14 @@ final class ThemeManager: NSObject {
      }
    }(actualTheme)

-    if Settings.mapAppearance == .light {
+    let isCarPlayActive = CarPlayService.shared.isCarplayActivated
+    if !isCarPlayActive, Settings.mapAppearance == .light {
      if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
          FrameworkHelper.setTheme(.vehicleDay)
      } else {
          FrameworkHelper.setTheme(.day)
      }
-    } else if Settings.mapAppearance == .dark {
+    } else if !isCarPlayActive, Settings.mapAppearance == .dark {
      if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
        FrameworkHelper.setTheme(.vehicleNight)
      } else {
--- a/iphone/Maps/Core/Theme/MapStyleSheet.swift
+++ b/iphone/Maps/Core/Theme/MapStyleSheet.swift
@@ -7,7 +7,8 @@ enum MapStyleSheet: String, CaseIterable {
  case mapButtonPending = "ButtonPending"
  case mapButtonGetPosition = "ButtonGetPosition"
  case mapButtonFollow = "ButtonFollow"
-  case mapButtonFollowAndRotate = "ButtonFollowAndRotate"
+  case mapButtonFollowAndRotateCompass = "ButtonFollowAndRotateCompass"
+  case mapButtonFollowAndRotateRoute = "ButtonFollowAndRotateRoute"
  case mapButtonMapBookmarks = "ButtonMapBookmarks"
  case mapPromoDiscoveryButton = "PromoDiscroveryButton"
  case mapButtonBookmarksBack = "ButtonBookmarksBack"
@@ -67,10 +68,14 @@ extension MapStyleSheet: IStyleSheet {
      return .add { s in
        s.mwmImage = "btn_follow"
      }
-    case .mapButtonFollowAndRotate:
+    case .mapButtonFollowAndRotateCompass:
      return .add { s in
        s.mwmImage = "btn_follow_and_rotate"
      }
+    case .mapButtonFollowAndRotateRoute:
+      return .add { s in
+        s.mwmImage = "btn_follow_route"
+      }
    case .mapButtonMapBookmarks:
      return .add { s in
        s.mwmImage = "ic_routing_bookmark"
--- a/iphone/Maps/Images.xcassets/Location/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location/Contents.json
@@ -1,6 +1,6 @@
 {
  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
  }
-}
+}
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_dark.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_dark.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "btn_follow_route_dark.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_dark.imageset/btn_follow_route_dark.png
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_dark.imageset/btn_follow_route_dark.png
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_dark.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_dark.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "btn_follow_route_highlighted_dark.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_dark.imageset/btn_follow_route_highlighted_dark.png
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_dark.imageset/btn_follow_route_highlighted_dark.png
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_light.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_light.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "btn_follow_route_highlighted_light.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_light.imageset/btn_follow_route_highlighted_light.png
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_light.imageset/btn_follow_route_highlighted_light.png
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_light.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_light.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "btn_follow_route_light.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/iphone/Maps/Images.xcassets/Location/btn_follow_route_light.imageset/btn_follow_route_light.png
+++ b/iphone/Maps/Images.xcassets/Location/btn_follow_route_light.imageset/btn_follow_route_light.png
--- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
@@ -19,10 +19,10 @@
 "type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
 "type.amenity.courthouse" = "Courthouse";
 "type.amenity.language_school" = "Language School";
-"type.office.diplomatic" = "দূতাবাস";
+"type.office.diplomatic" = "Embassy";
 "type.amenity.money_transfer" = "Money Transfer";
 "type.drinking_water.yes" = "Drinking Water";
-"type.amenity.music_school" = "গানের স্কুল";
+"type.amenity.music_school" = "Music School";
 "type.amenity.exhibition_centre" = "Exhibition Center";
 "type.amenity.doctors" = "Doctor";
 "type.amenity.grave_yard.christian" = "খ্রিস্টান কবরস্থান";
@@ -39,9 +39,9 @@
 "type.amenity.place_of_worship.taoist" = "Taoist Temple";
 "type.amenity.police" = "Police";
 "type.amenity.post_box" = "Mailbox";
-"type.amenity.place_of_worship.hindu" = "হিন্দু মন্দির";
+"type.amenity.place_of_worship.hindu" = "Hindu Temple";
 "type.amenity.place_of_worship.shinto" = "Shinto Shrine";
-"type.amenity.place_of_worship.muslim" = "মসজিদ";
+"type.amenity.place_of_worship.muslim" = "Mosque";
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 "type.amenity.recycling.centre" = "Recycling Center";
 "type.amenity.recycling" = "Recycling Container";
@@ -96,7 +96,7 @@
 "type.man_made.silo" = "Silo";
 "type.natural.strait" = "Strait";
 "type.natural.spring.drinking_water_no" = "Natural Spring";
-"type.natural.volcano" = "আগ্নেয়গিরি";
+"type.natural.volcano" = "Volcano";
 "type.natural.wetland" = "Wetland";
 "type.natural.wetland.bog" = "Bog";
 "type.organic.only" = "Organic";
@@ -266,7 +266,7 @@
 "type.highway.residential.area" = "Residential Street";
 "type.wheelchair.yes" = "Full Wheelchair Access";
 "type.boundary.protected_area.2" = "Protected Area";
-"type.amenity.drinking_water" = "পানীয় জল";
+"type.amenity.drinking_water" = "Drinking Water";
 "type.healthcare.podiatrist" = "Podiatrist";
 "type.railway.station.subway.yokohama" = "Subway Station";
 "type.area_highway.primary" = "Primary Road";
@@ -301,7 +301,7 @@
 "type.railway.station.subway.kyoto" = "Subway Station";
 "type.craft.tailor" = "Tailor";
 "type.amenity.place_of_worship" = "Place of Worship";
-"type.amenity.prison" = "কারাগার";
+"type.amenity.prison" = "Prison";
 "type.historic.city_gate" = "City Gate";
 "type.wheelchair.no" = "No Wheelchair Access";
 "type.shop.grocery" = "Grocery Store";
@@ -334,7 +334,7 @@
 "type.landuse.reservoir" = "Reservoir";
 "type.sport.soccer" = "Soccer";
 "type.amenity.shelter.basic_hut" = "Bivouac Hut";
-"type.natural.desert" = "মরুভূমি";
+"type.natural.desert" = "Desert";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.man_made.water_tap.drinking_water_no" = "Water Tap";
 "type.railway.subway_entrance.wuhan" = "Subway Entrance";
@@ -398,7 +398,7 @@
 "type.tourism.artwork.painting" = "Painting";
 "type.amenity.pharmacy" = "Pharmacy";
 "type.landuse.military" = "Military Area";
-"type.amenity.college" = "কলেজ";
+"type.amenity.college" = "College";
 "type.railway.station.light_rail" = "Light Rail Station";
 "type.railway.subway_entrance.bucharest" = "Subway Entrance";
 "type.cuisine.ethiopian" = "Ethiopian";
@@ -445,7 +445,7 @@
 "type.natural.earth_bank" = "Earth Bank";
 "type.railway.subway_entrance.manila" = "Subway Entrance";
 "type.railway.monorail.tunnel" = "Monorail Tunnel";
-"type.barrier.fence" = "বেড়া";
+"type.barrier.fence" = "Fence";
 "type.natural.cliff" = "Cliff";
 "type.tourism.zoo" = "Zoo";
 "type.shop.paint" = "Paint Shop";
@@ -620,7 +620,7 @@
 "type.historic.battlefield" = "Historic Battlefield";
 "type.amenity.public_bookcase" = "Book Exchange";
 "type.railway.subway_entrance.kobe" = "Subway Entrance";
-"type.aeroway.aerodrome.international" = "আন্তর্জাতিক বিমানবন্দর";
+"type.aeroway.aerodrome.international" = "International Airport";
 "type.highway.road" = "Road";
 "type.natural" = "Nature";
 "type.natural.saddle" = "Mountain Saddle";
@@ -670,7 +670,7 @@
 "type.healthcare.optometrist" = "Optometrist";
 "type.cuisine.oriental" = "East Asian";
 "type.railway.station.subway.santo_domingo" = "Subway Station";
-"type.aeroway.aerodrome" = "বিমানবন্দর";
+"type.aeroway.aerodrome" = "Airport";
 "type.natural.orchard" = "Orchard";
 "type.man_made.embankment" = "Embankment";
 "type.highway.steps.bridge" = "Bridge";
@@ -941,7 +941,7 @@
 "type.railway.subway_entrance.glasgow" = "Subway Entrance";
 "type.shop.clothes" = "Clothes Shop";
 "type.railway.station.subway.chengdu" = "Subway Station";
-"type.natural.water.river" = "নদী";
+"type.natural.water.river" = "River";
 "type.organic.yes" = "Organic";
 "type.cuisine.seafood" = "Seafood";
 "type.area_highway.trunk" = "Trunk Road";
@@ -1164,7 +1164,7 @@
 "type.craft.winery" = "Winery";
 "type.man_made.flare" = "Gas Flare";
 "type.cuisine.peruvian" = "Peruvian";
-"type.natural.water.pond" = "পুকুর";
+"type.natural.water.pond" = "Pond";
 "type.waterway.dam" = "Dam";
 "type.amenity.parking.park_and_ride" = "Park And Ride Parking";
 "type.amenity.fountain" = "ফাউন্টেন";
@@ -1188,7 +1188,7 @@
 "type.natural.cave_entrance" = "Cave Entrance";
 "type.amenity.parking" = "পার্কিং";
 "type.railway.subway_entrance.chongqing" = "Subway Entrance";
-"type.natural.coastline" = "উপকূলরেখা";
+"type.natural.coastline" = "Coastline";
 "type.highway.road.bridge" = "Bridge";
 "type.recycling.green_waste" = "Green/Organic Waste";
 "type.railway.station.subway.valencia" = "Subway Station";
@@ -1302,4 +1302,3 @@
 "type.office.security" = "সিকিউরিটি গার্ড অফিস";
 "type.power.portal" = "পাওয়ার পোর্টাল";
 "type.building.guardhouse" = "সিকিউরিটি বুথ";
-"type.natural.tree" = "গাছ";
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -677,7 +677,7 @@
 "editor_edits_sent_message" = "La vostra nota s'enviarà a OpenStreetMap";
 "editor_comment_hint" = "Comentari…";
 "editor_reset_edits_message" = "Voleu descartar tots els canvis locals?";
-"editor_reset_edits_button" = "Descartar canvis";
+"editor_reset_edits_button" = "Descarta";
 "editor_remove_place_message" = "Voleu suprimir el lloc afegit?";
 "editor_remove_place_button" = "Suprimeix";
 "editor_place_doesnt_exist" = "El lloc no existeix";
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -683,7 +683,7 @@
 "editor_edits_sent_message" = "Vaše poznámka bude odeslána do OpenStreetMap";
 "editor_comment_hint" = "Poznámka…";
 "editor_reset_edits_message" = "Vymazat všechny místní změny?";
-"editor_reset_edits_button" = "Zahodit změny";
+"editor_reset_edits_button" = "Zahodit";
 "editor_remove_place_message" = "Odstranit přidané místo?";
 "editor_remove_place_button" = "Odstranit";
 "editor_place_doesnt_exist" = "Místo neexistuje";
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -181,7 +181,7 @@
 "type.amenity.vending_machine.food" = "Essensautomat";
 "type.amenity.vending_machine.newspapers" = "Zeitungsautomat";
 "type.amenity.vending_machine.parking_tickets" = "Parkautomat";
-"type.amenity.vending_machine.public_transport_tickets" = "5Fahrkartenautomat|4Ticketautomat|U+1F3AB|U+1F39F|U+1F9FE";
+"type.amenity.vending_machine.public_transport_tickets" = "Fahrkartenautomat";
 "type.amenity.vending_machine.sweets" = "Süßigkeitenautomat";
 "type.amenity.vending_machine.excrement_bags" = "Hundekotbeutelspender";
 "type.amenity.parcel_locker" = "Paketstation";
@@ -400,7 +400,7 @@
 "type.cardinal.east" = "Ost";
 "type.cardinal.north" = "Nord";
 "type.cardinal.south" = "Süd";
-"type.cardinal.west" = "Westen";
+"type.cardinal.west" = "West";

 /* A mountain rescue base for search and rescue activities. */
 "type.emergency.mountain_rescue" = "Bergrettungsstation";
@@ -1591,4 +1591,3 @@
 "type.natural.sand" = "Sand";
 "type.amenity.mobile_money_agent" = "Mobile Money Vertretung";
 "type.amenity.food_sharing" = "Food Sharing";
-"type.amenity.hydrant" = "Beregnungshydrant";
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -608,7 +608,7 @@
 "editor_sharing_title" = "Βελτίωσα τους χάρτες CoMaps";

 /* Downloaded 10 **of** 20 <- it is that "of" */
-"downloader_of" = "%1$d από %2$d";
+"downloader_of" = "%1$d/%2$d";
 "download_over_mobile_header" = "Να γίνει λήψη μέσω δικτύου κινητής τηλεφωνίας;";
 "download_over_mobile_message" = "Αυτό μπορεί να είναι πολύ ακριβό για μερικά πακέτα ή στην περίπτωση roaming.";
 "error_enter_correct_house_number" = "Εισαγάγετε έναν έγκυρο αριθμό κτιρίου";
@@ -634,7 +634,7 @@
 "editor_category_unsuitable_title" = "Δεν μπορείτε να βρείτε την κατάλληλη κατηγορία;";
 "editor_category_unsuitable_text" = "Οι CoMaps επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a>. Ελέγξτε τον <a href=\"https://www.comaps.app/support/advanced-map-editing/\">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.";
 "downloader_no_downloaded_maps_title" = "Δεν έχετε κατεβάσει χάρτες";
-"downloader_no_downloaded_maps_message" = "Κατεβάστε χάρτες για να κάνετε αναζήτηση και να πλοηγηθείτε χωρίς σύνδεση.";
+"downloader_no_downloaded_maps_message" = "Κατεβάστε χάρτες για να αναζητήσετε μια τοποθεσία και να χρησιμοποιήσετε την πλοήγησης χωρίς σύνδεση.";
 "current_location_unknown_error_title" = "Η τρέχουσα τοποθεσία είναι άγνωστη.";
 "current_location_unknown_error_message" = "Παρουσιάστηκε σφάλμα κατά την αναζήτηση της τοποθεσίας σας. Ελέγξτε αν η συσκευή σας λειτουργεί κανονικά και δοκιμάστε ξανά αργότερα.";
 "location_services_disabled_header" = "Οι υπηρεσίες εντοπισμού τοποθεσίας είναι απενεργοποιημένες";
@@ -677,7 +677,7 @@
 "editor_edits_sent_message" = "Η σημείωσή σας θα σταλεί στο OpenStreetMap";
 "editor_comment_hint" = "Σχόλιο…";
 "editor_reset_edits_message" = "Απόρριψη όλων των τοπικών αλλαγών;";
-"editor_reset_edits_button" = "Απόρριψη αλλαγών";
+"editor_reset_edits_button" = "Απόρριψη";
 "editor_remove_place_message" = "Διαγραφή της τοποθεσίας που προστέθηκε;";
 "editor_remove_place_button" = "Διαγραφή";
 "editor_place_doesnt_exist" = "Η τοποθεσία δεν υπάρχει";
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -509,7 +509,7 @@

 /* Text for allday switch. */
 "editor_time_allday" = "Todo el día (24 horas)";
-"editor_time_open" = "Apertura";
+"editor_time_open" = "Abierto";
 "editor_time_close" = "Cierre";
 "editor_time_add_closed" = "Añadir horas de pausa";
 "editor_time_title" = "Horario de apertura";
@@ -683,7 +683,7 @@
 "editor_edits_sent_message" = "Su nota se enviará a OpenStreetMap";
 "editor_comment_hint" = "Comentario…";
 "editor_reset_edits_message" = "¿Restablecer todos los cambios locales?";
-"editor_reset_edits_button" = "Descartar cambios";
+"editor_reset_edits_button" = "Restablecer";
 "editor_remove_place_message" = "¿Eliminar el lugar añadido?";
 "editor_remove_place_button" = "Eliminar";
 "editor_place_doesnt_exist" = "El lugar no existe";
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -47,7 +47,7 @@
 "type.amenity.cinema" = "Cine";
 "type.leisure.bowling_alley" = "Bolera";
 "type.amenity.clinic" = "Clínica";
-"type.amenity.college" = "Colegio universitario";
+"type.amenity.college" = "Facultad";
 "type.amenity.community_centre" = "Centro comunitario";
 "type.amenity.compressed_air" = "Aire comprimido";
 "type.amenity.conference_centre" = "Centro de conferencias";
@@ -216,13 +216,13 @@
 "type.boundary.administrative" = "Frontera administrativa";

 /* Borders between countries. */
-"type.boundary.administrative.2" = "Frontera nacional";
+"type.boundary.administrative.2" = "Frontera de país";

 /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
-"type.boundary.administrative.3" = "Frontera regional";
+"type.boundary.administrative.3" = "Frontera de región";

 /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
-"type.boundary.administrative.4" = "Frontera regional";
+"type.boundary.administrative.4" = "Frontera de región";
 "type.boundary.national_park" = "Parque nacional";
 "type.boundary.aboriginal_lands" = "Tierras indígenas";
 "type.boundary.protected_area" = "Área protegida";
@@ -306,7 +306,7 @@
 "type.cuisine.german" = "Alemana";
 "type.cuisine.greek" = "Griega";
 "type.cuisine.grill" = "Parrilla";
-"type.cuisine.heuriger" = "Heuriger";
+"type.cuisine.heuriger" = "Heuriger (especialidad austríaca)";
 "type.cuisine.hotdog" = "Perritos calientes";
 "type.cuisine.hungarian" = "Húngara";
 "type.cuisine.ice_cream" = "Helados";
@@ -627,7 +627,7 @@
 "type.historic.memorial.plaque" = "Placa conmemorativa";
 "type.historic.memorial.sculpture" = "Escultura";
 "type.historic.memorial.statue" = "Estatua";
-"type.historic.memorial.stolperstein" = "Stolperstein (memorial de las víctimas del nazismo)";
+"type.historic.memorial.stolperstein" = "Stolperstein (memoriales de las víctimas del nazismo)";
 "type.historic.stone" = "Piedra histórica";
 "type.historic.memorial.war_memorial" = "Memorial de guerra";
 "type.historic.mine" = "Mina histórica";
@@ -728,7 +728,7 @@
 "type.man_made" = "Artificial";
 "type.man_made.breakwater" = "Rompeolas";
 "type.man_made.cairn" = "Mojón";
-"type.man_made.chimney" = "Chimenea";
+"type.man_made.chimney" = "Chimenea de fábrica";
 "type.man_made.cutline" = "Línea de corte forestal";
 "type.man_made.survey_point" = "Punto geodésico";
 "type.man_made.flagpole" = "Asta de bandera";
@@ -949,7 +949,7 @@
 "type.railway.station.light_rail" = "Estación de tren";
 "type.railway.station.light_rail.berlin" = "Estación de tren (S-Bahn)";
 "type.railway.station.light_rail.london" = "Estación de tren";
-"type.railway.station.light_rail.porto" = "Metro de Porto";
+"type.railway.station.light_rail.porto" = "Estación de metro";
 "type.railway.station.monorail" = "Estación de monoriel";
 "type.railway.station.subway" = "Estación de metro";
 "type.railway.station.subway.adana" = "Estación de metro";
@@ -1199,27 +1199,27 @@
 "type.shop.books" = "Librería";
 "type.shop.butcher" = "Carnicería";
 "type.shop.cannabis" = "Tienda de cánnabis";
-"type.shop.car" = "Concesionario de automóviles";
+"type.shop.car" = "Concesionario de coches";
 "type.shop.car_parts" = "Piezas de automóvil";
-"type.shop.car_repair" = "Taller de automóviles";
+"type.shop.car_repair" = "Taller";
 "type.shop.car_repair.tyres" = "Reparación de neumáticos";
 "type.shop.caravan" = "Concesionario de caravanas";
-"type.shop.carpet" = "Tienda de alfombras";
+"type.shop.carpet" = "Alfombras";
 "type.shop.chemist" = "Droguería";
 "type.shop.chocolate" = "Chocolatería";
 "type.shop.clothes" = "Tienda de ropa";
 "type.shop.coffee" = "Tienda de café";
 "type.shop.computer" = "Tienda de informática";
-"type.shop.confectionery" = "Tienda de dulces";
+"type.shop.confectionery" = "Confitería";
 "type.shop.convenience" = "Tienda de barrio";
-"type.shop.copyshop" = "Copistería";
+"type.shop.copyshop" = "Centro de copiado";
 "type.shop.cosmetics" = "Tienda de cosméticos";
-"type.shop.curtain" = "Tienda de cortinas";
+"type.shop.curtain" = "Cortinas";
 "type.shop.deli" = "Tienda de delicatessen";
 "type.shop.department_store" = "Grandes almacenes";
 "type.shop.doityourself" = "Tienda de bricolaje";
 "type.shop.dry_cleaning" = "Tintorería";
-"type.shop.electronics" = "Tienda de electrónica";
+"type.shop.electronics" = "Electrónica";
 "type.shop.erotic" = "Tienda erótica";
 "type.shop.fabric" = "Tienda de telas";
 "type.shop.farm" = "Tienda de alimentos de granja";
@@ -1228,7 +1228,7 @@
 "type.shop.funeral_directors" = "Funeraria";
 "type.shop.furniture" = "Tienda de muebles";
 "type.shop.garden_centre" = "Vivero";
-"type.shop.gas" = "Tienda de gas";
+"type.shop.gas" = "Tienda de gasolina";
 "type.shop.gift" = "Tienda de regalos";
 "type.shop.greengrocer" = "Frutería";
 "type.shop.grocery" = "Tienda de comestibles";
@@ -1245,12 +1245,12 @@
 "type.shop.laundry" = "Lavandería";
 "type.shop.mall" = "Centro comercial";
 "type.shop.massage" = "Salón de masajes";
-"type.shop.mobile_phone" = "Tienda de móviles";
+"type.shop.mobile_phone" = "Tienda de Móviles";
 "type.shop.money_lender" = "Prestamista";
 "type.shop.motorcycle" = "Tienda de motos";
 "type.shop.motorcycle_repair" = "Taller de motos";
 "type.shop.music" = "Tienda de discos";
-"type.shop.musical_instrument" = "Tienda de instrumentos musicales";
+"type.shop.musical_instrument" = "Instrumentos musicales";
 "type.shop.newsagent" = "Puesto de venta de periódicos";
 "type.shop.optician" = "Óptica";
 "type.shop.outdoor" = "Equipamiento de ocio al aire libre";
@@ -1303,9 +1303,9 @@
 "type.shop.perfumery" = "Perfumería";
 "type.shop.sewing" = "Materiales de costura";
 "type.shop.storage_rental" = "Alquiler de almacenamiento";
-"type.shop.tobacco" = "Tabaquería";
+"type.shop.tobacco" = "Tabaco";
 "type.shop.trade" = "Suministros comerciales";
-"type.shop.watches" = "Relojería";
+"type.shop.watches" = "Relojes";
 "type.shop.wholesale" = "Tienda al por mayor";
 "type.sport" = "Deporte";
 "type.sport.american_football" = "Fútbol americano";
@@ -1444,11 +1444,11 @@
 "type.piste_type.hike" = "Ruta de senderismo en la nieve";
 "type.piste_type.connection" = "Conexión de pistas";
 "type.piste_type.skitour" = "Sendero Skitour";
-"type.amenity.events_venue" = "Recinto para eventos";
+"type.amenity.events_venue" = "Lugar para eventos";
 "type.shop.auction" = "Subasta";
 "type.shop.collector" = "Coleccionables";
 "type.self_service.yes" = "Autoservicio disponible";
-"type.self_service.only" = "Sólo autoservicio";
+"type.self_service.only" = "Solo autoservicio";
 "type.self_service.partially" = "Autoservicio parcial";
 "type.self_service.no" = "Sin autoservicio";

@@ -1463,7 +1463,7 @@

 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Pabellón deportivo";
-"type.amenity.studio" = "Estudio multimedia";
+"type.amenity.studio" = "Estudio";
 "type.leisure.firepit" = "Fogón";
 "type.amenity.love_hotel" = "Hotel del amor";
 "type.barrier.guard_rail" = "Guardarraíl";
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 "cancel" = "وازدن";

 /* Button which interrupts country download */
-"cancel_download" = "وازدن بارگیری";
+"cancel_download" = "لغو دانلود";

 /* Button which deletes downloaded country */
 "delete" = "سِتُردن";
@@ -351,15 +351,15 @@

 /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */
 "downloader_status_maps" = "نقشه‌ها";
-"downloader_download_all_button" = "بارگیری همه";
-"downloader_downloading" = "بارگیری می‌شود:";
+"downloader_download_all_button" = "دانلود همه";
+"downloader_downloading" = "درحال دانلود:";
 "downloader_search_results" = "یافت شد";

 /* Status of outdated country in the list */
 "downloader_status_outdated" = "بروزرسانی";

 /* Status of failed country in the list */
-"downloader_status_failed" = "ناکام بود";
+"downloader_status_failed" = "ناموفق";

 /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */
 "downloader_delete_map_while_routing_dialog" = "برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید.";
@@ -368,10 +368,10 @@
 "routing_failed_cross_mwm_building" = "تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند.";

 /* Context menu item for downloader. */
-"downloader_download_map" = "بارگیری نقشه";
+"downloader_download_map" = "دانلود نقشه";

 /* Item status in downloader. */
-"downloader_retry" = "تلاش دوباره";
+"downloader_retry" = "تلاش مجدد";

 /* Item in context menu. */
 "downloader_delete_map" = "حذف نقشه";
@@ -385,7 +385,7 @@
 /* bookmark button text */
 "bookmark" = "نشانه‌ها";
 "save" = "ذخیره";
-"create" = "ساختن";
+"create" = "ایجاد";

 /* red color */
 "red" = "قرمز";
@@ -415,13 +415,13 @@
 "deep_purple" = "ارغوانی سیر";

 /* light blue color */
-"light_blue" = "آبی کم‌رنگ";
+"light_blue" = "آبی کمرنگ";

 /* cyan color */
 "cyan" = "فیروزه‌ای";

 /* teal color */
-"teal" = "سبز دودی";
+"teal" = "آبی سیر";

 /* lime color */
 "lime" = "زرد لیمویی";
@@ -457,7 +457,7 @@
 "dialog_routing_select_closer_end" = "لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید.";
 "dialog_routing_change_intermediate" = "ناتوان در تعیین نقطه میانی.";
 "dialog_routing_intermediate_not_determined" = "لطفا نقطه میانی را تنظیم کنید.";
-"dialog_routing_system_error" = "ایرنگ سامانه";
+"dialog_routing_system_error" = "خطای سیستم";
 "dialog_routing_application_error" = "ناتوان در ایجاد مسیر به علت خطای برنامه.";
 "dialog_routing_try_again" = "لطفا دوباره تلاش کنید";
 "dialog_routing_download_and_build_cross_route" = "ایا مایل به دانلود نقشه و ایجاد مسیر‌های بهینه بیشتری که نقشه‌های بیشتری را پوشش میدهد هستید؟";
@@ -467,7 +467,7 @@
 "show" = "نمایش";

 /* «Hide» context menu */
-"hide" = "پنهان کردن";
+"hide" = "مخفی کردن";

 /* Failed planning route message in navigation view */
 "routing_planning_error" = "برنامه ریزی مسیر ناموفق";
@@ -620,7 +620,7 @@
 "error_enter_correct_zip_code" = "یک کد‌ پستی معتبر وارد کنید";

 /* Place Page title for long tap */
-"core_placepage_unknown_place" = "خَجَک نقشه";
+"core_placepage_unknown_place" = "خَجَکِ نقشه";

 /* Title for OSM note section in the editor */
 "editor_other_info" = "توجه به داوطلبان OpenStreetMap (اختیاری)";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
x7z4w	96bf6e1ec1	[drape] Adjust double- and long-tap delays Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-29 23:26:05 +07:00
eisa01	f477d9bb49	[carplay] Add myPositionMode button to iOS <26 workaround See PR #2474 Signed-off-by: eisa01 <eisa01@gmail.com>	2025-12-29 23:12:23 +07:00
eisa01	9ec67097fc	[carplay] Use system buttons for better appearance Signed-off-by: eisa01 <eisa01@gmail.com>	2025-12-29 23:12:23 +07:00
Johannes	c0bdbe1bcb	make sure to use the correct myPositionMode terminology	2025-12-29 23:12:23 +07:00
Johannes	006951a33c	Add position mode toggle for CarPlay	2025-12-29 23:12:23 +07:00
Yannik Bloscheck	bea2148f66	[ios] Don't let custom map appearance influence CarPlay Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-12-29 23:12:23 +07:00
Yannik Bloscheck	9729ab9cab	[ios] Always use light map appearance by default Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-12-29 23:12:23 +07:00
Leonardo Bishop	d448369c04	[ios] Handle distinct FollowAndRotateRoute and FollowAndRotateCompass modes Signed-off-by: Leonardo Bishop <me@leonardobishop.net>	2025-12-29 23:12:23 +07:00
Leonardo Bishop	ee4675b388	[android] Handle distinct FollowAndRotateRoute and FollowAndRotateCompass modes Signed-off-by: Leonardo Bishop <me@leonardobishop.net>	2025-12-29 23:12:23 +07:00
Leonardo Bishop	515cf98cef	[drape] Add FollowAndRotateRoute mode This adds a new mode to rotate the camera towards the route while driving. This is done by looking ahead X number of seconds along the current route, up to the next turn, and calculating the angle between the current position and then. Squashed commits: [drape] Add bearing calculation via route lookahead while navigating [drape] Extract NavigationContext from OnLocationUpdate params [drape] Increase rotation animation duration during navigation [drape] Seperate route and compass rotation into two modes [drape] Reduce route lookahead maximum to 25 seconds [drape] Fix case where rotation was incorrectly considered invalid [drape] Make FollowAndRotateRoute mode only available during driving navigation [drape] Rewrite FollowedPolyline::GetLookaheadPoint [drape] Cleanup Signed-off-by: Leonardo Bishop <me@leonardobishop.net>	2025-12-29 23:12:23 +07:00
Jean-Baptiste	0d01076c0f	[android] Fix camera cutout offset in navigation Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-29 23:12:23 +07:00
thesupertechie	5f0bcc1486	[core] remove random key file Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-29 23:12:23 +07:00
thesupertechie	1edcb23ab2	[tts] add tamil TTS translation Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-29 23:12:22 +07:00
Jean-Baptiste	817b31bc5f	[android] Update Android dependencies Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-29 23:12:22 +07:00