[android] Add Map Layers button to custom left button options

Signed-off-by: Harry Bond <me@hbond.xyz>

Signed-off-by: Harry Bond <me@hbond.xyz>

.forgejo/workflows/android-beta.yaml

@@ -32,13 +32,12 @@ on:
       - track_generator/**
       - xcode/**
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   android-google-beta:
     name: Android Google Beta
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     environment: beta
     steps:
       - name: Install build tools and dependencies

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

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

.forgejo/workflows/android-check.yaml

@@ -34,13 +34,12 @@ on:
       - track_generator/**
       - xcode/**
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   lint:
     name: Android Lint
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
+    container:
+      image: runmymind/docker-android-sdk:latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -59,6 +58,8 @@ jobs:
   android-check:
     name: Build Android Debug
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     strategy:
       fail-fast: false
       matrix:

.forgejo/workflows/android-monkey.yaml

@@ -4,12 +4,9 @@ on:
   schedule:
     - cron:  '0 5 * * 0' # Once per week at 05:00 UTC
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   precondition:
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
     name: Check preconditions
     steps:
       - name: Checkout sources
@@ -34,6 +31,8 @@ jobs:
   android-google-beta:
     name: Android Google Beta
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     needs: precondition
     if: ${{ needs.precondition.outputs.updated != '' }}
     environment: beta

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

@@ -2,13 +2,12 @@ name: Android Release Metadata
 on:
   workflow_dispatch: # Manual trigger
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   android-release-metadata:
     name: Upload Google Play metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
+    container:
+      image: runmymind/docker-android-sdk:latest
     environment: production
     steps:
       - name: Checkout sources

.forgejo/workflows/android-release.yaml

@@ -5,12 +5,13 @@ on:
 env:
   RELEASE_NOTES: android/app/src/google/play/release-notes/en-US/default.txt
   FDROID_VERSION: android/app/src/fdroid/play/version.yaml
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
 
 jobs:
   tag:
     name: Tag
     runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
     environment: production
     steps:
       - name: Checkout sources

.forgejo/workflows/appstream-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.organicmaps.desktop.metainfo.xml
+      - packaging/app.comaps.desktop.metainfo.xml
       - .forgejo/workflows/appstream-check.yaml  # Run check on self change
 
 jobs:
   validate-appstream:
     name: Validate appstream metadata xml
-    runs-on: ubuntu-24.04
+    runs-on: codeberg-tiny
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            packaging/app.organicmaps.desktop.metainfo.xml
+            packaging/app.comaps.desktop.metainfo.xml
 
       - name: Install appstream validator and flatpak Builder
         shell: bash
@@ -29,8 +29,8 @@ jobs:
 
       - name: Lint appstream data with flatpak Builder
         shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.organicmaps.desktop.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.desktop.metainfo.xml
 
       - name: Run appstreamcli in pedantic mode
         shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.organicmaps.desktop.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.desktop.metainfo.xml

.forgejo/workflows/coverage-check.yaml

@@ -33,7 +33,7 @@ concurrency:
 jobs:
   should-run-check:
     name: Should run coverage
-    runs-on: ubuntu-24.04
+    runs-on: codeberg-tiny
     outputs:
       run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
       manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}
@@ -59,14 +59,9 @@ jobs:
   coverage:
     needs: should-run-check
     name: Generate coverage report
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}}
     steps:
-      - name: Free disk space by removing .NET, Android and Haskell
-        shell: bash
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-
       - name: Checkout sources
         uses: actions/checkout@v4
         with:

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

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.organicmaps.desktop.desktop
+      - qt/res/app.comaps.desktop.desktop
       - .forgejo/workflows/desktop-file-check.yaml  # Run check on self change
 
 jobs:
   validate-desktop-file:
     name: Validate .desktop file
-    runs-on: ubuntu-24.04
+    runs-on: codeberg-tiny
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.organicmaps.desktop.desktop
+            qt/res/app.comaps.desktop.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.organicmaps.desktop.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.comaps.desktop.desktop && echo "Successfully validated .desktop file"

.forgejo/workflows/ios-beta.yaml

@@ -66,6 +66,10 @@ jobs:
           CERTIFICATES_DEV_P12: ${{ secrets.CERTIFICATES_DEV_P12 }}
           CERTIFICATES_DISTR_P12: ${{ secrets.CERTIFICATES_DISTR_P12 }}
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Compile and upload to TestFlight
         run: |
           echo "IOS_VERSION=$(../tools/unix/version.sh ios_version)-$(../tools/unix/version.sh ios_build)" >> "$GITHUB_ENV"

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

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

.forgejo/workflows/ios-check.yaml

@@ -59,6 +59,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure XCode cache
         uses: irgaly/xcode-cache@v1
         with:

.forgejo/workflows/linux-check.yaml

@@ -31,18 +31,13 @@ on:
 jobs:
   linux-no-unity:
     name: Linux no unity build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     # Cancels previous jobs if the same branch or PR was updated again.
     concurrency:
       group: ${{ github.workflow }}-no-unity-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
 
     steps:
-      - name: Free disk space by removing .NET, Android and Haskell
-        shell: bash
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -95,7 +90,7 @@ jobs:
 
   linux-matrix:
     name: Linux builds and tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -107,11 +102,6 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - name: Free disk space by removing .NET, Android and Haskell
-        shell: bash
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-
       - name: Checkout sources
         uses: actions/checkout@v4
 

.github/workflows/ios-check.yaml

@@ -37,6 +37,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
+      - name:  Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure XCode cache
         uses: irgaly/xcode-cache@v1
         with:

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

@@ -6,6 +6,7 @@ import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
+import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_MAP_LAYER_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;
@@ -944,6 +945,42 @@ public class MwmActivity extends BaseMwmFragmentActivity
         drawIcon(left);
       }
     });
+
+    buttonsHolder.registerButton(new LeftToggleButton() {
+      //TODO: hide layers button
+      private boolean isLayerActive = false; //TODO: hook up
+
+      @Override
+      public void setChecked(boolean checked)
+      {
+        isLayerActive = checked;
+      }
+
+      @Override
+      public String getCode()
+      {
+        return BUTTON_MAP_LAYER_CODE;
+      }
+
+      @Override
+      public String getPrefsName()
+      {
+        return getString(R.string.layers_title);
+      }
+
+      @Override
+      public void drawIcon(FloatingActionButton imageView)
+      {
+        imageView.setImageResource(isLayerActive ? R.drawable.ic_layers : R.drawable.ic_layers_clear);
+      }
+
+      @Override
+      public void onClick(FloatingActionButton left)
+      {
+        toggleMapLayerBottomSheet();
+        drawIcon(left);
+      }
+    });
   }
 
   private void initNavigationButtons(MapButtonsController.LayoutMode layoutMode)

android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java

@@ -19,6 +19,7 @@ public class LeftButtonsHolder
   public static final String BUTTON_SETTINGS_CODE = "settings";
   public static final String BUTTON_ADD_PLACE_CODE = "add-place";
   public static final String BUTTON_RECORD_TRACK_CODE = "record-track";
+  public static final String BUTTON_MAP_LAYER_CODE = "map-layer";
   private static final String DEFAULT_BUTTON_CODE = BUTTON_HELP_CODE;
 
   private final String leftButtonPreferenceKey;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.addr_interpolation">ঠিকানা/ব্লক</string>
 </resources>

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

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

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

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

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

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

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

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

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

@@ -1227,6 +1227,7 @@
     <string name="type.highway.cycleway">Ποδηλατόδρομος</string>
     <string name="type.highway.cycleway.permissive">Ποδηλατόδρομος</string>
     <string name="type.highway.elevator">Ανελκυστήρας</string>
+    <string name="type.highway.world_level">αυτοκινητόδρομος-κόσμος_επίπεδο</string>
     <string name="type.barrier.wall">Τοίχος</string>
     <string name="type.recycling.cans">Κονσερβοκούτια</string>
     <string name="type.barrier">Εμπόδιο</string>
@@ -1246,4 +1247,5 @@
     <string name="type.area_highway.cycleway">Ποδηλατόδρομος</string>
     <string name="type.aeroway.gate">Πύλη</string>
     <string name="type.amenity.atm">ATM</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

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

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

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

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

@@ -1359,6 +1359,29 @@
     <string name="type.man_made.utility_pole">Poste</string>
     <string name="type.railway.abandoned.tunnel">Túnel ferroviario abandonado</string>
     <string name="type.railway.abandoned.bridge">Puente ferroviario abandonado</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <string name="type.railway.funicular.bridge">Puente de funicular</string>
     <string name="type.railway.funicular.tunnel">Túnel de funicular</string>
     <string name="type.railway.light_rail.tunnel">Túnel de tren ligero</string>

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

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

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

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

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

@@ -1091,5 +1091,6 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">سالن ورزشی</string>
     <string name="type.man_made.silo">سیلو</string>
+    <string name="type.mapswithme">MapsWithMe</string>
     <string name="type.man_made.storage_tank">مخازن سیال</string>
 </resources>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -57,4 +57,5 @@
     <string name="type.highway.busway.tunnel">Tunelis</string>
     <string name="type.aeroway.aerodrome.international">Starptautiskā lidosta</string>
     <string name="type.highway.bus_stop">Pietura</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -544,6 +544,8 @@
     <string name="type.area_highway.track">Track</string>
     <string name="type.area_highway.trunk">Trunk Road</string>
     <string name="type.area_highway.unclassified">Minor Road</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Historic Object</string>
     <string name="type.historic.aircraft">Historic Aircraft</string>
@@ -589,6 +591,19 @@
     <string name="type.historic.wayside_cross">Wayside Cross</string>
     <string name="type.historic.wayside_shrine">Wayside Shrine</string>
     <string name="type.historic.wreck">Shipwreck</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Internet</string>
     <string name="type.junction">Junction</string>
@@ -702,6 +717,8 @@
     <string name="type.man_made.water_well.drinking_water_no">Water Well</string>
     <string name="type.man_made.windmill">Windmill</string>
     <string name="type.man_made.works">Industrial Works</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
     <string name="type.military">Military</string>
     <string name="type.military.bunker">Bunker</string>
     <string name="type.mountain_pass">Mountain Pass</string>
@@ -826,6 +843,11 @@
     <string name="type.power.pole">Power Pole</string>
     <!-- A single pole supporting various public utilities, such as lighting or telephony. -->
     <string name="type.man_made.utility_pole">Utility Pole</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.public_transport">Public Transport</string>
     <string name="type.public_transport.platform">Platform</string>
     <string name="type.railway">Railway</string>
@@ -1125,6 +1147,7 @@
     <string name="type.railway.tram_stop">Tram Stop</string>
     <string name="type.route">Route</string>
     <string name="type.route.ferry">Ferry</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.shop">Shop</string>
     <string name="type.shop.alcohol">Liquor Shop</string>
     <string name="type.shop.bakery">Bakery</string>

docs/INSTALL.md

@@ -87,6 +87,8 @@ brew install wget optipng cmake qt
 #### Clone the repository
 ```bash
 git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/comaps.git
+cd comaps
+./configure.sh
 ```
 
 ### Special cases options

docs/STYLES.md

@@ -10,8 +10,8 @@ Here is the basic workflow to update styles:
 Please prepend `[styles]` to your commit message and add [Developers Certificate of Origin](CONTRIBUTING.md#legal-requirements) to it.
 Files changed by the script should be added as a separate `[styles] Regenerated` commit.
 
-Please check [a list of current styling issues](https://codeberg.org/comaps/comaps/issues?q=is%3Aopen+is%3Aissue+label%3AStyles)
-and ["icons wanted" issues](https://codeberg.org/comaps/comaps/issues?q=is%3Aopen+is%3Aissue+label%3AIcons+label%3A%22Good+first+issue%22).
+Please check [a list of current styling issues](https://codeberg.org/comaps/comaps/issues?q=&type=all&sort=&labels=410439)
+and ["icons" issues](https://codeberg.org/comaps/comaps/issues?q=&type=all&sort=&labels=446883).
 
 An overview of currently used icons can be found in the [Wiki](https://codeberg.org/comaps/comaps/wiki/Icons).
 

docs/TEAMS.md

@@ -1,20 +1,24 @@
 # Teams
 
-CoMaps is led by community contributors, with functional domains occasionally establishing or dissolving their leadership structures, formal or informal. This file outlines the functional project structure that has evolved over time. The current list of teams is available on [Codeberg](https://codeberg.org/orgs/comaps/teams).
+CoMaps is led by community contributors, with functional domains occasionally establishing or dissolving their leadership structures, formal or informal. This file outlines the functional project structure that has evolved over time. The current list of teams is available on [Codeberg]https://codeberg.org/org/comaps/teams).
 
-Teams are typically assigned as code owners for certain sections of the repository. Codeberg will automatically request a review from the responsible team when changes are made to the relevant part of the repository in a pull request. See the [CODEOWNERS](../.forgejo/CODEOWNERS) file for more information. Please feel free to tag the relevant team in the comments if you need assistance in a specific area. If you are unsure which team to contact, please tag [@comaps/triage](https://codeberg.org/orgs/comaps/teams/contributors/triage) for help.
+## Members
 
-## Triage
+- [@comaps/members](https://codeberg.org/org/comaps/teams/members)
 
-- [@comaps/triage](https://codeberg.org/org/comaps/teams)
+Active contributors on different projects around CoMaps
 
-People who help with triaging incoming issues and pull requests. Tag this group if you are unsure which team to tag.
+## Owners
 
-## Mergers
+- [@comaps/owners](https://codeberg.org/org/comaps/teams/owners)
 
-- [@comaps/mergers](https://codeberg.org/org/comaps/teams)
+Owners of the CoMaps team and repositories on Codeberg
 
-People who can merge pull requests that are ready.
+## Admins
+
+- [@comaps/admins](https://codeberg.org/org/comaps/teams/admins)
+
+- Administrators of different repositories on Codeberg
 
 ## Android
 
@@ -22,95 +26,32 @@ People who can merge pull requests that are ready.
 
 Android experts.
 
-### Android Auto
-
-Android Auto experts (a subteam of Android).
-
-- [@comaps/android-auto](https://codeberg.org/org/comaps/teams)
-
 ## iOS
 
-- [@comaps/ios](https://codeberg.org/org/comaps/teams)
+- [@comaps/ios](https://codeberg.org/org/comaps/teams/ios)
 
 iOS experts.
 
-## Qt
-
-- [@comaps/qt](https://codeberg.org/org/comaps/teams)
-
-Qt Desktop & Convergent UI experts.
-
 ## C++
 
-- [@comaps/cpp](https://codeberg.org/org/comaps/teams)
+- [@comaps/cpp](https://codeberg.org/org/comaps/teams/cpp)
 
 C++ experts.
 
-## Rendering
+## Server
 
-- [@comaps/rendering](https://codeberg.org/org/comaps/teams)
+- [@comaps/server](https://codeberg.org/org/comaps/teams/server)
 
-Rendering experts.
-
-## Data
-
-- [@comaps/map](https://codeberg.org/org/comaps/teams)
-- [#data](https://comaps.zulipchat.com/#narrow/channel/477127-Data)
-
-Map data generation team.
-
-## Styles
-
-- [@comaps/styles](https://codeberg.org/org/comaps/teams)
-
-Map styles team.
-
-## DevOps
-
-- [@comaps/devops](https://codeberg.org/org/comaps/teams)
-
-DevOps team.
-
-## Design
-
-- [@comaps/design](https://codeberg.org/org/comaps/teams)
-
-Visual design (icons, graphics, colors, contrast, etc.).
+Management of website server, generator server
 
 ## Web
 
-- [@comaps/web](https://codeberg.org/org/comaps/teams)
+- [@comaps/website](https://codeberg.org/org/comaps/teams/website)
 
 Web development experts.
 
-## Growth
-
-- [@comaps/growth](https://codeberg.org/org/comaps/teams)
-
-Marketing, ASO, SEO, and SMM experts.
-
-## Product
-
-- [@comaps/product](https://codeberg.org/org/comaps/teams)
-
-Product management group.
-
 ## Translations
 
-- [@comaps/translations](https://codeberg.org/org/comaps/teams)
+- [@comaps/translations](https://codeberg.org/org/comaps/teams/translations)
 
 Internationalization and localization.
-
-Tag [@comaps/translations-langcode](https://codeberg.org/org/comaps/teams) (e.g. @comaps/translations-fr) for specific language.
-
-## Support
-
-- [@comaps/support](https://codeberg.org/org/comaps/teams)
-
-End-user support: feedback in stores, emails, user-facing docs (FAQs).
-
-## Legal
-
-- [@comaps/legal](https://codeberg.org/org/comaps/teams)
-
-Legal team.

iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Pad";
 "type.area_highway.trunk" = "Hoofpad";
 "type.area_highway.unclassified" = "Straat";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Historiese voorwerp";
 "type.historic.aircraft" = "Historic Aircraft";
 "type.historic.anchor" = "Historic Anchor";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Wegkruis";
 "type.historic.wayside_shrine" = "Kruisbeeld";
 "type.historic.wreck" = "Shipwreck";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Kruising";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Waterput";
 "type.man_made.windmill" = "Windmeule";
 "type.man_made.works" = "Fabriek";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militêr";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Bergpas";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "Padoppervlak";
+"type.psurface.paved_bad" = "Geteer";
+"type.psurface.paved_good" = "Geteer";
+"type.psurface.unpaved_bad" = "Ongeteer";
+"type.psurface.unpaved_good" = "Ongeteer";
 "type.public_transport" = "Openbare vervoer";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Spoorweg";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tremhalte";
 "type.route" = "Roete";
 "type.route.ferry" = "Veerboot";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Winkel";
 "type.shop.alcohol" = "Drankwinkel";
 "type.shop.bakery" = "Bakkery";

iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "شارع";
 "type.area_highway.trunk" = "شارع وطني";
 "type.area_highway.unclassified" = "شارع صغير";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "مكان تاريخي";
 "type.historic.aircraft" = "الطائرات التاريخية";
 "type.historic.anchor" = "مرساة تاريخية";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "صليب جانب الطريق";
 "type.historic.wayside_shrine" = "ضريح جانب الطريق";
 "type.historic.wreck" = "حطام سفينة";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "إنترنت";
 "type.internet_access.wlan" = "إنترنت";
 "type.junction" = "تقاطع";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "بئر ماء";
 "type.man_made.windmill" = "طاحونة هواء";
 "type.man_made.works" = "Industrial Works";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "عسكري";
 "type.military.bunker" = "ملجأ";
 "type.mountain_pass" = "Mountain Pass";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Public Transport";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "موقف ترام";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "متجر";
 "type.shop.alcohol" = "متجر مشروبات كحولية";
 "type.shop.bakery" = "مخبز";

iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings

@@ -156,6 +156,7 @@
 "type.amenity.hospital" = "Hospital";
 "type.amenity.college" = "Enseñu posobligatoriu";
 "type.craft.confectionery" = "Confitería";
+"type.mapswithme" = "MapsWithMe";
 "type.healthcare.alternative" = "Alternative Medicine";
 "type.craft.caterer" = "Caterer";
 "type.railway" = "Railway";
@@ -197,7 +198,12 @@
 "type.highway.trunk_link" = "Trunk Road Ramp";
 "type.highway.trunk" = "Trunk Road";
 "type.area_highway.trunk" = "Trunk Road";
+"type.highway.world_level" = "highway-world_level";
 "type.area_highway.steps" = "Stairs";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag" = "hwtag";
+"type.hwtag.nocar" = "hwtag-nocar";
 "type.landuse.flowerbed" = "Flowerbed";
 "type.landuse.field" = "Field";
 "type.landuse.farmyard" = "Farmyard";
@@ -268,9 +274,14 @@
 "type.power" = "Power";
 "type.shop.agrarian" = "Agricultural Shop";
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
 "type.power.tower" = "Power Tower";
 "type.landuse.religious" = "Religious Land";
+"type.psurface" = "psurface";
+"type.psurface.paved_good" = "psurface-paved_good";
 "type.power.pole" = "Power Pole";
+"type.psurface.paved_bad" = "psurface-paved_bad";
 "type.railway.station.subway.ankara" = "Subway Station";
 "type.railway.station.subway.bengalore" = "Subway Station";
 "type.railway.station.subway.barcelona" = "Subway Station";
@@ -304,6 +315,7 @@
 "type.shop.beverages" = "Beverages";
 "type.shop.bathroom_furnishing" = "Bathroom Furnishings";
 "type.shop.bookmaker" = "Bookmaker";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop.bicycle" = "Bicycle Shop";
 "type.shop.bakery" = "Bakery";
 "type.shop.alcohol" = "Liquor Shop";
@@ -398,6 +410,7 @@
 "type.sport.padel" = "Padel";
 "type.shop.convenience" = "Convenience Store";
 "type.area_highway.footway" = "Foot Path";
+"type.hwtag.toll" = "hwtag-toll";
 "type.shop.gift" = "Gift Shop";
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 "type.railway.station.subway.isfahan" = "Subway Station";
@@ -554,6 +567,7 @@
 "type.highway.secondary" = "Secondary Road";
 "type.piste_type.nordic" = "Nordic Ski Trail";
 "type.sport.curling" = "Curling";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.highway.tertiary_link" = "Tertiary Road Ramp";
 "type.aerialway.platter" = "Platter Lift";
 "type.railway.subway_entrance" = "Subway Entrance";
@@ -623,6 +637,7 @@
 "type.shop.rental" = "Rental Shop";
 "type.waterway.drain.tunnel" = "Culvert";
 "type.tourism.zoo.petting" = "Petting Zoo";
+"type.hwtag.yescar" = "hwtag-yescar";
 "type.shop.cosmetics" = "Cosmetics Shop";
 "type.organic.only" = "Organic";
 "type.landuse.greenfield" = "Greenfield";
@@ -692,6 +707,7 @@
 "type.railway.subway_entrance.london" = "Metro Station Entrance";
 "type.railway.subway_entrance.roma" = "Subway Entrance";
 "type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
 "type.building.train_station" = "Station Building";
 "type.railway.station.subway.nnov" = "Subway Station";
 "type.place.state" = "State";
@@ -904,6 +920,7 @@
 "type.piste_type.downhill.advanced.area" = "Advanced Downhill Ski Run";
 "type.historic.castle.kremlin" = "Kremlin";
 "type.public_transport.platform" = "Platform";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.waterway.stream.ephemeral" = "Ephemeral Stream";
 "type.amenity.bbq" = "Barbecue Grill";
 "type.landuse.reservoir" = "Reservoir";
@@ -921,6 +938,7 @@
 "type.shop.medical_supply" = "Medical Supplies Store";
 "type.military.bunker" = "Bunker";
 "type.barrier.guard_rail" = "Guard Rail";
+"type.hwtag.private" = "hwtag-private";
 "type.highway.footway.bicycle" = "Cycle & Foot Path";
 "type.barrier.border_control" = "Border Control";
 "type.sport.scuba_diving" = "Scuba Diving Site";
@@ -933,6 +951,7 @@
 "type.leisure.amusement_arcade" = "Arcade";
 "type.shop.bed" = "Bed Shop";
 "type.amenity.parcel_locker" = "Parcel Locker";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
 "type.historic.pillory" = "Pillory";
 "type.barrier.block" = "Block";
 "type.historic.archaeological_site" = "Archaeological Site";
@@ -975,6 +994,7 @@
 "type.cuisine.ethiopian" = "Ethiopian";
 "type.railway.subway_entrance.malaga" = "Subway Entrance";
 "type.waterway.dock" = "Waterway Dock";
+"type.hwtag.oneway" = "hwtag-oneway";
 "type.cuisine.russian" = "Russian";
 "type.attraction.animal" = "Animal Enclosure";
 "type.sport.ice_hockey" = "Ice Hockey";
@@ -1056,6 +1076,7 @@
 "type.shop.tea" = "Tea Shop";
 "type.place.county" = "County";
 "type.aerialway.gondola" = "Gondola";
+"type.hwtag.lit" = "hwtag-lit";
 "type.building.garage" = "Garage";
 "type.railway.station.subway.milan" = "Subway Station";
 "type.natural.glacier" = "Glacier";
@@ -1236,6 +1257,8 @@
 "type.cuisine.thai" = "Thai";
 "type.leisure.miniature_golf" = "Minigolf";
 "type.internet_access.wlan" = "Internet";
+"type.mapswithme.grid" = "mapswithme-grid";
+"type.hwtag.nofoot" = "hwtag-nofoot";
 "type.shop.charity" = "Charity Shop";
 "type.leisure.outdoor_seating" = "Outdoor Seating";
 "type.railway.subway_entrance.brescia" = "Subway Entrance";

iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Uçuş zolağı";
 "type.area_highway.trunk" = "Dövlət şossesi";
 "type.area_highway.unclassified" = "Yan yol";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Tarix";
 "type.historic.aircraft" = "Tarixi Təyyarə";
 "type.historic.anchor" = "Tarixi Çapa";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Xristian xaç";
 "type.historic.wayside_shrine" = "Məbəd";
 "type.historic.wreck" = "Gəmi qəzası";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "İnternet";
 "type.internet_access.wlan" = "İnternet";
 "type.junction" = "Qovşaq nöqtəsi";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Su quyusu";
 "type.man_made.windmill" = "Yel dəyirmanı";
 "type.man_made.works" = "Sənaye İşləri";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Hərbi";
 "type.military.bunker" = "Sığınacaq";
 "type.mountain_pass" = "Boğaz";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "İctimai nəqliyyat";
 "type.public_transport.platform" = "Platforma";
 "type.railway" = "Dəmir yolu";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tramvay dayanacağı";
 "type.route" = "Marşrut";
 "type.route.ferry" = "Bərə";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Ticarət mərkəzi";
 "type.shop.alcohol" = "Içki mağazası";
 "type.shop.bakery" = "Soba";

iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Track";
 "type.area_highway.trunk" = "Траса";
 "type.area_highway.unclassified" = "Minor Road";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Гістарычны аб'ект";
 "type.historic.aircraft" = "Гістарычныя самалёты";
 "type.historic.anchor" = "Гістарычны якар";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Прыдарожны крыж";
 "type.historic.wayside_shrine" = "Прыдарожная святыня";
 "type.historic.wreck" = "Караблекрушэнне";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Junction";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Water Well";
 "type.man_made.windmill" = "Windmill";
 "type.man_made.works" = "Industrial Works";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Military";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Перавал";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Public Transport";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tram Stop";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Shop";
 "type.shop.alcohol" = "Liquor Shop";
 "type.shop.bakery" = "Bakery";

iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings

@@ -594,6 +594,8 @@
 "type.area_highway.track" = "Пътека";
 "type.area_highway.trunk" = "Автомагистрала";
 "type.area_highway.unclassified" = "Малък път";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Исторически обект";
 "type.historic.aircraft" = "Исторически самолет";
 "type.historic.anchor" = "Историческа котва";
@@ -640,6 +642,19 @@
 "type.historic.wayside_cross" = "Крайпътен кръст";
 "type.historic.wayside_shrine" = "Крайпътно светилище";
 "type.historic.wreck" = "корабокрушение";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Съединение";
@@ -756,6 +771,8 @@
 "type.man_made.water_well.drinking_water_no" = "Кладенец";
 "type.man_made.windmill" = "Вятърна мелница";
 "type.man_made.works" = "Промишлени предприятия";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Военни";
 "type.military.bunker" = "Бункер";
 "type.mountain_pass" = "Планински проход";
@@ -882,6 +899,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Стълб за комунални услуги";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Обществен транспорт";
 "type.public_transport.platform" = "Платформа";
 "type.railway" = "Железопътна линия";
@@ -1183,6 +1205,7 @@
 "type.railway.tram_stop" = "Трамвайна спирка";
 "type.route" = "Маршрут";
 "type.route.ferry" = "Ферибот";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Магазин";
 "type.shop.alcohol" = "Магазин за алкохол";
 "type.shop.bakery" = "Пекарна";

iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings

@@ -1,3 +1,4 @@
+"type.mapswithme" = "MapsWithMe";
 "type.addr_interpolation" = "ঠিকানা/ব্লক";
 "type.aerialway.drag_lift" = "Drag Lift";
 "type.aeroway.helipad" = "Helipad";
@@ -245,6 +246,7 @@
 "type.sport.bowls" = "Bowls";
 "type.highway.motorway.tunnel" = "Motorway Tunnel";
 "type.railway.subway_entrance.warszawa" = "Subway Entrance";
+"type.psurface" = "psurface";
 "type.tourism.camp_site" = "Campground";
 "type.entrance.exit" = "Exit";
 "type.amenity.vehicle_inspection" = "Vehicle Inspection";
@@ -256,6 +258,7 @@
 "type.cuisine.american" = "American";
 "type.natural.bare_rock" = "Bare Rock";
 "type.piste_type.downhill.intermediate.area" = "Intermediate Downhill Ski Run";
+"type.psurface.paved_good" = "psurface-paved_good";
 "type.cuisine.beef_bowl" = "Beef Bowl";
 "type.tourism.motel" = "Motel";
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
@@ -284,6 +287,7 @@
 "type.shop.fashion_accessories" = "Fashion Accessories";
 "type.railway.subway_entrance.bangkok" = "Subway Entrance";
 "type.amenity.charging_station" = "Charging Station";
+"type.highway.world_level" = "highway-world_level";
 "type.piste_type.downhill.easy.area" = "Easy Downhill Ski Run";
 "type.landuse.forest" = "Forest";
 "type.leisure" = "Leisure";
@@ -329,6 +333,7 @@
 "type.historic.castle.kremlin" = "Kremlin";
 "type.railway.station.light_rail.berlin" = "S-Bahn Station";
 "type.public_transport.platform" = "Platform";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.natural.geyser" = "Geyser";
 "type.amenity.bbq" = "Barbecue Grill";
 "type.landuse.reservoir" = "Reservoir";
@@ -346,6 +351,7 @@
 "type.military.bunker" = "Bunker";
 "type.barrier.guard_rail" = "Guard Rail";
 "type.amenity.bar" = "Bar";
+"type.hwtag.private" = "hwtag-private";
 "type.highway.footway.bicycle" = "Cycle & Foot Path";
 "type.barrier.border_control" = "Border Control";
 "type.sport.scuba_diving" = "Scuba Diving Site";
@@ -359,6 +365,7 @@
 "type.tourism.museum" = "Museum";
 "type.amenity.school" = "School";
 "type.amenity.parcel_locker" = "Parcel Locker";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
 "type.historic.pillory" = "Pillory";
 "type.barrier.block" = "Block";
 "type.man_made.tower" = "Tower";
@@ -403,6 +410,7 @@
 "type.railway.subway_entrance.bucharest" = "Subway Entrance";
 "type.cuisine.ethiopian" = "Ethiopian";
 "type.railway.subway_entrance.malaga" = "Subway Entrance";
+"type.hwtag.oneway" = "hwtag-oneway";
 "type.cuisine.russian" = "Russian";
 "type.attraction.animal" = "Animal Enclosure";
 "type.sport.ice_hockey" = "Ice Hockey";
@@ -415,6 +423,7 @@
 "type.railway.subway_entrance.valencia" = "Subway Entrance";
 "type.highway.track.tunnel" = "Tunnel";
 "type.amenity.hunting_stand" = "Hunting Stand";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.railway.disused" = "Disused Railway";
 "type.man_made.pipeline" = "Pipeline";
 "type.highway.motorway" = "Motorway";
@@ -486,6 +495,7 @@
 "type.amenity.casino" = "Casino";
 "type.aerialway.gondola" = "Gondola";
 "type.man_made.mast" = "Mast";
+"type.hwtag.lit" = "hwtag-lit";
 "type.building.garage" = "Garage";
 "type.natural.glacier" = "Glacier";
 "type.cuisine.ramen" = "Ramen";
@@ -668,6 +678,7 @@
 "type.craft.beekeeper" = "Beekeeper";
 "type.cuisine.mexican" = "Mexican";
 "type.healthcare.optometrist" = "Optometrist";
+"type.psurface.paved_bad" = "psurface-paved_bad";
 "type.cuisine.oriental" = "East Asian";
 "type.railway.station.subway.santo_domingo" = "Subway Station";
 "type.aeroway.aerodrome" = "Airport";
@@ -677,6 +688,8 @@
 "type.sport.equestrian" = "Equestrian Sports";
 "type.cuisine.thai" = "Thai";
 "type.internet_access.wlan" = "Internet";
+"type.mapswithme.grid" = "mapswithme-grid";
+"type.hwtag.nofoot" = "hwtag-nofoot";
 "type.shop.charity" = "Charity Shop";
 "type.leisure.outdoor_seating" = "Outdoor Seating";
 "type.railway.subway_entrance.cairo" = "Subway Entrance";
@@ -779,6 +792,7 @@
 "type.waterway.lock_gate" = "Lock Gate";
 "type.waterway.river" = "River";
 "type.highway.track" = "Track";
+"type.hwtag.toll" = "hwtag-toll";
 "type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
 "type.place.square" = "Square";
 "type.place.neighbourhood" = "Neighbourhood";
@@ -994,6 +1008,7 @@
 "type.highway.secondary_link.tunnel" = "Tunnel";
 "type.office.lawyer" = "Lawyer";
 "type.shop.jewelry" = "Jewelry Store";
+"type.hwtag.nocar" = "hwtag-nocar";
 "type.highway.footway.bridge" = "Pedestrian Bridge";
 "type.amenity.shelter.public_transport" = "Shelter";
 "type.railway.station.subway.saopaulo" = "Subway Station";
@@ -1001,6 +1016,7 @@
 "type.cuisine.persian" = "Persian";
 "type.area_highway.residential" = "Residential Street";
 "type.place.hamlet" = "Hamlet";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
 "type.railway.subway_entrance.rotterdam" = "Subway Entrance";
 "type.man_made.water_tap" = "Water Tap";
 "type.natural.heath" = "Heath";
@@ -1018,6 +1034,7 @@
 "type.cuisine.balkan" = "Balkan";
 "type.craft.key_cutter" = "Key Cutting";
 "type.amenity.vending_machine" = "Vending Machine";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
 "type.highway.busway" = "Dedicated Bus Road";
 "type.amenity.parking_space.permissive" = "Parking Space";
 "type.shop.trade" = "Trade Supplies";
@@ -1032,6 +1049,7 @@
 "type.highway.bridleway.tunnel" = "Tunnel";
 "type.sport.curling" = "Curling";
 "type.aerialway.station" = "Aerialway Station";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.highway.tertiary_link" = "Tertiary Road Ramp";
 "type.highway.path" = "Path";
 "type.aeroway.apron" = "Apron";
@@ -1108,6 +1126,7 @@
 "type.historic.castle" = "Castle";
 "type.waterway.drain.tunnel" = "Culvert";
 "type.tourism.zoo.petting" = "Petting Zoo";
+"type.hwtag.yescar" = "hwtag-yescar";
 "type.shop.cosmetics" = "Cosmetics Shop";
 "type.leisure.slipway" = "Slipway";
 "type.landuse.greenfield" = "Greenfield";
@@ -1134,6 +1153,7 @@
 "type.railway.tram_stop" = "Tram Stop";
 "type.highway.pedestrian.tunnel" = "Pedestrian Tunnel";
 "type.amenity.parking_entrance" = "Parking Entrance";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.amenity.loading_dock" = "Loading Dock";
 "type.railway.subway_entrance.ankara" = "Subway Entrance";
 "type.railway.station.subway.kazan" = "Subway Station";
@@ -1158,6 +1178,7 @@
 "type.traffic_calming.bump" = "Traffic Bump";
 "type.waterway.canal.tunnel" = "Canal Tunnel";
 "type.shop.computer" = "Computer Store";
+"type.hwtag" = "hwtag";
 "type.amenity.place_of_worship.christian.jehovahs_witness" = "Jehovah's Witnesses Kingdom Hall";
 "type.craft.winery" = "Winery";
 "type.man_made.flare" = "Gas Flare";
@@ -1177,6 +1198,7 @@
 "type.railway.subway_entrance.london" = "Metro Station Entrance";
 "type.railway.subway_entrance.saopaulo" = "Subway Entrance";
 "type.building.train_station" = "Station Building";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
 "type.highway.cycleway" = "Cycle Path";
 "type.cuisine.vegetarian" = "Vegetarian";
 "type.cuisine.malaysian" = "Malaysian";
@@ -1197,6 +1219,7 @@
 "type.shop.garden_centre" = "Garden Center";
 "type.piste_type.downhill.expert" = "Expert Downhill Ski Run";
 "type.cuisine.malagasy" = "Malagasy";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
 "type.railway.station.subway.brasilia" = "Subway Station";
 "type.railway.subway_entrance.catania" = "Subway Entrance";
 "type.power.tower" = "Power Tower";

iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Track";
 "type.area_highway.trunk" = "Carretera nacional";
 "type.area_highway.unclassified" = "Minor Road";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Objecte històric";
 "type.historic.aircraft" = "Avions històrics";
 "type.historic.anchor" = "Àncora històrica";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Wayside Cross";
 "type.historic.wayside_shrine" = "Wayside Shrine";
 "type.historic.wreck" = "Naufragi";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Cruïlla";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Pou d’aigua";
 "type.man_made.windmill" = "Molí de vent";
 "type.man_made.works" = "Fàbrica";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Military";
 "type.military.bunker" = "Búnquer";
 "type.mountain_pass" = "Mountain Pass";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Pal";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Transport públic";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tram Stop";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Shop";
 "type.shop.alcohol" = "Liquor Shop";
 "type.shop.bakery" = "Forn de pa";

iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Ulice";
 "type.area_highway.trunk" = "Ulice";
 "type.area_highway.unclassified" = "Ulice";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Historický objekt";
 "type.historic.aircraft" = "Historická letadla";
 "type.historic.anchor" = "Historická kotva";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Přícestný kříž";
 "type.historic.wayside_shrine" = "Drobná sakrální památka";
 "type.historic.wreck" = "Vrak";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Křižovatka";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Studna";
 "type.man_made.windmill" = "Větrný mlýn";
 "type.man_made.works" = "Průmysl";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Armáda";
 "type.military.bunker" = "Bunkr";
 "type.mountain_pass" = "Horské sedlo";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Užitkový sloup";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Veřejná doprava";
 "type.public_transport.platform" = "Nástupiště";
 "type.railway" = "Železnice";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tramvajová zastávka";
 "type.route" = "Trasa";
 "type.route.ferry" = "Přívoz";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Obchod";
 "type.shop.alcohol" = "Obchod s alkoholem";
 "type.shop.bakery" = "Pekařství";

iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings

@@ -73,6 +73,7 @@
 "type.amenity.ice_cream" = "Ice Cream";
 "type.railway.rail.branch.bridge" = "Railway Bridge";
 "type.shop.convenience" = "Convenience Store";
+"type.hwtag.toll" = "hwtag-toll";
 "type.shop.gift" = "Gift Shop";
 "type.railway.station.subway.isfahan" = "Subway Station";
 "type.boundary.administrative" = "Administrative Boundary";
@@ -271,6 +272,7 @@
 "type.office.lawyer" = "Lawyer";
 "type.amenity.recycling" = "Recycling Container";
 "type.shop.jewelry" = "Jewelry Store";
+"type.hwtag.nocar" = "hwtag-nocar";
 "type.recycling.cartons" = "Cartons";
 "type.railway.subway_entrance.montreal" = "Subway Entrance";
 "type.highway.footway.bridge" = "Pedestrian Bridge";
@@ -284,6 +286,7 @@
 "type.shop.collector" = "Collectables";
 "type.amenity.post_box" = "Mailbox";
 "type.place.hamlet" = "Hamlet";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
 "type.addr_interpolation" = "Cyfeiriad/Bloc";
 "type.railway.subway_entrance.rotterdam" = "Subway Entrance";
 "type.man_made.water_tap" = "Water Tap";
@@ -309,6 +312,7 @@
 "type.craft.key_cutter" = "Key Cutting";
 "type.amenity.vending_machine" = "Vending Machine";
 "type.railway.station.subway.paris" = "Subway Station";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
 "type.highway.busway" = "Dedicated Bus Road";
 "type.amenity.parking_space.permissive" = "Parking Space";
 "type.historic.monument" = "Monument";
@@ -327,6 +331,7 @@
 "type.highway.bridleway.tunnel" = "Tunnel";
 "type.sport.curling" = "Curling";
 "type.aerialway.station" = "Gorsaf Awyrffordd";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.highway.tertiary_link" = "Tertiary Road Ramp";
 "type.highway.path" = "Path";
 "type.aeroway.apron" = "Apron";
@@ -422,6 +427,7 @@
 "type.railway.station.subway.shiraz" = "Subway Station";
 "type.tourism.zoo.petting" = "Petting Zoo";
 "type.amenity.ranger_station" = "Ranger Station";
+"type.hwtag.yescar" = "hwtag-yescar";
 "type.shop.cosmetics" = "Cosmetics Shop";
 "type.leisure.slipway" = "Slipway";
 "type.railway.station.subway.philadelphia" = "Subway Station";
@@ -459,6 +465,7 @@
 "type.highway.pedestrian.tunnel" = "Pedestrian Tunnel";
 "type.amenity.parking_entrance" = "Parking Entrance";
 "type.railway.station.subway.amsterdam" = "Subway Station";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.amenity.loading_dock" = "Loading Dock";
 "type.railway.subway_entrance.ankara" = "Subway Entrance";
 "type.railway.station.subway.kazan" = "Subway Station";
@@ -490,6 +497,7 @@
 "type.cuisine.ice_cream" = "Ice Cream";
 "type.shop.computer" = "Computer Store";
 "type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.hwtag" = "hwtag";
 "type.amenity.place_of_worship.christian.jehovahs_witness" = "Jehovah's Witnesses Kingdom Hall";
 "type.craft.winery" = "Winery";
 "type.man_made.flare" = "Gas Flare";
@@ -517,6 +525,7 @@
 "type.railway.station.subway.nnov" = "Subway Station";
 "type.place.state" = "State";
 "type.railway.station.subway.barcelona" = "Subway Station";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
 "type.place.town" = "Town";
 "type.leisure.park" = "Park";
 "type.highway.cycleway" = "Cycle Path";
@@ -550,6 +559,7 @@
 "type.piste_type.downhill.expert" = "Expert Downhill Ski Run";
 "type.shop.bathroom_furnishing" = "Bathroom Furnishings";
 "type.cuisine.malagasy" = "Malagasy";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
 "type.railway.station.subway.brasilia" = "Subway Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.power.tower" = "Power Tower";
@@ -672,6 +682,7 @@
 "type.amenity.parking.street_side" = "Street-Side Parking";
 "type.highway.motorway.tunnel" = "Motorway Tunnel";
 "type.railway.subway_entrance.warszawa" = "Subway Entrance";
+"type.psurface" = "psurface";
 "type.tourism.camp_site" = "Campground";
 "type.entrance.exit" = "Exit";
 "type.emergency.lifeguard" = "Lifeguard";
@@ -687,6 +698,7 @@
 "type.cuisine.american" = "American";
 "type.natural.bare_rock" = "Bare Rock";
 "type.piste_type.downhill.intermediate.area" = "Intermediate Downhill Ski Run";
+"type.psurface.paved_good" = "psurface-paved_good";
 "type.cuisine.beef_bowl" = "Beef Bowl";
 "type.tourism.motel" = "Motel";
 "type.railway.subway_entrance.lyon" = "Subway Entrance";
@@ -725,6 +737,7 @@
 "type.barrier.retaining_wall" = "Retaining Wall";
 "type.railway.subway_entrance.bangkok" = "Subway Entrance";
 "type.amenity.charging_station" = "Charging Station";
+"type.highway.world_level" = "highway-world_level";
 "type.piste_type.downhill.easy.area" = "Easy Downhill Ski Run";
 "type.landuse.forest" = "Forest";
 "type.leisure.track" = "Track";
@@ -791,6 +804,7 @@
 "type.historic.castle.kremlin" = "Kremlin";
 "type.railway.station.light_rail.berlin" = "S-Bahn Station";
 "type.public_transport.platform" = "Platform";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.natural.geyser" = "Geyser";
 "type.waterway.stream.ephemeral" = "Ephemeral Stream";
 "type.amenity.bbq" = "Barbecue Grill";
@@ -804,6 +818,7 @@
 "type.railway.subway_entrance.rennes" = "Subway Entrance";
 "type.railway.station.subway.malaga" = "Subway Station";
 "type.railway.station.subway.spb" = "Subway Station";
+"type.mapswithme" = "mapswithme";
 "type.shop.pet_grooming" = "Pet Grooming";
 "type.shop.stationery" = "Stationery Shop";
 "type.craft.confectionery" = "Confectioner";
@@ -811,6 +826,7 @@
 "type.military.bunker" = "Bunker";
 "type.barrier.guard_rail" = "Guard Rail";
 "type.amenity.bar" = "Bar";
+"type.hwtag.private" = "hwtag-private";
 "type.cuisine.coffee_shop" = "Coffee";
 "type.highway.footway.bicycle" = "Cycle & Foot Path";
 "type.barrier.border_control" = "Border Control";
@@ -828,6 +844,7 @@
 "type.tourism.museum" = "Museum";
 "type.amenity.school" = "School";
 "type.amenity.parcel_locker" = "Parcel Locker";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
 "type.historic.pillory" = "Pillory";
 "type.barrier.block" = "Block";
 "type.man_made.tower" = "Tower";
@@ -884,6 +901,7 @@
 "type.cuisine.ethiopian" = "Ethiopian";
 "type.railway.subway_entrance.malaga" = "Subway Entrance";
 "type.waterway.dock" = "Waterway Dock";
+"type.hwtag.oneway" = "hwtag-oneway";
 "type.cuisine.russian" = "Russian";
 "type.attraction.animal" = "Animal Enclosure";
 "type.sport.ice_hockey" = "Ice Hockey";
@@ -901,6 +919,7 @@
 "type.emergency.fire_hydrant" = "Fire Hydrant";
 "type.power.generator.wind" = "Wind Generator";
 "type.shop.toys" = "Toy Store";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.railway.disused" = "Disused Railway";
 "type.man_made.pipeline" = "Pipeline";
 "type.railway.station.subway.yerevan" = "Subway Station";
@@ -990,6 +1009,7 @@
 "type.place.county" = "County";
 "type.aerialway.gondola" = "Gondola";
 "type.man_made.mast" = "Mast";
+"type.hwtag.lit" = "hwtag-lit";
 "type.building.garage" = "Garage";
 "type.railway.station.subway.milan" = "Subway Station";
 "type.natural.glacier" = "Glacier";
@@ -1214,6 +1234,7 @@
 "type.healthcare.optometrist" = "Optometrist";
 "type.power.generator.hydro" = "Hydroelectric Power Plant";
 "type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.psurface.paved_bad" = "psurface-paved_bad";
 "type.railway.station.subway.santo_domingo" = "Subway Station";
 "type.aeroway.aerodrome" = "Maes Awyr";
 "type.natural.orchard" = "Orchard";
@@ -1223,6 +1244,8 @@
 "type.cuisine.thai" = "Thai";
 "type.leisure.miniature_golf" = "Minigolf";
 "type.internet_access.wlan" = "Internet";
+"type.mapswithme.grid" = "mapswithme-grid";
+"type.hwtag.nofoot" = "hwtag-nofoot";
 "type.shop.charity" = "Charity Shop";
 "type.leisure.outdoor_seating" = "Outdoor Seating";
 "type.railway.subway_entrance.brescia" = "Subway Entrance";

iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Hjulspor";
 "type.area_highway.trunk" = "Motortrafikvej";
 "type.area_highway.unclassified" = "Mindre vej";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Historisk objekt";
 "type.historic.aircraft" = "Historisk fly";
 "type.historic.anchor" = "Historisk anker";
@@ -642,6 +644,17 @@
 "type.historic.wayside_cross" = "Kors ved vejsiden";
 "type.historic.wayside_shrine" = "Skrin ved vejsiden";
 "type.historic.wreck" = "Forlis";
+"type.hwtag" = "hwtag";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Trådløst internet";
 "type.junction" = "Vejkryds";
@@ -758,6 +771,8 @@
 "type.man_made.water_well.drinking_water_no" = "Brønd";
 "type.man_made.windmill" = "Vindmølle";
 "type.man_made.works" = "Fabrik";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militær";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Bjergpas";
@@ -884,6 +899,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Offentlig transport";
 "type.public_transport.platform" = "Stoppested";
 "type.railway" = "Jernbane";
@@ -1185,6 +1205,7 @@
 "type.railway.tram_stop" = "Sporvognsstoppested";
 "type.route" = "Rute";
 "type.route.ferry" = "Færgerute";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Butik";
 "type.shop.alcohol" = "Alkoholforhandler";
 "type.shop.bakery" = "Bager";
@@ -1469,7 +1490,9 @@
 "type.amenity.love_hotel" = "Kærlighedshotel";
 "type.natural.wetland.tidalflat" = "Tidal Flat";
 "type.sport.diving" = "High Diving";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
 "type.natural.wetland.swamp" = "Sump";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
 "type.natural.wetland.saltmarsh" = "Strandeng";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.natural.wetland.fen" = "Fen";

iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Forst-/Feldweg";
 "type.area_highway.trunk" = "Schnellstraße";
 "type.area_highway.unclassified" = "Nebenstraße";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Historisches Objekt";
 "type.historic.aircraft" = "Historisches Flugzeug";
 "type.historic.anchor" = "Historischer Anker";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Wegkreuz";
 "type.historic.wayside_shrine" = "Bildstock";
 "type.historic.wreck" = "Schiffswrack";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Straßenknotenpunkt";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Brunnen";
 "type.man_made.windmill" = "Windmühle";
 "type.man_made.works" = "Fabrik";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militärisches Objekt";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Gebirgspass";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Versorgungsmast";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Öffentlicher Verkehr";
 "type.public_transport.platform" = "Plattform";
 "type.railway" = "Eisenbahn";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Straßenbahnhaltestelle";
 "type.route" = "Route";
 "type.route.ferry" = "Fähre";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Geschäft";
 "type.shop.alcohol" = "Spirituosengeschäft";
 "type.shop.bakery" = "Bäckerei";

iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Οδός";
 "type.area_highway.trunk" = "Οδός";
 "type.area_highway.unclassified" = "Οδός";
+"type.highway.world_level" = "αυτοκινητόδρομος-κόσμος_επίπεδο";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Ιστορικό αντικείμενο";
 "type.historic.aircraft" = "Ιστορικό αεροσκάφος";
 "type.historic.anchor" = "Ιστορική Άγκυρα";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Σταυρός στην άκρη του δρόμου";
 "type.historic.wayside_shrine" = "Εικονοστάσιο στην άκρη του δρόμου";
 "type.historic.wreck" = "Ναυάγιο";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Ίντερνετ";
 "type.internet_access.wlan" = "Ίντερνετ";
 "type.junction" = "Junction";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Πηγάδι νερού";
 "type.man_made.windmill" = "Ανεμόμυλος";
 "type.man_made.works" = "Industrial Works";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Military";
 "type.military.bunker" = "Στρατιωτική αποθήκη";
 "type.mountain_pass" = "Mountain Pass";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Πόλος κοινής ωφέλειας";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Public Transport";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Στάση τραμ";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Κατάστημα";
 "type.shop.alcohol" = "Κάβα";
 "type.shop.bakery" = "Αρτοποιείο";

iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Track";
 "type.area_highway.trunk" = "Trunk Road";
 "type.area_highway.unclassified" = "Minor Road";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Historic Object";
 "type.historic.aircraft" = "Historic Aircraft";
 "type.historic.anchor" = "Historic Anchor";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Wayside Cross";
 "type.historic.wayside_shrine" = "Wayside Shrine";
 "type.historic.wreck" = "Shipwreck";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Junction";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Water Well";
 "type.man_made.windmill" = "Windmill";
 "type.man_made.works" = "Industrial Works";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Military";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Mountain Pass";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Public Transport";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tram Stop";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Shop";
 "type.shop.alcohol" = "Liquor Shop";
 "type.shop.bakery" = "Bakery";

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -615,6 +615,8 @@
 "type.area_highway.track" = "Track";
 "type.area_highway.trunk" = "Trunk Road";
 "type.area_highway.unclassified" = "Minor Road";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 
 
 /********** Types: Historic **********/
@@ -665,6 +667,19 @@
 "type.historic.wayside_cross" = "Wayside Cross";
 "type.historic.wayside_shrine" = "Wayside Shrine";
 "type.historic.wreck" = "Shipwreck";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Junction";
@@ -785,6 +800,8 @@
 "type.man_made.water_well.drinking_water_no" = "Water Well";
 "type.man_made.windmill" = "Windmill";
 "type.man_made.works" = "Industrial Works";
+"type.mapswithme" = "mapswithme";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Military";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Mountain Pass";
@@ -918,6 +935,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Public Transport";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1220,6 +1242,7 @@
 "type.railway.tram_stop" = "Tram Stop";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Shop";
 "type.shop.alcohol" = "Liquor Shop";
 "type.shop.bakery" = "Bakery";

iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Pista";
 "type.area_highway.trunk" = "Vía troncal";
 "type.area_highway.unclassified" = "Carretera sin clasificar";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Objeto histórico";
 "type.historic.aircraft" = "Avión histórico";
 "type.historic.anchor" = "Ancla histórica";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Cruz de término";
 "type.historic.wayside_shrine" = "Peto de ánimas";
 "type.historic.wreck" = "Naufragio";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Cruce";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Pozo";
 "type.man_made.windmill" = "Molino";
 "type.man_made.works" = "Fábrica";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militar";
 "type.military.bunker" = "Búnker";
 "type.mountain_pass" = "Puerto de montaña";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Poste";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Transporte público";
 "type.public_transport.platform" = "Plataforma";
 "type.railway" = "Vía férrea";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Parada de tranvía";
 "type.route" = "Ruta";
 "type.route.ferry" = "Ruta de ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Tienda";
 "type.shop.alcohol" = "Licorería";
 "type.shop.bakery" = "Panadería";

iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Pista";
 "type.area_highway.trunk" = "Vía troncal";
 "type.area_highway.unclassified" = "Carretera sin clasificar";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Objeto histórico";
 "type.historic.aircraft" = "Avión histórico";
 "type.historic.anchor" = "Ancla histórica";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Cruz de término";
 "type.historic.wayside_shrine" = "Peto de ánimas";
 "type.historic.wreck" = "Naufragio";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Cruce";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Pozo";
 "type.man_made.windmill" = "Molino";
 "type.man_made.works" = "Fábrica";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militar";
 "type.military.bunker" = "Búnker";
 "type.mountain_pass" = "Puerto de montaña";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Poste";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Transporte público";
 "type.public_transport.platform" = "Plataforma";
 "type.railway" = "Vía férrea";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Parada de tranvía";
 "type.route" = "Ruta";
 "type.route.ferry" = "Ruta de ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Tienda";
 "type.shop.alcohol" = "Licorería";
 "type.shop.bakery" = "Panadería";

iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Rada";
 "type.area_highway.trunk" = "E-tähistusega põhimaantee";
 "type.area_highway.unclassified" = "Vähetähtis tee";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Ajalooline objekt";
 "type.historic.aircraft" = "Ajalooline lennuk";
 "type.historic.anchor" = "Ajalooline ankur";
@@ -642,6 +644,18 @@
 "type.historic.wayside_cross" = "Teeäärne rist";
 "type.historic.wayside_shrine" = "Teeäärne altar";
 "type.historic.wreck" = "Laevavrakk";
+"type.hwtag" = "hwtag";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Wifi";
 "type.junction" = "Ristmik";
@@ -758,6 +772,8 @@
 "type.man_made.water_well.drinking_water_no" = "Pole joogivesi";
 "type.man_made.windmill" = "Tuuleveski";
 "type.man_made.works" = "Tehas";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militaarobjekt";
 "type.military.bunker" = "Punker";
 "type.mountain_pass" = "Mäekuru";
@@ -884,6 +900,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Valgustus- või sidepost";
+"type.psurface" = "Pind";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Ühistransport";
 "type.public_transport.platform" = "Ooteplatvorm";
 "type.railway" = "Raudtee";
@@ -1185,6 +1206,7 @@
 "type.railway.tram_stop" = "Trammipeatus";
 "type.route" = "Marsruut";
 "type.route.ferry" = "Praamiliin";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Pood";
 "type.shop.alcohol" = "Alkoholipood";
 "type.shop.bakery" = "Pagar";
@@ -1460,6 +1482,7 @@
 
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Spordisaal";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
 "type.landuse.plant_nursery" = "Puukool";
 "type.highway.ladder" = "Redel";
 "type.amenity.love_hotel" = "Armuhotell";

iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Kalea";
 "type.area_highway.trunk" = "Kalea";
 "type.area_highway.unclassified" = "Kalea";
+"type.highway.world_level" = "Mundu mailako errepidea";
+"type.highway.world_towns_level" = "Herri mailako errepidea";
 "type.historic" = "Objektu historikoa";
 "type.historic.aircraft" = "Hegazkin historikoa";
 "type.historic.anchor" = "Aingura Historikoa";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Bideko gurutze";
 "type.historic.wayside_shrine" = "Bide bazterreko baseliza";
 "type.historic.wreck" = "Naufragioa";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet sarrera";
 "type.internet_access.wlan" = "Wi-Fia";
 "type.junction" = "Bidegurutzea";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Ur putzua";
 "type.man_made.windmill" = "Haize-errota";
 "type.man_made.works" = "Lantegiak";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-sareta";
 "type.military" = "Eremu militarra";
 "type.military.bunker" = "Bunkerra";
 "type.mountain_pass" = "Mendatea";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Garraio publikoa";
 "type.public_transport.platform" = "Plataforma";
 "type.railway" = "Trenbidea";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Tranbiaren geltokia";
 "type.route" = "Ibilbidea";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Denda";
 "type.shop.alcohol" = "Likore-denda";
 "type.shop.bakery" = "Okindegia";

iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "جاده";
 "type.area_highway.trunk" = "جاده";
 "type.area_highway.unclassified" = "جاده";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "شیء تاریخی";
 "type.historic.aircraft" = "هواپیمای تاریخی";
 "type.historic.anchor" = "لنگر تاریخی";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "صلیب کنار راه";
 "type.historic.wayside_shrine" = "حرم کنار راه";
 "type.historic.wreck" = "غرق کشتی";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "وای فای";
 "type.internet_access.wlan" = "وای فای";
 "type.junction" = "Junction";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "چاه اب";
 "type.man_made.windmill" = "توربین بادی";
 "type.man_made.works" = "Industrial Works";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Military";
 "type.military.bunker" = "پناهگاه";
 "type.mountain_pass" = "Mountain Pass";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Utility Pole";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Public Transport";
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "ایستگاه قطار";
 "type.route" = "Route";
 "type.route.ferry" = "Ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "فروشگاه";
 "type.shop.alcohol" = "فروشگاه";
 "type.shop.bakery" = "فروشگاه";

iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Katu";
 "type.area_highway.trunk" = "Päätie";
 "type.area_highway.unclassified" = "Katu";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Historiallinen esine";
 "type.historic.aircraft" = "Historiallinen lentokone";
 "type.historic.anchor" = "Historiallinen ankkuri";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Tienvarren risti";
 "type.historic.wayside_shrine" = "Tienvarren pyhäkkö";
 "type.historic.wreck" = "Haaksirikko";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Risteys";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Kaivo";
 "type.man_made.windmill" = "Tuulimylly";
 "type.man_made.works" = "Tehdas";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Sotilasalue";
 "type.military.bunker" = "Bunkkeri";
 "type.mountain_pass" = "Vuoristosola";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Pylväs";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Julkinen liikenne";
 "type.public_transport.platform" = "Joukkoliikenteen pysäkki/laituri";
 "type.railway" = "Rautatie";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Raitiovaunupysäkki";
 "type.route" = "Reitti";
 "type.route.ferry" = "Lauttareitti";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Kauppa";
 "type.shop.alcohol" = "Alkoholikauppa";
 "type.shop.bakery" = "Leipomo";

iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings

@@ -596,6 +596,8 @@
 "type.area_highway.track" = "Piste";
 "type.area_highway.trunk" = "Voie rapide";
 "type.area_highway.unclassified" = "Rue";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Objet historique";
 "type.historic.aircraft" = "Avion historique";
 "type.historic.anchor" = "Ancre historique";
@@ -642,6 +644,19 @@
 "type.historic.wayside_cross" = "Croix de chemin";
 "type.historic.wayside_shrine" = "Oratoire";
 "type.historic.wreck" = "Naufrage";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Croisement";
@@ -758,6 +773,8 @@
 "type.man_made.water_well.drinking_water_no" = "Puits à eau";
 "type.man_made.windmill" = "Moulin à vent";
 "type.man_made.works" = "Usine";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Armée";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Col de montagne";
@@ -884,6 +901,11 @@
 
 /* A single pole supporting various public utilities, such as lighting or telephony. */
 "type.man_made.utility_pole" = "Pylônes (Télécommunication, lampadaire)";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Transport public";
 "type.public_transport.platform" = "Quai de transport en commun";
 "type.railway" = "Chemin de fer";
@@ -1185,6 +1207,7 @@
 "type.railway.tram_stop" = "Arrêt de tramway";
 "type.route" = "Itinéraire";
 "type.route.ferry" = "Trajet de ferry";
+"type.route.shuttle_train" = "route-shuttle_train";
 "type.shop" = "Magasin";
 "type.shop.alcohol" = "Magasin de vins et spiritueux";
 "type.shop.bakery" = "Boulangerie";

iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings

@@ -28,6 +28,8 @@
 "type.area_highway.residential" = "Rúa residencial";
 "type.historic.citywalls" = "Muralla";
 "type.historic.fort" = "Forte";
+"type.hwtag.nobicycle" = "hwtag-nobicycle";
+"type.hwtag.nocar" = "hwtag-nocar";
 "type.landuse" = "Uso do adoito";
 "type.landuse.allotments" = "Horto urbano";
 "type.landuse.basin" = "Cuenca";
@@ -557,6 +559,8 @@
 "type.area_highway.track" = "Pista";
 "type.area_highway.trunk" = "Vía troncal";
 "type.area_highway.unclassified" = "Estrada sen clasificar";
+"type.highway.world_level" = "highway-world_level";
+"type.highway.world_towns_level" = "highway-world_towns_level";
 "type.historic" = "Obxecto histórico";
 "type.historic.aircraft" = "Avión histórico";
 "type.historic.anchor" = "Ancora histórica";
@@ -597,6 +601,17 @@
 "type.historic.wayside_cross" = "Cruz de termo";
 "type.historic.wayside_shrine" = "Peto de ánimas";
 "type.historic.wreck" = "Naufraxio";
+"type.hwtag" = "hwtag";
+"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
+"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
+"type.hwtag.lit" = "hwtag-lit";
+"type.hwtag.nofoot" = "hwtag-nofoot";
+"type.hwtag.oneway" = "hwtag-oneway";
+"type.hwtag.private" = "hwtag-private";
+"type.hwtag.toll" = "hwtag-toll";
+"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
+"type.hwtag.yescar" = "hwtag-yescar";
+"type.hwtag.yesfoot" = "hwtag-yesfoot";
 "type.internet_access" = "Internet";
 "type.internet_access.wlan" = "Internet";
 "type.junction" = "Cruce";
@@ -690,6 +705,8 @@
 "type.man_made.water_well.drinking_water_no" = "Pozo";
 "type.man_made.windmill" = "Muíño";
 "type.man_made.works" = "Fábrica";
+"type.mapswithme" = "MapsWithMe";
+"type.mapswithme.grid" = "mapswithme-grid";
 "type.military" = "Militar";
 "type.military.bunker" = "Búnker";
 "type.mountain_pass" = "Porto de montaña";
@@ -786,6 +803,11 @@
 "type.power.tower" = "Torre eléctrica";
 "type.power.pole" = "Poste eléctrico";
 "type.man_made.utility_pole" = "Poste";
+"type.psurface" = "psurface";
+"type.psurface.paved_bad" = "psurface-paved_bad";
+"type.psurface.paved_good" = "psurface-paved_good";
+"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
+"type.psurface.unpaved_good" = "psurface-unpaved_good";
 "type.public_transport" = "Transporte público";
 "type.public_transport.platform" = "Plataforma";
 "type.railway" = "Vía férrea";
@@ -1045,6 +1067,7 @@
 "type.railway.tram.tunnel" = "Túnel de tranvía";
 "type.railway.tram_stop" = "Parada de tranvía";
 "type.route.ferry" = "Roteiro de ferry";
+"type.route.shuttle_train" = "route-lanzadeira_train";
 "type.shop" = "Tenda";
 "type.shop.alcohol" = "Licorería";
 "type.shop.bakery" = "Panadería";