diff --git a/android/app/src/main/res/values-af/types_strings.xml b/android/app/src/main/res/values-af/types_strings.xml
index 98e8ee3d9..1bf880226 100644
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -763,11 +763,6 @@
Substasie
Kragmas
- Padoppervlak
- Geteer
- Geteer
- Ongeteer
- Ongeteer
Openbare vervoer
Platform
Spoorweg
@@ -1315,5 +1310,4 @@
Sportsaal
Moltreinstasie
- MapsWithMe
diff --git a/android/app/src/main/res/values-ar/types_strings.xml b/android/app/src/main/res/values-ar/types_strings.xml
index 95e22ac8a..2e11bef48 100644
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -1280,5 +1280,4 @@
فندق جب
معرض
محطة مترو
- MapsWithMe
diff --git a/android/app/src/main/res/values-ast/types_strings.xml b/android/app/src/main/res/values-ast/types_strings.xml
index 5fc56cbea..40e552032 100644
--- a/android/app/src/main/res/values-ast/types_strings.xml
+++ b/android/app/src/main/res/values-ast/types_strings.xml
@@ -158,5 +158,4 @@
Escuela de llingües
Hospital
Confitería
- MapsWithMe
diff --git a/android/app/src/main/res/values-az/types_strings.xml b/android/app/src/main/res/values-az/types_strings.xml
index 0dc5e9d9f..cef0a5041 100644
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -1328,5 +1328,4 @@
Dojo
İdman zalı
- MapsWithMe
diff --git a/android/app/src/main/res/values-be/types_strings.xml b/android/app/src/main/res/values-be/types_strings.xml
index 728b5b00e..bfd0c0ada 100644
--- a/android/app/src/main/res/values-be/types_strings.xml
+++ b/android/app/src/main/res/values-be/types_strings.xml
@@ -623,6 +623,4 @@
Додзе
Спартыўная зала
- mapswithme-grid
- MapsWithMe
diff --git a/android/app/src/main/res/values-bg/types_strings.xml b/android/app/src/main/res/values-bg/types_strings.xml
index a2d643a67..93c3eecab 100644
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -774,7 +774,6 @@
Път
Третостепенен път
Гробище
- MapsWithMe
Студио
Колеж
Мантинела
diff --git a/android/app/src/main/res/values-bn/types_strings.xml b/android/app/src/main/res/values-bn/types_strings.xml
index 13fc0fac3..2f8066e2b 100644
--- a/android/app/src/main/res/values-bn/types_strings.xml
+++ b/android/app/src/main/res/values-bn/types_strings.xml
@@ -1,5 +1,4 @@
- MapsWithMe
ঠিকানা/ব্লক
diff --git a/android/app/src/main/res/values-ca/types_strings.xml b/android/app/src/main/res/values-ca/types_strings.xml
index ecc84c4ae..853abd027 100644
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -963,5 +963,4 @@
Estudi
Barrera de seguretat
Hacklab
- MapsWithMe
diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml
index 0817f3fa4..04dc4a359 100644
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1171,11 +1171,8 @@
Dódžó
Sportovní hala
- psurface
Solné jezírko
Trasa
- mapswithme-grid
- hwtag-yesbicycle
Vedlejší elektrické vedení
Plechovky
Vlek
@@ -1204,10 +1201,6 @@
Hipostezka
Cyklostezka
Výtah
- hwtag-nobicycle
- hwtag-oneway
- hwtag-yescar
- hwtag-yesfoot
Internet
Kruhový objezd
Brownfield
@@ -1225,7 +1218,6 @@
Povrchové potrubí
Čistírna odpadních vod
Průmysl
- MapsWithMe
Armáda
Horské sedlo
Energie
@@ -1262,12 +1254,10 @@
Visutá lanovka
Vinice
Plážový areál
- route-shuttle_train
Jídelní zóna
Lepenka
Boty
Sklad
- hwtag
Otevřený přístřešek
Automat na kávu
Stanoviště taxislužby
@@ -1275,7 +1265,6 @@
Živý plot
Hranice
Automat na noviny
- hwtag-nofoot
Ledové kluziště
Železniční stavba
Využití území
@@ -1288,18 +1277,12 @@
Hranice oblasti
Garáže
Trať
- hwtag-bidir_bicycle
- hwtag-nocar
Kruhový objezd
Cyklostezka
- hwtag-toll
Komerční zóna
- highway-world_level
- hwtag-lit
Přírodní
Zaniklá železnice
Vzdělávací zařízení
- hwtag-private
Bowls
Statek
Molo
@@ -1312,10 +1295,8 @@
Železniční přejezd
Silo
Topografický bod
- psurface-unpaved_good
Supermarket
Přírodní
- psurface-unpaved_bad
Tramvajová trať
Tunel lehké železnice
Most zaniklé železnice
@@ -1329,18 +1310,14 @@
Tunel tramvajové trati
Plot
Přístav
- psurface-paved_good
Automat na kondomy
Veřejná doprava
- highway-world_towns_level
- hwtag-onedir_bicycle
Veřejný prostor
Rekreační areál
Hranice oblasti
Lanová dráha
Odpočívadlo se službami
Průsek
- psurface-paved_bad
Most zachovalé železnice
Tunel úzkorozchodné železnice
Bar
diff --git a/android/app/src/main/res/values-da/types_strings.xml b/android/app/src/main/res/values-da/types_strings.xml
index 9b72b5f41..4b4ba2d55 100644
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1356,7 +1356,6 @@
Kælkebane
Meget let pist
Sporvejsbro
- MapsWithMe
Planteskole
Bålplads
Kran
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/app/src/main/res/values-de/types_strings.xml
index 64b2b4edb..1aac21586 100644
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -1344,40 +1344,17 @@
Pipeline
Bar
Restaurant
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
Internet
Internet
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- hwtag-yesfoot
Hackerraum
Yoga Studio
- mapswithme-grid
Sackgasse
- psurface
- psurface-paved_bad
- psurface-unpaved_good
- route-shuttle_train
Kiosk
- psurface-unpaved_bad
Landesgrenze
Garage
Fisch und Chips
- highway-world_level
- hwtag-nobicycle
- hwtag-nocar
- MapsWithMe
- psurface-paved_good
Badestrand
Food Court
- highway-world_towns_level
$
Versorgungsmast
Bubble Tea
diff --git a/android/app/src/main/res/values-el/types_strings.xml b/android/app/src/main/res/values-el/types_strings.xml
index 41b34f440..dd6ebc0c2 100644
--- a/android/app/src/main/res/values-el/types_strings.xml
+++ b/android/app/src/main/res/values-el/types_strings.xml
@@ -1227,7 +1227,6 @@
Ποδηλατόδρομος
Ποδηλατόδρομος
Ανελκυστήρας
- αυτοκινητόδρομος-κόσμος_επίπεδο
Τοίχος
Κονσερβοκούτια
Εμπόδιο
@@ -1247,7 +1246,6 @@
Ποδηλατόδρομος
Πύλη
ATM
- MapsWithMe
Σιδηροδρομική πλατφόρμα
Σιδηροδρομική σήραγγα στενού εύρους
Γέφυρα γραμμής μετρό
diff --git a/android/app/src/main/res/values-en-rGB/types_strings.xml b/android/app/src/main/res/values-en-rGB/types_strings.xml
index 2ededc0ef..8d3a6fd8c 100644
--- a/android/app/src/main/res/values-en-rGB/types_strings.xml
+++ b/android/app/src/main/res/values-en-rGB/types_strings.xml
@@ -287,5 +287,4 @@
Power Pole
Utility Pole
Metro Station
- MapsWithMe
diff --git a/android/app/src/main/res/values-es-rMX/types_strings.xml b/android/app/src/main/res/values-es-rMX/types_strings.xml
index 3918e0ff3..39fb851af 100644
--- a/android/app/src/main/res/values-es-rMX/types_strings.xml
+++ b/android/app/src/main/res/values-es-rMX/types_strings.xml
@@ -554,5 +554,4 @@
Renta de motocicletas
Semáforo
Crepas
- MapsWithMe
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index b9770dd20..7b7c3e3b9 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -1359,29 +1359,6 @@
Poste
Túnel ferroviario abandonado
Puente ferroviario abandonado
- highway-world_level
- hwtag
- hwtag-bidir_bicycle
- hwtag-lit
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- psurface
- psurface-paved_bad
- psurface-unpaved_good
- hwtag-nocar
- hwtag-nofoot
- psurface-unpaved_bad
- psurface-paved_good
- mapswithme-grid
- hwtag-onedir_bicycle
- hwtag-yesfoot
- MapsWithMe
- hwtag-nobicycle
- hwtag-oneway
- route-shuttle_train
- highway-world_towns_level
Puente de funicular
Túnel de funicular
Túnel de tren ligero
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index 8f5a53821..f1f0bd7d0 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -799,7 +799,6 @@
Alajaam
Kõrgepingemast
- Pind
Ühistransport
Ooteplatvorm
Raudtee
@@ -1369,28 +1368,6 @@
Autodroom
$ / €
Häkkerite ühisruum
- route-shuttle_train
- hwtag-bidir_bicycle
- highway-world_level
- hwtag
- hwtag-onedir_bicycle
- MapsWithMe
- mapswithme-grid
- psurface-paved_bad
- psurface-paved_good
- hwtag-nocar
- hwtag-yesbicycle
- hwtag-nofoot
- hwtag-lit
- psurface-unpaved_good
- psurface-unpaved_bad
- hwtag-yesfoot
- highway-world_towns_level
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yescar
- hwtag-nobicycle
Vettehüpped
Tulease
Armuhotell
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index 469eeb419..d2c035ab9 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -1241,7 +1241,6 @@
Zaldi-bidea
Bizikleta konponketa gunea
Zerbitzugunea
- Mundu mailako errepidea
Wi-Fia
Bidegurutzea
Baratze komunitatea
@@ -1271,7 +1270,6 @@
Garajeak
Zabalera estuko trenbide-zubia
Lurzoruaren erabilera
- Herri mailako errepidea
Komertzial-gunea
Militar-gunea
Parkea
@@ -1339,13 +1337,11 @@
Zoo
Tranbia bidea
Markatze-puntua
- MapsWithMe
Artifiziala
Maitasun hotela
Irteerarik gabeko bidea
Escape Room
Eremu erlijiosoa
- mapswithme-sareta
Txirrinduen aparkaleku estalia
Ekipaje-kontsigna
Gatz-padura
diff --git a/android/app/src/main/res/values-fa/types_strings.xml b/android/app/src/main/res/values-fa/types_strings.xml
index 31d79c1da..26b3849f5 100644
--- a/android/app/src/main/res/values-fa/types_strings.xml
+++ b/android/app/src/main/res/values-fa/types_strings.xml
@@ -1091,6 +1091,5 @@
سالن ورزشی
سیلو
- MapsWithMe
مخازن سیال
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index d3833a1bb..5c3bc1997 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -1313,27 +1313,12 @@
Airspace Infrastructure
Lentokentän asemataso
Koirankakkapussiautomaatti
- hwtag-yescar
Olutpuutarha
Tikapuut
- hwtag-yesfoot
Kasvitarha
- highway-world_towns_level
Fish and Chips
- highway-world_level
- hwtag-bidir_bicycle
- hwtag-private
- hwtag
Studio
Tiekaide
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-toll
- hwtag-yesbicycle
Tulentekopaikka
Leisure
Internet
@@ -1350,15 +1335,7 @@
Internet
Man Made
$
- psurface-paved_bad
- mapswithme-grid
Luomu
- MapsWithMe
- psurface-paved_good
- psurface-unpaved_bad
- psurface
- route-shuttle_train
- psurface-unpaved_good
Julkinen paikka
Juoksurata
Juoksurata
diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/app/src/main/res/values-fr/types_strings.xml
index aa0a347b3..0c65e57dd 100644
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -1368,36 +1368,13 @@
Fauteuil roulant
Téléski
Télésiège
- highway-world_level
- highway-world_towns_level
- psurface-unpaved_bad
Itinéraire
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- hwtag-yesfoot
Internet
Internet
Terrain
- MapsWithMe
- mapswithme-grid
Bunker
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_good
- route-shuttle_train
Bookmaker
Attraction
- hwtag
Grue
Station de métro
Terre religieuse
diff --git a/android/app/src/main/res/values-gl/types_strings.xml b/android/app/src/main/res/values-gl/types_strings.xml
index b350b6d4a..3cef22c5b 100644
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -474,8 +474,6 @@
Pista
Vía troncal
Estrada sen clasificar
- highway-world_level
- highway-world_towns_level
Obxecto histórico
Avión histórico
Ancora histórica
@@ -518,19 +516,6 @@
Cruz de termo
Peto de ánimas
Naufraxio
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- hwtag-yesfoot
Internet
Internet
Cruce
@@ -633,8 +618,6 @@
Pozo
Muíño
Fábrica
- MapsWithMe
- mapswithme-grid
Militar
Búnker
Porto de montaña
@@ -743,11 +726,6 @@
Torre eléctrica
Poste eléctrico
Poste
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
Transporte público
Vía férrea abandonada
Puente ferroviario abandonado
@@ -1039,7 +1017,6 @@
Parada de tranvía
Roteiro
Roteiro de ferry
- route-lanzadeira_train
Tenda
Licorería
Panadería
diff --git a/android/app/src/main/res/values-gsw/types_strings.xml b/android/app/src/main/res/values-gsw/types_strings.xml
index fdaaa1a43..28190177c 100644
--- a/android/app/src/main/res/values-gsw/types_strings.xml
+++ b/android/app/src/main/res/values-gsw/types_strings.xml
@@ -430,7 +430,6 @@
Forst-/Feldweg
Autostrass
Näbestrass
- highway-world_level
Historischs Objekt
Historischs Flugzüüg
Historische Anker
@@ -469,18 +468,6 @@
Wegchrüz
Wegkapelle
Schiffswrack
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
Internet
Internet
Chrüzig
@@ -576,8 +563,6 @@
Brunne
Windmühli
Fabrik
- MapsWithMe
- mapswithme-grid
Militärischs Objekt
Gebirgspass
Natur
@@ -678,11 +663,6 @@
Umspannwerch
Hochspannigsmascht
Strommascht
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
Öffentliche Verchehr
Plattform
Isebahn
@@ -822,7 +802,6 @@
Landschaftsgärtner
Hauptiigang
Tunnel
- highway-world_towns_level
Picknicktisch
Funkturm
Wiiler
@@ -858,7 +837,6 @@
Höchgschwindigkeitsisebahn
Hauptstrass
Chrüz
- hwtag-yesfoot
Schwümmbecki
Vermessigspunkt
Standseilbahnbrugg
@@ -983,7 +961,6 @@
Tramtunnel
Route
Fähre
- route-shuttle_train
Gschäft
Spirituosegschäft
Bäckerei
diff --git a/android/app/src/main/res/values-hi/types_strings.xml b/android/app/src/main/res/values-hi/types_strings.xml
index 75387751a..0eb91212f 100644
--- a/android/app/src/main/res/values-hi/types_strings.xml
+++ b/android/app/src/main/res/values-hi/types_strings.xml
@@ -665,5 +665,4 @@
डोजो
खेल हॉल
- MapsWithMe
diff --git a/android/app/src/main/res/values-hr/types_strings.xml b/android/app/src/main/res/values-hr/types_strings.xml
index 49cadb1ba..200e75223 100644
--- a/android/app/src/main/res/values-hr/types_strings.xml
+++ b/android/app/src/main/res/values-hr/types_strings.xml
@@ -2,5 +2,4 @@
Hackerspace
Silo
- MapsWithMe
diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/app/src/main/res/values-hu/types_strings.xml
index 0ffb913f2..05396b487 100644
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1238,9 +1238,6 @@
Felvonó
Pihenőhely
Kerékpárút
- egyirányú
- magán
- útdíjjas
Internetcsatlakozás
Területhasználat
Kiskertek
@@ -1355,37 +1352,17 @@
Akadálymentesség
Tányéros sífelvonó
Csákányos sífelvonó
- út-világszint
- út-világvárosok szint
- útcímke
- útcímke-kétirányú_kerékpárút
- útcímke-egyirányú_kerékpárút
- útcímke-kerékpárral_használható
- útcímke-gyalogosan_használható
- MapsWithMe
- mapswithme-rács
- felület
- felület-burkolt_rossz
- felület-burkolt_jó
- felület-burkolatlan_rossz
- felület-burkolatlan_jó
Sípálya
Sípálya tapasztaltaknak
Sípálya szakértőknek
Sípálya kezdőknek
Sípálya kezdőknek
Sípálya középhaladóknak
- útcímke-személyautóval_használható
- útcímke-megvilágítás
- útcímke-kerékpárral_nem_használható
- útvonal-ingajáratú_vonat
Sípálya
Sípálya tapasztaltaknak
Sípálya újoncoknak
Sípálya szakértőknek
Sípálya középhaladóknak
Sípálya újoncoknak
- útcímke-személyautóval_nem_használható
- útcímke-gyalogosan_nem_használható
Természetes eredetű sípálya
diff --git a/android/app/src/main/res/values-ia/types_strings.xml b/android/app/src/main/res/values-ia/types_strings.xml
index f04075af3..dc777f31e 100644
--- a/android/app/src/main/res/values-ia/types_strings.xml
+++ b/android/app/src/main/res/values-ia/types_strings.xml
@@ -1,6 +1,5 @@
- MapsWithMe
Adresse/Bloco
Adresse/Bloco
diff --git a/android/app/src/main/res/values-in/types_strings.xml b/android/app/src/main/res/values-in/types_strings.xml
index 5da8d1f20..875cf195e 100644
--- a/android/app/src/main/res/values-in/types_strings.xml
+++ b/android/app/src/main/res/values-in/types_strings.xml
@@ -1166,6 +1166,5 @@
Ruang olahraga
Hackerspace
- MapsWithMe
Silo
diff --git a/android/app/src/main/res/values-is/types_strings.xml b/android/app/src/main/res/values-is/types_strings.xml
index 4a02d0078..f7e03e67e 100644
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -1203,14 +1203,6 @@
Sjálfsafgreiðsla tiltæk
Einungis sjálfsafgreiðsla
Sjálfsafgreiðsla að hluta
- hwtag-nobicycle
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- hwtag-yesfoot
Varðveitt lestarspor
Varðveitt lestarbrú
Varðveitt lestargöng
@@ -1224,24 +1216,10 @@
Smáréttagerð
Söfnunarmiðstöð sýna
Talmeinafræði
- highway-world_level
- highway-world_towns_level
Víggirt hæð
Kastalasetur
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nocar
Járnbrautasvæði
- MapsWithMe
- mapswithme-grid
Skipastigahólf
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
Dráttarlestarbrú
Dráttarlestargöng
Járnbrautarstopp
@@ -1259,7 +1237,6 @@
Inngangur í neðanjarðarlest
Sporvagnabrú
Sporvagnagöng
- route-shuttle_train
Búsáhaldaverslun
Handverksvöruverslun
Reykingaverslun
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index 257f95bde..85af664c6 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -784,7 +784,6 @@
Sottostazione elettrica
Pilone elettrico
- Superficie
Trasporto pubblico
Ferrovia
Ferrovia abbandonata
@@ -1338,8 +1337,6 @@
Tumulo
Galleria funicolare
Hackerspace
- MapsWithMe
- mapswithme-grid
Internet
Area divertimento
Ponte della metropolitana
@@ -1370,30 +1367,10 @@
Pista da sci fuoripista
Riparo a capanna
Sciovia ad ancora a J
- hwtag-bidir_bicycle
Braciere
- route-shuttle_train
- highway-world_level
- hwtag
- hwtag-yescar
Studio
- highway-world_towns_level
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yesfoot
Vivaio
Cutline
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
Love hotel
Scala a pioli
Tuffi dalle grandi altezze
diff --git a/android/app/src/main/res/values-iw/types_strings.xml b/android/app/src/main/res/values-iw/types_strings.xml
index daf068a97..074863227 100644
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -579,18 +579,6 @@
צלב בצד הדרך
מקדש בצד הדרך
ספינה טרופה
- מסלול אופניים דו סיטרי
- מסלול אופניים חד סיטרי
- מואר
- אין כניסה לאופניים
- אין כניסה לכלי רכב
- אין כניסה להולכי רגל
- חד סיטרי
- פרטי
- אגרה
- הכניסה לאופניים מותרת
- הכניסה לכלי רכב מותרת
- הכניסה להולכי רגל מותרת
אינטרנט
אינטרנט אלחוטי
צומת
@@ -807,11 +795,6 @@
תחנת כוח משנית
מגדל קירור
- משטח
- אספלט במצב גרוע
- אספלט במצב טוב
- לא סלול במצב גרוע
- לא סלול במצב טוב
תחבורה ציבורית
רציף תחבורה
מסילת רכבת
@@ -1056,5 +1039,4 @@
דוג\'ו
אולם ספורט
- MapsWithMe
diff --git a/android/app/src/main/res/values-ja/types_strings.xml b/android/app/src/main/res/values-ja/types_strings.xml
index 609187acb..4d43024ce 100644
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -1334,38 +1334,20 @@
うんち袋の自販機
宅配ロッカー
ゴミ処理場
- MapsWithMe
ユーティリティポール
- シャトル列車
観覧車
クレーン
- mapswithme-グリッド
チェーンポール
タピオカティー
ダウンヒルスキー場
地下鉄路線(橋)
RVディーラー
- 高速道路(世界レベル)
地下鉄路線
エレベーター
- 私道タグ
行政界
行政界
倉庫
緊急サービス
- 高速道路(町レベル)
- 交通特性タグ
- 双方向の自転車レーンタグ
- 一方通行の自転車レーンタグ
- 道路照明タグ
- 自転車通行禁止タグ
- 自動車通行禁止タグ
- 歩行者通行禁止タグ
- 一方通行の道路タグ
- 有料道路タグ
- 自転車通行許可タグ
- 自動車通行許可タグ
- 歩行者通行許可タグ
貯蔵タンク
ビーチリゾート
Jバーリフト
@@ -1375,11 +1357,6 @@
Tバーリフト
ノルディックスキーコース
トボガンコース
- 路面
- 舗装路面(悪い)
- 舗装路面(良い)
- 未舗装路面(悪い)
- 未舗装路面(良い)
地下鉄路線(トンネル)
ダウンヒルスキーコース
初級者向けのダウンヒルスキー場
diff --git a/android/app/src/main/res/values-kab/types_strings.xml b/android/app/src/main/res/values-kab/types_strings.xml
index 948d14e11..045e125f3 100644
--- a/android/app/src/main/res/values-kab/types_strings.xml
+++ b/android/app/src/main/res/values-kab/types_strings.xml
@@ -1,4 +1,3 @@
- MapsWithMe
diff --git a/android/app/src/main/res/values-ko/types_strings.xml b/android/app/src/main/res/values-ko/types_strings.xml
index a24e05f72..2b2cb4728 100644
--- a/android/app/src/main/res/values-ko/types_strings.xml
+++ b/android/app/src/main/res/values-ko/types_strings.xml
@@ -1187,5 +1187,4 @@
지하철 노선 교량
전철역
저장탑
- MapsWithMe
diff --git a/android/app/src/main/res/values-lt/types_strings.xml b/android/app/src/main/res/values-lt/types_strings.xml
index 762a1a05e..1869959c7 100644
--- a/android/app/src/main/res/values-lt/types_strings.xml
+++ b/android/app/src/main/res/values-lt/types_strings.xml
@@ -95,5 +95,4 @@
Adresas / blokas
Keltuvas
Adresas / blokas
- MapsWithMe
diff --git a/android/app/src/main/res/values-lv/types_strings.xml b/android/app/src/main/res/values-lv/types_strings.xml
index 5a597e47a..3e7f28a5f 100644
--- a/android/app/src/main/res/values-lv/types_strings.xml
+++ b/android/app/src/main/res/values-lv/types_strings.xml
@@ -57,5 +57,4 @@
Tunelis
Starptautiskā lidosta
Pietura
- MapsWithMe
diff --git a/android/app/src/main/res/values-ml/types_strings.xml b/android/app/src/main/res/values-ml/types_strings.xml
index dd9cd1a91..833e8b6bc 100644
--- a/android/app/src/main/res/values-ml/types_strings.xml
+++ b/android/app/src/main/res/values-ml/types_strings.xml
@@ -1,5 +1,4 @@
- MapsWithMe
വിലാസം/ബ്ലോക്ക്
diff --git a/android/app/src/main/res/values-mr/types_strings.xml b/android/app/src/main/res/values-mr/types_strings.xml
index 2e023a02a..5acb98e20 100644
--- a/android/app/src/main/res/values-mr/types_strings.xml
+++ b/android/app/src/main/res/values-mr/types_strings.xml
@@ -1178,5 +1178,4 @@
डोजो
क्रीडा हॉल
- MapsWithMe
diff --git a/android/app/src/main/res/values-mt/types_strings.xml b/android/app/src/main/res/values-mt/types_strings.xml
index 948d14e11..045e125f3 100644
--- a/android/app/src/main/res/values-mt/types_strings.xml
+++ b/android/app/src/main/res/values-mt/types_strings.xml
@@ -1,4 +1,3 @@
- MapsWithMe
diff --git a/android/app/src/main/res/values-nb/types_strings.xml b/android/app/src/main/res/values-nb/types_strings.xml
index 616b6282b..950134935 100644
--- a/android/app/src/main/res/values-nb/types_strings.xml
+++ b/android/app/src/main/res/values-nb/types_strings.xml
@@ -1193,5 +1193,4 @@
Idrettshall
Skaperverksted
Silo
- MapsWithMe
diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/app/src/main/res/values-nl/types_strings.xml
index 4f5d7108b..04831e312 100644
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -792,11 +792,6 @@
Transformatorstation
Elektriciteitsmast
- Wegdek
- Verhard
- Verhard
- Onverhard
- Onverhard
Openbaar vervoer
Platform
Spoorweg
@@ -1364,31 +1359,13 @@
Stroommast
Paal
Fish and Chips
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-yesfoot
Reservoir
- hwtag-nobicycle
- hwtag-yesbicycle
- hwtag-toll
- hwtag-yescar
- MapsWithMe
Motel
- route-shuttle_train
- mapswithme-grid
Reuzenrad
Afschotbeschutting
Braakliggend terrein
Greenfield
Generator
- highway-world_level
- highway-world_towns_level
Hackerspace
Foodcourt
ladder
diff --git a/android/app/src/main/res/values-pl/types_strings.xml b/android/app/src/main/res/values-pl/types_strings.xml
index c3cf439a9..1af2b8a9c 100644
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -1305,29 +1305,13 @@
Szklarnia
$
Ścieżka
- hwtag
Internet
Internet
Przystań
- MapsWithMe
Herbata bąbelkowa
Słup elektryczny
Słup użytkowy
Pompa paliwowa
- highway-world_level
- highway-world_towns_level
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- hwtag-yesfoot
Teren publiczny
Schron turystyczny
Kurort przy plaży
@@ -1362,14 +1346,7 @@
Jaz
Wózek inwalidzki
Hackerspace
- mapswithme-grid
Moc
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
- route-shuttle_train
Dźwig
Drabina
Ognisko
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index cff0bb396..583adb9fd 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -1124,13 +1124,7 @@
Dojo
Resort
Mastro
- highway-world_towns_level
Pedra memorial
- highway-world_level
- Sinalização de trânsito
- hwtag-bidir_bicycle
- MapsWithMe
- mapswithme-grid
Concessionária de trailers
Curling
Ponto de Reunião de Emergência
@@ -1213,7 +1207,6 @@
Ferrovia Utilitária
Telha
Ferrovia de alta velocidade
- rota-ônibus_trem
Placa Comemorativa
Sela de montanha
País
@@ -1231,8 +1224,6 @@
Navio
Túmulo
Santuário à beira da estrada
- hwtag-pedágio
- hwtag-simbicicleta
Minigolfe
Poço de petróleo ou gás
Ramal Ferroviário
@@ -1296,7 +1287,6 @@
Hóquei no gelo
Pelota Basca
Fosso
- hwtag-onedir_bicycle
Casa de férias
Túnel ferroviário
Atração turística
@@ -1306,19 +1296,6 @@
Skate
Cabana
Escultura
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-yescar
- hwtag-yesfoot
Roda-gigante
Carrossel
Atração histórica
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml
index 24230a9b0..555dcaf4e 100644
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -1346,12 +1346,8 @@
Viveiro de plantas
Cartão
Escada
- hwtag
Estúdio
Dispensador de doces
- psurface-não pavimentado_ruim
- rota-ônibus_trem
- hwtag-bidir_bicicleta
Latas
Hotel do Amor
Sapato
@@ -1368,11 +1364,6 @@
Corrente
Guarda-corpo
$
- nível mundial de rodovias
- nível_das_cidades_do_mundo_das_rodovias
- hwtag-onedir_bicicleta
- hwtag-lit
- hwtag-simbicicleta
Hackerspace
Fogueira
Resort de praia
@@ -1381,24 +1372,10 @@
Mastro
Silo
Tanque de armazenamento
- MapsWithMe
- mapswithme-grade
Passo da Montanha
Poste de serviço público
- superfície p
- superfície pavimentada ruim
- superfície pavimentada_boa
Concessionária de RV
Mergulho alto
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yescar
- hwtag-yesfoot
- psurface-unpaved_good
Instalação Educativa
Estação de metro
Escape Room
diff --git a/android/app/src/main/res/values-ro/types_strings.xml b/android/app/src/main/res/values-ro/types_strings.xml
index 55b4a9b06..5e164cec8 100644
--- a/android/app/src/main/res/values-ro/types_strings.xml
+++ b/android/app/src/main/res/values-ro/types_strings.xml
@@ -1163,6 +1163,5 @@
Dojo
Sală de sport
- MapsWithMe
Siloz
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index 33b5c0c29..41a3b7713 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -809,11 +809,6 @@
Подстанция
Опора ЛЭП
- Поверхность
- Плохая асфальтированная
- Хорошая асфальтированная
- Плохая неасфальтированная
- Хорошая неасфальтированная
Общественный транспорт
Платформа
Ж/Д
@@ -1380,15 +1375,6 @@
Спортивный зал
Столб
Столб ЛЭП
- Шоссе мирового значения
- Шоссе местного значения
- Велосипедная двухсторонняя
- Велосипедная односторонняя
- Освещённая
- Без мотоциклов
- Одностороннее движение
- Платная
- Частная
$
Дорожное ограждение (отбойник)
Садовый питомник
@@ -1398,15 +1384,6 @@
Высотные прыжки в воду
Любовный отель
Кран
- Не пешая
- Не для машин
- Дорожный знак
- Велосипедам можно
- Машинам можно
- Пешком можно
- MapsWithMe
- mapswithme-сетка
- Челночный поезд
Церковный двор
Станция метро
diff --git a/android/app/src/main/res/values-sk/types_strings.xml b/android/app/src/main/res/values-sk/types_strings.xml
index 9fd76966d..15f73bbc0 100644
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -1320,5 +1320,4 @@
Dojo
Športová hala
- MapsWithMe
diff --git a/android/app/src/main/res/values-sq/types_strings.xml b/android/app/src/main/res/values-sq/types_strings.xml
index 46c412588..4f983d7f2 100644
--- a/android/app/src/main/res/values-sq/types_strings.xml
+++ b/android/app/src/main/res/values-sq/types_strings.xml
@@ -1,6 +1,5 @@
Stacion metroje
- MapsWithMe
Hackerspace
diff --git a/android/app/src/main/res/values-sr/types_strings.xml b/android/app/src/main/res/values-sr/types_strings.xml
index f466e4f83..ff6685ff8 100644
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -795,11 +795,6 @@
Подстаница
Далековод
- Површина
- Лош асфалт
- Добар асфалт
- Лош макадам
- Добар макадам
Јавни превоз
Стајалиште јавног превоза
Железница
@@ -1354,34 +1349,16 @@
Дојо
Спортска хала
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- MapsWithMe
Насеље
Изнајмљивање мотоцикала
- hwtag
- hwtag-yesfoot
- hwtag-lit
- hwtag-nobicycle
- hwtag-oneway
Далековод
Громила
- highway-world_towns_level
- mapswithme-grid
Рекреациони простор
- hwtag-bidir_bicycle
- hwtag-nofoot
- hwtag-yescar
- hwtag-nocar
Мања далеководна линија
- highway-world_level
- hwtag-onedir_bicycle
Хакерски простор
Аутићи
Панорамски точак
Мост успињаче
- route-shuttle_train
Тунел лаке железнице
$
Очуван железнички тунел
diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/app/src/main/res/values-sv/types_strings.xml
index 89258c9f9..8f6e54dc1 100644
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1252,7 +1252,6 @@
Vingård
Mast
Pipeline
- MapsWithMe
Bunker
Öken
Internet
diff --git a/android/app/src/main/res/values-sw/types_strings.xml b/android/app/src/main/res/values-sw/types_strings.xml
index bc7cbc99a..c7695ec32 100644
--- a/android/app/src/main/res/values-sw/types_strings.xml
+++ b/android/app/src/main/res/values-sw/types_strings.xml
@@ -661,5 +661,4 @@
Dojo
Ukumbi wa michezo
- MapsWithMe
diff --git a/android/app/src/main/res/values-th/types_strings.xml b/android/app/src/main/res/values-th/types_strings.xml
index e7d6e8db1..34610d294 100644
--- a/android/app/src/main/res/values-th/types_strings.xml
+++ b/android/app/src/main/res/values-th/types_strings.xml
@@ -1180,5 +1180,4 @@
โดโจ
ห้องกีฬา
- MapsWithMe
diff --git a/android/app/src/main/res/values-tr/types_strings.xml b/android/app/src/main/res/values-tr/types_strings.xml
index d0a71cd5e..9b3524371 100644
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -1372,7 +1372,6 @@
Ateş çukuru
Fidanlık
Korkuluk
- MapsWithMe
Aşk Oteli
Dini Toprak
Tuz Bataklığı
diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml
index 0b6ab281f..2798c1ae5 100644
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -1358,24 +1358,9 @@
Спортивний зал
Швидка
- hwtag-nocar
Підпірна стіна
$
- hwtag-lit
Жива огорожа
- highway-world_towns_level
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-nobicycle
- highway-world_level
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yescar
- hwtag-yesbicycle
- hwtag-yesfoot
Хакерський простір
Наземний трубопровід
Військові об\'єкти
@@ -1384,14 +1369,6 @@
Платформа
Доджем
Колесо огляду
- MapsWithMe
- mapswithme-grid
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- route-shuttle_train
- psurface-unpaved_good
Студія
Камера схову
Кран
diff --git a/android/app/src/main/res/values-vi/types_strings.xml b/android/app/src/main/res/values-vi/types_strings.xml
index 384cd9277..60a4a538c 100644
--- a/android/app/src/main/res/values-vi/types_strings.xml
+++ b/android/app/src/main/res/values-vi/types_strings.xml
@@ -1178,6 +1178,5 @@
Nhà thi đấu thể thao
Ngầm
- MapsWithMe
Silo
diff --git a/android/app/src/main/res/values-zh-rHK/types_strings.xml b/android/app/src/main/res/values-zh-rHK/types_strings.xml
index b87fe6821..a5f1325f2 100644
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -1280,7 +1280,6 @@
體育館
碰碰車
賽道
- MapsWithMe
賽道
鐵路要素
影樓
@@ -1306,7 +1305,6 @@
儲水缸
起重機
工廠
- mapswithme-網格
軍事
山口
沙漠
@@ -1316,10 +1314,6 @@
輸電線
電線桿
公用事業桿
- 路面
- 單行道標籤
- 私人道路標籤
- 收費道路標籤
森林分界線
測量點
地上管道
@@ -1329,24 +1323,8 @@
防波堤
有機
小型輸電線
- 快速公路—世界級
- 快速公路—鎮級
- 交通屬性標籤
- 雙向單車徑標籤
- 單向單車徑標籤
- 照明設備標籤
- 禁止單車標籤
- 禁止汽車標籤
- 禁止行人標籤
- 允許單車標籤
- 允許汽車標籤
- 允許行人標籤
污水處理廠
- 鋪築路面—較差
- 未鋪築路面—較差
- 未鋪築路面—良好
公共交通要素
- 鋪築路面—良好
公共交通月台
鐵路遺跡
鐵路橋遺跡
@@ -1391,7 +1369,6 @@
自由式速降滑雪道
中級速降滑雪道
中級速降滑雪區
- 穿梭列車
高級速降滑雪道
專家級速降滑雪區
交通緩行化
diff --git a/android/app/src/main/res/values-zh-rTW/types_strings.xml b/android/app/src/main/res/values-zh-rTW/types_strings.xml
index 11d12afd4..c8c95209c 100644
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -20,14 +20,12 @@
旅遊服務中心
筒倉
觀光景點
- 高速公路—世界級
有機
硬紙板
金屬罐
鞋子
綠色垃圾/有機廢棄物
紙盒
- 高速公路—鎮級
賽道
有機
電線桿
@@ -35,11 +33,6 @@
垃圾轉運站
撿便袋販賣機
智取櫃
- MapsWithMe
- 禁止汽車標籤
- 允許行人標籤
- 交通屬性標籤
- 雙向自行車道標籤
死胡同
捷運路線
鐵路月台
@@ -47,19 +40,9 @@
休閒元素
電力元素
地下輸電線
- 未鋪築路面—較差
纜索鐵路橋軌道
交通寧靜化
速降滑雪區
- 單向自行車道標籤
- 禁止自行車標籤
- 禁止行人標籤
- 單行道標籤
- 私人道路標籤
- 收費道路標籤
- 允許自行車標籤
- 允許汽車標籤
- 照明設備標籤
船坡道
賽道
防波堤
@@ -78,7 +61,6 @@
速降滑雪道
起重機
工廠
- mapswithme-網格
沙漠
發電機
輸電線
@@ -87,10 +69,6 @@
輕軌軌道橋
輕軌隧道
大眾運輸月台
- 路面
- 鋪築路面—較差
- 鋪築路面—良好
- 未鋪築路面—良好
鐵路元素
鐵路遺跡
鐵路橋遺跡
@@ -106,7 +84,6 @@
保留鐵路隧道
捷運線橋
捷運線路隧道
- 巡迴列車
観光元素
摩天輪
減速帶
diff --git a/android/app/src/main/res/values-zh/types_strings.xml b/android/app/src/main/res/values-zh/types_strings.xml
index a2738c6ab..a142c9d9a 100644
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -1327,30 +1327,14 @@
金属罐
鞋子
纸盒
- 双向自行车道标签
- 单向自行车道标签
- 照明设施标签
- 禁止自行车标签
- 禁止汽车标签
- 单行道标签
- 私有道路标签
- 收费道路标签
- 允许自行车标签
- 允许行人标签
堆石标
桅杆
筒仓
储罐
- mapswithme—网格
山口
沙漠
有机
电线杆
- 路面
- 铺装路面—较差
- 铺装路面—良好
- 未铺装路面—较差
- 未铺装路面—良好
铁路道口
保留铁路隧道
地铁线路桥
@@ -1375,8 +1359,6 @@
雪橇滑道区
绿色/有机垃圾
硬纸板
- 高速公路—城镇级
- 禁止行人标签
死胡同
有机
保留铁路
@@ -1384,13 +1366,8 @@
地铁线路
交通稳静化
速降滑雪道
- 高速公路—世界级
- 交通属性标签
- 允许汽车标签
测量点
- MapsWithMe
公共设施杆
- 穿梭列车
碰碰车
高台跳水
苗圃
diff --git a/android/app/src/main/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml
index 5baab3565..bf33acb4a 100644
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -67,4 +67,27 @@
com.google.android.material.bottomsheet.BottomSheetBehavior
Car
+ highway-world_level
+ highway-world_towns_level
+ hwtag
+ hwtag-bidir_bicycle
+ hwtag-onedir_bicycle
+ hwtag-lit
+ hwtag-nobicycle
+ hwtag-nocar
+ hwtag-nofoot
+ hwtag-oneway
+ hwtag-private
+ hwtag-toll
+ hwtag-yesbicycle
+ hwtag-yescar
+ hwtag-yesfoot
+ mapswithme-grid
+ MapsWithMe
+ psurface
+ psurface-paved_bad
+ psurface-paved_good
+ psurface-unpaved_bad
+ psurface-unpaved_good
+ route-shuttle_train
diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index 1fb56dce0..b5247a1e1 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -544,8 +544,6 @@
Track
Trunk Road
Minor Road
- highway-world_level
- highway-world_towns_level
Historic Object
Historic Aircraft
@@ -591,19 +589,6 @@
Wayside Cross
Wayside Shrine
Shipwreck
- hwtag
- hwtag-bidir_bicycle
- hwtag-onedir_bicycle
- hwtag-lit
- hwtag-nobicycle
- hwtag-nocar
- hwtag-nofoot
- hwtag-oneway
- hwtag-private
- hwtag-toll
- hwtag-yesbicycle
- hwtag-yescar
- hwtag-yesfoot
Internet
Internet
Junction
@@ -717,8 +702,6 @@
Water Well
Windmill
Industrial Works
- mapswithme
- mapswithme-grid
Military
Bunker
Mountain Pass
@@ -843,11 +826,6 @@
Power Pole
Utility Pole
- psurface
- psurface-paved_bad
- psurface-paved_good
- psurface-unpaved_bad
- psurface-unpaved_good
Public Transport
Platform
Railway
@@ -1147,7 +1125,6 @@
Tram Stop
Route
Ferry
- route-shuttle_train
Shop
Liquor Shop
Bakery
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
index a2bf56831..53423af70 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
index fca14d632..9ba3873e0 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "مرساة تاريخية";
@@ -644,19 +642,6 @@
"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" = "تقاطع";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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" = "مخبز";
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
index 835256ffc..1f05a51c7 100644
--- a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
@@ -156,7 +156,6 @@
"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";
@@ -198,12 +197,7 @@
"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";
@@ -274,14 +268,9 @@
"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";
@@ -315,7 +304,6 @@
"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";
@@ -410,7 +398,6 @@
"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";
@@ -567,7 +554,6 @@
"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";
@@ -637,7 +623,6 @@
"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";
@@ -707,7 +692,6 @@
"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";
@@ -920,7 +904,6 @@
"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";
@@ -938,7 +921,6 @@
"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";
@@ -951,7 +933,6 @@
"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";
@@ -994,7 +975,6 @@
"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";
@@ -1076,7 +1056,6 @@
"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";
@@ -1257,8 +1236,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
index 7902aea21..eee435431 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
index 6d48f3b66..b7a171693 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "Гістарычны якар";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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" = "Перавал";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
index 1284a306c..b6de53e59 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -594,8 +594,6 @@
"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,19 +640,6 @@
"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" = "Съединение";
@@ -771,8 +756,6 @@
"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" = "Планински проход";
@@ -899,11 +882,6 @@
/* 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" = "Железопътна линия";
@@ -1205,7 +1183,6 @@
"type.railway.tram_stop" = "Трамвайна спирка";
"type.route" = "Маршрут";
"type.route.ferry" = "Ферибот";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Магазин";
"type.shop.alcohol" = "Магазин за алкохол";
"type.shop.bakery" = "Пекарна";
diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
index 8e38c44dc..6b7f6ac27 100644
--- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
@@ -1,4 +1,3 @@
-"type.mapswithme" = "MapsWithMe";
"type.addr_interpolation" = "ঠিকানা/ব্লক";
"type.aerialway.drag_lift" = "Drag Lift";
"type.aeroway.helipad" = "Helipad";
@@ -246,7 +245,6 @@
"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";
@@ -258,7 +256,6 @@
"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";
@@ -287,7 +284,6 @@
"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";
@@ -333,7 +329,6 @@
"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";
@@ -351,7 +346,6 @@
"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";
@@ -365,7 +359,6 @@
"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";
@@ -410,7 +403,6 @@
"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";
@@ -423,7 +415,6 @@
"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";
@@ -495,7 +486,6 @@
"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";
@@ -678,7 +668,6 @@
"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";
@@ -688,8 +677,6 @@
"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";
@@ -792,7 +779,6 @@
"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";
@@ -1008,7 +994,6 @@
"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";
@@ -1016,7 +1001,6 @@
"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";
@@ -1034,7 +1018,6 @@
"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";
@@ -1049,7 +1032,6 @@
"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";
@@ -1126,7 +1108,6 @@
"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";
@@ -1153,7 +1134,6 @@
"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";
@@ -1178,7 +1158,6 @@
"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";
@@ -1198,7 +1177,6 @@
"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";
@@ -1219,7 +1197,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
index 28dc43e32..625656a21 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index 5d6267394..92c139184 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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í";
diff --git a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
index fafeea838..ccd415db6 100644
--- a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
@@ -73,7 +73,6 @@
"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";
@@ -272,7 +271,6 @@
"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";
@@ -286,7 +284,6 @@
"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";
@@ -312,7 +309,6 @@
"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";
@@ -331,7 +327,6 @@
"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";
@@ -427,7 +422,6 @@
"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";
@@ -465,7 +459,6 @@
"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";
@@ -497,7 +490,6 @@
"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";
@@ -525,7 +517,6 @@
"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";
@@ -559,7 +550,6 @@
"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";
@@ -682,7 +672,6 @@
"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";
@@ -698,7 +687,6 @@
"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";
@@ -737,7 +725,6 @@
"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";
@@ -804,7 +791,6 @@
"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";
@@ -818,7 +804,6 @@
"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";
@@ -826,7 +811,6 @@
"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";
@@ -844,7 +828,6 @@
"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";
@@ -901,7 +884,6 @@
"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";
@@ -919,7 +901,6 @@
"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";
@@ -1009,7 +990,6 @@
"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";
@@ -1234,7 +1214,6 @@
"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";
@@ -1244,8 +1223,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index ff2bdf561..11170bbc2 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,17 +642,6 @@
"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";
@@ -771,8 +758,6 @@
"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";
@@ -899,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Lygtepæl";
-"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";
@@ -1205,7 +1185,6 @@
"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";
@@ -1490,9 +1469,7 @@
"type.amenity.love_hotel" = "Kærlighedshotel";
"type.natural.wetland.tidalflat" = "Tidevandsflade";
"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";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index c645aa1e1..70d104f64 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
index 017a80d0b..b71cd5455 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "Ιστορική Άγκυρα";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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" = "Αρτοποιείο";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index f0c064e16..8491f5b03 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index b7b138ace..89e92cd90 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -615,8 +615,6 @@
"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 **********/
@@ -667,19 +665,6 @@
"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";
@@ -800,8 +785,6 @@
"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";
@@ -935,11 +918,6 @@
/* 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";
@@ -1242,7 +1220,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
index 7cab66e84..ea1e1799c 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 98c06fb6d..699cb1fa8 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index dee42ef63..5a9856b35 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,18 +642,6 @@
"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";
@@ -772,8 +758,6 @@
"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";
@@ -900,11 +884,6 @@
/* 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";
@@ -1206,7 +1185,6 @@
"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";
@@ -1482,7 +1460,6 @@
/* 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";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index 469d788ea..3005c4ab5 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index c5ea1779c..788ea1806 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "لنگر تاریخی";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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" = "فروشگاه";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index 32d3c4d53..50b510824 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
index 5ada1f1ff..2a8006aaa 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
index d5d9724e7..a516b7c0f 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
@@ -28,8 +28,6 @@
"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";
@@ -559,8 +557,6 @@
"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";
@@ -601,17 +597,6 @@
"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";
@@ -705,8 +690,6 @@
"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";
@@ -803,11 +786,6 @@
"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";
@@ -1067,7 +1045,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
index 654801711..8ca91ec37 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
@@ -506,8 +506,6 @@
"type.area_highway.track" = "Forst-/Feldweg";
"type.area_highway.trunk" = "Autostrass";
"type.area_highway.unclassified" = "Näbestrass";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Historischs Objekt";
"type.historic.aircraft" = "Historischs Flugzüüg";
"type.historic.anchor" = "Historische Anker";
@@ -550,19 +548,6 @@
"type.historic.wayside_cross" = "Wegchrüz";
"type.historic.wayside_shrine" = "Wegkapelle";
"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" = "Chrüzig";
@@ -667,8 +652,6 @@
"type.man_made.water_well.drinking_water_no" = "Brunne";
"type.man_made.windmill" = "Windmühli";
"type.man_made.works" = "Fabrik";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Militärischs Objekt";
"type.military.bunker" = "Bunker";
"type.mountain_pass" = "Gebirgspass";
@@ -776,11 +759,6 @@
"type.power.tower" = "Hochspannigsmascht";
"type.power.pole" = "Strommascht";
"type.man_made.utility_pole" = "Versorgigsmascht";
-"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" = "Öffentliche Verchehr";
"type.public_transport.platform" = "Plattform";
"type.railway" = "Isebahn";
@@ -1064,7 +1042,6 @@
"type.railway.tram_stop" = "Tramhaltistell";
"type.route" = "Route";
"type.route.ferry" = "Fähre";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Gschäft";
"type.shop.alcohol" = "Spirituosegschäft";
"type.shop.bakery" = "Bäckerei";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
index 089bac6f2..2aafab79b 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "עוגן היסטורי";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "צלב בצד הדרך";
"type.historic.wayside_shrine" = "מקדש בצד הדרך";
"type.historic.wreck" = "ספינה טרופה";
-"type.hwtag" = "hwtag";
-"type.hwtag.bidir_bicycle" = "מסלול אופניים דו סיטרי";
-"type.hwtag.onedir_bicycle" = "מסלול אופניים חד סיטרי";
-"type.hwtag.lit" = "מואר";
-"type.hwtag.nobicycle" = "אין כניסה לאופניים";
-"type.hwtag.nocar" = "אין כניסה לכלי רכב";
-"type.hwtag.nofoot" = "אין כניסה להולכי רגל";
-"type.hwtag.oneway" = "חד סיטרי";
-"type.hwtag.private" = "פרטי";
-"type.hwtag.toll" = "אגרה";
-"type.hwtag.yesbicycle" = "הכניסה לאופניים מותרת";
-"type.hwtag.yescar" = "הכניסה לכלי רכב מותרת";
-"type.hwtag.yesfoot" = "הכניסה להולכי רגל מותרת";
"type.internet_access" = "אינטרנט";
"type.internet_access.wlan" = "אינטרנט אלחוטי";
"type.junction" = "צומת";
@@ -773,8 +758,6 @@
"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" = "Mountain Pass";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Utility Pole";
-"type.psurface" = "משטח";
-"type.psurface.paved_bad" = "אספלט במצב גרוע";
-"type.psurface.paved_good" = "אספלט במצב טוב";
-"type.psurface.unpaved_bad" = "לא סלול במצב גרוע";
-"type.psurface.unpaved_good" = "לא סלול במצב טוב";
"type.public_transport" = "תחבורה ציבורית";
"type.public_transport.platform" = "רציף תחבורה";
"type.railway" = "מסילת רכבת";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
index 3be983cd0..7e441a579 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.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" = "Historic Aircraft";
"type.historic.anchor" = "Historic Anchor";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Wayside Cross";
"type.historic.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" = "इंटरनेट उपलब्ध";
"type.internet_access.wlan" = "वाई-फाई उपलब्ध";
"type.junction" = "Junction";
@@ -773,8 +758,6 @@
"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" = "Bunker";
"type.mountain_pass" = "दर्रा";
@@ -901,11 +884,6 @@
/* 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" = "रेलवे प्लेटफार्म";
"type.railway" = "रेल";
@@ -1207,7 +1185,6 @@
"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" = "शराब की दुकान";
"type.shop.bakery" = "बेकरी";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
index 0ea83fead..c7438c562 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
@@ -1,6 +1,5 @@
"type.man_made.silo" = "Silo";
"type.leisure.hackerspace" = "Hackerspace";
-"type.mapswithme" = "MapsWithMe";
"type.highway.raceway" = "Racetrack";
"type.man_made.bridge" = "Bridge";
"type.historic.cannon" = "Cannon";
@@ -73,15 +72,10 @@
"type.railway.subway_entrance.palma" = "Subway Entrance";
"type.man_made.utility_pole" = "Utility Pole";
"type.public_transport" = "Public Transport";
-"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.public_transport.platform" = "Platform";
"type.power.pole" = "Power Pole";
-"type.psurface.paved_bad" = "psurface-paved_bad";
"type.railway.station.subway.palma" = "Subway Station";
"type.railway.station.subway.rio" = "Subway Station";
"type.railway.station.subway.medellin" = "Subway Station";
@@ -410,7 +404,6 @@
"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";
@@ -424,7 +417,6 @@
"type.shop.collector" = "Collectables";
"type.amenity.post_box" = "Mailbox";
"type.place.hamlet" = "Hamlet";
-"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
"type.addr_interpolation" = "Address/Block";
"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
"type.man_made.water_tap" = "Water Tap";
@@ -446,7 +438,6 @@
"type.craft.key_cutter" = "Key Cutting";
"type.amenity.vending_machine" = "Vending Machine";
"type.amenity.music_school" = "Music School";
-"type.hwtag.nobicycle" = "hwtag-nobicycle";
"type.highway.busway" = "Dedicated Bus Road";
"type.shop.trade" = "Trade Supplies";
"type.railway.subway_entrance.stockholm" = "Subway Entrance";
@@ -460,7 +451,6 @@
"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";
@@ -542,7 +532,6 @@
"type.shop.rental" = "Rental Shop";
"type.historic.castle" = "Castle";
"type.railway.station.subway.shiraz" = "Subway Station";
-"type.hwtag.yescar" = "hwtag-yescar";
"type.shop.cosmetics" = "Cosmetics Shop";
"type.leisure.slipway" = "Slipway";
"type.organic.only" = "Organic";
@@ -597,7 +586,6 @@
"type.cuisine.indonesian" = "Indonesian";
"type.cuisine.ice_cream" = "Ice Cream";
"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";
@@ -622,7 +610,6 @@
"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
"type.building.train_station" = "Station Building";
"type.place.state" = "State";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
"type.place.town" = "Town";
"type.leisure.park" = "Park";
"type.highway.cycleway" = "Cycle Path";
@@ -800,7 +787,6 @@
"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.landuse.forest" = "Forest";
"type.leisure.track" = "Track";
"type.railway.rail.utility.bridge" = "Railway Bridge";
@@ -856,7 +842,6 @@
"type.railway.station.light_rail.london" = "DLR Station";
"type.sport.shooting" = "Shooting";
"type.railway.station.light_rail.berlin" = "S-Bahn Station";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.natural.geyser" = "Geyser";
"type.amenity.bbq" = "Barbecue Grill";
"type.landuse.reservoir" = "Reservoir";
@@ -874,7 +859,6 @@
"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.sport.scuba_diving" = "Scuba Diving Site";
@@ -891,7 +875,6 @@
"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";
@@ -941,7 +924,6 @@
"type.place.state.USA" = "State";
"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";
@@ -957,7 +939,6 @@
"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.highway.motorway" = "Motorway";
@@ -1036,7 +1017,6 @@
"type.place.county" = "County";
"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";
@@ -1232,8 +1212,6 @@
"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.leisure.outdoor_seating" = "Outdoor Seating";
"type.railway.subway_entrance.brescia" = "Subway Entrance";
"type.railway.subway_entrance.cairo" = "Subway Entrance";
@@ -1300,7 +1278,6 @@
"type.cuisine.italian_pizza" = "Italian, Pizza";
"type.cuisine.barbecue" = "Barbecue";
"type.cuisine.bavarian" = "Bavarian";
-"type.hwtag.toll" = "hwtag-toll";
"type.natural.volcano" = "Volcano";
"type.natural.wetland" = "Wetland";
"type.natural.water.lake" = "Lake";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index 9553418d9..8c1d61a36 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -634,9 +634,6 @@
"type.historic.wayside_cross" = "Útmenti kereszt";
"type.historic.wayside_shrine" = "Útmenti kegyhely";
"type.historic.wreck" = "Hajóroncs";
-"type.hwtag.oneway" = "egyirányú";
-"type.hwtag.private" = "magán";
-"type.hwtag.toll" = "útdíjjas";
"type.internet_access" = "Internetcsatlakozás";
"type.internet_access.wlan" = "Internetcsatlakozás";
"type.junction" = "Kereszteződés";
@@ -877,11 +874,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Közműoszlop";
-"type.psurface" = "felület";
-"type.psurface.paved_bad" = "felület-burkolt_rossz";
-"type.psurface.paved_good" = "felület-burkolt_jó";
-"type.psurface.unpaved_bad" = "felület-burkolatlan_rossz";
-"type.psurface.unpaved_good" = "felület-burkolatlan_jó";
"type.public_transport" = "Közösségi közlekedés";
"type.public_transport.platform" = "Peron";
"type.railway" = "Vasút";
@@ -1183,7 +1175,6 @@
"type.railway.tram_stop" = "Villamosmegálló";
"type.route" = "Útvonal";
"type.route.ferry" = "Komp";
-"type.route.shuttle_train" = "útvonal-ingajáratú_vonat";
"type.shop" = "Bolt";
"type.shop.alcohol" = "Szeszesitalbolt";
"type.shop.bakery" = "Pékség";
@@ -1465,20 +1456,6 @@
"type.boundary.administrative.4" = "Regionális határ";
"type.leisure.marina" = "Kishajókikötő";
"type.man_made.cairn" = "Kőhalom (mesterséges)";
-"type.highway.world_level" = "út-világszint";
-"type.highway.world_towns_level" = "út-világvárosok szint";
-"type.hwtag" = "útcímke";
-"type.hwtag.bidir_bicycle" = "útcímke-kétirányú_kerékpárút";
-"type.hwtag.lit" = "útcímke-megvilágítás";
-"type.hwtag.onedir_bicycle" = "útcímke-egyirányú_kerékpárút";
-"type.hwtag.nofoot" = "útcímke-gyalogosan_nem_használható";
-"type.hwtag.yesbicycle" = "útcímke-kerékpárral_használható";
-"type.hwtag.yescar" = "útcímke-személyautóval_használható";
-"type.mapswithme" = "MapsWithMe";
-"type.hwtag.nobicycle" = "útcímke-kerékpárral_nem_használható";
-"type.mapswithme.grid" = "mapswithme-rács";
-"type.hwtag.nocar" = "útcímke-személyautóval_nem_használható";
-"type.hwtag.yesfoot" = "útcímke-gyalogosan_használható";
"type.barrier.guard_rail" = "Guard Rail";
"type.highway.ladder" = "Ladder";
"type.landuse.plant_nursery" = "Plant Nursery";
diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
index 56eaef8c4..9055281a3 100644
--- a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
@@ -1,4 +1,3 @@
-"type.mapswithme" = "MapsWithMe";
"type.barrier.lift_gate" = "Lift Gate";
"type.fee.yes" = "$";
"type.highway.footway" = "Foot Path";
@@ -82,7 +81,6 @@
"type.area_highway.steps" = "Stairs";
"type.historic.anchor" = "Historic Anchor";
"type.historic" = "Historic Object";
-"type.highway.world_level" = "highway-world_level";
"type.historic.castle.fortified_church" = "Fortified Church";
"type.historic.cannon" = "Cannon";
"type.historic.boundary_stone" = "Boundary Stone";
@@ -99,8 +97,6 @@
"type.historic.monument" = "Monument";
"type.historic.ruins" = "Historic Ruins";
"type.historic.tank" = "Historic Tank";
-"type.hwtag.nocar" = "hwtag-nocar";
-"type.hwtag.toll" = "hwtag-toll";
"type.internet_access" = "Internet";
"type.junction.roundabout" = "Roundabout";
"type.landuse.basin" = "Basin";
@@ -446,7 +442,6 @@
"type.shop.collector" = "Collectables";
"type.amenity.post_box" = "Mailbox";
"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.cuisine.deli" = "Deli";
@@ -467,7 +462,6 @@
"type.amenity.vending_machine" = "Vending Machine";
"type.railway.station.subway.paris" = "Subway Station";
"type.amenity.music_school" = "Music School";
-"type.hwtag.nobicycle" = "hwtag-nobicycle";
"type.highway.busway" = "Dedicated Bus Road";
"type.amenity.parking_space.permissive" = "Parking Space";
"type.shop.trade" = "Trade Supplies";
@@ -482,7 +476,6 @@
"type.recycling.scrap_metal" = "Scrap Metal";
"type.highway.bridleway.tunnel" = "Tunnel";
"type.sport.curling" = "Curling";
-"type.hwtag.yesfoot" = "hwtag-yesfoot";
"type.highway.path" = "Path";
"type.natural.water.basin" = "Basin";
"type.amenity.restaurant" = "Restaurant";
@@ -551,7 +544,6 @@
"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.railway.station.subway.philadelphia" = "Subway Station";
@@ -580,7 +572,6 @@
"type.building_part" = "Building";
"type.railway.tram_stop" = "Tram Stop";
"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";
@@ -611,7 +602,6 @@
"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";
@@ -637,7 +627,6 @@
"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";
@@ -666,7 +655,6 @@
"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.power.tower" = "Power Tower";
"type.amenity.exhibition_centre" = "Exhibition Center";
@@ -745,7 +733,6 @@
"type.railway.subway_entrance.barcelona" = "Subway Entrance";
"type.railway.station.subway.la" = "Subway Station";
"type.attraction.historic" = "Historic attraction";
-"type.psurface" = "psurface";
"type.barrier.gate" = "Gate";
"type.area_highway.secondary" = "Secondary Road";
"type.power.line" = "Power Line";
@@ -780,7 +767,6 @@
"type.shop.curtain" = "Curtain Shop";
"type.cuisine.american" = "American";
"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";
@@ -872,7 +858,6 @@
"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.waterway.stream.ephemeral" = "Ephemeral Stream";
"type.landuse.reservoir" = "Reservoir";
"type.sport.soccer" = "Soccer";
@@ -887,7 +872,6 @@
"type.shop.medical_supply" = "Medical Supplies Store";
"type.military.bunker" = "Bunker";
"type.barrier.guard_rail" = "Guard Rail";
-"type.hwtag.private" = "hwtag-private";
"type.cuisine.coffee_shop" = "Coffee";
"type.highway.footway.bicycle" = "Cycle & Foot Path";
"type.barrier.border_control" = "Border Control";
@@ -902,7 +886,6 @@
"type.tourism.museum" = "Museum";
"type.amenity.school" = "School";
"type.amenity.parcel_locker" = "Parcel Locker";
-"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
"type.historic.pillory" = "Pillory";
"type.man_made.tower" = "Tower";
"type.historic.archaeological_site" = "Archaeological Site";
@@ -948,7 +931,6 @@
"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";
@@ -963,7 +945,6 @@
"type.piste_type.downhill.expert.area" = "Expert Downhill Ski Run";
"type.emergency.fire_hydrant" = "Fire Hydrant";
"type.power.generator.wind" = "Wind Generator";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.railway.disused" = "Disused Railway";
"type.man_made.pipeline" = "Pipeline";
"type.highway.motorway" = "Motorway";
@@ -1036,7 +1017,6 @@
"type.amenity.casino" = "Casino";
"type.place.county" = "County";
"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";
@@ -1235,7 +1215,6 @@
"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.cuisine.oriental" = "East Asian";
"type.aeroway.aerodrome" = "Airport";
"type.natural.orchard" = "Orchard";
@@ -1244,8 +1223,6 @@
"type.sport.equestrian" = "Equestrian Sports";
"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";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
index 4280c649d..84e7b5c64 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Jalan";
"type.area_highway.trunk" = "Jalan";
"type.area_highway.unclassified" = "Jalan";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Objek bersejarah";
"type.historic.aircraft" = "Pesawat Bersejarah";
"type.historic.anchor" = "Jangkar Bersejarah";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Salib di pinggir jalan";
"type.historic.wayside_shrine" = "Kuil di pinggir jalan";
"type.historic.wreck" = "Kecelakaan kapal";
-"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";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Sumur air";
"type.man_made.windmill" = "Kincir angin";
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Perhentian trem";
"type.route" = "Route";
"type.route.ferry" = "Ferry";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Toko";
"type.shop.alcohol" = "Toko alkohol";
"type.shop.bakery" = "Toko roti";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
index 0a2ba09c4..3a4006f8c 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
@@ -408,8 +408,6 @@
"type.self_service.partially" = "Sjálfsafgreiðsla að hluta";
"type.emergency.emergency_ward_entrance" = "Inngangur á bráðamóttöku";
"type.power" = "Orka";
-"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
-"type.psurface.unpaved_good" = "psurface-unpaved_good";
"type.railway.preserved" = "Varðveitt lestarspor";
"type.railway.preserved.bridge" = "Varðveitt lestarbrú";
"type.railway.preserved.tunnel" = "Varðveitt lestargöng";
@@ -425,30 +423,10 @@
"type.craft.confectionery" = "Smáréttagerð";
"type.healthcare.sample_collection" = "Söfnunarmiðstöð sýna";
"type.healthcare.speech_therapist" = "Talmeinafræði";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic.castle.hillfort" = "Víggirt hæð";
"type.historic.castle.stately" = "Kastalasetur";
-"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.landuse.railway" = "Járnbrautasvæði";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.natural.water.lock" = "Skipastigahólf";
-"type.psurface" = "psurface";
-"type.psurface.paved_bad" = "psurface-paved_bad";
-"type.psurface.paved_good" = "psurface-paved_good";
"type.railway.funicular.bridge" = "Dráttarlestarbrú";
"type.railway.funicular.tunnel" = "Dráttarlestargöng";
"type.railway.halt" = "Járnbrautarstopp";
@@ -464,7 +442,6 @@
"type.railway.subway_entrance.london" = "Inngangur í neðanjarðarlest";
"type.railway.tram.bridge" = "Sporvagnabrú";
"type.railway.tram.tunnel" = "Sporvagnagöng";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop.houseware" = "Búsáhaldaverslun";
"type.shop.craft" = "Handverksvöruverslun";
"type.shop.tobacco" = "Reykingaverslun";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 64b30ca41..b945d408e 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Via";
"type.area_highway.trunk" = "Strada";
"type.area_highway.unclassified" = "Via";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Oggetto storico";
"type.historic.aircraft" = "Aerei storici";
"type.historic.anchor" = "Ancora storica";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Crocifisso";
"type.historic.wayside_shrine" = "Edicola votiva";
"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" = "Incrocio";
@@ -772,8 +757,6 @@
"type.man_made.water_well.drinking_water_no" = "Pozzo d'acqua";
"type.man_made.windmill" = "Mulino a vento";
"type.man_made.works" = "Fabbrica";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Forze armate";
"type.military.bunker" = "Bunker";
"type.mountain_pass" = "Passo";
@@ -900,11 +883,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Palo di servizio";
-"type.psurface" = "Superficie";
-"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" = "Trasporto pubblico";
"type.public_transport.platform" = "Banchina";
"type.railway" = "Ferrovia";
@@ -1205,7 +1183,6 @@
"type.railway.tram_stop" = "Fermata del tram";
"type.route" = "Percorso";
"type.route.ferry" = "Traghetto";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Negozio";
"type.shop.alcohol" = "Negozio di alcolici";
"type.shop.bakery" = "Panetteria";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
index 1cdb33a68..4f0775d54 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "ストリート";
"type.area_highway.trunk" = "ストリート";
"type.area_highway.unclassified" = "ストリート";
-"type.highway.world_level" = "高速道路(世界レベル)";
-"type.highway.world_towns_level" = "高速道路(町レベル)";
"type.historic" = "史跡";
"type.historic.aircraft" = "歴史的な航空機";
"type.historic.anchor" = "歴史的なアンカー";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "歴史的な十字架";
"type.historic.wayside_shrine" = "歴史的な祠";
"type.historic.wreck" = "難破船";
-"type.hwtag" = "交通特性タグ";
-"type.hwtag.bidir_bicycle" = "双方向の自転車レーンタグ";
-"type.hwtag.onedir_bicycle" = "一方通行の自転車レーンタグ";
-"type.hwtag.lit" = "道路照明タグ";
-"type.hwtag.nobicycle" = "自転車通行禁止タグ";
-"type.hwtag.nocar" = "自動車通行禁止タグ";
-"type.hwtag.nofoot" = "歩行者通行禁止タグ";
-"type.hwtag.oneway" = "一方通行の道路タグ";
-"type.hwtag.private" = "私道タグ";
-"type.hwtag.toll" = "有料道路タグ";
-"type.hwtag.yesbicycle" = "自転車通行許可タグ";
-"type.hwtag.yescar" = "自動車通行許可タグ";
-"type.hwtag.yesfoot" = "歩行者通行許可タグ";
"type.internet_access" = "インターネット";
"type.internet_access.wlan" = "インターネット";
"type.junction" = "交差点";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "井戸";
"type.man_made.windmill" = "風車";
"type.man_made.works" = "工場";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-グリッド";
"type.military" = "軍事";
"type.military.bunker" = "掩蔽壕";
"type.mountain_pass" = "峠";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "ユーティリティポール";
-"type.psurface" = "路面";
-"type.psurface.paved_bad" = "舗装路面(悪い)";
-"type.psurface.paved_good" = "舗装路面(良い)";
-"type.psurface.unpaved_bad" = "未舗装路面(悪い)";
-"type.psurface.unpaved_good" = "未舗装路面(良い)";
"type.public_transport" = "公共交通機関";
"type.public_transport.platform" = "公共交通機関のプラットホーム";
"type.railway" = "鉄道";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "トラム";
"type.route" = "ルート";
"type.route.ferry" = "フェリー航路";
-"type.route.shuttle_train" = "シャトル列車";
"type.shop" = "買い物";
"type.shop.alcohol" = "酒屋";
"type.shop.bakery" = "パン屋";
diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
index 3a46f2d12..62f06fe82 100644
--- a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
@@ -1,4 +1,3 @@
-"type.mapswithme" = "MapsWithMe";
"type.railway.station.subway.bengalore" = "Subway Station";
"type.amenity.language_school" = "Language School";
"type.amenity.recycling.centre" = "Recycling Center";
@@ -26,12 +25,7 @@
"type.historic.pillory" = "Pillory";
"type.historic.memorial.war_memorial" = "War Memorial";
"type.historic.wayside_cross" = "Wayside Cross";
-"type.hwtag" = "hwtag";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
"type.historic.tank" = "Historic Tank";
-"type.hwtag.nocar" = "hwtag-nocar";
-"type.hwtag.nobicycle" = "hwtag-nobicycle";
-"type.hwtag.nofoot" = "hwtag-nofoot";
"type.leisure.recreation_ground" = "Recreation Ground";
"type.leisure.park.private" = "Private Park";
"type.leisure.park.permissive" = "Park";
@@ -279,7 +273,6 @@
"type.railway.subway_entrance.wuhan" = "Subway Entrance";
"type.route" = "Route";
"type.railway.subway_entrance.valencia" = "Subway Entrance";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.railway.tram.tunnel" = "Tram Line Tunnel";
"type.shop.bakery" = "Bakery";
"type.shop" = "Shop";
@@ -544,7 +537,6 @@
"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";
@@ -696,7 +688,6 @@
"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.aeroway.aerodrome" = "Airport";
"type.natural.orchard" = "Orchard";
@@ -705,7 +696,6 @@
"type.cuisine.thai" = "Thai";
"type.leisure.miniature_golf" = "Minigolf";
"type.internet_access.wlan" = "Internet";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.leisure.outdoor_seating" = "Outdoor Seating";
"type.leisure.playground" = "Playground";
"type.area_highway.cycleway" = "Cycle Path";
@@ -762,7 +752,6 @@
"type.amenity.ice_cream" = "Ice Cream";
"type.railway.rail.branch.bridge" = "Railway Bridge";
"type.area_highway.footway" = "Foot Path";
-"type.hwtag.toll" = "hwtag-toll";
"type.boundary.administrative" = "Administrative Boundary";
"type.amenity.parking_space" = "Parking Space";
"type.shop.pet" = "Pet Store";
@@ -901,7 +890,6 @@
"type.cuisine.persian" = "Persian";
"type.area_highway.residential" = "Residential Street";
"type.amenity.post_box" = "Mailbox";
-"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
"type.addr_interpolation" = "Address/Block";
"type.man_made.water_tap" = "Water Tap";
"type.cuisine.deli" = "Deli";
@@ -931,7 +919,6 @@
"type.highway.secondary" = "Secondary Road";
"type.highway.bridleway.tunnel" = "Tunnel";
"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";
@@ -985,7 +972,6 @@
"type.amenity.veterinary" = "Veterinary Doctor";
"type.amenity.dentist" = "Dentist";
"type.shop.rental" = "Rental Shop";
-"type.hwtag.yescar" = "hwtag-yescar";
"type.organic.only" = "Organic";
"type.landuse.greenfield" = "Greenfield";
"type.cuisine.pancake" = "Pancake";
@@ -1004,7 +990,6 @@
"type.building_part" = "Building";
"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.leisure.adult_gaming_centre" = "Adult Gaming Centre";
@@ -1056,7 +1041,6 @@
"type.amenity.cinema" = "Cinema";
"type.cuisine.bubble_tea" = "Bubble Tea";
"type.cuisine.malagasy" = "Malagasy";
-"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
"type.power.tower" = "Power Tower";
"type.amenity.exhibition_centre" = "Exhibition Center";
"type.natural.water.moat" = "Moat";
@@ -1132,7 +1116,6 @@
"type.craft.blacksmith" = "Blacksmith";
"type.amenity.parking.street_side" = "Street-Side Parking";
"type.highway.motorway.tunnel" = "Motorway Tunnel";
-"type.psurface" = "psurface";
"type.entrance.exit" = "Exit";
"type.emergency.lifeguard" = "Lifeguard";
"type.amenity.car_rental" = "Car Rental";
@@ -1141,7 +1124,6 @@
"type.highway.trunk.bridge" = "Bridge";
"type.cuisine.american" = "American";
"type.natural.bare_rock" = "Bare Rock";
-"type.psurface.paved_good" = "psurface-paved_good";
"type.cuisine.beef_bowl" = "Beef Bowl";
"type.railway.rail.utility" = "Utility Railway";
"type.highway.residential.area" = "Residential Street";
@@ -1163,7 +1145,6 @@
"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.landuse.forest" = "Forest";
"type.railway.rail.utility.bridge" = "Railway Bridge";
"type.leisure" = "Leisure";
@@ -1204,7 +1185,6 @@
"type.railway.station.subway.berlin" = "Subway Station";
"type.historic.castle.kremlin" = "Kremlin";
"type.railway.station.light_rail.berlin" = "S-Bahn Station";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.natural.geyser" = "Geyser";
"type.amenity.bbq" = "Barbecue Grill";
"type.landuse.reservoir" = "Reservoir";
@@ -1220,7 +1200,6 @@
"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";
@@ -1233,7 +1212,6 @@
"type.highway.track" = "Track";
"type.amenity.school" = "School";
"type.amenity.parcel_locker" = "Parcel Locker";
-"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
"type.barrier.block" = "Block";
"type.man_made.tower" = "Tower";
"type.historic.archaeological_site" = "Archaeological Site";
@@ -1268,7 +1246,6 @@
"type.amenity.college" = "College";
"type.railway.station.light_rail" = "Light Rail Station";
"type.cuisine.ethiopian" = "Ethiopian";
-"type.hwtag.oneway" = "hwtag-oneway";
"type.cuisine.russian" = "Russian";
"type.aeroway" = "Airspace Infrastructure";
"type.healthcare.alternative" = "Alternative Medicine";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
index 90ea392e6..c8f272ede 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "역사적인 앵커";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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" = "베이커리";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
index c9a1c1c4d..50190e193 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "Istorinis lėktuvas";
"type.historic.anchor" = "Istorinis inkaras";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Wayside Cross";
"type.historic.wayside_shrine" = "Wayside Shrine";
"type.historic.wreck" = "Laivo liekanos";
-"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
index 09954a512..da6bea252 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
index 551d49cd1..5dd0231b4 100644
--- a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
@@ -1,4 +1,3 @@
-"type.mapswithme" = "MapsWithMe";
"type.historic.memorial.war_memorial" = "War Memorial";
"type.historic.wayside_cross" = "Wayside Cross";
"type.historic.monument" = "Monument";
@@ -38,14 +37,6 @@
"type.barrier.toll_booth" = "Toll Booth";
"type.boundary.administrative" = "Administrative Boundary";
"type.boundary.national_park" = "National Park";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
-"type.hwtag.lit" = "hwtag-lit";
-"type.hwtag.nocar" = "hwtag-nocar";
-"type.hwtag.nobicycle" = "hwtag-nobicycle";
-"type.hwtag.private" = "hwtag-private";
-"type.hwtag.oneway" = "hwtag-oneway";
-"type.hwtag.nofoot" = "hwtag-nofoot";
-"type.hwtag.toll" = "hwtag-toll";
"type.junction.roundabout" = "Roundabout";
"type.landuse.cemetery" = "Cemetery";
"type.landuse.commercial" = "Commercial Area";
@@ -193,7 +184,6 @@
"type.military" = "Military";
"type.man_made.windmill" = "Windmill";
"type.man_made.works" = "Industrial Works";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.natural.bay" = "Bay";
"type.natural.shingle" = "Shingle";
"type.natural.bare_rock" = "Bare Rock";
@@ -248,7 +238,6 @@
"type.railway.station.subway.shanghai" = "Subway Station";
"type.power.tower" = "Power Tower";
"type.landuse.religious" = "Religious Land";
-"type.psurface" = "psurface";
"type.railway.station.subway.almaty" = "Subway Station";
"type.railway.station.subway.bangkok" = "Subway Station";
"type.railway.station.subway.buenos_aires" = "Subway Station";
@@ -586,7 +575,6 @@
"type.area_highway.residential" = "Residential Street";
"type.amenity.post_box" = "Mailbox";
"type.place.hamlet" = "Hamlet";
-"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
"type.addr_interpolation" = "വിലാസം/ബ്ലോക്ക്";
"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
"type.man_made.water_tap" = "Water Tap";
@@ -606,7 +594,6 @@
"type.amenity.bench" = "Bench";
"type.highway.secondary" = "Secondary Road";
"type.aerialway.station" = "Aerialway Station";
-"type.hwtag.yesfoot" = "hwtag-yesfoot";
"type.highway.tertiary_link" = "Tertiary Road Ramp";
"type.aeroway.apron" = "Apron";
"type.railway.subway_entrance" = "Subway Entrance";
@@ -650,7 +637,6 @@
"type.amenity.veterinary" = "Veterinary Doctor";
"type.shop.rental" = "Rental Shop";
"type.historic.castle" = "Castle";
-"type.hwtag.yescar" = "hwtag-yescar";
"type.leisure.slipway" = "Slipway";
"type.railway.station.subway.philadelphia" = "Subway Station";
"type.landuse.greenfield" = "Greenfield";
@@ -672,7 +658,6 @@
"type.building_part" = "Building";
"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.subway_entrance.minsk" = "Subway Entrance";
@@ -688,7 +673,6 @@
"type.office.company" = "Company Office";
"type.highway.path.expert" = "Expert or Indiscernible Trail";
"type.cuisine.indonesian" = "Indonesian";
-"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";
@@ -729,7 +713,6 @@
"type.man_made.cutline" = "Cutline";
"type.shop.craft" = "Craft Supplies Store";
"type.cuisine.malagasy" = "Malagasy";
-"type.psurface.unpaved_bad" = "psurface-unpaved_bad";
"type.railway.subway_entrance.catania" = "Subway Entrance";
"type.amenity.exhibition_centre" = "Exhibition Center";
"type.sport.gymnastics" = "Gymnastics";
@@ -828,7 +811,6 @@
"type.historic.castle.manor" = "Manor House";
"type.highway.trunk.bridge" = "Bridge";
"type.cuisine.american" = "American";
-"type.psurface.paved_good" = "psurface-paved_good";
"type.cuisine.beef_bowl" = "Beef Bowl";
"type.tourism.motel" = "Motel";
"type.railway.rail.utility" = "Utility Railway";
@@ -857,7 +839,6 @@
"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";
@@ -900,7 +881,6 @@
"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";
@@ -929,7 +909,6 @@
"type.shop.bed" = "Bed Shop";
"type.tourism.museum" = "Museum";
"type.amenity.parcel_locker" = "Parcel Locker";
-"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
"type.historic.pillory" = "Pillory";
"type.barrier.block" = "Block";
"type.man_made.tower" = "Tower";
@@ -989,7 +968,6 @@
"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.man_made.pipeline" = "Pipeline";
"type.railway.station.subway.yerevan" = "Subway Station";
"type.highway.motorway" = "Motorway";
@@ -1241,7 +1219,6 @@
"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.cuisine.oriental" = "East Asian";
"type.aeroway.aerodrome" = "Airport";
"type.natural.orchard" = "Orchard";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
index 1477c516d..10093530d 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "ऐतिहासिक अँकर";
@@ -644,19 +642,6 @@
"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" = "जंक्शन";
@@ -773,8 +758,6 @@
"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" = "डोंगरवाट";
@@ -901,11 +884,6 @@
/* 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" = "सार्वजनिक वाहतूक";
"type.public_transport.platform" = "फलाट";
"type.railway" = "रेल्वे";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "ट्राम थांबा";
"type.route" = "मार्ग";
"type.route.ferry" = "होडी";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "दुकान";
"type.shop.alcohol" = "दारूचे दुकान";
"type.shop.bakery" = "बेकरी";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
index b871f5739..5aa62431e 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index 9287b17f6..b7a8402b8 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Traktor/Skogsbilvei";
"type.area_highway.trunk" = "Riksvei";
"type.area_highway.unclassified" = "Småvei";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Historisk gjenstand";
"type.historic.aircraft" = "Historisk fly";
"type.historic.anchor" = "Historisk anker";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Veikantkors";
"type.historic.wayside_shrine" = "Helligdom ved veikanten";
"type.historic.wreck" = "Skipsvrak";
-"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";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Brønn";
"type.man_made.windmill" = "Vindmølle";
"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";
@@ -901,11 +884,6 @@
/* 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" = "Platform";
"type.railway" = "Jernbane";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Trikkestopp";
"type.route" = "Route";
"type.route.ferry" = "Ferry";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Butikk";
"type.shop.alcohol" = "Vinmonopol";
"type.shop.bakery" = "Bakeri";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index 99727cb05..31b1fe5f1 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Straat";
"type.area_highway.trunk" = "Straat";
"type.area_highway.unclassified" = "Straat";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Historisch object";
"type.historic.aircraft" = "Historische vliegtuigen";
"type.historic.anchor" = "Historisch anker";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Wegkruis";
"type.historic.wayside_shrine" = "Kruisbeeld";
"type.historic.wreck" = "Schipbreuk";
-"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" = "Draadloos internet";
"type.junction" = "Kruispunt";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Waterput";
"type.man_made.windmill" = "Windmolen";
"type.man_made.works" = "Fabriek";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Militair";
"type.military.bunker" = "Bunker";
"type.mountain_pass" = "Bergpas";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Paal";
-"type.psurface" = "Wegdek";
-"type.psurface.paved_bad" = "Verhard";
-"type.psurface.paved_good" = "Verhard";
-"type.psurface.unpaved_bad" = "Onverhard";
-"type.psurface.unpaved_good" = "Onverhard";
"type.public_transport" = "Openbaar vervoer";
"type.public_transport.platform" = "Platform";
"type.railway" = "Spoorweg";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Tramhalte";
"type.route" = "Route";
"type.route.ferry" = "Veerboot";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Winkel";
"type.shop.alcohol" = "Slijterij";
"type.shop.bakery" = "Bakkerij";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
index 809a19673..1ebf845cc 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Droga na pola lub do lasu";
"type.area_highway.trunk" = "Ulica";
"type.area_highway.unclassified" = "Ulica";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Obiekt historyczny";
"type.historic.aircraft" = "Historyczny samolot";
"type.historic.anchor" = "Historyczna kotwica";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Krzyż przydrożny";
"type.historic.wayside_shrine" = "Kapliczka przydrożna";
"type.historic.wreck" = "Wrak statku";
-"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" = "Skrzyżowanie";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Studnia";
"type.man_made.windmill" = "Młyn wiatrowy";
"type.man_made.works" = "Fabryka";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Wojskowe";
"type.military.bunker" = "Bunkier";
"type.mountain_pass" = "Przełęcz górska";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Słup użytkowy";
-"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 publiczny";
"type.public_transport.platform" = "Przystanek transportu publicznego";
"type.railway" = "Kolej";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Przystanek tramwajowy";
"type.route" = "Trasa";
"type.route.ferry" = "Przeprawa promowa";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Sklep";
"type.shop.alcohol" = "Sklep monopolowy";
"type.shop.bakery" = "Piekarnia";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index af47cade6..54ff3be10 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Pista para desportos não motorizados";
"type.area_highway.trunk" = "Via expressa";
"type.area_highway.unclassified" = "Estrada sem classificação";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Objeto histórico";
"type.historic.aircraft" = "Aeronaves Históricas";
"type.historic.anchor" = "Âncora Histórica";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Cruz à beira da estrada";
"type.historic.wayside_shrine" = "Santuário à beira da estrada";
"type.historic.wreck" = "Naufrágio";
-"type.hwtag" = "Sinalização de trânsito";
-"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-pedágio";
-"type.hwtag.yesbicycle" = "hwtag-simbicicleta";
-"type.hwtag.yescar" = "hwtag-yescar";
-"type.hwtag.yesfoot" = "hwtag-yesfoot";
"type.internet_access" = "Internet";
"type.internet_access.wlan" = "Internet";
"type.junction" = "Cruzamento";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Poço de água";
"type.man_made.windmill" = "Moinho de vento";
"type.man_made.works" = "Fábrica";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Militar";
"type.military.bunker" = "Búnquer";
"type.mountain_pass" = "Passo da Montanha";
@@ -900,11 +883,6 @@
/* 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 de transporte público";
"type.railway" = "Ferrovia";
@@ -1206,7 +1184,6 @@
"type.railway.tram_stop" = "Parada de bonde";
"type.route" = "Rota";
"type.route.ferry" = "Rota de balsa";
-"type.route.shuttle_train" = "rota-ônibus_trem";
"type.shop" = "Loja";
"type.shop.alcohol" = "Loja de bebidas alcoólicas";
"type.shop.bakery" = "Padaria";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index 0d22daf8b..2894e1b4c 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Pista para desportos não motorizados";
"type.area_highway.trunk" = "Via rápida";
"type.area_highway.unclassified" = "Estrada sem classificação";
-"type.highway.world_level" = "nível mundial de rodovias";
-"type.highway.world_towns_level" = "nível_das_cidades_do_mundo_das_rodovias";
"type.historic" = "Objeto histórico";
"type.historic.aircraft" = "Aeronaves Históricas";
"type.historic.anchor" = "Âncora Histórica";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Cruzeiro";
"type.historic.wayside_shrine" = "Alminhas";
"type.historic.wreck" = "Naufrágio";
-"type.hwtag" = "hwtag";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicicleta";
-"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicicleta";
-"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-simbicicleta";
-"type.hwtag.yescar" = "hwtag-yescar";
-"type.hwtag.yesfoot" = "hwtag-yesfoot";
"type.internet_access" = "Internet";
"type.internet_access.wlan" = "Internet";
"type.junction" = "Cruzamento";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Poço de água";
"type.man_made.windmill" = "Moinho de vento";
"type.man_made.works" = "Fábrica";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grade";
"type.military" = "Militar";
"type.military.bunker" = "Búnquer";
"type.mountain_pass" = "Passo da Montanha";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Poste de serviço público";
-"type.psurface" = "superfície p";
-"type.psurface.paved_bad" = "superfície pavimentada ruim";
-"type.psurface.paved_good" = "superfície pavimentada_boa";
-"type.psurface.unpaved_bad" = "psurface-não pavimentado_ruim";
-"type.psurface.unpaved_good" = "psurface-unpaved_good";
"type.public_transport" = "Transporte público";
"type.public_transport.platform" = "Plataforma de transporte público";
"type.railway" = "Ferrovia";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Paragem de elétrico";
"type.route" = "Rota";
"type.route.ferry" = "Rota de ferry";
-"type.route.shuttle_train" = "rota-ônibus_trem";
"type.shop" = "Loja";
"type.shop.alcohol" = "Loja de bebidas alcoolicas";
"type.shop.bakery" = "Padaria";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
index 70b099ca9..fc2506bdf 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Stradă";
"type.area_highway.trunk" = "Stradă";
"type.area_highway.unclassified" = "Stradă";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Obiect istoric";
"type.historic.aircraft" = "Avioane istorice";
"type.historic.anchor" = "Ancoră istorică";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Troiță";
"type.historic.wayside_shrine" = "Altarul de la marginea drumului";
"type.historic.wreck" = "Naufragiu";
-"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";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Puț de apă";
"type.man_made.windmill" = "Moară de vânt";
"type.man_made.works" = "Industrial Works";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Military";
"type.military.bunker" = "Buncăr";
"type.mountain_pass" = "Mountain Pass";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Stație de tramvai";
"type.route" = "Route";
"type.route.ferry" = "Ferry";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Magazin";
"type.shop.alcohol" = "Băuturi alcoolice";
"type.shop.bakery" = "Brutărie";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index 19b813f05..75df7e20f 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Грунтовка";
"type.area_highway.trunk" = "Трасса";
"type.area_highway.unclassified" = "Небольшая дорога";
-"type.highway.world_level" = "Шоссе мирового значения";
-"type.highway.world_towns_level" = "Шоссе местного значения";
"type.historic" = "Исторический объект";
"type.historic.aircraft" = "Исторический самолет";
"type.historic.anchor" = "Исторический якорь";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Христианский крест";
"type.historic.wayside_shrine" = "Святыня";
"type.historic.wreck" = "Кораблекрушение";
-"type.hwtag" = "Дорожный знак";
-"type.hwtag.bidir_bicycle" = "Велосипедная двухсторонняя";
-"type.hwtag.onedir_bicycle" = "Велосипедная односторонняя";
-"type.hwtag.lit" = "Освещённая";
-"type.hwtag.nobicycle" = "Без мотоциклов";
-"type.hwtag.nocar" = "Не для машин";
-"type.hwtag.nofoot" = "Не пешая";
-"type.hwtag.oneway" = "Одностороннее движение";
-"type.hwtag.private" = "Частная";
-"type.hwtag.toll" = "Платная";
-"type.hwtag.yesbicycle" = "Велосипедам можно";
-"type.hwtag.yescar" = "Машинам можно";
-"type.hwtag.yesfoot" = "Пешком можно";
"type.internet_access" = "Интернет";
"type.internet_access.wlan" = "Интернет";
"type.junction" = "Перекрёсток";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Колодец";
"type.man_made.windmill" = "Ветряная мельница";
"type.man_made.works" = "Промышленное производство";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-сетка";
"type.military" = "Военные объекты";
"type.military.bunker" = "Бункер";
"type.mountain_pass" = "Перевал";
@@ -908,11 +891,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Столб";
-"type.psurface" = "Поверхность";
-"type.psurface.paved_bad" = "Плохая асфальтированная";
-"type.psurface.paved_good" = "Хорошая асфальтированная";
-"type.psurface.unpaved_bad" = "Плохая неасфальтированная";
-"type.psurface.unpaved_good" = "Хорошая неасфальтированная";
"type.public_transport" = "Общественный транспорт";
"type.public_transport.platform" = "Платформа";
"type.railway" = "Ж/Д";
@@ -1214,7 +1192,6 @@
"type.railway.tram_stop" = "Остановка трамвая";
"type.route" = "Маршрут";
"type.route.ferry" = "Паромная переправа";
-"type.route.shuttle_train" = "Челночный поезд";
"type.shop" = "Магазин";
"type.shop.alcohol" = "Магазин алкоголя";
"type.shop.bakery" = "Булочная";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
index f8246254b..a3527ee0d 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Poľná cesta";
"type.area_highway.trunk" = "Cesta";
"type.area_highway.unclassified" = "Cesta bez administratívneho zaradenia";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Historický objekt";
"type.historic.aircraft" = "Historické lietadlo";
"type.historic.anchor" = "Historická kotva";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Kríž pri ceste";
"type.historic.wayside_shrine" = "Svätyňa pri ceste";
"type.historic.wreck" = "Trosky lode";
-"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" = "Križovatka";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Studňa";
"type.man_made.windmill" = "Veterný mlyn";
"type.man_made.works" = "Továreň";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Military";
"type.military.bunker" = "Bunker";
"type.mountain_pass" = "Horský priesmyk";
@@ -901,11 +884,6 @@
/* 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" = "Hromadná doprava";
"type.public_transport.platform" = "Nástupište";
"type.railway" = "Železnica";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Zastávka električky";
"type.route" = "Trasa";
"type.route.ferry" = "Trajekt";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Obchod";
"type.shop.alcohol" = "Liehoviny";
"type.shop.bakery" = "Pekáreň";
diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
index 77b56e903..f60dbb642 100644
--- a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
@@ -1,6 +1,5 @@
"type.railway.station.subway.qingdao" = "Stacion metroje";
"type.leisure.hackerspace" = "Hackerspace";
-"type.mapswithme" = "MapsWithMe";
"type.railway.station.subway.hamburg" = "Subway Station";
"type.railway.station.subway.lyon" = "Subway Station";
"type.railway.station.subway.lisboa" = "Subway Station";
@@ -233,14 +232,7 @@
"type.historic.memorial.sculpture" = "Sculpture";
"type.historic.wayside_cross" = "Wayside Cross";
"type.historic.tank" = "Historic Tank";
-"type.hwtag.toll" = "hwtag-toll";
"type.internet_access" = "Internet";
-"type.hwtag.nocar" = "hwtag-nocar";
-"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
-"type.hwtag.nobicycle" = "hwtag-nobicycle";
-"type.hwtag.yesfoot" = "hwtag-yesfoot";
-"type.hwtag.yescar" = "hwtag-yescar";
-"type.hwtag" = "hwtag";
"type.landuse.flowerbed" = "Flowerbed";
"type.landuse.forest" = "Forest";
"type.landuse.garages" = "Garages";
@@ -349,14 +341,9 @@
"type.wheelchair" = "Wheelchair";
"type.piste_type.downhill.area" = "Downhill Ski Run";
"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.shop.chemist" = "Chemist";
"type.shop.clothes" = "Clothes Shop";
"type.shop.caravan" = "RV Dealership";
@@ -724,7 +711,6 @@
"type.power.plant.coal" = "Coal Power Plant";
"type.building.train_station" = "Station Building";
"type.railway.station.subway.nnov" = "Subway Station";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
"type.cuisine.vegetarian" = "Vegetarian";
"type.cuisine.malaysian" = "Malaysian";
"type.amenity.parking.street_side.private" = "Private Street-Side Parking";
@@ -856,7 +842,6 @@
"type.shop.fashion_accessories" = "Fashion Accessories";
"type.shop.electronics" = "Electronics Shop";
"type.amenity.charging_station" = "Charging Station";
-"type.highway.world_level" = "highway-world_level";
"type.piste_type.downhill.easy.area" = "Easy Downhill Ski Run";
"type.railway.rail.utility.bridge" = "Railway Bridge";
"type.leisure" = "Leisure";
@@ -903,7 +888,6 @@
"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.landuse.reservoir" = "Reservoir";
@@ -920,7 +904,6 @@
"type.craft.confectionery" = "Confectioner";
"type.shop.medical_supply" = "Medical Supplies Store";
"type.military.bunker" = "Bunker";
-"type.hwtag.private" = "hwtag-private";
"type.cuisine.coffee_shop" = "Coffee";
"type.highway.footway.bicycle" = "Cycle & Foot Path";
"type.sport.scuba_diving" = "Scuba Diving Site";
@@ -935,7 +918,6 @@
"type.shop.bed" = "Bed Shop";
"type.tourism.museum" = "Museum";
"type.amenity.school" = "School";
-"type.hwtag.yesbicycle" = "hwtag-yesbicycle";
"type.man_made.tower" = "Tower";
"type.historic.archaeological_site" = "Archaeological Site";
"type.shop.watches" = "Watch Store";
@@ -978,7 +960,6 @@
"type.cuisine.ethiopian" = "Ethiopian";
"type.railway.subway_entrance.malaga" = "Subway Entrance";
"type.waterway.dock" = "Waterway Dock";
-"type.hwtag.oneway" = "hwtag-oneway";
"type.attraction.animal" = "Animal Enclosure";
"type.sport.ice_hockey" = "Ice Hockey";
"type.aeroway" = "Airspace Infrastructure";
@@ -993,7 +974,6 @@
"type.piste_type.downhill.expert.area" = "Expert Downhill Ski Run";
"type.emergency.fire_hydrant" = "Fire Hydrant";
"type.shop.toys" = "Toy Store";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.railway.disused" = "Disused Railway";
"type.entrance.main" = "Main Entrance";
"type.landuse.quarry" = "Quarry";
@@ -1058,7 +1038,6 @@
"type.amenity.casino" = "Casino";
"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";
@@ -1233,8 +1212,6 @@
"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.cairo" = "Subway Entrance";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
index a2496b344..cb34dff14 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "Историјско сидро";
@@ -644,19 +642,6 @@
"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" = "Раскрсница";
@@ -773,8 +758,6 @@
"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" = "Планински превој";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Услужни стуб";
-"type.psurface" = "Површина";
-"type.psurface.paved_bad" = "Лош асфалт";
-"type.psurface.paved_good" = "Добар асфалт";
-"type.psurface.unpaved_bad" = "Лош макадам";
-"type.psurface.unpaved_good" = "Добар макадам";
"type.public_transport" = "Јавни превоз";
"type.public_transport.platform" = "Стајалиште јавног превоза";
"type.railway" = "Железница";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Трамвајска станица";
"type.route" = "Рута";
"type.route.ferry" = "Трајект";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Продавница";
"type.shop.alcohol" = "Продавница пића";
"type.shop.bakery" = "Пекара";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
index d3d4b4582..d347f2aa9 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Traktorväg";
"type.area_highway.trunk" = "Gata";
"type.area_highway.unclassified" = "Gata";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Historiskt objekt";
"type.historic.aircraft" = "Historiska flygplan";
"type.historic.anchor" = "Historiskt ankare";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Korset vid vägkanten";
"type.historic.wayside_shrine" = "Helgedom vid vägkanten";
"type.historic.wreck" = "Förlisning";
-"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" = "Trådlöst nätverk";
"type.junction" = "Trafikplats";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Brunn";
"type.man_made.windmill" = "Väderkvarn";
"type.man_made.works" = "Fabrik";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Militärt";
"type.military.bunker" = "Bunker";
"type.mountain_pass" = "Bergspass";
@@ -901,11 +884,6 @@
/* 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" = "Kollektivtrafik";
"type.public_transport.platform" = "Perrong";
"type.railway" = "Järnväg";
@@ -1206,7 +1184,6 @@
"type.railway.tram_stop" = "Spårvagnshållplats";
"type.route" = "Rutt";
"type.route.ferry" = "Färja";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Butik";
"type.shop.alcohol" = "Spritaffär";
"type.shop.bakery" = "Bageri";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
index 0650ce407..bbb0346f4 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "Kitu cha kihistoria";
"type.historic.aircraft" = "Ndege ya kihistoria";
"type.historic.anchor" = "Nanga ya kihistoria";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Msalaba wa njiani";
"type.historic.wayside_shrine" = "Kaburi la njia";
"type.historic.wreck" = "Ajali ya meli";
-"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
index 402339bbf..d7958256d 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "ผู้ประกาศข่าวประวัติศาสตร์";
@@ -644,19 +642,6 @@
"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";
@@ -773,8 +758,6 @@
"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";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"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" = "เบเกอรี่";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index 9ae8d385e..1892948b8 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Pist";
"type.area_highway.trunk" = "Devlet Yolu";
"type.area_highway.unclassified" = "Tali Yol";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Tarihi Nesne";
"type.historic.aircraft" = "Tarihi Uçak";
"type.historic.anchor" = "Tarihi Çapa";
@@ -644,18 +642,6 @@
"type.historic.wayside_cross" = "Hıristiyan Haçı";
"type.historic.wayside_shrine" = "Tapınak";
"type.historic.wreck" = "Gemi enkazı";
-"type.hwtag" = "hwtag";
-"type.hwtag.bidir_bicycle" = "hwtag-bidir_bicycle";
-"type.hwtag.onedir_bicycle" = "hwtag-onedir_bicycle";
-"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" = "Kavşak noktası";
@@ -772,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Su Kuyusu";
"type.man_made.windmill" = "Yel Değirmeni";
"type.man_made.works" = "Sanayi İşleri";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Askeri";
"type.military.bunker" = "Sığınak";
"type.mountain_pass" = "Boğaz";
@@ -900,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "Hizmet Direği";
-"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" = "Toplu Taşıma";
"type.public_transport.platform" = "Platform";
"type.railway" = "Demiryolu";
@@ -1206,7 +1185,6 @@
"type.railway.tram_stop" = "Tramvay Durağı";
"type.route" = "Rota";
"type.route.ferry" = "Feribot";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Mağaza";
"type.shop.alcohol" = "İçki dükkanı";
"type.shop.bakery" = "Fırın";
@@ -1493,7 +1471,6 @@
"type.natural.wetland.fen" = "Bataklık";
"type.natural.wetland.saltmarsh" = "Tuz Bataklığı";
"type.natural.wetland.saltmarsh.tidal" = "Gelgit Tuz Bataklığı";
-"type.hwtag.lit" = "hwtag-lit";
"type.railway.station.subway.qingdao" = "Subway Station";
"type.natural.wetland.tidalflat" = "Tidal Flat";
"type.natural.wetland.swamp" = "Swamp";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
index 2c7fdcf57..70b9bcb02 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"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" = "Історичний якір";
@@ -644,19 +642,6 @@
"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" = "Перехрестя";
@@ -773,8 +758,6 @@
"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" = "Перевал";
@@ -901,11 +884,6 @@
/* 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" = "Залізниця";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Зупинка";
"type.route" = "Маршрут";
"type.route.ferry" = "Паромна переправа";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Крамниця";
"type.shop.alcohol" = "Винний магазин";
"type.shop.bakery" = "Пекарня";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
index 5615f4a7e..e55699c85 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "Phố";
"type.area_highway.trunk" = "Phố";
"type.area_highway.unclassified" = "Phố";
-"type.highway.world_level" = "highway-world_level";
-"type.highway.world_towns_level" = "highway-world_towns_level";
"type.historic" = "Đối tượng lịch sử";
"type.historic.aircraft" = "Máy bay lịch sử";
"type.historic.anchor" = "Mỏ Neo lịch sử";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "Đường chéo";
"type.historic.wayside_shrine" = "Đền thờ";
"type.historic.wreck" = "Sự chìm tàu";
-"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";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "Giếng Nước";
"type.man_made.windmill" = "Cối xay gió";
"type.man_made.works" = "Industrial Works";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-grid";
"type.military" = "Military";
"type.military.bunker" = "Boongke";
"type.mountain_pass" = "Mountain Pass";
@@ -901,11 +884,6 @@
/* 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";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "Bến tàu điện";
"type.route" = "Route";
"type.route.ferry" = "Ferry";
-"type.route.shuttle_train" = "route-shuttle_train";
"type.shop" = "Cửa hàng";
"type.shop.alcohol" = "Cửa hàng rượu";
"type.shop.bakery" = "Hiệu bánh";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
index 4d6d7b62f..6b75c48ad 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "土路";
"type.area_highway.trunk" = "干线道路";
"type.area_highway.unclassified" = "道路";
-"type.highway.world_level" = "高速公路—世界级";
-"type.highway.world_towns_level" = "高速公路—城镇级";
"type.historic" = "历史地点";
"type.historic.aircraft" = "历史悠久的飞机";
"type.historic.anchor" = "历史锚";
@@ -644,19 +642,6 @@
"type.historic.wayside_cross" = "路旁十字架";
"type.historic.wayside_shrine" = "路旁神龛";
"type.historic.wreck" = "沉船";
-"type.hwtag" = "交通属性标签";
-"type.hwtag.bidir_bicycle" = "双向自行车道标签";
-"type.hwtag.onedir_bicycle" = "单向自行车道标签";
-"type.hwtag.lit" = "照明设施标签";
-"type.hwtag.nobicycle" = "禁止自行车标签";
-"type.hwtag.nocar" = "禁止汽车标签";
-"type.hwtag.nofoot" = "禁止行人标签";
-"type.hwtag.oneway" = "单行道标签";
-"type.hwtag.private" = "私有道路标签";
-"type.hwtag.toll" = "收费道路标签";
-"type.hwtag.yesbicycle" = "允许自行车标签";
-"type.hwtag.yescar" = "允许汽车标签";
-"type.hwtag.yesfoot" = "允许行人标签";
"type.internet_access" = "互联网";
"type.internet_access.wlan" = "无线网络";
"type.junction" = "交叉口";
@@ -773,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "水井";
"type.man_made.windmill" = "风车";
"type.man_made.works" = "工厂";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme—网格";
"type.military" = "军事";
"type.military.bunker" = "地堡";
"type.mountain_pass" = "山口";
@@ -901,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "公共设施杆";
-"type.psurface" = "路面";
-"type.psurface.paved_bad" = "铺装路面—较差";
-"type.psurface.paved_good" = "铺装路面—良好";
-"type.psurface.unpaved_bad" = "未铺装路面—较差";
-"type.psurface.unpaved_good" = "未铺装路面—良好";
"type.public_transport" = "公共交通要素";
"type.public_transport.platform" = "公共交通站台";
"type.railway" = "铁路要素";
@@ -1207,7 +1185,6 @@
"type.railway.tram_stop" = "电车站";
"type.route" = "线路";
"type.route.ferry" = "航线";
-"type.route.shuttle_train" = "穿梭列车";
"type.shop" = "商店";
"type.shop.alcohol" = "烈酒";
"type.shop.bakery" = "烘培店";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
index 7d0c96b53..253b4ff6e 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
@@ -596,8 +596,6 @@
"type.area_highway.track" = "土路";
"type.area_highway.trunk" = "主幹道";
"type.area_highway.unclassified" = "道路";
-"type.highway.world_level" = "高速公路—世界級";
-"type.highway.world_towns_level" = "高速公路—鎮級";
"type.historic" = "歷史地點";
"type.historic.aircraft" = "歷史悠久的飛機";
"type.historic.anchor" = "歷史錨";
@@ -644,18 +642,6 @@
"type.historic.wayside_cross" = "路旁十字架";
"type.historic.wayside_shrine" = "路旁神龕";
"type.historic.wreck" = "沉船";
-"type.hwtag.bidir_bicycle" = "雙向自行車道標籤";
-"type.hwtag.onedir_bicycle" = "單向自行車道標籤";
-"type.hwtag.lit" = "照明設備標籤";
-"type.hwtag.nobicycle" = "禁止自行車標籤";
-"type.hwtag.nocar" = "禁止汽車標籤";
-"type.hwtag.nofoot" = "禁止行人標籤";
-"type.hwtag.oneway" = "單行道標籤";
-"type.hwtag.private" = "私人道路標籤";
-"type.hwtag.toll" = "收費道路標籤";
-"type.hwtag.yesbicycle" = "允許自行車標籤";
-"type.hwtag.yescar" = "允許汽車標籤";
-"type.hwtag.yesfoot" = "允許行人標籤";
"type.internet_access" = "互聯網";
"type.internet_access.wlan" = "無線網路";
"type.junction" = "交叉口";
@@ -772,8 +758,6 @@
"type.man_made.water_well.drinking_water_no" = "水井";
"type.man_made.windmill" = "風車";
"type.man_made.works" = "工廠";
-"type.mapswithme" = "MapsWithMe";
-"type.mapswithme.grid" = "mapswithme-網格";
"type.military" = "軍事";
"type.military.bunker" = "地堡";
"type.mountain_pass" = "Mountain Pass";
@@ -900,11 +884,6 @@
/* A single pole supporting various public utilities, such as lighting or telephony. */
"type.man_made.utility_pole" = "公共設施桿";
-"type.psurface" = "路面";
-"type.psurface.paved_bad" = "鋪築路面—較差";
-"type.psurface.paved_good" = "鋪築路面—良好";
-"type.psurface.unpaved_bad" = "未鋪築路面—較差";
-"type.psurface.unpaved_good" = "未鋪築路面—良好";
"type.public_transport" = "大眾運輸元素";
"type.public_transport.platform" = "大眾運輸月台";
"type.railway" = "鐵路元素";
@@ -1206,7 +1185,6 @@
"type.railway.tram_stop" = "電車站";
"type.route" = "路線";
"type.route.ferry" = "航線";
-"type.route.shuttle_train" = "巡迴列車";
"type.shop" = "購物";
"type.shop.alcohol" = "烈酒";
"type.shop.bakery" = "麵包店";
@@ -1490,7 +1468,6 @@
"type.leisure.firepit" = "營火場";
"type.sport.diving" = "高台跳水";
"type.man_made.crane" = "起重機";
-"type.hwtag" = "交通屬性標籤";
"type.railway.station.subway.qingdao" = "地鐵站";
"type.natural.wetland.tidalflat" = "潮間帶";
"type.natural.wetland.swamp" = "沼澤";