diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index ab9025ebaa..1eb63dfc61 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1424,6 +1424,13 @@
 	<string name="type.railway.level_crossing">مزلقان</string>
 	<string name="type.railway.monorail">اتجاه واحد</string>
 	<string name="type.railway.rail">خط سكة حديد</string>
+	<string name="type.railway.rail.highspeed">خط سكة حديد</string>
+	<string name="type.railway.rail.tourism">خط سكة حديد</string>
+	<string name="type.railway.rail.main">خط سكة حديد</string>
+	<string name="type.railway.rail.branch">خط سكة حديد</string>
+	<string name="type.railway.rail.utility">خط سكة حديد</string>
+	<string name="type.railway.rail.spur">خط سكة حديد</string>
+	<string name="type.railway.rail.service">خط سكة حديد</string>
 	<string name="type.railway.station">محطة سكك حديدية</string>
 	<string name="type.railway.station.funicular">حبلي</string>
 	<string name="type.railway.station.light_rail">محطة سكك حديدية</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index a2e006523d..b141a4cbe7 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1320,6 +1320,13 @@
 	<string name="type.railway.level_crossing">Přejezd</string>
 	<string name="type.railway.monorail">Jednokolejná železnice</string>
 	<string name="type.railway.rail">Železnice</string>
+	<string name="type.railway.rail.highspeed">Železnice</string>
+	<string name="type.railway.rail.tourism">Železnice</string>
+	<string name="type.railway.rail.main">Železnice</string>
+	<string name="type.railway.rail.branch">Železnice</string>
+	<string name="type.railway.rail.utility">Železnice</string>
+	<string name="type.railway.rail.spur">Železnice</string>
+	<string name="type.railway.rail.service">Železnice</string>
 	<string name="type.railway.station">Železniční stanice</string>
 	<string name="type.railway.station.funicular">Lanovka</string>
 	<string name="type.railway.station.light_rail">Železniční stanice</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index fd8dbd3da6..1a46bebdb4 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1303,6 +1303,13 @@
 	<string name="type.railway.level_crossing">Niveauskæring</string>
 	<string name="type.railway.monorail">Monorail</string>
 	<string name="type.railway.rail">Jernbane</string>
+	<string name="type.railway.rail.highspeed">Jernbane</string>
+	<string name="type.railway.rail.tourism">Jernbane</string>
+	<string name="type.railway.rail.main">Jernbane</string>
+	<string name="type.railway.rail.branch">Jernbane</string>
+	<string name="type.railway.rail.utility">Jernbane</string>
+	<string name="type.railway.rail.spur">Jernbane</string>
+	<string name="type.railway.rail.service">Jernbane</string>
 	<string name="type.railway.station">Togstation</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Togstation</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 96f05c59b1..bd8b0bfd0a 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1484,16 +1484,29 @@
 	<string name="type.railway.preserved.bridge">Museumsbahnbrücke</string>
 	<string name="type.railway.preserved.tunnel">Museumsbahntunnel</string>
 	<string name="type.railway.rail">Eisenbahn</string>
+	<string name="type.railway.rail.highspeed">Eisenbahn</string>
+	<string name="type.railway.rail.tourism">Eisenbahn</string>
+	<string name="type.railway.rail.main">Eisenbahn</string>
+	<string name="type.railway.rail.branch">Eisenbahn</string>
+	<string name="type.railway.rail.utility">Eisenbahn</string>
+	<string name="type.railway.rail.spur">Anschlussgleis</string>
+	<string name="type.railway.rail.service">Eisenbahn</string>
 	<string name="type.railway.rail.bridge">Eisenbahnbrücke</string>
-	<string name="type.railway.rail.motor_vehicle">Eisenbahn</string>
+	<string name="type.railway.rail.highspeed.bridge">Eisenbahnbrücke</string>
+	<string name="type.railway.rail.tourism.bridge">Eisenbahnbrücke</string>
+	<string name="type.railway.rail.main.bridge">Eisenbahnbrücke</string>
+	<string name="type.railway.rail.branch.bridge">Eisenbahnbrücke</string>
+	<string name="type.railway.rail.utility.bridge">Eisenbahnbrücke</string>
+	<string name="type.railway.rail.spur.bridge">Eisenbahnbrücke</string>
+	<string name="type.railway.rail.service.bridge">Eisenbahnbrücke</string>
 	<string name="type.railway.rail.tunnel">Eisenbahntunnel</string>
-	<string name="type.railway.razed">Stillgelegte Eisenbahnstrecke</string>
-	<string name="type.railway.siding">Ausweich-/Überholgleis</string>
-	<string name="type.railway.siding.bridge">Ausweich-/Überholgleis</string>
-	<string name="type.railway.siding.tunnel">Ausweich-/Überholgleis</string>
-	<string name="type.railway.spur">Anschlussgleis</string>
-	<string name="type.railway.spur.bridge">Anschlussgleis</string>
-	<string name="type.railway.spur.tunnel">Anschlussgleis</string>
+	<string name="type.railway.rail.highspeed.tunnel">Eisenbahntunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Eisenbahntunnel</string>
+	<string name="type.railway.rail.main.tunnel">Eisenbahntunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Eisenbahntunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Eisenbahntunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Eisenbahntunnel</string>
+	<string name="type.railway.rail.service.tunnel">Eisenbahntunnel</string>
 	<string name="type.railway.station">Bahnhof</string>
 	<string name="type.railway.station.funicular">Standseilbahn</string>
 	<string name="type.railway.station.light_rail">Stadtbahnbahnhof</string>
@@ -1725,12 +1738,8 @@
 	<string name="type.railway.tram.bridge">Straßenbahnbrücke</string>
 	<string name="type.railway.tram.tunnel">Straßenbahntunnel</string>
 	<string name="type.railway.tram_stop">Straßenbahnhaltestelle</string>
-	<string name="type.railway.yard">Abstellgleis</string>
-	<string name="type.railway.yard.bridge">Abstellgleis</string>
-	<string name="type.railway.yard.tunnel">Abstellgleis</string>
 	<string name="type.route">Route</string>
 	<string name="type.route.ferry">Fähre</string>
-	<string name="type.route.shuttle_train">Shuttlezug</string>
 	<string name="type.shop">Geschäft</string>
 	<string name="type.shop.alcohol">Spirituosengeschäft</string>
 	<string name="type.shop.bakery">Bäckerei</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 48a50d96e9..c4231b2f8b 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1315,6 +1315,13 @@
 	<string name="type.railway.level_crossing">Σιδηροδρομική διέλευση</string>
 	<string name="type.railway.monorail">Μονοαξονικός σιδηρόδρομος</string>
 	<string name="type.railway.rail">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.highspeed">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.tourism">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.main">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.branch">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.utility">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.spur">Σιδηρόδρομος</string>
+	<string name="type.railway.rail.service">Σιδηρόδρομος</string>
 	<string name="type.railway.station">Σιδηροδρομικός σταθμός</string>
 	<string name="type.railway.station.funicular">Μονωτικό τρενάκι</string>
 	<string name="type.railway.station.light_rail">Σιδηροδρομικός σταθμός</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index 7a27cb592f..103182675b 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -330,6 +330,13 @@
 	<string name="type.railway.level_crossing">Cruce de ferrocarril</string>
 	<string name="type.railway.monorail">Monorraíl</string>
 	<string name="type.railway.rail">Línea de ferrocarril</string>
+	<string name="type.railway.rail.highspeed">Línea de ferrocarril</string>
+	<string name="type.railway.rail.tourism">Línea de ferrocarril</string>
+	<string name="type.railway.rail.main">Línea de ferrocarril</string>
+	<string name="type.railway.rail.branch">Línea de ferrocarril</string>
+	<string name="type.railway.rail.utility">Línea de ferrocarril</string>
+	<string name="type.railway.rail.spur">Línea de ferrocarril</string>
+	<string name="type.railway.rail.service">Línea de ferrocarril</string>
 	<string name="type.railway.station">Estación de tren</string>
 	<string name="type.railway.station.light_rail">Estación de tren</string>
 	<string name="type.railway.station.monorail">Estación de tren</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index da2bc85cb6..21c1863eab 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1493,6 +1493,13 @@
 	<string name="type.railway.narrow_gauge">Vía férrea de ancho estrecho</string>
 	<string name="type.railway.platform">Plataforma de vía férrea</string>
 	<string name="type.railway.rail">Ferrocarril</string>
+	<string name="type.railway.rail.highspeed">Ferrocarril</string>
+	<string name="type.railway.rail.tourism">Ferrocarril</string>
+	<string name="type.railway.rail.main">Ferrocarril</string>
+	<string name="type.railway.rail.branch">Ferrocarril</string>
+	<string name="type.railway.rail.utility">Ferrocarril</string>
+	<string name="type.railway.rail.spur">Ferrocarril</string>
+	<string name="type.railway.rail.service">Ferrocarril</string>
 	<string name="type.railway.station">Estación de tren</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Estación de tren</string>
diff --git a/android/res/values-et/strings.xml b/android/res/values-et/strings.xml
index d01491a53b..21c4b44e4d 100644
--- a/android/res/values-et/strings.xml
+++ b/android/res/values-et/strings.xml
@@ -1501,16 +1501,29 @@
 	<string name="type.railway.preserved.bridge">Muuseumiraudtee sild</string>
 	<string name="type.railway.preserved.tunnel">Muuseumiraudtee tunnel</string>
 	<string name="type.railway.rail">Raudtee</string>
+	<string name="type.railway.rail.highspeed">Raudtee</string>
+	<string name="type.railway.rail.tourism">Raudtee</string>
+	<string name="type.railway.rail.main">Raudtee</string>
+	<string name="type.railway.rail.branch">Raudtee</string>
+	<string name="type.railway.rail.utility">Raudtee</string>
+	<string name="type.railway.rail.spur">Rööbastee</string>
+	<string name="type.railway.rail.service">Raudtee</string>
 	<string name="type.railway.rail.bridge">Raudtee sild</string>
-	<string name="type.railway.rail.motor_vehicle">Raudtee</string>
+	<string name="type.railway.rail.highspeed.bridge">Raudtee sild</string>
+	<string name="type.railway.rail.tourism.bridge">Raudtee sild</string>
+	<string name="type.railway.rail.main.bridge">Raudtee sild</string>
+	<string name="type.railway.rail.branch.bridge">Raudtee sild</string>
+	<string name="type.railway.rail.utility.bridge">Raudtee sild</string>
+	<string name="type.railway.rail.spur.bridge">Raudtee sild</string>
+	<string name="type.railway.rail.service.bridge">Raudtee sild</string>
 	<string name="type.railway.rail.tunnel">Raudtee tunnel</string>
-	<string name="type.railway.razed">Eemaldatud raudtee</string>
-	<string name="type.railway.siding">Raudtee haru</string>
-	<string name="type.railway.siding.bridge">Raudtee haru sild</string>
-	<string name="type.railway.siding.tunnel">Raudtee haru tunnel</string>
-	<string name="type.railway.spur">Rööbastee</string>
-	<string name="type.railway.spur.bridge">Rööbastee sild</string>
-	<string name="type.railway.spur.tunnel">Rööbastee tunnel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Raudtee tunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Raudtee tunnel</string>
+	<string name="type.railway.rail.main.tunnel">Raudtee tunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Raudtee tunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Raudtee tunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Raudtee tunnel</string>
+	<string name="type.railway.rail.service.tunnel">Raudtee tunnel</string>
 	<string name="type.railway.station">Raudtee jaam</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Raudtee jaam</string>
@@ -1742,12 +1755,8 @@
 	<string name="type.railway.tram.bridge">Trammiliini sild</string>
 	<string name="type.railway.tram.tunnel">Trammiliini tunnel</string>
 	<string name="type.railway.tram_stop">Trammipeatus</string>
-	<string name="type.railway.yard">Raudtee hoov</string>
-	<string name="type.railway.yard.bridge">Raudtee hoovi sild</string>
-	<string name="type.railway.yard.tunnel">Raudtee hoovi tunnel</string>
 	<string name="type.route">Tee</string>
 	<string name="type.route.ferry">Praam</string>
-	<string name="type.route.shuttle_train">Kiirrong</string>
 	<string name="type.shop">Pood</string>
 	<string name="type.shop.alcohol">Alkoholipood</string>
 	<string name="type.shop.bakery">Pagar</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 475172baf2..cf7d314d2a 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -1422,6 +1422,13 @@
 	<string name="type.railway.level_crossing">Trenbide-pasagunea</string>
 	<string name="type.railway.monorail">Tren monoraila</string>
 	<string name="type.railway.rail">Trenbidea</string>
+	<string name="type.railway.rail.highspeed">Trenbidea</string>
+	<string name="type.railway.rail.tourism">Trenbidea</string>
+	<string name="type.railway.rail.main">Trenbidea</string>
+	<string name="type.railway.rail.branch">Trenbidea</string>
+	<string name="type.railway.rail.utility">Trenbidea</string>
+	<string name="type.railway.rail.spur">Trenbidea</string>
+	<string name="type.railway.rail.service">Trenbidea</string>
 	<string name="type.railway.station">Tren geltokian</string>
 	<string name="type.railway.station.funicular">Funikularra</string>
 	<string name="type.railway.station.light_rail">Tren geltokian</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 017d2beb0b..749cd42b81 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1225,6 +1225,13 @@
 	<string name="type.railway.level_crossing">تقاطع راه آهن</string>
 	<string name="type.railway.monorail">مونوریل</string>
 	<string name="type.railway.rail">راه آهن</string>
+	<string name="type.railway.rail.highspeed">راه آهن</string>
+	<string name="type.railway.rail.tourism">راه آهن</string>
+	<string name="type.railway.rail.main">راه آهن</string>
+	<string name="type.railway.rail.branch">راه آهن</string>
+	<string name="type.railway.rail.utility">راه آهن</string>
+	<string name="type.railway.rail.spur">راه آهن</string>
+	<string name="type.railway.rail.service">راه آهن</string>
 	<string name="type.railway.station">ایستگاه قطار</string>
 	<string name="type.railway.station.funicular">فونیکولور</string>
 	<string name="type.railway.station.light_rail">ایستگاه قطار</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index a46e9787ac..139c295ae6 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1362,6 +1362,13 @@
 	<string name="type.railway.level_crossing">Rautatien tasoristeys</string>
 	<string name="type.railway.monorail">Monorail (kohorata)</string>
 	<string name="type.railway.rail">Rautatie</string>
+	<string name="type.railway.rail.highspeed">Rautatie</string>
+	<string name="type.railway.rail.tourism">Rautatie</string>
+	<string name="type.railway.rail.main">Rautatie</string>
+	<string name="type.railway.rail.branch">Rautatie</string>
+	<string name="type.railway.rail.utility">Rautatie</string>
+	<string name="type.railway.rail.spur">Rautatie</string>
+	<string name="type.railway.rail.service">Rautatie</string>
 	<string name="type.railway.station">Rautatieasema</string>
 	<string name="type.railway.station.funicular">Köysirata</string>
 	<string name="type.railway.station.light_rail">Rautatieasema</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index bfd3e6fd02..e46a3d7c6b 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1458,8 +1458,29 @@
 	<string name="type.railway.platform">Quai de gare</string>
 	<string name="type.railway.preserved">Chemin de fer touristique</string>
 	<string name="type.railway.rail">Chemin de fer</string>
+	<string name="type.railway.rail.highspeed">Chemin de fer</string>
+	<string name="type.railway.rail.tourism">Chemin de fer</string>
+	<string name="type.railway.rail.main">Chemin de fer</string>
+	<string name="type.railway.rail.branch">Chemin de fer</string>
+	<string name="type.railway.rail.utility">Chemin de fer</string>
+	<string name="type.railway.rail.spur">Chemin de fer</string>
+	<string name="type.railway.rail.service">Chemin de fer</string>
 	<string name="type.railway.rail.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.highspeed.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.tourism.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.main.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.branch.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.utility.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.spur.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.service.bridge">Chemin de fer</string>
 	<string name="type.railway.rail.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.highspeed.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.tourism.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.main.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.branch.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.utility.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.spur.tunnel">Chemin de fer</string>
+	<string name="type.railway.rail.service.tunnel">Chemin de fer</string>
 	<string name="type.railway.station">Gare</string>
 	<string name="type.railway.station.funicular">Funiculaire</string>
 	<string name="type.railway.station.light_rail">Gare</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 32645393e5..b51bd8420b 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1330,6 +1330,13 @@
 	<string name="type.railway.level_crossing">Vasúti átjáró</string>
 	<string name="type.railway.monorail">Egysínű vasút</string>
 	<string name="type.railway.rail">Vasút</string>
+	<string name="type.railway.rail.highspeed">Vasút</string>
+	<string name="type.railway.rail.tourism">Vasút</string>
+	<string name="type.railway.rail.main">Vasút</string>
+	<string name="type.railway.rail.branch">Vasút</string>
+	<string name="type.railway.rail.utility">Vasút</string>
+	<string name="type.railway.rail.spur">Vasút</string>
+	<string name="type.railway.rail.service">Vasút</string>
 	<string name="type.railway.station">Vonatmegálló</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Vonatmegálló</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 5932a2ead6..7d5388ae8f 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -1307,6 +1307,13 @@
 	<string name="type.railway.level_crossing">Perlintasan Kereta Api</string>
 	<string name="type.railway.monorail">Monorel</string>
 	<string name="type.railway.rail">Kereta api</string>
+	<string name="type.railway.rail.highspeed">Kereta api</string>
+	<string name="type.railway.rail.tourism">Kereta api</string>
+	<string name="type.railway.rail.main">Kereta api</string>
+	<string name="type.railway.rail.branch">Kereta api</string>
+	<string name="type.railway.rail.utility">Kereta api</string>
+	<string name="type.railway.rail.spur">Kereta api</string>
+	<string name="type.railway.rail.service">Kereta api</string>
 	<string name="type.railway.station">Rel kereta api</string>
 	<string name="type.railway.station.funicular">Kereta gantung</string>
 	<string name="type.railway.station.light_rail">Rel kereta api</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 9a8ab55060..24d9dbef98 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1440,6 +1440,13 @@
 	<string name="type.railway.light_rail">Metropolitana</string>
 	<string name="type.railway.monorail">Monorotaia</string>
 	<string name="type.railway.rail">Binari</string>
+	<string name="type.railway.rail.highspeed">Binari</string>
+	<string name="type.railway.rail.tourism">Binari</string>
+	<string name="type.railway.rail.main">Binari</string>
+	<string name="type.railway.rail.branch">Binari</string>
+	<string name="type.railway.rail.utility">Binari</string>
+	<string name="type.railway.rail.spur">Binari</string>
+	<string name="type.railway.rail.service">Binari</string>
 	<string name="type.railway.station">Stazione ferroviaria</string>
 	<string name="type.railway.station.funicular">Funicolare</string>
 	<string name="type.railway.station.light_rail">Stazione ferroviaria</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index f65e9c6f4a..6b4b9d4943 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1422,16 +1422,29 @@
 	<string name="type.railway.preserved.bridge">保存鉄道(橋)</string>
 	<string name="type.railway.preserved.tunnel">保存鉄道(トンネル)</string>
 	<string name="type.railway.rail">鉄道</string>
+	<string name="type.railway.rail.highspeed">鉄道</string>
+	<string name="type.railway.rail.tourism">鉄道</string>
+	<string name="type.railway.rail.main">鉄道</string>
+	<string name="type.railway.rail.branch">鉄道</string>
+	<string name="type.railway.rail.utility">鉄道</string>
+	<string name="type.railway.rail.spur">引き込み線</string>
+	<string name="type.railway.rail.service">鉄道</string>
 	<string name="type.railway.rail.bridge">鉄道(橋)</string>
-	<string name="type.railway.rail.motor_vehicle">鉄道</string>
+	<string name="type.railway.rail.highspeed.bridge">鉄道(橋)</string>
+	<string name="type.railway.rail.tourism.bridge">鉄道(橋)</string>
+	<string name="type.railway.rail.main.bridge">鉄道(橋)</string>
+	<string name="type.railway.rail.branch.bridge">鉄道(橋)</string>
+	<string name="type.railway.rail.utility.bridge">鉄道(橋)</string>
+	<string name="type.railway.rail.spur.bridge">鉄道(橋)</string>
+	<string name="type.railway.rail.service.bridge">鉄道(橋)</string>
 	<string name="type.railway.rail.tunnel">鉄道(鉄道)</string>
-	<string name="type.railway.razed">撤去済の鉄道</string>
-	<string name="type.railway.siding">側線</string>
-	<string name="type.railway.siding.bridge">側線(橋)</string>
-	<string name="type.railway.siding.tunnel">側線(トンネル)</string>
-	<string name="type.railway.spur">引き込み線</string>
-	<string name="type.railway.spur.bridge">引き込み線(橋)</string>
-	<string name="type.railway.spur.tunnel">引き込み線(トンネル)</string>
+	<string name="type.railway.rail.highspeed.tunnel">鉄道(鉄道)</string>
+	<string name="type.railway.rail.tourism.tunnel">鉄道(鉄道)</string>
+	<string name="type.railway.rail.main.tunnel">鉄道(鉄道)</string>
+	<string name="type.railway.rail.branch.tunnel">鉄道(鉄道)</string>
+	<string name="type.railway.rail.utility.tunnel">鉄道(鉄道)</string>
+	<string name="type.railway.rail.spur.tunnel">鉄道(鉄道)</string>
+	<string name="type.railway.rail.service.tunnel">鉄道(鉄道)</string>
 	<string name="type.railway.station">鉄道駅</string>
 	<string name="type.railway.station.funicular">フニクラ</string>
 	<string name="type.railway.station.light_rail">鉄道駅</string>
@@ -1660,9 +1673,6 @@
 	<string name="type.railway.tram.bridge">トラム(橋)</string>
 	<string name="type.railway.tram.tunnel">トラム(トンネル)</string>
 	<string name="type.railway.tram_stop">トラム</string>
-	<string name="type.railway.yard">ヤード</string>
-	<string name="type.railway.yard.bridge">ヤード(橋)</string>
-	<string name="type.railway.yard.tunnel">ヤード(トンネル)</string>
 	<string name="type.route">ルート</string>
 	<string name="type.route.ferry">フェリー航路</string>
 	<string name="type.shop">買い物</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index a8ef0f15bf..7c5581404c 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1312,6 +1312,13 @@
 	<string name="type.railway.level_crossing">철도 건널목</string>
 	<string name="type.railway.monorail">모노레일</string>
 	<string name="type.railway.rail">철로</string>
+	<string name="type.railway.rail.highspeed">철로</string>
+	<string name="type.railway.rail.tourism">철로</string>
+	<string name="type.railway.rail.main">철로</string>
+	<string name="type.railway.rail.branch">철로</string>
+	<string name="type.railway.rail.utility">철로</string>
+	<string name="type.railway.rail.spur">철로</string>
+	<string name="type.railway.rail.service">철로</string>
 	<string name="type.railway.station">기차역</string>
 	<string name="type.railway.station.funicular">케이블카</string>
 	<string name="type.railway.station.light_rail">기차역</string>
diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml
index e81618c265..cd13e417f4 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -1360,9 +1360,29 @@
 	<string name="type.railway.narrow_gauge.tunnel">अरुंदमापी रेल्वे</string>
 	<string name="type.railway.platform">रेल्वे फलाट</string>
 	<string name="type.railway.rail">रेल्वे</string>
+	<string name="type.railway.rail.highspeed">रेल्वे</string>
+	<string name="type.railway.rail.tourism">रेल्वे</string>
+	<string name="type.railway.rail.main">रेल्वे</string>
+	<string name="type.railway.rail.branch">रेल्वे</string>
+	<string name="type.railway.rail.utility">रेल्वे</string>
+	<string name="type.railway.rail.spur">रेल्वे</string>
+	<string name="type.railway.rail.service">रेल्वे</string>
 	<string name="type.railway.rail.bridge">रेल्वे</string>
-	<string name="type.railway.rail.motor_vehicle">रेल्वे</string>
+	<string name="type.railway.rail.highspeed.bridge">रेल्वे</string>
+	<string name="type.railway.rail.tourism.bridge">रेल्वे</string>
+	<string name="type.railway.rail.main.bridge">रेल्वे</string>
+	<string name="type.railway.rail.branch.bridge">रेल्वे</string>
+	<string name="type.railway.rail.utility.bridge">रेल्वे</string>
+	<string name="type.railway.rail.spur.bridge">रेल्वे</string>
+	<string name="type.railway.rail.service.bridge">रेल्वे</string>
 	<string name="type.railway.rail.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.highspeed.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.tourism.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.main.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.branch.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.utility.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.spur.tunnel">रेल्वे</string>
+	<string name="type.railway.rail.service.tunnel">रेल्वे</string>
 	<string name="type.railway.station">रेल्वे स्थानक</string>
 	<string name="type.railway.station.funicular">फ्युनिक्युलर</string>
 	<string name="type.railway.station.light_rail">रेल्वे स्थानक</string>
@@ -1594,9 +1614,6 @@
 	<string name="type.railway.tram.bridge">ट्राम मार्गिका</string>
 	<string name="type.railway.tram.tunnel">ट्राम मार्गिका</string>
 	<string name="type.railway.tram_stop">ट्राम थांबा</string>
-	<string name="type.railway.yard">रेल्वे आवार</string>
-	<string name="type.railway.yard.bridge">रेल्वे आवार</string>
-	<string name="type.railway.yard.tunnel">रेल्वे आवार</string>
 	<string name="type.route">मार्ग</string>
 	<string name="type.route.ferry">होडी</string>
 	<string name="type.shop">दुकान</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 576c452716..3c417f52c1 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1368,6 +1368,13 @@
 	<string name="type.railway.platform">Jernbaneplattform</string>
 	<string name="type.railway.preserved">Museumsjernbane</string>
 	<string name="type.railway.rail">Toglinje</string>
+	<string name="type.railway.rail.highspeed">Toglinje</string>
+	<string name="type.railway.rail.tourism">Toglinje</string>
+	<string name="type.railway.rail.main">Toglinje</string>
+	<string name="type.railway.rail.branch">Toglinje</string>
+	<string name="type.railway.rail.utility">Toglinje</string>
+	<string name="type.railway.rail.spur">Toglinje</string>
+	<string name="type.railway.rail.service">Toglinje</string>
 	<string name="type.railway.station">Togstasjon</string>
 	<string name="type.railway.station.funicular">Kabelbane</string>
 	<string name="type.railway.station.light_rail">Togstasjon</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 71f1445dab..10ec8f2a6f 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1506,16 +1506,29 @@
 	<string name="type.railway.preserved.bridge">Museumspoorbaanbrug</string>
 	<string name="type.railway.preserved.tunnel">Museumspoorbaantunnel</string>
 	<string name="type.railway.rail">Spoorlijn</string>
+	<string name="type.railway.rail.highspeed">Spoorlijn</string>
+	<string name="type.railway.rail.tourism">Spoorlijn</string>
+	<string name="type.railway.rail.main">Spoorlijn</string>
+	<string name="type.railway.rail.branch">Spoorlijn</string>
+	<string name="type.railway.rail.utility">Spoorlijn</string>
+	<string name="type.railway.rail.spur">Zijspoor</string>
+	<string name="type.railway.rail.service">Spoorlijn</string>
 	<string name="type.railway.rail.bridge">Treinspoorbrug</string>
-	<string name="type.railway.rail.motor_vehicle">Spoorweg</string>
+	<string name="type.railway.rail.highspeed.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.tourism.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.main.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.branch.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.utility.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.spur.bridge">Treinspoorbrug</string>
+	<string name="type.railway.rail.service.bridge">Treinspoorbrug</string>
 	<string name="type.railway.rail.tunnel">Spoortunnel</string>
-	<string name="type.railway.razed">Verwijderde spoorbaan</string>
-	<string name="type.railway.siding">Nevenspoor</string>
-	<string name="type.railway.siding.bridge">Nevenspoor-brug</string>
-	<string name="type.railway.siding.tunnel">Nevenspoor-tunnel</string>
-	<string name="type.railway.spur">Zijspoor</string>
-	<string name="type.railway.spur.bridge">Zijspoor-brug</string>
-	<string name="type.railway.spur.tunnel">Zijspoor-tunnel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Spoortunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Spoortunnel</string>
+	<string name="type.railway.rail.main.tunnel">Spoortunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Spoortunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Spoortunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Spoortunnel</string>
+	<string name="type.railway.rail.service.tunnel">Spoortunnel</string>
 	<string name="type.railway.station">Station</string>
 	<string name="type.railway.station.funicular">Tunnel</string>
 	<string name="type.railway.station.light_rail">Station</string>
@@ -1747,11 +1760,7 @@
 	<string name="type.railway.tram.bridge">Trambrug</string>
 	<string name="type.railway.tram.tunnel">Tramtunnel</string>
 	<string name="type.railway.tram_stop">Tramhalte</string>
-	<string name="type.railway.yard">Rangeerterrein</string>
-	<string name="type.railway.yard.bridge">Rangeerterrein brug</string>
-	<string name="type.railway.yard.tunnel">Rangeerterrein tunnel</string>
 	<string name="type.route.ferry">Veerboot</string>
-	<string name="type.route.shuttle_train">Shuttle-trein</string>
 	<string name="type.shop">Winkel</string>
 	<string name="type.shop.alcohol">Slijterij</string>
 	<string name="type.shop.bakery">Bakkerij</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 5ec7512f40..afba3536d2 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1455,6 +1455,13 @@
 	<string name="type.railway.level_crossing">Przejazd kolejowy</string>
 	<string name="type.railway.monorail">Kolej jednoszynowa</string>
 	<string name="type.railway.rail">Kolej</string>
+	<string name="type.railway.rail.highspeed">Kolej</string>
+	<string name="type.railway.rail.tourism">Kolej</string>
+	<string name="type.railway.rail.main">Kolej</string>
+	<string name="type.railway.rail.branch">Kolej</string>
+	<string name="type.railway.rail.utility">Kolej</string>
+	<string name="type.railway.rail.spur">Kolej</string>
+	<string name="type.railway.rail.service">Kolej</string>
 	<string name="type.railway.station">Dworzec kolejowy</string>
 	<string name="type.railway.station.funicular">Kolejka linowa</string>
 	<string name="type.railway.station.light_rail">Dworzec kolejowy</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 23001999a0..4b9e3b6eb7 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -1357,16 +1357,29 @@
 	<string name="type.railway.preserved.bridge">Ferrovia preservada</string>
 	<string name="type.railway.preserved.tunnel">Ferrovia preservada</string>
 	<string name="type.railway.rail">Ferrovia</string>
+	<string name="type.railway.rail.highspeed">Ferrovia</string>
+	<string name="type.railway.rail.tourism">Ferrovia</string>
+	<string name="type.railway.rail.main">Ferrovia</string>
+	<string name="type.railway.rail.branch">Ferrovia</string>
+	<string name="type.railway.rail.utility">Ferrovia</string>
+	<string name="type.railway.rail.spur">Ramal de ferrovia</string>
+	<string name="type.railway.rail.service">Ferrovia</string>
 	<string name="type.railway.rail.bridge">Ferrovia</string>
-	<string name="type.railway.rail.motor_vehicle">Ferrovia</string>
+	<string name="type.railway.rail.highspeed.bridge">Ferrovia</string>
+	<string name="type.railway.rail.tourism.bridge">Ferrovia</string>
+	<string name="type.railway.rail.main.bridge">Ferrovia</string>
+	<string name="type.railway.rail.branch.bridge">Ferrovia</string>
+	<string name="type.railway.rail.utility.bridge">Ferrovia</string>
+	<string name="type.railway.rail.spur.bridge">Ferrovia</string>
+	<string name="type.railway.rail.service.bridge">Ferrovia</string>
 	<string name="type.railway.rail.tunnel">Ferrovia</string>
-	<string name="type.railway.razed">Ferrovia removida</string>
-	<string name="type.railway.siding">Desvio de ferrovia</string>
-	<string name="type.railway.siding.bridge">Desvio de ferrovia</string>
-	<string name="type.railway.siding.tunnel">Desvio de ferrovia</string>
-	<string name="type.railway.spur">Ramal de ferrovia</string>
-	<string name="type.railway.spur.bridge">Ramal de ferrovia</string>
-	<string name="type.railway.spur.tunnel">Ramal de ferrovia</string>
+	<string name="type.railway.rail.highspeed.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.tourism.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.main.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.branch.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.utility.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.spur.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.service.tunnel">Ferrovia</string>
 	<string name="type.railway.station">Estação de trem</string>
 	<string name="type.railway.station.light_rail">Estação de trem</string>
 	<string name="type.railway.station.monorail">Estação de trem</string>
@@ -1597,12 +1610,8 @@
 	<string name="type.railway.tram.bridge">Linha de bonde</string>
 	<string name="type.railway.tram.tunnel">Linha de bonde</string>
 	<string name="type.railway.tram_stop">Parada de bonde</string>
-	<string name="type.railway.yard">Pátio de manobras ferroviárias</string>
-	<string name="type.railway.yard.bridge">Pátio de manobras ferroviárias</string>
-	<string name="type.railway.yard.tunnel">Pátio de manobras ferroviárias</string>
 	<string name="type.route">Rota</string>
 	<string name="type.route.ferry">Rota de balsa</string>
-	<string name="type.route.shuttle_train">Rota de trem vaivém</string>
 	<string name="type.shop">Loja</string>
 	<string name="type.shop.alcohol">Loja de bebidas alcoólicas</string>
 	<string name="type.shop.bakery">Padaria</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 0eddd2eb45..b5d7baa549 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1454,16 +1454,29 @@
 	<string name="type.railway.preserved.bridge">Ferrovia preservada</string>
 	<string name="type.railway.preserved.tunnel">Ferrovia preservada</string>
 	<string name="type.railway.rail">Ferrovia</string>
+	<string name="type.railway.rail.highspeed">Ferrovia</string>
+	<string name="type.railway.rail.tourism">Ferrovia</string>
+	<string name="type.railway.rail.main">Ferrovia</string>
+	<string name="type.railway.rail.branch">Ferrovia</string>
+	<string name="type.railway.rail.utility">Ferrovia</string>
+	<string name="type.railway.rail.spur">Ramal de ferrovia</string>
+	<string name="type.railway.rail.service">Ferrovia</string>
 	<string name="type.railway.rail.bridge">Ferrovia</string>
-	<string name="type.railway.rail.motor_vehicle">Ferrovia</string>
+	<string name="type.railway.rail.highspeed.bridge">Ferrovia</string>
+	<string name="type.railway.rail.tourism.bridge">Ferrovia</string>
+	<string name="type.railway.rail.main.bridge">Ferrovia</string>
+	<string name="type.railway.rail.branch.bridge">Ferrovia</string>
+	<string name="type.railway.rail.utility.bridge">Ferrovia</string>
+	<string name="type.railway.rail.spur.bridge">Ferrovia</string>
+	<string name="type.railway.rail.service.bridge">Ferrovia</string>
 	<string name="type.railway.rail.tunnel">Ferrovia</string>
-	<string name="type.railway.razed">Ferrovia removida</string>
-	<string name="type.railway.siding">Desvio de ferrovia</string>
-	<string name="type.railway.siding.bridge">Desvio de ferrovia</string>
-	<string name="type.railway.siding.tunnel">Desvio de ferrovia</string>
-	<string name="type.railway.spur">Ramal de ferrovia</string>
-	<string name="type.railway.spur.bridge">Ramal de ferrovia</string>
-	<string name="type.railway.spur.tunnel">Ramal de ferrovia</string>
+	<string name="type.railway.rail.highspeed.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.tourism.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.main.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.branch.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.utility.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.spur.tunnel">Ferrovia</string>
+	<string name="type.railway.rail.service.tunnel">Ferrovia</string>
 	<string name="type.railway.station">Estação de comboios</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Estação de comboios</string>
@@ -1695,12 +1708,8 @@
 	<string name="type.railway.tram.bridge">Linha de elétrico</string>
 	<string name="type.railway.tram.tunnel">Linha de elétrico</string>
 	<string name="type.railway.tram_stop">Paragem de elétrico</string>
-	<string name="type.railway.yard">Pátio de manobras ferroviárias</string>
-	<string name="type.railway.yard.bridge">Pátio de manobras ferroviárias</string>
-	<string name="type.railway.yard.tunnel">Pátio de manobras ferroviárias</string>
 	<string name="type.route">Rota</string>
 	<string name="type.route.ferry">Rota de ferry</string>
-	<string name="type.route.shuttle_train">Rota de comboio vaivem</string>
 	<string name="type.shop">Loja</string>
 	<string name="type.shop.alcohol">Loja de bebidas alcoolicas</string>
 	<string name="type.shop.bakery">Padaria</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 6a4c53febf..7d2a0d600a 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1325,6 +1325,13 @@
 	<string name="type.railway.level_crossing">Trecere feroviară</string>
 	<string name="type.railway.monorail">Cale ferată monoșină</string>
 	<string name="type.railway.rail">Cale ferată</string>
+	<string name="type.railway.rail.highspeed">Cale ferată</string>
+	<string name="type.railway.rail.tourism">Cale ferată</string>
+	<string name="type.railway.rail.main">Cale ferată</string>
+	<string name="type.railway.rail.branch">Cale ferată</string>
+	<string name="type.railway.rail.utility">Cale ferată</string>
+	<string name="type.railway.rail.spur">Cale ferată</string>
+	<string name="type.railway.rail.service">Cale ferată</string>
 	<string name="type.railway.station">Feroviar</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Feroviar</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index d9c960f6c9..2320dd2403 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1531,16 +1531,29 @@
 	<string name="type.railway.preserved.bridge">Законсервированная Ж/Д</string>
 	<string name="type.railway.preserved.tunnel">Законсервированная Ж/Д</string>
 	<string name="type.railway.rail">Железнодорожный путь</string>
+	<string name="type.railway.rail.highspeed">Железнодорожный путь</string>
+	<string name="type.railway.rail.tourism">Железнодорожный путь</string>
+	<string name="type.railway.rail.main">Железнодорожный путь</string>
+	<string name="type.railway.rail.branch">Железнодорожный путь</string>
+	<string name="type.railway.rail.utility">Железнодорожный путь</string>
+	<string name="type.railway.rail.spur">Подъездная Ж/Д</string>
+	<string name="type.railway.rail.service">Железнодорожный путь</string>
 	<string name="type.railway.rail.bridge">Железнодорожный мост</string>
-	<string name="type.railway.rail.motor_vehicle">Железная дорога</string>
+	<string name="type.railway.rail.highspeed.bridge">Железнодорожный мост</string>
+	<string name="type.railway.rail.tourism.bridge">Железнодорожный мост</string>
+	<string name="type.railway.rail.main.bridge">Железнодорожный мост</string>
+	<string name="type.railway.rail.branch.bridge">Железнодорожный мост</string>
+	<string name="type.railway.rail.utility.bridge">Железнодорожный мост</string>
+	<string name="type.railway.rail.spur.bridge">Железнодорожный мост</string>
+	<string name="type.railway.rail.service.bridge">Железнодорожный мост</string>
 	<string name="type.railway.rail.tunnel">Железнодорожный туннель</string>
-	<string name="type.railway.razed">Заброшенная Ж/Д</string>
-	<string name="type.railway.siding">Ветка Ж/Д</string>
-	<string name="type.railway.siding.bridge">Ветка Ж/Д</string>
-	<string name="type.railway.siding.tunnel">Ветка Ж/Д</string>
-	<string name="type.railway.spur">Подъездная Ж/Д</string>
-	<string name="type.railway.spur.bridge">Подъездная Ж/Д</string>
-	<string name="type.railway.spur.tunnel">Подъездная Ж/Д</string>
+	<string name="type.railway.rail.highspeed.tunnel">Железнодорожный туннель</string>
+	<string name="type.railway.rail.tourism.tunnel">Железнодорожный туннель</string>
+	<string name="type.railway.rail.main.tunnel">Железнодорожный туннель</string>
+	<string name="type.railway.rail.branch.tunnel">Железнодорожный туннель</string>
+	<string name="type.railway.rail.utility.tunnel">Железнодорожный туннель</string>
+	<string name="type.railway.rail.spur.tunnel">Железнодорожный туннель</string>
+	<string name="type.railway.rail.service.tunnel">Железнодорожный туннель</string>
 	<string name="type.railway.station">Ж/д станция</string>
 	<string name="type.railway.station.funicular">Фуникулер</string>
 	<string name="type.railway.station.light_rail">Ж/д станция</string>
@@ -1772,12 +1785,8 @@
 	<string name="type.railway.tram.bridge">Трамвай</string>
 	<string name="type.railway.tram.tunnel">Трамвай</string>
 	<string name="type.railway.tram_stop">Остановка трамвая</string>
-	<string name="type.railway.yard">Ж/Д площадка</string>
-	<string name="type.railway.yard.bridge">Ж/Д площадка</string>
-	<string name="type.railway.yard.tunnel">Ж/Д площадка</string>
 	<string name="type.route">Маршрут</string>
 	<string name="type.route.ferry">Паромная переправа</string>
-	<string name="type.route.shuttle_train">Челночная линия</string>
 	<string name="type.shop">Магазин</string>
 	<string name="type.shop.alcohol">Магазин алкоголя</string>
 	<string name="type.shop.bakery">Булочная</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 8166659c19..e600efa839 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1305,6 +1305,13 @@
 	<string name="type.railway.level_crossing">Križovanie úrovní</string>
 	<string name="type.railway.monorail">Jednokoľajnicová dráha</string>
 	<string name="type.railway.rail">Železnica</string>
+	<string name="type.railway.rail.highspeed">Železnica</string>
+	<string name="type.railway.rail.tourism">Železnica</string>
+	<string name="type.railway.rail.main">Železnica</string>
+	<string name="type.railway.rail.branch">Železnica</string>
+	<string name="type.railway.rail.utility">Železnica</string>
+	<string name="type.railway.rail.spur">Železnica</string>
+	<string name="type.railway.rail.service">Železnica</string>
 	<string name="type.railway.station">Železničná stanica</string>
 	<string name="type.railway.station.funicular">Lanovka</string>
 	<string name="type.railway.station.light_rail">Železničná stanica</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 6c50659416..5743629fb8 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1305,6 +1305,13 @@
 	<string name="type.railway.level_crossing">Järnvägskorsning</string>
 	<string name="type.railway.monorail">Monorail</string>
 	<string name="type.railway.rail">Järnväg</string>
+	<string name="type.railway.rail.highspeed">Järnväg</string>
+	<string name="type.railway.rail.tourism">Järnväg</string>
+	<string name="type.railway.rail.main">Järnväg</string>
+	<string name="type.railway.rail.branch">Järnväg</string>
+	<string name="type.railway.rail.utility">Järnväg</string>
+	<string name="type.railway.rail.spur">Järnväg</string>
+	<string name="type.railway.rail.service">Järnväg</string>
 	<string name="type.railway.station">Tågstation</string>
 	<string name="type.railway.station.funicular">Linbana</string>
 	<string name="type.railway.station.light_rail">Tågstation</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 6499dd96b8..bd57c51e8f 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -550,6 +550,13 @@
 	<string name="type.railway.level_crossing">Tambuka Reli</string>
 	<string name="type.railway.monorail">Mfumo wa reli moja</string>
 	<string name="type.railway.rail">Njia ya Reli</string>
+	<string name="type.railway.rail.highspeed">Njia ya Reli</string>
+	<string name="type.railway.rail.tourism">Njia ya Reli</string>
+	<string name="type.railway.rail.main">Njia ya Reli</string>
+	<string name="type.railway.rail.branch">Njia ya Reli</string>
+	<string name="type.railway.rail.utility">Njia ya Reli</string>
+	<string name="type.railway.rail.spur">Njia ya Reli</string>
+	<string name="type.railway.rail.service">Njia ya Reli</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.subway_entrance">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.railway.subway_entrance.adana">Lango la kuingilia stesheni ya reli</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index d9f12cdf27..a818b8910c 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1312,6 +1312,13 @@
 	<string name="type.railway.level_crossing">ทางรถไฟตัดผ่านถนน</string>
 	<string name="type.railway.monorail">รางรถไฟรางเดี่ยว</string>
 	<string name="type.railway.rail">รถไฟ</string>
+	<string name="type.railway.rail.highspeed">รถไฟ</string>
+	<string name="type.railway.rail.tourism">รถไฟ</string>
+	<string name="type.railway.rail.main">รถไฟ</string>
+	<string name="type.railway.rail.branch">รถไฟ</string>
+	<string name="type.railway.rail.utility">รถไฟ</string>
+	<string name="type.railway.rail.spur">รถไฟ</string>
+	<string name="type.railway.rail.service">รถไฟ</string>
 	<string name="type.railway.station">สถานีรถไฟ</string>
 	<string name="type.railway.station.funicular">รถกระเช้าไฟฟ้า</string>
 	<string name="type.railway.station.light_rail">สถานีรถไฟ</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 7cbc759938..1a84946b91 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1506,16 +1506,29 @@
 	<string name="type.railway.preserved.bridge">Korunmuş Ray</string>
 	<string name="type.railway.preserved.tunnel">Korunmuş Ray</string>
 	<string name="type.railway.rail">Demiryolu</string>
+	<string name="type.railway.rail.highspeed">Demiryolu</string>
+	<string name="type.railway.rail.tourism">Demiryolu</string>
+	<string name="type.railway.rail.main">Demiryolu</string>
+	<string name="type.railway.rail.branch">Demiryolu</string>
+	<string name="type.railway.rail.utility">Demiryolu</string>
+	<string name="type.railway.rail.spur">Düz Ray</string>
+	<string name="type.railway.rail.service">Demiryolu</string>
 	<string name="type.railway.rail.bridge">Demiryolu</string>
-	<string name="type.railway.rail.motor_vehicle">Demiryolu</string>
+	<string name="type.railway.rail.highspeed.bridge">Demiryolu</string>
+	<string name="type.railway.rail.tourism.bridge">Demiryolu</string>
+	<string name="type.railway.rail.main.bridge">Demiryolu</string>
+	<string name="type.railway.rail.branch.bridge">Demiryolu</string>
+	<string name="type.railway.rail.utility.bridge">Demiryolu</string>
+	<string name="type.railway.rail.spur.bridge">Demiryolu</string>
+	<string name="type.railway.rail.service.bridge">Demiryolu</string>
 	<string name="type.railway.rail.tunnel">Demiryolu</string>
-	<string name="type.railway.razed">Yıkılmış Ray</string>
-	<string name="type.railway.siding">Demiryolu Hattı</string>
-	<string name="type.railway.siding.bridge">Demiryolu Hattı</string>
-	<string name="type.railway.siding.tunnel">Demiryolu Hattı</string>
-	<string name="type.railway.spur">Düz Ray</string>
-	<string name="type.railway.spur.bridge">Düz Ray</string>
-	<string name="type.railway.spur.tunnel">Düz Ray</string>
+	<string name="type.railway.rail.highspeed.tunnel">Demiryolu</string>
+	<string name="type.railway.rail.tourism.tunnel">Demiryolu</string>
+	<string name="type.railway.rail.main.tunnel">Demiryolu</string>
+	<string name="type.railway.rail.branch.tunnel">Demiryolu</string>
+	<string name="type.railway.rail.utility.tunnel">Demiryolu</string>
+	<string name="type.railway.rail.spur.tunnel">Demiryolu</string>
+	<string name="type.railway.rail.service.tunnel">Demiryolu</string>
 	<string name="type.railway.station">Tren İstasyonu</string>
 	<string name="type.railway.station.funicular">Füniküler</string>
 	<string name="type.railway.station.light_rail">Tren İstasyonu</string>
@@ -1747,12 +1760,8 @@
 	<string name="type.railway.tram.bridge">Tramvay Hattı</string>
 	<string name="type.railway.tram.tunnel">Tramvay Hattı</string>
 	<string name="type.railway.tram_stop">Tramvay Durağı</string>
-	<string name="type.railway.yard">Demiryolu Avlusu</string>
-	<string name="type.railway.yard.bridge">Demiryolu Avlusu</string>
-	<string name="type.railway.yard.tunnel">Demiryolu Avlusu</string>
 	<string name="type.route">Rota</string>
 	<string name="type.route.ferry">Feribot</string>
-	<string name="type.route.shuttle_train">Servis Treni</string>
 	<string name="type.shop">Mağaza</string>
 	<string name="type.shop.alcohol">İçki dükkanı</string>
 	<string name="type.shop.bakery">Fırın</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 097ec077fe..3910de4ce9 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1493,16 +1493,29 @@
 	<string name="type.railway.preserved.bridge">Законсервована залізниця</string>
 	<string name="type.railway.preserved.tunnel">Законсервована залізниця</string>
 	<string name="type.railway.rail">Залізнична дорога</string>
+	<string name="type.railway.rail.highspeed">Залізнична дорога</string>
+	<string name="type.railway.rail.tourism">Залізнична дорога</string>
+	<string name="type.railway.rail.main">Залізнична дорога</string>
+	<string name="type.railway.rail.branch">Залізнична дорога</string>
+	<string name="type.railway.rail.utility">Залізнична дорога</string>
+	<string name="type.railway.rail.spur">Під\'їздна залізниця</string>
+	<string name="type.railway.rail.service">Залізнична дорога</string>
 	<string name="type.railway.rail.bridge">Залізничний міст</string>
-	<string name="type.railway.rail.motor_vehicle">Залізниця</string>
+	<string name="type.railway.rail.highspeed.bridge">Залізничний міст</string>
+	<string name="type.railway.rail.tourism.bridge">Залізничний міст</string>
+	<string name="type.railway.rail.main.bridge">Залізничний міст</string>
+	<string name="type.railway.rail.branch.bridge">Залізничний міст</string>
+	<string name="type.railway.rail.utility.bridge">Залізничний міст</string>
+	<string name="type.railway.rail.spur.bridge">Залізничний міст</string>
+	<string name="type.railway.rail.service.bridge">Залізничний міст</string>
 	<string name="type.railway.rail.tunnel">Залізничний тунель</string>
-	<string name="type.railway.razed">Закинута залізниця</string>
-	<string name="type.railway.siding">Гілка залізниці</string>
-	<string name="type.railway.siding.bridge">Гілка залізниці</string>
-	<string name="type.railway.siding.tunnel">Гілка залізниці</string>
-	<string name="type.railway.spur">Під\'їздна залізниця</string>
-	<string name="type.railway.spur.bridge">Під\'їздна залізниця</string>
-	<string name="type.railway.spur.tunnel">Під\'їздна залізниця</string>
+	<string name="type.railway.rail.highspeed.tunnel">Залізничний тунель</string>
+	<string name="type.railway.rail.tourism.tunnel">Залізничний тунель</string>
+	<string name="type.railway.rail.main.tunnel">Залізничний тунель</string>
+	<string name="type.railway.rail.branch.tunnel">Залізничний тунель</string>
+	<string name="type.railway.rail.utility.tunnel">Залізничний тунель</string>
+	<string name="type.railway.rail.spur.tunnel">Залізничний тунель</string>
+	<string name="type.railway.rail.service.tunnel">Залізничний тунель</string>
 	<string name="type.railway.station">Залізничний вокзал</string>
 	<string name="type.railway.station.funicular">Фунікулер</string>
 	<string name="type.railway.station.light_rail">Залізничний вокзал</string>
@@ -1734,9 +1747,6 @@
 	<string name="type.railway.tram.bridge">Трамвай</string>
 	<string name="type.railway.tram.tunnel">Трамвай</string>
 	<string name="type.railway.tram_stop">Зупинка</string>
-	<string name="type.railway.yard">Залізнична ділянка</string>
-	<string name="type.railway.yard.bridge">Залізнична ділянка</string>
-	<string name="type.railway.yard.tunnel">Залізнична ділянка</string>
 	<string name="type.route">Маршрут</string>
 	<string name="type.route.ferry">Паромна переправа</string>
 	<string name="type.shop">Крамниця</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 3be8870ace..af61a0327c 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1308,6 +1308,13 @@
 	<string name="type.railway.level_crossing">Chỗ qua đường sắt</string>
 	<string name="type.railway.monorail">Đường sắt một chiều</string>
 	<string name="type.railway.rail">Đường sắt</string>
+	<string name="type.railway.rail.highspeed">Đường sắt</string>
+	<string name="type.railway.rail.tourism">Đường sắt</string>
+	<string name="type.railway.rail.main">Đường sắt</string>
+	<string name="type.railway.rail.branch">Đường sắt</string>
+	<string name="type.railway.rail.utility">Đường sắt</string>
+	<string name="type.railway.rail.spur">Đường sắt</string>
+	<string name="type.railway.rail.service">Đường sắt</string>
 	<string name="type.railway.station">Đường tàu hỏa</string>
 	<string name="type.railway.station.funicular">Đường sắt leo núi</string>
 	<string name="type.railway.station.light_rail">Đường tàu hỏa</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index f4614e588d..7591b6f53f 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1346,9 +1346,29 @@
 	<string name="type.railway.monorail.bridge">單軌軌道</string>
 	<string name="type.railway.monorail.tunnel">單軌軌道</string>
 	<string name="type.railway.rail">鐵路軌道</string>
+	<string name="type.railway.rail.highspeed">鐵路軌道</string>
+	<string name="type.railway.rail.tourism">鐵路軌道</string>
+	<string name="type.railway.rail.main">鐵路軌道</string>
+	<string name="type.railway.rail.branch">鐵路軌道</string>
+	<string name="type.railway.rail.utility">鐵路軌道</string>
+	<string name="type.railway.rail.spur">鐵路軌道</string>
+	<string name="type.railway.rail.service">鐵路軌道</string>
 	<string name="type.railway.rail.bridge">鐵路軌道</string>
-	<string name="type.railway.rail.motor_vehicle">鐵路軌道</string>
+	<string name="type.railway.rail.highspeed.bridge">鐵路軌道</string>
+	<string name="type.railway.rail.tourism.bridge">鐵路軌道</string>
+	<string name="type.railway.rail.main.bridge">鐵路軌道</string>
+	<string name="type.railway.rail.branch.bridge">鐵路軌道</string>
+	<string name="type.railway.rail.utility.bridge">鐵路軌道</string>
+	<string name="type.railway.rail.spur.bridge">鐵路軌道</string>
+	<string name="type.railway.rail.service.bridge">鐵路軌道</string>
 	<string name="type.railway.rail.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.highspeed.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.tourism.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.main.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.branch.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.utility.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.spur.tunnel">鐵路軌道</string>
+	<string name="type.railway.rail.service.tunnel">鐵路軌道</string>
 	<string name="type.railway.station">火車站</string>
 	<string name="type.railway.station.funicular">纜車</string>
 	<string name="type.railway.station.light_rail">輕軌車站</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 7eba1aa2e6..9246359450 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -1431,9 +1431,29 @@
 	<string name="type.railway.narrow_gauge.tunnel">窄轨铁路轨道</string>
 	<string name="type.railway.platform">火车站台</string>
 	<string name="type.railway.rail">铁路轨道</string>
+	<string name="type.railway.rail.highspeed">铁路轨道</string>
+	<string name="type.railway.rail.tourism">铁路轨道</string>
+	<string name="type.railway.rail.main">铁路轨道</string>
+	<string name="type.railway.rail.branch">铁路轨道</string>
+	<string name="type.railway.rail.utility">铁路轨道</string>
+	<string name="type.railway.rail.spur">铁路轨道</string>
+	<string name="type.railway.rail.service">铁路轨道</string>
 	<string name="type.railway.rail.bridge">铁路轨道</string>
-	<string name="type.railway.rail.motor_vehicle">铁路轨道</string>
+	<string name="type.railway.rail.highspeed.bridge">铁路轨道</string>
+	<string name="type.railway.rail.tourism.bridge">铁路轨道</string>
+	<string name="type.railway.rail.main.bridge">铁路轨道</string>
+	<string name="type.railway.rail.branch.bridge">铁路轨道</string>
+	<string name="type.railway.rail.utility.bridge">铁路轨道</string>
+	<string name="type.railway.rail.spur.bridge">铁路轨道</string>
+	<string name="type.railway.rail.service.bridge">铁路轨道</string>
 	<string name="type.railway.rail.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.highspeed.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.tourism.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.main.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.branch.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.utility.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.spur.tunnel">铁路轨道</string>
+	<string name="type.railway.rail.service.tunnel">铁路轨道</string>
 	<string name="type.railway.station">火车站</string>
 	<string name="type.railway.station.funicular">缆车</string>
 	<string name="type.railway.station.light_rail">轻轨车站</string>
@@ -1662,9 +1682,6 @@
 	<string name="type.railway.tram.bridge">电车轨道</string>
 	<string name="type.railway.tram.tunnel">电车轨道</string>
 	<string name="type.railway.tram_stop">电车站</string>
-	<string name="type.railway.yard">铁路货场</string>
-	<string name="type.railway.yard.bridge">铁路货场</string>
-	<string name="type.railway.yard.tunnel">铁路货场</string>
 	<string name="type.route">线路</string>
 	<string name="type.route.ferry">航线</string>
 	<string name="type.shop">商店</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index e4b601af81..17b47b0908 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1570,16 +1570,29 @@
 	<string name="type.railway.preserved.bridge">Preserved Rail Bridge</string>
 	<string name="type.railway.preserved.tunnel">Preserved Rail Tunnel</string>
 	<string name="type.railway.rail">Railway</string>
+	<string name="type.railway.rail.highspeed">Railway</string>
+	<string name="type.railway.rail.tourism">Railway</string>
+	<string name="type.railway.rail.main">Railway</string>
+	<string name="type.railway.rail.branch">Railway</string>
+	<string name="type.railway.rail.utility">Railway</string>
+	<string name="type.railway.rail.spur">Spur Rail</string>
+	<string name="type.railway.rail.service">Railway</string>
 	<string name="type.railway.rail.bridge">Railway Bridge</string>
-	<string name="type.railway.rail.motor_vehicle">Railway</string>
+	<string name="type.railway.rail.highspeed.bridge">Railway Bridge</string>
+	<string name="type.railway.rail.tourism.bridge">Railway Bridge</string>
+	<string name="type.railway.rail.main.bridge">Railway Bridge</string>
+	<string name="type.railway.rail.branch.bridge">Railway Bridge</string>
+	<string name="type.railway.rail.utility.bridge">Railway Bridge</string>
+	<string name="type.railway.rail.spur.bridge">Railway Bridge</string>
+	<string name="type.railway.rail.service.bridge">Railway Bridge</string>
 	<string name="type.railway.rail.tunnel">Railway Tunnel</string>
-	<string name="type.railway.razed">Razed Rail</string>
-	<string name="type.railway.siding">Siding Rail</string>
-	<string name="type.railway.siding.bridge">Siding Rail Bridge</string>
-	<string name="type.railway.siding.tunnel">Siding Rail Tunnel</string>
-	<string name="type.railway.spur">Spur Rail</string>
-	<string name="type.railway.spur.bridge">Spur Rail Bridge</string>
-	<string name="type.railway.spur.tunnel">Spur Rail Tunnel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Railway Tunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Railway Tunnel</string>
+	<string name="type.railway.rail.main.tunnel">Railway Tunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Railway Tunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Railway Tunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Railway Tunnel</string>
+	<string name="type.railway.rail.service.tunnel">Railway Tunnel</string>
 	<string name="type.railway.station">Train Station</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.railway.station.light_rail">Light Rail Station</string>
@@ -1811,12 +1824,9 @@
 	<string name="type.railway.tram.bridge">Tram Line Bridge</string>
 	<string name="type.railway.tram.tunnel">Tram Line Tunnel</string>
 	<string name="type.railway.tram_stop">Tram Stop</string>
-	<string name="type.railway.yard">Railway Yard</string>
-	<string name="type.railway.yard.bridge">Railway Yard Bridge</string>
-	<string name="type.railway.yard.tunnel">Railway Yard Tunnel</string>
 	<string name="type.route">Route</string>
 	<string name="type.route.ferry">Ferry</string>
-	<string name="type.route.shuttle_train">Shuttle Train</string>
+	<string name="type.route.shuttle_train">route-shuttle_train</string>
 	<string name="type.shop">Shop</string>
 	<string name="type.shop.alcohol">Liquor Shop</string>
 	<string name="type.shop.bakery">Bakery</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index f9fa54fd57..9f3e016704 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "خط سكة حديد";
 
+"type.railway.rail.highspeed" = "خط سكة حديد";
+
+"type.railway.rail.tourism" = "خط سكة حديد";
+
+"type.railway.rail.main" = "خط سكة حديد";
+
+"type.railway.rail.branch" = "خط سكة حديد";
+
+"type.railway.rail.utility" = "خط سكة حديد";
+
+"type.railway.rail.spur" = "خط سكة حديد";
+
+"type.railway.rail.service" = "خط سكة حديد";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "محطة سكك حديدية";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "موقف ترام";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "متجر";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 3b0a993a8e..db1b194f76 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Railway";
 
+"type.railway.rail.highspeed" = "Railway";
+
+"type.railway.rail.tourism" = "Railway";
+
+"type.railway.rail.main" = "Railway";
+
+"type.railway.rail.branch" = "Railway";
+
+"type.railway.rail.utility" = "Railway";
+
+"type.railway.rail.spur" = "Railway";
+
+"type.railway.rail.service" = "Railway";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 17d47a7a52..15da94460b 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Railway";
 
+"type.railway.rail.highspeed" = "Railway";
+
+"type.railway.rail.tourism" = "Railway";
+
+"type.railway.rail.main" = "Railway";
+
+"type.railway.rail.branch" = "Railway";
+
+"type.railway.rail.utility" = "Railway";
+
+"type.railway.rail.spur" = "Railway";
+
+"type.railway.rail.service" = "Railway";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 6c88569204..6ecd38299f 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Railway";
 
+"type.railway.rail.highspeed" = "Railway";
+
+"type.railway.rail.tourism" = "Railway";
+
+"type.railway.rail.main" = "Railway";
+
+"type.railway.rail.branch" = "Railway";
+
+"type.railway.rail.utility" = "Railway";
+
+"type.railway.rail.spur" = "Railway";
+
+"type.railway.rail.service" = "Railway";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 39d7693d9f..7217f4f862 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Železnice";
 
+"type.railway.rail.highspeed" = "Železnice";
+
+"type.railway.rail.tourism" = "Železnice";
+
+"type.railway.rail.main" = "Železnice";
+
+"type.railway.rail.branch" = "Železnice";
+
+"type.railway.rail.utility" = "Železnice";
+
+"type.railway.rail.spur" = "Železnice";
+
+"type.railway.rail.service" = "Železnice";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Železniční stanice";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tramvajová zastávka";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Obchod";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 8e703ad75e..15eadf8b1b 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Jernbane";
 
+"type.railway.rail.highspeed" = "Jernbane";
+
+"type.railway.rail.tourism" = "Jernbane";
+
+"type.railway.rail.main" = "Jernbane";
+
+"type.railway.rail.branch" = "Jernbane";
+
+"type.railway.rail.utility" = "Jernbane";
+
+"type.railway.rail.spur" = "Jernbane";
+
+"type.railway.rail.service" = "Jernbane";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Togstation";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Sporvogn";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Butik";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index a4789e3f8a..8b28699cd7 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Eisenbahn";
 
+"type.railway.rail.highspeed" = "Eisenbahn";
+
+"type.railway.rail.tourism" = "Eisenbahn";
+
+"type.railway.rail.main" = "Eisenbahn";
+
+"type.railway.rail.branch" = "Eisenbahn";
+
+"type.railway.rail.utility" = "Eisenbahn";
+
+"type.railway.rail.spur" = "Anschlussgleis";
+
+"type.railway.rail.service" = "Eisenbahn";
+
 "type.railway.rail.bridge" = "Eisenbahnbrücke";
 
-"type.railway.rail.motor_vehicle" = "Eisenbahn";
+"type.railway.rail.highspeed.bridge" = "Eisenbahnbrücke";
+
+"type.railway.rail.tourism.bridge" = "Eisenbahnbrücke";
+
+"type.railway.rail.main.bridge" = "Eisenbahnbrücke";
+
+"type.railway.rail.branch.bridge" = "Eisenbahnbrücke";
+
+"type.railway.rail.utility.bridge" = "Eisenbahnbrücke";
+
+"type.railway.rail.spur.bridge" = "Eisenbahnbrücke";
+
+"type.railway.rail.service.bridge" = "Eisenbahnbrücke";
 
 "type.railway.rail.tunnel" = "Eisenbahntunnel";
 
-"type.railway.razed" = "Stillgelegte Eisenbahnstrecke";
+"type.railway.rail.highspeed.tunnel" = "Eisenbahntunnel";
 
-"type.railway.siding" = "Ausweich-/Überholgleis";
+"type.railway.rail.tourism.tunnel" = "Eisenbahntunnel";
 
-"type.railway.siding.bridge" = "Ausweich-/Überholgleis";
+"type.railway.rail.main.tunnel" = "Eisenbahntunnel";
 
-"type.railway.siding.tunnel" = "Ausweich-/Überholgleis";
+"type.railway.rail.branch.tunnel" = "Eisenbahntunnel";
 
-"type.railway.spur" = "Anschlussgleis";
+"type.railway.rail.utility.tunnel" = "Eisenbahntunnel";
 
-"type.railway.spur.bridge" = "Anschlussgleis";
+"type.railway.rail.spur.tunnel" = "Eisenbahntunnel";
 
-"type.railway.spur.tunnel" = "Anschlussgleis";
+"type.railway.rail.service.tunnel" = "Eisenbahntunnel";
 
 "type.railway.station" = "Bahnhof";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Straßenbahnhaltestelle";
 
-"type.railway.yard" = "Abstellgleis";
-
-"type.railway.yard.bridge" = "Abstellgleis";
-
-"type.railway.yard.tunnel" = "Abstellgleis";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Fähre";
 
-"type.route.shuttle_train" = "Shuttlezug";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Geschäft";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index fd96679b42..0997f410cd 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Σιδηρόδρομος";
 
+"type.railway.rail.highspeed" = "Σιδηρόδρομος";
+
+"type.railway.rail.tourism" = "Σιδηρόδρομος";
+
+"type.railway.rail.main" = "Σιδηρόδρομος";
+
+"type.railway.rail.branch" = "Σιδηρόδρομος";
+
+"type.railway.rail.utility" = "Σιδηρόδρομος";
+
+"type.railway.rail.spur" = "Σιδηρόδρομος";
+
+"type.railway.rail.service" = "Σιδηρόδρομος";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Σιδηροδρομικός σταθμός";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Στάση τραμ";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Κατάστημα";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 41a9d84a98..b83b1a2dbe 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Railway";
 
+"type.railway.rail.highspeed" = "Railway";
+
+"type.railway.rail.tourism" = "Railway";
+
+"type.railway.rail.main" = "Railway";
+
+"type.railway.rail.branch" = "Railway";
+
+"type.railway.rail.utility" = "Railway";
+
+"type.railway.rail.spur" = "Railway";
+
+"type.railway.rail.service" = "Railway";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 59ea1fba04..e6615bc00e 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Railway";
 
+"type.railway.rail.highspeed" = "Railway";
+
+"type.railway.rail.tourism" = "Railway";
+
+"type.railway.rail.main" = "Railway";
+
+"type.railway.rail.branch" = "Railway";
+
+"type.railway.rail.utility" = "Railway";
+
+"type.railway.rail.spur" = "Spur Rail";
+
+"type.railway.rail.service" = "Railway";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 3afce13339..98f577967e 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Línea de ferrocarril";
 
+"type.railway.rail.highspeed" = "Línea de ferrocarril";
+
+"type.railway.rail.tourism" = "Línea de ferrocarril";
+
+"type.railway.rail.main" = "Línea de ferrocarril";
+
+"type.railway.rail.branch" = "Línea de ferrocarril";
+
+"type.railway.rail.utility" = "Línea de ferrocarril";
+
+"type.railway.rail.spur" = "Línea de ferrocarril";
+
+"type.railway.rail.service" = "Línea de ferrocarril";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Estación de tren";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Parada de tranvía";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Ruta";
 
 "type.route.ferry" = "Ruta de ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Tienda";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 072b173d73..f2eb307668 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Ferrocarril";
 
+"type.railway.rail.highspeed" = "Ferrocarril";
+
+"type.railway.rail.tourism" = "Ferrocarril";
+
+"type.railway.rail.main" = "Ferrocarril";
+
+"type.railway.rail.branch" = "Ferrocarril";
+
+"type.railway.rail.utility" = "Ferrocarril";
+
+"type.railway.rail.spur" = "Ferrocarril";
+
+"type.railway.rail.service" = "Ferrocarril";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Estación de tren";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Parada de tranvía";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Ruta";
 
 "type.route.ferry" = "Ruta de ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Tienda";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index b387ac9027..c3ba99ce14 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Raudtee";
 
+"type.railway.rail.highspeed" = "Raudtee";
+
+"type.railway.rail.tourism" = "Raudtee";
+
+"type.railway.rail.main" = "Raudtee";
+
+"type.railway.rail.branch" = "Raudtee";
+
+"type.railway.rail.utility" = "Raudtee";
+
+"type.railway.rail.spur" = "Rööbastee";
+
+"type.railway.rail.service" = "Raudtee";
+
 "type.railway.rail.bridge" = "Raudtee sild";
 
-"type.railway.rail.motor_vehicle" = "Raudtee";
+"type.railway.rail.highspeed.bridge" = "Raudtee sild";
+
+"type.railway.rail.tourism.bridge" = "Raudtee sild";
+
+"type.railway.rail.main.bridge" = "Raudtee sild";
+
+"type.railway.rail.branch.bridge" = "Raudtee sild";
+
+"type.railway.rail.utility.bridge" = "Raudtee sild";
+
+"type.railway.rail.spur.bridge" = "Raudtee sild";
+
+"type.railway.rail.service.bridge" = "Raudtee sild";
 
 "type.railway.rail.tunnel" = "Raudtee tunnel";
 
-"type.railway.razed" = "Eemaldatud raudtee";
+"type.railway.rail.highspeed.tunnel" = "Raudtee tunnel";
 
-"type.railway.siding" = "Raudtee haru";
+"type.railway.rail.tourism.tunnel" = "Raudtee tunnel";
 
-"type.railway.siding.bridge" = "Raudtee haru sild";
+"type.railway.rail.main.tunnel" = "Raudtee tunnel";
 
-"type.railway.siding.tunnel" = "Raudtee haru tunnel";
+"type.railway.rail.branch.tunnel" = "Raudtee tunnel";
 
-"type.railway.spur" = "Rööbastee";
+"type.railway.rail.utility.tunnel" = "Raudtee tunnel";
 
-"type.railway.spur.bridge" = "Rööbastee sild";
+"type.railway.rail.spur.tunnel" = "Raudtee tunnel";
 
-"type.railway.spur.tunnel" = "Rööbastee tunnel";
+"type.railway.rail.service.tunnel" = "Raudtee tunnel";
 
 "type.railway.station" = "Raudtee jaam";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Trammipeatus";
 
-"type.railway.yard" = "Raudtee hoov";
-
-"type.railway.yard.bridge" = "Raudtee hoovi sild";
-
-"type.railway.yard.tunnel" = "Raudtee hoovi tunnel";
-
 "type.route" = "Tee";
 
 "type.route.ferry" = "Praam";
 
-"type.route.shuttle_train" = "Kiirrong";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Pood";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 092aa53abb..104d9a4707 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Trenbidea";
 
+"type.railway.rail.highspeed" = "Trenbidea";
+
+"type.railway.rail.tourism" = "Trenbidea";
+
+"type.railway.rail.main" = "Trenbidea";
+
+"type.railway.rail.branch" = "Trenbidea";
+
+"type.railway.rail.utility" = "Trenbidea";
+
+"type.railway.rail.spur" = "Trenbidea";
+
+"type.railway.rail.service" = "Trenbidea";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Tren geltokian";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tranbiaren geltokia";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Denda";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 430b2c9d3d..a22dc5ce52 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "راه آهن";
 
+"type.railway.rail.highspeed" = "راه آهن";
+
+"type.railway.rail.tourism" = "راه آهن";
+
+"type.railway.rail.main" = "راه آهن";
+
+"type.railway.rail.branch" = "راه آهن";
+
+"type.railway.rail.utility" = "راه آهن";
+
+"type.railway.rail.spur" = "راه آهن";
+
+"type.railway.rail.service" = "راه آهن";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "ایستگاه قطار";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "ایستگاه قطار";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "فروشگاه";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index ba03fc6e67..0649422b4c 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Rautatie";
 
+"type.railway.rail.highspeed" = "Rautatie";
+
+"type.railway.rail.tourism" = "Rautatie";
+
+"type.railway.rail.main" = "Rautatie";
+
+"type.railway.rail.branch" = "Rautatie";
+
+"type.railway.rail.utility" = "Rautatie";
+
+"type.railway.rail.spur" = "Rautatie";
+
+"type.railway.rail.service" = "Rautatie";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Rautatieasema";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Raitiovaunupysäkki";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Kauppa";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 3595e0e77c..bde0c79bad 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Chemin de fer";
 
+"type.railway.rail.highspeed" = "Chemin de fer";
+
+"type.railway.rail.tourism" = "Chemin de fer";
+
+"type.railway.rail.main" = "Chemin de fer";
+
+"type.railway.rail.branch" = "Chemin de fer";
+
+"type.railway.rail.utility" = "Chemin de fer";
+
+"type.railway.rail.spur" = "Chemin de fer";
+
+"type.railway.rail.service" = "Chemin de fer";
+
 "type.railway.rail.bridge" = "Chemin de fer";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Chemin de fer";
+
+"type.railway.rail.tourism.bridge" = "Chemin de fer";
+
+"type.railway.rail.main.bridge" = "Chemin de fer";
+
+"type.railway.rail.branch.bridge" = "Chemin de fer";
+
+"type.railway.rail.utility.bridge" = "Chemin de fer";
+
+"type.railway.rail.spur.bridge" = "Chemin de fer";
+
+"type.railway.rail.service.bridge" = "Chemin de fer";
 
 "type.railway.rail.tunnel" = "Chemin de fer";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Chemin de fer";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Chemin de fer";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Chemin de fer";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Chemin de fer";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Chemin de fer";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Chemin de fer";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Chemin de fer";
 
 "type.railway.station" = "Gare";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Arrêt de tramway";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Trajet de ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Magasin";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index db0a99875a..180c6fb230 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Railway";
 
+"type.railway.rail.highspeed" = "Railway";
+
+"type.railway.rail.tourism" = "Railway";
+
+"type.railway.rail.main" = "Railway";
+
+"type.railway.rail.branch" = "Railway";
+
+"type.railway.rail.utility" = "Railway";
+
+"type.railway.rail.spur" = "Railway";
+
+"type.railway.rail.service" = "Railway";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 954399db4b..d322fe293e 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Vasút";
 
+"type.railway.rail.highspeed" = "Vasút";
+
+"type.railway.rail.tourism" = "Vasút";
+
+"type.railway.rail.main" = "Vasút";
+
+"type.railway.rail.branch" = "Vasút";
+
+"type.railway.rail.utility" = "Vasút";
+
+"type.railway.rail.spur" = "Vasút";
+
+"type.railway.rail.service" = "Vasút";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Vonatmegálló";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Villamosmegálló";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Bolt";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 82123e5a97..b930620157 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Kereta api";
 
+"type.railway.rail.highspeed" = "Kereta api";
+
+"type.railway.rail.tourism" = "Kereta api";
+
+"type.railway.rail.main" = "Kereta api";
+
+"type.railway.rail.branch" = "Kereta api";
+
+"type.railway.rail.utility" = "Kereta api";
+
+"type.railway.rail.spur" = "Kereta api";
+
+"type.railway.rail.service" = "Kereta api";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Rel kereta api";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Perhentian trem";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Toko";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 44be917460..230e490e5a 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Binari";
 
+"type.railway.rail.highspeed" = "Binari";
+
+"type.railway.rail.tourism" = "Binari";
+
+"type.railway.rail.main" = "Binari";
+
+"type.railway.rail.branch" = "Binari";
+
+"type.railway.rail.utility" = "Binari";
+
+"type.railway.rail.spur" = "Binari";
+
+"type.railway.rail.service" = "Binari";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Stazione ferroviaria";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Fermata del tram";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Percorso";
 
 "type.route.ferry" = "Traghetto";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Negozio";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index fcef1b32ea..1eb6890bc6 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "鉄道";
 
+"type.railway.rail.highspeed" = "鉄道";
+
+"type.railway.rail.tourism" = "鉄道";
+
+"type.railway.rail.main" = "鉄道";
+
+"type.railway.rail.branch" = "鉄道";
+
+"type.railway.rail.utility" = "鉄道";
+
+"type.railway.rail.spur" = "引き込み線";
+
+"type.railway.rail.service" = "鉄道";
+
 "type.railway.rail.bridge" = "鉄道(橋)";
 
-"type.railway.rail.motor_vehicle" = "鉄道";
+"type.railway.rail.highspeed.bridge" = "鉄道(橋)";
+
+"type.railway.rail.tourism.bridge" = "鉄道(橋)";
+
+"type.railway.rail.main.bridge" = "鉄道(橋)";
+
+"type.railway.rail.branch.bridge" = "鉄道(橋)";
+
+"type.railway.rail.utility.bridge" = "鉄道(橋)";
+
+"type.railway.rail.spur.bridge" = "鉄道(橋)";
+
+"type.railway.rail.service.bridge" = "鉄道(橋)";
 
 "type.railway.rail.tunnel" = "鉄道(鉄道)";
 
-"type.railway.razed" = "撤去済の鉄道";
+"type.railway.rail.highspeed.tunnel" = "鉄道(鉄道)";
 
-"type.railway.siding" = "側線";
+"type.railway.rail.tourism.tunnel" = "鉄道(鉄道)";
 
-"type.railway.siding.bridge" = "側線(橋)";
+"type.railway.rail.main.tunnel" = "鉄道(鉄道)";
 
-"type.railway.siding.tunnel" = "側線(トンネル)";
+"type.railway.rail.branch.tunnel" = "鉄道(鉄道)";
 
-"type.railway.spur" = "引き込み線";
+"type.railway.rail.utility.tunnel" = "鉄道(鉄道)";
 
-"type.railway.spur.bridge" = "引き込み線(橋)";
+"type.railway.rail.spur.tunnel" = "鉄道(鉄道)";
 
-"type.railway.spur.tunnel" = "引き込み線(トンネル)";
+"type.railway.rail.service.tunnel" = "鉄道(鉄道)";
 
 "type.railway.station" = "鉄道駅";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "トラム";
 
-"type.railway.yard" = "ヤード";
-
-"type.railway.yard.bridge" = "ヤード(橋)";
-
-"type.railway.yard.tunnel" = "ヤード(トンネル)";
-
 "type.route" = "ルート";
 
 "type.route.ferry" = "フェリー航路";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "買い物";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 9c93dac414..df27ecfc46 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "철로";
 
+"type.railway.rail.highspeed" = "철로";
+
+"type.railway.rail.tourism" = "철로";
+
+"type.railway.rail.main" = "철로";
+
+"type.railway.rail.branch" = "철로";
+
+"type.railway.rail.utility" = "철로";
+
+"type.railway.rail.spur" = "철로";
+
+"type.railway.rail.service" = "철로";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "기차역";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "트램 정류장";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "가게";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 2c26427011..87cda09ffe 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "रेल्वे";
 
+"type.railway.rail.highspeed" = "रेल्वे";
+
+"type.railway.rail.tourism" = "रेल्वे";
+
+"type.railway.rail.main" = "रेल्वे";
+
+"type.railway.rail.branch" = "रेल्वे";
+
+"type.railway.rail.utility" = "रेल्वे";
+
+"type.railway.rail.spur" = "रेल्वे";
+
+"type.railway.rail.service" = "रेल्वे";
+
 "type.railway.rail.bridge" = "रेल्वे";
 
-"type.railway.rail.motor_vehicle" = "रेल्वे";
+"type.railway.rail.highspeed.bridge" = "रेल्वे";
+
+"type.railway.rail.tourism.bridge" = "रेल्वे";
+
+"type.railway.rail.main.bridge" = "रेल्वे";
+
+"type.railway.rail.branch.bridge" = "रेल्वे";
+
+"type.railway.rail.utility.bridge" = "रेल्वे";
+
+"type.railway.rail.spur.bridge" = "रेल्वे";
+
+"type.railway.rail.service.bridge" = "रेल्वे";
 
 "type.railway.rail.tunnel" = "रेल्वे";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "रेल्वे";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "रेल्वे";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "रेल्वे";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "रेल्वे";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "रेल्वे";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "रेल्वे";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "रेल्वे";
 
 "type.railway.station" = "रेल्वे स्थानक";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "ट्राम थांबा";
 
-"type.railway.yard" = "रेल्वे आवार";
-
-"type.railway.yard.bridge" = "रेल्वे आवार";
-
-"type.railway.yard.tunnel" = "रेल्वे आवार";
-
 "type.route" = "मार्ग";
 
 "type.route.ferry" = "होडी";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "दुकान";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 8fda892ebb..5482942a15 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Toglinje";
 
+"type.railway.rail.highspeed" = "Toglinje";
+
+"type.railway.rail.tourism" = "Toglinje";
+
+"type.railway.rail.main" = "Toglinje";
+
+"type.railway.rail.branch" = "Toglinje";
+
+"type.railway.rail.utility" = "Toglinje";
+
+"type.railway.rail.spur" = "Toglinje";
+
+"type.railway.rail.service" = "Toglinje";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Togstasjon";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Trikkestopp";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Butikk";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index d9ebb305ff..052f5b330a 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Spoorlijn";
 
+"type.railway.rail.highspeed" = "Spoorlijn";
+
+"type.railway.rail.tourism" = "Spoorlijn";
+
+"type.railway.rail.main" = "Spoorlijn";
+
+"type.railway.rail.branch" = "Spoorlijn";
+
+"type.railway.rail.utility" = "Spoorlijn";
+
+"type.railway.rail.spur" = "Zijspoor";
+
+"type.railway.rail.service" = "Spoorlijn";
+
 "type.railway.rail.bridge" = "Treinspoorbrug";
 
-"type.railway.rail.motor_vehicle" = "Spoorweg";
+"type.railway.rail.highspeed.bridge" = "Treinspoorbrug";
+
+"type.railway.rail.tourism.bridge" = "Treinspoorbrug";
+
+"type.railway.rail.main.bridge" = "Treinspoorbrug";
+
+"type.railway.rail.branch.bridge" = "Treinspoorbrug";
+
+"type.railway.rail.utility.bridge" = "Treinspoorbrug";
+
+"type.railway.rail.spur.bridge" = "Treinspoorbrug";
+
+"type.railway.rail.service.bridge" = "Treinspoorbrug";
 
 "type.railway.rail.tunnel" = "Spoortunnel";
 
-"type.railway.razed" = "Verwijderde spoorbaan";
+"type.railway.rail.highspeed.tunnel" = "Spoortunnel";
 
-"type.railway.siding" = "Nevenspoor";
+"type.railway.rail.tourism.tunnel" = "Spoortunnel";
 
-"type.railway.siding.bridge" = "Nevenspoor-brug";
+"type.railway.rail.main.tunnel" = "Spoortunnel";
 
-"type.railway.siding.tunnel" = "Nevenspoor-tunnel";
+"type.railway.rail.branch.tunnel" = "Spoortunnel";
 
-"type.railway.spur" = "Zijspoor";
+"type.railway.rail.utility.tunnel" = "Spoortunnel";
 
-"type.railway.spur.bridge" = "Zijspoor-brug";
+"type.railway.rail.spur.tunnel" = "Spoortunnel";
 
-"type.railway.spur.tunnel" = "Zijspoor-tunnel";
+"type.railway.rail.service.tunnel" = "Spoortunnel";
 
 "type.railway.station" = "Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tramhalte";
 
-"type.railway.yard" = "Rangeerterrein";
-
-"type.railway.yard.bridge" = "Rangeerterrein brug";
-
-"type.railway.yard.tunnel" = "Rangeerterrein tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Veerboot";
 
-"type.route.shuttle_train" = "Shuttle-trein";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Winkel";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index ac0c227063..4fe244bda1 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Kolej";
 
+"type.railway.rail.highspeed" = "Kolej";
+
+"type.railway.rail.tourism" = "Kolej";
+
+"type.railway.rail.main" = "Kolej";
+
+"type.railway.rail.branch" = "Kolej";
+
+"type.railway.rail.utility" = "Kolej";
+
+"type.railway.rail.spur" = "Kolej";
+
+"type.railway.rail.service" = "Kolej";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Dworzec kolejowy";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Przystanek tramwajowy";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Sklep";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index d538f8b2b1..ee4d8d99d9 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Ferrovia";
 
+"type.railway.rail.highspeed" = "Ferrovia";
+
+"type.railway.rail.tourism" = "Ferrovia";
+
+"type.railway.rail.main" = "Ferrovia";
+
+"type.railway.rail.branch" = "Ferrovia";
+
+"type.railway.rail.utility" = "Ferrovia";
+
+"type.railway.rail.spur" = "Ramal de ferrovia";
+
+"type.railway.rail.service" = "Ferrovia";
+
 "type.railway.rail.bridge" = "Ferrovia";
 
-"type.railway.rail.motor_vehicle" = "Ferrovia";
+"type.railway.rail.highspeed.bridge" = "Ferrovia";
+
+"type.railway.rail.tourism.bridge" = "Ferrovia";
+
+"type.railway.rail.main.bridge" = "Ferrovia";
+
+"type.railway.rail.branch.bridge" = "Ferrovia";
+
+"type.railway.rail.utility.bridge" = "Ferrovia";
+
+"type.railway.rail.spur.bridge" = "Ferrovia";
+
+"type.railway.rail.service.bridge" = "Ferrovia";
 
 "type.railway.rail.tunnel" = "Ferrovia";
 
-"type.railway.razed" = "Ferrovia removida";
+"type.railway.rail.highspeed.tunnel" = "Ferrovia";
 
-"type.railway.siding" = "Desvio de ferrovia";
+"type.railway.rail.tourism.tunnel" = "Ferrovia";
 
-"type.railway.siding.bridge" = "Desvio de ferrovia";
+"type.railway.rail.main.tunnel" = "Ferrovia";
 
-"type.railway.siding.tunnel" = "Desvio de ferrovia";
+"type.railway.rail.branch.tunnel" = "Ferrovia";
 
-"type.railway.spur" = "Ramal de ferrovia";
+"type.railway.rail.utility.tunnel" = "Ferrovia";
 
-"type.railway.spur.bridge" = "Ramal de ferrovia";
+"type.railway.rail.spur.tunnel" = "Ferrovia";
 
-"type.railway.spur.tunnel" = "Ramal de ferrovia";
+"type.railway.rail.service.tunnel" = "Ferrovia";
 
 "type.railway.station" = "Estação de trem";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Parada de bonde";
 
-"type.railway.yard" = "Pátio de manobras ferroviárias";
-
-"type.railway.yard.bridge" = "Pátio de manobras ferroviárias";
-
-"type.railway.yard.tunnel" = "Pátio de manobras ferroviárias";
-
 "type.route" = "Rota";
 
 "type.route.ferry" = "Rota de balsa";
 
-"type.route.shuttle_train" = "Rota de trem vaivém";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Loja";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index a6b2500f07..dfe1057f1c 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Ferrovia";
 
+"type.railway.rail.highspeed" = "Ferrovia";
+
+"type.railway.rail.tourism" = "Ferrovia";
+
+"type.railway.rail.main" = "Ferrovia";
+
+"type.railway.rail.branch" = "Ferrovia";
+
+"type.railway.rail.utility" = "Ferrovia";
+
+"type.railway.rail.spur" = "Ramal de ferrovia";
+
+"type.railway.rail.service" = "Ferrovia";
+
 "type.railway.rail.bridge" = "Ferrovia";
 
-"type.railway.rail.motor_vehicle" = "Ferrovia";
+"type.railway.rail.highspeed.bridge" = "Ferrovia";
+
+"type.railway.rail.tourism.bridge" = "Ferrovia";
+
+"type.railway.rail.main.bridge" = "Ferrovia";
+
+"type.railway.rail.branch.bridge" = "Ferrovia";
+
+"type.railway.rail.utility.bridge" = "Ferrovia";
+
+"type.railway.rail.spur.bridge" = "Ferrovia";
+
+"type.railway.rail.service.bridge" = "Ferrovia";
 
 "type.railway.rail.tunnel" = "Ferrovia";
 
-"type.railway.razed" = "Ferrovia removida";
+"type.railway.rail.highspeed.tunnel" = "Ferrovia";
 
-"type.railway.siding" = "Desvio de ferrovia";
+"type.railway.rail.tourism.tunnel" = "Ferrovia";
 
-"type.railway.siding.bridge" = "Desvio de ferrovia";
+"type.railway.rail.main.tunnel" = "Ferrovia";
 
-"type.railway.siding.tunnel" = "Desvio de ferrovia";
+"type.railway.rail.branch.tunnel" = "Ferrovia";
 
-"type.railway.spur" = "Ramal de ferrovia";
+"type.railway.rail.utility.tunnel" = "Ferrovia";
 
-"type.railway.spur.bridge" = "Ramal de ferrovia";
+"type.railway.rail.spur.tunnel" = "Ferrovia";
 
-"type.railway.spur.tunnel" = "Ramal de ferrovia";
+"type.railway.rail.service.tunnel" = "Ferrovia";
 
 "type.railway.station" = "Estação de comboios";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Paragem de elétrico";
 
-"type.railway.yard" = "Pátio de manobras ferroviárias";
-
-"type.railway.yard.bridge" = "Pátio de manobras ferroviárias";
-
-"type.railway.yard.tunnel" = "Pátio de manobras ferroviárias";
-
 "type.route" = "Rota";
 
 "type.route.ferry" = "Rota de ferry";
 
-"type.route.shuttle_train" = "Rota de comboio vaivem";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Loja";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 3f785121b9..b3db5f98b9 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Cale ferată";
 
+"type.railway.rail.highspeed" = "Cale ferată";
+
+"type.railway.rail.tourism" = "Cale ferată";
+
+"type.railway.rail.main" = "Cale ferată";
+
+"type.railway.rail.branch" = "Cale ferată";
+
+"type.railway.rail.utility" = "Cale ferată";
+
+"type.railway.rail.spur" = "Cale ferată";
+
+"type.railway.rail.service" = "Cale ferată";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Feroviar";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Stație de tramvai";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Magazin";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 74dc431ae5..1e14b0f5ef 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Железнодорожный путь";
 
+"type.railway.rail.highspeed" = "Железнодорожный путь";
+
+"type.railway.rail.tourism" = "Железнодорожный путь";
+
+"type.railway.rail.main" = "Железнодорожный путь";
+
+"type.railway.rail.branch" = "Железнодорожный путь";
+
+"type.railway.rail.utility" = "Железнодорожный путь";
+
+"type.railway.rail.spur" = "Подъездная Ж/Д";
+
+"type.railway.rail.service" = "Железнодорожный путь";
+
 "type.railway.rail.bridge" = "Железнодорожный мост";
 
-"type.railway.rail.motor_vehicle" = "Железная дорога";
+"type.railway.rail.highspeed.bridge" = "Железнодорожный мост";
+
+"type.railway.rail.tourism.bridge" = "Железнодорожный мост";
+
+"type.railway.rail.main.bridge" = "Железнодорожный мост";
+
+"type.railway.rail.branch.bridge" = "Железнодорожный мост";
+
+"type.railway.rail.utility.bridge" = "Железнодорожный мост";
+
+"type.railway.rail.spur.bridge" = "Железнодорожный мост";
+
+"type.railway.rail.service.bridge" = "Железнодорожный мост";
 
 "type.railway.rail.tunnel" = "Железнодорожный туннель";
 
-"type.railway.razed" = "Заброшенная Ж/Д";
+"type.railway.rail.highspeed.tunnel" = "Железнодорожный туннель";
 
-"type.railway.siding" = "Ветка Ж/Д";
+"type.railway.rail.tourism.tunnel" = "Железнодорожный туннель";
 
-"type.railway.siding.bridge" = "Ветка Ж/Д";
+"type.railway.rail.main.tunnel" = "Железнодорожный туннель";
 
-"type.railway.siding.tunnel" = "Ветка Ж/Д";
+"type.railway.rail.branch.tunnel" = "Железнодорожный туннель";
 
-"type.railway.spur" = "Подъездная Ж/Д";
+"type.railway.rail.utility.tunnel" = "Железнодорожный туннель";
 
-"type.railway.spur.bridge" = "Подъездная Ж/Д";
+"type.railway.rail.spur.tunnel" = "Железнодорожный туннель";
 
-"type.railway.spur.tunnel" = "Подъездная Ж/Д";
+"type.railway.rail.service.tunnel" = "Железнодорожный туннель";
 
 "type.railway.station" = "Ж/д станция";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Остановка трамвая";
 
-"type.railway.yard" = "Ж/Д площадка";
-
-"type.railway.yard.bridge" = "Ж/Д площадка";
-
-"type.railway.yard.tunnel" = "Ж/Д площадка";
-
 "type.route" = "Маршрут";
 
 "type.route.ferry" = "Паромная переправа";
 
-"type.route.shuttle_train" = "Челночная линия";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Магазин";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index efd4c47372..1d05f240a1 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Železnica";
 
+"type.railway.rail.highspeed" = "Železnica";
+
+"type.railway.rail.tourism" = "Železnica";
+
+"type.railway.rail.main" = "Železnica";
+
+"type.railway.rail.branch" = "Železnica";
+
+"type.railway.rail.utility" = "Železnica";
+
+"type.railway.rail.spur" = "Železnica";
+
+"type.railway.rail.service" = "Železnica";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Železničná stanica";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Električková zastávka";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Obchod";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index f8aae6177d..6825398bad 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Järnväg";
 
+"type.railway.rail.highspeed" = "Järnväg";
+
+"type.railway.rail.tourism" = "Järnväg";
+
+"type.railway.rail.main" = "Järnväg";
+
+"type.railway.rail.branch" = "Järnväg";
+
+"type.railway.rail.utility" = "Järnväg";
+
+"type.railway.rail.spur" = "Järnväg";
+
+"type.railway.rail.service" = "Järnväg";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Tågstation";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Spårvagnshållplats";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Butik";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 30be3e86e3..37d4348927 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Njia ya Reli";
 
+"type.railway.rail.highspeed" = "Njia ya Reli";
+
+"type.railway.rail.tourism" = "Njia ya Reli";
+
+"type.railway.rail.main" = "Njia ya Reli";
+
+"type.railway.rail.branch" = "Njia ya Reli";
+
+"type.railway.rail.utility" = "Njia ya Reli";
+
+"type.railway.rail.spur" = "Njia ya Reli";
+
+"type.railway.rail.service" = "Njia ya Reli";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Train Station";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tram Stop";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Shop";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 0fdf5e9079..ed38387085 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "รถไฟ";
 
+"type.railway.rail.highspeed" = "รถไฟ";
+
+"type.railway.rail.tourism" = "รถไฟ";
+
+"type.railway.rail.main" = "รถไฟ";
+
+"type.railway.rail.branch" = "รถไฟ";
+
+"type.railway.rail.utility" = "รถไฟ";
+
+"type.railway.rail.spur" = "รถไฟ";
+
+"type.railway.rail.service" = "รถไฟ";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "สถานีรถไฟ";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "ป้ายรถราง";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "ร้านค้า";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index a7c1572f90..42b03ea9b3 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Demiryolu";
 
+"type.railway.rail.highspeed" = "Demiryolu";
+
+"type.railway.rail.tourism" = "Demiryolu";
+
+"type.railway.rail.main" = "Demiryolu";
+
+"type.railway.rail.branch" = "Demiryolu";
+
+"type.railway.rail.utility" = "Demiryolu";
+
+"type.railway.rail.spur" = "Düz Ray";
+
+"type.railway.rail.service" = "Demiryolu";
+
 "type.railway.rail.bridge" = "Demiryolu";
 
-"type.railway.rail.motor_vehicle" = "Demiryolu";
+"type.railway.rail.highspeed.bridge" = "Demiryolu";
+
+"type.railway.rail.tourism.bridge" = "Demiryolu";
+
+"type.railway.rail.main.bridge" = "Demiryolu";
+
+"type.railway.rail.branch.bridge" = "Demiryolu";
+
+"type.railway.rail.utility.bridge" = "Demiryolu";
+
+"type.railway.rail.spur.bridge" = "Demiryolu";
+
+"type.railway.rail.service.bridge" = "Demiryolu";
 
 "type.railway.rail.tunnel" = "Demiryolu";
 
-"type.railway.razed" = "Yıkılmış Ray";
+"type.railway.rail.highspeed.tunnel" = "Demiryolu";
 
-"type.railway.siding" = "Demiryolu Hattı";
+"type.railway.rail.tourism.tunnel" = "Demiryolu";
 
-"type.railway.siding.bridge" = "Demiryolu Hattı";
+"type.railway.rail.main.tunnel" = "Demiryolu";
 
-"type.railway.siding.tunnel" = "Demiryolu Hattı";
+"type.railway.rail.branch.tunnel" = "Demiryolu";
 
-"type.railway.spur" = "Düz Ray";
+"type.railway.rail.utility.tunnel" = "Demiryolu";
 
-"type.railway.spur.bridge" = "Düz Ray";
+"type.railway.rail.spur.tunnel" = "Demiryolu";
 
-"type.railway.spur.tunnel" = "Düz Ray";
+"type.railway.rail.service.tunnel" = "Demiryolu";
 
 "type.railway.station" = "Tren İstasyonu";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Tramvay Durağı";
 
-"type.railway.yard" = "Demiryolu Avlusu";
-
-"type.railway.yard.bridge" = "Demiryolu Avlusu";
-
-"type.railway.yard.tunnel" = "Demiryolu Avlusu";
-
 "type.route" = "Rota";
 
 "type.route.ferry" = "Feribot";
 
-"type.route.shuttle_train" = "Servis Treni";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Mağaza";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 2127a68c5b..38f9565a2e 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Залізнична дорога";
 
+"type.railway.rail.highspeed" = "Залізнична дорога";
+
+"type.railway.rail.tourism" = "Залізнична дорога";
+
+"type.railway.rail.main" = "Залізнична дорога";
+
+"type.railway.rail.branch" = "Залізнична дорога";
+
+"type.railway.rail.utility" = "Залізнична дорога";
+
+"type.railway.rail.spur" = "Під'їздна залізниця";
+
+"type.railway.rail.service" = "Залізнична дорога";
+
 "type.railway.rail.bridge" = "Залізничний міст";
 
-"type.railway.rail.motor_vehicle" = "Залізниця";
+"type.railway.rail.highspeed.bridge" = "Залізничний міст";
+
+"type.railway.rail.tourism.bridge" = "Залізничний міст";
+
+"type.railway.rail.main.bridge" = "Залізничний міст";
+
+"type.railway.rail.branch.bridge" = "Залізничний міст";
+
+"type.railway.rail.utility.bridge" = "Залізничний міст";
+
+"type.railway.rail.spur.bridge" = "Залізничний міст";
+
+"type.railway.rail.service.bridge" = "Залізничний міст";
 
 "type.railway.rail.tunnel" = "Залізничний тунель";
 
-"type.railway.razed" = "Закинута залізниця";
+"type.railway.rail.highspeed.tunnel" = "Залізничний тунель";
 
-"type.railway.siding" = "Гілка залізниці";
+"type.railway.rail.tourism.tunnel" = "Залізничний тунель";
 
-"type.railway.siding.bridge" = "Гілка залізниці";
+"type.railway.rail.main.tunnel" = "Залізничний тунель";
 
-"type.railway.siding.tunnel" = "Гілка залізниці";
+"type.railway.rail.branch.tunnel" = "Залізничний тунель";
 
-"type.railway.spur" = "Під'їздна залізниця";
+"type.railway.rail.utility.tunnel" = "Залізничний тунель";
 
-"type.railway.spur.bridge" = "Під'їздна залізниця";
+"type.railway.rail.spur.tunnel" = "Залізничний тунель";
 
-"type.railway.spur.tunnel" = "Під'їздна залізниця";
+"type.railway.rail.service.tunnel" = "Залізничний тунель";
 
 "type.railway.station" = "Залізничний вокзал";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Зупинка";
 
-"type.railway.yard" = "Залізнична ділянка";
-
-"type.railway.yard.bridge" = "Залізнична ділянка";
-
-"type.railway.yard.tunnel" = "Залізнична ділянка";
-
 "type.route" = "Маршрут";
 
 "type.route.ferry" = "Паромна переправа";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Крамниця";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 30300e937a..01397f8a0e 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "Đường sắt";
 
+"type.railway.rail.highspeed" = "Đường sắt";
+
+"type.railway.rail.tourism" = "Đường sắt";
+
+"type.railway.rail.main" = "Đường sắt";
+
+"type.railway.rail.branch" = "Đường sắt";
+
+"type.railway.rail.utility" = "Đường sắt";
+
+"type.railway.rail.spur" = "Đường sắt";
+
+"type.railway.rail.service" = "Đường sắt";
+
 "type.railway.rail.bridge" = "Railway Bridge";
 
-"type.railway.rail.motor_vehicle" = "Railway";
+"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+
+"type.railway.rail.tourism.bridge" = "Railway Bridge";
+
+"type.railway.rail.main.bridge" = "Railway Bridge";
+
+"type.railway.rail.branch.bridge" = "Railway Bridge";
+
+"type.railway.rail.utility.bridge" = "Railway Bridge";
+
+"type.railway.rail.spur.bridge" = "Railway Bridge";
+
+"type.railway.rail.service.bridge" = "Railway Bridge";
 
 "type.railway.rail.tunnel" = "Railway Tunnel";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "Railway Tunnel";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "Railway Tunnel";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "Railway Tunnel";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "Railway Tunnel";
 
 "type.railway.station" = "Đường tàu hỏa";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "Bến tàu điện";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "Cửa hàng";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 115d64adce..19a3780612 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "铁路轨道";
 
+"type.railway.rail.highspeed" = "铁路轨道";
+
+"type.railway.rail.tourism" = "铁路轨道";
+
+"type.railway.rail.main" = "铁路轨道";
+
+"type.railway.rail.branch" = "铁路轨道";
+
+"type.railway.rail.utility" = "铁路轨道";
+
+"type.railway.rail.spur" = "铁路轨道";
+
+"type.railway.rail.service" = "铁路轨道";
+
 "type.railway.rail.bridge" = "铁路轨道";
 
-"type.railway.rail.motor_vehicle" = "铁路轨道";
+"type.railway.rail.highspeed.bridge" = "铁路轨道";
+
+"type.railway.rail.tourism.bridge" = "铁路轨道";
+
+"type.railway.rail.main.bridge" = "铁路轨道";
+
+"type.railway.rail.branch.bridge" = "铁路轨道";
+
+"type.railway.rail.utility.bridge" = "铁路轨道";
+
+"type.railway.rail.spur.bridge" = "铁路轨道";
+
+"type.railway.rail.service.bridge" = "铁路轨道";
 
 "type.railway.rail.tunnel" = "铁路轨道";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "铁路轨道";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "铁路轨道";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "铁路轨道";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "铁路轨道";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "铁路轨道";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "铁路轨道";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "铁路轨道";
 
 "type.railway.station" = "火车站";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "电车站";
 
-"type.railway.yard" = "铁路货场";
-
-"type.railway.yard.bridge" = "铁路货场";
-
-"type.railway.yard.tunnel" = "铁路货场";
-
 "type.route" = "线路";
 
 "type.route.ferry" = "航线";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "商店";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index be3f637608..a8c9815708 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -2783,25 +2783,51 @@
 
 "type.railway.rail" = "鐵路軌道";
 
+"type.railway.rail.highspeed" = "鐵路軌道";
+
+"type.railway.rail.tourism" = "鐵路軌道";
+
+"type.railway.rail.main" = "鐵路軌道";
+
+"type.railway.rail.branch" = "鐵路軌道";
+
+"type.railway.rail.utility" = "鐵路軌道";
+
+"type.railway.rail.spur" = "鐵路軌道";
+
+"type.railway.rail.service" = "鐵路軌道";
+
 "type.railway.rail.bridge" = "鐵路軌道";
 
-"type.railway.rail.motor_vehicle" = "鐵路軌道";
+"type.railway.rail.highspeed.bridge" = "鐵路軌道";
+
+"type.railway.rail.tourism.bridge" = "鐵路軌道";
+
+"type.railway.rail.main.bridge" = "鐵路軌道";
+
+"type.railway.rail.branch.bridge" = "鐵路軌道";
+
+"type.railway.rail.utility.bridge" = "鐵路軌道";
+
+"type.railway.rail.spur.bridge" = "鐵路軌道";
+
+"type.railway.rail.service.bridge" = "鐵路軌道";
 
 "type.railway.rail.tunnel" = "鐵路軌道";
 
-"type.railway.razed" = "Razed Rail";
+"type.railway.rail.highspeed.tunnel" = "鐵路軌道";
 
-"type.railway.siding" = "Siding Rail";
+"type.railway.rail.tourism.tunnel" = "鐵路軌道";
 
-"type.railway.siding.bridge" = "Siding Rail Bridge";
+"type.railway.rail.main.tunnel" = "鐵路軌道";
 
-"type.railway.siding.tunnel" = "Siding Rail Tunnel";
+"type.railway.rail.branch.tunnel" = "鐵路軌道";
 
-"type.railway.spur" = "Spur Rail";
+"type.railway.rail.utility.tunnel" = "鐵路軌道";
 
-"type.railway.spur.bridge" = "Spur Rail Bridge";
+"type.railway.rail.spur.tunnel" = "鐵路軌道";
 
-"type.railway.spur.tunnel" = "Spur Rail Tunnel";
+"type.railway.rail.service.tunnel" = "鐵路軌道";
 
 "type.railway.station" = "火車站";
 
@@ -3265,17 +3291,11 @@
 
 "type.railway.tram_stop" = "電車站";
 
-"type.railway.yard" = "Railway Yard";
-
-"type.railway.yard.bridge" = "Railway Yard Bridge";
-
-"type.railway.yard.tunnel" = "Railway Yard Tunnel";
-
 "type.route" = "Route";
 
 "type.route.ferry" = "Ferry";
 
-"type.route.shuttle_train" = "Shuttle Train";
+"type.route.shuttle_train" = "route-shuttle_train";
 
 "type.shop" = "購物";