diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 1cdc117dfa..c35ded88f8 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1435,13 +1435,32 @@
 	<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.rail.highspeed">سكة حديد عالية السرعة</string>
+	<string name="type.railway.rail.tourism">السكك الحديدية السياحية</string>
+	<string name="type.railway.rail.main">سكة حديدية</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">السكك الحديدية الثانوية</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">سكة حديد المرافق</string>
+	<string name="type.railway.rail.spur">سكة حديد سبير</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">مسار السكك الحديدية المساعدة</string>
+	<string name="type.railway.rail.bridge">جسر للسكك الحديدية</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-be/strings.xml b/android/res/values-be/strings.xml
index aa013e384f..7f3ffaed25 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -1091,6 +1091,32 @@
 	<string name="type.power.plant.wind">Ветраэлектрастанцыя</string>
 	<string name="type.railway.funicular">Фунікулёр</string>
 	<string name="type.railway.platform">Чыгуначная платформа</string>
+	<string name="type.railway.rail.highspeed">Хуткасная чыгунка</string>
+	<string name="type.railway.rail.tourism">Турыстычная чыгунка</string>
+	<string name="type.railway.rail.main">Чыгуначны</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Другасная чыгунка</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Службова чыгунка</string>
+	<string name="type.railway.rail.spur">Чыгуначны шлях</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Дапаможны чыгуначны шлях</string>
+	<string name="type.railway.rail.bridge">Чыгуначны мост</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.funicular">Фунікулёр</string>
 	<string name="type.shop.bathroom_furnishing">Мэбля для ванных пакояў</string>
 	<string name="type.shop.beverages">Напоі</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 63ff97cbea..175d01221c 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -961,6 +961,32 @@
 	<string name="type.power.plant.solar">Слънчева електроцентрала</string>
 	<string name="type.power.plant.wind">Вятърна електроцентрала</string>
 	<string name="type.railway.funicular">Фуникуляр</string>
+	<string name="type.railway.rail.highspeed">Високоскоростна железница</string>
+	<string name="type.railway.rail.tourism">Туристическа железница</string>
+	<string name="type.railway.rail.main">Железопътна линия</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Вторична железница</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Сервизна железница</string>
+	<string name="type.railway.rail.spur">Железопътна отбивка</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Спомагателен релсов път</string>
+	<string name="type.railway.rail.bridge">Железопътен мост</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.funicular">Фуникуляр</string>
 	<string name="type.shop.bathroom_furnishing">Обзавеждане за баня</string>
 	<string name="type.shop.cannabis">Магазин за канабис</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index dfe13ccb62..e891d6c507 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -777,6 +777,32 @@
 	<string name="type.power.plant.solar">Central d\'energia solar</string>
 	<string name="type.power.plant.wind">Central eòlica</string>
 	<string name="type.railway.funicular">Funicular</string>
+	<string name="type.railway.rail.highspeed">Ferrocarril d\'alta velocitat</string>
+	<string name="type.railway.rail.tourism">Ferrocarril turístic</string>
+	<string name="type.railway.rail.main">Ferrocarril</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Ferrocarril secundari</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Ferrocarril d\'utilitat</string>
+	<string name="type.railway.rail.spur">Espoló de ferrocarril</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Via ferroviària auxiliar</string>
+	<string name="type.railway.rail.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.highspeed.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.tourism.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.main.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.branch.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.utility.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.spur.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.service.bridge">Pont del ferrocarril</string>
+	<string name="type.railway.rail.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.highspeed.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.tourism.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.main.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.branch.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.utility.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.spur.tunnel">Túnel ferroviari</string>
+	<string name="type.railway.rail.service.tunnel">Túnel ferroviari</string>
 	<string name="type.railway.station.funicular">Funicular</string>
 	<string name="type.shop.bathroom_furnishing">Mobles de bany</string>
 	<string name="type.shop.cannabis">Botiga de cànnabis</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index d07ad4357b..741c441e0e 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1330,13 +1330,32 @@
 	<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.highspeed">Vysokorychlostní železnice</string>
+	<string name="type.railway.rail.tourism">Turistická ž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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Sekundární železnice</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Užitková železnice</string>
+	<string name="type.railway.rail.spur">Železniční odbočka</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Pomocná kolejnice</string>
+	<string name="type.railway.rail.bridge">Železniční most</string>
+	<string name="type.railway.rail.highspeed.bridge">Železniční most</string>
+	<string name="type.railway.rail.tourism.bridge">Železniční most</string>
+	<string name="type.railway.rail.main.bridge">Železniční most</string>
+	<string name="type.railway.rail.branch.bridge">Železniční most</string>
+	<string name="type.railway.rail.utility.bridge">Železniční most</string>
+	<string name="type.railway.rail.spur.bridge">Železniční most</string>
+	<string name="type.railway.rail.service.bridge">Železniční most</string>
+	<string name="type.railway.rail.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.tourism.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.main.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.branch.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.utility.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.spur.tunnel">Železniční tunel</string>
+	<string name="type.railway.rail.service.tunnel">Železniční tunel</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 f01557acea..0222f86f62 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1313,13 +1313,32 @@
 	<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.highspeed">Højhastighedsjernbane</string>
+	<string name="type.railway.rail.tourism">Turistisk 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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Sekundær jernbane</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Jernbane til forsyningsselskaber</string>
+	<string name="type.railway.rail.spur">Jernbanespor</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Ekstra jernbanespor</string>
+	<string name="type.railway.rail.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.highspeed.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.tourism.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.main.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.branch.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.utility.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.spur.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.service.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.main.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.service.tunnel">Jernbanetunnel</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 34e94f6d24..9ed0d4328b 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1495,13 +1495,16 @@
 	<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.highspeed">Hochgeschwindigkeits-eisenbahn</string>
+	<string name="type.railway.rail.tourism">Touristische 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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Sekundärbahn</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Versorgungseisenbahn</string>
 	<string name="type.railway.rail.spur">Anschlussgleis</string>
-	<string name="type.railway.rail.service">Eisenbahn</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Hilfsbahngleis</string>
 	<string name="type.railway.rail.bridge">Eisenbahnbrücke</string>
 	<string name="type.railway.rail.highspeed.bridge">Eisenbahnbrücke</string>
 	<string name="type.railway.rail.tourism.bridge">Eisenbahnbrücke</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 24604703b1..19dab0f5a4 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1325,13 +1325,32 @@
 	<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.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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Δευτερεύων σιδηροδρομικός σιδηρόδρομος</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Σιδηρόδρομος κοινής ωφέλειας</string>
+	<string name="type.railway.rail.spur">Σιδηροδρομική ατραπός</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Βοηθητική σιδηροδρομική γραμμή</string>
+	<string name="type.railway.rail.bridge">Σιδηροδρομική γέφυρα</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-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index 2943e35f6f..739f2e47ef 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -331,13 +331,7 @@
 	<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.rail.spur">Espuela ferroviaria</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 8cb31fb17e..0bb87df379 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1504,13 +1504,32 @@
 	<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.highspeed">Ferrocarril de alta velocidad</string>
+	<string name="type.railway.rail.tourism">Ferrocarril turístico</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Ramal ferroviario</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Ferrocarril utilitario</string>
+	<string name="type.railway.rail.spur">Espolón ferroviario</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Vía férrea de maniobras</string>
+	<string name="type.railway.rail.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.highspeed.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.tourism.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.main.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.branch.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.utility.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.spur.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.service.bridge">Puente ferroviario</string>
+	<string name="type.railway.rail.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.highspeed.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.tourism.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.main.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.branch.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.utility.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.spur.tunnel">Túnel ferroviario</string>
+	<string name="type.railway.rail.service.tunnel">Túnel ferroviario</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 ac9279a01d..50a789cf78 100644
--- a/android/res/values-et/strings.xml
+++ b/android/res/values-et/strings.xml
@@ -1512,13 +1512,16 @@
 	<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.highspeed">Kiirraudtee</string>
+	<string name="type.railway.rail.tourism">Turismiraudtee</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Teisene raudtee</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Teenindus raudtee</string>
 	<string name="type.railway.rail.spur">Rööbastee</string>
-	<string name="type.railway.rail.service">Raudtee</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Lisarööpmel rööbastee</string>
 	<string name="type.railway.rail.bridge">Raudtee sild</string>
 	<string name="type.railway.rail.highspeed.bridge">Raudtee sild</string>
 	<string name="type.railway.rail.tourism.bridge">Raudtee sild</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 9fe006563b..4c246bf907 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -1433,13 +1433,32 @@
 	<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.highspeed">Abiadura handiko trena</string>
+	<string name="type.railway.rail.tourism">Tren turistikoa</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Bigarren mailako trenbidea</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Erabilgarritasun trena</string>
+	<string name="type.railway.rail.spur">Trenbide-spur</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Trenbide laguntzailea</string>
+	<string name="type.railway.rail.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.highspeed.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.tourism.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.main.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.branch.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.utility.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.spur.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.service.bridge">Trenbide zubia</string>
+	<string name="type.railway.rail.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.highspeed.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.tourism.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.main.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.branch.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.utility.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.spur.tunnel">Trenbide-tunela</string>
+	<string name="type.railway.rail.service.tunnel">Trenbide-tunela</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 7e622cc589..3f73969d7e 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1235,13 +1235,32 @@
 	<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.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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">راه آهن ثانویه</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">راه آهن شهری</string>
+	<string name="type.railway.rail.spur">خار راه آهن</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">ریل کمکی</string>
+	<string name="type.railway.rail.bridge">پل راه آهن</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-fi/strings.xml b/android/res/values-fi/strings.xml
index b0d4868abc..d40b17c9ac 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1410,13 +1410,32 @@
 	<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.highspeed">Suurnopeusrautatie</string>
+	<string name="type.railway.rail.tourism">Turistinen 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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Toissijainen rautatie</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Rautatieliikenne</string>
+	<string name="type.railway.rail.spur">Rautatien varsi</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Apukiskorata</string>
+	<string name="type.railway.rail.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.highspeed.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.tourism.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.main.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.branch.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.utility.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.spur.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.service.bridge">Rautatiesilta</string>
+	<string name="type.railway.rail.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.highspeed.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.tourism.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.main.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.branch.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.utility.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.spur.tunnel">Rautatietunneli</string>
+	<string name="type.railway.rail.service.tunnel">Rautatietunneli</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 2e4c3530f9..e18a3f6e79 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1478,29 +1478,32 @@
 	<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.highspeed">Chemin de fer à grande vitesse</string>
+	<string name="type.railway.rail.tourism">Ligne touristique</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Chemin de fer secondaire</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Train de fret</string>
+	<string name="type.railway.rail.spur">Embranchement ferroviaire</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Service ferroviaire</string>
+	<string name="type.railway.rail.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.highspeed.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.tourism.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.main.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.branch.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.utility.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.spur.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.service.bridge">Pont ferroviaire</string>
+	<string name="type.railway.rail.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.highspeed.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.tourism.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.main.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.branch.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.utility.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.spur.tunnel">Tunnel ferroviaire</string>
+	<string name="type.railway.rail.service.tunnel">Tunnel ferroviaire</string>
 	<string name="type.railway.station">Gare ferroviaire</string>
 	<string name="type.railway.station.funicular">Funiculaire</string>
 	<string name="type.railway.station.light_rail">Gare ferroviaire</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index e56275012c..eaa19f351e 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1340,13 +1340,32 @@
 	<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.highspeed">Nagysebességű vasút</string>
+	<string name="type.railway.rail.tourism">Turisztikai 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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Másodlagos vasút</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Közüzemi vasút</string>
+	<string name="type.railway.rail.spur">Vasúti nyomvonal</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Kiegészítő sínpálya</string>
+	<string name="type.railway.rail.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.highspeed.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.tourism.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.main.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.branch.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.utility.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.spur.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.service.bridge">Vasúti híd</string>
+	<string name="type.railway.rail.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.highspeed.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.tourism.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.main.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.branch.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.utility.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.spur.tunnel">Vasúti alagút</string>
+	<string name="type.railway.rail.service.tunnel">Vasúti alagú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 169a42ae57..bc158df3d2 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -1317,13 +1317,32 @@
 	<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.highspeed">Kereta api berkecepatan tinggi</string>
+	<string name="type.railway.rail.tourism">Kereta api wisata</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Kereta api sekunder</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Kereta api utilitas</string>
+	<string name="type.railway.rail.spur">Pacu kereta api</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Jalur rel bantu</string>
+	<string name="type.railway.rail.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.highspeed.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.tourism.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.main.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.branch.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.utility.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.spur.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.service.bridge">Jembatan kereta api</string>
+	<string name="type.railway.rail.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.highspeed.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.tourism.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.main.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.branch.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.utility.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.spur.tunnel">Terowongan kereta api</string>
+	<string name="type.railway.rail.service.tunnel">Terowongan 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 d5bbb9c371..6d8f068317 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1457,13 +1457,32 @@
 	<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.rail.highspeed">Ferrovia ad alta velocità</string>
+	<string name="type.railway.rail.tourism">Ferrovia turistica</string>
+	<string name="type.railway.rail.main">Ferrovia</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Ferrovia secondaria</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Ferrovia di utilità</string>
+	<string name="type.railway.rail.spur">Sperone ferroviario</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Binario ausiliario</string>
+	<string name="type.railway.rail.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.highspeed.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.tourism.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.main.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.branch.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.utility.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.spur.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.service.bridge">Ponte ferroviario</string>
+	<string name="type.railway.rail.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.highspeed.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.tourism.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.main.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.branch.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.utility.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.spur.tunnel">Tunnel ferroviario</string>
+	<string name="type.railway.rail.service.tunnel">Tunnel ferroviario</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-iw/strings.xml b/android/res/values-iw/strings.xml
index 0757e1f8b0..bc0ec41551 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -634,6 +634,32 @@
 	<string name="type.power.plant.solar">תחנת כוח סולארית</string>
 	<string name="type.power.plant.wind">תחנת כוח רוח</string>
 	<string name="type.railway.funicular">רַכֶּבֶל</string>
+	<string name="type.railway.rail.highspeed">רכבת מהירה</string>
+	<string name="type.railway.rail.tourism">רכבת תיירות</string>
+	<string name="type.railway.rail.main">מסילת רכבת</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">רכבת משנית</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">רכבת שירות</string>
+	<string name="type.railway.rail.spur">ספר רכבת</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">מסילת רכבת עזר</string>
+	<string name="type.railway.rail.bridge">גשר הרכבת</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.funicular">רַכֶּבֶל</string>
 	<string name="type.shop.bathroom_furnishing">ריהוט חדר רחצה</string>
 	<string name="type.shop.cannabis">חנות קנאביס</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 416de41b99..dfae6df365 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1433,13 +1433,16 @@
 	<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.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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">二次鉄道</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">実用鉄道</string>
 	<string name="type.railway.rail.spur">引き込み線</string>
-	<string name="type.railway.rail.service">鉄道</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">補助線路</string>
 	<string name="type.railway.rail.bridge">鉄道(橋)</string>
 	<string name="type.railway.rail.highspeed.bridge">鉄道(橋)</string>
 	<string name="type.railway.rail.tourism.bridge">鉄道(橋)</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index aa63ea2553..a24862b97f 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1322,13 +1322,32 @@
 	<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.rail.highspeed">고속 철도</string>
+	<string name="type.railway.rail.tourism">관광 철도</string>
+	<string name="type.railway.rail.main">철도</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">보조 철도</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">유틸리티 철도</string>
+	<string name="type.railway.rail.spur">철도 박차</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">보조 레일 트랙</string>
+	<string name="type.railway.rail.bridge">철도 교량</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-mr/strings.xml b/android/res/values-mr/strings.xml
index 9ba7b9c96d..422bd9a357 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -1371,13 +1371,16 @@
 	<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.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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">दुय्यम रेल्वे</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">उपयुक्तता रेल्वे</string>
+	<string name="type.railway.rail.spur">रेल्वे स्पर</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">सहायक रेल्वे ट्रॅक</string>
 	<string name="type.railway.rail.bridge">रेल्वे</string>
 	<string name="type.railway.rail.highspeed.bridge">रेल्वे</string>
 	<string name="type.railway.rail.tourism.bridge">रेल्वे</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 8747a5f1cd..06dbd729bc 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1378,13 +1378,32 @@
 	<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.rail.highspeed">Høyhastighetsjernbane</string>
+	<string name="type.railway.rail.tourism">Turistjernbane</string>
+	<string name="type.railway.rail.main">Jernbane</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Sekundær jernbane</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Service jernbane</string>
+	<string name="type.railway.rail.spur">Jernbanespor</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Ekstra jernbanespor</string>
+	<string name="type.railway.rail.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.highspeed.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.tourism.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.main.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.branch.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.utility.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.spur.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.service.bridge">Jernbanebro</string>
+	<string name="type.railway.rail.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.main.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Jernbanetunnel</string>
+	<string name="type.railway.rail.service.tunnel">Jernbanetunnel</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 d6f3c7abc7..533d13a84a 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1517,13 +1517,16 @@
 	<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.highspeed">Hogesnelheidstrein</string>
+	<string name="type.railway.rail.tourism">Toeristische spoorlijn</string>
+	<string name="type.railway.rail.main">Spoor</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Secundaire spoorwegen</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Spoorwegen</string>
 	<string name="type.railway.rail.spur">Zijspoor</string>
-	<string name="type.railway.rail.service">Spoorlijn</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Hulpspoor</string>
 	<string name="type.railway.rail.bridge">Treinspoorbrug</string>
 	<string name="type.railway.rail.highspeed.bridge">Treinspoorbrug</string>
 	<string name="type.railway.rail.tourism.bridge">Treinspoorbrug</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index f16492447f..3ae24da177 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1466,13 +1466,32 @@
 	<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.highspeed">Kolej dużych prędkości</string>
+	<string name="type.railway.rail.tourism">Kolej turystyczna</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Kolej drugorzędna</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Kolej użytkowa</string>
+	<string name="type.railway.rail.spur">Ostroga kolejowa</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Pomocniczy tor kolejowy</string>
+	<string name="type.railway.rail.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.highspeed.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.tourism.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.main.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.branch.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.utility.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.spur.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.service.bridge">Most kolejowy</string>
+	<string name="type.railway.rail.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.highspeed.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.tourism.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.main.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.branch.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.utility.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.spur.tunnel">Tunel kolejowy</string>
+	<string name="type.railway.rail.service.tunnel">Tunel kolejowy</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 1a0a3b8b91..9d34ac2a7e 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -1368,29 +1368,6 @@
 	<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.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.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>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 77209b1ec9..6489b558b8 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1465,29 +1465,32 @@
 	<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.highspeed">Ferrovia de alta velocidade</string>
+	<string name="type.railway.rail.tourism">Ferrovia turística</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.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.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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Ramal ferroviário</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Ferrovia de serviços</string>
+	<string name="type.railway.rail.spur">Ramal de inserção</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Linha de serviço</string>
+	<string name="type.railway.rail.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.highspeed.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.tourism.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.main.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.branch.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.utility.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.spur.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.service.bridge">Ponte ferroviária</string>
+	<string name="type.railway.rail.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.highspeed.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.tourism.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.main.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.branch.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.utility.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.spur.tunnel">Túnel ferroviário</string>
+	<string name="type.railway.rail.service.tunnel">Túnel ferroviário</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>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index b5855cb329..ce32a9659f 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1335,13 +1335,32 @@
 	<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.rail.highspeed">Calea ferată de mare viteză</string>
+	<string name="type.railway.rail.tourism">Calea ferată turistică</string>
+	<string name="type.railway.rail.main">Calea ferată</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Calea ferată secundară</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Calea ferată utilitară</string>
+	<string name="type.railway.rail.spur">Pinteni de cale ferată</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Calea ferată auxiliară</string>
+	<string name="type.railway.rail.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.highspeed.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.tourism.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.main.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.branch.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.utility.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.spur.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.service.bridge">Podul de cale ferată</string>
+	<string name="type.railway.rail.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.highspeed.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.tourism.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.main.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.branch.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.utility.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.spur.tunnel">Tunel de cale ferată</string>
+	<string name="type.railway.rail.service.tunnel">Tunel de 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 32e3318615..236892c966 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1542,13 +1542,16 @@
 	<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.highspeed">Высокоскоростная железная дорога</string>
+	<string name="type.railway.rail.tourism">Туристическая железная дорога</string>
+	<string name="type.railway.rail.main">Железная дорога</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Второстепенная железная дорога</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Служебная железная дорога</string>
+	<string name="type.railway.rail.spur">Подъездной Ж/Д путь</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Вспомогательный Ж/Д путь</string>
 	<string name="type.railway.rail.bridge">Железнодорожный мост</string>
 	<string name="type.railway.rail.highspeed.bridge">Железнодорожный мост</string>
 	<string name="type.railway.rail.tourism.bridge">Железнодорожный мост</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index f5b46bb3f4..e47379e9ea 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1315,13 +1315,32 @@
 	<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.rail.highspeed">Vysokorýchlostná železnica</string>
+	<string name="type.railway.rail.tourism">Turistická železnica</string>
+	<string name="type.railway.rail.main">Železnice</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Sekundárna železnica</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Úžitková železnica</string>
+	<string name="type.railway.rail.spur">Železničná odbočka</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Pomocná železničná trať</string>
+	<string name="type.railway.rail.bridge">Železničný most</string>
+	<string name="type.railway.rail.highspeed.bridge">Železničný most</string>
+	<string name="type.railway.rail.tourism.bridge">Železničný most</string>
+	<string name="type.railway.rail.main.bridge">Železničný most</string>
+	<string name="type.railway.rail.branch.bridge">Železničný most</string>
+	<string name="type.railway.rail.utility.bridge">Železničný most</string>
+	<string name="type.railway.rail.spur.bridge">Železničný most</string>
+	<string name="type.railway.rail.service.bridge">Železničný most</string>
+	<string name="type.railway.rail.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.tourism.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.main.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.branch.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.utility.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.spur.tunnel">Železničný tunel</string>
+	<string name="type.railway.rail.service.tunnel">Železničný tunel</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 092bae747f..b4ca5b879b 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1315,13 +1315,32 @@
 	<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.highspeed">Järnväg för höghastighetståg</string>
+	<string name="type.railway.rail.tourism">Järnväg för turisttrafik</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Sekundär järnväg</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Järnväg för allmännyttiga ändamål</string>
+	<string name="type.railway.rail.spur">Järnvägsspår</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Extra järnvägsspår</string>
+	<string name="type.railway.rail.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.highspeed.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.tourism.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.main.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.branch.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.utility.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.spur.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.service.bridge">Järnvägsbro</string>
+	<string name="type.railway.rail.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.highspeed.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.tourism.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.main.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.branch.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.utility.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.spur.tunnel">Järnvägstunnel</string>
+	<string name="type.railway.rail.service.tunnel">Järnvägstunnel</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 a8e430bb17..4169e534c3 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -560,13 +560,32 @@
 	<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.rail.highspeed">Reli ya mwendo wa kasi</string>
+	<string name="type.railway.rail.tourism">Reli ya kitalii</string>
+	<string name="type.railway.rail.main">Reli</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Reli ya sekondari</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Utility railway</string>
+	<string name="type.railway.rail.spur">Railway spur</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Njia ya reli ya msaidizi</string>
+	<string name="type.railway.rail.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.highspeed.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.tourism.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.main.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.branch.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.utility.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.spur.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.service.bridge">Daraja la reli</string>
+	<string name="type.railway.rail.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.highspeed.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.tourism.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.main.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.branch.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.utility.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.spur.tunnel">Njia ya reli</string>
+	<string name="type.railway.rail.service.tunnel">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 85ad14c0e8..0d1bf19016 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1322,13 +1322,32 @@
 	<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.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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">รถไฟสายรอง</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">ยูทิลิตี้รถไฟ</string>
+	<string name="type.railway.rail.spur">เดือยรถไฟ</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">รางรถไฟเสริม</string>
+	<string name="type.railway.rail.bridge">สะพานรถไฟ</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-tr/strings.xml b/android/res/values-tr/strings.xml
index 4392a18353..e2490f4656 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1517,29 +1517,32 @@
 	<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.highspeed">Yüksek hızlı demiryolu</string>
+	<string name="type.railway.rail.tourism">Turistik 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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">İkincil demiryolu</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Yardımcı 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.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.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>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Yardımcı ray hattı</string>
+	<string name="type.railway.rail.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.highspeed.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.tourism.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.main.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.branch.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.utility.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.spur.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.service.bridge">Demiryolu köprüsü</string>
+	<string name="type.railway.rail.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.highspeed.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.tourism.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.main.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.branch.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.utility.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.spur.tunnel">Demiryolu tüneli</string>
+	<string name="type.railway.rail.service.tunnel">Demiryolu tüneli</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>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 45c96d6806..2f8195c354 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1504,13 +1504,16 @@
 	<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.highspeed">Швидкісна залізниця</string>
+	<string name="type.railway.rail.tourism">Туристична залізниця</string>
+	<string name="type.railway.rail.main">Залізниця</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Залізнична гілка</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Службова залізниця</string>
 	<string name="type.railway.rail.spur">Під\'їздна залізниця</string>
-	<string name="type.railway.rail.service">Залізнична дорога</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Допоміжна залізнична колія</string>
 	<string name="type.railway.rail.bridge">Залізничний міст</string>
 	<string name="type.railway.rail.highspeed.bridge">Залізничний міст</string>
 	<string name="type.railway.rail.tourism.bridge">Залізничний міст</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 1ebd04cc10..ea1b0c7413 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1318,13 +1318,32 @@
 	<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.highspeed">Đường sắt cao tốc</string>
+	<string name="type.railway.rail.tourism">Đường sắt du lịch</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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Đường sắt phụ</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Đường sắt tiện ích</string>
+	<string name="type.railway.rail.spur">Đường sắt thúc đẩy</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Đường ray phụ trợ</string>
+	<string name="type.railway.rail.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.highspeed.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.tourism.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.main.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.branch.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.utility.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.spur.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.service.bridge">Cầu đường sắt</string>
+	<string name="type.railway.rail.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.highspeed.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.tourism.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.main.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.branch.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.utility.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.spur.tunnel">Đường hầm đường sắt</string>
+	<string name="type.railway.rail.service.tunnel">Đường hầm đườ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 bda291612c..35c6be9798 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1356,21 +1356,24 @@
 	<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.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.highspeed">高鐵</string>
+	<string name="type.railway.rail.tourism">旅遊鐵路</string>
+	<string name="type.railway.rail.main">鐵路</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">二級鐵路</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">公用鐵路</string>
+	<string name="type.railway.rail.spur">鐵路支線</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">輔助鐵軌</string>
+	<string name="type.railway.rail.bridge">鐵路橋</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>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index fb22cc738a..e16add9986 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -1442,13 +1442,16 @@
 	<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.highspeed">高速铁路</string>
+	<string name="type.railway.rail.tourism">观光性铁路</string>
+	<string name="type.railway.rail.main">铁路</string>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">铁路支线</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">公共铁路</string>
+	<string name="type.railway.rail.spur">铁路岔线</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">服务性铁路</string>
 	<string name="type.railway.rail.bridge">铁路轨道</string>
 	<string name="type.railway.rail.highspeed.bridge">铁路轨道</string>
 	<string name="type.railway.rail.tourism.bridge">铁路轨道</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f811e84aa2..060ec5d111 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1581,13 +1581,16 @@
 	<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.highspeed">High-Speed Railway</string>
+	<string name="type.railway.rail.tourism">Touristic 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>
+	<!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
+	<string name="type.railway.rail.branch">Railway Branch</string>
+	<!-- Non-passenger utility tracks: industrial, military, test. -->
+	<string name="type.railway.rail.utility">Utility Railway</string>
+	<string name="type.railway.rail.spur">Railway Spur</string>
+	<!-- Short service tracks: siding, yard, crossover. -->
+	<string name="type.railway.rail.service">Service Rail Track</string>
 	<string name="type.railway.rail.bridge">Railway Bridge</string>
 	<string name="type.railway.rail.highspeed.bridge">Railway Bridge</string>
 	<string name="type.railway.rail.tourism.bridge">Railway Bridge</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index ec58fc7086..65b606fafd 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "خط سكة حديد";
 
-"type.railway.rail.highspeed" = "خط سكة حديد";
+"type.railway.rail.highspeed" = "سكة حديد عالية السرعة";
 
-"type.railway.rail.tourism" = "خط سكة حديد";
+"type.railway.rail.tourism" = "السكك الحديدية السياحية";
 
-"type.railway.rail.main" = "خط سكة حديد";
+"type.railway.rail.main" = "سكة حديدية";
 
-"type.railway.rail.branch" = "خط سكة حديد";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "السكك الحديدية الثانوية";
 
-"type.railway.rail.utility" = "خط سكة حديد";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "سكة حديد المرافق";
 
-"type.railway.rail.spur" = "خط سكة حديد";
+"type.railway.rail.spur" = "سكة حديد سبير";
 
-"type.railway.rail.service" = "خط سكة حديد";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "مسار السكك الحديدية المساعدة";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "جسر للسكك الحديدية";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "نفق السكة الحديد";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "نفق السكة الحديد";
 
 "type.railway.station" = "محطة سكك حديدية";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 267d56b3dd..2c0709a9fe 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Railway";
 
-"type.railway.rail.highspeed" = "Railway";
+"type.railway.rail.highspeed" = "Хуткасная чыгунка";
 
-"type.railway.rail.tourism" = "Railway";
+"type.railway.rail.tourism" = "Турыстычная чыгунка";
 
-"type.railway.rail.main" = "Railway";
+"type.railway.rail.main" = "Чыгуначны";
 
-"type.railway.rail.branch" = "Railway";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Другасная чыгунка";
 
-"type.railway.rail.utility" = "Railway";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Службова чыгунка";
 
-"type.railway.rail.spur" = "Railway";
+"type.railway.rail.spur" = "Чыгуначны шлях";
 
-"type.railway.rail.service" = "Railway";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Дапаможны чыгуначны шлях";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Чыгуначны мост";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Чыгуначны тунэль";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Чыгуначны тунэль";
 
 "type.railway.station" = "Train Station";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 05fb94a9bf..05a6c4a2c9 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Railway";
 
-"type.railway.rail.highspeed" = "Railway";
+"type.railway.rail.highspeed" = "Високоскоростна железница";
 
-"type.railway.rail.tourism" = "Railway";
+"type.railway.rail.tourism" = "Туристическа железница";
 
-"type.railway.rail.main" = "Railway";
+"type.railway.rail.main" = "Железопътна линия";
 
-"type.railway.rail.branch" = "Railway";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Вторична железница";
 
-"type.railway.rail.utility" = "Railway";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Сервизна железница";
 
-"type.railway.rail.spur" = "Railway";
+"type.railway.rail.spur" = "Железопътна отбивка";
 
-"type.railway.rail.service" = "Railway";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Спомагателен релсов път";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Железопътен мост";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Железопътен мост";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Железопътен мост";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Железопътен мост";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Железопътен мост";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Железопътен мост";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Железопътен мост";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Железопътен мост";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Железопътен тунел";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Железопътен тунел";
 
 "type.railway.station" = "Train Station";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index de0918f724..37c5eb826a 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Railway";
 
-"type.railway.rail.highspeed" = "Railway";
+"type.railway.rail.highspeed" = "Ferrocarril d'alta velocitat";
 
-"type.railway.rail.tourism" = "Railway";
+"type.railway.rail.tourism" = "Ferrocarril turístic";
 
-"type.railway.rail.main" = "Railway";
+"type.railway.rail.main" = "Ferrocarril";
 
-"type.railway.rail.branch" = "Railway";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Ferrocarril secundari";
 
-"type.railway.rail.utility" = "Railway";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Ferrocarril d'utilitat";
 
-"type.railway.rail.spur" = "Railway";
+"type.railway.rail.spur" = "Espoló de ferrocarril";
 
-"type.railway.rail.service" = "Railway";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Via ferroviària auxiliar";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Pont del ferrocarril";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Túnel ferroviari";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Túnel ferroviari";
 
 "type.railway.station" = "Train Station";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 6659cc2b83..cc75b3e9ea 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Železnice";
 
-"type.railway.rail.highspeed" = "Železnice";
+"type.railway.rail.highspeed" = "Vysokorychlostní železnice";
 
-"type.railway.rail.tourism" = "Železnice";
+"type.railway.rail.tourism" = "Turistická železnice";
 
 "type.railway.rail.main" = "Železnice";
 
-"type.railway.rail.branch" = "Železnice";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Sekundární železnice";
 
-"type.railway.rail.utility" = "Železnice";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Užitková železnice";
 
-"type.railway.rail.spur" = "Železnice";
+"type.railway.rail.spur" = "Železniční odbočka";
 
-"type.railway.rail.service" = "Železnice";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Pomocná kolejnice";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Železniční most";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Železniční most";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Železniční most";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Železniční most";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Železniční most";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Železniční most";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Železniční most";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Železniční most";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Železniční tunel";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Železniční tunel";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Železniční tunel";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Železniční tunel";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Železniční tunel";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Železniční tunel";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Železniční tunel";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Železniční tunel";
 
 "type.railway.station" = "Železniční stanice";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 294ec2a4e3..0fcb4997e4 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Jernbane";
 
-"type.railway.rail.highspeed" = "Jernbane";
+"type.railway.rail.highspeed" = "Højhastighedsjernbane";
 
-"type.railway.rail.tourism" = "Jernbane";
+"type.railway.rail.tourism" = "Turistisk jernbane";
 
 "type.railway.rail.main" = "Jernbane";
 
-"type.railway.rail.branch" = "Jernbane";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Sekundær jernbane";
 
-"type.railway.rail.utility" = "Jernbane";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Jernbane til forsyningsselskaber";
 
-"type.railway.rail.spur" = "Jernbane";
+"type.railway.rail.spur" = "Jernbanespor";
 
-"type.railway.rail.service" = "Jernbane";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Ekstra jernbanespor";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Jernbanebro";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Jernbanebro";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Jernbanebro";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Jernbanebro";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Jernbanebro";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Jernbanebro";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Jernbanebro";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Jernbanebro";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Jernbanetunnel";
 
 "type.railway.station" = "Togstation";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 6a13cac45e..450a4eea32 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Eisenbahn";
 
-"type.railway.rail.highspeed" = "Eisenbahn";
+"type.railway.rail.highspeed" = "Hochgeschwindigkeits-eisenbahn";
 
-"type.railway.rail.tourism" = "Eisenbahn";
+"type.railway.rail.tourism" = "Touristische eisenbahn";
 
 "type.railway.rail.main" = "Eisenbahn";
 
-"type.railway.rail.branch" = "Eisenbahn";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Sekundärbahn";
 
-"type.railway.rail.utility" = "Eisenbahn";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Versorgungseisenbahn";
 
 "type.railway.rail.spur" = "Anschlussgleis";
 
-"type.railway.rail.service" = "Eisenbahn";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Hilfsbahngleis";
 
 "type.railway.rail.bridge" = "Eisenbahnbrücke";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 5baecef811..c4dea8b4ba 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Σιδηρόδρομος";
 
-"type.railway.rail.highspeed" = "Σιδηρόδρομος";
+"type.railway.rail.highspeed" = "Σιδηρόδρομος υψηλής ταχύτητας";
 
-"type.railway.rail.tourism" = "Σιδηρόδρομος";
+"type.railway.rail.tourism" = "Τουριστικός σιδηρόδρομος";
 
 "type.railway.rail.main" = "Σιδηρόδρομος";
 
-"type.railway.rail.branch" = "Σιδηρόδρομος";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Δευτερεύων σιδηροδρομικός σιδηρόδρομος";
 
-"type.railway.rail.utility" = "Σιδηρόδρομος";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Σιδηρόδρομος κοινής ωφέλειας";
 
-"type.railway.rail.spur" = "Σιδηρόδρομος";
+"type.railway.rail.spur" = "Σιδηροδρομική ατραπός";
 
-"type.railway.rail.service" = "Σιδηρόδρομος";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Βοηθητική σιδηροδρομική γραμμή";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Σιδηροδρομική γέφυρα";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Σιδηροδρομική σήραγγα";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Σιδηροδρομική σήραγγα";
 
 "type.railway.station" = "Σιδηροδρομικός σταθμός";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index db1f5febec..848bf07a89 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Railway";
 
-"type.railway.rail.highspeed" = "Railway";
+"type.railway.rail.highspeed" = "High-Speed Railway";
 
-"type.railway.rail.tourism" = "Railway";
+"type.railway.rail.tourism" = "Touristic Railway";
 
 "type.railway.rail.main" = "Railway";
 
-"type.railway.rail.branch" = "Railway";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Railway Branch";
 
-"type.railway.rail.utility" = "Railway";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Utility Railway";
 
-"type.railway.rail.spur" = "Railway";
+"type.railway.rail.spur" = "Railway Spur";
 
-"type.railway.rail.service" = "Railway";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Service Rail Track";
 
 "type.railway.rail.bridge" = "Railway Bridge";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index d4883b9d8a..f9038bea44 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Railway";
 
-"type.railway.rail.highspeed" = "Railway";
+"type.railway.rail.highspeed" = "High-Speed Railway";
 
-"type.railway.rail.tourism" = "Railway";
+"type.railway.rail.tourism" = "Touristic Railway";
 
 "type.railway.rail.main" = "Railway";
 
-"type.railway.rail.branch" = "Railway";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Railway Branch";
 
-"type.railway.rail.utility" = "Railway";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Utility Railway";
 
-"type.railway.rail.spur" = "Spur Rail";
+"type.railway.rail.spur" = "Railway Spur";
 
-"type.railway.rail.service" = "Railway";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Service Rail Track";
 
 "type.railway.rail.bridge" = "Railway Bridge";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 60f030b4ee..d05119ad8b 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Línea de ferrocarril";
 
-"type.railway.rail.highspeed" = "Línea de ferrocarril";
+"type.railway.rail.highspeed" = "Ferrocarril de alta velocidad";
 
-"type.railway.rail.tourism" = "Línea de ferrocarril";
+"type.railway.rail.tourism" = "Ferrocarril turístico";
 
-"type.railway.rail.main" = "Línea de ferrocarril";
+"type.railway.rail.main" = "Ferrocarril";
 
-"type.railway.rail.branch" = "Línea de ferrocarril";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Ramal ferroviario";
 
-"type.railway.rail.utility" = "Línea de ferrocarril";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Ferrocarril utilitario";
 
-"type.railway.rail.spur" = "Línea de ferrocarril";
+"type.railway.rail.spur" = "Espuela ferroviaria";
 
-"type.railway.rail.service" = "Línea de ferrocarril";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Vía férrea de maniobras";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Puente ferroviario";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Puente ferroviario";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Puente ferroviario";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Puente ferroviario";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Puente ferroviario";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Puente ferroviario";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Puente ferroviario";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Puente ferroviario";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Túnel ferroviario";
 
 "type.railway.station" = "Estación de tren";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 1c8ca2a85d..4ff1878412 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Ferrocarril";
 
-"type.railway.rail.highspeed" = "Ferrocarril";
+"type.railway.rail.highspeed" = "Ferrocarril de alta velocidad";
 
-"type.railway.rail.tourism" = "Ferrocarril";
+"type.railway.rail.tourism" = "Ferrocarril turístico";
 
 "type.railway.rail.main" = "Ferrocarril";
 
-"type.railway.rail.branch" = "Ferrocarril";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Ramal ferroviario";
 
-"type.railway.rail.utility" = "Ferrocarril";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Ferrocarril utilitario";
 
-"type.railway.rail.spur" = "Ferrocarril";
+"type.railway.rail.spur" = "Espolón ferroviario";
 
-"type.railway.rail.service" = "Ferrocarril";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Vía férrea de maniobras";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Puente ferroviario";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Puente ferroviario";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Puente ferroviario";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Puente ferroviario";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Puente ferroviario";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Puente ferroviario";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Puente ferroviario";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Puente ferroviario";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Túnel ferroviario";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Túnel ferroviario";
 
 "type.railway.station" = "Estación de tren";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 50bf05ff1f..5afe83a23a 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Raudtee";
 
-"type.railway.rail.highspeed" = "Raudtee";
+"type.railway.rail.highspeed" = "Kiirraudtee";
 
-"type.railway.rail.tourism" = "Raudtee";
+"type.railway.rail.tourism" = "Turismiraudtee";
 
 "type.railway.rail.main" = "Raudtee";
 
-"type.railway.rail.branch" = "Raudtee";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Teisene raudtee";
 
-"type.railway.rail.utility" = "Raudtee";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Teenindus raudtee";
 
 "type.railway.rail.spur" = "Rööbastee";
 
-"type.railway.rail.service" = "Raudtee";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Lisarööpmel rööbastee";
 
 "type.railway.rail.bridge" = "Raudtee sild";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 09714de4ce..8a3a925235 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Trenbidea";
 
-"type.railway.rail.highspeed" = "Trenbidea";
+"type.railway.rail.highspeed" = "Abiadura handiko trena";
 
-"type.railway.rail.tourism" = "Trenbidea";
+"type.railway.rail.tourism" = "Tren turistikoa";
 
 "type.railway.rail.main" = "Trenbidea";
 
-"type.railway.rail.branch" = "Trenbidea";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Bigarren mailako trenbidea";
 
-"type.railway.rail.utility" = "Trenbidea";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Erabilgarritasun trena";
 
-"type.railway.rail.spur" = "Trenbidea";
+"type.railway.rail.spur" = "Trenbide-spur";
 
-"type.railway.rail.service" = "Trenbidea";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Trenbide laguntzailea";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Trenbide zubia";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Trenbide zubia";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Trenbide zubia";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Trenbide zubia";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Trenbide zubia";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Trenbide zubia";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Trenbide zubia";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Trenbide zubia";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Trenbide-tunela";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Trenbide-tunela";
 
 "type.railway.station" = "Tren geltokian";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 493e60894a..458dd6cffc 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "راه آهن";
 
-"type.railway.rail.highspeed" = "راه آهن";
+"type.railway.rail.highspeed" = "راه آهن پرسرعت";
 
-"type.railway.rail.tourism" = "راه آهن";
+"type.railway.rail.tourism" = "راه آهن توریستی";
 
 "type.railway.rail.main" = "راه آهن";
 
-"type.railway.rail.branch" = "راه آهن";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "راه آهن ثانویه";
 
-"type.railway.rail.utility" = "راه آهن";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "راه آهن شهری";
 
-"type.railway.rail.spur" = "راه آهن";
+"type.railway.rail.spur" = "خار راه آهن";
 
-"type.railway.rail.service" = "راه آهن";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "ریل کمکی";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "پل راه آهن";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "پل راه آهن";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "پل راه آهن";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "پل راه آهن";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "پل راه آهن";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "پل راه آهن";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "پل راه آهن";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "پل راه آهن";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "تونل راه آهن";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "تونل راه آهن";
 
 "type.railway.station" = "ایستگاه قطار";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index db9575ed50..cc51f4e4c5 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Rautatie";
 
-"type.railway.rail.highspeed" = "Rautatie";
+"type.railway.rail.highspeed" = "Suurnopeusrautatie";
 
-"type.railway.rail.tourism" = "Rautatie";
+"type.railway.rail.tourism" = "Turistinen rautatie";
 
 "type.railway.rail.main" = "Rautatie";
 
-"type.railway.rail.branch" = "Rautatie";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Toissijainen rautatie";
 
-"type.railway.rail.utility" = "Rautatie";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Rautatieliikenne";
 
-"type.railway.rail.spur" = "Rautatie";
+"type.railway.rail.spur" = "Rautatien varsi";
 
-"type.railway.rail.service" = "Rautatie";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Apukiskorata";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Rautatiesilta";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Rautatiesilta";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Rautatiesilta";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Rautatiesilta";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Rautatiesilta";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Rautatiesilta";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Rautatiesilta";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Rautatiesilta";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Rautatietunneli";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Rautatietunneli";
 
 "type.railway.station" = "Rautatieasema";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index d756d47557..4183e4fb69 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Chemin de fer";
 
-"type.railway.rail.highspeed" = "Chemin de fer";
+"type.railway.rail.highspeed" = "Chemin de fer à grande vitesse";
 
-"type.railway.rail.tourism" = "Chemin de fer";
+"type.railway.rail.tourism" = "Ligne touristique";
 
 "type.railway.rail.main" = "Chemin de fer";
 
-"type.railway.rail.branch" = "Chemin de fer";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Chemin de fer secondaire";
 
-"type.railway.rail.utility" = "Chemin de fer";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Train de fret";
 
-"type.railway.rail.spur" = "Chemin de fer";
+"type.railway.rail.spur" = "Embranchement ferroviaire";
 
-"type.railway.rail.service" = "Chemin de fer";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Service ferroviaire";
 
-"type.railway.rail.bridge" = "Chemin de fer";
+"type.railway.rail.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.highspeed.bridge" = "Chemin de fer";
+"type.railway.rail.highspeed.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.tourism.bridge" = "Chemin de fer";
+"type.railway.rail.tourism.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.main.bridge" = "Chemin de fer";
+"type.railway.rail.main.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.branch.bridge" = "Chemin de fer";
+"type.railway.rail.branch.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.utility.bridge" = "Chemin de fer";
+"type.railway.rail.utility.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.spur.bridge" = "Chemin de fer";
+"type.railway.rail.spur.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.service.bridge" = "Chemin de fer";
+"type.railway.rail.service.bridge" = "Pont ferroviaire";
 
-"type.railway.rail.tunnel" = "Chemin de fer";
+"type.railway.rail.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.highspeed.tunnel" = "Chemin de fer";
+"type.railway.rail.highspeed.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.tourism.tunnel" = "Chemin de fer";
+"type.railway.rail.tourism.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.main.tunnel" = "Chemin de fer";
+"type.railway.rail.main.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.branch.tunnel" = "Chemin de fer";
+"type.railway.rail.branch.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.utility.tunnel" = "Chemin de fer";
+"type.railway.rail.utility.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.spur.tunnel" = "Chemin de fer";
+"type.railway.rail.spur.tunnel" = "Tunnel ferroviaire";
 
-"type.railway.rail.service.tunnel" = "Chemin de fer";
+"type.railway.rail.service.tunnel" = "Tunnel ferroviaire";
 
 "type.railway.station" = "Gare ferroviaire";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 234104e7dd..488b557963 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Railway";
 
-"type.railway.rail.highspeed" = "Railway";
+"type.railway.rail.highspeed" = "רכבת מהירה";
 
-"type.railway.rail.tourism" = "Railway";
+"type.railway.rail.tourism" = "רכבת תיירות";
 
-"type.railway.rail.main" = "Railway";
+"type.railway.rail.main" = "מסילת רכבת";
 
-"type.railway.rail.branch" = "Railway";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "רכבת משנית";
 
-"type.railway.rail.utility" = "Railway";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "רכבת שירות";
 
-"type.railway.rail.spur" = "Railway";
+"type.railway.rail.spur" = "ספר רכבת";
 
-"type.railway.rail.service" = "Railway";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "מסילת רכבת עזר";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "גשר הרכבת";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "גשר הרכבת";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "גשר הרכבת";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "גשר הרכבת";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "גשר הרכבת";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "גשר הרכבת";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "גשר הרכבת";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "גשר הרכבת";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "מנהרת הרכבת";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "מנהרת הרכבת";
 
 "type.railway.station" = "Train Station";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index b242971d41..897966d3b3 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Vasút";
 
-"type.railway.rail.highspeed" = "Vasút";
+"type.railway.rail.highspeed" = "Nagysebességű vasút";
 
-"type.railway.rail.tourism" = "Vasút";
+"type.railway.rail.tourism" = "Turisztikai vasút";
 
 "type.railway.rail.main" = "Vasút";
 
-"type.railway.rail.branch" = "Vasút";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Másodlagos vasút";
 
-"type.railway.rail.utility" = "Vasút";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Közüzemi vasút";
 
-"type.railway.rail.spur" = "Vasút";
+"type.railway.rail.spur" = "Vasúti nyomvonal";
 
-"type.railway.rail.service" = "Vasút";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Kiegészítő sínpálya";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Vasúti híd";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Vasúti híd";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Vasúti híd";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Vasúti híd";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Vasúti híd";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Vasúti híd";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Vasúti híd";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Vasúti híd";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Vasúti alagút";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Vasúti alagút";
 
 "type.railway.station" = "Vonatmegálló";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index c61f73f59d..1a2d04e277 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Kereta api";
 
-"type.railway.rail.highspeed" = "Kereta api";
+"type.railway.rail.highspeed" = "Kereta api berkecepatan tinggi";
 
-"type.railway.rail.tourism" = "Kereta api";
+"type.railway.rail.tourism" = "Kereta api wisata";
 
 "type.railway.rail.main" = "Kereta api";
 
-"type.railway.rail.branch" = "Kereta api";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Kereta api sekunder";
 
-"type.railway.rail.utility" = "Kereta api";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Kereta api utilitas";
 
-"type.railway.rail.spur" = "Kereta api";
+"type.railway.rail.spur" = "Pacu kereta api";
 
-"type.railway.rail.service" = "Kereta api";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Jalur rel bantu";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Jembatan kereta api";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Terowongan kereta api";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Terowongan kereta api";
 
 "type.railway.station" = "Rel kereta api";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 427a8b6a1d..6e2761d7b5 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Binari";
 
-"type.railway.rail.highspeed" = "Binari";
+"type.railway.rail.highspeed" = "Ferrovia ad alta velocità";
 
-"type.railway.rail.tourism" = "Binari";
+"type.railway.rail.tourism" = "Ferrovia turistica";
 
-"type.railway.rail.main" = "Binari";
+"type.railway.rail.main" = "Ferrovia";
 
-"type.railway.rail.branch" = "Binari";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Ferrovia secondaria";
 
-"type.railway.rail.utility" = "Binari";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Ferrovia di utilità";
 
-"type.railway.rail.spur" = "Binari";
+"type.railway.rail.spur" = "Sperone ferroviario";
 
-"type.railway.rail.service" = "Binari";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Binario ausiliario";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Ponte ferroviario";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Tunnel ferroviario";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Tunnel ferroviario";
 
 "type.railway.station" = "Stazione ferroviaria";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index ceb1e440d3..5853c80c00 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "鉄道";
 
-"type.railway.rail.highspeed" = "鉄道";
+"type.railway.rail.highspeed" = "高速鉄道";
 
-"type.railway.rail.tourism" = "鉄道";
+"type.railway.rail.tourism" = "観光鉄道";
 
 "type.railway.rail.main" = "鉄道";
 
-"type.railway.rail.branch" = "鉄道";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "二次鉄道";
 
-"type.railway.rail.utility" = "鉄道";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "実用鉄道";
 
 "type.railway.rail.spur" = "引き込み線";
 
-"type.railway.rail.service" = "鉄道";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "補助線路";
 
 "type.railway.rail.bridge" = "鉄道(橋)";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 79913c0e29..5ff085fe7c 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "철로";
 
-"type.railway.rail.highspeed" = "철로";
+"type.railway.rail.highspeed" = "고속 철도";
 
-"type.railway.rail.tourism" = "철로";
+"type.railway.rail.tourism" = "관광 철도";
 
-"type.railway.rail.main" = "철로";
+"type.railway.rail.main" = "철도";
 
-"type.railway.rail.branch" = "철로";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "보조 철도";
 
-"type.railway.rail.utility" = "철로";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "유틸리티 철도";
 
-"type.railway.rail.spur" = "철로";
+"type.railway.rail.spur" = "철도 박차";
 
-"type.railway.rail.service" = "철로";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "보조 레일 트랙";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "철도 교량";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "철도 교량";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "철도 교량";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "철도 교량";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "철도 교량";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "철도 교량";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "철도 교량";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "철도 교량";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "철도 터널";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "철도 터널";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "철도 터널";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "철도 터널";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "철도 터널";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "철도 터널";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "철도 터널";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "철도 터널";
 
 "type.railway.station" = "기차역";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index b402711aed..5fe60adf17 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "रेल्वे";
 
-"type.railway.rail.highspeed" = "रेल्वे";
+"type.railway.rail.highspeed" = "हाय-स्पीड रेल्वे";
 
-"type.railway.rail.tourism" = "रेल्वे";
+"type.railway.rail.tourism" = "पर्यटन रेल्वे";
 
 "type.railway.rail.main" = "रेल्वे";
 
-"type.railway.rail.branch" = "रेल्वे";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "दुय्यम रेल्वे";
 
-"type.railway.rail.utility" = "रेल्वे";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "उपयुक्तता रेल्वे";
 
-"type.railway.rail.spur" = "रेल्वे";
+"type.railway.rail.spur" = "रेल्वे स्पर";
 
-"type.railway.rail.service" = "रेल्वे";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "सहायक रेल्वे ट्रॅक";
 
 "type.railway.rail.bridge" = "रेल्वे";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 56ff9fdf50..b1b3bf4890 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Toglinje";
 
-"type.railway.rail.highspeed" = "Toglinje";
+"type.railway.rail.highspeed" = "Høyhastighetsjernbane";
 
-"type.railway.rail.tourism" = "Toglinje";
+"type.railway.rail.tourism" = "Turistjernbane";
 
-"type.railway.rail.main" = "Toglinje";
+"type.railway.rail.main" = "Jernbane";
 
-"type.railway.rail.branch" = "Toglinje";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Sekundær jernbane";
 
-"type.railway.rail.utility" = "Toglinje";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Service jernbane";
 
-"type.railway.rail.spur" = "Toglinje";
+"type.railway.rail.spur" = "Jernbanespor";
 
-"type.railway.rail.service" = "Toglinje";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Ekstra jernbanespor";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Jernbanebro";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Jernbanebro";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Jernbanebro";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Jernbanebro";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Jernbanebro";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Jernbanebro";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Jernbanebro";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Jernbanebro";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Jernbanetunnel";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Jernbanetunnel";
 
 "type.railway.station" = "Togstasjon";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index dc13a73454..58da59d50d 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Spoorlijn";
 
-"type.railway.rail.highspeed" = "Spoorlijn";
+"type.railway.rail.highspeed" = "Hogesnelheidstrein";
 
-"type.railway.rail.tourism" = "Spoorlijn";
+"type.railway.rail.tourism" = "Toeristische spoorlijn";
 
-"type.railway.rail.main" = "Spoorlijn";
+"type.railway.rail.main" = "Spoor";
 
-"type.railway.rail.branch" = "Spoorlijn";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Secundaire spoorwegen";
 
-"type.railway.rail.utility" = "Spoorlijn";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Spoorwegen";
 
 "type.railway.rail.spur" = "Zijspoor";
 
-"type.railway.rail.service" = "Spoorlijn";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Hulpspoor";
 
 "type.railway.rail.bridge" = "Treinspoorbrug";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index ffade01979..3e6f4c319a 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Kolej";
 
-"type.railway.rail.highspeed" = "Kolej";
+"type.railway.rail.highspeed" = "Kolej dużych prędkości";
 
-"type.railway.rail.tourism" = "Kolej";
+"type.railway.rail.tourism" = "Kolej turystyczna";
 
 "type.railway.rail.main" = "Kolej";
 
-"type.railway.rail.branch" = "Kolej";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Kolej drugorzędna";
 
-"type.railway.rail.utility" = "Kolej";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Kolej użytkowa";
 
-"type.railway.rail.spur" = "Kolej";
+"type.railway.rail.spur" = "Ostroga kolejowa";
 
-"type.railway.rail.service" = "Kolej";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Pomocniczy tor kolejowy";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Most kolejowy";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Most kolejowy";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Most kolejowy";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Most kolejowy";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Most kolejowy";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Most kolejowy";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Most kolejowy";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Most kolejowy";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Tunel kolejowy";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Tunel kolejowy";
 
 "type.railway.station" = "Dworzec kolejowy";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 75bc8bbe28..b140757901 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Ferrovia";
 
-"type.railway.rail.highspeed" = "Ferrovia";
+"type.railway.rail.highspeed" = "Ferrovia de alta velocidade";
 
-"type.railway.rail.tourism" = "Ferrovia";
+"type.railway.rail.tourism" = "Ferrovia turística";
 
 "type.railway.rail.main" = "Ferrovia";
 
-"type.railway.rail.branch" = "Ferrovia";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Ramal ferroviário";
 
-"type.railway.rail.utility" = "Ferrovia";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Ferrovia de serviços";
 
-"type.railway.rail.spur" = "Ramal de ferrovia";
+"type.railway.rail.spur" = "Ramal de inserção";
 
-"type.railway.rail.service" = "Ferrovia";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Linha de serviço";
 
-"type.railway.rail.bridge" = "Ferrovia";
+"type.railway.rail.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.highspeed.bridge" = "Ferrovia";
+"type.railway.rail.highspeed.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.tourism.bridge" = "Ferrovia";
+"type.railway.rail.tourism.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.main.bridge" = "Ferrovia";
+"type.railway.rail.main.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.branch.bridge" = "Ferrovia";
+"type.railway.rail.branch.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.utility.bridge" = "Ferrovia";
+"type.railway.rail.utility.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.spur.bridge" = "Ferrovia";
+"type.railway.rail.spur.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.service.bridge" = "Ferrovia";
+"type.railway.rail.service.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.tunnel" = "Ferrovia";
+"type.railway.rail.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.highspeed.tunnel" = "Ferrovia";
+"type.railway.rail.highspeed.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.tourism.tunnel" = "Ferrovia";
+"type.railway.rail.tourism.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.main.tunnel" = "Ferrovia";
+"type.railway.rail.main.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.branch.tunnel" = "Ferrovia";
+"type.railway.rail.branch.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.utility.tunnel" = "Ferrovia";
+"type.railway.rail.utility.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.spur.tunnel" = "Ferrovia";
+"type.railway.rail.spur.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.service.tunnel" = "Ferrovia";
+"type.railway.rail.service.tunnel" = "Túnel ferroviário";
 
 "type.railway.station" = "Estação de trem";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 8238cf0ce3..14786de0f4 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Ferrovia";
 
-"type.railway.rail.highspeed" = "Ferrovia";
+"type.railway.rail.highspeed" = "Ferrovia de alta velocidade";
 
-"type.railway.rail.tourism" = "Ferrovia";
+"type.railway.rail.tourism" = "Ferrovia turística";
 
 "type.railway.rail.main" = "Ferrovia";
 
-"type.railway.rail.branch" = "Ferrovia";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Ramal ferroviário";
 
-"type.railway.rail.utility" = "Ferrovia";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Ferrovia de serviços";
 
-"type.railway.rail.spur" = "Ramal de ferrovia";
+"type.railway.rail.spur" = "Ramal de inserção";
 
-"type.railway.rail.service" = "Ferrovia";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Linha de serviço";
 
-"type.railway.rail.bridge" = "Ferrovia";
+"type.railway.rail.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.highspeed.bridge" = "Ferrovia";
+"type.railway.rail.highspeed.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.tourism.bridge" = "Ferrovia";
+"type.railway.rail.tourism.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.main.bridge" = "Ferrovia";
+"type.railway.rail.main.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.branch.bridge" = "Ferrovia";
+"type.railway.rail.branch.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.utility.bridge" = "Ferrovia";
+"type.railway.rail.utility.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.spur.bridge" = "Ferrovia";
+"type.railway.rail.spur.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.service.bridge" = "Ferrovia";
+"type.railway.rail.service.bridge" = "Ponte ferroviária";
 
-"type.railway.rail.tunnel" = "Ferrovia";
+"type.railway.rail.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.highspeed.tunnel" = "Ferrovia";
+"type.railway.rail.highspeed.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.tourism.tunnel" = "Ferrovia";
+"type.railway.rail.tourism.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.main.tunnel" = "Ferrovia";
+"type.railway.rail.main.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.branch.tunnel" = "Ferrovia";
+"type.railway.rail.branch.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.utility.tunnel" = "Ferrovia";
+"type.railway.rail.utility.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.spur.tunnel" = "Ferrovia";
+"type.railway.rail.spur.tunnel" = "Túnel ferroviário";
 
-"type.railway.rail.service.tunnel" = "Ferrovia";
+"type.railway.rail.service.tunnel" = "Túnel ferroviário";
 
 "type.railway.station" = "Estação de comboios";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 7d31c02970..9010db6256 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Cale ferată";
 
-"type.railway.rail.highspeed" = "Cale ferată";
+"type.railway.rail.highspeed" = "Calea ferată de mare viteză";
 
-"type.railway.rail.tourism" = "Cale ferată";
+"type.railway.rail.tourism" = "Calea ferată turistică";
 
-"type.railway.rail.main" = "Cale ferată";
+"type.railway.rail.main" = "Calea ferată";
 
-"type.railway.rail.branch" = "Cale ferată";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Calea ferată secundară";
 
-"type.railway.rail.utility" = "Cale ferată";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Calea ferată utilitară";
 
-"type.railway.rail.spur" = "Cale ferată";
+"type.railway.rail.spur" = "Pinteni de cale ferată";
 
-"type.railway.rail.service" = "Cale ferată";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Calea ferată auxiliară";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Podul de cale ferată";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Tunel de cale ferată";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Tunel de cale ferată";
 
 "type.railway.station" = "Feroviar";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index b059403759..9f26d2e267 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Железнодорожный путь";
 
-"type.railway.rail.highspeed" = "Железнодорожный путь";
+"type.railway.rail.highspeed" = "Высокоскоростная железная дорога";
 
-"type.railway.rail.tourism" = "Железнодорожный путь";
+"type.railway.rail.tourism" = "Туристическая железная дорога";
 
-"type.railway.rail.main" = "Железнодорожный путь";
+"type.railway.rail.main" = "Железная дорога";
 
-"type.railway.rail.branch" = "Железнодорожный путь";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Второстепенная железная дорога";
 
-"type.railway.rail.utility" = "Железнодорожный путь";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Служебная железная дорога";
 
-"type.railway.rail.spur" = "Подъездная Ж/Д";
+"type.railway.rail.spur" = "Подъездной Ж/Д путь";
 
-"type.railway.rail.service" = "Железнодорожный путь";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Вспомогательный Ж/Д путь";
 
 "type.railway.rail.bridge" = "Железнодорожный мост";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 32a03bee8e..80675e46bc 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Železnica";
 
-"type.railway.rail.highspeed" = "Železnica";
+"type.railway.rail.highspeed" = "Vysokorýchlostná železnica";
 
-"type.railway.rail.tourism" = "Železnica";
+"type.railway.rail.tourism" = "Turistická železnica";
 
-"type.railway.rail.main" = "Železnica";
+"type.railway.rail.main" = "Železnice";
 
-"type.railway.rail.branch" = "Železnica";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Sekundárna železnica";
 
-"type.railway.rail.utility" = "Železnica";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Úžitková železnica";
 
-"type.railway.rail.spur" = "Železnica";
+"type.railway.rail.spur" = "Železničná odbočka";
 
-"type.railway.rail.service" = "Železnica";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Pomocná železničná trať";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Železničný most";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Železničný most";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Železničný most";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Železničný most";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Železničný most";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Železničný most";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Železničný most";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Železničný most";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Železničný tunel";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Železničný tunel";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Železničný tunel";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Železničný tunel";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Železničný tunel";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Železničný tunel";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Železničný tunel";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Železničný tunel";
 
 "type.railway.station" = "Železničná stanica";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index e167ad4593..06aa354482 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Järnväg";
 
-"type.railway.rail.highspeed" = "Järnväg";
+"type.railway.rail.highspeed" = "Järnväg för höghastighetståg";
 
-"type.railway.rail.tourism" = "Järnväg";
+"type.railway.rail.tourism" = "Järnväg för turisttrafik";
 
 "type.railway.rail.main" = "Järnväg";
 
-"type.railway.rail.branch" = "Järnväg";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Sekundär järnväg";
 
-"type.railway.rail.utility" = "Järnväg";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Järnväg för allmännyttiga ändamål";
 
-"type.railway.rail.spur" = "Järnväg";
+"type.railway.rail.spur" = "Järnvägsspår";
 
-"type.railway.rail.service" = "Järnväg";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Extra järnvägsspår";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Järnvägsbro";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Järnvägsbro";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Järnvägsbro";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Järnvägsbro";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Järnvägsbro";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Järnvägsbro";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Järnvägsbro";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Järnvägsbro";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Järnvägstunnel";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Järnvägstunnel";
 
 "type.railway.station" = "Tågstation";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 3e9aa1ca69..6432eca8ac 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Njia ya Reli";
 
-"type.railway.rail.highspeed" = "Njia ya Reli";
+"type.railway.rail.highspeed" = "Reli ya mwendo wa kasi";
 
-"type.railway.rail.tourism" = "Njia ya Reli";
+"type.railway.rail.tourism" = "Reli ya kitalii";
 
-"type.railway.rail.main" = "Njia ya Reli";
+"type.railway.rail.main" = "Reli";
 
-"type.railway.rail.branch" = "Njia ya Reli";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Reli ya sekondari";
 
-"type.railway.rail.utility" = "Njia ya Reli";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Utility railway";
 
-"type.railway.rail.spur" = "Njia ya Reli";
+"type.railway.rail.spur" = "Railway spur";
 
-"type.railway.rail.service" = "Njia ya Reli";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Njia ya reli ya msaidizi";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Daraja la reli";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Daraja la reli";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Daraja la reli";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Daraja la reli";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Daraja la reli";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Daraja la reli";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Daraja la reli";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Daraja la reli";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Njia ya reli";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Njia ya reli";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Njia ya reli";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Njia ya reli";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Njia ya reli";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Njia ya reli";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Njia ya reli";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Njia ya reli";
 
 "type.railway.station" = "Train Station";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index b03dd30013..b8dd936562 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "รถไฟ";
 
-"type.railway.rail.highspeed" = "รถไฟ";
+"type.railway.rail.highspeed" = "รถไฟความเร็วสูง";
 
-"type.railway.rail.tourism" = "รถไฟ";
+"type.railway.rail.tourism" = "รถไฟท่องเที่ยว";
 
 "type.railway.rail.main" = "รถไฟ";
 
-"type.railway.rail.branch" = "รถไฟ";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "รถไฟสายรอง";
 
-"type.railway.rail.utility" = "รถไฟ";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "ยูทิลิตี้รถไฟ";
 
-"type.railway.rail.spur" = "รถไฟ";
+"type.railway.rail.spur" = "เดือยรถไฟ";
 
-"type.railway.rail.service" = "รถไฟ";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "รางรถไฟเสริม";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "สะพานรถไฟ";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "อุโมงค์รถไฟ";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "อุโมงค์รถไฟ";
 
 "type.railway.station" = "สถานีรถไฟ";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index c24c9c795f..c0b1336b97 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Demiryolu";
 
-"type.railway.rail.highspeed" = "Demiryolu";
+"type.railway.rail.highspeed" = "Yüksek hızlı demiryolu";
 
-"type.railway.rail.tourism" = "Demiryolu";
+"type.railway.rail.tourism" = "Turistik demiryolu";
 
 "type.railway.rail.main" = "Demiryolu";
 
-"type.railway.rail.branch" = "Demiryolu";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "İkincil demiryolu";
 
-"type.railway.rail.utility" = "Demiryolu";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Yardımcı demiryolu";
 
 "type.railway.rail.spur" = "Düz Ray";
 
-"type.railway.rail.service" = "Demiryolu";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Yardımcı ray hattı";
 
-"type.railway.rail.bridge" = "Demiryolu";
+"type.railway.rail.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.highspeed.bridge" = "Demiryolu";
+"type.railway.rail.highspeed.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.tourism.bridge" = "Demiryolu";
+"type.railway.rail.tourism.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.main.bridge" = "Demiryolu";
+"type.railway.rail.main.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.branch.bridge" = "Demiryolu";
+"type.railway.rail.branch.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.utility.bridge" = "Demiryolu";
+"type.railway.rail.utility.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.spur.bridge" = "Demiryolu";
+"type.railway.rail.spur.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.service.bridge" = "Demiryolu";
+"type.railway.rail.service.bridge" = "Demiryolu köprüsü";
 
-"type.railway.rail.tunnel" = "Demiryolu";
+"type.railway.rail.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.highspeed.tunnel" = "Demiryolu";
+"type.railway.rail.highspeed.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.tourism.tunnel" = "Demiryolu";
+"type.railway.rail.tourism.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.main.tunnel" = "Demiryolu";
+"type.railway.rail.main.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.branch.tunnel" = "Demiryolu";
+"type.railway.rail.branch.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.utility.tunnel" = "Demiryolu";
+"type.railway.rail.utility.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.spur.tunnel" = "Demiryolu";
+"type.railway.rail.spur.tunnel" = "Demiryolu tüneli";
 
-"type.railway.rail.service.tunnel" = "Demiryolu";
+"type.railway.rail.service.tunnel" = "Demiryolu tüneli";
 
 "type.railway.station" = "Tren İstasyonu";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 746cdf4509..0b61a1c673 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "Залізнична дорога";
 
-"type.railway.rail.highspeed" = "Залізнична дорога";
+"type.railway.rail.highspeed" = "Швидкісна залізниця";
 
-"type.railway.rail.tourism" = "Залізнична дорога";
+"type.railway.rail.tourism" = "Туристична залізниця";
 
-"type.railway.rail.main" = "Залізнична дорога";
+"type.railway.rail.main" = "Залізниця";
 
-"type.railway.rail.branch" = "Залізнична дорога";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Залізнична гілка";
 
-"type.railway.rail.utility" = "Залізнична дорога";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Службова залізниця";
 
 "type.railway.rail.spur" = "Під'їздна залізниця";
 
-"type.railway.rail.service" = "Залізнична дорога";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Допоміжна залізнична колія";
 
 "type.railway.rail.bridge" = "Залізничний міст";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index c93a4728b6..1edda922b5 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -2804,51 +2804,54 @@
 
 "type.railway.rail" = "Đường sắt";
 
-"type.railway.rail.highspeed" = "Đường sắt";
+"type.railway.rail.highspeed" = "Đường sắt cao tốc";
 
-"type.railway.rail.tourism" = "Đường sắt";
+"type.railway.rail.tourism" = "Đường sắt du lịch";
 
 "type.railway.rail.main" = "Đường sắt";
 
-"type.railway.rail.branch" = "Đường sắt";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "Đường sắt phụ";
 
-"type.railway.rail.utility" = "Đường sắt";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "Đường sắt tiện ích";
 
-"type.railway.rail.spur" = "Đường sắt";
+"type.railway.rail.spur" = "Đường sắt thúc đẩy";
 
-"type.railway.rail.service" = "Đường sắt";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "Đường ray phụ trợ";
 
-"type.railway.rail.bridge" = "Railway Bridge";
+"type.railway.rail.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.highspeed.bridge" = "Railway Bridge";
+"type.railway.rail.highspeed.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.tourism.bridge" = "Railway Bridge";
+"type.railway.rail.tourism.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.main.bridge" = "Railway Bridge";
+"type.railway.rail.main.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.branch.bridge" = "Railway Bridge";
+"type.railway.rail.branch.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.utility.bridge" = "Railway Bridge";
+"type.railway.rail.utility.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.spur.bridge" = "Railway Bridge";
+"type.railway.rail.spur.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.service.bridge" = "Railway Bridge";
+"type.railway.rail.service.bridge" = "Cầu đường sắt";
 
-"type.railway.rail.tunnel" = "Railway Tunnel";
+"type.railway.rail.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.highspeed.tunnel" = "Railway Tunnel";
+"type.railway.rail.highspeed.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.tourism.tunnel" = "Railway Tunnel";
+"type.railway.rail.tourism.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.main.tunnel" = "Railway Tunnel";
+"type.railway.rail.main.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.branch.tunnel" = "Railway Tunnel";
+"type.railway.rail.branch.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.utility.tunnel" = "Railway Tunnel";
+"type.railway.rail.utility.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.spur.tunnel" = "Railway Tunnel";
+"type.railway.rail.spur.tunnel" = "Đường hầm đường sắt";
 
-"type.railway.rail.service.tunnel" = "Railway Tunnel";
+"type.railway.rail.service.tunnel" = "Đường hầm đường sắt";
 
 "type.railway.station" = "Đường tàu hỏa";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index d00f56b4f0..fb9bfd4308 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -2804,19 +2804,22 @@
 
 "type.railway.rail" = "铁路轨道";
 
-"type.railway.rail.highspeed" = "铁路轨道";
+"type.railway.rail.highspeed" = "高速铁路";
 
-"type.railway.rail.tourism" = "铁路轨道";
+"type.railway.rail.tourism" = "观光性铁路";
 
-"type.railway.rail.main" = "铁路轨道";
+"type.railway.rail.main" = "铁路";
 
-"type.railway.rail.branch" = "铁路轨道";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "铁路支线";
 
-"type.railway.rail.utility" = "铁路轨道";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "公共铁路";
 
-"type.railway.rail.spur" = "铁路轨道";
+"type.railway.rail.spur" = "铁路岔线";
 
-"type.railway.rail.service" = "铁路轨道";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "服务性铁路";
 
 "type.railway.rail.bridge" = "铁路轨道";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 23a0261172..c784de7cd1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -2804,35 +2804,38 @@
 
 "type.railway.rail" = "鐵路軌道";
 
-"type.railway.rail.highspeed" = "鐵路軌道";
+"type.railway.rail.highspeed" = "高鐵";
 
-"type.railway.rail.tourism" = "鐵路軌道";
+"type.railway.rail.tourism" = "旅遊鐵路";
 
-"type.railway.rail.main" = "鐵路軌道";
+"type.railway.rail.main" = "鐵路";
 
-"type.railway.rail.branch" = "鐵路軌道";
+/* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
+"type.railway.rail.branch" = "二級鐵路";
 
-"type.railway.rail.utility" = "鐵路軌道";
+/* Non-passenger utility tracks: industrial, military, test. */
+"type.railway.rail.utility" = "公用鐵路";
 
-"type.railway.rail.spur" = "鐵路軌道";
+"type.railway.rail.spur" = "鐵路支線";
 
-"type.railway.rail.service" = "鐵路軌道";
+/* Short service tracks: siding, yard, crossover. */
+"type.railway.rail.service" = "輔助鐵軌";
 
-"type.railway.rail.bridge" = "鐵路軌道";
+"type.railway.rail.bridge" = "鐵路橋";
 
-"type.railway.rail.highspeed.bridge" = "鐵路軌道";
+"type.railway.rail.highspeed.bridge" = "鐵路橋";
 
-"type.railway.rail.tourism.bridge" = "鐵路軌道";
+"type.railway.rail.tourism.bridge" = "鐵路橋";
 
-"type.railway.rail.main.bridge" = "鐵路軌道";
+"type.railway.rail.main.bridge" = "鐵路橋";
 
-"type.railway.rail.branch.bridge" = "鐵路軌道";
+"type.railway.rail.branch.bridge" = "鐵路橋";
 
-"type.railway.rail.utility.bridge" = "鐵路軌道";
+"type.railway.rail.utility.bridge" = "鐵路橋";
 
-"type.railway.rail.spur.bridge" = "鐵路軌道";
+"type.railway.rail.spur.bridge" = "鐵路橋";
 
-"type.railway.rail.service.bridge" = "鐵路軌道";
+"type.railway.rail.service.bridge" = "鐵路橋";
 
 "type.railway.rail.tunnel" = "鐵路軌道";