diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index b5f640094f..af860f460a 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1314,29 +1314,225 @@
 	<string name="type.railway.station.light_rail">محطة سكك حديدية</string>
 	<string name="type.railway.station.monorail">محطة سكك حديدية</string>
 	<string name="type.railway.station.subway">محطة مترو</string>
+	<string name="type.railway.station.subway.adana">محطة مترو</string>
+	<string name="type.railway.station.subway.algiers">محطة مترو</string>
+	<string name="type.railway.station.subway.almaty">محطة مترو</string>
+	<string name="type.railway.station.subway.amsterdam">محطة مترو</string>
+	<string name="type.railway.station.subway.ankara">محطة مترو</string>
+	<string name="type.railway.station.subway.athens">محطة مترو</string>
+	<string name="type.railway.station.subway.baku">محطة مترو</string>
+	<string name="type.railway.station.subway.bangkok">محطة مترو</string>
 	<string name="type.railway.station.subway.barcelona">محطة مترو</string>
+	<string name="type.railway.station.subway.beijing">محطة مترو</string>
+	<string name="type.railway.station.subway.bengalore">محطة مترو</string>
 	<string name="type.railway.station.subway.berlin">محطة مترو</string>
+	<string name="type.railway.station.subway.brasilia">محطة مترو</string>
+	<string name="type.railway.station.subway.brescia">محطة مترو</string>
+	<string name="type.railway.station.subway.brussels">محطة مترو</string>
+	<string name="type.railway.station.subway.bucharest">محطة مترو</string>
+	<string name="type.railway.station.subway.budapest">محطة مترو</string>
+	<string name="type.railway.station.subway.buenos_aires">محطة مترو</string>
+	<string name="type.railway.station.subway.bursa">محطة مترو</string>
+	<string name="type.railway.station.subway.cairo">محطة مترو</string>
+	<string name="type.railway.station.subway.caracas">محطة مترو</string>
+	<string name="type.railway.station.subway.catania">محطة مترو</string>
+	<string name="type.railway.station.subway.changchun">محطة مترو</string>
+	<string name="type.railway.station.subway.chengdu">محطة مترو</string>
+	<string name="type.railway.station.subway.chicago">محطة مترو</string>
+	<string name="type.railway.station.subway.chongqing">محطة مترو</string>
+	<string name="type.railway.station.subway.dalian">محطة مترو</string>
+	<string name="type.railway.station.subway.delhi">محطة مترو</string>
+	<string name="type.railway.station.subway.dnepro">محطة مترو</string>
+	<string name="type.railway.station.subway.dubai">محطة مترو</string>
+	<string name="type.railway.station.subway.ekb">محطة مترو</string>
+	<string name="type.railway.station.subway.fukuoka">محطة مترو</string>
+	<string name="type.railway.station.subway.glasgow">محطة مترو</string>
+	<string name="type.railway.station.subway.guangzhou">محطة مترو</string>
+	<string name="type.railway.station.subway.hamburg">محطة مترو</string>
+	<string name="type.railway.station.subway.helsinki">محطة مترو</string>
+	<string name="type.railway.station.subway.hiroshima">محطة مترو</string>
+	<string name="type.railway.station.subway.isfahan">محطة مترو</string>
+	<string name="type.railway.station.subway.istanbul">محطة مترو</string>
+	<string name="type.railway.station.subway.izmir">محطة مترو</string>
+	<string name="type.railway.station.subway.kazan">محطة مترو</string>
+	<string name="type.railway.station.subway.kharkiv">محطة مترو</string>
 	<string name="type.railway.station.subway.kiev">محطة مترو</string>
+	<string name="type.railway.station.subway.kobe">محطة مترو</string>
+	<string name="type.railway.station.subway.kolkata">محطة مترو</string>
+	<string name="type.railway.station.subway.kunming">محطة مترو</string>
+	<string name="type.railway.station.subway.kyoto">محطة مترو</string>
+	<string name="type.railway.station.subway.la">محطة مترو</string>
+	<string name="type.railway.station.subway.lausanne">محطة مترو</string>
+	<string name="type.railway.station.subway.lille">محطة مترو</string>
+	<string name="type.railway.station.subway.lima">محطة مترو</string>
+	<string name="type.railway.station.subway.lisboa">محطة مترو</string>
+	<string name="type.railway.station.subway.lisbon">محطة مترو</string>
 	<string name="type.railway.station.subway.london">محطة مترو</string>
+	<string name="type.railway.station.subway.lyon">محطة مترو</string>
 	<string name="type.railway.station.subway.madrid">محطة مترو</string>
+	<string name="type.railway.station.subway.malaga">محطة مترو</string>
+	<string name="type.railway.station.subway.manila">محطة مترو</string>
+	<string name="type.railway.station.subway.maracaibo">محطة مترو</string>
+	<string name="type.railway.station.subway.mashhad">محطة مترو</string>
+	<string name="type.railway.station.subway.mecca">محطة مترو</string>
+	<string name="type.railway.station.subway.medellin">محطة مترو</string>
+	<string name="type.railway.station.subway.mexico">محطة مترو</string>
+	<string name="type.railway.station.subway.milan">محطة مترو</string>
 	<string name="type.railway.station.subway.minsk">محطة مترو</string>
+	<string name="type.railway.station.subway.montreal">محطة مترو</string>
 	<string name="type.railway.station.subway.moscow">محطة مترو</string>
+	<string name="type.railway.station.subway.munchen">محطة مترو</string>
+	<string name="type.railway.station.subway.nagoya">محطة مترو</string>
 	<string name="type.railway.station.subway.newyork">محطة مترو</string>
+	<string name="type.railway.station.subway.nnov">محطة مترو</string>
+	<string name="type.railway.station.subway.novosibirsk">محطة مترو</string>
+	<string name="type.railway.station.subway.osaka">محطة مترو</string>
+	<string name="type.railway.station.subway.oslo">محطة مترو</string>
+	<string name="type.railway.station.subway.palma">محطة مترو</string>
+	<string name="type.railway.station.subway.panama">محطة مترو</string>
 	<string name="type.railway.station.subway.paris">محطة مترو</string>
+	<string name="type.railway.station.subway.philadelphia">محطة مترو</string>
+	<string name="type.railway.station.subway.pyongyang">محطة مترو</string>
+	<string name="type.railway.station.subway.rennes">محطة مترو</string>
+	<string name="type.railway.station.subway.rio">محطة مترو</string>
 	<string name="type.railway.station.subway.roma">محطة مترو</string>
+	<string name="type.railway.station.subway.rotterdam">محطة مترو</string>
+	<string name="type.railway.station.subway.samara">محطة مترو</string>
+	<string name="type.railway.station.subway.santiago">محطة مترو</string>
+	<string name="type.railway.station.subway.santo_domingo">محطة مترو</string>
+	<string name="type.railway.station.subway.saopaulo">محطة مترو</string>
+	<string name="type.railway.station.subway.sapporo">محطة مترو</string>
+	<string name="type.railway.station.subway.sendai">محطة مترو</string>
+	<string name="type.railway.station.subway.sf">محطة مترو</string>
+	<string name="type.railway.station.subway.shanghai">محطة مترو</string>
+	<string name="type.railway.station.subway.shiraz">محطة مترو</string>
+	<string name="type.railway.station.subway.sofia">محطة مترو</string>
 	<string name="type.railway.station.subway.spb">محطة مترو</string>
+	<string name="type.railway.station.subway.stockholm">محطة مترو</string>
+	<string name="type.railway.station.subway.tabriz">محطة مترو</string>
+	<string name="type.railway.station.subway.taipei">محطة مترو</string>
+	<string name="type.railway.station.subway.taoyuan">محطة مترو</string>
+	<string name="type.railway.station.subway.tashkent">محطة مترو</string>
+	<string name="type.railway.station.subway.tbilisi">محطة مترو</string>
+	<string name="type.railway.station.subway.tianjin">محطة مترو</string>
+	<string name="type.railway.station.subway.tokyo">محطة مترو</string>
+	<string name="type.railway.station.subway.valencia">محطة مترو</string>
+	<string name="type.railway.station.subway.vienna">محطة مترو</string>
+	<string name="type.railway.station.subway.warszawa">محطة مترو</string>
+	<string name="type.railway.station.subway.washington">محطة مترو</string>
+	<string name="type.railway.station.subway.wuhan">محطة مترو</string>
+	<string name="type.railway.station.subway.yerevan">محطة مترو</string>
+	<string name="type.railway.station.subway.yokohama">محطة مترو</string>
 	<string name="type.railway.subway_entrance">مدخل المترو</string>
-	<string name="type.railway.subway_entrance.barcelona">محطة مترو</string>
-	<string name="type.railway.subway_entrance.berlin">محطة مترو</string>
-	<string name="type.railway.subway_entrance.kiev">محطة مترو</string>
-	<string name="type.railway.subway_entrance.london">محطة مترو</string>
-	<string name="type.railway.subway_entrance.madrid">محطة مترو</string>
-	<string name="type.railway.subway_entrance.minsk">محطة مترو</string>
-	<string name="type.railway.subway_entrance.moscow">محطة مترو</string>
-	<string name="type.railway.subway_entrance.newyork">محطة مترو</string>
-	<string name="type.railway.subway_entrance.paris">محطة مترو</string>
-	<string name="type.railway.subway_entrance.roma">محطة مترو</string>
-	<string name="type.railway.subway_entrance.spb">محطة مترو</string>
+	<string name="type.railway.subway_entrance.adana">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.algiers">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.almaty">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.amsterdam">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.ankara">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.athens">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.baku">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.bangkok">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.barcelona">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.beijing">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.bengalore">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.berlin">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.brasilia">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.brescia">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.brussels">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.bucharest">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.budapest">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.buenos_aires">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.bursa">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.cairo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.caracas">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.catania">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.changchun">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.chengdu">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.chicago">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.chongqing">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.dalian">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.delhi">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.dnepro">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.dubai">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.ekb">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.fukuoka">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.glasgow">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.guangzhou">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.hamburg">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.helsinki">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.hiroshima">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.isfahan">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.istanbul">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.izmir">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kazan">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kharkiv">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kiev">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kobe">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kolkata">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kunming">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.kyoto">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.la">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.lausanne">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.lille">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.lima">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.lisboa">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.lisbon">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.london">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.lyon">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.madrid">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.malaga">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.manila">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.maracaibo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.mashhad">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.mecca">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.medellin">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.mexico">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.milan">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.minsk">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.montreal">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.moscow">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.munchen">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.nagoya">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.newyork">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.nnov">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.novosibirsk">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.osaka">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.oslo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.palma">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.panama">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.paris">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.philadelphia">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.pyongyang">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.rennes">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.rio">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.roma">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.rotterdam">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.samara">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.santiago">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.santo_domingo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.saopaulo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.sapporo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.sendai">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.sf">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.shanghai">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.shiraz">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.sofia">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.spb">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.stockholm">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.tabriz">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.taipei">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.taoyuan">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.tashkent">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.tbilisi">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.tianjin">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.tokyo">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.valencia">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.vienna">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.warszawa">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.washington">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.wuhan">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.yerevan">مدخل المترو</string>
+	<string name="type.railway.subway_entrance.yokohama">مدخل المترو</string>
 	<string name="type.railway.tram_stop">موقف ترام</string>
 	<string name="type.shop">متجر</string>
 	<string name="type.shop.alcohol">متجر مشروبات كحولية</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 874832765f..bbd981a46a 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1228,29 +1228,225 @@
 	<string name="type.railway.station.light_rail">Železniční stanice</string>
 	<string name="type.railway.station.monorail">Železniční stanice</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway_entrance">Vchod do podchodu</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.algiers">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.almaty">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.amsterdam">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.ankara">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.athens">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.baku">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.bangkok">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.barcelona">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.beijing">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.bengalore">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.berlin">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.brasilia">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.brescia">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.brussels">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.bucharest">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.budapest">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.bursa">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.cairo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.caracas">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.catania">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.changchun">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.chengdu">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.chicago">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.chongqing">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.dalian">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.delhi">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.dnepro">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.dubai">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.ekb">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.fukuoka">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.glasgow">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.guangzhou">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.hamburg">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.helsinki">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.hiroshima">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.isfahan">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.istanbul">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.izmir">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kazan">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kharkiv">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kiev">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kobe">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kolkata">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kunming">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.kyoto">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.la">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.lausanne">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.lille">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.lima">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.lisboa">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.lisbon">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.london">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.lyon">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.madrid">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.malaga">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.manila">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.maracaibo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.mashhad">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.mecca">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.medellin">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.mexico">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.milan">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.minsk">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.montreal">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.moscow">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.munchen">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.nagoya">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.newyork">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.nnov">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.osaka">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.oslo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.palma">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.panama">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.paris">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.philadelphia">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.pyongyang">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.rennes">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.rio">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.roma">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.rotterdam">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.samara">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.santiago">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.saopaulo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.sapporo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.sendai">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.sf">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.shanghai">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.shiraz">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.sofia">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.spb">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.stockholm">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.tabriz">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.taipei">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.taoyuan">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.tashkent">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.tbilisi">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.tianjin">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.tokyo">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.valencia">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.vienna">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.warszawa">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.washington">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.wuhan">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.yerevan">Vchod do podchodu</string>
+	<string name="type.railway.subway_entrance.yokohama">Vchod do podchodu</string>
 	<string name="type.railway.tram_stop">Tramvajová zastávka</string>
 	<string name="type.shop">Obchod</string>
 	<string name="type.shop.alcohol">Obchod s alkoholem</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 1fc47c9cb0..f1dea5ec8b 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1219,29 +1219,225 @@
 	<string name="type.railway.station.light_rail">Togstation</string>
 	<string name="type.railway.station.monorail">Togstation</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway_entrance">Indgang til undergrundsbane</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.algiers">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.almaty">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.amsterdam">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.ankara">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.athens">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.baku">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.bangkok">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.barcelona">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.beijing">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.bengalore">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.berlin">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.brasilia">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.brescia">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.brussels">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.bucharest">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.budapest">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.bursa">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.cairo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.caracas">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.catania">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.changchun">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.chengdu">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.chicago">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.chongqing">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.dalian">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.delhi">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.dnepro">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.dubai">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.ekb">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.fukuoka">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.glasgow">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.guangzhou">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.hamburg">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.helsinki">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.hiroshima">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.isfahan">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.istanbul">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.izmir">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kazan">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kharkiv">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kiev">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kobe">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kolkata">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kunming">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.kyoto">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.la">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.lausanne">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.lille">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.lima">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.lisboa">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.lisbon">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.london">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.lyon">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.madrid">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.malaga">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.manila">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.maracaibo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.mashhad">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.mecca">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.medellin">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.mexico">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.milan">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.minsk">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.montreal">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.moscow">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.munchen">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.nagoya">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.newyork">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.nnov">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.osaka">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.oslo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.palma">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.panama">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.paris">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.philadelphia">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.pyongyang">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.rennes">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.rio">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.roma">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.rotterdam">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.samara">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.santiago">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.saopaulo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.sapporo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.sendai">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.sf">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.shanghai">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.shiraz">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.sofia">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.spb">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.stockholm">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.tabriz">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.taipei">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.taoyuan">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.tashkent">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.tbilisi">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.tianjin">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.tokyo">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.valencia">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.vienna">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.warszawa">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.washington">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.wuhan">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.yerevan">Indgang til undergrundsbane</string>
+	<string name="type.railway.subway_entrance.yokohama">Indgang til undergrundsbane</string>
 	<string name="type.railway.tram_stop">Sporvogn</string>
 	<string name="type.shop">Butik</string>
 	<string name="type.shop.alcohol">Alkohol</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 1452820d9e..01e53191b1 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1415,32 +1415,228 @@
 	<string name="type.railway.station.light_rail">Stadtbahnbahnhof</string>
 	<string name="type.railway.station.monorail">Bahnhof</string>
 	<string name="type.railway.station.subway">U-Bahnstation</string>
+	<string name="type.railway.station.subway.adana">U-Bahnstation</string>
+	<string name="type.railway.station.subway.algiers">U-Bahnstation</string>
+	<string name="type.railway.station.subway.almaty">U-Bahnstation</string>
+	<string name="type.railway.station.subway.amsterdam">U-Bahnstation</string>
+	<string name="type.railway.station.subway.ankara">U-Bahnstation</string>
+	<string name="type.railway.station.subway.athens">U-Bahnstation</string>
+	<string name="type.railway.station.subway.baku">U-Bahnstation</string>
+	<string name="type.railway.station.subway.bangkok">U-Bahnstation</string>
 	<string name="type.railway.station.subway.barcelona">U-Bahnstation</string>
+	<string name="type.railway.station.subway.beijing">U-Bahnstation</string>
+	<string name="type.railway.station.subway.bengalore">U-Bahnstation</string>
 	<string name="type.railway.station.subway.berlin">U-Bahnstation</string>
+	<string name="type.railway.station.subway.brasilia">U-Bahnstation</string>
+	<string name="type.railway.station.subway.brescia">U-Bahnstation</string>
+	<string name="type.railway.station.subway.brussels">U-Bahnstation</string>
+	<string name="type.railway.station.subway.bucharest">U-Bahnstation</string>
+	<string name="type.railway.station.subway.budapest">U-Bahnstation</string>
+	<string name="type.railway.station.subway.buenos_aires">U-Bahnstation</string>
+	<string name="type.railway.station.subway.bursa">U-Bahnstation</string>
+	<string name="type.railway.station.subway.cairo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.caracas">U-Bahnstation</string>
+	<string name="type.railway.station.subway.catania">U-Bahnstation</string>
+	<string name="type.railway.station.subway.changchun">U-Bahnstation</string>
+	<string name="type.railway.station.subway.chengdu">U-Bahnstation</string>
+	<string name="type.railway.station.subway.chicago">U-Bahnstation</string>
+	<string name="type.railway.station.subway.chongqing">U-Bahnstation</string>
+	<string name="type.railway.station.subway.dalian">U-Bahnstation</string>
+	<string name="type.railway.station.subway.delhi">U-Bahnstation</string>
+	<string name="type.railway.station.subway.dnepro">U-Bahnstation</string>
+	<string name="type.railway.station.subway.dubai">U-Bahnstation</string>
+	<string name="type.railway.station.subway.ekb">U-Bahnstation</string>
+	<string name="type.railway.station.subway.fukuoka">U-Bahnstation</string>
+	<string name="type.railway.station.subway.glasgow">U-Bahnstation</string>
+	<string name="type.railway.station.subway.guangzhou">U-Bahnstation</string>
+	<string name="type.railway.station.subway.hamburg">U-Bahnstation</string>
+	<string name="type.railway.station.subway.helsinki">U-Bahnstation</string>
+	<string name="type.railway.station.subway.hiroshima">U-Bahnstation</string>
+	<string name="type.railway.station.subway.isfahan">U-Bahnstation</string>
+	<string name="type.railway.station.subway.istanbul">U-Bahnstation</string>
+	<string name="type.railway.station.subway.izmir">U-Bahnstation</string>
+	<string name="type.railway.station.subway.kazan">U-Bahnstation</string>
+	<string name="type.railway.station.subway.kharkiv">U-Bahnstation</string>
 	<string name="type.railway.station.subway.kiev">U-Bahnstation</string>
+	<string name="type.railway.station.subway.kobe">U-Bahnstation</string>
+	<string name="type.railway.station.subway.kolkata">U-Bahnstation</string>
+	<string name="type.railway.station.subway.kunming">U-Bahnstation</string>
+	<string name="type.railway.station.subway.kyoto">U-Bahnstation</string>
+	<string name="type.railway.station.subway.la">U-Bahnstation</string>
+	<string name="type.railway.station.subway.lausanne">U-Bahnstation</string>
+	<string name="type.railway.station.subway.lille">U-Bahnstation</string>
+	<string name="type.railway.station.subway.lima">U-Bahnstation</string>
+	<string name="type.railway.station.subway.lisboa">U-Bahnstation</string>
+	<string name="type.railway.station.subway.lisbon">U-Bahnstation</string>
 	<string name="type.railway.station.subway.london">U-Bahnstation</string>
+	<string name="type.railway.station.subway.lyon">U-Bahnstation</string>
 	<string name="type.railway.station.subway.madrid">U-Bahnstation</string>
+	<string name="type.railway.station.subway.malaga">U-Bahnstation</string>
+	<string name="type.railway.station.subway.manila">U-Bahnstation</string>
+	<string name="type.railway.station.subway.maracaibo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.mashhad">U-Bahnstation</string>
+	<string name="type.railway.station.subway.mecca">U-Bahnstation</string>
+	<string name="type.railway.station.subway.medellin">U-Bahnstation</string>
+	<string name="type.railway.station.subway.mexico">U-Bahnstation</string>
+	<string name="type.railway.station.subway.milan">U-Bahnstation</string>
 	<string name="type.railway.station.subway.minsk">U-Bahnstation</string>
+	<string name="type.railway.station.subway.montreal">U-Bahnstation</string>
 	<string name="type.railway.station.subway.moscow">U-Bahnstation</string>
+	<string name="type.railway.station.subway.munchen">U-Bahnstation</string>
+	<string name="type.railway.station.subway.nagoya">U-Bahnstation</string>
 	<string name="type.railway.station.subway.newyork">U-Bahnstation</string>
+	<string name="type.railway.station.subway.nnov">U-Bahnstation</string>
+	<string name="type.railway.station.subway.novosibirsk">U-Bahnstation</string>
+	<string name="type.railway.station.subway.osaka">U-Bahnstation</string>
+	<string name="type.railway.station.subway.oslo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.palma">U-Bahnstation</string>
+	<string name="type.railway.station.subway.panama">U-Bahnstation</string>
 	<string name="type.railway.station.subway.paris">U-Bahnstation</string>
+	<string name="type.railway.station.subway.philadelphia">U-Bahnstation</string>
+	<string name="type.railway.station.subway.pyongyang">U-Bahnstation</string>
+	<string name="type.railway.station.subway.rennes">U-Bahnstation</string>
+	<string name="type.railway.station.subway.rio">U-Bahnstation</string>
 	<string name="type.railway.station.subway.roma">U-Bahnstation</string>
+	<string name="type.railway.station.subway.rotterdam">U-Bahnstation</string>
+	<string name="type.railway.station.subway.samara">U-Bahnstation</string>
+	<string name="type.railway.station.subway.santiago">U-Bahnstation</string>
+	<string name="type.railway.station.subway.santo_domingo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.saopaulo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.sapporo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.sendai">U-Bahnstation</string>
+	<string name="type.railway.station.subway.sf">U-Bahnstation</string>
+	<string name="type.railway.station.subway.shanghai">U-Bahnstation</string>
+	<string name="type.railway.station.subway.shiraz">U-Bahnstation</string>
+	<string name="type.railway.station.subway.sofia">U-Bahnstation</string>
 	<string name="type.railway.station.subway.spb">U-Bahnstation</string>
+	<string name="type.railway.station.subway.stockholm">U-Bahnstation</string>
+	<string name="type.railway.station.subway.tabriz">U-Bahnstation</string>
+	<string name="type.railway.station.subway.taipei">U-Bahnstation</string>
+	<string name="type.railway.station.subway.taoyuan">U-Bahnstation</string>
+	<string name="type.railway.station.subway.tashkent">U-Bahnstation</string>
+	<string name="type.railway.station.subway.tbilisi">U-Bahnstation</string>
+	<string name="type.railway.station.subway.tianjin">U-Bahnstation</string>
+	<string name="type.railway.station.subway.tokyo">U-Bahnstation</string>
+	<string name="type.railway.station.subway.valencia">U-Bahnstation</string>
+	<string name="type.railway.station.subway.vienna">U-Bahnstation</string>
+	<string name="type.railway.station.subway.warszawa">U-Bahnstation</string>
+	<string name="type.railway.station.subway.washington">U-Bahnstation</string>
+	<string name="type.railway.station.subway.wuhan">U-Bahnstation</string>
+	<string name="type.railway.station.subway.yerevan">U-Bahnstation</string>
+	<string name="type.railway.station.subway.yokohama">U-Bahnstation</string>
 	<string name="type.railway.subway">U-Bahn</string>
 	<string name="type.railway.subway.bridge">U-Bahn-Brücke</string>
 	<string name="type.railway.subway.tunnel">U-Bahn-Tunnel</string>
 	<string name="type.railway.subway_entrance">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.adana">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.algiers">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.almaty">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.amsterdam">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.ankara">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.athens">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.baku">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.bangkok">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.barcelona">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.beijing">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.bengalore">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.berlin">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.brasilia">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.brescia">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.brussels">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.bucharest">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.budapest">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.buenos_aires">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.bursa">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.cairo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.caracas">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.catania">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.changchun">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.chengdu">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.chicago">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.chongqing">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.dalian">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.delhi">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.dnepro">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.dubai">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.ekb">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.fukuoka">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.glasgow">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.guangzhou">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.hamburg">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.helsinki">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.hiroshima">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.isfahan">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.istanbul">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.izmir">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.kazan">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.kharkiv">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.kiev">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.kobe">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.kolkata">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.kunming">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.kyoto">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.la">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.lausanne">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.lille">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.lima">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.lisboa">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.lisbon">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.london">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.lyon">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.madrid">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.malaga">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.manila">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.maracaibo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.mashhad">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.mecca">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.medellin">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.mexico">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.milan">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.minsk">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.montreal">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.moscow">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.munchen">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.nagoya">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.newyork">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.nnov">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.novosibirsk">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.osaka">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.oslo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.palma">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.panama">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.paris">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.philadelphia">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.pyongyang">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.rennes">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.rio">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.roma">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.rotterdam">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.samara">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.santiago">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.santo_domingo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.saopaulo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.sapporo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.sendai">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.sf">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.shanghai">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.shiraz">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.sofia">U-Bahn-Eingang</string>
 	<string name="type.railway.subway_entrance.spb">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.stockholm">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.tabriz">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.taipei">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.taoyuan">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.tashkent">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.tbilisi">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.tianjin">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.tokyo">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.valencia">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.vienna">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.warszawa">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.washington">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.wuhan">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.yerevan">U-Bahn-Eingang</string>
+	<string name="type.railway.subway_entrance.yokohama">U-Bahn-Eingang</string>
 	<string name="type.railway.tram">Straßenbahn</string>
 	<string name="type.railway.tram.bridge">Straßenbahnbrücke</string>
 	<string name="type.railway.tram.tunnel">Straßenbahntunnel</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 572cd135a4..dfe55a220b 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1230,29 +1230,225 @@
 	<string name="type.railway.station.light_rail">Σιδηροδρομικός σταθμός</string>
 	<string name="type.railway.station.monorail">Σιδηροδρομικός σταθμός</string>
 	<string name="type.railway.station.subway">Μετρό</string>
+	<string name="type.railway.station.subway.adana">Μετρό</string>
+	<string name="type.railway.station.subway.algiers">Μετρό</string>
+	<string name="type.railway.station.subway.almaty">Μετρό</string>
+	<string name="type.railway.station.subway.amsterdam">Μετρό</string>
+	<string name="type.railway.station.subway.ankara">Μετρό</string>
+	<string name="type.railway.station.subway.athens">Μετρό</string>
+	<string name="type.railway.station.subway.baku">Μετρό</string>
+	<string name="type.railway.station.subway.bangkok">Μετρό</string>
 	<string name="type.railway.station.subway.barcelona">Μετρό</string>
+	<string name="type.railway.station.subway.beijing">Μετρό</string>
+	<string name="type.railway.station.subway.bengalore">Μετρό</string>
 	<string name="type.railway.station.subway.berlin">Μετρό</string>
+	<string name="type.railway.station.subway.brasilia">Μετρό</string>
+	<string name="type.railway.station.subway.brescia">Μετρό</string>
+	<string name="type.railway.station.subway.brussels">Μετρό</string>
+	<string name="type.railway.station.subway.bucharest">Μετρό</string>
+	<string name="type.railway.station.subway.budapest">Μετρό</string>
+	<string name="type.railway.station.subway.buenos_aires">Μετρό</string>
+	<string name="type.railway.station.subway.bursa">Μετρό</string>
+	<string name="type.railway.station.subway.cairo">Μετρό</string>
+	<string name="type.railway.station.subway.caracas">Μετρό</string>
+	<string name="type.railway.station.subway.catania">Μετρό</string>
+	<string name="type.railway.station.subway.changchun">Μετρό</string>
+	<string name="type.railway.station.subway.chengdu">Μετρό</string>
+	<string name="type.railway.station.subway.chicago">Μετρό</string>
+	<string name="type.railway.station.subway.chongqing">Μετρό</string>
+	<string name="type.railway.station.subway.dalian">Μετρό</string>
+	<string name="type.railway.station.subway.delhi">Μετρό</string>
+	<string name="type.railway.station.subway.dnepro">Μετρό</string>
+	<string name="type.railway.station.subway.dubai">Μετρό</string>
+	<string name="type.railway.station.subway.ekb">Μετρό</string>
+	<string name="type.railway.station.subway.fukuoka">Μετρό</string>
+	<string name="type.railway.station.subway.glasgow">Μετρό</string>
+	<string name="type.railway.station.subway.guangzhou">Μετρό</string>
+	<string name="type.railway.station.subway.hamburg">Μετρό</string>
+	<string name="type.railway.station.subway.helsinki">Μετρό</string>
+	<string name="type.railway.station.subway.hiroshima">Μετρό</string>
+	<string name="type.railway.station.subway.isfahan">Μετρό</string>
+	<string name="type.railway.station.subway.istanbul">Μετρό</string>
+	<string name="type.railway.station.subway.izmir">Μετρό</string>
+	<string name="type.railway.station.subway.kazan">Μετρό</string>
+	<string name="type.railway.station.subway.kharkiv">Μετρό</string>
 	<string name="type.railway.station.subway.kiev">Μετρό</string>
+	<string name="type.railway.station.subway.kobe">Μετρό</string>
+	<string name="type.railway.station.subway.kolkata">Μετρό</string>
+	<string name="type.railway.station.subway.kunming">Μετρό</string>
+	<string name="type.railway.station.subway.kyoto">Μετρό</string>
+	<string name="type.railway.station.subway.la">Μετρό</string>
+	<string name="type.railway.station.subway.lausanne">Μετρό</string>
+	<string name="type.railway.station.subway.lille">Μετρό</string>
+	<string name="type.railway.station.subway.lima">Μετρό</string>
+	<string name="type.railway.station.subway.lisboa">Μετρό</string>
+	<string name="type.railway.station.subway.lisbon">Μετρό</string>
 	<string name="type.railway.station.subway.london">Μετρό</string>
+	<string name="type.railway.station.subway.lyon">Μετρό</string>
 	<string name="type.railway.station.subway.madrid">Μετρό</string>
+	<string name="type.railway.station.subway.malaga">Μετρό</string>
+	<string name="type.railway.station.subway.manila">Μετρό</string>
+	<string name="type.railway.station.subway.maracaibo">Μετρό</string>
+	<string name="type.railway.station.subway.mashhad">Μετρό</string>
+	<string name="type.railway.station.subway.mecca">Μετρό</string>
+	<string name="type.railway.station.subway.medellin">Μετρό</string>
+	<string name="type.railway.station.subway.mexico">Μετρό</string>
+	<string name="type.railway.station.subway.milan">Μετρό</string>
 	<string name="type.railway.station.subway.minsk">Μετρό</string>
+	<string name="type.railway.station.subway.montreal">Μετρό</string>
 	<string name="type.railway.station.subway.moscow">Μετρό</string>
+	<string name="type.railway.station.subway.munchen">Μετρό</string>
+	<string name="type.railway.station.subway.nagoya">Μετρό</string>
 	<string name="type.railway.station.subway.newyork">Μετρό</string>
+	<string name="type.railway.station.subway.nnov">Μετρό</string>
+	<string name="type.railway.station.subway.novosibirsk">Μετρό</string>
+	<string name="type.railway.station.subway.osaka">Μετρό</string>
+	<string name="type.railway.station.subway.oslo">Μετρό</string>
+	<string name="type.railway.station.subway.palma">Μετρό</string>
+	<string name="type.railway.station.subway.panama">Μετρό</string>
 	<string name="type.railway.station.subway.paris">Μετρό</string>
+	<string name="type.railway.station.subway.philadelphia">Μετρό</string>
+	<string name="type.railway.station.subway.pyongyang">Μετρό</string>
+	<string name="type.railway.station.subway.rennes">Μετρό</string>
+	<string name="type.railway.station.subway.rio">Μετρό</string>
 	<string name="type.railway.station.subway.roma">Μετρό</string>
+	<string name="type.railway.station.subway.rotterdam">Μετρό</string>
+	<string name="type.railway.station.subway.samara">Μετρό</string>
+	<string name="type.railway.station.subway.santiago">Μετρό</string>
+	<string name="type.railway.station.subway.santo_domingo">Μετρό</string>
+	<string name="type.railway.station.subway.saopaulo">Μετρό</string>
+	<string name="type.railway.station.subway.sapporo">Μετρό</string>
+	<string name="type.railway.station.subway.sendai">Μετρό</string>
+	<string name="type.railway.station.subway.sf">Μετρό</string>
+	<string name="type.railway.station.subway.shanghai">Μετρό</string>
+	<string name="type.railway.station.subway.shiraz">Μετρό</string>
+	<string name="type.railway.station.subway.sofia">Μετρό</string>
 	<string name="type.railway.station.subway.spb">Μετρό</string>
+	<string name="type.railway.station.subway.stockholm">Μετρό</string>
+	<string name="type.railway.station.subway.tabriz">Μετρό</string>
+	<string name="type.railway.station.subway.taipei">Μετρό</string>
+	<string name="type.railway.station.subway.taoyuan">Μετρό</string>
+	<string name="type.railway.station.subway.tashkent">Μετρό</string>
+	<string name="type.railway.station.subway.tbilisi">Μετρό</string>
+	<string name="type.railway.station.subway.tianjin">Μετρό</string>
+	<string name="type.railway.station.subway.tokyo">Μετρό</string>
+	<string name="type.railway.station.subway.valencia">Μετρό</string>
+	<string name="type.railway.station.subway.vienna">Μετρό</string>
+	<string name="type.railway.station.subway.warszawa">Μετρό</string>
+	<string name="type.railway.station.subway.washington">Μετρό</string>
+	<string name="type.railway.station.subway.wuhan">Μετρό</string>
+	<string name="type.railway.station.subway.yerevan">Μετρό</string>
+	<string name="type.railway.station.subway.yokohama">Μετρό</string>
 	<string name="type.railway.subway_entrance">Είσοδος μετρό</string>
-	<string name="type.railway.subway_entrance.barcelona">Μετρό</string>
-	<string name="type.railway.subway_entrance.berlin">Μετρό</string>
-	<string name="type.railway.subway_entrance.kiev">Μετρό</string>
-	<string name="type.railway.subway_entrance.london">Μετρό</string>
-	<string name="type.railway.subway_entrance.madrid">Μετρό</string>
-	<string name="type.railway.subway_entrance.minsk">Μετρό</string>
-	<string name="type.railway.subway_entrance.moscow">Μετρό</string>
-	<string name="type.railway.subway_entrance.newyork">Μετρό</string>
-	<string name="type.railway.subway_entrance.paris">Μετρό</string>
-	<string name="type.railway.subway_entrance.roma">Μετρό</string>
-	<string name="type.railway.subway_entrance.spb">Μετρό</string>
+	<string name="type.railway.subway_entrance.adana">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.algiers">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.almaty">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.amsterdam">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.ankara">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.athens">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.baku">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.bangkok">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.barcelona">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.beijing">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.bengalore">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.berlin">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.brasilia">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.brescia">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.brussels">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.bucharest">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.budapest">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.bursa">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.cairo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.caracas">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.catania">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.changchun">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.chengdu">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.chicago">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.chongqing">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.dalian">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.delhi">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.dnepro">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.dubai">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.ekb">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.fukuoka">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.glasgow">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.guangzhou">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.hamburg">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.helsinki">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.hiroshima">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.isfahan">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.istanbul">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.izmir">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kazan">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kharkiv">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kiev">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kobe">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kolkata">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kunming">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.kyoto">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.la">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.lausanne">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.lille">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.lima">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.lisboa">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.lisbon">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.london">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.lyon">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.madrid">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.malaga">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.manila">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.maracaibo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.mashhad">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.mecca">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.medellin">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.mexico">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.milan">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.minsk">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.montreal">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.moscow">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.munchen">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.nagoya">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.newyork">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.nnov">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.osaka">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.oslo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.palma">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.panama">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.paris">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.philadelphia">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.pyongyang">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.rennes">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.rio">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.roma">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.rotterdam">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.samara">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.santiago">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.saopaulo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.sapporo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.sendai">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.sf">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.shanghai">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.shiraz">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.sofia">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.spb">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.stockholm">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.tabriz">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.taipei">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.taoyuan">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.tashkent">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.tbilisi">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.tianjin">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.tokyo">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.valencia">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.vienna">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.warszawa">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.washington">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.wuhan">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.yerevan">Είσοδος μετρό</string>
+	<string name="type.railway.subway_entrance.yokohama">Είσοδος μετρό</string>
 	<string name="type.railway.tram_stop">Στάση τραμ</string>
 	<string name="type.shop">Κατάστημα</string>
 	<string name="type.shop.alcohol">Κάβα</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index e91632474f..c868261e69 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -318,6 +318,115 @@
 	<string name="type.railway.monorail">Monorraíl</string>
 	<string name="type.railway.rail">Línea de ferrocarril</string>
 	<string name="type.railway.subway_entrance">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.adana">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.algiers">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.almaty">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.amsterdam">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.ankara">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.athens">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.baku">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.bangkok">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.barcelona">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.beijing">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.bengalore">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.berlin">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.brasilia">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.brescia">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.brussels">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.bucharest">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.budapest">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.bursa">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.cairo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.caracas">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.catania">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.changchun">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.chengdu">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.chicago">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.chongqing">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.dalian">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.delhi">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.dnepro">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.dubai">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.ekb">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.fukuoka">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.glasgow">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.guangzhou">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.hamburg">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.helsinki">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.hiroshima">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.isfahan">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.istanbul">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.izmir">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kazan">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kharkiv">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kiev">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kobe">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kolkata">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kunming">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.kyoto">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.la">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.lausanne">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.lille">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.lima">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.lisboa">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.lisbon">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.london">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.lyon">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.madrid">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.malaga">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.manila">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.maracaibo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.mashhad">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.mecca">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.medellin">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.mexico">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.milan">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.minsk">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.montreal">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.moscow">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.munchen">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.nagoya">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.newyork">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.nnov">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.osaka">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.oslo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.palma">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.panama">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.paris">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.philadelphia">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.pyongyang">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.rennes">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.rio">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.roma">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.rotterdam">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.samara">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.santiago">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.saopaulo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.sapporo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.sendai">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.sf">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.shanghai">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.shiraz">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.sofia">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.spb">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.stockholm">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.tabriz">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.taipei">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.taoyuan">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.tashkent">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.tbilisi">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.tianjin">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.tokyo">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.valencia">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.vienna">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.warszawa">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.washington">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.wuhan">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.yerevan">Entrada de metro</string>
+	<string name="type.railway.subway_entrance.yokohama">Entrada de metro</string>
 	<string name="type.shop.video">Tienda de vídeo</string>
 	<string name="type.shop.video_games">Tienda de videojuegos</string>
 	<string name="type.sport.archery">Tiro al arco</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 6fadc74276..f0d82c4552 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1319,29 +1319,225 @@
 	<string name="type.railway.station.light_rail">Estación de tren</string>
 	<string name="type.railway.station.monorail">Estación de tren</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway_entrance">Entrada al metro</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.algiers">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.almaty">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.amsterdam">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.ankara">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.athens">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.baku">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.bangkok">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.barcelona">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.beijing">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.bengalore">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.berlin">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.brasilia">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.brescia">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.brussels">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.bucharest">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.budapest">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.bursa">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.cairo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.caracas">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.catania">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.changchun">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.chengdu">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.chicago">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.chongqing">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.dalian">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.delhi">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.dnepro">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.dubai">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.ekb">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.fukuoka">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.glasgow">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.guangzhou">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.hamburg">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.helsinki">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.hiroshima">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.isfahan">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.istanbul">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.izmir">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kazan">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kharkiv">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kiev">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kobe">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kolkata">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kunming">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.kyoto">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.la">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.lausanne">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.lille">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.lima">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.lisboa">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.lisbon">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.london">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.lyon">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.madrid">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.malaga">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.manila">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.maracaibo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.mashhad">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.mecca">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.medellin">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.mexico">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.milan">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.minsk">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.montreal">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.moscow">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.munchen">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.nagoya">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.newyork">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.nnov">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.osaka">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.oslo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.palma">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.panama">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.paris">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.philadelphia">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.pyongyang">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.rennes">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.rio">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.roma">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.rotterdam">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.samara">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.santiago">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.saopaulo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.sapporo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.sendai">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.sf">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.shanghai">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.shiraz">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.sofia">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.spb">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.stockholm">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.tabriz">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.taipei">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.taoyuan">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.tashkent">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.tbilisi">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.tianjin">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.tokyo">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.valencia">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.vienna">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.warszawa">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.washington">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.wuhan">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.yerevan">Entrada al metro</string>
+	<string name="type.railway.subway_entrance.yokohama">Entrada al metro</string>
 	<string name="type.railway.tram_stop">Parada de tranvía</string>
 	<string name="type.shop">Tienda</string>
 	<string name="type.shop.alcohol">Licorería</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 283e9e7f1a..e828a073f7 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -1295,29 +1295,225 @@
 	<string name="type.railway.station.light_rail">Tren geltokian</string>
 	<string name="type.railway.station.monorail">Tren geltokian</string>
 	<string name="type.railway.station.subway">Metroa</string>
+	<string name="type.railway.station.subway.adana">Metroa</string>
+	<string name="type.railway.station.subway.algiers">Metroa</string>
+	<string name="type.railway.station.subway.almaty">Metroa</string>
+	<string name="type.railway.station.subway.amsterdam">Metroa</string>
+	<string name="type.railway.station.subway.ankara">Metroa</string>
+	<string name="type.railway.station.subway.athens">Metroa</string>
+	<string name="type.railway.station.subway.baku">Metroa</string>
+	<string name="type.railway.station.subway.bangkok">Metroa</string>
 	<string name="type.railway.station.subway.barcelona">Metroa</string>
+	<string name="type.railway.station.subway.beijing">Metroa</string>
+	<string name="type.railway.station.subway.bengalore">Metroa</string>
 	<string name="type.railway.station.subway.berlin">Metroa</string>
+	<string name="type.railway.station.subway.brasilia">Metroa</string>
+	<string name="type.railway.station.subway.brescia">Metroa</string>
+	<string name="type.railway.station.subway.brussels">Metroa</string>
+	<string name="type.railway.station.subway.bucharest">Metroa</string>
+	<string name="type.railway.station.subway.budapest">Metroa</string>
+	<string name="type.railway.station.subway.buenos_aires">Metroa</string>
+	<string name="type.railway.station.subway.bursa">Metroa</string>
+	<string name="type.railway.station.subway.cairo">Metroa</string>
+	<string name="type.railway.station.subway.caracas">Metroa</string>
+	<string name="type.railway.station.subway.catania">Metroa</string>
+	<string name="type.railway.station.subway.changchun">Metroa</string>
+	<string name="type.railway.station.subway.chengdu">Metroa</string>
+	<string name="type.railway.station.subway.chicago">Metroa</string>
+	<string name="type.railway.station.subway.chongqing">Metroa</string>
+	<string name="type.railway.station.subway.dalian">Metroa</string>
+	<string name="type.railway.station.subway.delhi">Metroa</string>
+	<string name="type.railway.station.subway.dnepro">Metroa</string>
+	<string name="type.railway.station.subway.dubai">Metroa</string>
+	<string name="type.railway.station.subway.ekb">Metroa</string>
+	<string name="type.railway.station.subway.fukuoka">Metroa</string>
+	<string name="type.railway.station.subway.glasgow">Metroa</string>
+	<string name="type.railway.station.subway.guangzhou">Metroa</string>
+	<string name="type.railway.station.subway.hamburg">Metroa</string>
+	<string name="type.railway.station.subway.helsinki">Metroa</string>
+	<string name="type.railway.station.subway.hiroshima">Metroa</string>
+	<string name="type.railway.station.subway.isfahan">Metroa</string>
+	<string name="type.railway.station.subway.istanbul">Metroa</string>
+	<string name="type.railway.station.subway.izmir">Metroa</string>
+	<string name="type.railway.station.subway.kazan">Metroa</string>
+	<string name="type.railway.station.subway.kharkiv">Metroa</string>
 	<string name="type.railway.station.subway.kiev">Metroa</string>
+	<string name="type.railway.station.subway.kobe">Metroa</string>
+	<string name="type.railway.station.subway.kolkata">Metroa</string>
+	<string name="type.railway.station.subway.kunming">Metroa</string>
+	<string name="type.railway.station.subway.kyoto">Metroa</string>
+	<string name="type.railway.station.subway.la">Metroa</string>
+	<string name="type.railway.station.subway.lausanne">Metroa</string>
+	<string name="type.railway.station.subway.lille">Metroa</string>
+	<string name="type.railway.station.subway.lima">Metroa</string>
+	<string name="type.railway.station.subway.lisboa">Metroa</string>
+	<string name="type.railway.station.subway.lisbon">Metroa</string>
 	<string name="type.railway.station.subway.london">Metroa</string>
+	<string name="type.railway.station.subway.lyon">Metroa</string>
 	<string name="type.railway.station.subway.madrid">Metroa</string>
+	<string name="type.railway.station.subway.malaga">Metroa</string>
+	<string name="type.railway.station.subway.manila">Metroa</string>
+	<string name="type.railway.station.subway.maracaibo">Metroa</string>
+	<string name="type.railway.station.subway.mashhad">Metroa</string>
+	<string name="type.railway.station.subway.mecca">Metroa</string>
+	<string name="type.railway.station.subway.medellin">Metroa</string>
+	<string name="type.railway.station.subway.mexico">Metroa</string>
+	<string name="type.railway.station.subway.milan">Metroa</string>
 	<string name="type.railway.station.subway.minsk">Metroa</string>
+	<string name="type.railway.station.subway.montreal">Metroa</string>
 	<string name="type.railway.station.subway.moscow">Metroa</string>
+	<string name="type.railway.station.subway.munchen">Metroa</string>
+	<string name="type.railway.station.subway.nagoya">Metroa</string>
 	<string name="type.railway.station.subway.newyork">Metroa</string>
+	<string name="type.railway.station.subway.nnov">Metroa</string>
+	<string name="type.railway.station.subway.novosibirsk">Metroa</string>
+	<string name="type.railway.station.subway.osaka">Metroa</string>
+	<string name="type.railway.station.subway.oslo">Metroa</string>
+	<string name="type.railway.station.subway.palma">Metroa</string>
+	<string name="type.railway.station.subway.panama">Metroa</string>
 	<string name="type.railway.station.subway.paris">Metroa</string>
+	<string name="type.railway.station.subway.philadelphia">Metroa</string>
+	<string name="type.railway.station.subway.pyongyang">Metroa</string>
+	<string name="type.railway.station.subway.rennes">Metroa</string>
+	<string name="type.railway.station.subway.rio">Metroa</string>
 	<string name="type.railway.station.subway.roma">Metroa</string>
+	<string name="type.railway.station.subway.rotterdam">Metroa</string>
+	<string name="type.railway.station.subway.samara">Metroa</string>
+	<string name="type.railway.station.subway.santiago">Metroa</string>
+	<string name="type.railway.station.subway.santo_domingo">Metroa</string>
+	<string name="type.railway.station.subway.saopaulo">Metroa</string>
+	<string name="type.railway.station.subway.sapporo">Metroa</string>
+	<string name="type.railway.station.subway.sendai">Metroa</string>
+	<string name="type.railway.station.subway.sf">Metroa</string>
+	<string name="type.railway.station.subway.shanghai">Metroa</string>
+	<string name="type.railway.station.subway.shiraz">Metroa</string>
+	<string name="type.railway.station.subway.sofia">Metroa</string>
 	<string name="type.railway.station.subway.spb">Metroa</string>
+	<string name="type.railway.station.subway.stockholm">Metroa</string>
+	<string name="type.railway.station.subway.tabriz">Metroa</string>
+	<string name="type.railway.station.subway.taipei">Metroa</string>
+	<string name="type.railway.station.subway.taoyuan">Metroa</string>
+	<string name="type.railway.station.subway.tashkent">Metroa</string>
+	<string name="type.railway.station.subway.tbilisi">Metroa</string>
+	<string name="type.railway.station.subway.tianjin">Metroa</string>
+	<string name="type.railway.station.subway.tokyo">Metroa</string>
+	<string name="type.railway.station.subway.valencia">Metroa</string>
+	<string name="type.railway.station.subway.vienna">Metroa</string>
+	<string name="type.railway.station.subway.warszawa">Metroa</string>
+	<string name="type.railway.station.subway.washington">Metroa</string>
+	<string name="type.railway.station.subway.wuhan">Metroa</string>
+	<string name="type.railway.station.subway.yerevan">Metroa</string>
+	<string name="type.railway.station.subway.yokohama">Metroa</string>
 	<string name="type.railway.subway_entrance">Metroko sarrera</string>
-	<string name="type.railway.subway_entrance.barcelona">Metroa</string>
-	<string name="type.railway.subway_entrance.berlin">Metroa</string>
-	<string name="type.railway.subway_entrance.kiev">Metroa</string>
-	<string name="type.railway.subway_entrance.london">Metroa</string>
-	<string name="type.railway.subway_entrance.madrid">Metroa</string>
-	<string name="type.railway.subway_entrance.minsk">Metroa</string>
-	<string name="type.railway.subway_entrance.moscow">Metroa</string>
-	<string name="type.railway.subway_entrance.newyork">Metroa</string>
-	<string name="type.railway.subway_entrance.paris">Metroa</string>
-	<string name="type.railway.subway_entrance.roma">Metroa</string>
-	<string name="type.railway.subway_entrance.spb">Metroa</string>
+	<string name="type.railway.subway_entrance.adana">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.algiers">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.almaty">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.amsterdam">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.ankara">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.athens">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.baku">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.bangkok">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.barcelona">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.beijing">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.bengalore">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.berlin">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.brasilia">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.brescia">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.brussels">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.bucharest">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.budapest">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.bursa">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.cairo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.caracas">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.catania">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.changchun">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.chengdu">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.chicago">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.chongqing">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.dalian">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.delhi">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.dnepro">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.dubai">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.ekb">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.fukuoka">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.glasgow">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.guangzhou">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.hamburg">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.helsinki">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.hiroshima">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.isfahan">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.istanbul">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.izmir">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kazan">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kharkiv">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kiev">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kobe">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kolkata">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kunming">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.kyoto">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.la">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.lausanne">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.lille">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.lima">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.lisboa">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.lisbon">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.london">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.lyon">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.madrid">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.malaga">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.manila">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.maracaibo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.mashhad">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.mecca">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.medellin">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.mexico">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.milan">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.minsk">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.montreal">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.moscow">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.munchen">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.nagoya">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.newyork">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.nnov">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.osaka">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.oslo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.palma">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.panama">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.paris">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.philadelphia">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.pyongyang">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.rennes">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.rio">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.roma">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.rotterdam">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.samara">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.santiago">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.saopaulo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.sapporo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.sendai">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.sf">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.shanghai">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.shiraz">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.sofia">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.spb">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.stockholm">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.tabriz">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.taipei">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.taoyuan">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.tashkent">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.tbilisi">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.tianjin">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.tokyo">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.valencia">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.vienna">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.warszawa">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.washington">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.wuhan">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.yerevan">Metroko sarrera</string>
+	<string name="type.railway.subway_entrance.yokohama">Metroko sarrera</string>
 	<string name="type.railway.tram_stop">Tranbiaren geltokia</string>
 	<string name="type.shop">Denda</string>
 	<string name="type.shop.alcohol">Likore-denda</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 3ca3ea2ee3..2cf2b93094 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1141,29 +1141,225 @@
 	<string name="type.railway.station.light_rail">ایستگاه قطار</string>
 	<string name="type.railway.station.monorail">ایستگاه قطار</string>
 	<string name="type.railway.station.subway">حمل و نقل</string>
+	<string name="type.railway.station.subway.adana">حمل و نقل</string>
+	<string name="type.railway.station.subway.algiers">حمل و نقل</string>
+	<string name="type.railway.station.subway.almaty">حمل و نقل</string>
+	<string name="type.railway.station.subway.amsterdam">حمل و نقل</string>
+	<string name="type.railway.station.subway.ankara">حمل و نقل</string>
+	<string name="type.railway.station.subway.athens">حمل و نقل</string>
+	<string name="type.railway.station.subway.baku">حمل و نقل</string>
+	<string name="type.railway.station.subway.bangkok">حمل و نقل</string>
 	<string name="type.railway.station.subway.barcelona">حمل و نقل</string>
+	<string name="type.railway.station.subway.beijing">حمل و نقل</string>
+	<string name="type.railway.station.subway.bengalore">حمل و نقل</string>
 	<string name="type.railway.station.subway.berlin">حمل و نقل</string>
+	<string name="type.railway.station.subway.brasilia">حمل و نقل</string>
+	<string name="type.railway.station.subway.brescia">حمل و نقل</string>
+	<string name="type.railway.station.subway.brussels">حمل و نقل</string>
+	<string name="type.railway.station.subway.bucharest">حمل و نقل</string>
+	<string name="type.railway.station.subway.budapest">حمل و نقل</string>
+	<string name="type.railway.station.subway.buenos_aires">حمل و نقل</string>
+	<string name="type.railway.station.subway.bursa">حمل و نقل</string>
+	<string name="type.railway.station.subway.cairo">حمل و نقل</string>
+	<string name="type.railway.station.subway.caracas">حمل و نقل</string>
+	<string name="type.railway.station.subway.catania">حمل و نقل</string>
+	<string name="type.railway.station.subway.changchun">حمل و نقل</string>
+	<string name="type.railway.station.subway.chengdu">حمل و نقل</string>
+	<string name="type.railway.station.subway.chicago">حمل و نقل</string>
+	<string name="type.railway.station.subway.chongqing">حمل و نقل</string>
+	<string name="type.railway.station.subway.dalian">حمل و نقل</string>
+	<string name="type.railway.station.subway.delhi">حمل و نقل</string>
+	<string name="type.railway.station.subway.dnepro">حمل و نقل</string>
+	<string name="type.railway.station.subway.dubai">حمل و نقل</string>
+	<string name="type.railway.station.subway.ekb">حمل و نقل</string>
+	<string name="type.railway.station.subway.fukuoka">حمل و نقل</string>
+	<string name="type.railway.station.subway.glasgow">حمل و نقل</string>
+	<string name="type.railway.station.subway.guangzhou">حمل و نقل</string>
+	<string name="type.railway.station.subway.hamburg">حمل و نقل</string>
+	<string name="type.railway.station.subway.helsinki">حمل و نقل</string>
+	<string name="type.railway.station.subway.hiroshima">حمل و نقل</string>
+	<string name="type.railway.station.subway.isfahan">حمل و نقل</string>
+	<string name="type.railway.station.subway.istanbul">حمل و نقل</string>
+	<string name="type.railway.station.subway.izmir">حمل و نقل</string>
+	<string name="type.railway.station.subway.kazan">حمل و نقل</string>
+	<string name="type.railway.station.subway.kharkiv">حمل و نقل</string>
 	<string name="type.railway.station.subway.kiev">حمل و نقل</string>
+	<string name="type.railway.station.subway.kobe">حمل و نقل</string>
+	<string name="type.railway.station.subway.kolkata">حمل و نقل</string>
+	<string name="type.railway.station.subway.kunming">حمل و نقل</string>
+	<string name="type.railway.station.subway.kyoto">حمل و نقل</string>
+	<string name="type.railway.station.subway.la">حمل و نقل</string>
+	<string name="type.railway.station.subway.lausanne">حمل و نقل</string>
+	<string name="type.railway.station.subway.lille">حمل و نقل</string>
+	<string name="type.railway.station.subway.lima">حمل و نقل</string>
+	<string name="type.railway.station.subway.lisboa">حمل و نقل</string>
+	<string name="type.railway.station.subway.lisbon">حمل و نقل</string>
 	<string name="type.railway.station.subway.london">حمل و نقل</string>
+	<string name="type.railway.station.subway.lyon">حمل و نقل</string>
 	<string name="type.railway.station.subway.madrid">حمل و نقل</string>
+	<string name="type.railway.station.subway.malaga">حمل و نقل</string>
+	<string name="type.railway.station.subway.manila">حمل و نقل</string>
+	<string name="type.railway.station.subway.maracaibo">حمل و نقل</string>
+	<string name="type.railway.station.subway.mashhad">حمل و نقل</string>
+	<string name="type.railway.station.subway.mecca">حمل و نقل</string>
+	<string name="type.railway.station.subway.medellin">حمل و نقل</string>
+	<string name="type.railway.station.subway.mexico">حمل و نقل</string>
+	<string name="type.railway.station.subway.milan">حمل و نقل</string>
 	<string name="type.railway.station.subway.minsk">حمل و نقل</string>
+	<string name="type.railway.station.subway.montreal">حمل و نقل</string>
 	<string name="type.railway.station.subway.moscow">حمل و نقل</string>
+	<string name="type.railway.station.subway.munchen">حمل و نقل</string>
+	<string name="type.railway.station.subway.nagoya">حمل و نقل</string>
 	<string name="type.railway.station.subway.newyork">حمل و نقل</string>
+	<string name="type.railway.station.subway.nnov">حمل و نقل</string>
+	<string name="type.railway.station.subway.novosibirsk">حمل و نقل</string>
+	<string name="type.railway.station.subway.osaka">حمل و نقل</string>
+	<string name="type.railway.station.subway.oslo">حمل و نقل</string>
+	<string name="type.railway.station.subway.palma">حمل و نقل</string>
+	<string name="type.railway.station.subway.panama">حمل و نقل</string>
 	<string name="type.railway.station.subway.paris">حمل و نقل</string>
+	<string name="type.railway.station.subway.philadelphia">حمل و نقل</string>
+	<string name="type.railway.station.subway.pyongyang">حمل و نقل</string>
+	<string name="type.railway.station.subway.rennes">حمل و نقل</string>
+	<string name="type.railway.station.subway.rio">حمل و نقل</string>
 	<string name="type.railway.station.subway.roma">حمل و نقل</string>
+	<string name="type.railway.station.subway.rotterdam">حمل و نقل</string>
+	<string name="type.railway.station.subway.samara">حمل و نقل</string>
+	<string name="type.railway.station.subway.santiago">حمل و نقل</string>
+	<string name="type.railway.station.subway.santo_domingo">حمل و نقل</string>
+	<string name="type.railway.station.subway.saopaulo">حمل و نقل</string>
+	<string name="type.railway.station.subway.sapporo">حمل و نقل</string>
+	<string name="type.railway.station.subway.sendai">حمل و نقل</string>
+	<string name="type.railway.station.subway.sf">حمل و نقل</string>
+	<string name="type.railway.station.subway.shanghai">حمل و نقل</string>
+	<string name="type.railway.station.subway.shiraz">حمل و نقل</string>
+	<string name="type.railway.station.subway.sofia">حمل و نقل</string>
 	<string name="type.railway.station.subway.spb">حمل و نقل</string>
+	<string name="type.railway.station.subway.stockholm">حمل و نقل</string>
+	<string name="type.railway.station.subway.tabriz">حمل و نقل</string>
+	<string name="type.railway.station.subway.taipei">حمل و نقل</string>
+	<string name="type.railway.station.subway.taoyuan">حمل و نقل</string>
+	<string name="type.railway.station.subway.tashkent">حمل و نقل</string>
+	<string name="type.railway.station.subway.tbilisi">حمل و نقل</string>
+	<string name="type.railway.station.subway.tianjin">حمل و نقل</string>
+	<string name="type.railway.station.subway.tokyo">حمل و نقل</string>
+	<string name="type.railway.station.subway.valencia">حمل و نقل</string>
+	<string name="type.railway.station.subway.vienna">حمل و نقل</string>
+	<string name="type.railway.station.subway.warszawa">حمل و نقل</string>
+	<string name="type.railway.station.subway.washington">حمل و نقل</string>
+	<string name="type.railway.station.subway.wuhan">حمل و نقل</string>
+	<string name="type.railway.station.subway.yerevan">حمل و نقل</string>
+	<string name="type.railway.station.subway.yokohama">حمل و نقل</string>
 	<string name="type.railway.subway_entrance">ورودی مترو</string>
-	<string name="type.railway.subway_entrance.barcelona">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.berlin">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.kiev">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.london">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.madrid">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.minsk">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.moscow">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.newyork">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.paris">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.roma">حمل و نقل</string>
-	<string name="type.railway.subway_entrance.spb">حمل و نقل</string>
+	<string name="type.railway.subway_entrance.adana">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.algiers">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.almaty">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.amsterdam">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.ankara">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.athens">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.baku">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.bangkok">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.barcelona">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.beijing">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.bengalore">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.berlin">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.brasilia">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.brescia">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.brussels">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.bucharest">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.budapest">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.buenos_aires">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.bursa">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.cairo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.caracas">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.catania">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.changchun">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.chengdu">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.chicago">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.chongqing">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.dalian">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.delhi">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.dnepro">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.dubai">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.ekb">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.fukuoka">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.glasgow">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.guangzhou">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.hamburg">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.helsinki">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.hiroshima">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.isfahan">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.istanbul">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.izmir">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kazan">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kharkiv">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kiev">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kobe">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kolkata">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kunming">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.kyoto">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.la">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.lausanne">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.lille">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.lima">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.lisboa">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.lisbon">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.london">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.lyon">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.madrid">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.malaga">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.manila">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.maracaibo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.mashhad">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.mecca">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.medellin">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.mexico">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.milan">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.minsk">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.montreal">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.moscow">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.munchen">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.nagoya">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.newyork">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.nnov">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.novosibirsk">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.osaka">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.oslo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.palma">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.panama">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.paris">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.philadelphia">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.pyongyang">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.rennes">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.rio">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.roma">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.rotterdam">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.samara">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.santiago">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.santo_domingo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.saopaulo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.sapporo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.sendai">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.sf">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.shanghai">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.shiraz">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.sofia">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.spb">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.stockholm">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.tabriz">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.taipei">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.taoyuan">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.tashkent">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.tbilisi">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.tianjin">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.tokyo">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.valencia">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.vienna">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.warszawa">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.washington">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.wuhan">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.yerevan">ورودی مترو</string>
+	<string name="type.railway.subway_entrance.yokohama">ورودی مترو</string>
 	<string name="type.railway.tram_stop">ایستگاه قطار</string>
 	<string name="type.shop">فروشگاه</string>
 	<string name="type.shop.alcohol">فروشگاه</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 9c0b869021..5e5c5b44f7 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1241,29 +1241,225 @@
 	<string name="type.railway.station.light_rail">Rautatieasema</string>
 	<string name="type.railway.station.monorail">Rautatieasema</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway_entrance">Metron sisäänkäynti</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.algiers">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.almaty">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.amsterdam">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.ankara">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.athens">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.baku">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.bangkok">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.barcelona">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.beijing">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.bengalore">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.berlin">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.brasilia">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.brescia">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.brussels">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.bucharest">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.budapest">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.bursa">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.cairo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.caracas">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.catania">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.changchun">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.chengdu">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.chicago">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.chongqing">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.dalian">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.delhi">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.dnepro">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.dubai">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.ekb">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.fukuoka">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.glasgow">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.guangzhou">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.hamburg">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.helsinki">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.hiroshima">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.isfahan">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.istanbul">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.izmir">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kazan">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kharkiv">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kiev">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kobe">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kolkata">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kunming">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.kyoto">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.la">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.lausanne">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.lille">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.lima">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.lisboa">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.lisbon">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.london">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.lyon">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.madrid">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.malaga">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.manila">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.maracaibo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.mashhad">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.mecca">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.medellin">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.mexico">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.milan">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.minsk">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.montreal">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.moscow">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.munchen">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.nagoya">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.newyork">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.nnov">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.osaka">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.oslo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.palma">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.panama">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.paris">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.philadelphia">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.pyongyang">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.rennes">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.rio">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.roma">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.rotterdam">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.samara">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.santiago">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.saopaulo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.sapporo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.sendai">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.sf">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.shanghai">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.shiraz">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.sofia">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.spb">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.stockholm">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.tabriz">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.taipei">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.taoyuan">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.tashkent">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.tbilisi">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.tianjin">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.tokyo">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.valencia">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.vienna">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.warszawa">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.washington">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.wuhan">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.yerevan">Metron sisäänkäynti</string>
+	<string name="type.railway.subway_entrance.yokohama">Metron sisäänkäynti</string>
 	<string name="type.railway.tram_stop">Raitiovaunupysäkki</string>
 	<string name="type.shop">Kauppa</string>
 	<string name="type.shop.alcohol">Alkoholikauppa</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 225e38971a..d4e18be35a 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1375,32 +1375,228 @@
 	<string name="type.railway.station.light_rail">Gare</string>
 	<string name="type.railway.station.monorail">Gare</string>
 	<string name="type.railway.station.subway">Station de métro</string>
-	<string name="type.railway.station.subway.barcelona">Métro</string>
-	<string name="type.railway.station.subway.berlin">Métro</string>
-	<string name="type.railway.station.subway.kiev">Métro</string>
-	<string name="type.railway.station.subway.london">Métro</string>
-	<string name="type.railway.station.subway.madrid">Métro</string>
-	<string name="type.railway.station.subway.minsk">Métro</string>
-	<string name="type.railway.station.subway.moscow">Métro</string>
-	<string name="type.railway.station.subway.newyork">Métro</string>
+	<string name="type.railway.station.subway.adana">Station de métro</string>
+	<string name="type.railway.station.subway.algiers">Station de métro</string>
+	<string name="type.railway.station.subway.almaty">Station de métro</string>
+	<string name="type.railway.station.subway.amsterdam">Station de métro</string>
+	<string name="type.railway.station.subway.ankara">Station de métro</string>
+	<string name="type.railway.station.subway.athens">Station de métro</string>
+	<string name="type.railway.station.subway.baku">Station de métro</string>
+	<string name="type.railway.station.subway.bangkok">Station de métro</string>
+	<string name="type.railway.station.subway.barcelona">Station de métro</string>
+	<string name="type.railway.station.subway.beijing">Station de métro</string>
+	<string name="type.railway.station.subway.bengalore">Station de métro</string>
+	<string name="type.railway.station.subway.berlin">Station de métro</string>
+	<string name="type.railway.station.subway.brasilia">Station de métro</string>
+	<string name="type.railway.station.subway.brescia">Station de métro</string>
+	<string name="type.railway.station.subway.brussels">Station de métro</string>
+	<string name="type.railway.station.subway.bucharest">Station de métro</string>
+	<string name="type.railway.station.subway.budapest">Station de métro</string>
+	<string name="type.railway.station.subway.buenos_aires">Station de métro</string>
+	<string name="type.railway.station.subway.bursa">Station de métro</string>
+	<string name="type.railway.station.subway.cairo">Station de métro</string>
+	<string name="type.railway.station.subway.caracas">Station de métro</string>
+	<string name="type.railway.station.subway.catania">Station de métro</string>
+	<string name="type.railway.station.subway.changchun">Station de métro</string>
+	<string name="type.railway.station.subway.chengdu">Station de métro</string>
+	<string name="type.railway.station.subway.chicago">Station de métro</string>
+	<string name="type.railway.station.subway.chongqing">Station de métro</string>
+	<string name="type.railway.station.subway.dalian">Station de métro</string>
+	<string name="type.railway.station.subway.delhi">Station de métro</string>
+	<string name="type.railway.station.subway.dnepro">Station de métro</string>
+	<string name="type.railway.station.subway.dubai">Station de métro</string>
+	<string name="type.railway.station.subway.ekb">Station de métro</string>
+	<string name="type.railway.station.subway.fukuoka">Station de métro</string>
+	<string name="type.railway.station.subway.glasgow">Station de métro</string>
+	<string name="type.railway.station.subway.guangzhou">Station de métro</string>
+	<string name="type.railway.station.subway.hamburg">Station de métro</string>
+	<string name="type.railway.station.subway.helsinki">Station de métro</string>
+	<string name="type.railway.station.subway.hiroshima">Station de métro</string>
+	<string name="type.railway.station.subway.isfahan">Station de métro</string>
+	<string name="type.railway.station.subway.istanbul">Station de métro</string>
+	<string name="type.railway.station.subway.izmir">Station de métro</string>
+	<string name="type.railway.station.subway.kazan">Station de métro</string>
+	<string name="type.railway.station.subway.kharkiv">Station de métro</string>
+	<string name="type.railway.station.subway.kiev">Station de métro</string>
+	<string name="type.railway.station.subway.kobe">Station de métro</string>
+	<string name="type.railway.station.subway.kolkata">Station de métro</string>
+	<string name="type.railway.station.subway.kunming">Station de métro</string>
+	<string name="type.railway.station.subway.kyoto">Station de métro</string>
+	<string name="type.railway.station.subway.la">Station de métro</string>
+	<string name="type.railway.station.subway.lausanne">Station de métro</string>
+	<string name="type.railway.station.subway.lille">Station de métro</string>
+	<string name="type.railway.station.subway.lima">Station de métro</string>
+	<string name="type.railway.station.subway.lisboa">Station de métro</string>
+	<string name="type.railway.station.subway.lisbon">Station de métro</string>
+	<string name="type.railway.station.subway.london">Station de métro</string>
+	<string name="type.railway.station.subway.lyon">Station de métro</string>
+	<string name="type.railway.station.subway.madrid">Station de métro</string>
+	<string name="type.railway.station.subway.malaga">Station de métro</string>
+	<string name="type.railway.station.subway.manila">Station de métro</string>
+	<string name="type.railway.station.subway.maracaibo">Station de métro</string>
+	<string name="type.railway.station.subway.mashhad">Station de métro</string>
+	<string name="type.railway.station.subway.mecca">Station de métro</string>
+	<string name="type.railway.station.subway.medellin">Station de métro</string>
+	<string name="type.railway.station.subway.mexico">Station de métro</string>
+	<string name="type.railway.station.subway.milan">Station de métro</string>
+	<string name="type.railway.station.subway.minsk">Station de métro</string>
+	<string name="type.railway.station.subway.montreal">Station de métro</string>
+	<string name="type.railway.station.subway.moscow">Station de métro</string>
+	<string name="type.railway.station.subway.munchen">Station de métro</string>
+	<string name="type.railway.station.subway.nagoya">Station de métro</string>
+	<string name="type.railway.station.subway.newyork">Station de métro</string>
+	<string name="type.railway.station.subway.nnov">Station de métro</string>
+	<string name="type.railway.station.subway.novosibirsk">Station de métro</string>
+	<string name="type.railway.station.subway.osaka">Station de métro</string>
+	<string name="type.railway.station.subway.oslo">Station de métro</string>
+	<string name="type.railway.station.subway.palma">Station de métro</string>
+	<string name="type.railway.station.subway.panama">Station de métro</string>
 	<string name="type.railway.station.subway.paris">Station de métro</string>
-	<string name="type.railway.station.subway.roma">Métro</string>
-	<string name="type.railway.station.subway.spb">Métro</string>
+	<string name="type.railway.station.subway.philadelphia">Station de métro</string>
+	<string name="type.railway.station.subway.pyongyang">Station de métro</string>
+	<string name="type.railway.station.subway.rennes">Station de métro</string>
+	<string name="type.railway.station.subway.rio">Station de métro</string>
+	<string name="type.railway.station.subway.roma">Station de métro</string>
+	<string name="type.railway.station.subway.rotterdam">Station de métro</string>
+	<string name="type.railway.station.subway.samara">Station de métro</string>
+	<string name="type.railway.station.subway.santiago">Station de métro</string>
+	<string name="type.railway.station.subway.santo_domingo">Station de métro</string>
+	<string name="type.railway.station.subway.saopaulo">Station de métro</string>
+	<string name="type.railway.station.subway.sapporo">Station de métro</string>
+	<string name="type.railway.station.subway.sendai">Station de métro</string>
+	<string name="type.railway.station.subway.sf">Station de métro</string>
+	<string name="type.railway.station.subway.shanghai">Station de métro</string>
+	<string name="type.railway.station.subway.shiraz">Station de métro</string>
+	<string name="type.railway.station.subway.sofia">Station de métro</string>
+	<string name="type.railway.station.subway.spb">Station de métro</string>
+	<string name="type.railway.station.subway.stockholm">Station de métro</string>
+	<string name="type.railway.station.subway.tabriz">Station de métro</string>
+	<string name="type.railway.station.subway.taipei">Station de métro</string>
+	<string name="type.railway.station.subway.taoyuan">Station de métro</string>
+	<string name="type.railway.station.subway.tashkent">Station de métro</string>
+	<string name="type.railway.station.subway.tbilisi">Station de métro</string>
+	<string name="type.railway.station.subway.tianjin">Station de métro</string>
+	<string name="type.railway.station.subway.tokyo">Station de métro</string>
+	<string name="type.railway.station.subway.valencia">Station de métro</string>
+	<string name="type.railway.station.subway.vienna">Station de métro</string>
+	<string name="type.railway.station.subway.warszawa">Station de métro</string>
+	<string name="type.railway.station.subway.washington">Station de métro</string>
+	<string name="type.railway.station.subway.wuhan">Station de métro</string>
+	<string name="type.railway.station.subway.yerevan">Station de métro</string>
+	<string name="type.railway.station.subway.yokohama">Station de métro</string>
 	<string name="type.railway.subway">Ligne de métro</string>
 	<string name="type.railway.subway.bridge">Voie de métro</string>
 	<string name="type.railway.subway.tunnel">Voie de métro</string>
 	<string name="type.railway.subway_entrance">Entrée du métro</string>
-	<string name="type.railway.subway_entrance.barcelona">Métro</string>
-	<string name="type.railway.subway_entrance.berlin">Métro</string>
-	<string name="type.railway.subway_entrance.kiev">Métro</string>
-	<string name="type.railway.subway_entrance.london">Métro</string>
-	<string name="type.railway.subway_entrance.madrid">Métro</string>
-	<string name="type.railway.subway_entrance.minsk">Métro</string>
-	<string name="type.railway.subway_entrance.moscow">Métro</string>
-	<string name="type.railway.subway_entrance.newyork">Métro</string>
-	<string name="type.railway.subway_entrance.paris">Métro</string>
-	<string name="type.railway.subway_entrance.roma">Métro</string>
-	<string name="type.railway.subway_entrance.spb">Métro</string>
+	<string name="type.railway.subway_entrance.adana">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.algiers">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.almaty">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.amsterdam">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.ankara">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.athens">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.baku">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.bangkok">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.barcelona">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.beijing">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.bengalore">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.berlin">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.brasilia">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.brescia">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.brussels">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.bucharest">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.budapest">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.bursa">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.cairo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.caracas">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.catania">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.changchun">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.chengdu">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.chicago">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.chongqing">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.dalian">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.delhi">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.dnepro">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.dubai">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.ekb">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.fukuoka">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.glasgow">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.guangzhou">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.hamburg">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.helsinki">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.hiroshima">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.isfahan">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.istanbul">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.izmir">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kazan">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kharkiv">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kiev">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kobe">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kolkata">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kunming">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.kyoto">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.la">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.lausanne">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.lille">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.lima">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.lisboa">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.lisbon">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.london">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.lyon">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.madrid">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.malaga">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.manila">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.maracaibo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.mashhad">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.mecca">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.medellin">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.mexico">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.milan">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.minsk">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.montreal">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.moscow">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.munchen">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.nagoya">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.newyork">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.nnov">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.osaka">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.oslo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.palma">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.panama">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.paris">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.philadelphia">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.pyongyang">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.rennes">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.rio">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.roma">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.rotterdam">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.samara">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.santiago">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.saopaulo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.sapporo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.sendai">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.sf">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.shanghai">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.shiraz">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.sofia">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.spb">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.stockholm">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.tabriz">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.taipei">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.taoyuan">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.tashkent">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.tbilisi">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.tianjin">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.tokyo">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.valencia">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.vienna">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.warszawa">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.washington">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.wuhan">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.yerevan">Entrée du métro</string>
+	<string name="type.railway.subway_entrance.yokohama">Entrée du métro</string>
 	<string name="type.railway.tram">Voie de tramway</string>
 	<string name="type.railway.tram.bridge">Voie de tramway</string>
 	<string name="type.railway.tram.tunnel">Voie de tramway</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index b2516c9cbe..06eec6f530 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1226,29 +1226,225 @@
 	<string name="type.railway.station.light_rail">Vonatmegálló</string>
 	<string name="type.railway.station.monorail">Vonatmegálló</string>
 	<string name="type.railway.station.subway">Földalatti</string>
+	<string name="type.railway.station.subway.adana">Földalatti</string>
+	<string name="type.railway.station.subway.algiers">Földalatti</string>
+	<string name="type.railway.station.subway.almaty">Földalatti</string>
+	<string name="type.railway.station.subway.amsterdam">Földalatti</string>
+	<string name="type.railway.station.subway.ankara">Földalatti</string>
+	<string name="type.railway.station.subway.athens">Földalatti</string>
+	<string name="type.railway.station.subway.baku">Földalatti</string>
+	<string name="type.railway.station.subway.bangkok">Földalatti</string>
 	<string name="type.railway.station.subway.barcelona">Földalatti</string>
+	<string name="type.railway.station.subway.beijing">Földalatti</string>
+	<string name="type.railway.station.subway.bengalore">Földalatti</string>
 	<string name="type.railway.station.subway.berlin">Földalatti</string>
+	<string name="type.railway.station.subway.brasilia">Földalatti</string>
+	<string name="type.railway.station.subway.brescia">Földalatti</string>
+	<string name="type.railway.station.subway.brussels">Földalatti</string>
+	<string name="type.railway.station.subway.bucharest">Földalatti</string>
+	<string name="type.railway.station.subway.budapest">Földalatti</string>
+	<string name="type.railway.station.subway.buenos_aires">Földalatti</string>
+	<string name="type.railway.station.subway.bursa">Földalatti</string>
+	<string name="type.railway.station.subway.cairo">Földalatti</string>
+	<string name="type.railway.station.subway.caracas">Földalatti</string>
+	<string name="type.railway.station.subway.catania">Földalatti</string>
+	<string name="type.railway.station.subway.changchun">Földalatti</string>
+	<string name="type.railway.station.subway.chengdu">Földalatti</string>
+	<string name="type.railway.station.subway.chicago">Földalatti</string>
+	<string name="type.railway.station.subway.chongqing">Földalatti</string>
+	<string name="type.railway.station.subway.dalian">Földalatti</string>
+	<string name="type.railway.station.subway.delhi">Földalatti</string>
+	<string name="type.railway.station.subway.dnepro">Földalatti</string>
+	<string name="type.railway.station.subway.dubai">Földalatti</string>
+	<string name="type.railway.station.subway.ekb">Földalatti</string>
+	<string name="type.railway.station.subway.fukuoka">Földalatti</string>
+	<string name="type.railway.station.subway.glasgow">Földalatti</string>
+	<string name="type.railway.station.subway.guangzhou">Földalatti</string>
+	<string name="type.railway.station.subway.hamburg">Földalatti</string>
+	<string name="type.railway.station.subway.helsinki">Földalatti</string>
+	<string name="type.railway.station.subway.hiroshima">Földalatti</string>
+	<string name="type.railway.station.subway.isfahan">Földalatti</string>
+	<string name="type.railway.station.subway.istanbul">Földalatti</string>
+	<string name="type.railway.station.subway.izmir">Földalatti</string>
+	<string name="type.railway.station.subway.kazan">Földalatti</string>
+	<string name="type.railway.station.subway.kharkiv">Földalatti</string>
 	<string name="type.railway.station.subway.kiev">Földalatti</string>
+	<string name="type.railway.station.subway.kobe">Földalatti</string>
+	<string name="type.railway.station.subway.kolkata">Földalatti</string>
+	<string name="type.railway.station.subway.kunming">Földalatti</string>
+	<string name="type.railway.station.subway.kyoto">Földalatti</string>
+	<string name="type.railway.station.subway.la">Földalatti</string>
+	<string name="type.railway.station.subway.lausanne">Földalatti</string>
+	<string name="type.railway.station.subway.lille">Földalatti</string>
+	<string name="type.railway.station.subway.lima">Földalatti</string>
+	<string name="type.railway.station.subway.lisboa">Földalatti</string>
+	<string name="type.railway.station.subway.lisbon">Földalatti</string>
 	<string name="type.railway.station.subway.london">Földalatti</string>
+	<string name="type.railway.station.subway.lyon">Földalatti</string>
 	<string name="type.railway.station.subway.madrid">Földalatti</string>
+	<string name="type.railway.station.subway.malaga">Földalatti</string>
+	<string name="type.railway.station.subway.manila">Földalatti</string>
+	<string name="type.railway.station.subway.maracaibo">Földalatti</string>
+	<string name="type.railway.station.subway.mashhad">Földalatti</string>
+	<string name="type.railway.station.subway.mecca">Földalatti</string>
+	<string name="type.railway.station.subway.medellin">Földalatti</string>
+	<string name="type.railway.station.subway.mexico">Földalatti</string>
+	<string name="type.railway.station.subway.milan">Földalatti</string>
 	<string name="type.railway.station.subway.minsk">Földalatti</string>
+	<string name="type.railway.station.subway.montreal">Földalatti</string>
 	<string name="type.railway.station.subway.moscow">Földalatti</string>
+	<string name="type.railway.station.subway.munchen">Földalatti</string>
+	<string name="type.railway.station.subway.nagoya">Földalatti</string>
 	<string name="type.railway.station.subway.newyork">Földalatti</string>
+	<string name="type.railway.station.subway.nnov">Földalatti</string>
+	<string name="type.railway.station.subway.novosibirsk">Földalatti</string>
+	<string name="type.railway.station.subway.osaka">Földalatti</string>
+	<string name="type.railway.station.subway.oslo">Földalatti</string>
+	<string name="type.railway.station.subway.palma">Földalatti</string>
+	<string name="type.railway.station.subway.panama">Földalatti</string>
 	<string name="type.railway.station.subway.paris">Földalatti</string>
+	<string name="type.railway.station.subway.philadelphia">Földalatti</string>
+	<string name="type.railway.station.subway.pyongyang">Földalatti</string>
+	<string name="type.railway.station.subway.rennes">Földalatti</string>
+	<string name="type.railway.station.subway.rio">Földalatti</string>
 	<string name="type.railway.station.subway.roma">Földalatti</string>
+	<string name="type.railway.station.subway.rotterdam">Földalatti</string>
+	<string name="type.railway.station.subway.samara">Földalatti</string>
+	<string name="type.railway.station.subway.santiago">Földalatti</string>
+	<string name="type.railway.station.subway.santo_domingo">Földalatti</string>
+	<string name="type.railway.station.subway.saopaulo">Földalatti</string>
+	<string name="type.railway.station.subway.sapporo">Földalatti</string>
+	<string name="type.railway.station.subway.sendai">Földalatti</string>
+	<string name="type.railway.station.subway.sf">Földalatti</string>
+	<string name="type.railway.station.subway.shanghai">Földalatti</string>
+	<string name="type.railway.station.subway.shiraz">Földalatti</string>
+	<string name="type.railway.station.subway.sofia">Földalatti</string>
 	<string name="type.railway.station.subway.spb">Földalatti</string>
+	<string name="type.railway.station.subway.stockholm">Földalatti</string>
+	<string name="type.railway.station.subway.tabriz">Földalatti</string>
+	<string name="type.railway.station.subway.taipei">Földalatti</string>
+	<string name="type.railway.station.subway.taoyuan">Földalatti</string>
+	<string name="type.railway.station.subway.tashkent">Földalatti</string>
+	<string name="type.railway.station.subway.tbilisi">Földalatti</string>
+	<string name="type.railway.station.subway.tianjin">Földalatti</string>
+	<string name="type.railway.station.subway.tokyo">Földalatti</string>
+	<string name="type.railway.station.subway.valencia">Földalatti</string>
+	<string name="type.railway.station.subway.vienna">Földalatti</string>
+	<string name="type.railway.station.subway.warszawa">Földalatti</string>
+	<string name="type.railway.station.subway.washington">Földalatti</string>
+	<string name="type.railway.station.subway.wuhan">Földalatti</string>
+	<string name="type.railway.station.subway.yerevan">Földalatti</string>
+	<string name="type.railway.station.subway.yokohama">Földalatti</string>
 	<string name="type.railway.subway_entrance">Földalatti bejárat</string>
-	<string name="type.railway.subway_entrance.barcelona">Földalatti</string>
-	<string name="type.railway.subway_entrance.berlin">Földalatti</string>
-	<string name="type.railway.subway_entrance.kiev">Földalatti</string>
-	<string name="type.railway.subway_entrance.london">Földalatti</string>
-	<string name="type.railway.subway_entrance.madrid">Földalatti</string>
-	<string name="type.railway.subway_entrance.minsk">Földalatti</string>
-	<string name="type.railway.subway_entrance.moscow">Földalatti</string>
-	<string name="type.railway.subway_entrance.newyork">Földalatti</string>
-	<string name="type.railway.subway_entrance.paris">Földalatti</string>
-	<string name="type.railway.subway_entrance.roma">Földalatti</string>
-	<string name="type.railway.subway_entrance.spb">Földalatti</string>
+	<string name="type.railway.subway_entrance.adana">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.algiers">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.almaty">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.amsterdam">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.ankara">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.athens">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.baku">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.bangkok">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.barcelona">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.beijing">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.bengalore">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.berlin">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.brasilia">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.brescia">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.brussels">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.bucharest">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.budapest">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.bursa">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.cairo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.caracas">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.catania">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.changchun">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.chengdu">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.chicago">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.chongqing">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.dalian">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.delhi">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.dnepro">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.dubai">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.ekb">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.fukuoka">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.glasgow">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.guangzhou">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.hamburg">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.helsinki">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.hiroshima">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.isfahan">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.istanbul">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.izmir">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kazan">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kharkiv">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kiev">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kobe">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kolkata">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kunming">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.kyoto">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.la">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.lausanne">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.lille">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.lima">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.lisboa">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.lisbon">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.london">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.lyon">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.madrid">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.malaga">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.manila">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.maracaibo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.mashhad">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.mecca">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.medellin">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.mexico">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.milan">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.minsk">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.montreal">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.moscow">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.munchen">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.nagoya">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.newyork">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.nnov">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.osaka">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.oslo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.palma">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.panama">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.paris">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.philadelphia">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.pyongyang">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.rennes">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.rio">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.roma">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.rotterdam">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.samara">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.santiago">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.saopaulo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.sapporo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.sendai">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.sf">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.shanghai">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.shiraz">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.sofia">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.spb">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.stockholm">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.tabriz">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.taipei">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.taoyuan">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.tashkent">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.tbilisi">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.tianjin">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.tokyo">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.valencia">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.vienna">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.warszawa">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.washington">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.wuhan">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.yerevan">Földalatti bejárat</string>
+	<string name="type.railway.subway_entrance.yokohama">Földalatti bejárat</string>
 	<string name="type.railway.tram_stop">Villamosmegálló</string>
 	<string name="type.shop">Bolt</string>
 	<string name="type.shop.alcohol">Italbolt</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index aa7ba5d693..6841eb2279 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -1221,29 +1221,225 @@
 	<string name="type.railway.station.light_rail">Rel kereta api</string>
 	<string name="type.railway.station.monorail">Rel kereta api</string>
 	<string name="type.railway.station.subway">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.adana">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.algiers">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.almaty">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.amsterdam">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.ankara">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.athens">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.baku">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.bangkok">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.barcelona">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.beijing">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.bengalore">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.berlin">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.brasilia">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.brescia">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.brussels">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.bucharest">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.budapest">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.buenos_aires">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.bursa">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.cairo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.caracas">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.catania">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.changchun">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.chengdu">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.chicago">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.chongqing">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.dalian">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.delhi">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.dnepro">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.dubai">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.ekb">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.fukuoka">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.glasgow">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.guangzhou">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.hamburg">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.helsinki">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.hiroshima">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.isfahan">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.istanbul">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.izmir">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.kazan">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.kharkiv">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.kiev">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.kobe">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.kolkata">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.kunming">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.kyoto">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.la">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.lausanne">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.lille">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.lima">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.lisboa">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.lisbon">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.london">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.lyon">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.madrid">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.malaga">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.manila">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.maracaibo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.mashhad">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.mecca">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.medellin">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.mexico">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.milan">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.minsk">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.montreal">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.moscow">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.munchen">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.nagoya">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.newyork">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.nnov">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.novosibirsk">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.osaka">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.oslo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.palma">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.panama">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.paris">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.philadelphia">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.pyongyang">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.rennes">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.rio">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.roma">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.rotterdam">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.samara">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.santiago">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.santo_domingo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.saopaulo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.sapporo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.sendai">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.sf">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.shanghai">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.shiraz">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.sofia">Stasiun bawah tanah</string>
 	<string name="type.railway.station.subway.spb">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.stockholm">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.tabriz">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.taipei">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.taoyuan">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.tashkent">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.tbilisi">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.tianjin">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.tokyo">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.valencia">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.vienna">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.warszawa">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.washington">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.wuhan">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.yerevan">Stasiun bawah tanah</string>
+	<string name="type.railway.station.subway.yokohama">Stasiun bawah tanah</string>
 	<string name="type.railway.subway_entrance">Pintu masuk kereta bawah tanah</string>
-	<string name="type.railway.subway_entrance.barcelona">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.berlin">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.kiev">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.london">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.madrid">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.minsk">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.moscow">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.newyork">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.paris">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.roma">Stasiun bawah tanah</string>
-	<string name="type.railway.subway_entrance.spb">Stasiun bawah tanah</string>
+	<string name="type.railway.subway_entrance.adana">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.algiers">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.almaty">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.amsterdam">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.ankara">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.athens">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.baku">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.bangkok">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.barcelona">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.beijing">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.bengalore">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.berlin">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.brasilia">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.brescia">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.brussels">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.bucharest">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.budapest">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.bursa">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.cairo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.caracas">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.catania">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.changchun">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.chengdu">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.chicago">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.chongqing">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.dalian">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.delhi">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.dnepro">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.dubai">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.ekb">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.fukuoka">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.glasgow">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.guangzhou">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.hamburg">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.helsinki">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.hiroshima">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.isfahan">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.istanbul">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.izmir">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kazan">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kharkiv">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kiev">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kobe">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kolkata">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kunming">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.kyoto">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.la">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.lausanne">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.lille">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.lima">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.lisboa">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.lisbon">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.london">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.lyon">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.madrid">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.malaga">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.manila">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.maracaibo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.mashhad">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.mecca">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.medellin">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.mexico">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.milan">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.minsk">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.montreal">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.moscow">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.munchen">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.nagoya">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.newyork">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.nnov">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.osaka">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.oslo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.palma">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.panama">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.paris">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.philadelphia">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.pyongyang">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.rennes">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.rio">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.roma">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.rotterdam">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.samara">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.santiago">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.saopaulo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.sapporo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.sendai">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.sf">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.shanghai">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.shiraz">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.sofia">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.spb">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.stockholm">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.tabriz">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.taipei">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.taoyuan">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.tashkent">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.tbilisi">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.tianjin">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.tokyo">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.valencia">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.vienna">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.warszawa">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.washington">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.wuhan">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.yerevan">Pintu masuk kereta bawah tanah</string>
+	<string name="type.railway.subway_entrance.yokohama">Pintu masuk kereta bawah tanah</string>
 	<string name="type.railway.tram_stop">Perhentian trem</string>
 	<string name="type.shop">Toko</string>
 	<string name="type.shop.alcohol">Toko alkohol</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 5201e5d4a0..1f723f5abd 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1257,29 +1257,225 @@
 	<string name="type.railway.station.light_rail">Stazione ferroviaria</string>
 	<string name="type.railway.station.monorail">Stazione ferroviaria</string>
 	<string name="type.railway.station.subway">Metrò</string>
+	<string name="type.railway.station.subway.adana">Metrò</string>
+	<string name="type.railway.station.subway.algiers">Metrò</string>
+	<string name="type.railway.station.subway.almaty">Metrò</string>
+	<string name="type.railway.station.subway.amsterdam">Metrò</string>
+	<string name="type.railway.station.subway.ankara">Metrò</string>
+	<string name="type.railway.station.subway.athens">Metrò</string>
+	<string name="type.railway.station.subway.baku">Metrò</string>
+	<string name="type.railway.station.subway.bangkok">Metrò</string>
 	<string name="type.railway.station.subway.barcelona">Metrò</string>
+	<string name="type.railway.station.subway.beijing">Metrò</string>
+	<string name="type.railway.station.subway.bengalore">Metrò</string>
 	<string name="type.railway.station.subway.berlin">Metrò</string>
+	<string name="type.railway.station.subway.brasilia">Metrò</string>
+	<string name="type.railway.station.subway.brescia">Metrò</string>
+	<string name="type.railway.station.subway.brussels">Metrò</string>
+	<string name="type.railway.station.subway.bucharest">Metrò</string>
+	<string name="type.railway.station.subway.budapest">Metrò</string>
+	<string name="type.railway.station.subway.buenos_aires">Metrò</string>
+	<string name="type.railway.station.subway.bursa">Metrò</string>
+	<string name="type.railway.station.subway.cairo">Metrò</string>
+	<string name="type.railway.station.subway.caracas">Metrò</string>
+	<string name="type.railway.station.subway.catania">Metrò</string>
+	<string name="type.railway.station.subway.changchun">Metrò</string>
+	<string name="type.railway.station.subway.chengdu">Metrò</string>
+	<string name="type.railway.station.subway.chicago">Metrò</string>
+	<string name="type.railway.station.subway.chongqing">Metrò</string>
+	<string name="type.railway.station.subway.dalian">Metrò</string>
+	<string name="type.railway.station.subway.delhi">Metrò</string>
+	<string name="type.railway.station.subway.dnepro">Metrò</string>
+	<string name="type.railway.station.subway.dubai">Metrò</string>
+	<string name="type.railway.station.subway.ekb">Metrò</string>
+	<string name="type.railway.station.subway.fukuoka">Metrò</string>
+	<string name="type.railway.station.subway.glasgow">Metrò</string>
+	<string name="type.railway.station.subway.guangzhou">Metrò</string>
+	<string name="type.railway.station.subway.hamburg">Metrò</string>
+	<string name="type.railway.station.subway.helsinki">Metrò</string>
+	<string name="type.railway.station.subway.hiroshima">Metrò</string>
+	<string name="type.railway.station.subway.isfahan">Metrò</string>
+	<string name="type.railway.station.subway.istanbul">Metrò</string>
+	<string name="type.railway.station.subway.izmir">Metrò</string>
+	<string name="type.railway.station.subway.kazan">Metrò</string>
+	<string name="type.railway.station.subway.kharkiv">Metrò</string>
 	<string name="type.railway.station.subway.kiev">Metrò</string>
+	<string name="type.railway.station.subway.kobe">Metrò</string>
+	<string name="type.railway.station.subway.kolkata">Metrò</string>
+	<string name="type.railway.station.subway.kunming">Metrò</string>
+	<string name="type.railway.station.subway.kyoto">Metrò</string>
+	<string name="type.railway.station.subway.la">Metrò</string>
+	<string name="type.railway.station.subway.lausanne">Metrò</string>
+	<string name="type.railway.station.subway.lille">Metrò</string>
+	<string name="type.railway.station.subway.lima">Metrò</string>
+	<string name="type.railway.station.subway.lisboa">Metrò</string>
+	<string name="type.railway.station.subway.lisbon">Metrò</string>
 	<string name="type.railway.station.subway.london">Metrò</string>
+	<string name="type.railway.station.subway.lyon">Metrò</string>
 	<string name="type.railway.station.subway.madrid">Metrò</string>
+	<string name="type.railway.station.subway.malaga">Metrò</string>
+	<string name="type.railway.station.subway.manila">Metrò</string>
+	<string name="type.railway.station.subway.maracaibo">Metrò</string>
+	<string name="type.railway.station.subway.mashhad">Metrò</string>
+	<string name="type.railway.station.subway.mecca">Metrò</string>
+	<string name="type.railway.station.subway.medellin">Metrò</string>
+	<string name="type.railway.station.subway.mexico">Metrò</string>
+	<string name="type.railway.station.subway.milan">Metrò</string>
 	<string name="type.railway.station.subway.minsk">Metrò</string>
+	<string name="type.railway.station.subway.montreal">Metrò</string>
 	<string name="type.railway.station.subway.moscow">Metrò</string>
+	<string name="type.railway.station.subway.munchen">Metrò</string>
+	<string name="type.railway.station.subway.nagoya">Metrò</string>
 	<string name="type.railway.station.subway.newyork">Metrò</string>
+	<string name="type.railway.station.subway.nnov">Metrò</string>
+	<string name="type.railway.station.subway.novosibirsk">Metrò</string>
+	<string name="type.railway.station.subway.osaka">Metrò</string>
+	<string name="type.railway.station.subway.oslo">Metrò</string>
+	<string name="type.railway.station.subway.palma">Metrò</string>
+	<string name="type.railway.station.subway.panama">Metrò</string>
 	<string name="type.railway.station.subway.paris">Metrò</string>
+	<string name="type.railway.station.subway.philadelphia">Metrò</string>
+	<string name="type.railway.station.subway.pyongyang">Metrò</string>
+	<string name="type.railway.station.subway.rennes">Metrò</string>
+	<string name="type.railway.station.subway.rio">Metrò</string>
 	<string name="type.railway.station.subway.roma">Metrò</string>
+	<string name="type.railway.station.subway.rotterdam">Metrò</string>
+	<string name="type.railway.station.subway.samara">Metrò</string>
+	<string name="type.railway.station.subway.santiago">Metrò</string>
+	<string name="type.railway.station.subway.santo_domingo">Metrò</string>
+	<string name="type.railway.station.subway.saopaulo">Metrò</string>
+	<string name="type.railway.station.subway.sapporo">Metrò</string>
+	<string name="type.railway.station.subway.sendai">Metrò</string>
+	<string name="type.railway.station.subway.sf">Metrò</string>
+	<string name="type.railway.station.subway.shanghai">Metrò</string>
+	<string name="type.railway.station.subway.shiraz">Metrò</string>
+	<string name="type.railway.station.subway.sofia">Metrò</string>
 	<string name="type.railway.station.subway.spb">Metrò</string>
+	<string name="type.railway.station.subway.stockholm">Metrò</string>
+	<string name="type.railway.station.subway.tabriz">Metrò</string>
+	<string name="type.railway.station.subway.taipei">Metrò</string>
+	<string name="type.railway.station.subway.taoyuan">Metrò</string>
+	<string name="type.railway.station.subway.tashkent">Metrò</string>
+	<string name="type.railway.station.subway.tbilisi">Metrò</string>
+	<string name="type.railway.station.subway.tianjin">Metrò</string>
+	<string name="type.railway.station.subway.tokyo">Metrò</string>
+	<string name="type.railway.station.subway.valencia">Metrò</string>
+	<string name="type.railway.station.subway.vienna">Metrò</string>
+	<string name="type.railway.station.subway.warszawa">Metrò</string>
+	<string name="type.railway.station.subway.washington">Metrò</string>
+	<string name="type.railway.station.subway.wuhan">Metrò</string>
+	<string name="type.railway.station.subway.yerevan">Metrò</string>
+	<string name="type.railway.station.subway.yokohama">Metrò</string>
 	<string name="type.railway.subway_entrance">Stazione metropolitana</string>
-	<string name="type.railway.subway_entrance.barcelona">Metrò</string>
-	<string name="type.railway.subway_entrance.berlin">Metrò</string>
-	<string name="type.railway.subway_entrance.kiev">Metrò</string>
-	<string name="type.railway.subway_entrance.london">Metrò</string>
-	<string name="type.railway.subway_entrance.madrid">Metrò</string>
-	<string name="type.railway.subway_entrance.minsk">Metrò</string>
-	<string name="type.railway.subway_entrance.moscow">Metrò</string>
-	<string name="type.railway.subway_entrance.newyork">Metrò</string>
-	<string name="type.railway.subway_entrance.paris">Metrò</string>
-	<string name="type.railway.subway_entrance.roma">Metrò</string>
-	<string name="type.railway.subway_entrance.spb">Metrò</string>
+	<string name="type.railway.subway_entrance.adana">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.algiers">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.almaty">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.amsterdam">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.ankara">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.athens">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.baku">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.bangkok">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.barcelona">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.beijing">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.bengalore">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.berlin">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.brasilia">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.brescia">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.brussels">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.bucharest">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.budapest">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.bursa">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.cairo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.caracas">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.catania">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.changchun">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.chengdu">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.chicago">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.chongqing">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.dalian">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.delhi">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.dnepro">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.dubai">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.ekb">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.fukuoka">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.glasgow">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.guangzhou">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.hamburg">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.helsinki">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.hiroshima">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.isfahan">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.istanbul">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.izmir">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kazan">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kharkiv">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kiev">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kobe">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kolkata">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kunming">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.kyoto">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.la">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.lausanne">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.lille">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.lima">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.lisboa">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.lisbon">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.london">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.lyon">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.madrid">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.malaga">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.manila">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.maracaibo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.mashhad">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.mecca">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.medellin">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.mexico">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.milan">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.minsk">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.montreal">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.moscow">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.munchen">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.nagoya">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.newyork">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.nnov">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.osaka">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.oslo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.palma">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.panama">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.paris">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.philadelphia">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.pyongyang">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.rennes">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.rio">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.roma">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.rotterdam">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.samara">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.santiago">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.saopaulo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.sapporo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.sendai">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.sf">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.shanghai">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.shiraz">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.sofia">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.spb">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.stockholm">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.tabriz">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.taipei">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.taoyuan">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.tashkent">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.tbilisi">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.tianjin">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.tokyo">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.valencia">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.vienna">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.warszawa">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.washington">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.wuhan">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.yerevan">Stazione metropolitana</string>
+	<string name="type.railway.subway_entrance.yokohama">Stazione metropolitana</string>
 	<string name="type.railway.tram_stop">Fermata del tram</string>
 	<string name="type.shop">Negozio</string>
 	<string name="type.shop.alcohol">Enoteca</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 09f718fe9b..a1810c675e 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1356,29 +1356,225 @@
 	<string name="type.railway.station.light_rail">鉄道駅</string>
 	<string name="type.railway.station.monorail">鉄道駅</string>
 	<string name="type.railway.station.subway">地下鉄</string>
+	<string name="type.railway.station.subway.adana">地下鉄</string>
+	<string name="type.railway.station.subway.algiers">地下鉄</string>
+	<string name="type.railway.station.subway.almaty">地下鉄</string>
+	<string name="type.railway.station.subway.amsterdam">地下鉄</string>
+	<string name="type.railway.station.subway.ankara">地下鉄</string>
+	<string name="type.railway.station.subway.athens">地下鉄</string>
+	<string name="type.railway.station.subway.baku">地下鉄</string>
+	<string name="type.railway.station.subway.bangkok">地下鉄</string>
 	<string name="type.railway.station.subway.barcelona">地下鉄</string>
+	<string name="type.railway.station.subway.beijing">地下鉄</string>
+	<string name="type.railway.station.subway.bengalore">地下鉄</string>
 	<string name="type.railway.station.subway.berlin">地下鉄</string>
+	<string name="type.railway.station.subway.brasilia">地下鉄</string>
+	<string name="type.railway.station.subway.brescia">地下鉄</string>
+	<string name="type.railway.station.subway.brussels">地下鉄</string>
+	<string name="type.railway.station.subway.bucharest">地下鉄</string>
+	<string name="type.railway.station.subway.budapest">地下鉄</string>
+	<string name="type.railway.station.subway.buenos_aires">地下鉄</string>
+	<string name="type.railway.station.subway.bursa">地下鉄</string>
+	<string name="type.railway.station.subway.cairo">地下鉄</string>
+	<string name="type.railway.station.subway.caracas">地下鉄</string>
+	<string name="type.railway.station.subway.catania">地下鉄</string>
+	<string name="type.railway.station.subway.changchun">地下鉄</string>
+	<string name="type.railway.station.subway.chengdu">地下鉄</string>
+	<string name="type.railway.station.subway.chicago">地下鉄</string>
+	<string name="type.railway.station.subway.chongqing">地下鉄</string>
+	<string name="type.railway.station.subway.dalian">地下鉄</string>
+	<string name="type.railway.station.subway.delhi">地下鉄</string>
+	<string name="type.railway.station.subway.dnepro">地下鉄</string>
+	<string name="type.railway.station.subway.dubai">地下鉄</string>
+	<string name="type.railway.station.subway.ekb">地下鉄</string>
+	<string name="type.railway.station.subway.fukuoka">地下鉄</string>
+	<string name="type.railway.station.subway.glasgow">地下鉄</string>
+	<string name="type.railway.station.subway.guangzhou">地下鉄</string>
+	<string name="type.railway.station.subway.hamburg">地下鉄</string>
+	<string name="type.railway.station.subway.helsinki">地下鉄</string>
+	<string name="type.railway.station.subway.hiroshima">地下鉄</string>
+	<string name="type.railway.station.subway.isfahan">地下鉄</string>
+	<string name="type.railway.station.subway.istanbul">地下鉄</string>
+	<string name="type.railway.station.subway.izmir">地下鉄</string>
+	<string name="type.railway.station.subway.kazan">地下鉄</string>
+	<string name="type.railway.station.subway.kharkiv">地下鉄</string>
 	<string name="type.railway.station.subway.kiev">地下鉄</string>
+	<string name="type.railway.station.subway.kobe">地下鉄</string>
+	<string name="type.railway.station.subway.kolkata">地下鉄</string>
+	<string name="type.railway.station.subway.kunming">地下鉄</string>
+	<string name="type.railway.station.subway.kyoto">地下鉄</string>
+	<string name="type.railway.station.subway.la">地下鉄</string>
+	<string name="type.railway.station.subway.lausanne">地下鉄</string>
+	<string name="type.railway.station.subway.lille">地下鉄</string>
+	<string name="type.railway.station.subway.lima">地下鉄</string>
+	<string name="type.railway.station.subway.lisboa">地下鉄</string>
+	<string name="type.railway.station.subway.lisbon">地下鉄</string>
 	<string name="type.railway.station.subway.london">地下鉄</string>
+	<string name="type.railway.station.subway.lyon">地下鉄</string>
 	<string name="type.railway.station.subway.madrid">地下鉄</string>
+	<string name="type.railway.station.subway.malaga">地下鉄</string>
+	<string name="type.railway.station.subway.manila">地下鉄</string>
+	<string name="type.railway.station.subway.maracaibo">地下鉄</string>
+	<string name="type.railway.station.subway.mashhad">地下鉄</string>
+	<string name="type.railway.station.subway.mecca">地下鉄</string>
+	<string name="type.railway.station.subway.medellin">地下鉄</string>
+	<string name="type.railway.station.subway.mexico">地下鉄</string>
+	<string name="type.railway.station.subway.milan">地下鉄</string>
 	<string name="type.railway.station.subway.minsk">地下鉄</string>
+	<string name="type.railway.station.subway.montreal">地下鉄</string>
 	<string name="type.railway.station.subway.moscow">地下鉄</string>
+	<string name="type.railway.station.subway.munchen">地下鉄</string>
+	<string name="type.railway.station.subway.nagoya">地下鉄</string>
 	<string name="type.railway.station.subway.newyork">地下鉄</string>
+	<string name="type.railway.station.subway.nnov">地下鉄</string>
+	<string name="type.railway.station.subway.novosibirsk">地下鉄</string>
+	<string name="type.railway.station.subway.osaka">地下鉄</string>
+	<string name="type.railway.station.subway.oslo">地下鉄</string>
+	<string name="type.railway.station.subway.palma">地下鉄</string>
+	<string name="type.railway.station.subway.panama">地下鉄</string>
 	<string name="type.railway.station.subway.paris">地下鉄</string>
+	<string name="type.railway.station.subway.philadelphia">地下鉄</string>
+	<string name="type.railway.station.subway.pyongyang">地下鉄</string>
+	<string name="type.railway.station.subway.rennes">地下鉄</string>
+	<string name="type.railway.station.subway.rio">地下鉄</string>
 	<string name="type.railway.station.subway.roma">地下鉄</string>
+	<string name="type.railway.station.subway.rotterdam">地下鉄</string>
+	<string name="type.railway.station.subway.samara">地下鉄</string>
+	<string name="type.railway.station.subway.santiago">地下鉄</string>
+	<string name="type.railway.station.subway.santo_domingo">地下鉄</string>
+	<string name="type.railway.station.subway.saopaulo">地下鉄</string>
+	<string name="type.railway.station.subway.sapporo">地下鉄</string>
+	<string name="type.railway.station.subway.sendai">地下鉄</string>
+	<string name="type.railway.station.subway.sf">地下鉄</string>
+	<string name="type.railway.station.subway.shanghai">地下鉄</string>
+	<string name="type.railway.station.subway.shiraz">地下鉄</string>
+	<string name="type.railway.station.subway.sofia">地下鉄</string>
 	<string name="type.railway.station.subway.spb">地下鉄</string>
+	<string name="type.railway.station.subway.stockholm">地下鉄</string>
+	<string name="type.railway.station.subway.tabriz">地下鉄</string>
+	<string name="type.railway.station.subway.taipei">地下鉄</string>
+	<string name="type.railway.station.subway.taoyuan">地下鉄</string>
+	<string name="type.railway.station.subway.tashkent">地下鉄</string>
+	<string name="type.railway.station.subway.tbilisi">地下鉄</string>
+	<string name="type.railway.station.subway.tianjin">地下鉄</string>
+	<string name="type.railway.station.subway.tokyo">地下鉄</string>
+	<string name="type.railway.station.subway.valencia">地下鉄</string>
+	<string name="type.railway.station.subway.vienna">地下鉄</string>
+	<string name="type.railway.station.subway.warszawa">地下鉄</string>
+	<string name="type.railway.station.subway.washington">地下鉄</string>
+	<string name="type.railway.station.subway.wuhan">地下鉄</string>
+	<string name="type.railway.station.subway.yerevan">地下鉄</string>
+	<string name="type.railway.station.subway.yokohama">地下鉄</string>
 	<string name="type.railway.subway_entrance">地下鉄入り口</string>
-	<string name="type.railway.subway_entrance.barcelona">地下鉄</string>
-	<string name="type.railway.subway_entrance.berlin">地下鉄</string>
-	<string name="type.railway.subway_entrance.kiev">地下鉄</string>
-	<string name="type.railway.subway_entrance.london">地下鉄</string>
-	<string name="type.railway.subway_entrance.madrid">地下鉄</string>
-	<string name="type.railway.subway_entrance.minsk">地下鉄</string>
-	<string name="type.railway.subway_entrance.moscow">地下鉄</string>
-	<string name="type.railway.subway_entrance.newyork">地下鉄</string>
-	<string name="type.railway.subway_entrance.paris">地下鉄</string>
-	<string name="type.railway.subway_entrance.roma">地下鉄</string>
-	<string name="type.railway.subway_entrance.spb">地下鉄</string>
+	<string name="type.railway.subway_entrance.adana">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.algiers">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.almaty">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.amsterdam">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.ankara">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.athens">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.baku">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.bangkok">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.barcelona">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.beijing">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.bengalore">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.berlin">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.brasilia">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.brescia">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.brussels">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.bucharest">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.budapest">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.buenos_aires">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.bursa">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.cairo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.caracas">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.catania">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.changchun">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.chengdu">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.chicago">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.chongqing">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.dalian">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.delhi">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.dnepro">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.dubai">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.ekb">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.fukuoka">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.glasgow">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.guangzhou">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.hamburg">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.helsinki">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.hiroshima">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.isfahan">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.istanbul">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.izmir">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kazan">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kharkiv">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kiev">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kobe">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kolkata">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kunming">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.kyoto">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.la">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.lausanne">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.lille">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.lima">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.lisboa">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.lisbon">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.london">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.lyon">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.madrid">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.malaga">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.manila">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.maracaibo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.mashhad">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.mecca">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.medellin">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.mexico">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.milan">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.minsk">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.montreal">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.moscow">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.munchen">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.nagoya">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.newyork">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.nnov">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.novosibirsk">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.osaka">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.oslo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.palma">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.panama">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.paris">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.philadelphia">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.pyongyang">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.rennes">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.rio">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.roma">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.rotterdam">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.samara">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.santiago">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.santo_domingo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.saopaulo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.sapporo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.sendai">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.sf">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.shanghai">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.shiraz">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.sofia">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.spb">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.stockholm">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.tabriz">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.taipei">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.taoyuan">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.tashkent">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.tbilisi">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.tianjin">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.tokyo">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.valencia">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.vienna">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.warszawa">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.washington">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.wuhan">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.yerevan">地下鉄入り口</string>
+	<string name="type.railway.subway_entrance.yokohama">地下鉄入り口</string>
 	<string name="type.railway.tram">トラム</string>
 	<string name="type.railway.tram.bridge">トラム(橋)</string>
 	<string name="type.railway.tram.tunnel">トラム(トンネル)</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index b9ac4acea6..803aff107b 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1228,29 +1228,225 @@
 	<string name="type.railway.station.light_rail">기차역</string>
 	<string name="type.railway.station.monorail">기차역</string>
 	<string name="type.railway.station.subway">지하철</string>
+	<string name="type.railway.station.subway.adana">지하철</string>
+	<string name="type.railway.station.subway.algiers">지하철</string>
+	<string name="type.railway.station.subway.almaty">지하철</string>
+	<string name="type.railway.station.subway.amsterdam">지하철</string>
+	<string name="type.railway.station.subway.ankara">지하철</string>
+	<string name="type.railway.station.subway.athens">지하철</string>
+	<string name="type.railway.station.subway.baku">지하철</string>
+	<string name="type.railway.station.subway.bangkok">지하철</string>
 	<string name="type.railway.station.subway.barcelona">지하철</string>
+	<string name="type.railway.station.subway.beijing">지하철</string>
+	<string name="type.railway.station.subway.bengalore">지하철</string>
 	<string name="type.railway.station.subway.berlin">지하철</string>
+	<string name="type.railway.station.subway.brasilia">지하철</string>
+	<string name="type.railway.station.subway.brescia">지하철</string>
+	<string name="type.railway.station.subway.brussels">지하철</string>
+	<string name="type.railway.station.subway.bucharest">지하철</string>
+	<string name="type.railway.station.subway.budapest">지하철</string>
+	<string name="type.railway.station.subway.buenos_aires">지하철</string>
+	<string name="type.railway.station.subway.bursa">지하철</string>
+	<string name="type.railway.station.subway.cairo">지하철</string>
+	<string name="type.railway.station.subway.caracas">지하철</string>
+	<string name="type.railway.station.subway.catania">지하철</string>
+	<string name="type.railway.station.subway.changchun">지하철</string>
+	<string name="type.railway.station.subway.chengdu">지하철</string>
+	<string name="type.railway.station.subway.chicago">지하철</string>
+	<string name="type.railway.station.subway.chongqing">지하철</string>
+	<string name="type.railway.station.subway.dalian">지하철</string>
+	<string name="type.railway.station.subway.delhi">지하철</string>
+	<string name="type.railway.station.subway.dnepro">지하철</string>
+	<string name="type.railway.station.subway.dubai">지하철</string>
+	<string name="type.railway.station.subway.ekb">지하철</string>
+	<string name="type.railway.station.subway.fukuoka">지하철</string>
+	<string name="type.railway.station.subway.glasgow">지하철</string>
+	<string name="type.railway.station.subway.guangzhou">지하철</string>
+	<string name="type.railway.station.subway.hamburg">지하철</string>
+	<string name="type.railway.station.subway.helsinki">지하철</string>
+	<string name="type.railway.station.subway.hiroshima">지하철</string>
+	<string name="type.railway.station.subway.isfahan">지하철</string>
+	<string name="type.railway.station.subway.istanbul">지하철</string>
+	<string name="type.railway.station.subway.izmir">지하철</string>
+	<string name="type.railway.station.subway.kazan">지하철</string>
+	<string name="type.railway.station.subway.kharkiv">지하철</string>
 	<string name="type.railway.station.subway.kiev">지하철</string>
+	<string name="type.railway.station.subway.kobe">지하철</string>
+	<string name="type.railway.station.subway.kolkata">지하철</string>
+	<string name="type.railway.station.subway.kunming">지하철</string>
+	<string name="type.railway.station.subway.kyoto">지하철</string>
+	<string name="type.railway.station.subway.la">지하철</string>
+	<string name="type.railway.station.subway.lausanne">지하철</string>
+	<string name="type.railway.station.subway.lille">지하철</string>
+	<string name="type.railway.station.subway.lima">지하철</string>
+	<string name="type.railway.station.subway.lisboa">지하철</string>
+	<string name="type.railway.station.subway.lisbon">지하철</string>
 	<string name="type.railway.station.subway.london">지하철</string>
+	<string name="type.railway.station.subway.lyon">지하철</string>
 	<string name="type.railway.station.subway.madrid">지하철</string>
+	<string name="type.railway.station.subway.malaga">지하철</string>
+	<string name="type.railway.station.subway.manila">지하철</string>
+	<string name="type.railway.station.subway.maracaibo">지하철</string>
+	<string name="type.railway.station.subway.mashhad">지하철</string>
+	<string name="type.railway.station.subway.mecca">지하철</string>
+	<string name="type.railway.station.subway.medellin">지하철</string>
+	<string name="type.railway.station.subway.mexico">지하철</string>
+	<string name="type.railway.station.subway.milan">지하철</string>
 	<string name="type.railway.station.subway.minsk">지하철</string>
+	<string name="type.railway.station.subway.montreal">지하철</string>
 	<string name="type.railway.station.subway.moscow">지하철</string>
+	<string name="type.railway.station.subway.munchen">지하철</string>
+	<string name="type.railway.station.subway.nagoya">지하철</string>
 	<string name="type.railway.station.subway.newyork">지하철</string>
+	<string name="type.railway.station.subway.nnov">지하철</string>
+	<string name="type.railway.station.subway.novosibirsk">지하철</string>
+	<string name="type.railway.station.subway.osaka">지하철</string>
+	<string name="type.railway.station.subway.oslo">지하철</string>
+	<string name="type.railway.station.subway.palma">지하철</string>
+	<string name="type.railway.station.subway.panama">지하철</string>
 	<string name="type.railway.station.subway.paris">지하철</string>
+	<string name="type.railway.station.subway.philadelphia">지하철</string>
+	<string name="type.railway.station.subway.pyongyang">지하철</string>
+	<string name="type.railway.station.subway.rennes">지하철</string>
+	<string name="type.railway.station.subway.rio">지하철</string>
 	<string name="type.railway.station.subway.roma">지하철</string>
+	<string name="type.railway.station.subway.rotterdam">지하철</string>
+	<string name="type.railway.station.subway.samara">지하철</string>
+	<string name="type.railway.station.subway.santiago">지하철</string>
+	<string name="type.railway.station.subway.santo_domingo">지하철</string>
+	<string name="type.railway.station.subway.saopaulo">지하철</string>
+	<string name="type.railway.station.subway.sapporo">지하철</string>
+	<string name="type.railway.station.subway.sendai">지하철</string>
+	<string name="type.railway.station.subway.sf">지하철</string>
+	<string name="type.railway.station.subway.shanghai">지하철</string>
+	<string name="type.railway.station.subway.shiraz">지하철</string>
+	<string name="type.railway.station.subway.sofia">지하철</string>
 	<string name="type.railway.station.subway.spb">지하철</string>
+	<string name="type.railway.station.subway.stockholm">지하철</string>
+	<string name="type.railway.station.subway.tabriz">지하철</string>
+	<string name="type.railway.station.subway.taipei">지하철</string>
+	<string name="type.railway.station.subway.taoyuan">지하철</string>
+	<string name="type.railway.station.subway.tashkent">지하철</string>
+	<string name="type.railway.station.subway.tbilisi">지하철</string>
+	<string name="type.railway.station.subway.tianjin">지하철</string>
+	<string name="type.railway.station.subway.tokyo">지하철</string>
+	<string name="type.railway.station.subway.valencia">지하철</string>
+	<string name="type.railway.station.subway.vienna">지하철</string>
+	<string name="type.railway.station.subway.warszawa">지하철</string>
+	<string name="type.railway.station.subway.washington">지하철</string>
+	<string name="type.railway.station.subway.wuhan">지하철</string>
+	<string name="type.railway.station.subway.yerevan">지하철</string>
+	<string name="type.railway.station.subway.yokohama">지하철</string>
 	<string name="type.railway.subway_entrance">지하철 입구</string>
-	<string name="type.railway.subway_entrance.barcelona">지하철</string>
-	<string name="type.railway.subway_entrance.berlin">지하철</string>
-	<string name="type.railway.subway_entrance.kiev">지하철</string>
-	<string name="type.railway.subway_entrance.london">지하철</string>
-	<string name="type.railway.subway_entrance.madrid">지하철</string>
-	<string name="type.railway.subway_entrance.minsk">지하철</string>
-	<string name="type.railway.subway_entrance.moscow">지하철</string>
-	<string name="type.railway.subway_entrance.newyork">지하철</string>
-	<string name="type.railway.subway_entrance.paris">지하철</string>
-	<string name="type.railway.subway_entrance.roma">지하철</string>
-	<string name="type.railway.subway_entrance.spb">지하철</string>
+	<string name="type.railway.subway_entrance.adana">지하철 입구</string>
+	<string name="type.railway.subway_entrance.algiers">지하철 입구</string>
+	<string name="type.railway.subway_entrance.almaty">지하철 입구</string>
+	<string name="type.railway.subway_entrance.amsterdam">지하철 입구</string>
+	<string name="type.railway.subway_entrance.ankara">지하철 입구</string>
+	<string name="type.railway.subway_entrance.athens">지하철 입구</string>
+	<string name="type.railway.subway_entrance.baku">지하철 입구</string>
+	<string name="type.railway.subway_entrance.bangkok">지하철 입구</string>
+	<string name="type.railway.subway_entrance.barcelona">지하철 입구</string>
+	<string name="type.railway.subway_entrance.beijing">지하철 입구</string>
+	<string name="type.railway.subway_entrance.bengalore">지하철 입구</string>
+	<string name="type.railway.subway_entrance.berlin">지하철 입구</string>
+	<string name="type.railway.subway_entrance.brasilia">지하철 입구</string>
+	<string name="type.railway.subway_entrance.brescia">지하철 입구</string>
+	<string name="type.railway.subway_entrance.brussels">지하철 입구</string>
+	<string name="type.railway.subway_entrance.bucharest">지하철 입구</string>
+	<string name="type.railway.subway_entrance.budapest">지하철 입구</string>
+	<string name="type.railway.subway_entrance.buenos_aires">지하철 입구</string>
+	<string name="type.railway.subway_entrance.bursa">지하철 입구</string>
+	<string name="type.railway.subway_entrance.cairo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.caracas">지하철 입구</string>
+	<string name="type.railway.subway_entrance.catania">지하철 입구</string>
+	<string name="type.railway.subway_entrance.changchun">지하철 입구</string>
+	<string name="type.railway.subway_entrance.chengdu">지하철 입구</string>
+	<string name="type.railway.subway_entrance.chicago">지하철 입구</string>
+	<string name="type.railway.subway_entrance.chongqing">지하철 입구</string>
+	<string name="type.railway.subway_entrance.dalian">지하철 입구</string>
+	<string name="type.railway.subway_entrance.delhi">지하철 입구</string>
+	<string name="type.railway.subway_entrance.dnepro">지하철 입구</string>
+	<string name="type.railway.subway_entrance.dubai">지하철 입구</string>
+	<string name="type.railway.subway_entrance.ekb">지하철 입구</string>
+	<string name="type.railway.subway_entrance.fukuoka">지하철 입구</string>
+	<string name="type.railway.subway_entrance.glasgow">지하철 입구</string>
+	<string name="type.railway.subway_entrance.guangzhou">지하철 입구</string>
+	<string name="type.railway.subway_entrance.hamburg">지하철 입구</string>
+	<string name="type.railway.subway_entrance.helsinki">지하철 입구</string>
+	<string name="type.railway.subway_entrance.hiroshima">지하철 입구</string>
+	<string name="type.railway.subway_entrance.isfahan">지하철 입구</string>
+	<string name="type.railway.subway_entrance.istanbul">지하철 입구</string>
+	<string name="type.railway.subway_entrance.izmir">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kazan">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kharkiv">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kiev">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kobe">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kolkata">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kunming">지하철 입구</string>
+	<string name="type.railway.subway_entrance.kyoto">지하철 입구</string>
+	<string name="type.railway.subway_entrance.la">지하철 입구</string>
+	<string name="type.railway.subway_entrance.lausanne">지하철 입구</string>
+	<string name="type.railway.subway_entrance.lille">지하철 입구</string>
+	<string name="type.railway.subway_entrance.lima">지하철 입구</string>
+	<string name="type.railway.subway_entrance.lisboa">지하철 입구</string>
+	<string name="type.railway.subway_entrance.lisbon">지하철 입구</string>
+	<string name="type.railway.subway_entrance.london">지하철 입구</string>
+	<string name="type.railway.subway_entrance.lyon">지하철 입구</string>
+	<string name="type.railway.subway_entrance.madrid">지하철 입구</string>
+	<string name="type.railway.subway_entrance.malaga">지하철 입구</string>
+	<string name="type.railway.subway_entrance.manila">지하철 입구</string>
+	<string name="type.railway.subway_entrance.maracaibo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.mashhad">지하철 입구</string>
+	<string name="type.railway.subway_entrance.mecca">지하철 입구</string>
+	<string name="type.railway.subway_entrance.medellin">지하철 입구</string>
+	<string name="type.railway.subway_entrance.mexico">지하철 입구</string>
+	<string name="type.railway.subway_entrance.milan">지하철 입구</string>
+	<string name="type.railway.subway_entrance.minsk">지하철 입구</string>
+	<string name="type.railway.subway_entrance.montreal">지하철 입구</string>
+	<string name="type.railway.subway_entrance.moscow">지하철 입구</string>
+	<string name="type.railway.subway_entrance.munchen">지하철 입구</string>
+	<string name="type.railway.subway_entrance.nagoya">지하철 입구</string>
+	<string name="type.railway.subway_entrance.newyork">지하철 입구</string>
+	<string name="type.railway.subway_entrance.nnov">지하철 입구</string>
+	<string name="type.railway.subway_entrance.novosibirsk">지하철 입구</string>
+	<string name="type.railway.subway_entrance.osaka">지하철 입구</string>
+	<string name="type.railway.subway_entrance.oslo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.palma">지하철 입구</string>
+	<string name="type.railway.subway_entrance.panama">지하철 입구</string>
+	<string name="type.railway.subway_entrance.paris">지하철 입구</string>
+	<string name="type.railway.subway_entrance.philadelphia">지하철 입구</string>
+	<string name="type.railway.subway_entrance.pyongyang">지하철 입구</string>
+	<string name="type.railway.subway_entrance.rennes">지하철 입구</string>
+	<string name="type.railway.subway_entrance.rio">지하철 입구</string>
+	<string name="type.railway.subway_entrance.roma">지하철 입구</string>
+	<string name="type.railway.subway_entrance.rotterdam">지하철 입구</string>
+	<string name="type.railway.subway_entrance.samara">지하철 입구</string>
+	<string name="type.railway.subway_entrance.santiago">지하철 입구</string>
+	<string name="type.railway.subway_entrance.santo_domingo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.saopaulo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.sapporo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.sendai">지하철 입구</string>
+	<string name="type.railway.subway_entrance.sf">지하철 입구</string>
+	<string name="type.railway.subway_entrance.shanghai">지하철 입구</string>
+	<string name="type.railway.subway_entrance.shiraz">지하철 입구</string>
+	<string name="type.railway.subway_entrance.sofia">지하철 입구</string>
+	<string name="type.railway.subway_entrance.spb">지하철 입구</string>
+	<string name="type.railway.subway_entrance.stockholm">지하철 입구</string>
+	<string name="type.railway.subway_entrance.tabriz">지하철 입구</string>
+	<string name="type.railway.subway_entrance.taipei">지하철 입구</string>
+	<string name="type.railway.subway_entrance.taoyuan">지하철 입구</string>
+	<string name="type.railway.subway_entrance.tashkent">지하철 입구</string>
+	<string name="type.railway.subway_entrance.tbilisi">지하철 입구</string>
+	<string name="type.railway.subway_entrance.tianjin">지하철 입구</string>
+	<string name="type.railway.subway_entrance.tokyo">지하철 입구</string>
+	<string name="type.railway.subway_entrance.valencia">지하철 입구</string>
+	<string name="type.railway.subway_entrance.vienna">지하철 입구</string>
+	<string name="type.railway.subway_entrance.warszawa">지하철 입구</string>
+	<string name="type.railway.subway_entrance.washington">지하철 입구</string>
+	<string name="type.railway.subway_entrance.wuhan">지하철 입구</string>
+	<string name="type.railway.subway_entrance.yerevan">지하철 입구</string>
+	<string name="type.railway.subway_entrance.yokohama">지하철 입구</string>
 	<string name="type.railway.tram_stop">트램 정류장</string>
 	<string name="type.shop">가게</string>
 	<string name="type.shop.alcohol">주류 샵</string>
diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml
index 353053d2cc..01730eebfc 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -1301,32 +1301,228 @@
 	<string name="type.railway.station.light_rail">रेल्वे स्थानक</string>
 	<string name="type.railway.station.monorail">रेल्वे स्थानक</string>
 	<string name="type.railway.station.subway">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.adana">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.algiers">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.almaty">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.amsterdam">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.ankara">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.athens">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.baku">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.bangkok">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.barcelona">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.beijing">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.bengalore">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.berlin">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.brasilia">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.brescia">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.brussels">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.bucharest">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.budapest">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.buenos_aires">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.bursa">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.cairo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.caracas">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.catania">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.changchun">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.chengdu">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.chicago">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.chongqing">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.dalian">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.delhi">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.dnepro">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.dubai">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.ekb">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.fukuoka">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.glasgow">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.guangzhou">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.hamburg">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.helsinki">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.hiroshima">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.isfahan">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.istanbul">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.izmir">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.kazan">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.kharkiv">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.kiev">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.kobe">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.kolkata">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.kunming">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.kyoto">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.la">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.lausanne">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.lille">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.lima">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.lisboa">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.lisbon">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.london">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.lyon">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.madrid">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.malaga">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.manila">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.maracaibo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.mashhad">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.mecca">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.medellin">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.mexico">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.milan">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.minsk">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.montreal">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.moscow">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.munchen">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.nagoya">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.newyork">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.nnov">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.novosibirsk">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.osaka">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.oslo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.palma">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.panama">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.paris">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.philadelphia">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.pyongyang">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.rennes">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.rio">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.roma">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.rotterdam">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.samara">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.santiago">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.santo_domingo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.saopaulo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.sapporo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.sendai">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.sf">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.shanghai">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.shiraz">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.sofia">भुयारी मार्ग</string>
 	<string name="type.railway.station.subway.spb">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.stockholm">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.tabriz">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.taipei">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.taoyuan">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.tashkent">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.tbilisi">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.tianjin">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.tokyo">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.valencia">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.vienna">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.warszawa">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.washington">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.wuhan">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.yerevan">भुयारी मार्ग</string>
+	<string name="type.railway.station.subway.yokohama">भुयारी मार्ग</string>
 	<string name="type.railway.subway">भुयारी मार्गिका</string>
 	<string name="type.railway.subway.bridge">भुयारी मार्गिका</string>
 	<string name="type.railway.subway.tunnel">भुयारी मार्गिका</string>
 	<string name="type.railway.subway_entrance">भुयारी प्रवेशद्वार</string>
-	<string name="type.railway.subway_entrance.barcelona">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.berlin">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.kiev">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.london">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.madrid">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.minsk">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.moscow">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.newyork">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.paris">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.roma">भुयारी मार्ग</string>
-	<string name="type.railway.subway_entrance.spb">भुयारी मार्ग</string>
+	<string name="type.railway.subway_entrance.adana">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.algiers">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.almaty">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.amsterdam">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.ankara">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.athens">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.baku">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.bangkok">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.barcelona">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.beijing">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.bengalore">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.berlin">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.brasilia">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.brescia">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.brussels">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.bucharest">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.budapest">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.buenos_aires">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.bursa">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.cairo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.caracas">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.catania">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.changchun">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.chengdu">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.chicago">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.chongqing">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.dalian">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.delhi">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.dnepro">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.dubai">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.ekb">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.fukuoka">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.glasgow">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.guangzhou">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.hamburg">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.helsinki">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.hiroshima">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.isfahan">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.istanbul">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.izmir">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kazan">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kharkiv">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kiev">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kobe">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kolkata">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kunming">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.kyoto">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.la">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.lausanne">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.lille">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.lima">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.lisboa">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.lisbon">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.london">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.lyon">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.madrid">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.malaga">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.manila">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.maracaibo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.mashhad">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.mecca">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.medellin">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.mexico">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.milan">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.minsk">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.montreal">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.moscow">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.munchen">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.nagoya">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.newyork">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.nnov">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.novosibirsk">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.osaka">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.oslo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.palma">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.panama">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.paris">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.philadelphia">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.pyongyang">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.rennes">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.rio">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.roma">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.rotterdam">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.samara">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.santiago">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.santo_domingo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.saopaulo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.sapporo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.sendai">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.sf">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.shanghai">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.shiraz">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.sofia">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.spb">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.stockholm">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.tabriz">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.taipei">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.taoyuan">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.tashkent">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.tbilisi">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.tianjin">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.tokyo">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.valencia">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.vienna">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.warszawa">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.washington">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.wuhan">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.yerevan">भुयारी प्रवेशद्वार</string>
+	<string name="type.railway.subway_entrance.yokohama">भुयारी प्रवेशद्वार</string>
 	<string name="type.railway.tram">ट्राम मार्गिका</string>
 	<string name="type.railway.tram.bridge">ट्राम मार्गिका</string>
 	<string name="type.railway.tram.tunnel">ट्राम मार्गिका</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index a9113121b3..fb260bd9bf 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1222,29 +1222,225 @@
 	<string name="type.railway.station.light_rail">Togstasjon</string>
 	<string name="type.railway.station.monorail">Togstasjon</string>
 	<string name="type.railway.station.subway">T-bane</string>
+	<string name="type.railway.station.subway.adana">T-bane</string>
+	<string name="type.railway.station.subway.algiers">T-bane</string>
+	<string name="type.railway.station.subway.almaty">T-bane</string>
+	<string name="type.railway.station.subway.amsterdam">T-bane</string>
+	<string name="type.railway.station.subway.ankara">T-bane</string>
+	<string name="type.railway.station.subway.athens">T-bane</string>
+	<string name="type.railway.station.subway.baku">T-bane</string>
+	<string name="type.railway.station.subway.bangkok">T-bane</string>
 	<string name="type.railway.station.subway.barcelona">T-bane</string>
+	<string name="type.railway.station.subway.beijing">T-bane</string>
+	<string name="type.railway.station.subway.bengalore">T-bane</string>
 	<string name="type.railway.station.subway.berlin">T-bane</string>
+	<string name="type.railway.station.subway.brasilia">T-bane</string>
+	<string name="type.railway.station.subway.brescia">T-bane</string>
+	<string name="type.railway.station.subway.brussels">T-bane</string>
+	<string name="type.railway.station.subway.bucharest">T-bane</string>
+	<string name="type.railway.station.subway.budapest">T-bane</string>
+	<string name="type.railway.station.subway.buenos_aires">T-bane</string>
+	<string name="type.railway.station.subway.bursa">T-bane</string>
+	<string name="type.railway.station.subway.cairo">T-bane</string>
+	<string name="type.railway.station.subway.caracas">T-bane</string>
+	<string name="type.railway.station.subway.catania">T-bane</string>
+	<string name="type.railway.station.subway.changchun">T-bane</string>
+	<string name="type.railway.station.subway.chengdu">T-bane</string>
+	<string name="type.railway.station.subway.chicago">T-bane</string>
+	<string name="type.railway.station.subway.chongqing">T-bane</string>
+	<string name="type.railway.station.subway.dalian">T-bane</string>
+	<string name="type.railway.station.subway.delhi">T-bane</string>
+	<string name="type.railway.station.subway.dnepro">T-bane</string>
+	<string name="type.railway.station.subway.dubai">T-bane</string>
+	<string name="type.railway.station.subway.ekb">T-bane</string>
+	<string name="type.railway.station.subway.fukuoka">T-bane</string>
+	<string name="type.railway.station.subway.glasgow">T-bane</string>
+	<string name="type.railway.station.subway.guangzhou">T-bane</string>
+	<string name="type.railway.station.subway.hamburg">T-bane</string>
+	<string name="type.railway.station.subway.helsinki">T-bane</string>
+	<string name="type.railway.station.subway.hiroshima">T-bane</string>
+	<string name="type.railway.station.subway.isfahan">T-bane</string>
+	<string name="type.railway.station.subway.istanbul">T-bane</string>
+	<string name="type.railway.station.subway.izmir">T-bane</string>
+	<string name="type.railway.station.subway.kazan">T-bane</string>
+	<string name="type.railway.station.subway.kharkiv">T-bane</string>
 	<string name="type.railway.station.subway.kiev">T-bane</string>
+	<string name="type.railway.station.subway.kobe">T-bane</string>
+	<string name="type.railway.station.subway.kolkata">T-bane</string>
+	<string name="type.railway.station.subway.kunming">T-bane</string>
+	<string name="type.railway.station.subway.kyoto">T-bane</string>
+	<string name="type.railway.station.subway.la">T-bane</string>
+	<string name="type.railway.station.subway.lausanne">T-bane</string>
+	<string name="type.railway.station.subway.lille">T-bane</string>
+	<string name="type.railway.station.subway.lima">T-bane</string>
+	<string name="type.railway.station.subway.lisboa">T-bane</string>
+	<string name="type.railway.station.subway.lisbon">T-bane</string>
 	<string name="type.railway.station.subway.london">T-bane</string>
+	<string name="type.railway.station.subway.lyon">T-bane</string>
 	<string name="type.railway.station.subway.madrid">T-bane</string>
+	<string name="type.railway.station.subway.malaga">T-bane</string>
+	<string name="type.railway.station.subway.manila">T-bane</string>
+	<string name="type.railway.station.subway.maracaibo">T-bane</string>
+	<string name="type.railway.station.subway.mashhad">T-bane</string>
+	<string name="type.railway.station.subway.mecca">T-bane</string>
+	<string name="type.railway.station.subway.medellin">T-bane</string>
+	<string name="type.railway.station.subway.mexico">T-bane</string>
+	<string name="type.railway.station.subway.milan">T-bane</string>
 	<string name="type.railway.station.subway.minsk">T-bane</string>
+	<string name="type.railway.station.subway.montreal">T-bane</string>
 	<string name="type.railway.station.subway.moscow">T-bane</string>
+	<string name="type.railway.station.subway.munchen">T-bane</string>
+	<string name="type.railway.station.subway.nagoya">T-bane</string>
 	<string name="type.railway.station.subway.newyork">T-bane</string>
+	<string name="type.railway.station.subway.nnov">T-bane</string>
+	<string name="type.railway.station.subway.novosibirsk">T-bane</string>
+	<string name="type.railway.station.subway.osaka">T-bane</string>
+	<string name="type.railway.station.subway.oslo">T-bane</string>
+	<string name="type.railway.station.subway.palma">T-bane</string>
+	<string name="type.railway.station.subway.panama">T-bane</string>
 	<string name="type.railway.station.subway.paris">T-bane</string>
+	<string name="type.railway.station.subway.philadelphia">T-bane</string>
+	<string name="type.railway.station.subway.pyongyang">T-bane</string>
+	<string name="type.railway.station.subway.rennes">T-bane</string>
+	<string name="type.railway.station.subway.rio">T-bane</string>
 	<string name="type.railway.station.subway.roma">T-bane</string>
+	<string name="type.railway.station.subway.rotterdam">T-bane</string>
+	<string name="type.railway.station.subway.samara">T-bane</string>
+	<string name="type.railway.station.subway.santiago">T-bane</string>
+	<string name="type.railway.station.subway.santo_domingo">T-bane</string>
+	<string name="type.railway.station.subway.saopaulo">T-bane</string>
+	<string name="type.railway.station.subway.sapporo">T-bane</string>
+	<string name="type.railway.station.subway.sendai">T-bane</string>
+	<string name="type.railway.station.subway.sf">T-bane</string>
+	<string name="type.railway.station.subway.shanghai">T-bane</string>
+	<string name="type.railway.station.subway.shiraz">T-bane</string>
+	<string name="type.railway.station.subway.sofia">T-bane</string>
 	<string name="type.railway.station.subway.spb">T-bane</string>
+	<string name="type.railway.station.subway.stockholm">T-bane</string>
+	<string name="type.railway.station.subway.tabriz">T-bane</string>
+	<string name="type.railway.station.subway.taipei">T-bane</string>
+	<string name="type.railway.station.subway.taoyuan">T-bane</string>
+	<string name="type.railway.station.subway.tashkent">T-bane</string>
+	<string name="type.railway.station.subway.tbilisi">T-bane</string>
+	<string name="type.railway.station.subway.tianjin">T-bane</string>
+	<string name="type.railway.station.subway.tokyo">T-bane</string>
+	<string name="type.railway.station.subway.valencia">T-bane</string>
+	<string name="type.railway.station.subway.vienna">T-bane</string>
+	<string name="type.railway.station.subway.warszawa">T-bane</string>
+	<string name="type.railway.station.subway.washington">T-bane</string>
+	<string name="type.railway.station.subway.wuhan">T-bane</string>
+	<string name="type.railway.station.subway.yerevan">T-bane</string>
+	<string name="type.railway.station.subway.yokohama">T-bane</string>
 	<string name="type.railway.subway_entrance">T-bane inngang</string>
-	<string name="type.railway.subway_entrance.barcelona">T-bane</string>
-	<string name="type.railway.subway_entrance.berlin">T-bane</string>
-	<string name="type.railway.subway_entrance.kiev">T-bane</string>
-	<string name="type.railway.subway_entrance.london">T-bane</string>
-	<string name="type.railway.subway_entrance.madrid">T-bane</string>
-	<string name="type.railway.subway_entrance.minsk">T-bane</string>
-	<string name="type.railway.subway_entrance.moscow">T-bane</string>
-	<string name="type.railway.subway_entrance.newyork">T-bane</string>
-	<string name="type.railway.subway_entrance.paris">T-bane</string>
-	<string name="type.railway.subway_entrance.roma">T-bane</string>
-	<string name="type.railway.subway_entrance.spb">T-bane</string>
+	<string name="type.railway.subway_entrance.adana">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.algiers">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.almaty">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.amsterdam">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.ankara">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.athens">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.baku">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.bangkok">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.barcelona">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.beijing">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.bengalore">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.berlin">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.brasilia">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.brescia">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.brussels">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.bucharest">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.budapest">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.buenos_aires">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.bursa">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.cairo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.caracas">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.catania">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.changchun">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.chengdu">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.chicago">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.chongqing">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.dalian">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.delhi">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.dnepro">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.dubai">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.ekb">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.fukuoka">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.glasgow">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.guangzhou">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.hamburg">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.helsinki">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.hiroshima">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.isfahan">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.istanbul">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.izmir">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kazan">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kharkiv">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kiev">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kobe">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kolkata">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kunming">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.kyoto">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.la">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.lausanne">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.lille">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.lima">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.lisboa">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.lisbon">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.london">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.lyon">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.madrid">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.malaga">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.manila">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.maracaibo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.mashhad">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.mecca">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.medellin">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.mexico">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.milan">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.minsk">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.montreal">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.moscow">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.munchen">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.nagoya">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.newyork">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.nnov">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.novosibirsk">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.osaka">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.oslo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.palma">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.panama">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.paris">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.philadelphia">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.pyongyang">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.rennes">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.rio">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.roma">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.rotterdam">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.samara">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.santiago">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.santo_domingo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.saopaulo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.sapporo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.sendai">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.sf">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.shanghai">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.shiraz">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.sofia">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.spb">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.stockholm">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.tabriz">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.taipei">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.taoyuan">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.tashkent">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.tbilisi">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.tianjin">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.tokyo">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.valencia">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.vienna">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.warszawa">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.washington">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.wuhan">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.yerevan">T-bane inngang</string>
+	<string name="type.railway.subway_entrance.yokohama">T-bane inngang</string>
 	<string name="type.railway.tram_stop">Trikkestopp</string>
 	<string name="type.shop">Butikk</string>
 	<string name="type.shop.alcohol">Vinmonopol</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index e70f2e18e1..2874a5816b 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1441,32 +1441,228 @@
 	<string name="type.railway.station.light_rail">Station</string>
 	<string name="type.railway.station.monorail">Station</string>
 	<string name="type.railway.station.subway">Metrostation</string>
-	<string name="type.railway.station.subway.barcelona">Metro</string>
-	<string name="type.railway.station.subway.berlin">Metro</string>
-	<string name="type.railway.station.subway.kiev">Metro</string>
-	<string name="type.railway.station.subway.london">Metro</string>
-	<string name="type.railway.station.subway.madrid">Metro</string>
-	<string name="type.railway.station.subway.minsk">Metro</string>
-	<string name="type.railway.station.subway.moscow">Metro</string>
-	<string name="type.railway.station.subway.newyork">Metro</string>
-	<string name="type.railway.station.subway.paris">Metro</string>
-	<string name="type.railway.station.subway.roma">Metro</string>
-	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.adana">Metrostation</string>
+	<string name="type.railway.station.subway.algiers">Metrostation</string>
+	<string name="type.railway.station.subway.almaty">Metrostation</string>
+	<string name="type.railway.station.subway.amsterdam">Metrostation</string>
+	<string name="type.railway.station.subway.ankara">Metrostation</string>
+	<string name="type.railway.station.subway.athens">Metrostation</string>
+	<string name="type.railway.station.subway.baku">Metrostation</string>
+	<string name="type.railway.station.subway.bangkok">Metrostation</string>
+	<string name="type.railway.station.subway.barcelona">Metrostation</string>
+	<string name="type.railway.station.subway.beijing">Metrostation</string>
+	<string name="type.railway.station.subway.bengalore">Metrostation</string>
+	<string name="type.railway.station.subway.berlin">Metrostation</string>
+	<string name="type.railway.station.subway.brasilia">Metrostation</string>
+	<string name="type.railway.station.subway.brescia">Metrostation</string>
+	<string name="type.railway.station.subway.brussels">Metrostation</string>
+	<string name="type.railway.station.subway.bucharest">Metrostation</string>
+	<string name="type.railway.station.subway.budapest">Metrostation</string>
+	<string name="type.railway.station.subway.buenos_aires">Metrostation</string>
+	<string name="type.railway.station.subway.bursa">Metrostation</string>
+	<string name="type.railway.station.subway.cairo">Metrostation</string>
+	<string name="type.railway.station.subway.caracas">Metrostation</string>
+	<string name="type.railway.station.subway.catania">Metrostation</string>
+	<string name="type.railway.station.subway.changchun">Metrostation</string>
+	<string name="type.railway.station.subway.chengdu">Metrostation</string>
+	<string name="type.railway.station.subway.chicago">Metrostation</string>
+	<string name="type.railway.station.subway.chongqing">Metrostation</string>
+	<string name="type.railway.station.subway.dalian">Metrostation</string>
+	<string name="type.railway.station.subway.delhi">Metrostation</string>
+	<string name="type.railway.station.subway.dnepro">Metrostation</string>
+	<string name="type.railway.station.subway.dubai">Metrostation</string>
+	<string name="type.railway.station.subway.ekb">Metrostation</string>
+	<string name="type.railway.station.subway.fukuoka">Metrostation</string>
+	<string name="type.railway.station.subway.glasgow">Metrostation</string>
+	<string name="type.railway.station.subway.guangzhou">Metrostation</string>
+	<string name="type.railway.station.subway.hamburg">Metrostation</string>
+	<string name="type.railway.station.subway.helsinki">Metrostation</string>
+	<string name="type.railway.station.subway.hiroshima">Metrostation</string>
+	<string name="type.railway.station.subway.isfahan">Metrostation</string>
+	<string name="type.railway.station.subway.istanbul">Metrostation</string>
+	<string name="type.railway.station.subway.izmir">Metrostation</string>
+	<string name="type.railway.station.subway.kazan">Metrostation</string>
+	<string name="type.railway.station.subway.kharkiv">Metrostation</string>
+	<string name="type.railway.station.subway.kiev">Metrostation</string>
+	<string name="type.railway.station.subway.kobe">Metrostation</string>
+	<string name="type.railway.station.subway.kolkata">Metrostation</string>
+	<string name="type.railway.station.subway.kunming">Metrostation</string>
+	<string name="type.railway.station.subway.kyoto">Metrostation</string>
+	<string name="type.railway.station.subway.la">Metrostation</string>
+	<string name="type.railway.station.subway.lausanne">Metrostation</string>
+	<string name="type.railway.station.subway.lille">Metrostation</string>
+	<string name="type.railway.station.subway.lima">Metrostation</string>
+	<string name="type.railway.station.subway.lisboa">Metrostation</string>
+	<string name="type.railway.station.subway.lisbon">Metrostation</string>
+	<string name="type.railway.station.subway.london">Metrostation</string>
+	<string name="type.railway.station.subway.lyon">Metrostation</string>
+	<string name="type.railway.station.subway.madrid">Metrostation</string>
+	<string name="type.railway.station.subway.malaga">Metrostation</string>
+	<string name="type.railway.station.subway.manila">Metrostation</string>
+	<string name="type.railway.station.subway.maracaibo">Metrostation</string>
+	<string name="type.railway.station.subway.mashhad">Metrostation</string>
+	<string name="type.railway.station.subway.mecca">Metrostation</string>
+	<string name="type.railway.station.subway.medellin">Metrostation</string>
+	<string name="type.railway.station.subway.mexico">Metrostation</string>
+	<string name="type.railway.station.subway.milan">Metrostation</string>
+	<string name="type.railway.station.subway.minsk">Metrostation</string>
+	<string name="type.railway.station.subway.montreal">Metrostation</string>
+	<string name="type.railway.station.subway.moscow">Metrostation</string>
+	<string name="type.railway.station.subway.munchen">Metrostation</string>
+	<string name="type.railway.station.subway.nagoya">Metrostation</string>
+	<string name="type.railway.station.subway.newyork">Metrostation</string>
+	<string name="type.railway.station.subway.nnov">Metrostation</string>
+	<string name="type.railway.station.subway.novosibirsk">Metrostation</string>
+	<string name="type.railway.station.subway.osaka">Metrostation</string>
+	<string name="type.railway.station.subway.oslo">Metrostation</string>
+	<string name="type.railway.station.subway.palma">Metrostation</string>
+	<string name="type.railway.station.subway.panama">Metrostation</string>
+	<string name="type.railway.station.subway.paris">Metrostation</string>
+	<string name="type.railway.station.subway.philadelphia">Metrostation</string>
+	<string name="type.railway.station.subway.pyongyang">Metrostation</string>
+	<string name="type.railway.station.subway.rennes">Metrostation</string>
+	<string name="type.railway.station.subway.rio">Metrostation</string>
+	<string name="type.railway.station.subway.roma">Metrostation</string>
+	<string name="type.railway.station.subway.rotterdam">Metrostation</string>
+	<string name="type.railway.station.subway.samara">Metrostation</string>
+	<string name="type.railway.station.subway.santiago">Metrostation</string>
+	<string name="type.railway.station.subway.santo_domingo">Metrostation</string>
+	<string name="type.railway.station.subway.saopaulo">Metrostation</string>
+	<string name="type.railway.station.subway.sapporo">Metrostation</string>
+	<string name="type.railway.station.subway.sendai">Metrostation</string>
+	<string name="type.railway.station.subway.sf">Metrostation</string>
+	<string name="type.railway.station.subway.shanghai">Metrostation</string>
+	<string name="type.railway.station.subway.shiraz">Metrostation</string>
+	<string name="type.railway.station.subway.sofia">Metrostation</string>
+	<string name="type.railway.station.subway.spb">Metrostation</string>
+	<string name="type.railway.station.subway.stockholm">Metrostation</string>
+	<string name="type.railway.station.subway.tabriz">Metrostation</string>
+	<string name="type.railway.station.subway.taipei">Metrostation</string>
+	<string name="type.railway.station.subway.taoyuan">Metrostation</string>
+	<string name="type.railway.station.subway.tashkent">Metrostation</string>
+	<string name="type.railway.station.subway.tbilisi">Metrostation</string>
+	<string name="type.railway.station.subway.tianjin">Metrostation</string>
+	<string name="type.railway.station.subway.tokyo">Metrostation</string>
+	<string name="type.railway.station.subway.valencia">Metrostation</string>
+	<string name="type.railway.station.subway.vienna">Metrostation</string>
+	<string name="type.railway.station.subway.warszawa">Metrostation</string>
+	<string name="type.railway.station.subway.washington">Metrostation</string>
+	<string name="type.railway.station.subway.wuhan">Metrostation</string>
+	<string name="type.railway.station.subway.yerevan">Metrostation</string>
+	<string name="type.railway.station.subway.yokohama">Metrostation</string>
 	<string name="type.railway.subway">Metro</string>
 	<string name="type.railway.subway.bridge">Metrobrug</string>
 	<string name="type.railway.subway.tunnel">Metrotunnel</string>
 	<string name="type.railway.subway_entrance">Metro ingang</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Metro ingang</string>
+	<string name="type.railway.subway_entrance.algiers">Metro ingang</string>
+	<string name="type.railway.subway_entrance.almaty">Metro ingang</string>
+	<string name="type.railway.subway_entrance.amsterdam">Metro ingang</string>
+	<string name="type.railway.subway_entrance.ankara">Metro ingang</string>
+	<string name="type.railway.subway_entrance.athens">Metro ingang</string>
+	<string name="type.railway.subway_entrance.baku">Metro ingang</string>
+	<string name="type.railway.subway_entrance.bangkok">Metro ingang</string>
+	<string name="type.railway.subway_entrance.barcelona">Metro ingang</string>
+	<string name="type.railway.subway_entrance.beijing">Metro ingang</string>
+	<string name="type.railway.subway_entrance.bengalore">Metro ingang</string>
+	<string name="type.railway.subway_entrance.berlin">Metro ingang</string>
+	<string name="type.railway.subway_entrance.brasilia">Metro ingang</string>
+	<string name="type.railway.subway_entrance.brescia">Metro ingang</string>
+	<string name="type.railway.subway_entrance.brussels">Metro ingang</string>
+	<string name="type.railway.subway_entrance.bucharest">Metro ingang</string>
+	<string name="type.railway.subway_entrance.budapest">Metro ingang</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Metro ingang</string>
+	<string name="type.railway.subway_entrance.bursa">Metro ingang</string>
+	<string name="type.railway.subway_entrance.cairo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.caracas">Metro ingang</string>
+	<string name="type.railway.subway_entrance.catania">Metro ingang</string>
+	<string name="type.railway.subway_entrance.changchun">Metro ingang</string>
+	<string name="type.railway.subway_entrance.chengdu">Metro ingang</string>
+	<string name="type.railway.subway_entrance.chicago">Metro ingang</string>
+	<string name="type.railway.subway_entrance.chongqing">Metro ingang</string>
+	<string name="type.railway.subway_entrance.dalian">Metro ingang</string>
+	<string name="type.railway.subway_entrance.delhi">Metro ingang</string>
+	<string name="type.railway.subway_entrance.dnepro">Metro ingang</string>
+	<string name="type.railway.subway_entrance.dubai">Metro ingang</string>
+	<string name="type.railway.subway_entrance.ekb">Metro ingang</string>
+	<string name="type.railway.subway_entrance.fukuoka">Metro ingang</string>
+	<string name="type.railway.subway_entrance.glasgow">Metro ingang</string>
+	<string name="type.railway.subway_entrance.guangzhou">Metro ingang</string>
+	<string name="type.railway.subway_entrance.hamburg">Metro ingang</string>
+	<string name="type.railway.subway_entrance.helsinki">Metro ingang</string>
+	<string name="type.railway.subway_entrance.hiroshima">Metro ingang</string>
+	<string name="type.railway.subway_entrance.isfahan">Metro ingang</string>
+	<string name="type.railway.subway_entrance.istanbul">Metro ingang</string>
+	<string name="type.railway.subway_entrance.izmir">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kazan">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kharkiv">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kiev">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kobe">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kolkata">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kunming">Metro ingang</string>
+	<string name="type.railway.subway_entrance.kyoto">Metro ingang</string>
+	<string name="type.railway.subway_entrance.la">Metro ingang</string>
+	<string name="type.railway.subway_entrance.lausanne">Metro ingang</string>
+	<string name="type.railway.subway_entrance.lille">Metro ingang</string>
+	<string name="type.railway.subway_entrance.lima">Metro ingang</string>
+	<string name="type.railway.subway_entrance.lisboa">Metro ingang</string>
+	<string name="type.railway.subway_entrance.lisbon">Metro ingang</string>
+	<string name="type.railway.subway_entrance.london">Metro ingang</string>
+	<string name="type.railway.subway_entrance.lyon">Metro ingang</string>
+	<string name="type.railway.subway_entrance.madrid">Metro ingang</string>
+	<string name="type.railway.subway_entrance.malaga">Metro ingang</string>
+	<string name="type.railway.subway_entrance.manila">Metro ingang</string>
+	<string name="type.railway.subway_entrance.maracaibo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.mashhad">Metro ingang</string>
+	<string name="type.railway.subway_entrance.mecca">Metro ingang</string>
+	<string name="type.railway.subway_entrance.medellin">Metro ingang</string>
+	<string name="type.railway.subway_entrance.mexico">Metro ingang</string>
+	<string name="type.railway.subway_entrance.milan">Metro ingang</string>
+	<string name="type.railway.subway_entrance.minsk">Metro ingang</string>
+	<string name="type.railway.subway_entrance.montreal">Metro ingang</string>
+	<string name="type.railway.subway_entrance.moscow">Metro ingang</string>
+	<string name="type.railway.subway_entrance.munchen">Metro ingang</string>
+	<string name="type.railway.subway_entrance.nagoya">Metro ingang</string>
+	<string name="type.railway.subway_entrance.newyork">Metro ingang</string>
+	<string name="type.railway.subway_entrance.nnov">Metro ingang</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Metro ingang</string>
+	<string name="type.railway.subway_entrance.osaka">Metro ingang</string>
+	<string name="type.railway.subway_entrance.oslo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.palma">Metro ingang</string>
+	<string name="type.railway.subway_entrance.panama">Metro ingang</string>
+	<string name="type.railway.subway_entrance.paris">Metro ingang</string>
+	<string name="type.railway.subway_entrance.philadelphia">Metro ingang</string>
+	<string name="type.railway.subway_entrance.pyongyang">Metro ingang</string>
+	<string name="type.railway.subway_entrance.rennes">Metro ingang</string>
+	<string name="type.railway.subway_entrance.rio">Metro ingang</string>
+	<string name="type.railway.subway_entrance.roma">Metro ingang</string>
+	<string name="type.railway.subway_entrance.rotterdam">Metro ingang</string>
+	<string name="type.railway.subway_entrance.samara">Metro ingang</string>
+	<string name="type.railway.subway_entrance.santiago">Metro ingang</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.saopaulo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.sapporo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.sendai">Metro ingang</string>
+	<string name="type.railway.subway_entrance.sf">Metro ingang</string>
+	<string name="type.railway.subway_entrance.shanghai">Metro ingang</string>
+	<string name="type.railway.subway_entrance.shiraz">Metro ingang</string>
+	<string name="type.railway.subway_entrance.sofia">Metro ingang</string>
+	<string name="type.railway.subway_entrance.spb">Metro ingang</string>
+	<string name="type.railway.subway_entrance.stockholm">Metro ingang</string>
+	<string name="type.railway.subway_entrance.tabriz">Metro ingang</string>
+	<string name="type.railway.subway_entrance.taipei">Metro ingang</string>
+	<string name="type.railway.subway_entrance.taoyuan">Metro ingang</string>
+	<string name="type.railway.subway_entrance.tashkent">Metro ingang</string>
+	<string name="type.railway.subway_entrance.tbilisi">Metro ingang</string>
+	<string name="type.railway.subway_entrance.tianjin">Metro ingang</string>
+	<string name="type.railway.subway_entrance.tokyo">Metro ingang</string>
+	<string name="type.railway.subway_entrance.valencia">Metro ingang</string>
+	<string name="type.railway.subway_entrance.vienna">Metro ingang</string>
+	<string name="type.railway.subway_entrance.warszawa">Metro ingang</string>
+	<string name="type.railway.subway_entrance.washington">Metro ingang</string>
+	<string name="type.railway.subway_entrance.wuhan">Metro ingang</string>
+	<string name="type.railway.subway_entrance.yerevan">Metro ingang</string>
+	<string name="type.railway.subway_entrance.yokohama">Metro ingang</string>
 	<string name="type.railway.tram">Tram</string>
 	<string name="type.railway.tram.bridge">Trambrug</string>
 	<string name="type.railway.tram.tunnel">Tramtunnel</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 5a1e96d594..e0416e204a 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1377,29 +1377,225 @@
 	<string name="type.railway.station.light_rail">Dworzec kolejowy</string>
 	<string name="type.railway.station.monorail">Dworzec kolejowy</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway_entrance">Wejście do metra</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.algiers">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.almaty">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.amsterdam">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.ankara">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.athens">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.baku">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.bangkok">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.barcelona">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.beijing">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.bengalore">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.berlin">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.brasilia">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.brescia">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.brussels">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.bucharest">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.budapest">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.bursa">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.cairo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.caracas">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.catania">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.changchun">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.chengdu">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.chicago">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.chongqing">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.dalian">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.delhi">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.dnepro">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.dubai">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.ekb">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.fukuoka">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.glasgow">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.guangzhou">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.hamburg">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.helsinki">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.hiroshima">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.isfahan">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.istanbul">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.izmir">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kazan">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kharkiv">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kiev">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kobe">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kolkata">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kunming">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.kyoto">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.la">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.lausanne">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.lille">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.lima">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.lisboa">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.lisbon">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.london">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.lyon">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.madrid">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.malaga">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.manila">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.maracaibo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.mashhad">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.mecca">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.medellin">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.mexico">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.milan">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.minsk">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.montreal">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.moscow">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.munchen">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.nagoya">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.newyork">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.nnov">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.osaka">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.oslo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.palma">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.panama">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.paris">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.philadelphia">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.pyongyang">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.rennes">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.rio">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.roma">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.rotterdam">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.samara">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.santiago">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.saopaulo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.sapporo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.sendai">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.sf">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.shanghai">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.shiraz">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.sofia">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.spb">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.stockholm">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.tabriz">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.taipei">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.taoyuan">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.tashkent">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.tbilisi">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.tianjin">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.tokyo">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.valencia">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.vienna">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.warszawa">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.washington">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.wuhan">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.yerevan">Wejście do metra</string>
+	<string name="type.railway.subway_entrance.yokohama">Wejście do metra</string>
 	<string name="type.railway.tram_stop">Przystanek tramwajowy</string>
 	<string name="type.shop">Sklep</string>
 	<string name="type.shop.alcohol">Sklep monopolowy</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 95bf003daa..3bb0078746 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -1306,33 +1306,229 @@
 	<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>
-	<string name="type.railway.station.subway">Estação do metrô</string>
-	<string name="type.railway.station.subway.barcelona">Estação do metrô</string>
-	<string name="type.railway.station.subway.berlin">Estação do metrô</string>
-	<string name="type.railway.station.subway.kiev">Estação do metrô</string>
-	<string name="type.railway.station.subway.london">Estação do metrô</string>
-	<string name="type.railway.station.subway.madrid">Estação do metrô</string>
-	<string name="type.railway.station.subway.minsk">Estação do metrô</string>
-	<string name="type.railway.station.subway.moscow">Estação do metrô</string>
-	<string name="type.railway.station.subway.newyork">Estação do metrô</string>
-	<string name="type.railway.station.subway.paris">Estação do metrô</string>
-	<string name="type.railway.station.subway.roma">Estação do metrô</string>
-	<string name="type.railway.station.subway.spb">Estação do metrô</string>
+	<string name="type.railway.station.subway">Estação de metrô</string>
+	<string name="type.railway.station.subway.adana">Estação de metrô</string>
+	<string name="type.railway.station.subway.algiers">Estação de metrô</string>
+	<string name="type.railway.station.subway.almaty">Estação de metrô</string>
+	<string name="type.railway.station.subway.amsterdam">Estação de metrô</string>
+	<string name="type.railway.station.subway.ankara">Estação de metrô</string>
+	<string name="type.railway.station.subway.athens">Estação de metrô</string>
+	<string name="type.railway.station.subway.baku">Estação de metrô</string>
+	<string name="type.railway.station.subway.bangkok">Estação de metrô</string>
+	<string name="type.railway.station.subway.barcelona">Estação de metrô</string>
+	<string name="type.railway.station.subway.beijing">Estação de metrô</string>
+	<string name="type.railway.station.subway.bengalore">Estação de metrô</string>
+	<string name="type.railway.station.subway.berlin">Estação de metrô</string>
+	<string name="type.railway.station.subway.brasilia">Estação de metrô</string>
+	<string name="type.railway.station.subway.brescia">Estação de metrô</string>
+	<string name="type.railway.station.subway.brussels">Estação de metrô</string>
+	<string name="type.railway.station.subway.bucharest">Estação de metrô</string>
+	<string name="type.railway.station.subway.budapest">Estação de metrô</string>
+	<string name="type.railway.station.subway.buenos_aires">Estação de metrô</string>
+	<string name="type.railway.station.subway.bursa">Estação de metrô</string>
+	<string name="type.railway.station.subway.cairo">Estação de metrô</string>
+	<string name="type.railway.station.subway.caracas">Estação de metrô</string>
+	<string name="type.railway.station.subway.catania">Estação de metrô</string>
+	<string name="type.railway.station.subway.changchun">Estação de metrô</string>
+	<string name="type.railway.station.subway.chengdu">Estação de metrô</string>
+	<string name="type.railway.station.subway.chicago">Estação de metrô</string>
+	<string name="type.railway.station.subway.chongqing">Estação de metrô</string>
+	<string name="type.railway.station.subway.dalian">Estação de metrô</string>
+	<string name="type.railway.station.subway.delhi">Estação de metrô</string>
+	<string name="type.railway.station.subway.dnepro">Estação de metrô</string>
+	<string name="type.railway.station.subway.dubai">Estação de metrô</string>
+	<string name="type.railway.station.subway.ekb">Estação de metrô</string>
+	<string name="type.railway.station.subway.fukuoka">Estação de metrô</string>
+	<string name="type.railway.station.subway.glasgow">Estação de metrô</string>
+	<string name="type.railway.station.subway.guangzhou">Estação de metrô</string>
+	<string name="type.railway.station.subway.hamburg">Estação de metrô</string>
+	<string name="type.railway.station.subway.helsinki">Estação de metrô</string>
+	<string name="type.railway.station.subway.hiroshima">Estação de metrô</string>
+	<string name="type.railway.station.subway.isfahan">Estação de metrô</string>
+	<string name="type.railway.station.subway.istanbul">Estação de metrô</string>
+	<string name="type.railway.station.subway.izmir">Estação de metrô</string>
+	<string name="type.railway.station.subway.kazan">Estação de metrô</string>
+	<string name="type.railway.station.subway.kharkiv">Estação de metrô</string>
+	<string name="type.railway.station.subway.kiev">Estação de metrô</string>
+	<string name="type.railway.station.subway.kobe">Estação de metrô</string>
+	<string name="type.railway.station.subway.kolkata">Estação de metrô</string>
+	<string name="type.railway.station.subway.kunming">Estação de metrô</string>
+	<string name="type.railway.station.subway.kyoto">Estação de metrô</string>
+	<string name="type.railway.station.subway.la">Estação de metrô</string>
+	<string name="type.railway.station.subway.lausanne">Estação de metrô</string>
+	<string name="type.railway.station.subway.lille">Estação de metrô</string>
+	<string name="type.railway.station.subway.lima">Estação de metrô</string>
+	<string name="type.railway.station.subway.lisboa">Estação de metrô</string>
+	<string name="type.railway.station.subway.lisbon">Estação de metrô</string>
+	<string name="type.railway.station.subway.london">Estação de metrô</string>
+	<string name="type.railway.station.subway.lyon">Estação de metrô</string>
+	<string name="type.railway.station.subway.madrid">Estação de metrô</string>
+	<string name="type.railway.station.subway.malaga">Estação de metrô</string>
+	<string name="type.railway.station.subway.manila">Estação de metrô</string>
+	<string name="type.railway.station.subway.maracaibo">Estação de metrô</string>
+	<string name="type.railway.station.subway.mashhad">Estação de metrô</string>
+	<string name="type.railway.station.subway.mecca">Estação de metrô</string>
+	<string name="type.railway.station.subway.medellin">Estação de metrô</string>
+	<string name="type.railway.station.subway.mexico">Estação de metrô</string>
+	<string name="type.railway.station.subway.milan">Estação de metrô</string>
+	<string name="type.railway.station.subway.minsk">Estação de metrô</string>
+	<string name="type.railway.station.subway.montreal">Estação de metrô</string>
+	<string name="type.railway.station.subway.moscow">Estação de metrô</string>
+	<string name="type.railway.station.subway.munchen">Estação de metrô</string>
+	<string name="type.railway.station.subway.nagoya">Estação de metrô</string>
+	<string name="type.railway.station.subway.newyork">Estação de metrô</string>
+	<string name="type.railway.station.subway.nnov">Estação de metrô</string>
+	<string name="type.railway.station.subway.novosibirsk">Estação de metrô</string>
+	<string name="type.railway.station.subway.osaka">Estação de metrô</string>
+	<string name="type.railway.station.subway.oslo">Estação de metrô</string>
+	<string name="type.railway.station.subway.palma">Estação de metrô</string>
+	<string name="type.railway.station.subway.panama">Estação de metrô</string>
+	<string name="type.railway.station.subway.paris">Estação de metrô</string>
+	<string name="type.railway.station.subway.philadelphia">Estação de metrô</string>
+	<string name="type.railway.station.subway.pyongyang">Estação de metrô</string>
+	<string name="type.railway.station.subway.rennes">Estação de metrô</string>
+	<string name="type.railway.station.subway.rio">Estação de metrô</string>
+	<string name="type.railway.station.subway.roma">Estação de metrô</string>
+	<string name="type.railway.station.subway.rotterdam">Estação de metrô</string>
+	<string name="type.railway.station.subway.samara">Estação de metrô</string>
+	<string name="type.railway.station.subway.santiago">Estação de metrô</string>
+	<string name="type.railway.station.subway.santo_domingo">Estação de metrô</string>
+	<string name="type.railway.station.subway.saopaulo">Estação de metrô</string>
+	<string name="type.railway.station.subway.sapporo">Estação de metrô</string>
+	<string name="type.railway.station.subway.sendai">Estação de metrô</string>
+	<string name="type.railway.station.subway.sf">Estação de metrô</string>
+	<string name="type.railway.station.subway.shanghai">Estação de metrô</string>
+	<string name="type.railway.station.subway.shiraz">Estação de metrô</string>
+	<string name="type.railway.station.subway.sofia">Estação de metrô</string>
+	<string name="type.railway.station.subway.spb">Estação de metrô</string>
+	<string name="type.railway.station.subway.stockholm">Estação de metrô</string>
+	<string name="type.railway.station.subway.tabriz">Estação de metrô</string>
+	<string name="type.railway.station.subway.taipei">Estação de metrô</string>
+	<string name="type.railway.station.subway.taoyuan">Estação de metrô</string>
+	<string name="type.railway.station.subway.tashkent">Estação de metrô</string>
+	<string name="type.railway.station.subway.tbilisi">Estação de metrô</string>
+	<string name="type.railway.station.subway.tianjin">Estação de metrô</string>
+	<string name="type.railway.station.subway.tokyo">Estação de metrô</string>
+	<string name="type.railway.station.subway.valencia">Estação de metrô</string>
+	<string name="type.railway.station.subway.vienna">Estação de metrô</string>
+	<string name="type.railway.station.subway.warszawa">Estação de metrô</string>
+	<string name="type.railway.station.subway.washington">Estação de metrô</string>
+	<string name="type.railway.station.subway.wuhan">Estação de metrô</string>
+	<string name="type.railway.station.subway.yerevan">Estação de metrô</string>
+	<string name="type.railway.station.subway.yokohama">Estação de metrô</string>
 	<string name="type.railway.subway">Metrô</string>
 	<string name="type.railway.subway.bridge">Metrô</string>
 	<string name="type.railway.subway.tunnel">Metrô</string>
-	<string name="type.railway.subway_entrance">Entrada de metrô</string>
-	<string name="type.railway.subway_entrance.barcelona">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.berlin">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.kiev">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.london">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.madrid">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.minsk">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.moscow">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.newyork">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.paris">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.roma">Entrada de estação do metrô</string>
-	<string name="type.railway.subway_entrance.spb">Entrada de estação do metrô</string>
+	<string name="type.railway.subway_entrance">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.adana">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.algiers">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.almaty">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.amsterdam">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.ankara">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.athens">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.baku">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.bangkok">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.barcelona">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.beijing">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.bengalore">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.berlin">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.brasilia">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.brescia">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.brussels">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.bucharest">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.budapest">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.bursa">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.cairo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.caracas">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.catania">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.changchun">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.chengdu">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.chicago">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.chongqing">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.dalian">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.delhi">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.dnepro">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.dubai">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.ekb">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.fukuoka">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.glasgow">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.guangzhou">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.hamburg">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.helsinki">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.hiroshima">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.isfahan">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.istanbul">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.izmir">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kazan">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kharkiv">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kiev">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kobe">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kolkata">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kunming">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.kyoto">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.la">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.lausanne">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.lille">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.lima">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.lisboa">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.lisbon">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.london">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.lyon">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.madrid">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.malaga">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.manila">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.maracaibo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.mashhad">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.mecca">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.medellin">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.mexico">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.milan">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.minsk">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.montreal">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.moscow">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.munchen">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.nagoya">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.newyork">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.nnov">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.osaka">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.oslo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.palma">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.panama">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.paris">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.philadelphia">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.pyongyang">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.rennes">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.rio">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.roma">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.rotterdam">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.samara">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.santiago">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.saopaulo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.sapporo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.sendai">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.sf">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.shanghai">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.shiraz">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.sofia">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.spb">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.stockholm">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.tabriz">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.taipei">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.taoyuan">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.tashkent">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.tbilisi">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.tianjin">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.tokyo">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.valencia">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.vienna">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.warszawa">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.washington">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.wuhan">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.yerevan">Entrada do metrô</string>
+	<string name="type.railway.subway_entrance.yokohama">Entrada do metrô</string>
 	<string name="type.railway.tram">Linha de bonde</string>
 	<string name="type.railway.tram.bridge">Linha de bonde</string>
 	<string name="type.railway.tram.tunnel">Linha de bonde</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 70d5b0f1da..6f8a2ae66d 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1388,33 +1388,229 @@
 	<string name="type.railway.station">Estação de comboios</string>
 	<string name="type.railway.station.light_rail">Estação de comboios</string>
 	<string name="type.railway.station.monorail">Estação de comboios</string>
-	<string name="type.railway.station.subway">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.barcelona">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.berlin">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.kiev">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.london">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.madrid">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.minsk">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.moscow">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.newyork">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.paris">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.roma">Estação de metropolitano</string>
-	<string name="type.railway.station.subway.spb">Estação de metropolitano</string>
+	<string name="type.railway.station.subway">Estação de metro</string>
+	<string name="type.railway.station.subway.adana">Estação de metro</string>
+	<string name="type.railway.station.subway.algiers">Estação de metro</string>
+	<string name="type.railway.station.subway.almaty">Estação de metro</string>
+	<string name="type.railway.station.subway.amsterdam">Estação de metro</string>
+	<string name="type.railway.station.subway.ankara">Estação de metro</string>
+	<string name="type.railway.station.subway.athens">Estação de metro</string>
+	<string name="type.railway.station.subway.baku">Estação de metro</string>
+	<string name="type.railway.station.subway.bangkok">Estação de metro</string>
+	<string name="type.railway.station.subway.barcelona">Estação de metro</string>
+	<string name="type.railway.station.subway.beijing">Estação de metro</string>
+	<string name="type.railway.station.subway.bengalore">Estação de metro</string>
+	<string name="type.railway.station.subway.berlin">Estação de metro</string>
+	<string name="type.railway.station.subway.brasilia">Estação de metro</string>
+	<string name="type.railway.station.subway.brescia">Estação de metro</string>
+	<string name="type.railway.station.subway.brussels">Estação de metro</string>
+	<string name="type.railway.station.subway.bucharest">Estação de metro</string>
+	<string name="type.railway.station.subway.budapest">Estação de metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Estação de metro</string>
+	<string name="type.railway.station.subway.bursa">Estação de metro</string>
+	<string name="type.railway.station.subway.cairo">Estação de metro</string>
+	<string name="type.railway.station.subway.caracas">Estação de metro</string>
+	<string name="type.railway.station.subway.catania">Estação de metro</string>
+	<string name="type.railway.station.subway.changchun">Estação de metro</string>
+	<string name="type.railway.station.subway.chengdu">Estação de metro</string>
+	<string name="type.railway.station.subway.chicago">Estação de metro</string>
+	<string name="type.railway.station.subway.chongqing">Estação de metro</string>
+	<string name="type.railway.station.subway.dalian">Estação de metro</string>
+	<string name="type.railway.station.subway.delhi">Estação de metro</string>
+	<string name="type.railway.station.subway.dnepro">Estação de metro</string>
+	<string name="type.railway.station.subway.dubai">Estação de metro</string>
+	<string name="type.railway.station.subway.ekb">Estação de metro</string>
+	<string name="type.railway.station.subway.fukuoka">Estação de metro</string>
+	<string name="type.railway.station.subway.glasgow">Estação de metro</string>
+	<string name="type.railway.station.subway.guangzhou">Estação de metro</string>
+	<string name="type.railway.station.subway.hamburg">Estação de metro</string>
+	<string name="type.railway.station.subway.helsinki">Estação de metro</string>
+	<string name="type.railway.station.subway.hiroshima">Estação de metro</string>
+	<string name="type.railway.station.subway.isfahan">Estação de metro</string>
+	<string name="type.railway.station.subway.istanbul">Estação de metro</string>
+	<string name="type.railway.station.subway.izmir">Estação de metro</string>
+	<string name="type.railway.station.subway.kazan">Estação de metro</string>
+	<string name="type.railway.station.subway.kharkiv">Estação de metro</string>
+	<string name="type.railway.station.subway.kiev">Estação de metro</string>
+	<string name="type.railway.station.subway.kobe">Estação de metro</string>
+	<string name="type.railway.station.subway.kolkata">Estação de metro</string>
+	<string name="type.railway.station.subway.kunming">Estação de metro</string>
+	<string name="type.railway.station.subway.kyoto">Estação de metro</string>
+	<string name="type.railway.station.subway.la">Estação de metro</string>
+	<string name="type.railway.station.subway.lausanne">Estação de metro</string>
+	<string name="type.railway.station.subway.lille">Estação de metro</string>
+	<string name="type.railway.station.subway.lima">Estação de metro</string>
+	<string name="type.railway.station.subway.lisboa">Estação de metro</string>
+	<string name="type.railway.station.subway.lisbon">Estação de metro</string>
+	<string name="type.railway.station.subway.london">Estação de metro</string>
+	<string name="type.railway.station.subway.lyon">Estação de metro</string>
+	<string name="type.railway.station.subway.madrid">Estação de metro</string>
+	<string name="type.railway.station.subway.malaga">Estação de metro</string>
+	<string name="type.railway.station.subway.manila">Estação de metro</string>
+	<string name="type.railway.station.subway.maracaibo">Estação de metro</string>
+	<string name="type.railway.station.subway.mashhad">Estação de metro</string>
+	<string name="type.railway.station.subway.mecca">Estação de metro</string>
+	<string name="type.railway.station.subway.medellin">Estação de metro</string>
+	<string name="type.railway.station.subway.mexico">Estação de metro</string>
+	<string name="type.railway.station.subway.milan">Estação de metro</string>
+	<string name="type.railway.station.subway.minsk">Estação de metro</string>
+	<string name="type.railway.station.subway.montreal">Estação de metro</string>
+	<string name="type.railway.station.subway.moscow">Estação de metro</string>
+	<string name="type.railway.station.subway.munchen">Estação de metro</string>
+	<string name="type.railway.station.subway.nagoya">Estação de metro</string>
+	<string name="type.railway.station.subway.newyork">Estação de metro</string>
+	<string name="type.railway.station.subway.nnov">Estação de metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Estação de metro</string>
+	<string name="type.railway.station.subway.osaka">Estação de metro</string>
+	<string name="type.railway.station.subway.oslo">Estação de metro</string>
+	<string name="type.railway.station.subway.palma">Estação de metro</string>
+	<string name="type.railway.station.subway.panama">Estação de metro</string>
+	<string name="type.railway.station.subway.paris">Estação de metro</string>
+	<string name="type.railway.station.subway.philadelphia">Estação de metro</string>
+	<string name="type.railway.station.subway.pyongyang">Estação de metro</string>
+	<string name="type.railway.station.subway.rennes">Estação de metro</string>
+	<string name="type.railway.station.subway.rio">Estação de metro</string>
+	<string name="type.railway.station.subway.roma">Estação de metro</string>
+	<string name="type.railway.station.subway.rotterdam">Estação de metro</string>
+	<string name="type.railway.station.subway.samara">Estação de metro</string>
+	<string name="type.railway.station.subway.santiago">Estação de metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Estação de metro</string>
+	<string name="type.railway.station.subway.saopaulo">Estação de metro</string>
+	<string name="type.railway.station.subway.sapporo">Estação de metro</string>
+	<string name="type.railway.station.subway.sendai">Estação de metro</string>
+	<string name="type.railway.station.subway.sf">Estação de metro</string>
+	<string name="type.railway.station.subway.shanghai">Estação de metro</string>
+	<string name="type.railway.station.subway.shiraz">Estação de metro</string>
+	<string name="type.railway.station.subway.sofia">Estação de metro</string>
+	<string name="type.railway.station.subway.spb">Estação de metro</string>
+	<string name="type.railway.station.subway.stockholm">Estação de metro</string>
+	<string name="type.railway.station.subway.tabriz">Estação de metro</string>
+	<string name="type.railway.station.subway.taipei">Estação de metro</string>
+	<string name="type.railway.station.subway.taoyuan">Estação de metro</string>
+	<string name="type.railway.station.subway.tashkent">Estação de metro</string>
+	<string name="type.railway.station.subway.tbilisi">Estação de metro</string>
+	<string name="type.railway.station.subway.tianjin">Estação de metro</string>
+	<string name="type.railway.station.subway.tokyo">Estação de metro</string>
+	<string name="type.railway.station.subway.valencia">Estação de metro</string>
+	<string name="type.railway.station.subway.vienna">Estação de metro</string>
+	<string name="type.railway.station.subway.warszawa">Estação de metro</string>
+	<string name="type.railway.station.subway.washington">Estação de metro</string>
+	<string name="type.railway.station.subway.wuhan">Estação de metro</string>
+	<string name="type.railway.station.subway.yerevan">Estação de metro</string>
+	<string name="type.railway.station.subway.yokohama">Estação de metro</string>
 	<string name="type.railway.subway">Metropolitano</string>
 	<string name="type.railway.subway.bridge">Metropolitano</string>
 	<string name="type.railway.subway.tunnel">Metropolitano</string>
-	<string name="type.railway.subway_entrance">Entrada de metropolitano</string>
-	<string name="type.railway.subway_entrance.barcelona">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.berlin">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.kiev">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.london">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.madrid">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.minsk">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.moscow">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.newyork">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.paris">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.roma">Entrada de estação de metrolitano</string>
-	<string name="type.railway.subway_entrance.spb">Entrada de estação de metrolitano</string>
+	<string name="type.railway.subway_entrance">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.adana">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.algiers">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.almaty">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.amsterdam">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.ankara">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.athens">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.baku">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.bangkok">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.barcelona">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.beijing">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.bengalore">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.berlin">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.brasilia">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.brescia">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.brussels">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.bucharest">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.budapest">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.bursa">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.cairo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.caracas">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.catania">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.changchun">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.chengdu">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.chicago">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.chongqing">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.dalian">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.delhi">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.dnepro">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.dubai">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.ekb">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.fukuoka">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.glasgow">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.guangzhou">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.hamburg">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.helsinki">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.hiroshima">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.isfahan">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.istanbul">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.izmir">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kazan">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kharkiv">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kiev">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kobe">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kolkata">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kunming">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.kyoto">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.la">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.lausanne">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.lille">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.lima">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.lisboa">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.lisbon">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.london">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.lyon">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.madrid">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.malaga">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.manila">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.maracaibo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.mashhad">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.mecca">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.medellin">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.mexico">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.milan">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.minsk">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.montreal">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.moscow">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.munchen">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.nagoya">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.newyork">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.nnov">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.osaka">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.oslo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.palma">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.panama">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.paris">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.philadelphia">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.pyongyang">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.rennes">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.rio">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.roma">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.rotterdam">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.samara">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.santiago">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.saopaulo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.sapporo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.sendai">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.sf">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.shanghai">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.shiraz">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.sofia">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.spb">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.stockholm">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.tabriz">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.taipei">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.taoyuan">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.tashkent">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.tbilisi">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.tianjin">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.tokyo">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.valencia">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.vienna">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.warszawa">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.washington">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.wuhan">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.yerevan">Entrada do metro</string>
+	<string name="type.railway.subway_entrance.yokohama">Entrada do metro</string>
 	<string name="type.railway.tram">Linha de elétrico</string>
 	<string name="type.railway.tram.bridge">Linha de elétrico</string>
 	<string name="type.railway.tram.tunnel">Linha de elétrico</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 083ff81a0e..c822370d2a 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1248,29 +1248,225 @@
 	<string name="type.railway.station.light_rail">Feroviar</string>
 	<string name="type.railway.station.monorail">Feroviar</string>
 	<string name="type.railway.station.subway">Metrou</string>
+	<string name="type.railway.station.subway.adana">Metrou</string>
+	<string name="type.railway.station.subway.algiers">Metrou</string>
+	<string name="type.railway.station.subway.almaty">Metrou</string>
+	<string name="type.railway.station.subway.amsterdam">Metrou</string>
+	<string name="type.railway.station.subway.ankara">Metrou</string>
+	<string name="type.railway.station.subway.athens">Metrou</string>
+	<string name="type.railway.station.subway.baku">Metrou</string>
+	<string name="type.railway.station.subway.bangkok">Metrou</string>
 	<string name="type.railway.station.subway.barcelona">Metrou</string>
+	<string name="type.railway.station.subway.beijing">Metrou</string>
+	<string name="type.railway.station.subway.bengalore">Metrou</string>
 	<string name="type.railway.station.subway.berlin">Metrou</string>
+	<string name="type.railway.station.subway.brasilia">Metrou</string>
+	<string name="type.railway.station.subway.brescia">Metrou</string>
+	<string name="type.railway.station.subway.brussels">Metrou</string>
+	<string name="type.railway.station.subway.bucharest">Metrou</string>
+	<string name="type.railway.station.subway.budapest">Metrou</string>
+	<string name="type.railway.station.subway.buenos_aires">Metrou</string>
+	<string name="type.railway.station.subway.bursa">Metrou</string>
+	<string name="type.railway.station.subway.cairo">Metrou</string>
+	<string name="type.railway.station.subway.caracas">Metrou</string>
+	<string name="type.railway.station.subway.catania">Metrou</string>
+	<string name="type.railway.station.subway.changchun">Metrou</string>
+	<string name="type.railway.station.subway.chengdu">Metrou</string>
+	<string name="type.railway.station.subway.chicago">Metrou</string>
+	<string name="type.railway.station.subway.chongqing">Metrou</string>
+	<string name="type.railway.station.subway.dalian">Metrou</string>
+	<string name="type.railway.station.subway.delhi">Metrou</string>
+	<string name="type.railway.station.subway.dnepro">Metrou</string>
+	<string name="type.railway.station.subway.dubai">Metrou</string>
+	<string name="type.railway.station.subway.ekb">Metrou</string>
+	<string name="type.railway.station.subway.fukuoka">Metrou</string>
+	<string name="type.railway.station.subway.glasgow">Metrou</string>
+	<string name="type.railway.station.subway.guangzhou">Metrou</string>
+	<string name="type.railway.station.subway.hamburg">Metrou</string>
+	<string name="type.railway.station.subway.helsinki">Metrou</string>
+	<string name="type.railway.station.subway.hiroshima">Metrou</string>
+	<string name="type.railway.station.subway.isfahan">Metrou</string>
+	<string name="type.railway.station.subway.istanbul">Metrou</string>
+	<string name="type.railway.station.subway.izmir">Metrou</string>
+	<string name="type.railway.station.subway.kazan">Metrou</string>
+	<string name="type.railway.station.subway.kharkiv">Metrou</string>
 	<string name="type.railway.station.subway.kiev">Metrou</string>
+	<string name="type.railway.station.subway.kobe">Metrou</string>
+	<string name="type.railway.station.subway.kolkata">Metrou</string>
+	<string name="type.railway.station.subway.kunming">Metrou</string>
+	<string name="type.railway.station.subway.kyoto">Metrou</string>
+	<string name="type.railway.station.subway.la">Metrou</string>
+	<string name="type.railway.station.subway.lausanne">Metrou</string>
+	<string name="type.railway.station.subway.lille">Metrou</string>
+	<string name="type.railway.station.subway.lima">Metrou</string>
+	<string name="type.railway.station.subway.lisboa">Metrou</string>
+	<string name="type.railway.station.subway.lisbon">Metrou</string>
 	<string name="type.railway.station.subway.london">Metrou</string>
+	<string name="type.railway.station.subway.lyon">Metrou</string>
 	<string name="type.railway.station.subway.madrid">Metrou</string>
+	<string name="type.railway.station.subway.malaga">Metrou</string>
+	<string name="type.railway.station.subway.manila">Metrou</string>
+	<string name="type.railway.station.subway.maracaibo">Metrou</string>
+	<string name="type.railway.station.subway.mashhad">Metrou</string>
+	<string name="type.railway.station.subway.mecca">Metrou</string>
+	<string name="type.railway.station.subway.medellin">Metrou</string>
+	<string name="type.railway.station.subway.mexico">Metrou</string>
+	<string name="type.railway.station.subway.milan">Metrou</string>
 	<string name="type.railway.station.subway.minsk">Metrou</string>
+	<string name="type.railway.station.subway.montreal">Metrou</string>
 	<string name="type.railway.station.subway.moscow">Metrou</string>
+	<string name="type.railway.station.subway.munchen">Metrou</string>
+	<string name="type.railway.station.subway.nagoya">Metrou</string>
 	<string name="type.railway.station.subway.newyork">Metrou</string>
+	<string name="type.railway.station.subway.nnov">Metrou</string>
+	<string name="type.railway.station.subway.novosibirsk">Metrou</string>
+	<string name="type.railway.station.subway.osaka">Metrou</string>
+	<string name="type.railway.station.subway.oslo">Metrou</string>
+	<string name="type.railway.station.subway.palma">Metrou</string>
+	<string name="type.railway.station.subway.panama">Metrou</string>
 	<string name="type.railway.station.subway.paris">Metrou</string>
+	<string name="type.railway.station.subway.philadelphia">Metrou</string>
+	<string name="type.railway.station.subway.pyongyang">Metrou</string>
+	<string name="type.railway.station.subway.rennes">Metrou</string>
+	<string name="type.railway.station.subway.rio">Metrou</string>
 	<string name="type.railway.station.subway.roma">Metrou</string>
+	<string name="type.railway.station.subway.rotterdam">Metrou</string>
+	<string name="type.railway.station.subway.samara">Metrou</string>
+	<string name="type.railway.station.subway.santiago">Metrou</string>
+	<string name="type.railway.station.subway.santo_domingo">Metrou</string>
+	<string name="type.railway.station.subway.saopaulo">Metrou</string>
+	<string name="type.railway.station.subway.sapporo">Metrou</string>
+	<string name="type.railway.station.subway.sendai">Metrou</string>
+	<string name="type.railway.station.subway.sf">Metrou</string>
+	<string name="type.railway.station.subway.shanghai">Metrou</string>
+	<string name="type.railway.station.subway.shiraz">Metrou</string>
+	<string name="type.railway.station.subway.sofia">Metrou</string>
 	<string name="type.railway.station.subway.spb">Metrou</string>
+	<string name="type.railway.station.subway.stockholm">Metrou</string>
+	<string name="type.railway.station.subway.tabriz">Metrou</string>
+	<string name="type.railway.station.subway.taipei">Metrou</string>
+	<string name="type.railway.station.subway.taoyuan">Metrou</string>
+	<string name="type.railway.station.subway.tashkent">Metrou</string>
+	<string name="type.railway.station.subway.tbilisi">Metrou</string>
+	<string name="type.railway.station.subway.tianjin">Metrou</string>
+	<string name="type.railway.station.subway.tokyo">Metrou</string>
+	<string name="type.railway.station.subway.valencia">Metrou</string>
+	<string name="type.railway.station.subway.vienna">Metrou</string>
+	<string name="type.railway.station.subway.warszawa">Metrou</string>
+	<string name="type.railway.station.subway.washington">Metrou</string>
+	<string name="type.railway.station.subway.wuhan">Metrou</string>
+	<string name="type.railway.station.subway.yerevan">Metrou</string>
+	<string name="type.railway.station.subway.yokohama">Metrou</string>
 	<string name="type.railway.subway_entrance">Intrare în metro</string>
-	<string name="type.railway.subway_entrance.barcelona">Metrou</string>
-	<string name="type.railway.subway_entrance.berlin">Metrou</string>
-	<string name="type.railway.subway_entrance.kiev">Metrou</string>
-	<string name="type.railway.subway_entrance.london">Metrou</string>
-	<string name="type.railway.subway_entrance.madrid">Metrou</string>
-	<string name="type.railway.subway_entrance.minsk">Metrou</string>
-	<string name="type.railway.subway_entrance.moscow">Metrou</string>
-	<string name="type.railway.subway_entrance.newyork">Metrou</string>
-	<string name="type.railway.subway_entrance.paris">Metrou</string>
-	<string name="type.railway.subway_entrance.roma">Metrou</string>
-	<string name="type.railway.subway_entrance.spb">Metrou</string>
+	<string name="type.railway.subway_entrance.adana">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.algiers">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.almaty">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.amsterdam">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.ankara">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.athens">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.baku">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.bangkok">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.barcelona">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.beijing">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.bengalore">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.berlin">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.brasilia">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.brescia">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.brussels">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.bucharest">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.budapest">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.bursa">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.cairo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.caracas">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.catania">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.changchun">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.chengdu">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.chicago">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.chongqing">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.dalian">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.delhi">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.dnepro">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.dubai">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.ekb">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.fukuoka">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.glasgow">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.guangzhou">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.hamburg">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.helsinki">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.hiroshima">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.isfahan">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.istanbul">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.izmir">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kazan">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kharkiv">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kiev">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kobe">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kolkata">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kunming">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.kyoto">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.la">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.lausanne">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.lille">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.lima">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.lisboa">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.lisbon">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.london">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.lyon">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.madrid">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.malaga">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.manila">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.maracaibo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.mashhad">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.mecca">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.medellin">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.mexico">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.milan">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.minsk">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.montreal">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.moscow">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.munchen">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.nagoya">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.newyork">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.nnov">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.osaka">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.oslo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.palma">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.panama">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.paris">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.philadelphia">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.pyongyang">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.rennes">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.rio">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.roma">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.rotterdam">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.samara">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.santiago">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.saopaulo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.sapporo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.sendai">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.sf">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.shanghai">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.shiraz">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.sofia">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.spb">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.stockholm">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.tabriz">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.taipei">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.taoyuan">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.tashkent">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.tbilisi">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.tianjin">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.tokyo">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.valencia">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.vienna">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.warszawa">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.washington">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.wuhan">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.yerevan">Intrare în metro</string>
+	<string name="type.railway.subway_entrance.yokohama">Intrare în metro</string>
 	<string name="type.railway.tram_stop">Stație de tramvai</string>
 	<string name="type.shop">Magazin</string>
 	<string name="type.shop.alcohol">Băuturi alcoolice</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 7a455b5feb..112cf9d75d 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1467,32 +1467,228 @@
 	<string name="type.railway.station.light_rail">Ж/д станция</string>
 	<string name="type.railway.station.monorail">Ж/д станция</string>
 	<string name="type.railway.station.subway">Метро</string>
+	<string name="type.railway.station.subway.adana">Метро</string>
+	<string name="type.railway.station.subway.algiers">Метро</string>
+	<string name="type.railway.station.subway.almaty">Метро</string>
+	<string name="type.railway.station.subway.amsterdam">Метро</string>
+	<string name="type.railway.station.subway.ankara">Метро</string>
+	<string name="type.railway.station.subway.athens">Метро</string>
+	<string name="type.railway.station.subway.baku">Метро</string>
+	<string name="type.railway.station.subway.bangkok">Метро</string>
 	<string name="type.railway.station.subway.barcelona">Метро</string>
+	<string name="type.railway.station.subway.beijing">Метро</string>
+	<string name="type.railway.station.subway.bengalore">Метро</string>
 	<string name="type.railway.station.subway.berlin">Метро</string>
+	<string name="type.railway.station.subway.brasilia">Метро</string>
+	<string name="type.railway.station.subway.brescia">Метро</string>
+	<string name="type.railway.station.subway.brussels">Метро</string>
+	<string name="type.railway.station.subway.bucharest">Метро</string>
+	<string name="type.railway.station.subway.budapest">Метро</string>
+	<string name="type.railway.station.subway.buenos_aires">Метро</string>
+	<string name="type.railway.station.subway.bursa">Метро</string>
+	<string name="type.railway.station.subway.cairo">Метро</string>
+	<string name="type.railway.station.subway.caracas">Метро</string>
+	<string name="type.railway.station.subway.catania">Метро</string>
+	<string name="type.railway.station.subway.changchun">Метро</string>
+	<string name="type.railway.station.subway.chengdu">Метро</string>
+	<string name="type.railway.station.subway.chicago">Метро</string>
+	<string name="type.railway.station.subway.chongqing">Метро</string>
+	<string name="type.railway.station.subway.dalian">Метро</string>
+	<string name="type.railway.station.subway.delhi">Метро</string>
+	<string name="type.railway.station.subway.dnepro">Метро</string>
+	<string name="type.railway.station.subway.dubai">Метро</string>
+	<string name="type.railway.station.subway.ekb">Метро</string>
+	<string name="type.railway.station.subway.fukuoka">Метро</string>
+	<string name="type.railway.station.subway.glasgow">Метро</string>
+	<string name="type.railway.station.subway.guangzhou">Метро</string>
+	<string name="type.railway.station.subway.hamburg">Метро</string>
+	<string name="type.railway.station.subway.helsinki">Метро</string>
+	<string name="type.railway.station.subway.hiroshima">Метро</string>
+	<string name="type.railway.station.subway.isfahan">Метро</string>
+	<string name="type.railway.station.subway.istanbul">Метро</string>
+	<string name="type.railway.station.subway.izmir">Метро</string>
+	<string name="type.railway.station.subway.kazan">Метро</string>
+	<string name="type.railway.station.subway.kharkiv">Метро</string>
 	<string name="type.railway.station.subway.kiev">Метро</string>
+	<string name="type.railway.station.subway.kobe">Метро</string>
+	<string name="type.railway.station.subway.kolkata">Метро</string>
+	<string name="type.railway.station.subway.kunming">Метро</string>
+	<string name="type.railway.station.subway.kyoto">Метро</string>
+	<string name="type.railway.station.subway.la">Метро</string>
+	<string name="type.railway.station.subway.lausanne">Метро</string>
+	<string name="type.railway.station.subway.lille">Метро</string>
+	<string name="type.railway.station.subway.lima">Метро</string>
+	<string name="type.railway.station.subway.lisboa">Метро</string>
+	<string name="type.railway.station.subway.lisbon">Метро</string>
 	<string name="type.railway.station.subway.london">Метро</string>
+	<string name="type.railway.station.subway.lyon">Метро</string>
 	<string name="type.railway.station.subway.madrid">Метро</string>
+	<string name="type.railway.station.subway.malaga">Метро</string>
+	<string name="type.railway.station.subway.manila">Метро</string>
+	<string name="type.railway.station.subway.maracaibo">Метро</string>
+	<string name="type.railway.station.subway.mashhad">Метро</string>
+	<string name="type.railway.station.subway.mecca">Метро</string>
+	<string name="type.railway.station.subway.medellin">Метро</string>
+	<string name="type.railway.station.subway.mexico">Метро</string>
+	<string name="type.railway.station.subway.milan">Метро</string>
 	<string name="type.railway.station.subway.minsk">Метро</string>
+	<string name="type.railway.station.subway.montreal">Метро</string>
 	<string name="type.railway.station.subway.moscow">Метро</string>
+	<string name="type.railway.station.subway.munchen">Метро</string>
+	<string name="type.railway.station.subway.nagoya">Метро</string>
 	<string name="type.railway.station.subway.newyork">Метро</string>
+	<string name="type.railway.station.subway.nnov">Метро</string>
+	<string name="type.railway.station.subway.novosibirsk">Метро</string>
+	<string name="type.railway.station.subway.osaka">Метро</string>
+	<string name="type.railway.station.subway.oslo">Метро</string>
+	<string name="type.railway.station.subway.palma">Метро</string>
+	<string name="type.railway.station.subway.panama">Метро</string>
 	<string name="type.railway.station.subway.paris">Метро</string>
+	<string name="type.railway.station.subway.philadelphia">Метро</string>
+	<string name="type.railway.station.subway.pyongyang">Метро</string>
+	<string name="type.railway.station.subway.rennes">Метро</string>
+	<string name="type.railway.station.subway.rio">Метро</string>
 	<string name="type.railway.station.subway.roma">Метро</string>
+	<string name="type.railway.station.subway.rotterdam">Метро</string>
+	<string name="type.railway.station.subway.samara">Метро</string>
+	<string name="type.railway.station.subway.santiago">Метро</string>
+	<string name="type.railway.station.subway.santo_domingo">Метро</string>
+	<string name="type.railway.station.subway.saopaulo">Метро</string>
+	<string name="type.railway.station.subway.sapporo">Метро</string>
+	<string name="type.railway.station.subway.sendai">Метро</string>
+	<string name="type.railway.station.subway.sf">Метро</string>
+	<string name="type.railway.station.subway.shanghai">Метро</string>
+	<string name="type.railway.station.subway.shiraz">Метро</string>
+	<string name="type.railway.station.subway.sofia">Метро</string>
 	<string name="type.railway.station.subway.spb">Метро</string>
+	<string name="type.railway.station.subway.stockholm">Метро</string>
+	<string name="type.railway.station.subway.tabriz">Метро</string>
+	<string name="type.railway.station.subway.taipei">Метро</string>
+	<string name="type.railway.station.subway.taoyuan">Метро</string>
+	<string name="type.railway.station.subway.tashkent">Метро</string>
+	<string name="type.railway.station.subway.tbilisi">Метро</string>
+	<string name="type.railway.station.subway.tianjin">Метро</string>
+	<string name="type.railway.station.subway.tokyo">Метро</string>
+	<string name="type.railway.station.subway.valencia">Метро</string>
+	<string name="type.railway.station.subway.vienna">Метро</string>
+	<string name="type.railway.station.subway.warszawa">Метро</string>
+	<string name="type.railway.station.subway.washington">Метро</string>
+	<string name="type.railway.station.subway.wuhan">Метро</string>
+	<string name="type.railway.station.subway.yerevan">Метро</string>
+	<string name="type.railway.station.subway.yokohama">Метро</string>
 	<string name="type.railway.subway">Ветка метро</string>
 	<string name="type.railway.subway.bridge">Ветка метро</string>
 	<string name="type.railway.subway.tunnel">Ветка метро</string>
 	<string name="type.railway.subway_entrance">Вход в метро</string>
-	<string name="type.railway.subway_entrance.barcelona">Метро</string>
-	<string name="type.railway.subway_entrance.berlin">Метро</string>
-	<string name="type.railway.subway_entrance.kiev">Метро</string>
-	<string name="type.railway.subway_entrance.london">Метро</string>
-	<string name="type.railway.subway_entrance.madrid">Метро</string>
-	<string name="type.railway.subway_entrance.minsk">Метро</string>
-	<string name="type.railway.subway_entrance.moscow">Метро</string>
-	<string name="type.railway.subway_entrance.newyork">Метро</string>
-	<string name="type.railway.subway_entrance.paris">Метро</string>
-	<string name="type.railway.subway_entrance.roma">Метро</string>
-	<string name="type.railway.subway_entrance.spb">Метро</string>
+	<string name="type.railway.subway_entrance.adana">Вход в метро</string>
+	<string name="type.railway.subway_entrance.algiers">Вход в метро</string>
+	<string name="type.railway.subway_entrance.almaty">Вход в метро</string>
+	<string name="type.railway.subway_entrance.amsterdam">Вход в метро</string>
+	<string name="type.railway.subway_entrance.ankara">Вход в метро</string>
+	<string name="type.railway.subway_entrance.athens">Вход в метро</string>
+	<string name="type.railway.subway_entrance.baku">Вход в метро</string>
+	<string name="type.railway.subway_entrance.bangkok">Вход в метро</string>
+	<string name="type.railway.subway_entrance.barcelona">Вход в метро</string>
+	<string name="type.railway.subway_entrance.beijing">Вход в метро</string>
+	<string name="type.railway.subway_entrance.bengalore">Вход в метро</string>
+	<string name="type.railway.subway_entrance.berlin">Вход в метро</string>
+	<string name="type.railway.subway_entrance.brasilia">Вход в метро</string>
+	<string name="type.railway.subway_entrance.brescia">Вход в метро</string>
+	<string name="type.railway.subway_entrance.brussels">Вход в метро</string>
+	<string name="type.railway.subway_entrance.bucharest">Вход в метро</string>
+	<string name="type.railway.subway_entrance.budapest">Вход в метро</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Вход в метро</string>
+	<string name="type.railway.subway_entrance.bursa">Вход в метро</string>
+	<string name="type.railway.subway_entrance.cairo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.caracas">Вход в метро</string>
+	<string name="type.railway.subway_entrance.catania">Вход в метро</string>
+	<string name="type.railway.subway_entrance.changchun">Вход в метро</string>
+	<string name="type.railway.subway_entrance.chengdu">Вход в метро</string>
+	<string name="type.railway.subway_entrance.chicago">Вход в метро</string>
+	<string name="type.railway.subway_entrance.chongqing">Вход в метро</string>
+	<string name="type.railway.subway_entrance.dalian">Вход в метро</string>
+	<string name="type.railway.subway_entrance.delhi">Вход в метро</string>
+	<string name="type.railway.subway_entrance.dnepro">Вход в метро</string>
+	<string name="type.railway.subway_entrance.dubai">Вход в метро</string>
+	<string name="type.railway.subway_entrance.ekb">Вход в метро</string>
+	<string name="type.railway.subway_entrance.fukuoka">Вход в метро</string>
+	<string name="type.railway.subway_entrance.glasgow">Вход в метро</string>
+	<string name="type.railway.subway_entrance.guangzhou">Вход в метро</string>
+	<string name="type.railway.subway_entrance.hamburg">Вход в метро</string>
+	<string name="type.railway.subway_entrance.helsinki">Вход в метро</string>
+	<string name="type.railway.subway_entrance.hiroshima">Вход в метро</string>
+	<string name="type.railway.subway_entrance.isfahan">Вход в метро</string>
+	<string name="type.railway.subway_entrance.istanbul">Вход в метро</string>
+	<string name="type.railway.subway_entrance.izmir">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kazan">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kharkiv">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kiev">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kobe">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kolkata">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kunming">Вход в метро</string>
+	<string name="type.railway.subway_entrance.kyoto">Вход в метро</string>
+	<string name="type.railway.subway_entrance.la">Вход в метро</string>
+	<string name="type.railway.subway_entrance.lausanne">Вход в метро</string>
+	<string name="type.railway.subway_entrance.lille">Вход в метро</string>
+	<string name="type.railway.subway_entrance.lima">Вход в метро</string>
+	<string name="type.railway.subway_entrance.lisboa">Вход в метро</string>
+	<string name="type.railway.subway_entrance.lisbon">Вход в метро</string>
+	<string name="type.railway.subway_entrance.london">Вход в метро</string>
+	<string name="type.railway.subway_entrance.lyon">Вход в метро</string>
+	<string name="type.railway.subway_entrance.madrid">Вход в метро</string>
+	<string name="type.railway.subway_entrance.malaga">Вход в метро</string>
+	<string name="type.railway.subway_entrance.manila">Вход в метро</string>
+	<string name="type.railway.subway_entrance.maracaibo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.mashhad">Вход в метро</string>
+	<string name="type.railway.subway_entrance.mecca">Вход в метро</string>
+	<string name="type.railway.subway_entrance.medellin">Вход в метро</string>
+	<string name="type.railway.subway_entrance.mexico">Вход в метро</string>
+	<string name="type.railway.subway_entrance.milan">Вход в метро</string>
+	<string name="type.railway.subway_entrance.minsk">Вход в метро</string>
+	<string name="type.railway.subway_entrance.montreal">Вход в метро</string>
+	<string name="type.railway.subway_entrance.moscow">Вход в метро</string>
+	<string name="type.railway.subway_entrance.munchen">Вход в метро</string>
+	<string name="type.railway.subway_entrance.nagoya">Вход в метро</string>
+	<string name="type.railway.subway_entrance.newyork">Вход в метро</string>
+	<string name="type.railway.subway_entrance.nnov">Вход в метро</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Вход в метро</string>
+	<string name="type.railway.subway_entrance.osaka">Вход в метро</string>
+	<string name="type.railway.subway_entrance.oslo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.palma">Вход в метро</string>
+	<string name="type.railway.subway_entrance.panama">Вход в метро</string>
+	<string name="type.railway.subway_entrance.paris">Вход в метро</string>
+	<string name="type.railway.subway_entrance.philadelphia">Вход в метро</string>
+	<string name="type.railway.subway_entrance.pyongyang">Вход в метро</string>
+	<string name="type.railway.subway_entrance.rennes">Вход в метро</string>
+	<string name="type.railway.subway_entrance.rio">Вход в метро</string>
+	<string name="type.railway.subway_entrance.roma">Вход в метро</string>
+	<string name="type.railway.subway_entrance.rotterdam">Вход в метро</string>
+	<string name="type.railway.subway_entrance.samara">Вход в метро</string>
+	<string name="type.railway.subway_entrance.santiago">Вход в метро</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.saopaulo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.sapporo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.sendai">Вход в метро</string>
+	<string name="type.railway.subway_entrance.sf">Вход в метро</string>
+	<string name="type.railway.subway_entrance.shanghai">Вход в метро</string>
+	<string name="type.railway.subway_entrance.shiraz">Вход в метро</string>
+	<string name="type.railway.subway_entrance.sofia">Вход в метро</string>
+	<string name="type.railway.subway_entrance.spb">Вход в метро</string>
+	<string name="type.railway.subway_entrance.stockholm">Вход в метро</string>
+	<string name="type.railway.subway_entrance.tabriz">Вход в метро</string>
+	<string name="type.railway.subway_entrance.taipei">Вход в метро</string>
+	<string name="type.railway.subway_entrance.taoyuan">Вход в метро</string>
+	<string name="type.railway.subway_entrance.tashkent">Вход в метро</string>
+	<string name="type.railway.subway_entrance.tbilisi">Вход в метро</string>
+	<string name="type.railway.subway_entrance.tianjin">Вход в метро</string>
+	<string name="type.railway.subway_entrance.tokyo">Вход в метро</string>
+	<string name="type.railway.subway_entrance.valencia">Вход в метро</string>
+	<string name="type.railway.subway_entrance.vienna">Вход в метро</string>
+	<string name="type.railway.subway_entrance.warszawa">Вход в метро</string>
+	<string name="type.railway.subway_entrance.washington">Вход в метро</string>
+	<string name="type.railway.subway_entrance.wuhan">Вход в метро</string>
+	<string name="type.railway.subway_entrance.yerevan">Вход в метро</string>
+	<string name="type.railway.subway_entrance.yokohama">Вход в метро</string>
 	<string name="type.railway.tram">Трамвай</string>
 	<string name="type.railway.tram.bridge">Трамвай</string>
 	<string name="type.railway.tram.tunnel">Трамвай</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 5dca9fd83e..408b383826 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1224,29 +1224,225 @@
 	<string name="type.railway.station.light_rail">Železničná stanica</string>
 	<string name="type.railway.station.monorail">Železničná stanica</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway_entrance">Vstup do metra</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.algiers">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.almaty">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.amsterdam">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.ankara">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.athens">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.baku">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.bangkok">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.barcelona">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.beijing">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.bengalore">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.berlin">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.brasilia">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.brescia">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.brussels">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.bucharest">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.budapest">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.bursa">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.cairo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.caracas">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.catania">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.changchun">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.chengdu">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.chicago">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.chongqing">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.dalian">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.delhi">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.dnepro">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.dubai">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.ekb">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.fukuoka">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.glasgow">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.guangzhou">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.hamburg">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.helsinki">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.hiroshima">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.isfahan">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.istanbul">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.izmir">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kazan">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kharkiv">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kiev">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kobe">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kolkata">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kunming">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.kyoto">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.la">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.lausanne">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.lille">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.lima">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.lisboa">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.lisbon">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.london">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.lyon">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.madrid">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.malaga">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.manila">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.maracaibo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.mashhad">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.mecca">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.medellin">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.mexico">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.milan">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.minsk">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.montreal">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.moscow">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.munchen">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.nagoya">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.newyork">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.nnov">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.osaka">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.oslo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.palma">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.panama">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.paris">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.philadelphia">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.pyongyang">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.rennes">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.rio">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.roma">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.rotterdam">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.samara">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.santiago">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.saopaulo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.sapporo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.sendai">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.sf">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.shanghai">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.shiraz">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.sofia">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.spb">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.stockholm">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.tabriz">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.taipei">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.taoyuan">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.tashkent">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.tbilisi">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.tianjin">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.tokyo">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.valencia">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.vienna">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.warszawa">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.washington">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.wuhan">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.yerevan">Vstup do metra</string>
+	<string name="type.railway.subway_entrance.yokohama">Vstup do metra</string>
 	<string name="type.railway.tram_stop">Električková zastávka</string>
 	<string name="type.shop">Obchod</string>
 	<string name="type.shop.alcohol">Liehoviny</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 86aab3d0be..8454bde779 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1219,29 +1219,225 @@
 	<string name="type.railway.station.light_rail">Tågstation</string>
 	<string name="type.railway.station.monorail">Tågstation</string>
 	<string name="type.railway.station.subway">Tunnelbana</string>
+	<string name="type.railway.station.subway.adana">Tunnelbana</string>
+	<string name="type.railway.station.subway.algiers">Tunnelbana</string>
+	<string name="type.railway.station.subway.almaty">Tunnelbana</string>
+	<string name="type.railway.station.subway.amsterdam">Tunnelbana</string>
+	<string name="type.railway.station.subway.ankara">Tunnelbana</string>
+	<string name="type.railway.station.subway.athens">Tunnelbana</string>
+	<string name="type.railway.station.subway.baku">Tunnelbana</string>
+	<string name="type.railway.station.subway.bangkok">Tunnelbana</string>
 	<string name="type.railway.station.subway.barcelona">Tunnelbana</string>
+	<string name="type.railway.station.subway.beijing">Tunnelbana</string>
+	<string name="type.railway.station.subway.bengalore">Tunnelbana</string>
 	<string name="type.railway.station.subway.berlin">Tunnelbana</string>
+	<string name="type.railway.station.subway.brasilia">Tunnelbana</string>
+	<string name="type.railway.station.subway.brescia">Tunnelbana</string>
+	<string name="type.railway.station.subway.brussels">Tunnelbana</string>
+	<string name="type.railway.station.subway.bucharest">Tunnelbana</string>
+	<string name="type.railway.station.subway.budapest">Tunnelbana</string>
+	<string name="type.railway.station.subway.buenos_aires">Tunnelbana</string>
+	<string name="type.railway.station.subway.bursa">Tunnelbana</string>
+	<string name="type.railway.station.subway.cairo">Tunnelbana</string>
+	<string name="type.railway.station.subway.caracas">Tunnelbana</string>
+	<string name="type.railway.station.subway.catania">Tunnelbana</string>
+	<string name="type.railway.station.subway.changchun">Tunnelbana</string>
+	<string name="type.railway.station.subway.chengdu">Tunnelbana</string>
+	<string name="type.railway.station.subway.chicago">Tunnelbana</string>
+	<string name="type.railway.station.subway.chongqing">Tunnelbana</string>
+	<string name="type.railway.station.subway.dalian">Tunnelbana</string>
+	<string name="type.railway.station.subway.delhi">Tunnelbana</string>
+	<string name="type.railway.station.subway.dnepro">Tunnelbana</string>
+	<string name="type.railway.station.subway.dubai">Tunnelbana</string>
+	<string name="type.railway.station.subway.ekb">Tunnelbana</string>
+	<string name="type.railway.station.subway.fukuoka">Tunnelbana</string>
+	<string name="type.railway.station.subway.glasgow">Tunnelbana</string>
+	<string name="type.railway.station.subway.guangzhou">Tunnelbana</string>
+	<string name="type.railway.station.subway.hamburg">Tunnelbana</string>
+	<string name="type.railway.station.subway.helsinki">Tunnelbana</string>
+	<string name="type.railway.station.subway.hiroshima">Tunnelbana</string>
+	<string name="type.railway.station.subway.isfahan">Tunnelbana</string>
+	<string name="type.railway.station.subway.istanbul">Tunnelbana</string>
+	<string name="type.railway.station.subway.izmir">Tunnelbana</string>
+	<string name="type.railway.station.subway.kazan">Tunnelbana</string>
+	<string name="type.railway.station.subway.kharkiv">Tunnelbana</string>
 	<string name="type.railway.station.subway.kiev">Tunnelbana</string>
+	<string name="type.railway.station.subway.kobe">Tunnelbana</string>
+	<string name="type.railway.station.subway.kolkata">Tunnelbana</string>
+	<string name="type.railway.station.subway.kunming">Tunnelbana</string>
+	<string name="type.railway.station.subway.kyoto">Tunnelbana</string>
+	<string name="type.railway.station.subway.la">Tunnelbana</string>
+	<string name="type.railway.station.subway.lausanne">Tunnelbana</string>
+	<string name="type.railway.station.subway.lille">Tunnelbana</string>
+	<string name="type.railway.station.subway.lima">Tunnelbana</string>
+	<string name="type.railway.station.subway.lisboa">Tunnelbana</string>
+	<string name="type.railway.station.subway.lisbon">Tunnelbana</string>
 	<string name="type.railway.station.subway.london">Tunnelbana</string>
+	<string name="type.railway.station.subway.lyon">Tunnelbana</string>
 	<string name="type.railway.station.subway.madrid">Tunnelbana</string>
+	<string name="type.railway.station.subway.malaga">Tunnelbana</string>
+	<string name="type.railway.station.subway.manila">Tunnelbana</string>
+	<string name="type.railway.station.subway.maracaibo">Tunnelbana</string>
+	<string name="type.railway.station.subway.mashhad">Tunnelbana</string>
+	<string name="type.railway.station.subway.mecca">Tunnelbana</string>
+	<string name="type.railway.station.subway.medellin">Tunnelbana</string>
+	<string name="type.railway.station.subway.mexico">Tunnelbana</string>
+	<string name="type.railway.station.subway.milan">Tunnelbana</string>
 	<string name="type.railway.station.subway.minsk">Tunnelbana</string>
+	<string name="type.railway.station.subway.montreal">Tunnelbana</string>
 	<string name="type.railway.station.subway.moscow">Tunnelbana</string>
+	<string name="type.railway.station.subway.munchen">Tunnelbana</string>
+	<string name="type.railway.station.subway.nagoya">Tunnelbana</string>
 	<string name="type.railway.station.subway.newyork">Tunnelbana</string>
+	<string name="type.railway.station.subway.nnov">Tunnelbana</string>
+	<string name="type.railway.station.subway.novosibirsk">Tunnelbana</string>
+	<string name="type.railway.station.subway.osaka">Tunnelbana</string>
+	<string name="type.railway.station.subway.oslo">Tunnelbana</string>
+	<string name="type.railway.station.subway.palma">Tunnelbana</string>
+	<string name="type.railway.station.subway.panama">Tunnelbana</string>
 	<string name="type.railway.station.subway.paris">Tunnelbana</string>
+	<string name="type.railway.station.subway.philadelphia">Tunnelbana</string>
+	<string name="type.railway.station.subway.pyongyang">Tunnelbana</string>
+	<string name="type.railway.station.subway.rennes">Tunnelbana</string>
+	<string name="type.railway.station.subway.rio">Tunnelbana</string>
 	<string name="type.railway.station.subway.roma">Tunnelbana</string>
+	<string name="type.railway.station.subway.rotterdam">Tunnelbana</string>
+	<string name="type.railway.station.subway.samara">Tunnelbana</string>
+	<string name="type.railway.station.subway.santiago">Tunnelbana</string>
+	<string name="type.railway.station.subway.santo_domingo">Tunnelbana</string>
+	<string name="type.railway.station.subway.saopaulo">Tunnelbana</string>
+	<string name="type.railway.station.subway.sapporo">Tunnelbana</string>
+	<string name="type.railway.station.subway.sendai">Tunnelbana</string>
+	<string name="type.railway.station.subway.sf">Tunnelbana</string>
+	<string name="type.railway.station.subway.shanghai">Tunnelbana</string>
+	<string name="type.railway.station.subway.shiraz">Tunnelbana</string>
+	<string name="type.railway.station.subway.sofia">Tunnelbana</string>
 	<string name="type.railway.station.subway.spb">Tunnelbana</string>
+	<string name="type.railway.station.subway.stockholm">Tunnelbana</string>
+	<string name="type.railway.station.subway.tabriz">Tunnelbana</string>
+	<string name="type.railway.station.subway.taipei">Tunnelbana</string>
+	<string name="type.railway.station.subway.taoyuan">Tunnelbana</string>
+	<string name="type.railway.station.subway.tashkent">Tunnelbana</string>
+	<string name="type.railway.station.subway.tbilisi">Tunnelbana</string>
+	<string name="type.railway.station.subway.tianjin">Tunnelbana</string>
+	<string name="type.railway.station.subway.tokyo">Tunnelbana</string>
+	<string name="type.railway.station.subway.valencia">Tunnelbana</string>
+	<string name="type.railway.station.subway.vienna">Tunnelbana</string>
+	<string name="type.railway.station.subway.warszawa">Tunnelbana</string>
+	<string name="type.railway.station.subway.washington">Tunnelbana</string>
+	<string name="type.railway.station.subway.wuhan">Tunnelbana</string>
+	<string name="type.railway.station.subway.yerevan">Tunnelbana</string>
+	<string name="type.railway.station.subway.yokohama">Tunnelbana</string>
 	<string name="type.railway.subway_entrance">Tunnelbana entré</string>
-	<string name="type.railway.subway_entrance.barcelona">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.berlin">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.kiev">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.london">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.madrid">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.minsk">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.moscow">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.newyork">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.paris">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.roma">Tunnelbana</string>
-	<string name="type.railway.subway_entrance.spb">Tunnelbana</string>
+	<string name="type.railway.subway_entrance.adana">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.algiers">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.almaty">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.amsterdam">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.ankara">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.athens">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.baku">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.bangkok">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.barcelona">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.beijing">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.bengalore">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.berlin">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.brasilia">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.brescia">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.brussels">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.bucharest">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.budapest">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.bursa">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.cairo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.caracas">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.catania">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.changchun">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.chengdu">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.chicago">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.chongqing">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.dalian">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.delhi">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.dnepro">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.dubai">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.ekb">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.fukuoka">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.glasgow">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.guangzhou">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.hamburg">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.helsinki">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.hiroshima">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.isfahan">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.istanbul">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.izmir">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kazan">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kharkiv">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kiev">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kobe">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kolkata">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kunming">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.kyoto">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.la">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.lausanne">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.lille">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.lima">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.lisboa">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.lisbon">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.london">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.lyon">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.madrid">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.malaga">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.manila">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.maracaibo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.mashhad">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.mecca">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.medellin">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.mexico">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.milan">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.minsk">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.montreal">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.moscow">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.munchen">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.nagoya">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.newyork">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.nnov">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.osaka">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.oslo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.palma">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.panama">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.paris">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.philadelphia">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.pyongyang">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.rennes">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.rio">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.roma">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.rotterdam">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.samara">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.santiago">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.saopaulo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.sapporo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.sendai">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.sf">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.shanghai">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.shiraz">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.sofia">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.spb">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.stockholm">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.tabriz">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.taipei">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.taoyuan">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.tashkent">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.tbilisi">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.tianjin">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.tokyo">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.valencia">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.vienna">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.warszawa">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.washington">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.wuhan">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.yerevan">Tunnelbana entré</string>
+	<string name="type.railway.subway_entrance.yokohama">Tunnelbana entré</string>
 	<string name="type.railway.tram_stop">Spårvagnshållplats</string>
 	<string name="type.shop">Butik</string>
 	<string name="type.shop.alcohol">Spritaffär</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 534c0236c2..8877929019 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -469,6 +469,115 @@
 	<string name="type.railway.monorail">Mfumo wa reli moja</string>
 	<string name="type.railway.rail">Njia ya Reli</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>
+	<string name="type.railway.subway_entrance.algiers">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.almaty">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.amsterdam">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.ankara">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.athens">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.baku">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.bangkok">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.barcelona">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.beijing">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.bengalore">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.berlin">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.brasilia">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.brescia">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.brussels">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.bucharest">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.budapest">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.bursa">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.cairo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.caracas">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.catania">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.changchun">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.chengdu">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.chicago">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.chongqing">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.dalian">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.delhi">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.dnepro">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.dubai">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.ekb">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.fukuoka">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.glasgow">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.guangzhou">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.hamburg">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.helsinki">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.hiroshima">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.isfahan">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.istanbul">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.izmir">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kazan">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kharkiv">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kiev">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kobe">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kolkata">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kunming">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.kyoto">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.la">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.lausanne">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.lille">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.lima">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.lisboa">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.lisbon">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.london">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.lyon">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.madrid">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.malaga">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.manila">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.maracaibo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.mashhad">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.mecca">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.medellin">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.mexico">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.milan">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.minsk">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.montreal">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.moscow">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.munchen">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.nagoya">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.newyork">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.nnov">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.osaka">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.oslo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.palma">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.panama">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.paris">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.philadelphia">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.pyongyang">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.rennes">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.rio">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.roma">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.rotterdam">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.samara">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.santiago">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.saopaulo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.sapporo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.sendai">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.sf">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.shanghai">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.shiraz">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.sofia">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.spb">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.stockholm">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.tabriz">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.taipei">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.taoyuan">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.tashkent">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.tbilisi">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.tianjin">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.tokyo">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.valencia">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.vienna">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.warszawa">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.washington">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.wuhan">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.yerevan">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.railway.subway_entrance.yokohama">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.shop.deli">Duka la Delicatessen</string>
 	<string name="type.shop.farm">Duka la Chakula cha shambani</string>
 	<string name="type.shop.grocery">Chakula cha mboga</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 4d82c01dcf..3db32498a9 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1232,29 +1232,225 @@
 	<string name="type.railway.station.light_rail">สถานีรถไฟ</string>
 	<string name="type.railway.station.monorail">สถานีรถไฟ</string>
 	<string name="type.railway.station.subway">รถไฟ</string>
+	<string name="type.railway.station.subway.adana">รถไฟ</string>
+	<string name="type.railway.station.subway.algiers">รถไฟ</string>
+	<string name="type.railway.station.subway.almaty">รถไฟ</string>
+	<string name="type.railway.station.subway.amsterdam">รถไฟ</string>
+	<string name="type.railway.station.subway.ankara">รถไฟ</string>
+	<string name="type.railway.station.subway.athens">รถไฟ</string>
+	<string name="type.railway.station.subway.baku">รถไฟ</string>
+	<string name="type.railway.station.subway.bangkok">รถไฟ</string>
 	<string name="type.railway.station.subway.barcelona">รถไฟ</string>
+	<string name="type.railway.station.subway.beijing">รถไฟ</string>
+	<string name="type.railway.station.subway.bengalore">รถไฟ</string>
 	<string name="type.railway.station.subway.berlin">รถไฟ</string>
+	<string name="type.railway.station.subway.brasilia">รถไฟ</string>
+	<string name="type.railway.station.subway.brescia">รถไฟ</string>
+	<string name="type.railway.station.subway.brussels">รถไฟ</string>
+	<string name="type.railway.station.subway.bucharest">รถไฟ</string>
+	<string name="type.railway.station.subway.budapest">รถไฟ</string>
+	<string name="type.railway.station.subway.buenos_aires">รถไฟ</string>
+	<string name="type.railway.station.subway.bursa">รถไฟ</string>
+	<string name="type.railway.station.subway.cairo">รถไฟ</string>
+	<string name="type.railway.station.subway.caracas">รถไฟ</string>
+	<string name="type.railway.station.subway.catania">รถไฟ</string>
+	<string name="type.railway.station.subway.changchun">รถไฟ</string>
+	<string name="type.railway.station.subway.chengdu">รถไฟ</string>
+	<string name="type.railway.station.subway.chicago">รถไฟ</string>
+	<string name="type.railway.station.subway.chongqing">รถไฟ</string>
+	<string name="type.railway.station.subway.dalian">รถไฟ</string>
+	<string name="type.railway.station.subway.delhi">รถไฟ</string>
+	<string name="type.railway.station.subway.dnepro">รถไฟ</string>
+	<string name="type.railway.station.subway.dubai">รถไฟ</string>
+	<string name="type.railway.station.subway.ekb">รถไฟ</string>
+	<string name="type.railway.station.subway.fukuoka">รถไฟ</string>
+	<string name="type.railway.station.subway.glasgow">รถไฟ</string>
+	<string name="type.railway.station.subway.guangzhou">รถไฟ</string>
+	<string name="type.railway.station.subway.hamburg">รถไฟ</string>
+	<string name="type.railway.station.subway.helsinki">รถไฟ</string>
+	<string name="type.railway.station.subway.hiroshima">รถไฟ</string>
+	<string name="type.railway.station.subway.isfahan">รถไฟ</string>
+	<string name="type.railway.station.subway.istanbul">รถไฟ</string>
+	<string name="type.railway.station.subway.izmir">รถไฟ</string>
+	<string name="type.railway.station.subway.kazan">รถไฟ</string>
+	<string name="type.railway.station.subway.kharkiv">รถไฟ</string>
 	<string name="type.railway.station.subway.kiev">รถไฟ</string>
+	<string name="type.railway.station.subway.kobe">รถไฟ</string>
+	<string name="type.railway.station.subway.kolkata">รถไฟ</string>
+	<string name="type.railway.station.subway.kunming">รถไฟ</string>
+	<string name="type.railway.station.subway.kyoto">รถไฟ</string>
+	<string name="type.railway.station.subway.la">รถไฟ</string>
+	<string name="type.railway.station.subway.lausanne">รถไฟ</string>
+	<string name="type.railway.station.subway.lille">รถไฟ</string>
+	<string name="type.railway.station.subway.lima">รถไฟ</string>
+	<string name="type.railway.station.subway.lisboa">รถไฟ</string>
+	<string name="type.railway.station.subway.lisbon">รถไฟ</string>
 	<string name="type.railway.station.subway.london">รถไฟ</string>
+	<string name="type.railway.station.subway.lyon">รถไฟ</string>
 	<string name="type.railway.station.subway.madrid">รถไฟ</string>
+	<string name="type.railway.station.subway.malaga">รถไฟ</string>
+	<string name="type.railway.station.subway.manila">รถไฟ</string>
+	<string name="type.railway.station.subway.maracaibo">รถไฟ</string>
+	<string name="type.railway.station.subway.mashhad">รถไฟ</string>
+	<string name="type.railway.station.subway.mecca">รถไฟ</string>
+	<string name="type.railway.station.subway.medellin">รถไฟ</string>
+	<string name="type.railway.station.subway.mexico">รถไฟ</string>
+	<string name="type.railway.station.subway.milan">รถไฟ</string>
 	<string name="type.railway.station.subway.minsk">รถไฟ</string>
+	<string name="type.railway.station.subway.montreal">รถไฟ</string>
 	<string name="type.railway.station.subway.moscow">รถไฟ</string>
+	<string name="type.railway.station.subway.munchen">รถไฟ</string>
+	<string name="type.railway.station.subway.nagoya">รถไฟ</string>
 	<string name="type.railway.station.subway.newyork">รถไฟ</string>
+	<string name="type.railway.station.subway.nnov">รถไฟ</string>
+	<string name="type.railway.station.subway.novosibirsk">รถไฟ</string>
+	<string name="type.railway.station.subway.osaka">รถไฟ</string>
+	<string name="type.railway.station.subway.oslo">รถไฟ</string>
+	<string name="type.railway.station.subway.palma">รถไฟ</string>
+	<string name="type.railway.station.subway.panama">รถไฟ</string>
 	<string name="type.railway.station.subway.paris">รถไฟ</string>
+	<string name="type.railway.station.subway.philadelphia">รถไฟ</string>
+	<string name="type.railway.station.subway.pyongyang">รถไฟ</string>
+	<string name="type.railway.station.subway.rennes">รถไฟ</string>
+	<string name="type.railway.station.subway.rio">รถไฟ</string>
 	<string name="type.railway.station.subway.roma">รถไฟ</string>
+	<string name="type.railway.station.subway.rotterdam">รถไฟ</string>
+	<string name="type.railway.station.subway.samara">รถไฟ</string>
+	<string name="type.railway.station.subway.santiago">รถไฟ</string>
+	<string name="type.railway.station.subway.santo_domingo">รถไฟ</string>
+	<string name="type.railway.station.subway.saopaulo">รถไฟ</string>
+	<string name="type.railway.station.subway.sapporo">รถไฟ</string>
+	<string name="type.railway.station.subway.sendai">รถไฟ</string>
+	<string name="type.railway.station.subway.sf">รถไฟ</string>
+	<string name="type.railway.station.subway.shanghai">รถไฟ</string>
+	<string name="type.railway.station.subway.shiraz">รถไฟ</string>
+	<string name="type.railway.station.subway.sofia">รถไฟ</string>
 	<string name="type.railway.station.subway.spb">รถไฟ</string>
+	<string name="type.railway.station.subway.stockholm">รถไฟ</string>
+	<string name="type.railway.station.subway.tabriz">รถไฟ</string>
+	<string name="type.railway.station.subway.taipei">รถไฟ</string>
+	<string name="type.railway.station.subway.taoyuan">รถไฟ</string>
+	<string name="type.railway.station.subway.tashkent">รถไฟ</string>
+	<string name="type.railway.station.subway.tbilisi">รถไฟ</string>
+	<string name="type.railway.station.subway.tianjin">รถไฟ</string>
+	<string name="type.railway.station.subway.tokyo">รถไฟ</string>
+	<string name="type.railway.station.subway.valencia">รถไฟ</string>
+	<string name="type.railway.station.subway.vienna">รถไฟ</string>
+	<string name="type.railway.station.subway.warszawa">รถไฟ</string>
+	<string name="type.railway.station.subway.washington">รถไฟ</string>
+	<string name="type.railway.station.subway.wuhan">รถไฟ</string>
+	<string name="type.railway.station.subway.yerevan">รถไฟ</string>
+	<string name="type.railway.station.subway.yokohama">รถไฟ</string>
 	<string name="type.railway.subway_entrance">ทางเข้ารถไฟใต้ดิน</string>
-	<string name="type.railway.subway_entrance.barcelona">รถไฟ</string>
-	<string name="type.railway.subway_entrance.berlin">รถไฟ</string>
-	<string name="type.railway.subway_entrance.kiev">รถไฟ</string>
-	<string name="type.railway.subway_entrance.london">รถไฟ</string>
-	<string name="type.railway.subway_entrance.madrid">รถไฟ</string>
-	<string name="type.railway.subway_entrance.minsk">รถไฟ</string>
-	<string name="type.railway.subway_entrance.moscow">รถไฟ</string>
-	<string name="type.railway.subway_entrance.newyork">รถไฟ</string>
-	<string name="type.railway.subway_entrance.paris">รถไฟ</string>
-	<string name="type.railway.subway_entrance.roma">รถไฟ</string>
-	<string name="type.railway.subway_entrance.spb">รถไฟ</string>
+	<string name="type.railway.subway_entrance.adana">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.algiers">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.almaty">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.amsterdam">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.ankara">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.athens">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.baku">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.bangkok">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.barcelona">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.beijing">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.bengalore">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.berlin">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.brasilia">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.brescia">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.brussels">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.bucharest">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.budapest">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.buenos_aires">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.bursa">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.cairo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.caracas">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.catania">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.changchun">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.chengdu">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.chicago">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.chongqing">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.dalian">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.delhi">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.dnepro">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.dubai">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.ekb">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.fukuoka">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.glasgow">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.guangzhou">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.hamburg">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.helsinki">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.hiroshima">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.isfahan">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.istanbul">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.izmir">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kazan">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kharkiv">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kiev">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kobe">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kolkata">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kunming">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.kyoto">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.la">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.lausanne">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.lille">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.lima">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.lisboa">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.lisbon">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.london">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.lyon">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.madrid">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.malaga">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.manila">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.maracaibo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.mashhad">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.mecca">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.medellin">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.mexico">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.milan">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.minsk">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.montreal">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.moscow">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.munchen">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.nagoya">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.newyork">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.nnov">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.novosibirsk">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.osaka">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.oslo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.palma">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.panama">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.paris">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.philadelphia">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.pyongyang">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.rennes">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.rio">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.roma">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.rotterdam">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.samara">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.santiago">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.santo_domingo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.saopaulo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.sapporo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.sendai">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.sf">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.shanghai">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.shiraz">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.sofia">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.spb">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.stockholm">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.tabriz">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.taipei">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.taoyuan">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.tashkent">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.tbilisi">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.tianjin">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.tokyo">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.valencia">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.vienna">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.warszawa">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.washington">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.wuhan">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.yerevan">ทางเข้ารถไฟใต้ดิน</string>
+	<string name="type.railway.subway_entrance.yokohama">ทางเข้ารถไฟใต้ดิน</string>
 	<string name="type.railway.tram_stop">ป้ายรถราง</string>
 	<string name="type.shop">ร้านค้า</string>
 	<string name="type.shop.alcohol">ร้านขายเหล้า</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index a90b6593b6..eb3f31a0ec 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1443,32 +1443,228 @@
 	<string name="type.railway.station.light_rail">Tren İstasyonu</string>
 	<string name="type.railway.station.monorail">Tren İstasyonu</string>
 	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
 	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
 	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
 	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
+	<string name="type.railway.station.subway.lisbon">Metro</string>
 	<string name="type.railway.station.subway.london">Metro</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
 	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
 	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
 	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
 	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
 	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
 	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
 	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway">Metro Hattı</string>
 	<string name="type.railway.subway.bridge">Metro Hattı</string>
 	<string name="type.railway.subway.tunnel">Metro Hattı</string>
 	<string name="type.railway.subway_entrance">Metro Girişi</string>
-	<string name="type.railway.subway_entrance.barcelona">Metro</string>
-	<string name="type.railway.subway_entrance.berlin">Metro</string>
-	<string name="type.railway.subway_entrance.kiev">Metro</string>
-	<string name="type.railway.subway_entrance.london">Metro</string>
-	<string name="type.railway.subway_entrance.madrid">Metro</string>
-	<string name="type.railway.subway_entrance.minsk">Metro</string>
-	<string name="type.railway.subway_entrance.moscow">Metro</string>
-	<string name="type.railway.subway_entrance.newyork">Metro</string>
-	<string name="type.railway.subway_entrance.paris">Metro</string>
-	<string name="type.railway.subway_entrance.roma">Metro</string>
-	<string name="type.railway.subway_entrance.spb">Metro</string>
+	<string name="type.railway.subway_entrance.adana">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.algiers">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.almaty">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.amsterdam">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.ankara">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.athens">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.baku">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.bangkok">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.barcelona">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.beijing">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.bengalore">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.berlin">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.brasilia">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.brescia">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.brussels">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.bucharest">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.budapest">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.bursa">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.cairo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.caracas">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.catania">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.changchun">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.chengdu">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.chicago">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.chongqing">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.dalian">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.delhi">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.dnepro">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.dubai">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.ekb">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.fukuoka">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.glasgow">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.guangzhou">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.hamburg">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.helsinki">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.hiroshima">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.isfahan">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.istanbul">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.izmir">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kazan">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kharkiv">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kiev">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kobe">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kolkata">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kunming">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.kyoto">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.la">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.lausanne">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.lille">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.lima">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.lisboa">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.lisbon">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.london">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.lyon">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.madrid">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.malaga">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.manila">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.maracaibo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.mashhad">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.mecca">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.medellin">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.mexico">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.milan">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.minsk">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.montreal">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.moscow">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.munchen">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.nagoya">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.newyork">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.nnov">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.osaka">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.oslo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.palma">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.panama">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.paris">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.philadelphia">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.pyongyang">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.rennes">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.rio">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.roma">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.rotterdam">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.samara">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.santiago">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.saopaulo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.sapporo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.sendai">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.sf">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.shanghai">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.shiraz">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.sofia">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.spb">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.stockholm">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.tabriz">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.taipei">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.taoyuan">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.tashkent">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.tbilisi">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.tianjin">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.tokyo">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.valencia">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.vienna">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.warszawa">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.washington">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.wuhan">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.yerevan">Metro Girişi</string>
+	<string name="type.railway.subway_entrance.yokohama">Metro Girişi</string>
 	<string name="type.railway.tram">Tramvay Hattı</string>
 	<string name="type.railway.tram.bridge">Tramvay Hattı</string>
 	<string name="type.railway.tram.tunnel">Tramvay Hattı</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 7f45cc840e..2fd951661d 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1427,32 +1427,228 @@
 	<string name="type.railway.station.light_rail">Залізничний вокзал</string>
 	<string name="type.railway.station.monorail">Залізничний вокзал</string>
 	<string name="type.railway.station.subway">Метро</string>
+	<string name="type.railway.station.subway.adana">Метро</string>
+	<string name="type.railway.station.subway.algiers">Метро</string>
+	<string name="type.railway.station.subway.almaty">Метро</string>
+	<string name="type.railway.station.subway.amsterdam">Метро</string>
+	<string name="type.railway.station.subway.ankara">Метро</string>
+	<string name="type.railway.station.subway.athens">Метро</string>
+	<string name="type.railway.station.subway.baku">Метро</string>
+	<string name="type.railway.station.subway.bangkok">Метро</string>
 	<string name="type.railway.station.subway.barcelona">Метро</string>
+	<string name="type.railway.station.subway.beijing">Метро</string>
+	<string name="type.railway.station.subway.bengalore">Метро</string>
 	<string name="type.railway.station.subway.berlin">Метро</string>
+	<string name="type.railway.station.subway.brasilia">Метро</string>
+	<string name="type.railway.station.subway.brescia">Метро</string>
+	<string name="type.railway.station.subway.brussels">Метро</string>
+	<string name="type.railway.station.subway.bucharest">Метро</string>
+	<string name="type.railway.station.subway.budapest">Метро</string>
+	<string name="type.railway.station.subway.buenos_aires">Метро</string>
+	<string name="type.railway.station.subway.bursa">Метро</string>
+	<string name="type.railway.station.subway.cairo">Метро</string>
+	<string name="type.railway.station.subway.caracas">Метро</string>
+	<string name="type.railway.station.subway.catania">Метро</string>
+	<string name="type.railway.station.subway.changchun">Метро</string>
+	<string name="type.railway.station.subway.chengdu">Метро</string>
+	<string name="type.railway.station.subway.chicago">Метро</string>
+	<string name="type.railway.station.subway.chongqing">Метро</string>
+	<string name="type.railway.station.subway.dalian">Метро</string>
+	<string name="type.railway.station.subway.delhi">Метро</string>
+	<string name="type.railway.station.subway.dnepro">Метро</string>
+	<string name="type.railway.station.subway.dubai">Метро</string>
+	<string name="type.railway.station.subway.ekb">Метро</string>
+	<string name="type.railway.station.subway.fukuoka">Метро</string>
+	<string name="type.railway.station.subway.glasgow">Метро</string>
+	<string name="type.railway.station.subway.guangzhou">Метро</string>
+	<string name="type.railway.station.subway.hamburg">Метро</string>
+	<string name="type.railway.station.subway.helsinki">Метро</string>
+	<string name="type.railway.station.subway.hiroshima">Метро</string>
+	<string name="type.railway.station.subway.isfahan">Метро</string>
+	<string name="type.railway.station.subway.istanbul">Метро</string>
+	<string name="type.railway.station.subway.izmir">Метро</string>
+	<string name="type.railway.station.subway.kazan">Метро</string>
+	<string name="type.railway.station.subway.kharkiv">Метро</string>
 	<string name="type.railway.station.subway.kiev">Метро</string>
+	<string name="type.railway.station.subway.kobe">Метро</string>
+	<string name="type.railway.station.subway.kolkata">Метро</string>
+	<string name="type.railway.station.subway.kunming">Метро</string>
+	<string name="type.railway.station.subway.kyoto">Метро</string>
+	<string name="type.railway.station.subway.la">Метро</string>
+	<string name="type.railway.station.subway.lausanne">Метро</string>
+	<string name="type.railway.station.subway.lille">Метро</string>
+	<string name="type.railway.station.subway.lima">Метро</string>
+	<string name="type.railway.station.subway.lisboa">Метро</string>
+	<string name="type.railway.station.subway.lisbon">Метро</string>
 	<string name="type.railway.station.subway.london">Метро</string>
+	<string name="type.railway.station.subway.lyon">Метро</string>
 	<string name="type.railway.station.subway.madrid">Метро</string>
+	<string name="type.railway.station.subway.malaga">Метро</string>
+	<string name="type.railway.station.subway.manila">Метро</string>
+	<string name="type.railway.station.subway.maracaibo">Метро</string>
+	<string name="type.railway.station.subway.mashhad">Метро</string>
+	<string name="type.railway.station.subway.mecca">Метро</string>
+	<string name="type.railway.station.subway.medellin">Метро</string>
+	<string name="type.railway.station.subway.mexico">Метро</string>
+	<string name="type.railway.station.subway.milan">Метро</string>
 	<string name="type.railway.station.subway.minsk">Метро</string>
+	<string name="type.railway.station.subway.montreal">Метро</string>
 	<string name="type.railway.station.subway.moscow">Метро</string>
+	<string name="type.railway.station.subway.munchen">Метро</string>
+	<string name="type.railway.station.subway.nagoya">Метро</string>
 	<string name="type.railway.station.subway.newyork">Метро</string>
+	<string name="type.railway.station.subway.nnov">Метро</string>
+	<string name="type.railway.station.subway.novosibirsk">Метро</string>
+	<string name="type.railway.station.subway.osaka">Метро</string>
+	<string name="type.railway.station.subway.oslo">Метро</string>
+	<string name="type.railway.station.subway.palma">Метро</string>
+	<string name="type.railway.station.subway.panama">Метро</string>
 	<string name="type.railway.station.subway.paris">Метро</string>
+	<string name="type.railway.station.subway.philadelphia">Метро</string>
+	<string name="type.railway.station.subway.pyongyang">Метро</string>
+	<string name="type.railway.station.subway.rennes">Метро</string>
+	<string name="type.railway.station.subway.rio">Метро</string>
 	<string name="type.railway.station.subway.roma">Метро</string>
+	<string name="type.railway.station.subway.rotterdam">Метро</string>
+	<string name="type.railway.station.subway.samara">Метро</string>
+	<string name="type.railway.station.subway.santiago">Метро</string>
+	<string name="type.railway.station.subway.santo_domingo">Метро</string>
+	<string name="type.railway.station.subway.saopaulo">Метро</string>
+	<string name="type.railway.station.subway.sapporo">Метро</string>
+	<string name="type.railway.station.subway.sendai">Метро</string>
+	<string name="type.railway.station.subway.sf">Метро</string>
+	<string name="type.railway.station.subway.shanghai">Метро</string>
+	<string name="type.railway.station.subway.shiraz">Метро</string>
+	<string name="type.railway.station.subway.sofia">Метро</string>
 	<string name="type.railway.station.subway.spb">Метро</string>
+	<string name="type.railway.station.subway.stockholm">Метро</string>
+	<string name="type.railway.station.subway.tabriz">Метро</string>
+	<string name="type.railway.station.subway.taipei">Метро</string>
+	<string name="type.railway.station.subway.taoyuan">Метро</string>
+	<string name="type.railway.station.subway.tashkent">Метро</string>
+	<string name="type.railway.station.subway.tbilisi">Метро</string>
+	<string name="type.railway.station.subway.tianjin">Метро</string>
+	<string name="type.railway.station.subway.tokyo">Метро</string>
+	<string name="type.railway.station.subway.valencia">Метро</string>
+	<string name="type.railway.station.subway.vienna">Метро</string>
+	<string name="type.railway.station.subway.warszawa">Метро</string>
+	<string name="type.railway.station.subway.washington">Метро</string>
+	<string name="type.railway.station.subway.wuhan">Метро</string>
+	<string name="type.railway.station.subway.yerevan">Метро</string>
+	<string name="type.railway.station.subway.yokohama">Метро</string>
 	<string name="type.railway.subway">Лінія метро</string>
 	<string name="type.railway.subway.bridge">Лінія метро</string>
 	<string name="type.railway.subway.tunnel">Лінія метро</string>
 	<string name="type.railway.subway_entrance">Вхід до метро</string>
-	<string name="type.railway.subway_entrance.barcelona">Метро</string>
-	<string name="type.railway.subway_entrance.berlin">Метро</string>
-	<string name="type.railway.subway_entrance.kiev">Метро</string>
-	<string name="type.railway.subway_entrance.london">Метро</string>
-	<string name="type.railway.subway_entrance.madrid">Метро</string>
-	<string name="type.railway.subway_entrance.minsk">Метро</string>
-	<string name="type.railway.subway_entrance.moscow">Метро</string>
-	<string name="type.railway.subway_entrance.newyork">Метро</string>
-	<string name="type.railway.subway_entrance.paris">Метро</string>
-	<string name="type.railway.subway_entrance.roma">Метро</string>
-	<string name="type.railway.subway_entrance.spb">Метро</string>
+	<string name="type.railway.subway_entrance.adana">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.algiers">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.almaty">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.amsterdam">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.ankara">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.athens">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.baku">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.bangkok">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.barcelona">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.beijing">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.bengalore">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.berlin">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.brasilia">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.brescia">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.brussels">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.bucharest">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.budapest">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.bursa">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.cairo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.caracas">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.catania">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.changchun">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.chengdu">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.chicago">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.chongqing">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.dalian">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.delhi">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.dnepro">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.dubai">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.ekb">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.fukuoka">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.glasgow">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.guangzhou">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.hamburg">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.helsinki">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.hiroshima">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.isfahan">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.istanbul">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.izmir">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kazan">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kharkiv">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kiev">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kobe">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kolkata">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kunming">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.kyoto">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.la">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.lausanne">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.lille">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.lima">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.lisboa">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.lisbon">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.london">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.lyon">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.madrid">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.malaga">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.manila">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.maracaibo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.mashhad">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.mecca">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.medellin">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.mexico">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.milan">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.minsk">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.montreal">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.moscow">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.munchen">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.nagoya">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.newyork">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.nnov">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.osaka">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.oslo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.palma">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.panama">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.paris">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.philadelphia">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.pyongyang">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.rennes">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.rio">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.roma">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.rotterdam">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.samara">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.santiago">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.saopaulo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.sapporo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.sendai">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.sf">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.shanghai">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.shiraz">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.sofia">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.spb">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.stockholm">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.tabriz">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.taipei">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.taoyuan">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.tashkent">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.tbilisi">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.tianjin">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.tokyo">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.valencia">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.vienna">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.warszawa">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.washington">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.wuhan">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.yerevan">Вхід до метро</string>
+	<string name="type.railway.subway_entrance.yokohama">Вхід до метро</string>
 	<string name="type.railway.tram">Трамвай</string>
 	<string name="type.railway.tram.bridge">Трамвай</string>
 	<string name="type.railway.tram.tunnel">Трамвай</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 2d3c8166cc..5dbd0450dc 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1227,29 +1227,225 @@
 	<string name="type.railway.station.light_rail">Đường tàu hỏa</string>
 	<string name="type.railway.station.monorail">Đường tàu hỏa</string>
 	<string name="type.railway.station.subway">Ngầm</string>
+	<string name="type.railway.station.subway.adana">Ngầm</string>
+	<string name="type.railway.station.subway.algiers">Ngầm</string>
+	<string name="type.railway.station.subway.almaty">Ngầm</string>
+	<string name="type.railway.station.subway.amsterdam">Ngầm</string>
+	<string name="type.railway.station.subway.ankara">Ngầm</string>
+	<string name="type.railway.station.subway.athens">Ngầm</string>
+	<string name="type.railway.station.subway.baku">Ngầm</string>
+	<string name="type.railway.station.subway.bangkok">Ngầm</string>
 	<string name="type.railway.station.subway.barcelona">Ngầm</string>
+	<string name="type.railway.station.subway.beijing">Ngầm</string>
+	<string name="type.railway.station.subway.bengalore">Ngầm</string>
 	<string name="type.railway.station.subway.berlin">Ngầm</string>
+	<string name="type.railway.station.subway.brasilia">Ngầm</string>
+	<string name="type.railway.station.subway.brescia">Ngầm</string>
+	<string name="type.railway.station.subway.brussels">Ngầm</string>
+	<string name="type.railway.station.subway.bucharest">Ngầm</string>
+	<string name="type.railway.station.subway.budapest">Ngầm</string>
+	<string name="type.railway.station.subway.buenos_aires">Ngầm</string>
+	<string name="type.railway.station.subway.bursa">Ngầm</string>
+	<string name="type.railway.station.subway.cairo">Ngầm</string>
+	<string name="type.railway.station.subway.caracas">Ngầm</string>
+	<string name="type.railway.station.subway.catania">Ngầm</string>
+	<string name="type.railway.station.subway.changchun">Ngầm</string>
+	<string name="type.railway.station.subway.chengdu">Ngầm</string>
+	<string name="type.railway.station.subway.chicago">Ngầm</string>
+	<string name="type.railway.station.subway.chongqing">Ngầm</string>
+	<string name="type.railway.station.subway.dalian">Ngầm</string>
+	<string name="type.railway.station.subway.delhi">Ngầm</string>
+	<string name="type.railway.station.subway.dnepro">Ngầm</string>
+	<string name="type.railway.station.subway.dubai">Ngầm</string>
+	<string name="type.railway.station.subway.ekb">Ngầm</string>
+	<string name="type.railway.station.subway.fukuoka">Ngầm</string>
+	<string name="type.railway.station.subway.glasgow">Ngầm</string>
+	<string name="type.railway.station.subway.guangzhou">Ngầm</string>
+	<string name="type.railway.station.subway.hamburg">Ngầm</string>
+	<string name="type.railway.station.subway.helsinki">Ngầm</string>
+	<string name="type.railway.station.subway.hiroshima">Ngầm</string>
+	<string name="type.railway.station.subway.isfahan">Ngầm</string>
+	<string name="type.railway.station.subway.istanbul">Ngầm</string>
+	<string name="type.railway.station.subway.izmir">Ngầm</string>
+	<string name="type.railway.station.subway.kazan">Ngầm</string>
+	<string name="type.railway.station.subway.kharkiv">Ngầm</string>
 	<string name="type.railway.station.subway.kiev">Ngầm</string>
+	<string name="type.railway.station.subway.kobe">Ngầm</string>
+	<string name="type.railway.station.subway.kolkata">Ngầm</string>
+	<string name="type.railway.station.subway.kunming">Ngầm</string>
+	<string name="type.railway.station.subway.kyoto">Ngầm</string>
+	<string name="type.railway.station.subway.la">Ngầm</string>
+	<string name="type.railway.station.subway.lausanne">Ngầm</string>
+	<string name="type.railway.station.subway.lille">Ngầm</string>
+	<string name="type.railway.station.subway.lima">Ngầm</string>
+	<string name="type.railway.station.subway.lisboa">Ngầm</string>
+	<string name="type.railway.station.subway.lisbon">Ngầm</string>
 	<string name="type.railway.station.subway.london">Ngầm</string>
+	<string name="type.railway.station.subway.lyon">Ngầm</string>
 	<string name="type.railway.station.subway.madrid">Ngầm</string>
+	<string name="type.railway.station.subway.malaga">Ngầm</string>
+	<string name="type.railway.station.subway.manila">Ngầm</string>
+	<string name="type.railway.station.subway.maracaibo">Ngầm</string>
+	<string name="type.railway.station.subway.mashhad">Ngầm</string>
+	<string name="type.railway.station.subway.mecca">Ngầm</string>
+	<string name="type.railway.station.subway.medellin">Ngầm</string>
+	<string name="type.railway.station.subway.mexico">Ngầm</string>
+	<string name="type.railway.station.subway.milan">Ngầm</string>
 	<string name="type.railway.station.subway.minsk">Ngầm</string>
+	<string name="type.railway.station.subway.montreal">Ngầm</string>
 	<string name="type.railway.station.subway.moscow">Ngầm</string>
+	<string name="type.railway.station.subway.munchen">Ngầm</string>
+	<string name="type.railway.station.subway.nagoya">Ngầm</string>
 	<string name="type.railway.station.subway.newyork">Ngầm</string>
+	<string name="type.railway.station.subway.nnov">Ngầm</string>
+	<string name="type.railway.station.subway.novosibirsk">Ngầm</string>
+	<string name="type.railway.station.subway.osaka">Ngầm</string>
+	<string name="type.railway.station.subway.oslo">Ngầm</string>
+	<string name="type.railway.station.subway.palma">Ngầm</string>
+	<string name="type.railway.station.subway.panama">Ngầm</string>
 	<string name="type.railway.station.subway.paris">Ngầm</string>
+	<string name="type.railway.station.subway.philadelphia">Ngầm</string>
+	<string name="type.railway.station.subway.pyongyang">Ngầm</string>
+	<string name="type.railway.station.subway.rennes">Ngầm</string>
+	<string name="type.railway.station.subway.rio">Ngầm</string>
 	<string name="type.railway.station.subway.roma">Ngầm</string>
+	<string name="type.railway.station.subway.rotterdam">Ngầm</string>
+	<string name="type.railway.station.subway.samara">Ngầm</string>
+	<string name="type.railway.station.subway.santiago">Ngầm</string>
+	<string name="type.railway.station.subway.santo_domingo">Ngầm</string>
+	<string name="type.railway.station.subway.saopaulo">Ngầm</string>
+	<string name="type.railway.station.subway.sapporo">Ngầm</string>
+	<string name="type.railway.station.subway.sendai">Ngầm</string>
+	<string name="type.railway.station.subway.sf">Ngầm</string>
+	<string name="type.railway.station.subway.shanghai">Ngầm</string>
+	<string name="type.railway.station.subway.shiraz">Ngầm</string>
+	<string name="type.railway.station.subway.sofia">Ngầm</string>
 	<string name="type.railway.station.subway.spb">Ngầm</string>
+	<string name="type.railway.station.subway.stockholm">Ngầm</string>
+	<string name="type.railway.station.subway.tabriz">Ngầm</string>
+	<string name="type.railway.station.subway.taipei">Ngầm</string>
+	<string name="type.railway.station.subway.taoyuan">Ngầm</string>
+	<string name="type.railway.station.subway.tashkent">Ngầm</string>
+	<string name="type.railway.station.subway.tbilisi">Ngầm</string>
+	<string name="type.railway.station.subway.tianjin">Ngầm</string>
+	<string name="type.railway.station.subway.tokyo">Ngầm</string>
+	<string name="type.railway.station.subway.valencia">Ngầm</string>
+	<string name="type.railway.station.subway.vienna">Ngầm</string>
+	<string name="type.railway.station.subway.warszawa">Ngầm</string>
+	<string name="type.railway.station.subway.washington">Ngầm</string>
+	<string name="type.railway.station.subway.wuhan">Ngầm</string>
+	<string name="type.railway.station.subway.yerevan">Ngầm</string>
+	<string name="type.railway.station.subway.yokohama">Ngầm</string>
 	<string name="type.railway.subway_entrance">Lỗi vào Metro</string>
-	<string name="type.railway.subway_entrance.barcelona">Ngầm</string>
-	<string name="type.railway.subway_entrance.berlin">Ngầm</string>
-	<string name="type.railway.subway_entrance.kiev">Ngầm</string>
-	<string name="type.railway.subway_entrance.london">Ngầm</string>
-	<string name="type.railway.subway_entrance.madrid">Ngầm</string>
-	<string name="type.railway.subway_entrance.minsk">Ngầm</string>
-	<string name="type.railway.subway_entrance.moscow">Ngầm</string>
-	<string name="type.railway.subway_entrance.newyork">Ngầm</string>
-	<string name="type.railway.subway_entrance.paris">Ngầm</string>
-	<string name="type.railway.subway_entrance.roma">Ngầm</string>
-	<string name="type.railway.subway_entrance.spb">Ngầm</string>
+	<string name="type.railway.subway_entrance.adana">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.algiers">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.almaty">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.amsterdam">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.ankara">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.athens">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.baku">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.bangkok">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.barcelona">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.beijing">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.bengalore">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.berlin">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.brasilia">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.brescia">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.brussels">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.bucharest">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.budapest">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.bursa">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.cairo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.caracas">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.catania">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.changchun">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.chengdu">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.chicago">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.chongqing">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.dalian">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.delhi">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.dnepro">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.dubai">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.ekb">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.fukuoka">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.glasgow">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.guangzhou">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.hamburg">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.helsinki">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.hiroshima">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.isfahan">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.istanbul">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.izmir">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kazan">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kharkiv">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kiev">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kobe">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kolkata">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kunming">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.kyoto">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.la">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.lausanne">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.lille">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.lima">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.lisboa">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.lisbon">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.london">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.lyon">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.madrid">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.malaga">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.manila">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.maracaibo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.mashhad">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.mecca">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.medellin">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.mexico">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.milan">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.minsk">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.montreal">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.moscow">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.munchen">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.nagoya">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.newyork">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.nnov">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.osaka">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.oslo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.palma">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.panama">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.paris">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.philadelphia">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.pyongyang">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.rennes">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.rio">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.roma">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.rotterdam">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.samara">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.santiago">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.saopaulo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.sapporo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.sendai">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.sf">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.shanghai">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.shiraz">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.sofia">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.spb">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.stockholm">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.tabriz">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.taipei">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.taoyuan">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.tashkent">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.tbilisi">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.tianjin">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.tokyo">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.valencia">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.vienna">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.warszawa">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.washington">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.wuhan">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.yerevan">Lỗi vào Metro</string>
+	<string name="type.railway.subway_entrance.yokohama">Lỗi vào Metro</string>
 	<string name="type.railway.tram_stop">Bến tàu điện</string>
 	<string name="type.shop">Cửa hàng</string>
 	<string name="type.shop.alcohol">Cửa hàng rượu</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index dccf3e5667..fcd61ce77f 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1276,30 +1276,226 @@
 	<string name="type.railway.station">火車站</string>
 	<string name="type.railway.station.light_rail">輕軌車站</string>
 	<string name="type.railway.station.monorail">單軌車站</string>
-	<string name="type.railway.station.subway">地鐵車站</string>
-	<string name="type.railway.station.subway.barcelona">地鐵車站</string>
-	<string name="type.railway.station.subway.berlin">地鐵車站</string>
-	<string name="type.railway.station.subway.kiev">地鐵車站</string>
-	<string name="type.railway.station.subway.london">地鐵車站</string>
-	<string name="type.railway.station.subway.madrid">地鐵車站</string>
-	<string name="type.railway.station.subway.minsk">地鐵車站</string>
-	<string name="type.railway.station.subway.moscow">地鐵車站</string>
-	<string name="type.railway.station.subway.newyork">地鐵車站</string>
-	<string name="type.railway.station.subway.paris">地鐵車站</string>
-	<string name="type.railway.station.subway.roma">地鐵車站</string>
-	<string name="type.railway.station.subway.spb">地鐵車站</string>
+	<string name="type.railway.station.subway">捷運站</string>
+	<string name="type.railway.station.subway.adana">捷運站</string>
+	<string name="type.railway.station.subway.algiers">捷運站</string>
+	<string name="type.railway.station.subway.almaty">捷運站</string>
+	<string name="type.railway.station.subway.amsterdam">捷運站</string>
+	<string name="type.railway.station.subway.ankara">捷運站</string>
+	<string name="type.railway.station.subway.athens">捷運站</string>
+	<string name="type.railway.station.subway.baku">捷運站</string>
+	<string name="type.railway.station.subway.bangkok">捷運站</string>
+	<string name="type.railway.station.subway.barcelona">捷運站</string>
+	<string name="type.railway.station.subway.beijing">捷運站</string>
+	<string name="type.railway.station.subway.bengalore">捷運站</string>
+	<string name="type.railway.station.subway.berlin">捷運站</string>
+	<string name="type.railway.station.subway.brasilia">捷運站</string>
+	<string name="type.railway.station.subway.brescia">捷運站</string>
+	<string name="type.railway.station.subway.brussels">捷運站</string>
+	<string name="type.railway.station.subway.bucharest">捷運站</string>
+	<string name="type.railway.station.subway.budapest">捷運站</string>
+	<string name="type.railway.station.subway.buenos_aires">捷運站</string>
+	<string name="type.railway.station.subway.bursa">捷運站</string>
+	<string name="type.railway.station.subway.cairo">捷運站</string>
+	<string name="type.railway.station.subway.caracas">捷運站</string>
+	<string name="type.railway.station.subway.catania">捷運站</string>
+	<string name="type.railway.station.subway.changchun">捷運站</string>
+	<string name="type.railway.station.subway.chengdu">捷運站</string>
+	<string name="type.railway.station.subway.chicago">捷運站</string>
+	<string name="type.railway.station.subway.chongqing">捷運站</string>
+	<string name="type.railway.station.subway.dalian">捷運站</string>
+	<string name="type.railway.station.subway.delhi">捷運站</string>
+	<string name="type.railway.station.subway.dnepro">捷運站</string>
+	<string name="type.railway.station.subway.dubai">捷運站</string>
+	<string name="type.railway.station.subway.ekb">捷運站</string>
+	<string name="type.railway.station.subway.fukuoka">捷運站</string>
+	<string name="type.railway.station.subway.glasgow">捷運站</string>
+	<string name="type.railway.station.subway.guangzhou">捷運站</string>
+	<string name="type.railway.station.subway.hamburg">捷運站</string>
+	<string name="type.railway.station.subway.helsinki">捷運站</string>
+	<string name="type.railway.station.subway.hiroshima">捷運站</string>
+	<string name="type.railway.station.subway.isfahan">捷運站</string>
+	<string name="type.railway.station.subway.istanbul">捷運站</string>
+	<string name="type.railway.station.subway.izmir">捷運站</string>
+	<string name="type.railway.station.subway.kazan">捷運站</string>
+	<string name="type.railway.station.subway.kharkiv">捷運站</string>
+	<string name="type.railway.station.subway.kiev">捷運站</string>
+	<string name="type.railway.station.subway.kobe">捷運站</string>
+	<string name="type.railway.station.subway.kolkata">捷運站</string>
+	<string name="type.railway.station.subway.kunming">捷運站</string>
+	<string name="type.railway.station.subway.kyoto">捷運站</string>
+	<string name="type.railway.station.subway.la">捷運站</string>
+	<string name="type.railway.station.subway.lausanne">捷運站</string>
+	<string name="type.railway.station.subway.lille">捷運站</string>
+	<string name="type.railway.station.subway.lima">捷運站</string>
+	<string name="type.railway.station.subway.lisboa">捷運站</string>
+	<string name="type.railway.station.subway.lisbon">捷運站</string>
+	<string name="type.railway.station.subway.london">捷運站</string>
+	<string name="type.railway.station.subway.lyon">捷運站</string>
+	<string name="type.railway.station.subway.madrid">捷運站</string>
+	<string name="type.railway.station.subway.malaga">捷運站</string>
+	<string name="type.railway.station.subway.manila">捷運站</string>
+	<string name="type.railway.station.subway.maracaibo">捷運站</string>
+	<string name="type.railway.station.subway.mashhad">捷運站</string>
+	<string name="type.railway.station.subway.mecca">捷運站</string>
+	<string name="type.railway.station.subway.medellin">捷運站</string>
+	<string name="type.railway.station.subway.mexico">捷運站</string>
+	<string name="type.railway.station.subway.milan">捷運站</string>
+	<string name="type.railway.station.subway.minsk">捷運站</string>
+	<string name="type.railway.station.subway.montreal">捷運站</string>
+	<string name="type.railway.station.subway.moscow">捷運站</string>
+	<string name="type.railway.station.subway.munchen">捷運站</string>
+	<string name="type.railway.station.subway.nagoya">捷運站</string>
+	<string name="type.railway.station.subway.newyork">捷運站</string>
+	<string name="type.railway.station.subway.nnov">捷運站</string>
+	<string name="type.railway.station.subway.novosibirsk">捷運站</string>
+	<string name="type.railway.station.subway.osaka">捷運站</string>
+	<string name="type.railway.station.subway.oslo">捷運站</string>
+	<string name="type.railway.station.subway.palma">捷運站</string>
+	<string name="type.railway.station.subway.panama">捷運站</string>
+	<string name="type.railway.station.subway.paris">捷運站</string>
+	<string name="type.railway.station.subway.philadelphia">捷運站</string>
+	<string name="type.railway.station.subway.pyongyang">捷運站</string>
+	<string name="type.railway.station.subway.rennes">捷運站</string>
+	<string name="type.railway.station.subway.rio">捷運站</string>
+	<string name="type.railway.station.subway.roma">捷運站</string>
+	<string name="type.railway.station.subway.rotterdam">捷運站</string>
+	<string name="type.railway.station.subway.samara">捷運站</string>
+	<string name="type.railway.station.subway.santiago">捷運站</string>
+	<string name="type.railway.station.subway.santo_domingo">捷運站</string>
+	<string name="type.railway.station.subway.saopaulo">捷運站</string>
+	<string name="type.railway.station.subway.sapporo">捷運站</string>
+	<string name="type.railway.station.subway.sendai">捷運站</string>
+	<string name="type.railway.station.subway.sf">捷運站</string>
+	<string name="type.railway.station.subway.shanghai">捷運站</string>
+	<string name="type.railway.station.subway.shiraz">捷運站</string>
+	<string name="type.railway.station.subway.sofia">捷運站</string>
+	<string name="type.railway.station.subway.spb">捷運站</string>
+	<string name="type.railway.station.subway.stockholm">捷運站</string>
+	<string name="type.railway.station.subway.tabriz">捷運站</string>
+	<string name="type.railway.station.subway.taipei">捷運站</string>
+	<string name="type.railway.station.subway.taoyuan">捷運站</string>
+	<string name="type.railway.station.subway.tashkent">捷運站</string>
+	<string name="type.railway.station.subway.tbilisi">捷運站</string>
+	<string name="type.railway.station.subway.tianjin">捷運站</string>
+	<string name="type.railway.station.subway.tokyo">捷運站</string>
+	<string name="type.railway.station.subway.valencia">捷運站</string>
+	<string name="type.railway.station.subway.vienna">捷運站</string>
+	<string name="type.railway.station.subway.warszawa">捷運站</string>
+	<string name="type.railway.station.subway.washington">捷運站</string>
+	<string name="type.railway.station.subway.wuhan">捷運站</string>
+	<string name="type.railway.station.subway.yerevan">捷運站</string>
+	<string name="type.railway.station.subway.yokohama">捷運站</string>
 	<string name="type.railway.subway_entrance">地鐵入口</string>
+	<string name="type.railway.subway_entrance.adana">地鐵入口</string>
+	<string name="type.railway.subway_entrance.algiers">地鐵入口</string>
+	<string name="type.railway.subway_entrance.almaty">地鐵入口</string>
+	<string name="type.railway.subway_entrance.amsterdam">地鐵入口</string>
+	<string name="type.railway.subway_entrance.ankara">地鐵入口</string>
+	<string name="type.railway.subway_entrance.athens">地鐵入口</string>
+	<string name="type.railway.subway_entrance.baku">地鐵入口</string>
+	<string name="type.railway.subway_entrance.bangkok">地鐵入口</string>
 	<string name="type.railway.subway_entrance.barcelona">地鐵入口</string>
+	<string name="type.railway.subway_entrance.beijing">地鐵入口</string>
+	<string name="type.railway.subway_entrance.bengalore">地鐵入口</string>
 	<string name="type.railway.subway_entrance.berlin">地鐵入口</string>
+	<string name="type.railway.subway_entrance.brasilia">地鐵入口</string>
+	<string name="type.railway.subway_entrance.brescia">地鐵入口</string>
+	<string name="type.railway.subway_entrance.brussels">地鐵入口</string>
+	<string name="type.railway.subway_entrance.bucharest">地鐵入口</string>
+	<string name="type.railway.subway_entrance.budapest">地鐵入口</string>
+	<string name="type.railway.subway_entrance.buenos_aires">地鐵入口</string>
+	<string name="type.railway.subway_entrance.bursa">地鐵入口</string>
+	<string name="type.railway.subway_entrance.cairo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.caracas">地鐵入口</string>
+	<string name="type.railway.subway_entrance.catania">地鐵入口</string>
+	<string name="type.railway.subway_entrance.changchun">地鐵入口</string>
+	<string name="type.railway.subway_entrance.chengdu">地鐵入口</string>
+	<string name="type.railway.subway_entrance.chicago">地鐵入口</string>
+	<string name="type.railway.subway_entrance.chongqing">地鐵入口</string>
+	<string name="type.railway.subway_entrance.dalian">地鐵入口</string>
+	<string name="type.railway.subway_entrance.delhi">地鐵入口</string>
+	<string name="type.railway.subway_entrance.dnepro">地鐵入口</string>
+	<string name="type.railway.subway_entrance.dubai">地鐵入口</string>
+	<string name="type.railway.subway_entrance.ekb">地鐵入口</string>
+	<string name="type.railway.subway_entrance.fukuoka">地鐵入口</string>
+	<string name="type.railway.subway_entrance.glasgow">地鐵入口</string>
+	<string name="type.railway.subway_entrance.guangzhou">地鐵入口</string>
+	<string name="type.railway.subway_entrance.hamburg">地鐵入口</string>
+	<string name="type.railway.subway_entrance.helsinki">地鐵入口</string>
+	<string name="type.railway.subway_entrance.hiroshima">地鐵入口</string>
+	<string name="type.railway.subway_entrance.isfahan">地鐵入口</string>
+	<string name="type.railway.subway_entrance.istanbul">地鐵入口</string>
+	<string name="type.railway.subway_entrance.izmir">地鐵入口</string>
+	<string name="type.railway.subway_entrance.kazan">地鐵入口</string>
+	<string name="type.railway.subway_entrance.kharkiv">地鐵入口</string>
 	<string name="type.railway.subway_entrance.kiev">地鐵入口</string>
+	<string name="type.railway.subway_entrance.kobe">地鐵入口</string>
+	<string name="type.railway.subway_entrance.kolkata">地鐵入口</string>
+	<string name="type.railway.subway_entrance.kunming">地鐵入口</string>
+	<string name="type.railway.subway_entrance.kyoto">地鐵入口</string>
+	<string name="type.railway.subway_entrance.la">地鐵入口</string>
+	<string name="type.railway.subway_entrance.lausanne">地鐵入口</string>
+	<string name="type.railway.subway_entrance.lille">地鐵入口</string>
+	<string name="type.railway.subway_entrance.lima">地鐵入口</string>
+	<string name="type.railway.subway_entrance.lisboa">地鐵入口</string>
+	<string name="type.railway.subway_entrance.lisbon">地鐵入口</string>
 	<string name="type.railway.subway_entrance.london">地鐵入口</string>
+	<string name="type.railway.subway_entrance.lyon">地鐵入口</string>
 	<string name="type.railway.subway_entrance.madrid">地鐵入口</string>
+	<string name="type.railway.subway_entrance.malaga">地鐵入口</string>
+	<string name="type.railway.subway_entrance.manila">地鐵入口</string>
+	<string name="type.railway.subway_entrance.maracaibo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.mashhad">地鐵入口</string>
+	<string name="type.railway.subway_entrance.mecca">地鐵入口</string>
+	<string name="type.railway.subway_entrance.medellin">地鐵入口</string>
+	<string name="type.railway.subway_entrance.mexico">地鐵入口</string>
+	<string name="type.railway.subway_entrance.milan">地鐵入口</string>
 	<string name="type.railway.subway_entrance.minsk">地鐵入口</string>
+	<string name="type.railway.subway_entrance.montreal">地鐵入口</string>
 	<string name="type.railway.subway_entrance.moscow">地鐵入口</string>
+	<string name="type.railway.subway_entrance.munchen">地鐵入口</string>
+	<string name="type.railway.subway_entrance.nagoya">地鐵入口</string>
 	<string name="type.railway.subway_entrance.newyork">地鐵入口</string>
+	<string name="type.railway.subway_entrance.nnov">地鐵入口</string>
+	<string name="type.railway.subway_entrance.novosibirsk">地鐵入口</string>
+	<string name="type.railway.subway_entrance.osaka">地鐵入口</string>
+	<string name="type.railway.subway_entrance.oslo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.palma">地鐵入口</string>
+	<string name="type.railway.subway_entrance.panama">地鐵入口</string>
 	<string name="type.railway.subway_entrance.paris">地鐵入口</string>
+	<string name="type.railway.subway_entrance.philadelphia">地鐵入口</string>
+	<string name="type.railway.subway_entrance.pyongyang">地鐵入口</string>
+	<string name="type.railway.subway_entrance.rennes">地鐵入口</string>
+	<string name="type.railway.subway_entrance.rio">地鐵入口</string>
 	<string name="type.railway.subway_entrance.roma">地鐵入口</string>
+	<string name="type.railway.subway_entrance.rotterdam">地鐵入口</string>
+	<string name="type.railway.subway_entrance.samara">地鐵入口</string>
+	<string name="type.railway.subway_entrance.santiago">地鐵入口</string>
+	<string name="type.railway.subway_entrance.santo_domingo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.saopaulo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.sapporo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.sendai">地鐵入口</string>
+	<string name="type.railway.subway_entrance.sf">地鐵入口</string>
+	<string name="type.railway.subway_entrance.shanghai">地鐵入口</string>
+	<string name="type.railway.subway_entrance.shiraz">地鐵入口</string>
+	<string name="type.railway.subway_entrance.sofia">地鐵入口</string>
 	<string name="type.railway.subway_entrance.spb">地鐵入口</string>
+	<string name="type.railway.subway_entrance.stockholm">地鐵入口</string>
+	<string name="type.railway.subway_entrance.tabriz">地鐵入口</string>
+	<string name="type.railway.subway_entrance.taipei">地鐵入口</string>
+	<string name="type.railway.subway_entrance.taoyuan">地鐵入口</string>
+	<string name="type.railway.subway_entrance.tashkent">地鐵入口</string>
+	<string name="type.railway.subway_entrance.tbilisi">地鐵入口</string>
+	<string name="type.railway.subway_entrance.tianjin">地鐵入口</string>
+	<string name="type.railway.subway_entrance.tokyo">地鐵入口</string>
+	<string name="type.railway.subway_entrance.valencia">地鐵入口</string>
+	<string name="type.railway.subway_entrance.vienna">地鐵入口</string>
+	<string name="type.railway.subway_entrance.warszawa">地鐵入口</string>
+	<string name="type.railway.subway_entrance.washington">地鐵入口</string>
+	<string name="type.railway.subway_entrance.wuhan">地鐵入口</string>
+	<string name="type.railway.subway_entrance.yerevan">地鐵入口</string>
+	<string name="type.railway.subway_entrance.yokohama">地鐵入口</string>
 	<string name="type.railway.tram">電車軌道</string>
 	<string name="type.railway.tram.bridge">電車軌道</string>
 	<string name="type.railway.tram.tunnel">電車軌道</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index f21a0948f4..916227f198 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -1361,29 +1361,225 @@
 	<string name="type.railway.station.light_rail">轻轨车站</string>
 	<string name="type.railway.station.monorail">单轨车站</string>
 	<string name="type.railway.station.subway">地铁车站</string>
+	<string name="type.railway.station.subway.adana">地铁车站</string>
+	<string name="type.railway.station.subway.algiers">地铁车站</string>
+	<string name="type.railway.station.subway.almaty">地铁车站</string>
+	<string name="type.railway.station.subway.amsterdam">地铁车站</string>
+	<string name="type.railway.station.subway.ankara">地铁车站</string>
+	<string name="type.railway.station.subway.athens">地铁车站</string>
+	<string name="type.railway.station.subway.baku">地铁车站</string>
+	<string name="type.railway.station.subway.bangkok">地铁车站</string>
 	<string name="type.railway.station.subway.barcelona">地铁车站</string>
+	<string name="type.railway.station.subway.beijing">地铁车站</string>
+	<string name="type.railway.station.subway.bengalore">地铁车站</string>
 	<string name="type.railway.station.subway.berlin">地铁车站</string>
+	<string name="type.railway.station.subway.brasilia">地铁车站</string>
+	<string name="type.railway.station.subway.brescia">地铁车站</string>
+	<string name="type.railway.station.subway.brussels">地铁车站</string>
+	<string name="type.railway.station.subway.bucharest">地铁车站</string>
+	<string name="type.railway.station.subway.budapest">地铁车站</string>
+	<string name="type.railway.station.subway.buenos_aires">地铁车站</string>
+	<string name="type.railway.station.subway.bursa">地铁车站</string>
+	<string name="type.railway.station.subway.cairo">地铁车站</string>
+	<string name="type.railway.station.subway.caracas">地铁车站</string>
+	<string name="type.railway.station.subway.catania">地铁车站</string>
+	<string name="type.railway.station.subway.changchun">地铁车站</string>
+	<string name="type.railway.station.subway.chengdu">地铁车站</string>
+	<string name="type.railway.station.subway.chicago">地铁车站</string>
+	<string name="type.railway.station.subway.chongqing">地铁车站</string>
+	<string name="type.railway.station.subway.dalian">地铁车站</string>
+	<string name="type.railway.station.subway.delhi">地铁车站</string>
+	<string name="type.railway.station.subway.dnepro">地铁车站</string>
+	<string name="type.railway.station.subway.dubai">地铁车站</string>
+	<string name="type.railway.station.subway.ekb">地铁车站</string>
+	<string name="type.railway.station.subway.fukuoka">地铁车站</string>
+	<string name="type.railway.station.subway.glasgow">地铁车站</string>
+	<string name="type.railway.station.subway.guangzhou">地铁车站</string>
+	<string name="type.railway.station.subway.hamburg">地铁车站</string>
+	<string name="type.railway.station.subway.helsinki">地铁车站</string>
+	<string name="type.railway.station.subway.hiroshima">地铁车站</string>
+	<string name="type.railway.station.subway.isfahan">地铁车站</string>
+	<string name="type.railway.station.subway.istanbul">地铁车站</string>
+	<string name="type.railway.station.subway.izmir">地铁车站</string>
+	<string name="type.railway.station.subway.kazan">地铁车站</string>
+	<string name="type.railway.station.subway.kharkiv">地铁车站</string>
 	<string name="type.railway.station.subway.kiev">地铁车站</string>
+	<string name="type.railway.station.subway.kobe">地铁车站</string>
+	<string name="type.railway.station.subway.kolkata">地铁车站</string>
+	<string name="type.railway.station.subway.kunming">地铁车站</string>
+	<string name="type.railway.station.subway.kyoto">地铁车站</string>
+	<string name="type.railway.station.subway.la">地铁车站</string>
+	<string name="type.railway.station.subway.lausanne">地铁车站</string>
+	<string name="type.railway.station.subway.lille">地铁车站</string>
+	<string name="type.railway.station.subway.lima">地铁车站</string>
+	<string name="type.railway.station.subway.lisboa">地铁车站</string>
+	<string name="type.railway.station.subway.lisbon">地铁车站</string>
 	<string name="type.railway.station.subway.london">地铁车站</string>
+	<string name="type.railway.station.subway.lyon">地铁车站</string>
 	<string name="type.railway.station.subway.madrid">地铁车站</string>
+	<string name="type.railway.station.subway.malaga">地铁车站</string>
+	<string name="type.railway.station.subway.manila">地铁车站</string>
+	<string name="type.railway.station.subway.maracaibo">地铁车站</string>
+	<string name="type.railway.station.subway.mashhad">地铁车站</string>
+	<string name="type.railway.station.subway.mecca">地铁车站</string>
+	<string name="type.railway.station.subway.medellin">地铁车站</string>
+	<string name="type.railway.station.subway.mexico">地铁车站</string>
+	<string name="type.railway.station.subway.milan">地铁车站</string>
 	<string name="type.railway.station.subway.minsk">地铁车站</string>
+	<string name="type.railway.station.subway.montreal">地铁车站</string>
 	<string name="type.railway.station.subway.moscow">地铁车站</string>
+	<string name="type.railway.station.subway.munchen">地铁车站</string>
+	<string name="type.railway.station.subway.nagoya">地铁车站</string>
 	<string name="type.railway.station.subway.newyork">地铁车站</string>
+	<string name="type.railway.station.subway.nnov">地铁车站</string>
+	<string name="type.railway.station.subway.novosibirsk">地铁车站</string>
+	<string name="type.railway.station.subway.osaka">地铁车站</string>
+	<string name="type.railway.station.subway.oslo">地铁车站</string>
+	<string name="type.railway.station.subway.palma">地铁车站</string>
+	<string name="type.railway.station.subway.panama">地铁车站</string>
 	<string name="type.railway.station.subway.paris">地铁车站</string>
+	<string name="type.railway.station.subway.philadelphia">地铁车站</string>
+	<string name="type.railway.station.subway.pyongyang">地铁车站</string>
+	<string name="type.railway.station.subway.rennes">地铁车站</string>
+	<string name="type.railway.station.subway.rio">地铁车站</string>
 	<string name="type.railway.station.subway.roma">地铁车站</string>
+	<string name="type.railway.station.subway.rotterdam">地铁车站</string>
+	<string name="type.railway.station.subway.samara">地铁车站</string>
+	<string name="type.railway.station.subway.santiago">地铁车站</string>
+	<string name="type.railway.station.subway.santo_domingo">地铁车站</string>
+	<string name="type.railway.station.subway.saopaulo">地铁车站</string>
+	<string name="type.railway.station.subway.sapporo">地铁车站</string>
+	<string name="type.railway.station.subway.sendai">地铁车站</string>
+	<string name="type.railway.station.subway.sf">地铁车站</string>
+	<string name="type.railway.station.subway.shanghai">地铁车站</string>
+	<string name="type.railway.station.subway.shiraz">地铁车站</string>
+	<string name="type.railway.station.subway.sofia">地铁车站</string>
 	<string name="type.railway.station.subway.spb">地铁车站</string>
-	<string name="type.railway.subway_entrance">地铁入口</string>
-	<string name="type.railway.subway_entrance.barcelona">地铁入口</string>
-	<string name="type.railway.subway_entrance.berlin">地铁入口</string>
-	<string name="type.railway.subway_entrance.kiev">地铁入口</string>
-	<string name="type.railway.subway_entrance.london">地铁入口</string>
-	<string name="type.railway.subway_entrance.madrid">地铁入口</string>
-	<string name="type.railway.subway_entrance.minsk">地铁入口</string>
-	<string name="type.railway.subway_entrance.moscow">地铁入口</string>
-	<string name="type.railway.subway_entrance.newyork">地铁入口</string>
-	<string name="type.railway.subway_entrance.paris">地铁入口</string>
-	<string name="type.railway.subway_entrance.roma">地铁入口</string>
-	<string name="type.railway.subway_entrance.spb">地铁入口</string>
+	<string name="type.railway.station.subway.stockholm">地铁车站</string>
+	<string name="type.railway.station.subway.tabriz">地铁车站</string>
+	<string name="type.railway.station.subway.taipei">地铁车站</string>
+	<string name="type.railway.station.subway.taoyuan">地铁车站</string>
+	<string name="type.railway.station.subway.tashkent">地铁车站</string>
+	<string name="type.railway.station.subway.tbilisi">地铁车站</string>
+	<string name="type.railway.station.subway.tianjin">地铁车站</string>
+	<string name="type.railway.station.subway.tokyo">地铁车站</string>
+	<string name="type.railway.station.subway.valencia">地铁车站</string>
+	<string name="type.railway.station.subway.vienna">地铁车站</string>
+	<string name="type.railway.station.subway.warszawa">地铁车站</string>
+	<string name="type.railway.station.subway.washington">地铁车站</string>
+	<string name="type.railway.station.subway.wuhan">地铁车站</string>
+	<string name="type.railway.station.subway.yerevan">地铁车站</string>
+	<string name="type.railway.station.subway.yokohama">地铁车站</string>
+	<string name="type.railway.subway_entrance">地铁出入口</string>
+	<string name="type.railway.subway_entrance.adana">地铁出入口</string>
+	<string name="type.railway.subway_entrance.algiers">地铁出入口</string>
+	<string name="type.railway.subway_entrance.almaty">地铁出入口</string>
+	<string name="type.railway.subway_entrance.amsterdam">地铁出入口</string>
+	<string name="type.railway.subway_entrance.ankara">地铁出入口</string>
+	<string name="type.railway.subway_entrance.athens">地铁出入口</string>
+	<string name="type.railway.subway_entrance.baku">地铁出入口</string>
+	<string name="type.railway.subway_entrance.bangkok">地铁出入口</string>
+	<string name="type.railway.subway_entrance.barcelona">地铁出入口</string>
+	<string name="type.railway.subway_entrance.beijing">地铁出入口</string>
+	<string name="type.railway.subway_entrance.bengalore">地铁出入口</string>
+	<string name="type.railway.subway_entrance.berlin">地铁出入口</string>
+	<string name="type.railway.subway_entrance.brasilia">地铁出入口</string>
+	<string name="type.railway.subway_entrance.brescia">地铁出入口</string>
+	<string name="type.railway.subway_entrance.brussels">地铁出入口</string>
+	<string name="type.railway.subway_entrance.bucharest">地铁出入口</string>
+	<string name="type.railway.subway_entrance.budapest">地铁出入口</string>
+	<string name="type.railway.subway_entrance.buenos_aires">地铁出入口</string>
+	<string name="type.railway.subway_entrance.bursa">地铁出入口</string>
+	<string name="type.railway.subway_entrance.cairo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.caracas">地铁出入口</string>
+	<string name="type.railway.subway_entrance.catania">地铁出入口</string>
+	<string name="type.railway.subway_entrance.changchun">地铁出入口</string>
+	<string name="type.railway.subway_entrance.chengdu">地铁出入口</string>
+	<string name="type.railway.subway_entrance.chicago">地铁出入口</string>
+	<string name="type.railway.subway_entrance.chongqing">地铁出入口</string>
+	<string name="type.railway.subway_entrance.dalian">地铁出入口</string>
+	<string name="type.railway.subway_entrance.delhi">地铁出入口</string>
+	<string name="type.railway.subway_entrance.dnepro">地铁出入口</string>
+	<string name="type.railway.subway_entrance.dubai">地铁出入口</string>
+	<string name="type.railway.subway_entrance.ekb">地铁出入口</string>
+	<string name="type.railway.subway_entrance.fukuoka">地铁出入口</string>
+	<string name="type.railway.subway_entrance.glasgow">地铁出入口</string>
+	<string name="type.railway.subway_entrance.guangzhou">地铁出入口</string>
+	<string name="type.railway.subway_entrance.hamburg">地铁出入口</string>
+	<string name="type.railway.subway_entrance.helsinki">地铁出入口</string>
+	<string name="type.railway.subway_entrance.hiroshima">地铁出入口</string>
+	<string name="type.railway.subway_entrance.isfahan">地铁出入口</string>
+	<string name="type.railway.subway_entrance.istanbul">地铁出入口</string>
+	<string name="type.railway.subway_entrance.izmir">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kazan">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kharkiv">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kiev">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kobe">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kolkata">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kunming">地铁出入口</string>
+	<string name="type.railway.subway_entrance.kyoto">地铁出入口</string>
+	<string name="type.railway.subway_entrance.la">地铁出入口</string>
+	<string name="type.railway.subway_entrance.lausanne">地铁出入口</string>
+	<string name="type.railway.subway_entrance.lille">地铁出入口</string>
+	<string name="type.railway.subway_entrance.lima">地铁出入口</string>
+	<string name="type.railway.subway_entrance.lisboa">地铁出入口</string>
+	<string name="type.railway.subway_entrance.lisbon">地铁出入口</string>
+	<string name="type.railway.subway_entrance.london">地铁出入口</string>
+	<string name="type.railway.subway_entrance.lyon">地铁出入口</string>
+	<string name="type.railway.subway_entrance.madrid">地铁出入口</string>
+	<string name="type.railway.subway_entrance.malaga">地铁出入口</string>
+	<string name="type.railway.subway_entrance.manila">地铁出入口</string>
+	<string name="type.railway.subway_entrance.maracaibo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.mashhad">地铁出入口</string>
+	<string name="type.railway.subway_entrance.mecca">地铁出入口</string>
+	<string name="type.railway.subway_entrance.medellin">地铁出入口</string>
+	<string name="type.railway.subway_entrance.mexico">地铁出入口</string>
+	<string name="type.railway.subway_entrance.milan">地铁出入口</string>
+	<string name="type.railway.subway_entrance.minsk">地铁出入口</string>
+	<string name="type.railway.subway_entrance.montreal">地铁出入口</string>
+	<string name="type.railway.subway_entrance.moscow">地铁出入口</string>
+	<string name="type.railway.subway_entrance.munchen">地铁出入口</string>
+	<string name="type.railway.subway_entrance.nagoya">地铁出入口</string>
+	<string name="type.railway.subway_entrance.newyork">地铁出入口</string>
+	<string name="type.railway.subway_entrance.nnov">地铁出入口</string>
+	<string name="type.railway.subway_entrance.novosibirsk">地铁出入口</string>
+	<string name="type.railway.subway_entrance.osaka">地铁出入口</string>
+	<string name="type.railway.subway_entrance.oslo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.palma">地铁出入口</string>
+	<string name="type.railway.subway_entrance.panama">地铁出入口</string>
+	<string name="type.railway.subway_entrance.paris">地铁出入口</string>
+	<string name="type.railway.subway_entrance.philadelphia">地铁出入口</string>
+	<string name="type.railway.subway_entrance.pyongyang">地铁出入口</string>
+	<string name="type.railway.subway_entrance.rennes">地铁出入口</string>
+	<string name="type.railway.subway_entrance.rio">地铁出入口</string>
+	<string name="type.railway.subway_entrance.roma">地铁出入口</string>
+	<string name="type.railway.subway_entrance.rotterdam">地铁出入口</string>
+	<string name="type.railway.subway_entrance.samara">地铁出入口</string>
+	<string name="type.railway.subway_entrance.santiago">地铁出入口</string>
+	<string name="type.railway.subway_entrance.santo_domingo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.saopaulo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.sapporo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.sendai">地铁出入口</string>
+	<string name="type.railway.subway_entrance.sf">地铁出入口</string>
+	<string name="type.railway.subway_entrance.shanghai">地铁出入口</string>
+	<string name="type.railway.subway_entrance.shiraz">地铁出入口</string>
+	<string name="type.railway.subway_entrance.sofia">地铁出入口</string>
+	<string name="type.railway.subway_entrance.spb">地铁出入口</string>
+	<string name="type.railway.subway_entrance.stockholm">地铁出入口</string>
+	<string name="type.railway.subway_entrance.tabriz">地铁出入口</string>
+	<string name="type.railway.subway_entrance.taipei">地铁出入口</string>
+	<string name="type.railway.subway_entrance.taoyuan">地铁出入口</string>
+	<string name="type.railway.subway_entrance.tashkent">地铁出入口</string>
+	<string name="type.railway.subway_entrance.tbilisi">地铁出入口</string>
+	<string name="type.railway.subway_entrance.tianjin">地铁出入口</string>
+	<string name="type.railway.subway_entrance.tokyo">地铁出入口</string>
+	<string name="type.railway.subway_entrance.valencia">地铁出入口</string>
+	<string name="type.railway.subway_entrance.vienna">地铁出入口</string>
+	<string name="type.railway.subway_entrance.warszawa">地铁出入口</string>
+	<string name="type.railway.subway_entrance.washington">地铁出入口</string>
+	<string name="type.railway.subway_entrance.wuhan">地铁出入口</string>
+	<string name="type.railway.subway_entrance.yerevan">地铁出入口</string>
+	<string name="type.railway.subway_entrance.yokohama">地铁出入口</string>
 	<string name="type.railway.tram">电车轨道</string>
 	<string name="type.railway.tram.bridge">电车轨道</string>
 	<string name="type.railway.tram.tunnel">电车轨道</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 4c942573ff..29f2f385b6 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1500,32 +1500,228 @@
 	<string name="type.railway.station.light_rail">Train Station</string>
 	<string name="type.railway.station.monorail">Train Station</string>
 	<string name="type.railway.station.subway">Subway</string>
+	<string name="type.railway.station.subway.adana">Subway</string>
+	<string name="type.railway.station.subway.algiers">Subway</string>
+	<string name="type.railway.station.subway.almaty">Subway</string>
+	<string name="type.railway.station.subway.amsterdam">Subway</string>
+	<string name="type.railway.station.subway.ankara">Subway</string>
+	<string name="type.railway.station.subway.athens">Subway</string>
+	<string name="type.railway.station.subway.baku">Subway</string>
+	<string name="type.railway.station.subway.bangkok">Subway</string>
 	<string name="type.railway.station.subway.barcelona">Subway</string>
+	<string name="type.railway.station.subway.beijing">Subway</string>
+	<string name="type.railway.station.subway.bengalore">Subway</string>
 	<string name="type.railway.station.subway.berlin">Subway</string>
+	<string name="type.railway.station.subway.brasilia">Subway</string>
+	<string name="type.railway.station.subway.brescia">Subway</string>
+	<string name="type.railway.station.subway.brussels">Subway</string>
+	<string name="type.railway.station.subway.bucharest">Subway</string>
+	<string name="type.railway.station.subway.budapest">Subway</string>
+	<string name="type.railway.station.subway.buenos_aires">Subway</string>
+	<string name="type.railway.station.subway.bursa">Subway</string>
+	<string name="type.railway.station.subway.cairo">Subway</string>
+	<string name="type.railway.station.subway.caracas">Subway</string>
+	<string name="type.railway.station.subway.catania">Subway</string>
+	<string name="type.railway.station.subway.changchun">Subway</string>
+	<string name="type.railway.station.subway.chengdu">Subway</string>
+	<string name="type.railway.station.subway.chicago">Subway</string>
+	<string name="type.railway.station.subway.chongqing">Subway</string>
+	<string name="type.railway.station.subway.dalian">Subway</string>
+	<string name="type.railway.station.subway.delhi">Subway</string>
+	<string name="type.railway.station.subway.dnepro">Subway</string>
+	<string name="type.railway.station.subway.dubai">Subway</string>
+	<string name="type.railway.station.subway.ekb">Subway</string>
+	<string name="type.railway.station.subway.fukuoka">Subway</string>
+	<string name="type.railway.station.subway.glasgow">Subway</string>
+	<string name="type.railway.station.subway.guangzhou">Subway</string>
+	<string name="type.railway.station.subway.hamburg">Subway</string>
+	<string name="type.railway.station.subway.helsinki">Subway</string>
+	<string name="type.railway.station.subway.hiroshima">Subway</string>
+	<string name="type.railway.station.subway.isfahan">Subway</string>
+	<string name="type.railway.station.subway.istanbul">Subway</string>
+	<string name="type.railway.station.subway.izmir">Subway</string>
+	<string name="type.railway.station.subway.kazan">Subway</string>
+	<string name="type.railway.station.subway.kharkiv">Subway</string>
 	<string name="type.railway.station.subway.kiev">Subway</string>
+	<string name="type.railway.station.subway.kobe">Subway</string>
+	<string name="type.railway.station.subway.kolkata">Subway</string>
+	<string name="type.railway.station.subway.kunming">Subway</string>
+	<string name="type.railway.station.subway.kyoto">Subway</string>
+	<string name="type.railway.station.subway.la">Subway</string>
+	<string name="type.railway.station.subway.lausanne">Subway</string>
+	<string name="type.railway.station.subway.lille">Subway</string>
+	<string name="type.railway.station.subway.lima">Subway</string>
+	<string name="type.railway.station.subway.lisboa">Subway</string>
+	<string name="type.railway.station.subway.lisbon">Subway</string>
 	<string name="type.railway.station.subway.london">Subway</string>
+	<string name="type.railway.station.subway.lyon">Subway</string>
 	<string name="type.railway.station.subway.madrid">Subway</string>
+	<string name="type.railway.station.subway.malaga">Subway</string>
+	<string name="type.railway.station.subway.manila">Subway</string>
+	<string name="type.railway.station.subway.maracaibo">Subway</string>
+	<string name="type.railway.station.subway.mashhad">Subway</string>
+	<string name="type.railway.station.subway.mecca">Subway</string>
+	<string name="type.railway.station.subway.medellin">Subway</string>
+	<string name="type.railway.station.subway.mexico">Subway</string>
+	<string name="type.railway.station.subway.milan">Subway</string>
 	<string name="type.railway.station.subway.minsk">Subway</string>
+	<string name="type.railway.station.subway.montreal">Subway</string>
 	<string name="type.railway.station.subway.moscow">Subway</string>
+	<string name="type.railway.station.subway.munchen">Subway</string>
+	<string name="type.railway.station.subway.nagoya">Subway</string>
 	<string name="type.railway.station.subway.newyork">Subway</string>
+	<string name="type.railway.station.subway.nnov">Subway</string>
+	<string name="type.railway.station.subway.novosibirsk">Subway</string>
+	<string name="type.railway.station.subway.osaka">Subway</string>
+	<string name="type.railway.station.subway.oslo">Subway</string>
+	<string name="type.railway.station.subway.palma">Subway</string>
+	<string name="type.railway.station.subway.panama">Subway</string>
 	<string name="type.railway.station.subway.paris">Subway</string>
+	<string name="type.railway.station.subway.philadelphia">Subway</string>
+	<string name="type.railway.station.subway.pyongyang">Subway</string>
+	<string name="type.railway.station.subway.rennes">Subway</string>
+	<string name="type.railway.station.subway.rio">Subway</string>
 	<string name="type.railway.station.subway.roma">Subway</string>
+	<string name="type.railway.station.subway.rotterdam">Subway</string>
+	<string name="type.railway.station.subway.samara">Subway</string>
+	<string name="type.railway.station.subway.santiago">Subway</string>
+	<string name="type.railway.station.subway.santo_domingo">Subway</string>
+	<string name="type.railway.station.subway.saopaulo">Subway</string>
+	<string name="type.railway.station.subway.sapporo">Subway</string>
+	<string name="type.railway.station.subway.sendai">Subway</string>
+	<string name="type.railway.station.subway.sf">Subway</string>
+	<string name="type.railway.station.subway.shanghai">Subway</string>
+	<string name="type.railway.station.subway.shiraz">Subway</string>
+	<string name="type.railway.station.subway.sofia">Subway</string>
 	<string name="type.railway.station.subway.spb">Subway</string>
+	<string name="type.railway.station.subway.stockholm">Subway</string>
+	<string name="type.railway.station.subway.tabriz">Subway</string>
+	<string name="type.railway.station.subway.taipei">Subway</string>
+	<string name="type.railway.station.subway.taoyuan">Subway</string>
+	<string name="type.railway.station.subway.tashkent">Subway</string>
+	<string name="type.railway.station.subway.tbilisi">Subway</string>
+	<string name="type.railway.station.subway.tianjin">Subway</string>
+	<string name="type.railway.station.subway.tokyo">Subway</string>
+	<string name="type.railway.station.subway.valencia">Subway</string>
+	<string name="type.railway.station.subway.vienna">Subway</string>
+	<string name="type.railway.station.subway.warszawa">Subway</string>
+	<string name="type.railway.station.subway.washington">Subway</string>
+	<string name="type.railway.station.subway.wuhan">Subway</string>
+	<string name="type.railway.station.subway.yerevan">Subway</string>
+	<string name="type.railway.station.subway.yokohama">Subway</string>
 	<string name="type.railway.subway">Subway Line</string>
 	<string name="type.railway.subway.bridge">Subway Line</string>
 	<string name="type.railway.subway.tunnel">Subway Line</string>
 	<string name="type.railway.subway_entrance">Subway Entrance</string>
-	<string name="type.railway.subway_entrance.barcelona">Subway</string>
-	<string name="type.railway.subway_entrance.berlin">Subway</string>
-	<string name="type.railway.subway_entrance.kiev">Subway</string>
-	<string name="type.railway.subway_entrance.london">Subway</string>
-	<string name="type.railway.subway_entrance.madrid">Subway</string>
-	<string name="type.railway.subway_entrance.minsk">Subway</string>
-	<string name="type.railway.subway_entrance.moscow">Subway</string>
-	<string name="type.railway.subway_entrance.newyork">Subway</string>
-	<string name="type.railway.subway_entrance.paris">Subway</string>
-	<string name="type.railway.subway_entrance.roma">Subway</string>
-	<string name="type.railway.subway_entrance.spb">Subway</string>
+	<string name="type.railway.subway_entrance.adana">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.algiers">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.almaty">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.amsterdam">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.ankara">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.athens">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.baku">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.bangkok">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.barcelona">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.beijing">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.bengalore">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.berlin">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.brasilia">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.brescia">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.brussels">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.bucharest">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.budapest">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.buenos_aires">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.bursa">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.cairo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.caracas">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.catania">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.changchun">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.chengdu">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.chicago">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.chongqing">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.dalian">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.delhi">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.dnepro">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.dubai">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.ekb">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.fukuoka">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.glasgow">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.guangzhou">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.hamburg">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.helsinki">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.hiroshima">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.isfahan">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.istanbul">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.izmir">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kazan">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kharkiv">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kiev">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kobe">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kolkata">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kunming">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.kyoto">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.la">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.lausanne">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.lille">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.lima">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.lisboa">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.lisbon">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.london">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.lyon">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.madrid">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.malaga">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.manila">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.maracaibo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.mashhad">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.mecca">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.medellin">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.mexico">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.milan">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.minsk">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.montreal">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.moscow">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.munchen">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.nagoya">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.newyork">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.nnov">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.novosibirsk">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.osaka">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.oslo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.palma">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.panama">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.paris">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.philadelphia">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.pyongyang">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.rennes">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.rio">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.roma">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.rotterdam">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.samara">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.santiago">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.santo_domingo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.saopaulo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.sapporo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.sendai">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.sf">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.shanghai">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.shiraz">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.sofia">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.spb">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.stockholm">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.tabriz">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.taipei">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.taoyuan">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.tashkent">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.tbilisi">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.tianjin">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.tokyo">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.valencia">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.vienna">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.warszawa">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.washington">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.wuhan">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.yerevan">Subway Entrance</string>
+	<string name="type.railway.subway_entrance.yokohama">Subway Entrance</string>
 	<string name="type.railway.tram">Tram Line</string>
 	<string name="type.railway.tram.bridge">Tram Line</string>
 	<string name="type.railway.tram.tunnel">Tram Line</string>
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 4ec7f15b90..7f184994ed 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -17082,332 +17082,332 @@
     zh-Hans = 地铁出入口
     zh-Hant = 地鐵入口
 
-   [type.railway.subway_entrance.adana]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.adana]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.algiers]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.algiers]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.almaty]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.almaty]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.amsterdam]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.amsterdam]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.ankara]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.ankara]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.athens]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.athens]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.baku]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.baku]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.bangkok]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.bangkok]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.barcelona]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.barcelona]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.beijing]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.beijing]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.bengalore]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.bengalore]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.berlin]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.berlin]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.brasilia]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.brasilia]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.brescia]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.brescia]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.brussels]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.brussels]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.bucharest]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.bucharest]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.budapest]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.budapest]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.buenos_aires]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.buenos_aires]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.bursa]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.bursa]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.cairo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.cairo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.caracas]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.caracas]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.catania]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.catania]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.changchun]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.changchun]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.chengdu]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.chengdu]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.chicago]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.chicago]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.chongqing]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.chongqing]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.dalian]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.dalian]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.delhi]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.delhi]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.dnepro]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.dnepro]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.dubai]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.dubai]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.ekb]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.ekb]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.fukuoka]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.fukuoka]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.glasgow]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.glasgow]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.guangzhou]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.guangzhou]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.hamburg]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.hamburg]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.helsinki]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.helsinki]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.hiroshima]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.hiroshima]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.isfahan]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.isfahan]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.istanbul]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.istanbul]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.izmir]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.izmir]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kazan]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kazan]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kharkiv]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kharkiv]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kiev]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kiev]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kobe]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kobe]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kolkata]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kolkata]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kunming]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kunming]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.kyoto]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.kyoto]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.la]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.la]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.lausanne]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.lausanne]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.lille]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.lille]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.lima]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.lima]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.lisboa]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.lisboa]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.lisbon]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.lisbon]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.london]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.london]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.lyon]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.lyon]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.madrid]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.madrid]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.malaga]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.malaga]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.manila]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.manila]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.maracaibo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.maracaibo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.mashhad]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.mashhad]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.mecca]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.mecca]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.medellin]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.medellin]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.mexico]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.mexico]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.milan]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.milan]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.minsk]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.minsk]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.montreal]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.montreal]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.moscow]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.moscow]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.munchen]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.munchen]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.nagoya]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.nagoya]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.newyork]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.newyork]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.nnov]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.nnov]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.novosibirsk]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.novosibirsk]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.osaka]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.osaka]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.oslo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.oslo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.palma]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.palma]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.panama]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.panama]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.paris]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.paris]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.philadelphia]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.philadelphia]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.pyongyang]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.pyongyang]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.rennes]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.rennes]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.rio]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.rio]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.roma]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.roma]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.rotterdam]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.rotterdam]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.samara]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.samara]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.santiago]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.santiago]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.santo_domingo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.santo_domingo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.saopaulo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.saopaulo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.sapporo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.sapporo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.sendai]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.sendai]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.sf]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.sf]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.shanghai]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.shanghai]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.shiraz]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.shiraz]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.sofia]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.sofia]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.spb]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.spb]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.stockholm]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.stockholm]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.tabriz]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.tabriz]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.taipei]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.taipei]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.taoyuan]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.taoyuan]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.tashkent]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.tashkent]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.tbilisi]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.tbilisi]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.tianjin]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.tianjin]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.tokyo]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.tokyo]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.valencia]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.valencia]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.vienna]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.vienna]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.warszawa]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.warszawa]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.washington]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.washington]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.wuhan]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.wuhan]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.yerevan]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.yerevan]
+    ref = type.railway.subway_entrance
 
-   [type.railway.subway_entrance.yokohama]
-     ref = type.railway.subway_entrance
+  [type.railway.subway_entrance.yokohama]
+    ref = type.railway.subway_entrance
 
   [type.railway.tram]
     en = Tram Line
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 2cbea30f2d..55d065ab40 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "محطة مترو";
 
+"type.railway.station.subway.adana" = "محطة مترو";
+
+"type.railway.station.subway.algiers" = "محطة مترو";
+
+"type.railway.station.subway.almaty" = "محطة مترو";
+
+"type.railway.station.subway.amsterdam" = "محطة مترو";
+
+"type.railway.station.subway.ankara" = "محطة مترو";
+
+"type.railway.station.subway.athens" = "محطة مترو";
+
+"type.railway.station.subway.baku" = "محطة مترو";
+
+"type.railway.station.subway.bangkok" = "محطة مترو";
+
 "type.railway.station.subway.barcelona" = "محطة مترو";
 
+"type.railway.station.subway.beijing" = "محطة مترو";
+
+"type.railway.station.subway.bengalore" = "محطة مترو";
+
 "type.railway.station.subway.berlin" = "محطة مترو";
 
+"type.railway.station.subway.brasilia" = "محطة مترو";
+
+"type.railway.station.subway.brescia" = "محطة مترو";
+
+"type.railway.station.subway.brussels" = "محطة مترو";
+
+"type.railway.station.subway.bucharest" = "محطة مترو";
+
+"type.railway.station.subway.budapest" = "محطة مترو";
+
+"type.railway.station.subway.buenos_aires" = "محطة مترو";
+
+"type.railway.station.subway.bursa" = "محطة مترو";
+
+"type.railway.station.subway.cairo" = "محطة مترو";
+
+"type.railway.station.subway.caracas" = "محطة مترو";
+
+"type.railway.station.subway.catania" = "محطة مترو";
+
+"type.railway.station.subway.changchun" = "محطة مترو";
+
+"type.railway.station.subway.chengdu" = "محطة مترو";
+
+"type.railway.station.subway.chicago" = "محطة مترو";
+
+"type.railway.station.subway.chongqing" = "محطة مترو";
+
+"type.railway.station.subway.dalian" = "محطة مترو";
+
+"type.railway.station.subway.delhi" = "محطة مترو";
+
+"type.railway.station.subway.dnepro" = "محطة مترو";
+
+"type.railway.station.subway.dubai" = "محطة مترو";
+
+"type.railway.station.subway.ekb" = "محطة مترو";
+
+"type.railway.station.subway.fukuoka" = "محطة مترو";
+
+"type.railway.station.subway.glasgow" = "محطة مترو";
+
+"type.railway.station.subway.guangzhou" = "محطة مترو";
+
+"type.railway.station.subway.hamburg" = "محطة مترو";
+
+"type.railway.station.subway.helsinki" = "محطة مترو";
+
+"type.railway.station.subway.hiroshima" = "محطة مترو";
+
+"type.railway.station.subway.isfahan" = "محطة مترو";
+
+"type.railway.station.subway.istanbul" = "محطة مترو";
+
+"type.railway.station.subway.izmir" = "محطة مترو";
+
+"type.railway.station.subway.kazan" = "محطة مترو";
+
+"type.railway.station.subway.kharkiv" = "محطة مترو";
+
 "type.railway.station.subway.kiev" = "محطة مترو";
 
+"type.railway.station.subway.kobe" = "محطة مترو";
+
+"type.railway.station.subway.kolkata" = "محطة مترو";
+
+"type.railway.station.subway.kunming" = "محطة مترو";
+
+"type.railway.station.subway.kyoto" = "محطة مترو";
+
+"type.railway.station.subway.la" = "محطة مترو";
+
+"type.railway.station.subway.lausanne" = "محطة مترو";
+
+"type.railway.station.subway.lille" = "محطة مترو";
+
+"type.railway.station.subway.lima" = "محطة مترو";
+
+"type.railway.station.subway.lisboa" = "محطة مترو";
+
+"type.railway.station.subway.lisbon" = "محطة مترو";
+
 "type.railway.station.subway.london" = "محطة مترو";
 
+"type.railway.station.subway.lyon" = "محطة مترو";
+
 "type.railway.station.subway.madrid" = "محطة مترو";
 
+"type.railway.station.subway.malaga" = "محطة مترو";
+
+"type.railway.station.subway.manila" = "محطة مترو";
+
+"type.railway.station.subway.maracaibo" = "محطة مترو";
+
+"type.railway.station.subway.mashhad" = "محطة مترو";
+
+"type.railway.station.subway.mecca" = "محطة مترو";
+
+"type.railway.station.subway.medellin" = "محطة مترو";
+
+"type.railway.station.subway.mexico" = "محطة مترو";
+
+"type.railway.station.subway.milan" = "محطة مترو";
+
 "type.railway.station.subway.minsk" = "محطة مترو";
 
+"type.railway.station.subway.montreal" = "محطة مترو";
+
 "type.railway.station.subway.moscow" = "محطة مترو";
 
+"type.railway.station.subway.munchen" = "محطة مترو";
+
+"type.railway.station.subway.nagoya" = "محطة مترو";
+
 "type.railway.station.subway.newyork" = "محطة مترو";
 
+"type.railway.station.subway.nnov" = "محطة مترو";
+
+"type.railway.station.subway.novosibirsk" = "محطة مترو";
+
+"type.railway.station.subway.osaka" = "محطة مترو";
+
+"type.railway.station.subway.oslo" = "محطة مترو";
+
+"type.railway.station.subway.palma" = "محطة مترو";
+
+"type.railway.station.subway.panama" = "محطة مترو";
+
 "type.railway.station.subway.paris" = "محطة مترو";
 
+"type.railway.station.subway.philadelphia" = "محطة مترو";
+
+"type.railway.station.subway.pyongyang" = "محطة مترو";
+
+"type.railway.station.subway.rennes" = "محطة مترو";
+
+"type.railway.station.subway.rio" = "محطة مترو";
+
 "type.railway.station.subway.roma" = "محطة مترو";
 
+"type.railway.station.subway.rotterdam" = "محطة مترو";
+
+"type.railway.station.subway.samara" = "محطة مترو";
+
+"type.railway.station.subway.santiago" = "محطة مترو";
+
+"type.railway.station.subway.santo_domingo" = "محطة مترو";
+
+"type.railway.station.subway.saopaulo" = "محطة مترو";
+
+"type.railway.station.subway.sapporo" = "محطة مترو";
+
+"type.railway.station.subway.sendai" = "محطة مترو";
+
+"type.railway.station.subway.sf" = "محطة مترو";
+
+"type.railway.station.subway.shanghai" = "محطة مترو";
+
+"type.railway.station.subway.shiraz" = "محطة مترو";
+
+"type.railway.station.subway.sofia" = "محطة مترو";
+
 "type.railway.station.subway.spb" = "محطة مترو";
 
+"type.railway.station.subway.stockholm" = "محطة مترو";
+
+"type.railway.station.subway.tabriz" = "محطة مترو";
+
+"type.railway.station.subway.taipei" = "محطة مترو";
+
+"type.railway.station.subway.taoyuan" = "محطة مترو";
+
+"type.railway.station.subway.tashkent" = "محطة مترو";
+
+"type.railway.station.subway.tbilisi" = "محطة مترو";
+
+"type.railway.station.subway.tianjin" = "محطة مترو";
+
+"type.railway.station.subway.tokyo" = "محطة مترو";
+
+"type.railway.station.subway.valencia" = "محطة مترو";
+
+"type.railway.station.subway.vienna" = "محطة مترو";
+
+"type.railway.station.subway.warszawa" = "محطة مترو";
+
+"type.railway.station.subway.washington" = "محطة مترو";
+
+"type.railway.station.subway.wuhan" = "محطة مترو";
+
+"type.railway.station.subway.yerevan" = "محطة مترو";
+
+"type.railway.station.subway.yokohama" = "محطة مترو";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "مدخل المترو";
 
-"type.railway.subway_entrance.barcelona" = "محطة مترو";
+"type.railway.subway_entrance.adana" = "مدخل المترو";
 
-"type.railway.subway_entrance.berlin" = "محطة مترو";
+"type.railway.subway_entrance.algiers" = "مدخل المترو";
 
-"type.railway.subway_entrance.kiev" = "محطة مترو";
+"type.railway.subway_entrance.almaty" = "مدخل المترو";
 
-"type.railway.subway_entrance.london" = "محطة مترو";
+"type.railway.subway_entrance.amsterdam" = "مدخل المترو";
 
-"type.railway.subway_entrance.madrid" = "محطة مترو";
+"type.railway.subway_entrance.ankara" = "مدخل المترو";
 
-"type.railway.subway_entrance.minsk" = "محطة مترو";
+"type.railway.subway_entrance.athens" = "مدخل المترو";
 
-"type.railway.subway_entrance.moscow" = "محطة مترو";
+"type.railway.subway_entrance.baku" = "مدخل المترو";
 
-"type.railway.subway_entrance.newyork" = "محطة مترو";
+"type.railway.subway_entrance.bangkok" = "مدخل المترو";
 
-"type.railway.subway_entrance.paris" = "محطة مترو";
+"type.railway.subway_entrance.barcelona" = "مدخل المترو";
 
-"type.railway.subway_entrance.roma" = "محطة مترو";
+"type.railway.subway_entrance.beijing" = "مدخل المترو";
 
-"type.railway.subway_entrance.spb" = "محطة مترو";
+"type.railway.subway_entrance.bengalore" = "مدخل المترو";
+
+"type.railway.subway_entrance.berlin" = "مدخل المترو";
+
+"type.railway.subway_entrance.brasilia" = "مدخل المترو";
+
+"type.railway.subway_entrance.brescia" = "مدخل المترو";
+
+"type.railway.subway_entrance.brussels" = "مدخل المترو";
+
+"type.railway.subway_entrance.bucharest" = "مدخل المترو";
+
+"type.railway.subway_entrance.budapest" = "مدخل المترو";
+
+"type.railway.subway_entrance.buenos_aires" = "مدخل المترو";
+
+"type.railway.subway_entrance.bursa" = "مدخل المترو";
+
+"type.railway.subway_entrance.cairo" = "مدخل المترو";
+
+"type.railway.subway_entrance.caracas" = "مدخل المترو";
+
+"type.railway.subway_entrance.catania" = "مدخل المترو";
+
+"type.railway.subway_entrance.changchun" = "مدخل المترو";
+
+"type.railway.subway_entrance.chengdu" = "مدخل المترو";
+
+"type.railway.subway_entrance.chicago" = "مدخل المترو";
+
+"type.railway.subway_entrance.chongqing" = "مدخل المترو";
+
+"type.railway.subway_entrance.dalian" = "مدخل المترو";
+
+"type.railway.subway_entrance.delhi" = "مدخل المترو";
+
+"type.railway.subway_entrance.dnepro" = "مدخل المترو";
+
+"type.railway.subway_entrance.dubai" = "مدخل المترو";
+
+"type.railway.subway_entrance.ekb" = "مدخل المترو";
+
+"type.railway.subway_entrance.fukuoka" = "مدخل المترو";
+
+"type.railway.subway_entrance.glasgow" = "مدخل المترو";
+
+"type.railway.subway_entrance.guangzhou" = "مدخل المترو";
+
+"type.railway.subway_entrance.hamburg" = "مدخل المترو";
+
+"type.railway.subway_entrance.helsinki" = "مدخل المترو";
+
+"type.railway.subway_entrance.hiroshima" = "مدخل المترو";
+
+"type.railway.subway_entrance.isfahan" = "مدخل المترو";
+
+"type.railway.subway_entrance.istanbul" = "مدخل المترو";
+
+"type.railway.subway_entrance.izmir" = "مدخل المترو";
+
+"type.railway.subway_entrance.kazan" = "مدخل المترو";
+
+"type.railway.subway_entrance.kharkiv" = "مدخل المترو";
+
+"type.railway.subway_entrance.kiev" = "مدخل المترو";
+
+"type.railway.subway_entrance.kobe" = "مدخل المترو";
+
+"type.railway.subway_entrance.kolkata" = "مدخل المترو";
+
+"type.railway.subway_entrance.kunming" = "مدخل المترو";
+
+"type.railway.subway_entrance.kyoto" = "مدخل المترو";
+
+"type.railway.subway_entrance.la" = "مدخل المترو";
+
+"type.railway.subway_entrance.lausanne" = "مدخل المترو";
+
+"type.railway.subway_entrance.lille" = "مدخل المترو";
+
+"type.railway.subway_entrance.lima" = "مدخل المترو";
+
+"type.railway.subway_entrance.lisboa" = "مدخل المترو";
+
+"type.railway.subway_entrance.lisbon" = "مدخل المترو";
+
+"type.railway.subway_entrance.london" = "مدخل المترو";
+
+"type.railway.subway_entrance.lyon" = "مدخل المترو";
+
+"type.railway.subway_entrance.madrid" = "مدخل المترو";
+
+"type.railway.subway_entrance.malaga" = "مدخل المترو";
+
+"type.railway.subway_entrance.manila" = "مدخل المترو";
+
+"type.railway.subway_entrance.maracaibo" = "مدخل المترو";
+
+"type.railway.subway_entrance.mashhad" = "مدخل المترو";
+
+"type.railway.subway_entrance.mecca" = "مدخل المترو";
+
+"type.railway.subway_entrance.medellin" = "مدخل المترو";
+
+"type.railway.subway_entrance.mexico" = "مدخل المترو";
+
+"type.railway.subway_entrance.milan" = "مدخل المترو";
+
+"type.railway.subway_entrance.minsk" = "مدخل المترو";
+
+"type.railway.subway_entrance.montreal" = "مدخل المترو";
+
+"type.railway.subway_entrance.moscow" = "مدخل المترو";
+
+"type.railway.subway_entrance.munchen" = "مدخل المترو";
+
+"type.railway.subway_entrance.nagoya" = "مدخل المترو";
+
+"type.railway.subway_entrance.newyork" = "مدخل المترو";
+
+"type.railway.subway_entrance.nnov" = "مدخل المترو";
+
+"type.railway.subway_entrance.novosibirsk" = "مدخل المترو";
+
+"type.railway.subway_entrance.osaka" = "مدخل المترو";
+
+"type.railway.subway_entrance.oslo" = "مدخل المترو";
+
+"type.railway.subway_entrance.palma" = "مدخل المترو";
+
+"type.railway.subway_entrance.panama" = "مدخل المترو";
+
+"type.railway.subway_entrance.paris" = "مدخل المترو";
+
+"type.railway.subway_entrance.philadelphia" = "مدخل المترو";
+
+"type.railway.subway_entrance.pyongyang" = "مدخل المترو";
+
+"type.railway.subway_entrance.rennes" = "مدخل المترو";
+
+"type.railway.subway_entrance.rio" = "مدخل المترو";
+
+"type.railway.subway_entrance.roma" = "مدخل المترو";
+
+"type.railway.subway_entrance.rotterdam" = "مدخل المترو";
+
+"type.railway.subway_entrance.samara" = "مدخل المترو";
+
+"type.railway.subway_entrance.santiago" = "مدخل المترو";
+
+"type.railway.subway_entrance.santo_domingo" = "مدخل المترو";
+
+"type.railway.subway_entrance.saopaulo" = "مدخل المترو";
+
+"type.railway.subway_entrance.sapporo" = "مدخل المترو";
+
+"type.railway.subway_entrance.sendai" = "مدخل المترو";
+
+"type.railway.subway_entrance.sf" = "مدخل المترو";
+
+"type.railway.subway_entrance.shanghai" = "مدخل المترو";
+
+"type.railway.subway_entrance.shiraz" = "مدخل المترو";
+
+"type.railway.subway_entrance.sofia" = "مدخل المترو";
+
+"type.railway.subway_entrance.spb" = "مدخل المترو";
+
+"type.railway.subway_entrance.stockholm" = "مدخل المترو";
+
+"type.railway.subway_entrance.tabriz" = "مدخل المترو";
+
+"type.railway.subway_entrance.taipei" = "مدخل المترو";
+
+"type.railway.subway_entrance.taoyuan" = "مدخل المترو";
+
+"type.railway.subway_entrance.tashkent" = "مدخل المترو";
+
+"type.railway.subway_entrance.tbilisi" = "مدخل المترو";
+
+"type.railway.subway_entrance.tianjin" = "مدخل المترو";
+
+"type.railway.subway_entrance.tokyo" = "مدخل المترو";
+
+"type.railway.subway_entrance.valencia" = "مدخل المترو";
+
+"type.railway.subway_entrance.vienna" = "مدخل المترو";
+
+"type.railway.subway_entrance.warszawa" = "مدخل المترو";
+
+"type.railway.subway_entrance.washington" = "مدخل المترو";
+
+"type.railway.subway_entrance.wuhan" = "مدخل المترو";
+
+"type.railway.subway_entrance.yerevan" = "مدخل المترو";
+
+"type.railway.subway_entrance.yokohama" = "مدخل المترو";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index d1403ba24b..cc61be3887 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Subway Entrance";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Subway Entrance";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Subway Entrance";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Subway Entrance";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Subway Entrance";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Subway Entrance";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Subway Entrance";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Subway Entrance";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Subway Entrance";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Subway Entrance";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Subway Entrance";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Subway Entrance";
+
+"type.railway.subway_entrance.berlin" = "Subway Entrance";
+
+"type.railway.subway_entrance.brasilia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brescia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brussels" = "Subway Entrance";
+
+"type.railway.subway_entrance.bucharest" = "Subway Entrance";
+
+"type.railway.subway_entrance.budapest" = "Subway Entrance";
+
+"type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
+
+"type.railway.subway_entrance.bursa" = "Subway Entrance";
+
+"type.railway.subway_entrance.cairo" = "Subway Entrance";
+
+"type.railway.subway_entrance.caracas" = "Subway Entrance";
+
+"type.railway.subway_entrance.catania" = "Subway Entrance";
+
+"type.railway.subway_entrance.changchun" = "Subway Entrance";
+
+"type.railway.subway_entrance.chengdu" = "Subway Entrance";
+
+"type.railway.subway_entrance.chicago" = "Subway Entrance";
+
+"type.railway.subway_entrance.chongqing" = "Subway Entrance";
+
+"type.railway.subway_entrance.dalian" = "Subway Entrance";
+
+"type.railway.subway_entrance.delhi" = "Subway Entrance";
+
+"type.railway.subway_entrance.dnepro" = "Subway Entrance";
+
+"type.railway.subway_entrance.dubai" = "Subway Entrance";
+
+"type.railway.subway_entrance.ekb" = "Subway Entrance";
+
+"type.railway.subway_entrance.fukuoka" = "Subway Entrance";
+
+"type.railway.subway_entrance.glasgow" = "Subway Entrance";
+
+"type.railway.subway_entrance.guangzhou" = "Subway Entrance";
+
+"type.railway.subway_entrance.hamburg" = "Subway Entrance";
+
+"type.railway.subway_entrance.helsinki" = "Subway Entrance";
+
+"type.railway.subway_entrance.hiroshima" = "Subway Entrance";
+
+"type.railway.subway_entrance.isfahan" = "Subway Entrance";
+
+"type.railway.subway_entrance.istanbul" = "Subway Entrance";
+
+"type.railway.subway_entrance.izmir" = "Subway Entrance";
+
+"type.railway.subway_entrance.kazan" = "Subway Entrance";
+
+"type.railway.subway_entrance.kharkiv" = "Subway Entrance";
+
+"type.railway.subway_entrance.kiev" = "Subway Entrance";
+
+"type.railway.subway_entrance.kobe" = "Subway Entrance";
+
+"type.railway.subway_entrance.kolkata" = "Subway Entrance";
+
+"type.railway.subway_entrance.kunming" = "Subway Entrance";
+
+"type.railway.subway_entrance.kyoto" = "Subway Entrance";
+
+"type.railway.subway_entrance.la" = "Subway Entrance";
+
+"type.railway.subway_entrance.lausanne" = "Subway Entrance";
+
+"type.railway.subway_entrance.lille" = "Subway Entrance";
+
+"type.railway.subway_entrance.lima" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisboa" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisbon" = "Subway Entrance";
+
+"type.railway.subway_entrance.london" = "Subway Entrance";
+
+"type.railway.subway_entrance.lyon" = "Subway Entrance";
+
+"type.railway.subway_entrance.madrid" = "Subway Entrance";
+
+"type.railway.subway_entrance.malaga" = "Subway Entrance";
+
+"type.railway.subway_entrance.manila" = "Subway Entrance";
+
+"type.railway.subway_entrance.maracaibo" = "Subway Entrance";
+
+"type.railway.subway_entrance.mashhad" = "Subway Entrance";
+
+"type.railway.subway_entrance.mecca" = "Subway Entrance";
+
+"type.railway.subway_entrance.medellin" = "Subway Entrance";
+
+"type.railway.subway_entrance.mexico" = "Subway Entrance";
+
+"type.railway.subway_entrance.milan" = "Subway Entrance";
+
+"type.railway.subway_entrance.minsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.montreal" = "Subway Entrance";
+
+"type.railway.subway_entrance.moscow" = "Subway Entrance";
+
+"type.railway.subway_entrance.munchen" = "Subway Entrance";
+
+"type.railway.subway_entrance.nagoya" = "Subway Entrance";
+
+"type.railway.subway_entrance.newyork" = "Subway Entrance";
+
+"type.railway.subway_entrance.nnov" = "Subway Entrance";
+
+"type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.osaka" = "Subway Entrance";
+
+"type.railway.subway_entrance.oslo" = "Subway Entrance";
+
+"type.railway.subway_entrance.palma" = "Subway Entrance";
+
+"type.railway.subway_entrance.panama" = "Subway Entrance";
+
+"type.railway.subway_entrance.paris" = "Subway Entrance";
+
+"type.railway.subway_entrance.philadelphia" = "Subway Entrance";
+
+"type.railway.subway_entrance.pyongyang" = "Subway Entrance";
+
+"type.railway.subway_entrance.rennes" = "Subway Entrance";
+
+"type.railway.subway_entrance.rio" = "Subway Entrance";
+
+"type.railway.subway_entrance.roma" = "Subway Entrance";
+
+"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
+
+"type.railway.subway_entrance.samara" = "Subway Entrance";
+
+"type.railway.subway_entrance.santiago" = "Subway Entrance";
+
+"type.railway.subway_entrance.santo_domingo" = "Subway Entrance";
+
+"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sapporo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sendai" = "Subway Entrance";
+
+"type.railway.subway_entrance.sf" = "Subway Entrance";
+
+"type.railway.subway_entrance.shanghai" = "Subway Entrance";
+
+"type.railway.subway_entrance.shiraz" = "Subway Entrance";
+
+"type.railway.subway_entrance.sofia" = "Subway Entrance";
+
+"type.railway.subway_entrance.spb" = "Subway Entrance";
+
+"type.railway.subway_entrance.stockholm" = "Subway Entrance";
+
+"type.railway.subway_entrance.tabriz" = "Subway Entrance";
+
+"type.railway.subway_entrance.taipei" = "Subway Entrance";
+
+"type.railway.subway_entrance.taoyuan" = "Subway Entrance";
+
+"type.railway.subway_entrance.tashkent" = "Subway Entrance";
+
+"type.railway.subway_entrance.tbilisi" = "Subway Entrance";
+
+"type.railway.subway_entrance.tianjin" = "Subway Entrance";
+
+"type.railway.subway_entrance.tokyo" = "Subway Entrance";
+
+"type.railway.subway_entrance.valencia" = "Subway Entrance";
+
+"type.railway.subway_entrance.vienna" = "Subway Entrance";
+
+"type.railway.subway_entrance.warszawa" = "Subway Entrance";
+
+"type.railway.subway_entrance.washington" = "Subway Entrance";
+
+"type.railway.subway_entrance.wuhan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yerevan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yokohama" = "Subway Entrance";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 3cb46ed5e1..4188b670c7 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Subway Entrance";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Subway Entrance";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Subway Entrance";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Subway Entrance";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Subway Entrance";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Subway Entrance";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Subway Entrance";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Subway Entrance";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Subway Entrance";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Subway Entrance";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Subway Entrance";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Subway Entrance";
+
+"type.railway.subway_entrance.berlin" = "Subway Entrance";
+
+"type.railway.subway_entrance.brasilia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brescia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brussels" = "Subway Entrance";
+
+"type.railway.subway_entrance.bucharest" = "Subway Entrance";
+
+"type.railway.subway_entrance.budapest" = "Subway Entrance";
+
+"type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
+
+"type.railway.subway_entrance.bursa" = "Subway Entrance";
+
+"type.railway.subway_entrance.cairo" = "Subway Entrance";
+
+"type.railway.subway_entrance.caracas" = "Subway Entrance";
+
+"type.railway.subway_entrance.catania" = "Subway Entrance";
+
+"type.railway.subway_entrance.changchun" = "Subway Entrance";
+
+"type.railway.subway_entrance.chengdu" = "Subway Entrance";
+
+"type.railway.subway_entrance.chicago" = "Subway Entrance";
+
+"type.railway.subway_entrance.chongqing" = "Subway Entrance";
+
+"type.railway.subway_entrance.dalian" = "Subway Entrance";
+
+"type.railway.subway_entrance.delhi" = "Subway Entrance";
+
+"type.railway.subway_entrance.dnepro" = "Subway Entrance";
+
+"type.railway.subway_entrance.dubai" = "Subway Entrance";
+
+"type.railway.subway_entrance.ekb" = "Subway Entrance";
+
+"type.railway.subway_entrance.fukuoka" = "Subway Entrance";
+
+"type.railway.subway_entrance.glasgow" = "Subway Entrance";
+
+"type.railway.subway_entrance.guangzhou" = "Subway Entrance";
+
+"type.railway.subway_entrance.hamburg" = "Subway Entrance";
+
+"type.railway.subway_entrance.helsinki" = "Subway Entrance";
+
+"type.railway.subway_entrance.hiroshima" = "Subway Entrance";
+
+"type.railway.subway_entrance.isfahan" = "Subway Entrance";
+
+"type.railway.subway_entrance.istanbul" = "Subway Entrance";
+
+"type.railway.subway_entrance.izmir" = "Subway Entrance";
+
+"type.railway.subway_entrance.kazan" = "Subway Entrance";
+
+"type.railway.subway_entrance.kharkiv" = "Subway Entrance";
+
+"type.railway.subway_entrance.kiev" = "Subway Entrance";
+
+"type.railway.subway_entrance.kobe" = "Subway Entrance";
+
+"type.railway.subway_entrance.kolkata" = "Subway Entrance";
+
+"type.railway.subway_entrance.kunming" = "Subway Entrance";
+
+"type.railway.subway_entrance.kyoto" = "Subway Entrance";
+
+"type.railway.subway_entrance.la" = "Subway Entrance";
+
+"type.railway.subway_entrance.lausanne" = "Subway Entrance";
+
+"type.railway.subway_entrance.lille" = "Subway Entrance";
+
+"type.railway.subway_entrance.lima" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisboa" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisbon" = "Subway Entrance";
+
+"type.railway.subway_entrance.london" = "Subway Entrance";
+
+"type.railway.subway_entrance.lyon" = "Subway Entrance";
+
+"type.railway.subway_entrance.madrid" = "Subway Entrance";
+
+"type.railway.subway_entrance.malaga" = "Subway Entrance";
+
+"type.railway.subway_entrance.manila" = "Subway Entrance";
+
+"type.railway.subway_entrance.maracaibo" = "Subway Entrance";
+
+"type.railway.subway_entrance.mashhad" = "Subway Entrance";
+
+"type.railway.subway_entrance.mecca" = "Subway Entrance";
+
+"type.railway.subway_entrance.medellin" = "Subway Entrance";
+
+"type.railway.subway_entrance.mexico" = "Subway Entrance";
+
+"type.railway.subway_entrance.milan" = "Subway Entrance";
+
+"type.railway.subway_entrance.minsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.montreal" = "Subway Entrance";
+
+"type.railway.subway_entrance.moscow" = "Subway Entrance";
+
+"type.railway.subway_entrance.munchen" = "Subway Entrance";
+
+"type.railway.subway_entrance.nagoya" = "Subway Entrance";
+
+"type.railway.subway_entrance.newyork" = "Subway Entrance";
+
+"type.railway.subway_entrance.nnov" = "Subway Entrance";
+
+"type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.osaka" = "Subway Entrance";
+
+"type.railway.subway_entrance.oslo" = "Subway Entrance";
+
+"type.railway.subway_entrance.palma" = "Subway Entrance";
+
+"type.railway.subway_entrance.panama" = "Subway Entrance";
+
+"type.railway.subway_entrance.paris" = "Subway Entrance";
+
+"type.railway.subway_entrance.philadelphia" = "Subway Entrance";
+
+"type.railway.subway_entrance.pyongyang" = "Subway Entrance";
+
+"type.railway.subway_entrance.rennes" = "Subway Entrance";
+
+"type.railway.subway_entrance.rio" = "Subway Entrance";
+
+"type.railway.subway_entrance.roma" = "Subway Entrance";
+
+"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
+
+"type.railway.subway_entrance.samara" = "Subway Entrance";
+
+"type.railway.subway_entrance.santiago" = "Subway Entrance";
+
+"type.railway.subway_entrance.santo_domingo" = "Subway Entrance";
+
+"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sapporo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sendai" = "Subway Entrance";
+
+"type.railway.subway_entrance.sf" = "Subway Entrance";
+
+"type.railway.subway_entrance.shanghai" = "Subway Entrance";
+
+"type.railway.subway_entrance.shiraz" = "Subway Entrance";
+
+"type.railway.subway_entrance.sofia" = "Subway Entrance";
+
+"type.railway.subway_entrance.spb" = "Subway Entrance";
+
+"type.railway.subway_entrance.stockholm" = "Subway Entrance";
+
+"type.railway.subway_entrance.tabriz" = "Subway Entrance";
+
+"type.railway.subway_entrance.taipei" = "Subway Entrance";
+
+"type.railway.subway_entrance.taoyuan" = "Subway Entrance";
+
+"type.railway.subway_entrance.tashkent" = "Subway Entrance";
+
+"type.railway.subway_entrance.tbilisi" = "Subway Entrance";
+
+"type.railway.subway_entrance.tianjin" = "Subway Entrance";
+
+"type.railway.subway_entrance.tokyo" = "Subway Entrance";
+
+"type.railway.subway_entrance.valencia" = "Subway Entrance";
+
+"type.railway.subway_entrance.vienna" = "Subway Entrance";
+
+"type.railway.subway_entrance.warszawa" = "Subway Entrance";
+
+"type.railway.subway_entrance.washington" = "Subway Entrance";
+
+"type.railway.subway_entrance.wuhan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yerevan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yokohama" = "Subway Entrance";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index c360b44da8..e0d8608db5 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Subway Entrance";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Subway Entrance";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Subway Entrance";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Subway Entrance";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Subway Entrance";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Subway Entrance";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Subway Entrance";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Subway Entrance";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Subway Entrance";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Subway Entrance";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Subway Entrance";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Subway Entrance";
+
+"type.railway.subway_entrance.berlin" = "Subway Entrance";
+
+"type.railway.subway_entrance.brasilia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brescia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brussels" = "Subway Entrance";
+
+"type.railway.subway_entrance.bucharest" = "Subway Entrance";
+
+"type.railway.subway_entrance.budapest" = "Subway Entrance";
+
+"type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
+
+"type.railway.subway_entrance.bursa" = "Subway Entrance";
+
+"type.railway.subway_entrance.cairo" = "Subway Entrance";
+
+"type.railway.subway_entrance.caracas" = "Subway Entrance";
+
+"type.railway.subway_entrance.catania" = "Subway Entrance";
+
+"type.railway.subway_entrance.changchun" = "Subway Entrance";
+
+"type.railway.subway_entrance.chengdu" = "Subway Entrance";
+
+"type.railway.subway_entrance.chicago" = "Subway Entrance";
+
+"type.railway.subway_entrance.chongqing" = "Subway Entrance";
+
+"type.railway.subway_entrance.dalian" = "Subway Entrance";
+
+"type.railway.subway_entrance.delhi" = "Subway Entrance";
+
+"type.railway.subway_entrance.dnepro" = "Subway Entrance";
+
+"type.railway.subway_entrance.dubai" = "Subway Entrance";
+
+"type.railway.subway_entrance.ekb" = "Subway Entrance";
+
+"type.railway.subway_entrance.fukuoka" = "Subway Entrance";
+
+"type.railway.subway_entrance.glasgow" = "Subway Entrance";
+
+"type.railway.subway_entrance.guangzhou" = "Subway Entrance";
+
+"type.railway.subway_entrance.hamburg" = "Subway Entrance";
+
+"type.railway.subway_entrance.helsinki" = "Subway Entrance";
+
+"type.railway.subway_entrance.hiroshima" = "Subway Entrance";
+
+"type.railway.subway_entrance.isfahan" = "Subway Entrance";
+
+"type.railway.subway_entrance.istanbul" = "Subway Entrance";
+
+"type.railway.subway_entrance.izmir" = "Subway Entrance";
+
+"type.railway.subway_entrance.kazan" = "Subway Entrance";
+
+"type.railway.subway_entrance.kharkiv" = "Subway Entrance";
+
+"type.railway.subway_entrance.kiev" = "Subway Entrance";
+
+"type.railway.subway_entrance.kobe" = "Subway Entrance";
+
+"type.railway.subway_entrance.kolkata" = "Subway Entrance";
+
+"type.railway.subway_entrance.kunming" = "Subway Entrance";
+
+"type.railway.subway_entrance.kyoto" = "Subway Entrance";
+
+"type.railway.subway_entrance.la" = "Subway Entrance";
+
+"type.railway.subway_entrance.lausanne" = "Subway Entrance";
+
+"type.railway.subway_entrance.lille" = "Subway Entrance";
+
+"type.railway.subway_entrance.lima" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisboa" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisbon" = "Subway Entrance";
+
+"type.railway.subway_entrance.london" = "Subway Entrance";
+
+"type.railway.subway_entrance.lyon" = "Subway Entrance";
+
+"type.railway.subway_entrance.madrid" = "Subway Entrance";
+
+"type.railway.subway_entrance.malaga" = "Subway Entrance";
+
+"type.railway.subway_entrance.manila" = "Subway Entrance";
+
+"type.railway.subway_entrance.maracaibo" = "Subway Entrance";
+
+"type.railway.subway_entrance.mashhad" = "Subway Entrance";
+
+"type.railway.subway_entrance.mecca" = "Subway Entrance";
+
+"type.railway.subway_entrance.medellin" = "Subway Entrance";
+
+"type.railway.subway_entrance.mexico" = "Subway Entrance";
+
+"type.railway.subway_entrance.milan" = "Subway Entrance";
+
+"type.railway.subway_entrance.minsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.montreal" = "Subway Entrance";
+
+"type.railway.subway_entrance.moscow" = "Subway Entrance";
+
+"type.railway.subway_entrance.munchen" = "Subway Entrance";
+
+"type.railway.subway_entrance.nagoya" = "Subway Entrance";
+
+"type.railway.subway_entrance.newyork" = "Subway Entrance";
+
+"type.railway.subway_entrance.nnov" = "Subway Entrance";
+
+"type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.osaka" = "Subway Entrance";
+
+"type.railway.subway_entrance.oslo" = "Subway Entrance";
+
+"type.railway.subway_entrance.palma" = "Subway Entrance";
+
+"type.railway.subway_entrance.panama" = "Subway Entrance";
+
+"type.railway.subway_entrance.paris" = "Subway Entrance";
+
+"type.railway.subway_entrance.philadelphia" = "Subway Entrance";
+
+"type.railway.subway_entrance.pyongyang" = "Subway Entrance";
+
+"type.railway.subway_entrance.rennes" = "Subway Entrance";
+
+"type.railway.subway_entrance.rio" = "Subway Entrance";
+
+"type.railway.subway_entrance.roma" = "Subway Entrance";
+
+"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
+
+"type.railway.subway_entrance.samara" = "Subway Entrance";
+
+"type.railway.subway_entrance.santiago" = "Subway Entrance";
+
+"type.railway.subway_entrance.santo_domingo" = "Subway Entrance";
+
+"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sapporo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sendai" = "Subway Entrance";
+
+"type.railway.subway_entrance.sf" = "Subway Entrance";
+
+"type.railway.subway_entrance.shanghai" = "Subway Entrance";
+
+"type.railway.subway_entrance.shiraz" = "Subway Entrance";
+
+"type.railway.subway_entrance.sofia" = "Subway Entrance";
+
+"type.railway.subway_entrance.spb" = "Subway Entrance";
+
+"type.railway.subway_entrance.stockholm" = "Subway Entrance";
+
+"type.railway.subway_entrance.tabriz" = "Subway Entrance";
+
+"type.railway.subway_entrance.taipei" = "Subway Entrance";
+
+"type.railway.subway_entrance.taoyuan" = "Subway Entrance";
+
+"type.railway.subway_entrance.tashkent" = "Subway Entrance";
+
+"type.railway.subway_entrance.tbilisi" = "Subway Entrance";
+
+"type.railway.subway_entrance.tianjin" = "Subway Entrance";
+
+"type.railway.subway_entrance.tokyo" = "Subway Entrance";
+
+"type.railway.subway_entrance.valencia" = "Subway Entrance";
+
+"type.railway.subway_entrance.vienna" = "Subway Entrance";
+
+"type.railway.subway_entrance.warszawa" = "Subway Entrance";
+
+"type.railway.subway_entrance.washington" = "Subway Entrance";
+
+"type.railway.subway_entrance.wuhan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yerevan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yokohama" = "Subway Entrance";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index f1bd33d716..8cd8769fbe 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Vchod do podchodu";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.berlin" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.brasilia" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.brescia" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.brussels" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.bucharest" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.budapest" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.buenos_aires" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.bursa" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.cairo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.caracas" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.catania" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.changchun" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.chengdu" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.chicago" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.chongqing" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.dalian" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.delhi" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.dnepro" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.dubai" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.ekb" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.fukuoka" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.glasgow" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.guangzhou" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.hamburg" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.helsinki" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.hiroshima" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.isfahan" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.istanbul" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.izmir" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kazan" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kharkiv" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kiev" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kobe" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kolkata" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kunming" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.kyoto" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.la" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.lausanne" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.lille" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.lima" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.lisboa" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.lisbon" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.london" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.lyon" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.madrid" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.malaga" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.manila" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.maracaibo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.mashhad" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.mecca" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.medellin" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.mexico" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.milan" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.minsk" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.montreal" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.moscow" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.munchen" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.nagoya" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.newyork" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.nnov" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.novosibirsk" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.osaka" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.oslo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.palma" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.panama" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.paris" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.philadelphia" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.pyongyang" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.rennes" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.rio" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.roma" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.rotterdam" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.samara" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.santiago" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.santo_domingo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.saopaulo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.sapporo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.sendai" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.sf" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.shanghai" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.shiraz" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.sofia" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.spb" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.stockholm" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.tabriz" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.taipei" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.taoyuan" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.tashkent" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.tbilisi" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.tianjin" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.tokyo" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.valencia" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.vienna" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.warszawa" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.washington" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.wuhan" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.yerevan" = "Vchod do podchodu";
+
+"type.railway.subway_entrance.yokohama" = "Vchod do podchodu";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 34ccf3fb82..538308f173 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Indgang til undergrundsbane";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.berlin" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.brasilia" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.brescia" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.brussels" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.bucharest" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.budapest" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.buenos_aires" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.bursa" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.cairo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.caracas" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.catania" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.changchun" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.chengdu" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.chicago" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.chongqing" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.dalian" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.delhi" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.dnepro" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.dubai" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.ekb" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.fukuoka" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.glasgow" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.guangzhou" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.hamburg" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.helsinki" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.hiroshima" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.isfahan" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.istanbul" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.izmir" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kazan" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kharkiv" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kiev" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kobe" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kolkata" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kunming" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.kyoto" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.la" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.lausanne" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.lille" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.lima" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.lisboa" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.lisbon" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.london" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.lyon" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.madrid" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.malaga" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.manila" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.maracaibo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.mashhad" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.mecca" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.medellin" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.mexico" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.milan" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.minsk" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.montreal" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.moscow" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.munchen" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.nagoya" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.newyork" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.nnov" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.novosibirsk" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.osaka" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.oslo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.palma" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.panama" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.paris" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.philadelphia" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.pyongyang" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.rennes" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.rio" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.roma" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.rotterdam" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.samara" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.santiago" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.santo_domingo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.saopaulo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.sapporo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.sendai" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.sf" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.shanghai" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.shiraz" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.sofia" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.spb" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.stockholm" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.tabriz" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.taipei" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.taoyuan" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.tashkent" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.tbilisi" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.tianjin" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.tokyo" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.valencia" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.vienna" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.warszawa" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.washington" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.wuhan" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.yerevan" = "Indgang til undergrundsbane";
+
+"type.railway.subway_entrance.yokohama" = "Indgang til undergrundsbane";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 617aedaf95..dcecd68f70 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "U-Bahnstation";
 
+"type.railway.station.subway.adana" = "U-Bahnstation";
+
+"type.railway.station.subway.algiers" = "U-Bahnstation";
+
+"type.railway.station.subway.almaty" = "U-Bahnstation";
+
+"type.railway.station.subway.amsterdam" = "U-Bahnstation";
+
+"type.railway.station.subway.ankara" = "U-Bahnstation";
+
+"type.railway.station.subway.athens" = "U-Bahnstation";
+
+"type.railway.station.subway.baku" = "U-Bahnstation";
+
+"type.railway.station.subway.bangkok" = "U-Bahnstation";
+
 "type.railway.station.subway.barcelona" = "U-Bahnstation";
 
+"type.railway.station.subway.beijing" = "U-Bahnstation";
+
+"type.railway.station.subway.bengalore" = "U-Bahnstation";
+
 "type.railway.station.subway.berlin" = "U-Bahnstation";
 
+"type.railway.station.subway.brasilia" = "U-Bahnstation";
+
+"type.railway.station.subway.brescia" = "U-Bahnstation";
+
+"type.railway.station.subway.brussels" = "U-Bahnstation";
+
+"type.railway.station.subway.bucharest" = "U-Bahnstation";
+
+"type.railway.station.subway.budapest" = "U-Bahnstation";
+
+"type.railway.station.subway.buenos_aires" = "U-Bahnstation";
+
+"type.railway.station.subway.bursa" = "U-Bahnstation";
+
+"type.railway.station.subway.cairo" = "U-Bahnstation";
+
+"type.railway.station.subway.caracas" = "U-Bahnstation";
+
+"type.railway.station.subway.catania" = "U-Bahnstation";
+
+"type.railway.station.subway.changchun" = "U-Bahnstation";
+
+"type.railway.station.subway.chengdu" = "U-Bahnstation";
+
+"type.railway.station.subway.chicago" = "U-Bahnstation";
+
+"type.railway.station.subway.chongqing" = "U-Bahnstation";
+
+"type.railway.station.subway.dalian" = "U-Bahnstation";
+
+"type.railway.station.subway.delhi" = "U-Bahnstation";
+
+"type.railway.station.subway.dnepro" = "U-Bahnstation";
+
+"type.railway.station.subway.dubai" = "U-Bahnstation";
+
+"type.railway.station.subway.ekb" = "U-Bahnstation";
+
+"type.railway.station.subway.fukuoka" = "U-Bahnstation";
+
+"type.railway.station.subway.glasgow" = "U-Bahnstation";
+
+"type.railway.station.subway.guangzhou" = "U-Bahnstation";
+
+"type.railway.station.subway.hamburg" = "U-Bahnstation";
+
+"type.railway.station.subway.helsinki" = "U-Bahnstation";
+
+"type.railway.station.subway.hiroshima" = "U-Bahnstation";
+
+"type.railway.station.subway.isfahan" = "U-Bahnstation";
+
+"type.railway.station.subway.istanbul" = "U-Bahnstation";
+
+"type.railway.station.subway.izmir" = "U-Bahnstation";
+
+"type.railway.station.subway.kazan" = "U-Bahnstation";
+
+"type.railway.station.subway.kharkiv" = "U-Bahnstation";
+
 "type.railway.station.subway.kiev" = "U-Bahnstation";
 
+"type.railway.station.subway.kobe" = "U-Bahnstation";
+
+"type.railway.station.subway.kolkata" = "U-Bahnstation";
+
+"type.railway.station.subway.kunming" = "U-Bahnstation";
+
+"type.railway.station.subway.kyoto" = "U-Bahnstation";
+
+"type.railway.station.subway.la" = "U-Bahnstation";
+
+"type.railway.station.subway.lausanne" = "U-Bahnstation";
+
+"type.railway.station.subway.lille" = "U-Bahnstation";
+
+"type.railway.station.subway.lima" = "U-Bahnstation";
+
+"type.railway.station.subway.lisboa" = "U-Bahnstation";
+
+"type.railway.station.subway.lisbon" = "U-Bahnstation";
+
 "type.railway.station.subway.london" = "U-Bahnstation";
 
+"type.railway.station.subway.lyon" = "U-Bahnstation";
+
 "type.railway.station.subway.madrid" = "U-Bahnstation";
 
+"type.railway.station.subway.malaga" = "U-Bahnstation";
+
+"type.railway.station.subway.manila" = "U-Bahnstation";
+
+"type.railway.station.subway.maracaibo" = "U-Bahnstation";
+
+"type.railway.station.subway.mashhad" = "U-Bahnstation";
+
+"type.railway.station.subway.mecca" = "U-Bahnstation";
+
+"type.railway.station.subway.medellin" = "U-Bahnstation";
+
+"type.railway.station.subway.mexico" = "U-Bahnstation";
+
+"type.railway.station.subway.milan" = "U-Bahnstation";
+
 "type.railway.station.subway.minsk" = "U-Bahnstation";
 
+"type.railway.station.subway.montreal" = "U-Bahnstation";
+
 "type.railway.station.subway.moscow" = "U-Bahnstation";
 
+"type.railway.station.subway.munchen" = "U-Bahnstation";
+
+"type.railway.station.subway.nagoya" = "U-Bahnstation";
+
 "type.railway.station.subway.newyork" = "U-Bahnstation";
 
+"type.railway.station.subway.nnov" = "U-Bahnstation";
+
+"type.railway.station.subway.novosibirsk" = "U-Bahnstation";
+
+"type.railway.station.subway.osaka" = "U-Bahnstation";
+
+"type.railway.station.subway.oslo" = "U-Bahnstation";
+
+"type.railway.station.subway.palma" = "U-Bahnstation";
+
+"type.railway.station.subway.panama" = "U-Bahnstation";
+
 "type.railway.station.subway.paris" = "U-Bahnstation";
 
+"type.railway.station.subway.philadelphia" = "U-Bahnstation";
+
+"type.railway.station.subway.pyongyang" = "U-Bahnstation";
+
+"type.railway.station.subway.rennes" = "U-Bahnstation";
+
+"type.railway.station.subway.rio" = "U-Bahnstation";
+
 "type.railway.station.subway.roma" = "U-Bahnstation";
 
+"type.railway.station.subway.rotterdam" = "U-Bahnstation";
+
+"type.railway.station.subway.samara" = "U-Bahnstation";
+
+"type.railway.station.subway.santiago" = "U-Bahnstation";
+
+"type.railway.station.subway.santo_domingo" = "U-Bahnstation";
+
+"type.railway.station.subway.saopaulo" = "U-Bahnstation";
+
+"type.railway.station.subway.sapporo" = "U-Bahnstation";
+
+"type.railway.station.subway.sendai" = "U-Bahnstation";
+
+"type.railway.station.subway.sf" = "U-Bahnstation";
+
+"type.railway.station.subway.shanghai" = "U-Bahnstation";
+
+"type.railway.station.subway.shiraz" = "U-Bahnstation";
+
+"type.railway.station.subway.sofia" = "U-Bahnstation";
+
 "type.railway.station.subway.spb" = "U-Bahnstation";
 
+"type.railway.station.subway.stockholm" = "U-Bahnstation";
+
+"type.railway.station.subway.tabriz" = "U-Bahnstation";
+
+"type.railway.station.subway.taipei" = "U-Bahnstation";
+
+"type.railway.station.subway.taoyuan" = "U-Bahnstation";
+
+"type.railway.station.subway.tashkent" = "U-Bahnstation";
+
+"type.railway.station.subway.tbilisi" = "U-Bahnstation";
+
+"type.railway.station.subway.tianjin" = "U-Bahnstation";
+
+"type.railway.station.subway.tokyo" = "U-Bahnstation";
+
+"type.railway.station.subway.valencia" = "U-Bahnstation";
+
+"type.railway.station.subway.vienna" = "U-Bahnstation";
+
+"type.railway.station.subway.warszawa" = "U-Bahnstation";
+
+"type.railway.station.subway.washington" = "U-Bahnstation";
+
+"type.railway.station.subway.wuhan" = "U-Bahnstation";
+
+"type.railway.station.subway.yerevan" = "U-Bahnstation";
+
+"type.railway.station.subway.yokohama" = "U-Bahnstation";
+
 "type.railway.subway" = "U-Bahn";
 
 "type.railway.subway.bridge" = "U-Bahn-Brücke";
@@ -2719,28 +2915,224 @@
 
 "type.railway.subway_entrance" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.adana" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.algiers" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.almaty" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.amsterdam" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.ankara" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.athens" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.baku" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.bangkok" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.barcelona" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.beijing" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.bengalore" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.berlin" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.brasilia" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.brescia" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.brussels" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.bucharest" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.budapest" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.buenos_aires" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.bursa" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.cairo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.caracas" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.catania" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.changchun" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.chengdu" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.chicago" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.chongqing" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.dalian" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.delhi" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.dnepro" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.dubai" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.ekb" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.fukuoka" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.glasgow" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.guangzhou" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.hamburg" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.helsinki" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.hiroshima" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.isfahan" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.istanbul" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.izmir" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.kazan" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.kharkiv" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.kiev" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.kobe" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.kolkata" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.kunming" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.kyoto" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.la" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.lausanne" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.lille" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.lima" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.lisboa" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.lisbon" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.london" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.lyon" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.madrid" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.malaga" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.manila" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.maracaibo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.mashhad" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.mecca" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.medellin" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.mexico" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.milan" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.minsk" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.montreal" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.moscow" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.munchen" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.nagoya" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.newyork" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.nnov" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.novosibirsk" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.osaka" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.oslo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.palma" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.panama" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.paris" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.philadelphia" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.pyongyang" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.rennes" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.rio" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.roma" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.rotterdam" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.samara" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.santiago" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.santo_domingo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.saopaulo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.sapporo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.sendai" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.sf" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.shanghai" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.shiraz" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.sofia" = "U-Bahn-Eingang";
+
 "type.railway.subway_entrance.spb" = "U-Bahn-Eingang";
 
+"type.railway.subway_entrance.stockholm" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.tabriz" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.taipei" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.taoyuan" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.tashkent" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.tbilisi" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.tianjin" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.tokyo" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.valencia" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.vienna" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.warszawa" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.washington" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.wuhan" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.yerevan" = "U-Bahn-Eingang";
+
+"type.railway.subway_entrance.yokohama" = "U-Bahn-Eingang";
+
 "type.railway.tram" = "Straßenbahn";
 
 "type.railway.tram.bridge" = "Straßenbahnbrücke";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 4c51f732f7..50cef8be58 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Μετρό";
 
+"type.railway.station.subway.adana" = "Μετρό";
+
+"type.railway.station.subway.algiers" = "Μετρό";
+
+"type.railway.station.subway.almaty" = "Μετρό";
+
+"type.railway.station.subway.amsterdam" = "Μετρό";
+
+"type.railway.station.subway.ankara" = "Μετρό";
+
+"type.railway.station.subway.athens" = "Μετρό";
+
+"type.railway.station.subway.baku" = "Μετρό";
+
+"type.railway.station.subway.bangkok" = "Μετρό";
+
 "type.railway.station.subway.barcelona" = "Μετρό";
 
+"type.railway.station.subway.beijing" = "Μετρό";
+
+"type.railway.station.subway.bengalore" = "Μετρό";
+
 "type.railway.station.subway.berlin" = "Μετρό";
 
+"type.railway.station.subway.brasilia" = "Μετρό";
+
+"type.railway.station.subway.brescia" = "Μετρό";
+
+"type.railway.station.subway.brussels" = "Μετρό";
+
+"type.railway.station.subway.bucharest" = "Μετρό";
+
+"type.railway.station.subway.budapest" = "Μετρό";
+
+"type.railway.station.subway.buenos_aires" = "Μετρό";
+
+"type.railway.station.subway.bursa" = "Μετρό";
+
+"type.railway.station.subway.cairo" = "Μετρό";
+
+"type.railway.station.subway.caracas" = "Μετρό";
+
+"type.railway.station.subway.catania" = "Μετρό";
+
+"type.railway.station.subway.changchun" = "Μετρό";
+
+"type.railway.station.subway.chengdu" = "Μετρό";
+
+"type.railway.station.subway.chicago" = "Μετρό";
+
+"type.railway.station.subway.chongqing" = "Μετρό";
+
+"type.railway.station.subway.dalian" = "Μετρό";
+
+"type.railway.station.subway.delhi" = "Μετρό";
+
+"type.railway.station.subway.dnepro" = "Μετρό";
+
+"type.railway.station.subway.dubai" = "Μετρό";
+
+"type.railway.station.subway.ekb" = "Μετρό";
+
+"type.railway.station.subway.fukuoka" = "Μετρό";
+
+"type.railway.station.subway.glasgow" = "Μετρό";
+
+"type.railway.station.subway.guangzhou" = "Μετρό";
+
+"type.railway.station.subway.hamburg" = "Μετρό";
+
+"type.railway.station.subway.helsinki" = "Μετρό";
+
+"type.railway.station.subway.hiroshima" = "Μετρό";
+
+"type.railway.station.subway.isfahan" = "Μετρό";
+
+"type.railway.station.subway.istanbul" = "Μετρό";
+
+"type.railway.station.subway.izmir" = "Μετρό";
+
+"type.railway.station.subway.kazan" = "Μετρό";
+
+"type.railway.station.subway.kharkiv" = "Μετρό";
+
 "type.railway.station.subway.kiev" = "Μετρό";
 
+"type.railway.station.subway.kobe" = "Μετρό";
+
+"type.railway.station.subway.kolkata" = "Μετρό";
+
+"type.railway.station.subway.kunming" = "Μετρό";
+
+"type.railway.station.subway.kyoto" = "Μετρό";
+
+"type.railway.station.subway.la" = "Μετρό";
+
+"type.railway.station.subway.lausanne" = "Μετρό";
+
+"type.railway.station.subway.lille" = "Μετρό";
+
+"type.railway.station.subway.lima" = "Μετρό";
+
+"type.railway.station.subway.lisboa" = "Μετρό";
+
+"type.railway.station.subway.lisbon" = "Μετρό";
+
 "type.railway.station.subway.london" = "Μετρό";
 
+"type.railway.station.subway.lyon" = "Μετρό";
+
 "type.railway.station.subway.madrid" = "Μετρό";
 
+"type.railway.station.subway.malaga" = "Μετρό";
+
+"type.railway.station.subway.manila" = "Μετρό";
+
+"type.railway.station.subway.maracaibo" = "Μετρό";
+
+"type.railway.station.subway.mashhad" = "Μετρό";
+
+"type.railway.station.subway.mecca" = "Μετρό";
+
+"type.railway.station.subway.medellin" = "Μετρό";
+
+"type.railway.station.subway.mexico" = "Μετρό";
+
+"type.railway.station.subway.milan" = "Μετρό";
+
 "type.railway.station.subway.minsk" = "Μετρό";
 
+"type.railway.station.subway.montreal" = "Μετρό";
+
 "type.railway.station.subway.moscow" = "Μετρό";
 
+"type.railway.station.subway.munchen" = "Μετρό";
+
+"type.railway.station.subway.nagoya" = "Μετρό";
+
 "type.railway.station.subway.newyork" = "Μετρό";
 
+"type.railway.station.subway.nnov" = "Μετρό";
+
+"type.railway.station.subway.novosibirsk" = "Μετρό";
+
+"type.railway.station.subway.osaka" = "Μετρό";
+
+"type.railway.station.subway.oslo" = "Μετρό";
+
+"type.railway.station.subway.palma" = "Μετρό";
+
+"type.railway.station.subway.panama" = "Μετρό";
+
 "type.railway.station.subway.paris" = "Μετρό";
 
+"type.railway.station.subway.philadelphia" = "Μετρό";
+
+"type.railway.station.subway.pyongyang" = "Μετρό";
+
+"type.railway.station.subway.rennes" = "Μετρό";
+
+"type.railway.station.subway.rio" = "Μετρό";
+
 "type.railway.station.subway.roma" = "Μετρό";
 
+"type.railway.station.subway.rotterdam" = "Μετρό";
+
+"type.railway.station.subway.samara" = "Μετρό";
+
+"type.railway.station.subway.santiago" = "Μετρό";
+
+"type.railway.station.subway.santo_domingo" = "Μετρό";
+
+"type.railway.station.subway.saopaulo" = "Μετρό";
+
+"type.railway.station.subway.sapporo" = "Μετρό";
+
+"type.railway.station.subway.sendai" = "Μετρό";
+
+"type.railway.station.subway.sf" = "Μετρό";
+
+"type.railway.station.subway.shanghai" = "Μετρό";
+
+"type.railway.station.subway.shiraz" = "Μετρό";
+
+"type.railway.station.subway.sofia" = "Μετρό";
+
 "type.railway.station.subway.spb" = "Μετρό";
 
+"type.railway.station.subway.stockholm" = "Μετρό";
+
+"type.railway.station.subway.tabriz" = "Μετρό";
+
+"type.railway.station.subway.taipei" = "Μετρό";
+
+"type.railway.station.subway.taoyuan" = "Μετρό";
+
+"type.railway.station.subway.tashkent" = "Μετρό";
+
+"type.railway.station.subway.tbilisi" = "Μετρό";
+
+"type.railway.station.subway.tianjin" = "Μετρό";
+
+"type.railway.station.subway.tokyo" = "Μετρό";
+
+"type.railway.station.subway.valencia" = "Μετρό";
+
+"type.railway.station.subway.vienna" = "Μετρό";
+
+"type.railway.station.subway.warszawa" = "Μετρό";
+
+"type.railway.station.subway.washington" = "Μετρό";
+
+"type.railway.station.subway.wuhan" = "Μετρό";
+
+"type.railway.station.subway.yerevan" = "Μετρό";
+
+"type.railway.station.subway.yokohama" = "Μετρό";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.barcelona" = "Μετρό";
+"type.railway.subway_entrance.adana" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.berlin" = "Μετρό";
+"type.railway.subway_entrance.algiers" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.kiev" = "Μετρό";
+"type.railway.subway_entrance.almaty" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.london" = "Μετρό";
+"type.railway.subway_entrance.amsterdam" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.madrid" = "Μετρό";
+"type.railway.subway_entrance.ankara" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.minsk" = "Μετρό";
+"type.railway.subway_entrance.athens" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.moscow" = "Μετρό";
+"type.railway.subway_entrance.baku" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.newyork" = "Μετρό";
+"type.railway.subway_entrance.bangkok" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.paris" = "Μετρό";
+"type.railway.subway_entrance.barcelona" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.roma" = "Μετρό";
+"type.railway.subway_entrance.beijing" = "Είσοδος μετρό";
 
-"type.railway.subway_entrance.spb" = "Μετρό";
+"type.railway.subway_entrance.bengalore" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.berlin" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.brasilia" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.brescia" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.brussels" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.bucharest" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.budapest" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.buenos_aires" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.bursa" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.cairo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.caracas" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.catania" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.changchun" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.chengdu" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.chicago" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.chongqing" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.dalian" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.delhi" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.dnepro" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.dubai" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.ekb" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.fukuoka" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.glasgow" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.guangzhou" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.hamburg" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.helsinki" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.hiroshima" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.isfahan" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.istanbul" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.izmir" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kazan" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kharkiv" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kiev" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kobe" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kolkata" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kunming" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.kyoto" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.la" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.lausanne" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.lille" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.lima" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.lisboa" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.lisbon" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.london" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.lyon" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.madrid" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.malaga" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.manila" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.maracaibo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.mashhad" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.mecca" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.medellin" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.mexico" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.milan" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.minsk" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.montreal" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.moscow" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.munchen" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.nagoya" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.newyork" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.nnov" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.novosibirsk" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.osaka" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.oslo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.palma" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.panama" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.paris" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.philadelphia" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.pyongyang" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.rennes" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.rio" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.roma" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.rotterdam" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.samara" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.santiago" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.santo_domingo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.saopaulo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.sapporo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.sendai" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.sf" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.shanghai" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.shiraz" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.sofia" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.spb" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.stockholm" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.tabriz" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.taipei" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.taoyuan" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.tashkent" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.tbilisi" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.tianjin" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.tokyo" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.valencia" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.vienna" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.warszawa" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.washington" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.wuhan" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.yerevan" = "Είσοδος μετρό";
+
+"type.railway.subway_entrance.yokohama" = "Είσοδος μετρό";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 97fa1fcc27..919b06ed72 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Subway Entrance";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Subway Entrance";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Subway Entrance";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Subway Entrance";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Subway Entrance";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Subway Entrance";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Subway Entrance";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Subway Entrance";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Subway Entrance";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Subway Entrance";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Subway Entrance";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Subway Entrance";
+
+"type.railway.subway_entrance.berlin" = "Subway Entrance";
+
+"type.railway.subway_entrance.brasilia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brescia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brussels" = "Subway Entrance";
+
+"type.railway.subway_entrance.bucharest" = "Subway Entrance";
+
+"type.railway.subway_entrance.budapest" = "Subway Entrance";
+
+"type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
+
+"type.railway.subway_entrance.bursa" = "Subway Entrance";
+
+"type.railway.subway_entrance.cairo" = "Subway Entrance";
+
+"type.railway.subway_entrance.caracas" = "Subway Entrance";
+
+"type.railway.subway_entrance.catania" = "Subway Entrance";
+
+"type.railway.subway_entrance.changchun" = "Subway Entrance";
+
+"type.railway.subway_entrance.chengdu" = "Subway Entrance";
+
+"type.railway.subway_entrance.chicago" = "Subway Entrance";
+
+"type.railway.subway_entrance.chongqing" = "Subway Entrance";
+
+"type.railway.subway_entrance.dalian" = "Subway Entrance";
+
+"type.railway.subway_entrance.delhi" = "Subway Entrance";
+
+"type.railway.subway_entrance.dnepro" = "Subway Entrance";
+
+"type.railway.subway_entrance.dubai" = "Subway Entrance";
+
+"type.railway.subway_entrance.ekb" = "Subway Entrance";
+
+"type.railway.subway_entrance.fukuoka" = "Subway Entrance";
+
+"type.railway.subway_entrance.glasgow" = "Subway Entrance";
+
+"type.railway.subway_entrance.guangzhou" = "Subway Entrance";
+
+"type.railway.subway_entrance.hamburg" = "Subway Entrance";
+
+"type.railway.subway_entrance.helsinki" = "Subway Entrance";
+
+"type.railway.subway_entrance.hiroshima" = "Subway Entrance";
+
+"type.railway.subway_entrance.isfahan" = "Subway Entrance";
+
+"type.railway.subway_entrance.istanbul" = "Subway Entrance";
+
+"type.railway.subway_entrance.izmir" = "Subway Entrance";
+
+"type.railway.subway_entrance.kazan" = "Subway Entrance";
+
+"type.railway.subway_entrance.kharkiv" = "Subway Entrance";
+
+"type.railway.subway_entrance.kiev" = "Subway Entrance";
+
+"type.railway.subway_entrance.kobe" = "Subway Entrance";
+
+"type.railway.subway_entrance.kolkata" = "Subway Entrance";
+
+"type.railway.subway_entrance.kunming" = "Subway Entrance";
+
+"type.railway.subway_entrance.kyoto" = "Subway Entrance";
+
+"type.railway.subway_entrance.la" = "Subway Entrance";
+
+"type.railway.subway_entrance.lausanne" = "Subway Entrance";
+
+"type.railway.subway_entrance.lille" = "Subway Entrance";
+
+"type.railway.subway_entrance.lima" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisboa" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisbon" = "Subway Entrance";
+
+"type.railway.subway_entrance.london" = "Subway Entrance";
+
+"type.railway.subway_entrance.lyon" = "Subway Entrance";
+
+"type.railway.subway_entrance.madrid" = "Subway Entrance";
+
+"type.railway.subway_entrance.malaga" = "Subway Entrance";
+
+"type.railway.subway_entrance.manila" = "Subway Entrance";
+
+"type.railway.subway_entrance.maracaibo" = "Subway Entrance";
+
+"type.railway.subway_entrance.mashhad" = "Subway Entrance";
+
+"type.railway.subway_entrance.mecca" = "Subway Entrance";
+
+"type.railway.subway_entrance.medellin" = "Subway Entrance";
+
+"type.railway.subway_entrance.mexico" = "Subway Entrance";
+
+"type.railway.subway_entrance.milan" = "Subway Entrance";
+
+"type.railway.subway_entrance.minsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.montreal" = "Subway Entrance";
+
+"type.railway.subway_entrance.moscow" = "Subway Entrance";
+
+"type.railway.subway_entrance.munchen" = "Subway Entrance";
+
+"type.railway.subway_entrance.nagoya" = "Subway Entrance";
+
+"type.railway.subway_entrance.newyork" = "Subway Entrance";
+
+"type.railway.subway_entrance.nnov" = "Subway Entrance";
+
+"type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.osaka" = "Subway Entrance";
+
+"type.railway.subway_entrance.oslo" = "Subway Entrance";
+
+"type.railway.subway_entrance.palma" = "Subway Entrance";
+
+"type.railway.subway_entrance.panama" = "Subway Entrance";
+
+"type.railway.subway_entrance.paris" = "Subway Entrance";
+
+"type.railway.subway_entrance.philadelphia" = "Subway Entrance";
+
+"type.railway.subway_entrance.pyongyang" = "Subway Entrance";
+
+"type.railway.subway_entrance.rennes" = "Subway Entrance";
+
+"type.railway.subway_entrance.rio" = "Subway Entrance";
+
+"type.railway.subway_entrance.roma" = "Subway Entrance";
+
+"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
+
+"type.railway.subway_entrance.samara" = "Subway Entrance";
+
+"type.railway.subway_entrance.santiago" = "Subway Entrance";
+
+"type.railway.subway_entrance.santo_domingo" = "Subway Entrance";
+
+"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sapporo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sendai" = "Subway Entrance";
+
+"type.railway.subway_entrance.sf" = "Subway Entrance";
+
+"type.railway.subway_entrance.shanghai" = "Subway Entrance";
+
+"type.railway.subway_entrance.shiraz" = "Subway Entrance";
+
+"type.railway.subway_entrance.sofia" = "Subway Entrance";
+
+"type.railway.subway_entrance.spb" = "Subway Entrance";
+
+"type.railway.subway_entrance.stockholm" = "Subway Entrance";
+
+"type.railway.subway_entrance.tabriz" = "Subway Entrance";
+
+"type.railway.subway_entrance.taipei" = "Subway Entrance";
+
+"type.railway.subway_entrance.taoyuan" = "Subway Entrance";
+
+"type.railway.subway_entrance.tashkent" = "Subway Entrance";
+
+"type.railway.subway_entrance.tbilisi" = "Subway Entrance";
+
+"type.railway.subway_entrance.tianjin" = "Subway Entrance";
+
+"type.railway.subway_entrance.tokyo" = "Subway Entrance";
+
+"type.railway.subway_entrance.valencia" = "Subway Entrance";
+
+"type.railway.subway_entrance.vienna" = "Subway Entrance";
+
+"type.railway.subway_entrance.warszawa" = "Subway Entrance";
+
+"type.railway.subway_entrance.washington" = "Subway Entrance";
+
+"type.railway.subway_entrance.wuhan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yerevan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yokohama" = "Subway Entrance";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 3c7fd84fba..f224ff2229 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Subway Entrance";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Subway Entrance";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Subway Entrance";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Subway Entrance";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Subway Entrance";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Subway Entrance";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Subway Entrance";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Subway Entrance";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Subway Entrance";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Subway Entrance";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Subway Entrance";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Subway Entrance";
+
+"type.railway.subway_entrance.berlin" = "Subway Entrance";
+
+"type.railway.subway_entrance.brasilia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brescia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brussels" = "Subway Entrance";
+
+"type.railway.subway_entrance.bucharest" = "Subway Entrance";
+
+"type.railway.subway_entrance.budapest" = "Subway Entrance";
+
+"type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
+
+"type.railway.subway_entrance.bursa" = "Subway Entrance";
+
+"type.railway.subway_entrance.cairo" = "Subway Entrance";
+
+"type.railway.subway_entrance.caracas" = "Subway Entrance";
+
+"type.railway.subway_entrance.catania" = "Subway Entrance";
+
+"type.railway.subway_entrance.changchun" = "Subway Entrance";
+
+"type.railway.subway_entrance.chengdu" = "Subway Entrance";
+
+"type.railway.subway_entrance.chicago" = "Subway Entrance";
+
+"type.railway.subway_entrance.chongqing" = "Subway Entrance";
+
+"type.railway.subway_entrance.dalian" = "Subway Entrance";
+
+"type.railway.subway_entrance.delhi" = "Subway Entrance";
+
+"type.railway.subway_entrance.dnepro" = "Subway Entrance";
+
+"type.railway.subway_entrance.dubai" = "Subway Entrance";
+
+"type.railway.subway_entrance.ekb" = "Subway Entrance";
+
+"type.railway.subway_entrance.fukuoka" = "Subway Entrance";
+
+"type.railway.subway_entrance.glasgow" = "Subway Entrance";
+
+"type.railway.subway_entrance.guangzhou" = "Subway Entrance";
+
+"type.railway.subway_entrance.hamburg" = "Subway Entrance";
+
+"type.railway.subway_entrance.helsinki" = "Subway Entrance";
+
+"type.railway.subway_entrance.hiroshima" = "Subway Entrance";
+
+"type.railway.subway_entrance.isfahan" = "Subway Entrance";
+
+"type.railway.subway_entrance.istanbul" = "Subway Entrance";
+
+"type.railway.subway_entrance.izmir" = "Subway Entrance";
+
+"type.railway.subway_entrance.kazan" = "Subway Entrance";
+
+"type.railway.subway_entrance.kharkiv" = "Subway Entrance";
+
+"type.railway.subway_entrance.kiev" = "Subway Entrance";
+
+"type.railway.subway_entrance.kobe" = "Subway Entrance";
+
+"type.railway.subway_entrance.kolkata" = "Subway Entrance";
+
+"type.railway.subway_entrance.kunming" = "Subway Entrance";
+
+"type.railway.subway_entrance.kyoto" = "Subway Entrance";
+
+"type.railway.subway_entrance.la" = "Subway Entrance";
+
+"type.railway.subway_entrance.lausanne" = "Subway Entrance";
+
+"type.railway.subway_entrance.lille" = "Subway Entrance";
+
+"type.railway.subway_entrance.lima" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisboa" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisbon" = "Subway Entrance";
+
+"type.railway.subway_entrance.london" = "Subway Entrance";
+
+"type.railway.subway_entrance.lyon" = "Subway Entrance";
+
+"type.railway.subway_entrance.madrid" = "Subway Entrance";
+
+"type.railway.subway_entrance.malaga" = "Subway Entrance";
+
+"type.railway.subway_entrance.manila" = "Subway Entrance";
+
+"type.railway.subway_entrance.maracaibo" = "Subway Entrance";
+
+"type.railway.subway_entrance.mashhad" = "Subway Entrance";
+
+"type.railway.subway_entrance.mecca" = "Subway Entrance";
+
+"type.railway.subway_entrance.medellin" = "Subway Entrance";
+
+"type.railway.subway_entrance.mexico" = "Subway Entrance";
+
+"type.railway.subway_entrance.milan" = "Subway Entrance";
+
+"type.railway.subway_entrance.minsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.montreal" = "Subway Entrance";
+
+"type.railway.subway_entrance.moscow" = "Subway Entrance";
+
+"type.railway.subway_entrance.munchen" = "Subway Entrance";
+
+"type.railway.subway_entrance.nagoya" = "Subway Entrance";
+
+"type.railway.subway_entrance.newyork" = "Subway Entrance";
+
+"type.railway.subway_entrance.nnov" = "Subway Entrance";
+
+"type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.osaka" = "Subway Entrance";
+
+"type.railway.subway_entrance.oslo" = "Subway Entrance";
+
+"type.railway.subway_entrance.palma" = "Subway Entrance";
+
+"type.railway.subway_entrance.panama" = "Subway Entrance";
+
+"type.railway.subway_entrance.paris" = "Subway Entrance";
+
+"type.railway.subway_entrance.philadelphia" = "Subway Entrance";
+
+"type.railway.subway_entrance.pyongyang" = "Subway Entrance";
+
+"type.railway.subway_entrance.rennes" = "Subway Entrance";
+
+"type.railway.subway_entrance.rio" = "Subway Entrance";
+
+"type.railway.subway_entrance.roma" = "Subway Entrance";
+
+"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
+
+"type.railway.subway_entrance.samara" = "Subway Entrance";
+
+"type.railway.subway_entrance.santiago" = "Subway Entrance";
+
+"type.railway.subway_entrance.santo_domingo" = "Subway Entrance";
+
+"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sapporo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sendai" = "Subway Entrance";
+
+"type.railway.subway_entrance.sf" = "Subway Entrance";
+
+"type.railway.subway_entrance.shanghai" = "Subway Entrance";
+
+"type.railway.subway_entrance.shiraz" = "Subway Entrance";
+
+"type.railway.subway_entrance.sofia" = "Subway Entrance";
+
+"type.railway.subway_entrance.spb" = "Subway Entrance";
+
+"type.railway.subway_entrance.stockholm" = "Subway Entrance";
+
+"type.railway.subway_entrance.tabriz" = "Subway Entrance";
+
+"type.railway.subway_entrance.taipei" = "Subway Entrance";
+
+"type.railway.subway_entrance.taoyuan" = "Subway Entrance";
+
+"type.railway.subway_entrance.tashkent" = "Subway Entrance";
+
+"type.railway.subway_entrance.tbilisi" = "Subway Entrance";
+
+"type.railway.subway_entrance.tianjin" = "Subway Entrance";
+
+"type.railway.subway_entrance.tokyo" = "Subway Entrance";
+
+"type.railway.subway_entrance.valencia" = "Subway Entrance";
+
+"type.railway.subway_entrance.vienna" = "Subway Entrance";
+
+"type.railway.subway_entrance.warszawa" = "Subway Entrance";
+
+"type.railway.subway_entrance.washington" = "Subway Entrance";
+
+"type.railway.subway_entrance.wuhan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yerevan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yokohama" = "Subway Entrance";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 0aeb987b83..fc371ad3e0 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Entrada de metro";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Entrada de metro";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Entrada de metro";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Entrada de metro";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Entrada de metro";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Entrada de metro";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Entrada de metro";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Entrada de metro";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Entrada de metro";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Entrada de metro";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Entrada de metro";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Entrada de metro";
+
+"type.railway.subway_entrance.berlin" = "Entrada de metro";
+
+"type.railway.subway_entrance.brasilia" = "Entrada de metro";
+
+"type.railway.subway_entrance.brescia" = "Entrada de metro";
+
+"type.railway.subway_entrance.brussels" = "Entrada de metro";
+
+"type.railway.subway_entrance.bucharest" = "Entrada de metro";
+
+"type.railway.subway_entrance.budapest" = "Entrada de metro";
+
+"type.railway.subway_entrance.buenos_aires" = "Entrada de metro";
+
+"type.railway.subway_entrance.bursa" = "Entrada de metro";
+
+"type.railway.subway_entrance.cairo" = "Entrada de metro";
+
+"type.railway.subway_entrance.caracas" = "Entrada de metro";
+
+"type.railway.subway_entrance.catania" = "Entrada de metro";
+
+"type.railway.subway_entrance.changchun" = "Entrada de metro";
+
+"type.railway.subway_entrance.chengdu" = "Entrada de metro";
+
+"type.railway.subway_entrance.chicago" = "Entrada de metro";
+
+"type.railway.subway_entrance.chongqing" = "Entrada de metro";
+
+"type.railway.subway_entrance.dalian" = "Entrada de metro";
+
+"type.railway.subway_entrance.delhi" = "Entrada de metro";
+
+"type.railway.subway_entrance.dnepro" = "Entrada de metro";
+
+"type.railway.subway_entrance.dubai" = "Entrada de metro";
+
+"type.railway.subway_entrance.ekb" = "Entrada de metro";
+
+"type.railway.subway_entrance.fukuoka" = "Entrada de metro";
+
+"type.railway.subway_entrance.glasgow" = "Entrada de metro";
+
+"type.railway.subway_entrance.guangzhou" = "Entrada de metro";
+
+"type.railway.subway_entrance.hamburg" = "Entrada de metro";
+
+"type.railway.subway_entrance.helsinki" = "Entrada de metro";
+
+"type.railway.subway_entrance.hiroshima" = "Entrada de metro";
+
+"type.railway.subway_entrance.isfahan" = "Entrada de metro";
+
+"type.railway.subway_entrance.istanbul" = "Entrada de metro";
+
+"type.railway.subway_entrance.izmir" = "Entrada de metro";
+
+"type.railway.subway_entrance.kazan" = "Entrada de metro";
+
+"type.railway.subway_entrance.kharkiv" = "Entrada de metro";
+
+"type.railway.subway_entrance.kiev" = "Entrada de metro";
+
+"type.railway.subway_entrance.kobe" = "Entrada de metro";
+
+"type.railway.subway_entrance.kolkata" = "Entrada de metro";
+
+"type.railway.subway_entrance.kunming" = "Entrada de metro";
+
+"type.railway.subway_entrance.kyoto" = "Entrada de metro";
+
+"type.railway.subway_entrance.la" = "Entrada de metro";
+
+"type.railway.subway_entrance.lausanne" = "Entrada de metro";
+
+"type.railway.subway_entrance.lille" = "Entrada de metro";
+
+"type.railway.subway_entrance.lima" = "Entrada de metro";
+
+"type.railway.subway_entrance.lisboa" = "Entrada de metro";
+
+"type.railway.subway_entrance.lisbon" = "Entrada de metro";
+
+"type.railway.subway_entrance.london" = "Entrada de metro";
+
+"type.railway.subway_entrance.lyon" = "Entrada de metro";
+
+"type.railway.subway_entrance.madrid" = "Entrada de metro";
+
+"type.railway.subway_entrance.malaga" = "Entrada de metro";
+
+"type.railway.subway_entrance.manila" = "Entrada de metro";
+
+"type.railway.subway_entrance.maracaibo" = "Entrada de metro";
+
+"type.railway.subway_entrance.mashhad" = "Entrada de metro";
+
+"type.railway.subway_entrance.mecca" = "Entrada de metro";
+
+"type.railway.subway_entrance.medellin" = "Entrada de metro";
+
+"type.railway.subway_entrance.mexico" = "Entrada de metro";
+
+"type.railway.subway_entrance.milan" = "Entrada de metro";
+
+"type.railway.subway_entrance.minsk" = "Entrada de metro";
+
+"type.railway.subway_entrance.montreal" = "Entrada de metro";
+
+"type.railway.subway_entrance.moscow" = "Entrada de metro";
+
+"type.railway.subway_entrance.munchen" = "Entrada de metro";
+
+"type.railway.subway_entrance.nagoya" = "Entrada de metro";
+
+"type.railway.subway_entrance.newyork" = "Entrada de metro";
+
+"type.railway.subway_entrance.nnov" = "Entrada de metro";
+
+"type.railway.subway_entrance.novosibirsk" = "Entrada de metro";
+
+"type.railway.subway_entrance.osaka" = "Entrada de metro";
+
+"type.railway.subway_entrance.oslo" = "Entrada de metro";
+
+"type.railway.subway_entrance.palma" = "Entrada de metro";
+
+"type.railway.subway_entrance.panama" = "Entrada de metro";
+
+"type.railway.subway_entrance.paris" = "Entrada de metro";
+
+"type.railway.subway_entrance.philadelphia" = "Entrada de metro";
+
+"type.railway.subway_entrance.pyongyang" = "Entrada de metro";
+
+"type.railway.subway_entrance.rennes" = "Entrada de metro";
+
+"type.railway.subway_entrance.rio" = "Entrada de metro";
+
+"type.railway.subway_entrance.roma" = "Entrada de metro";
+
+"type.railway.subway_entrance.rotterdam" = "Entrada de metro";
+
+"type.railway.subway_entrance.samara" = "Entrada de metro";
+
+"type.railway.subway_entrance.santiago" = "Entrada de metro";
+
+"type.railway.subway_entrance.santo_domingo" = "Entrada de metro";
+
+"type.railway.subway_entrance.saopaulo" = "Entrada de metro";
+
+"type.railway.subway_entrance.sapporo" = "Entrada de metro";
+
+"type.railway.subway_entrance.sendai" = "Entrada de metro";
+
+"type.railway.subway_entrance.sf" = "Entrada de metro";
+
+"type.railway.subway_entrance.shanghai" = "Entrada de metro";
+
+"type.railway.subway_entrance.shiraz" = "Entrada de metro";
+
+"type.railway.subway_entrance.sofia" = "Entrada de metro";
+
+"type.railway.subway_entrance.spb" = "Entrada de metro";
+
+"type.railway.subway_entrance.stockholm" = "Entrada de metro";
+
+"type.railway.subway_entrance.tabriz" = "Entrada de metro";
+
+"type.railway.subway_entrance.taipei" = "Entrada de metro";
+
+"type.railway.subway_entrance.taoyuan" = "Entrada de metro";
+
+"type.railway.subway_entrance.tashkent" = "Entrada de metro";
+
+"type.railway.subway_entrance.tbilisi" = "Entrada de metro";
+
+"type.railway.subway_entrance.tianjin" = "Entrada de metro";
+
+"type.railway.subway_entrance.tokyo" = "Entrada de metro";
+
+"type.railway.subway_entrance.valencia" = "Entrada de metro";
+
+"type.railway.subway_entrance.vienna" = "Entrada de metro";
+
+"type.railway.subway_entrance.warszawa" = "Entrada de metro";
+
+"type.railway.subway_entrance.washington" = "Entrada de metro";
+
+"type.railway.subway_entrance.wuhan" = "Entrada de metro";
+
+"type.railway.subway_entrance.yerevan" = "Entrada de metro";
+
+"type.railway.subway_entrance.yokohama" = "Entrada de metro";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index dcecdf8a4b..8ed7d1d09c 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Entrada al metro";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Entrada al metro";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Entrada al metro";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Entrada al metro";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Entrada al metro";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Entrada al metro";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Entrada al metro";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Entrada al metro";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Entrada al metro";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Entrada al metro";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Entrada al metro";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Entrada al metro";
+
+"type.railway.subway_entrance.berlin" = "Entrada al metro";
+
+"type.railway.subway_entrance.brasilia" = "Entrada al metro";
+
+"type.railway.subway_entrance.brescia" = "Entrada al metro";
+
+"type.railway.subway_entrance.brussels" = "Entrada al metro";
+
+"type.railway.subway_entrance.bucharest" = "Entrada al metro";
+
+"type.railway.subway_entrance.budapest" = "Entrada al metro";
+
+"type.railway.subway_entrance.buenos_aires" = "Entrada al metro";
+
+"type.railway.subway_entrance.bursa" = "Entrada al metro";
+
+"type.railway.subway_entrance.cairo" = "Entrada al metro";
+
+"type.railway.subway_entrance.caracas" = "Entrada al metro";
+
+"type.railway.subway_entrance.catania" = "Entrada al metro";
+
+"type.railway.subway_entrance.changchun" = "Entrada al metro";
+
+"type.railway.subway_entrance.chengdu" = "Entrada al metro";
+
+"type.railway.subway_entrance.chicago" = "Entrada al metro";
+
+"type.railway.subway_entrance.chongqing" = "Entrada al metro";
+
+"type.railway.subway_entrance.dalian" = "Entrada al metro";
+
+"type.railway.subway_entrance.delhi" = "Entrada al metro";
+
+"type.railway.subway_entrance.dnepro" = "Entrada al metro";
+
+"type.railway.subway_entrance.dubai" = "Entrada al metro";
+
+"type.railway.subway_entrance.ekb" = "Entrada al metro";
+
+"type.railway.subway_entrance.fukuoka" = "Entrada al metro";
+
+"type.railway.subway_entrance.glasgow" = "Entrada al metro";
+
+"type.railway.subway_entrance.guangzhou" = "Entrada al metro";
+
+"type.railway.subway_entrance.hamburg" = "Entrada al metro";
+
+"type.railway.subway_entrance.helsinki" = "Entrada al metro";
+
+"type.railway.subway_entrance.hiroshima" = "Entrada al metro";
+
+"type.railway.subway_entrance.isfahan" = "Entrada al metro";
+
+"type.railway.subway_entrance.istanbul" = "Entrada al metro";
+
+"type.railway.subway_entrance.izmir" = "Entrada al metro";
+
+"type.railway.subway_entrance.kazan" = "Entrada al metro";
+
+"type.railway.subway_entrance.kharkiv" = "Entrada al metro";
+
+"type.railway.subway_entrance.kiev" = "Entrada al metro";
+
+"type.railway.subway_entrance.kobe" = "Entrada al metro";
+
+"type.railway.subway_entrance.kolkata" = "Entrada al metro";
+
+"type.railway.subway_entrance.kunming" = "Entrada al metro";
+
+"type.railway.subway_entrance.kyoto" = "Entrada al metro";
+
+"type.railway.subway_entrance.la" = "Entrada al metro";
+
+"type.railway.subway_entrance.lausanne" = "Entrada al metro";
+
+"type.railway.subway_entrance.lille" = "Entrada al metro";
+
+"type.railway.subway_entrance.lima" = "Entrada al metro";
+
+"type.railway.subway_entrance.lisboa" = "Entrada al metro";
+
+"type.railway.subway_entrance.lisbon" = "Entrada al metro";
+
+"type.railway.subway_entrance.london" = "Entrada al metro";
+
+"type.railway.subway_entrance.lyon" = "Entrada al metro";
+
+"type.railway.subway_entrance.madrid" = "Entrada al metro";
+
+"type.railway.subway_entrance.malaga" = "Entrada al metro";
+
+"type.railway.subway_entrance.manila" = "Entrada al metro";
+
+"type.railway.subway_entrance.maracaibo" = "Entrada al metro";
+
+"type.railway.subway_entrance.mashhad" = "Entrada al metro";
+
+"type.railway.subway_entrance.mecca" = "Entrada al metro";
+
+"type.railway.subway_entrance.medellin" = "Entrada al metro";
+
+"type.railway.subway_entrance.mexico" = "Entrada al metro";
+
+"type.railway.subway_entrance.milan" = "Entrada al metro";
+
+"type.railway.subway_entrance.minsk" = "Entrada al metro";
+
+"type.railway.subway_entrance.montreal" = "Entrada al metro";
+
+"type.railway.subway_entrance.moscow" = "Entrada al metro";
+
+"type.railway.subway_entrance.munchen" = "Entrada al metro";
+
+"type.railway.subway_entrance.nagoya" = "Entrada al metro";
+
+"type.railway.subway_entrance.newyork" = "Entrada al metro";
+
+"type.railway.subway_entrance.nnov" = "Entrada al metro";
+
+"type.railway.subway_entrance.novosibirsk" = "Entrada al metro";
+
+"type.railway.subway_entrance.osaka" = "Entrada al metro";
+
+"type.railway.subway_entrance.oslo" = "Entrada al metro";
+
+"type.railway.subway_entrance.palma" = "Entrada al metro";
+
+"type.railway.subway_entrance.panama" = "Entrada al metro";
+
+"type.railway.subway_entrance.paris" = "Entrada al metro";
+
+"type.railway.subway_entrance.philadelphia" = "Entrada al metro";
+
+"type.railway.subway_entrance.pyongyang" = "Entrada al metro";
+
+"type.railway.subway_entrance.rennes" = "Entrada al metro";
+
+"type.railway.subway_entrance.rio" = "Entrada al metro";
+
+"type.railway.subway_entrance.roma" = "Entrada al metro";
+
+"type.railway.subway_entrance.rotterdam" = "Entrada al metro";
+
+"type.railway.subway_entrance.samara" = "Entrada al metro";
+
+"type.railway.subway_entrance.santiago" = "Entrada al metro";
+
+"type.railway.subway_entrance.santo_domingo" = "Entrada al metro";
+
+"type.railway.subway_entrance.saopaulo" = "Entrada al metro";
+
+"type.railway.subway_entrance.sapporo" = "Entrada al metro";
+
+"type.railway.subway_entrance.sendai" = "Entrada al metro";
+
+"type.railway.subway_entrance.sf" = "Entrada al metro";
+
+"type.railway.subway_entrance.shanghai" = "Entrada al metro";
+
+"type.railway.subway_entrance.shiraz" = "Entrada al metro";
+
+"type.railway.subway_entrance.sofia" = "Entrada al metro";
+
+"type.railway.subway_entrance.spb" = "Entrada al metro";
+
+"type.railway.subway_entrance.stockholm" = "Entrada al metro";
+
+"type.railway.subway_entrance.tabriz" = "Entrada al metro";
+
+"type.railway.subway_entrance.taipei" = "Entrada al metro";
+
+"type.railway.subway_entrance.taoyuan" = "Entrada al metro";
+
+"type.railway.subway_entrance.tashkent" = "Entrada al metro";
+
+"type.railway.subway_entrance.tbilisi" = "Entrada al metro";
+
+"type.railway.subway_entrance.tianjin" = "Entrada al metro";
+
+"type.railway.subway_entrance.tokyo" = "Entrada al metro";
+
+"type.railway.subway_entrance.valencia" = "Entrada al metro";
+
+"type.railway.subway_entrance.vienna" = "Entrada al metro";
+
+"type.railway.subway_entrance.warszawa" = "Entrada al metro";
+
+"type.railway.subway_entrance.washington" = "Entrada al metro";
+
+"type.railway.subway_entrance.wuhan" = "Entrada al metro";
+
+"type.railway.subway_entrance.yerevan" = "Entrada al metro";
+
+"type.railway.subway_entrance.yokohama" = "Entrada al metro";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index f8bd867a77..03bc949e4b 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metroa";
 
+"type.railway.station.subway.adana" = "Metroa";
+
+"type.railway.station.subway.algiers" = "Metroa";
+
+"type.railway.station.subway.almaty" = "Metroa";
+
+"type.railway.station.subway.amsterdam" = "Metroa";
+
+"type.railway.station.subway.ankara" = "Metroa";
+
+"type.railway.station.subway.athens" = "Metroa";
+
+"type.railway.station.subway.baku" = "Metroa";
+
+"type.railway.station.subway.bangkok" = "Metroa";
+
 "type.railway.station.subway.barcelona" = "Metroa";
 
+"type.railway.station.subway.beijing" = "Metroa";
+
+"type.railway.station.subway.bengalore" = "Metroa";
+
 "type.railway.station.subway.berlin" = "Metroa";
 
+"type.railway.station.subway.brasilia" = "Metroa";
+
+"type.railway.station.subway.brescia" = "Metroa";
+
+"type.railway.station.subway.brussels" = "Metroa";
+
+"type.railway.station.subway.bucharest" = "Metroa";
+
+"type.railway.station.subway.budapest" = "Metroa";
+
+"type.railway.station.subway.buenos_aires" = "Metroa";
+
+"type.railway.station.subway.bursa" = "Metroa";
+
+"type.railway.station.subway.cairo" = "Metroa";
+
+"type.railway.station.subway.caracas" = "Metroa";
+
+"type.railway.station.subway.catania" = "Metroa";
+
+"type.railway.station.subway.changchun" = "Metroa";
+
+"type.railway.station.subway.chengdu" = "Metroa";
+
+"type.railway.station.subway.chicago" = "Metroa";
+
+"type.railway.station.subway.chongqing" = "Metroa";
+
+"type.railway.station.subway.dalian" = "Metroa";
+
+"type.railway.station.subway.delhi" = "Metroa";
+
+"type.railway.station.subway.dnepro" = "Metroa";
+
+"type.railway.station.subway.dubai" = "Metroa";
+
+"type.railway.station.subway.ekb" = "Metroa";
+
+"type.railway.station.subway.fukuoka" = "Metroa";
+
+"type.railway.station.subway.glasgow" = "Metroa";
+
+"type.railway.station.subway.guangzhou" = "Metroa";
+
+"type.railway.station.subway.hamburg" = "Metroa";
+
+"type.railway.station.subway.helsinki" = "Metroa";
+
+"type.railway.station.subway.hiroshima" = "Metroa";
+
+"type.railway.station.subway.isfahan" = "Metroa";
+
+"type.railway.station.subway.istanbul" = "Metroa";
+
+"type.railway.station.subway.izmir" = "Metroa";
+
+"type.railway.station.subway.kazan" = "Metroa";
+
+"type.railway.station.subway.kharkiv" = "Metroa";
+
 "type.railway.station.subway.kiev" = "Metroa";
 
+"type.railway.station.subway.kobe" = "Metroa";
+
+"type.railway.station.subway.kolkata" = "Metroa";
+
+"type.railway.station.subway.kunming" = "Metroa";
+
+"type.railway.station.subway.kyoto" = "Metroa";
+
+"type.railway.station.subway.la" = "Metroa";
+
+"type.railway.station.subway.lausanne" = "Metroa";
+
+"type.railway.station.subway.lille" = "Metroa";
+
+"type.railway.station.subway.lima" = "Metroa";
+
+"type.railway.station.subway.lisboa" = "Metroa";
+
+"type.railway.station.subway.lisbon" = "Metroa";
+
 "type.railway.station.subway.london" = "Metroa";
 
+"type.railway.station.subway.lyon" = "Metroa";
+
 "type.railway.station.subway.madrid" = "Metroa";
 
+"type.railway.station.subway.malaga" = "Metroa";
+
+"type.railway.station.subway.manila" = "Metroa";
+
+"type.railway.station.subway.maracaibo" = "Metroa";
+
+"type.railway.station.subway.mashhad" = "Metroa";
+
+"type.railway.station.subway.mecca" = "Metroa";
+
+"type.railway.station.subway.medellin" = "Metroa";
+
+"type.railway.station.subway.mexico" = "Metroa";
+
+"type.railway.station.subway.milan" = "Metroa";
+
 "type.railway.station.subway.minsk" = "Metroa";
 
+"type.railway.station.subway.montreal" = "Metroa";
+
 "type.railway.station.subway.moscow" = "Metroa";
 
+"type.railway.station.subway.munchen" = "Metroa";
+
+"type.railway.station.subway.nagoya" = "Metroa";
+
 "type.railway.station.subway.newyork" = "Metroa";
 
+"type.railway.station.subway.nnov" = "Metroa";
+
+"type.railway.station.subway.novosibirsk" = "Metroa";
+
+"type.railway.station.subway.osaka" = "Metroa";
+
+"type.railway.station.subway.oslo" = "Metroa";
+
+"type.railway.station.subway.palma" = "Metroa";
+
+"type.railway.station.subway.panama" = "Metroa";
+
 "type.railway.station.subway.paris" = "Metroa";
 
+"type.railway.station.subway.philadelphia" = "Metroa";
+
+"type.railway.station.subway.pyongyang" = "Metroa";
+
+"type.railway.station.subway.rennes" = "Metroa";
+
+"type.railway.station.subway.rio" = "Metroa";
+
 "type.railway.station.subway.roma" = "Metroa";
 
+"type.railway.station.subway.rotterdam" = "Metroa";
+
+"type.railway.station.subway.samara" = "Metroa";
+
+"type.railway.station.subway.santiago" = "Metroa";
+
+"type.railway.station.subway.santo_domingo" = "Metroa";
+
+"type.railway.station.subway.saopaulo" = "Metroa";
+
+"type.railway.station.subway.sapporo" = "Metroa";
+
+"type.railway.station.subway.sendai" = "Metroa";
+
+"type.railway.station.subway.sf" = "Metroa";
+
+"type.railway.station.subway.shanghai" = "Metroa";
+
+"type.railway.station.subway.shiraz" = "Metroa";
+
+"type.railway.station.subway.sofia" = "Metroa";
+
 "type.railway.station.subway.spb" = "Metroa";
 
+"type.railway.station.subway.stockholm" = "Metroa";
+
+"type.railway.station.subway.tabriz" = "Metroa";
+
+"type.railway.station.subway.taipei" = "Metroa";
+
+"type.railway.station.subway.taoyuan" = "Metroa";
+
+"type.railway.station.subway.tashkent" = "Metroa";
+
+"type.railway.station.subway.tbilisi" = "Metroa";
+
+"type.railway.station.subway.tianjin" = "Metroa";
+
+"type.railway.station.subway.tokyo" = "Metroa";
+
+"type.railway.station.subway.valencia" = "Metroa";
+
+"type.railway.station.subway.vienna" = "Metroa";
+
+"type.railway.station.subway.warszawa" = "Metroa";
+
+"type.railway.station.subway.washington" = "Metroa";
+
+"type.railway.station.subway.wuhan" = "Metroa";
+
+"type.railway.station.subway.yerevan" = "Metroa";
+
+"type.railway.station.subway.yokohama" = "Metroa";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Metroko sarrera";
 
-"type.railway.subway_entrance.barcelona" = "Metroa";
+"type.railway.subway_entrance.adana" = "Metroko sarrera";
 
-"type.railway.subway_entrance.berlin" = "Metroa";
+"type.railway.subway_entrance.algiers" = "Metroko sarrera";
 
-"type.railway.subway_entrance.kiev" = "Metroa";
+"type.railway.subway_entrance.almaty" = "Metroko sarrera";
 
-"type.railway.subway_entrance.london" = "Metroa";
+"type.railway.subway_entrance.amsterdam" = "Metroko sarrera";
 
-"type.railway.subway_entrance.madrid" = "Metroa";
+"type.railway.subway_entrance.ankara" = "Metroko sarrera";
 
-"type.railway.subway_entrance.minsk" = "Metroa";
+"type.railway.subway_entrance.athens" = "Metroko sarrera";
 
-"type.railway.subway_entrance.moscow" = "Metroa";
+"type.railway.subway_entrance.baku" = "Metroko sarrera";
 
-"type.railway.subway_entrance.newyork" = "Metroa";
+"type.railway.subway_entrance.bangkok" = "Metroko sarrera";
 
-"type.railway.subway_entrance.paris" = "Metroa";
+"type.railway.subway_entrance.barcelona" = "Metroko sarrera";
 
-"type.railway.subway_entrance.roma" = "Metroa";
+"type.railway.subway_entrance.beijing" = "Metroko sarrera";
 
-"type.railway.subway_entrance.spb" = "Metroa";
+"type.railway.subway_entrance.bengalore" = "Metroko sarrera";
+
+"type.railway.subway_entrance.berlin" = "Metroko sarrera";
+
+"type.railway.subway_entrance.brasilia" = "Metroko sarrera";
+
+"type.railway.subway_entrance.brescia" = "Metroko sarrera";
+
+"type.railway.subway_entrance.brussels" = "Metroko sarrera";
+
+"type.railway.subway_entrance.bucharest" = "Metroko sarrera";
+
+"type.railway.subway_entrance.budapest" = "Metroko sarrera";
+
+"type.railway.subway_entrance.buenos_aires" = "Metroko sarrera";
+
+"type.railway.subway_entrance.bursa" = "Metroko sarrera";
+
+"type.railway.subway_entrance.cairo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.caracas" = "Metroko sarrera";
+
+"type.railway.subway_entrance.catania" = "Metroko sarrera";
+
+"type.railway.subway_entrance.changchun" = "Metroko sarrera";
+
+"type.railway.subway_entrance.chengdu" = "Metroko sarrera";
+
+"type.railway.subway_entrance.chicago" = "Metroko sarrera";
+
+"type.railway.subway_entrance.chongqing" = "Metroko sarrera";
+
+"type.railway.subway_entrance.dalian" = "Metroko sarrera";
+
+"type.railway.subway_entrance.delhi" = "Metroko sarrera";
+
+"type.railway.subway_entrance.dnepro" = "Metroko sarrera";
+
+"type.railway.subway_entrance.dubai" = "Metroko sarrera";
+
+"type.railway.subway_entrance.ekb" = "Metroko sarrera";
+
+"type.railway.subway_entrance.fukuoka" = "Metroko sarrera";
+
+"type.railway.subway_entrance.glasgow" = "Metroko sarrera";
+
+"type.railway.subway_entrance.guangzhou" = "Metroko sarrera";
+
+"type.railway.subway_entrance.hamburg" = "Metroko sarrera";
+
+"type.railway.subway_entrance.helsinki" = "Metroko sarrera";
+
+"type.railway.subway_entrance.hiroshima" = "Metroko sarrera";
+
+"type.railway.subway_entrance.isfahan" = "Metroko sarrera";
+
+"type.railway.subway_entrance.istanbul" = "Metroko sarrera";
+
+"type.railway.subway_entrance.izmir" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kazan" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kharkiv" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kiev" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kobe" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kolkata" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kunming" = "Metroko sarrera";
+
+"type.railway.subway_entrance.kyoto" = "Metroko sarrera";
+
+"type.railway.subway_entrance.la" = "Metroko sarrera";
+
+"type.railway.subway_entrance.lausanne" = "Metroko sarrera";
+
+"type.railway.subway_entrance.lille" = "Metroko sarrera";
+
+"type.railway.subway_entrance.lima" = "Metroko sarrera";
+
+"type.railway.subway_entrance.lisboa" = "Metroko sarrera";
+
+"type.railway.subway_entrance.lisbon" = "Metroko sarrera";
+
+"type.railway.subway_entrance.london" = "Metroko sarrera";
+
+"type.railway.subway_entrance.lyon" = "Metroko sarrera";
+
+"type.railway.subway_entrance.madrid" = "Metroko sarrera";
+
+"type.railway.subway_entrance.malaga" = "Metroko sarrera";
+
+"type.railway.subway_entrance.manila" = "Metroko sarrera";
+
+"type.railway.subway_entrance.maracaibo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.mashhad" = "Metroko sarrera";
+
+"type.railway.subway_entrance.mecca" = "Metroko sarrera";
+
+"type.railway.subway_entrance.medellin" = "Metroko sarrera";
+
+"type.railway.subway_entrance.mexico" = "Metroko sarrera";
+
+"type.railway.subway_entrance.milan" = "Metroko sarrera";
+
+"type.railway.subway_entrance.minsk" = "Metroko sarrera";
+
+"type.railway.subway_entrance.montreal" = "Metroko sarrera";
+
+"type.railway.subway_entrance.moscow" = "Metroko sarrera";
+
+"type.railway.subway_entrance.munchen" = "Metroko sarrera";
+
+"type.railway.subway_entrance.nagoya" = "Metroko sarrera";
+
+"type.railway.subway_entrance.newyork" = "Metroko sarrera";
+
+"type.railway.subway_entrance.nnov" = "Metroko sarrera";
+
+"type.railway.subway_entrance.novosibirsk" = "Metroko sarrera";
+
+"type.railway.subway_entrance.osaka" = "Metroko sarrera";
+
+"type.railway.subway_entrance.oslo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.palma" = "Metroko sarrera";
+
+"type.railway.subway_entrance.panama" = "Metroko sarrera";
+
+"type.railway.subway_entrance.paris" = "Metroko sarrera";
+
+"type.railway.subway_entrance.philadelphia" = "Metroko sarrera";
+
+"type.railway.subway_entrance.pyongyang" = "Metroko sarrera";
+
+"type.railway.subway_entrance.rennes" = "Metroko sarrera";
+
+"type.railway.subway_entrance.rio" = "Metroko sarrera";
+
+"type.railway.subway_entrance.roma" = "Metroko sarrera";
+
+"type.railway.subway_entrance.rotterdam" = "Metroko sarrera";
+
+"type.railway.subway_entrance.samara" = "Metroko sarrera";
+
+"type.railway.subway_entrance.santiago" = "Metroko sarrera";
+
+"type.railway.subway_entrance.santo_domingo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.saopaulo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.sapporo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.sendai" = "Metroko sarrera";
+
+"type.railway.subway_entrance.sf" = "Metroko sarrera";
+
+"type.railway.subway_entrance.shanghai" = "Metroko sarrera";
+
+"type.railway.subway_entrance.shiraz" = "Metroko sarrera";
+
+"type.railway.subway_entrance.sofia" = "Metroko sarrera";
+
+"type.railway.subway_entrance.spb" = "Metroko sarrera";
+
+"type.railway.subway_entrance.stockholm" = "Metroko sarrera";
+
+"type.railway.subway_entrance.tabriz" = "Metroko sarrera";
+
+"type.railway.subway_entrance.taipei" = "Metroko sarrera";
+
+"type.railway.subway_entrance.taoyuan" = "Metroko sarrera";
+
+"type.railway.subway_entrance.tashkent" = "Metroko sarrera";
+
+"type.railway.subway_entrance.tbilisi" = "Metroko sarrera";
+
+"type.railway.subway_entrance.tianjin" = "Metroko sarrera";
+
+"type.railway.subway_entrance.tokyo" = "Metroko sarrera";
+
+"type.railway.subway_entrance.valencia" = "Metroko sarrera";
+
+"type.railway.subway_entrance.vienna" = "Metroko sarrera";
+
+"type.railway.subway_entrance.warszawa" = "Metroko sarrera";
+
+"type.railway.subway_entrance.washington" = "Metroko sarrera";
+
+"type.railway.subway_entrance.wuhan" = "Metroko sarrera";
+
+"type.railway.subway_entrance.yerevan" = "Metroko sarrera";
+
+"type.railway.subway_entrance.yokohama" = "Metroko sarrera";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index dfff213adb..77bd794e6d 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "حمل و نقل";
 
+"type.railway.station.subway.adana" = "حمل و نقل";
+
+"type.railway.station.subway.algiers" = "حمل و نقل";
+
+"type.railway.station.subway.almaty" = "حمل و نقل";
+
+"type.railway.station.subway.amsterdam" = "حمل و نقل";
+
+"type.railway.station.subway.ankara" = "حمل و نقل";
+
+"type.railway.station.subway.athens" = "حمل و نقل";
+
+"type.railway.station.subway.baku" = "حمل و نقل";
+
+"type.railway.station.subway.bangkok" = "حمل و نقل";
+
 "type.railway.station.subway.barcelona" = "حمل و نقل";
 
+"type.railway.station.subway.beijing" = "حمل و نقل";
+
+"type.railway.station.subway.bengalore" = "حمل و نقل";
+
 "type.railway.station.subway.berlin" = "حمل و نقل";
 
+"type.railway.station.subway.brasilia" = "حمل و نقل";
+
+"type.railway.station.subway.brescia" = "حمل و نقل";
+
+"type.railway.station.subway.brussels" = "حمل و نقل";
+
+"type.railway.station.subway.bucharest" = "حمل و نقل";
+
+"type.railway.station.subway.budapest" = "حمل و نقل";
+
+"type.railway.station.subway.buenos_aires" = "حمل و نقل";
+
+"type.railway.station.subway.bursa" = "حمل و نقل";
+
+"type.railway.station.subway.cairo" = "حمل و نقل";
+
+"type.railway.station.subway.caracas" = "حمل و نقل";
+
+"type.railway.station.subway.catania" = "حمل و نقل";
+
+"type.railway.station.subway.changchun" = "حمل و نقل";
+
+"type.railway.station.subway.chengdu" = "حمل و نقل";
+
+"type.railway.station.subway.chicago" = "حمل و نقل";
+
+"type.railway.station.subway.chongqing" = "حمل و نقل";
+
+"type.railway.station.subway.dalian" = "حمل و نقل";
+
+"type.railway.station.subway.delhi" = "حمل و نقل";
+
+"type.railway.station.subway.dnepro" = "حمل و نقل";
+
+"type.railway.station.subway.dubai" = "حمل و نقل";
+
+"type.railway.station.subway.ekb" = "حمل و نقل";
+
+"type.railway.station.subway.fukuoka" = "حمل و نقل";
+
+"type.railway.station.subway.glasgow" = "حمل و نقل";
+
+"type.railway.station.subway.guangzhou" = "حمل و نقل";
+
+"type.railway.station.subway.hamburg" = "حمل و نقل";
+
+"type.railway.station.subway.helsinki" = "حمل و نقل";
+
+"type.railway.station.subway.hiroshima" = "حمل و نقل";
+
+"type.railway.station.subway.isfahan" = "حمل و نقل";
+
+"type.railway.station.subway.istanbul" = "حمل و نقل";
+
+"type.railway.station.subway.izmir" = "حمل و نقل";
+
+"type.railway.station.subway.kazan" = "حمل و نقل";
+
+"type.railway.station.subway.kharkiv" = "حمل و نقل";
+
 "type.railway.station.subway.kiev" = "حمل و نقل";
 
+"type.railway.station.subway.kobe" = "حمل و نقل";
+
+"type.railway.station.subway.kolkata" = "حمل و نقل";
+
+"type.railway.station.subway.kunming" = "حمل و نقل";
+
+"type.railway.station.subway.kyoto" = "حمل و نقل";
+
+"type.railway.station.subway.la" = "حمل و نقل";
+
+"type.railway.station.subway.lausanne" = "حمل و نقل";
+
+"type.railway.station.subway.lille" = "حمل و نقل";
+
+"type.railway.station.subway.lima" = "حمل و نقل";
+
+"type.railway.station.subway.lisboa" = "حمل و نقل";
+
+"type.railway.station.subway.lisbon" = "حمل و نقل";
+
 "type.railway.station.subway.london" = "حمل و نقل";
 
+"type.railway.station.subway.lyon" = "حمل و نقل";
+
 "type.railway.station.subway.madrid" = "حمل و نقل";
 
+"type.railway.station.subway.malaga" = "حمل و نقل";
+
+"type.railway.station.subway.manila" = "حمل و نقل";
+
+"type.railway.station.subway.maracaibo" = "حمل و نقل";
+
+"type.railway.station.subway.mashhad" = "حمل و نقل";
+
+"type.railway.station.subway.mecca" = "حمل و نقل";
+
+"type.railway.station.subway.medellin" = "حمل و نقل";
+
+"type.railway.station.subway.mexico" = "حمل و نقل";
+
+"type.railway.station.subway.milan" = "حمل و نقل";
+
 "type.railway.station.subway.minsk" = "حمل و نقل";
 
+"type.railway.station.subway.montreal" = "حمل و نقل";
+
 "type.railway.station.subway.moscow" = "حمل و نقل";
 
+"type.railway.station.subway.munchen" = "حمل و نقل";
+
+"type.railway.station.subway.nagoya" = "حمل و نقل";
+
 "type.railway.station.subway.newyork" = "حمل و نقل";
 
+"type.railway.station.subway.nnov" = "حمل و نقل";
+
+"type.railway.station.subway.novosibirsk" = "حمل و نقل";
+
+"type.railway.station.subway.osaka" = "حمل و نقل";
+
+"type.railway.station.subway.oslo" = "حمل و نقل";
+
+"type.railway.station.subway.palma" = "حمل و نقل";
+
+"type.railway.station.subway.panama" = "حمل و نقل";
+
 "type.railway.station.subway.paris" = "حمل و نقل";
 
+"type.railway.station.subway.philadelphia" = "حمل و نقل";
+
+"type.railway.station.subway.pyongyang" = "حمل و نقل";
+
+"type.railway.station.subway.rennes" = "حمل و نقل";
+
+"type.railway.station.subway.rio" = "حمل و نقل";
+
 "type.railway.station.subway.roma" = "حمل و نقل";
 
+"type.railway.station.subway.rotterdam" = "حمل و نقل";
+
+"type.railway.station.subway.samara" = "حمل و نقل";
+
+"type.railway.station.subway.santiago" = "حمل و نقل";
+
+"type.railway.station.subway.santo_domingo" = "حمل و نقل";
+
+"type.railway.station.subway.saopaulo" = "حمل و نقل";
+
+"type.railway.station.subway.sapporo" = "حمل و نقل";
+
+"type.railway.station.subway.sendai" = "حمل و نقل";
+
+"type.railway.station.subway.sf" = "حمل و نقل";
+
+"type.railway.station.subway.shanghai" = "حمل و نقل";
+
+"type.railway.station.subway.shiraz" = "حمل و نقل";
+
+"type.railway.station.subway.sofia" = "حمل و نقل";
+
 "type.railway.station.subway.spb" = "حمل و نقل";
 
+"type.railway.station.subway.stockholm" = "حمل و نقل";
+
+"type.railway.station.subway.tabriz" = "حمل و نقل";
+
+"type.railway.station.subway.taipei" = "حمل و نقل";
+
+"type.railway.station.subway.taoyuan" = "حمل و نقل";
+
+"type.railway.station.subway.tashkent" = "حمل و نقل";
+
+"type.railway.station.subway.tbilisi" = "حمل و نقل";
+
+"type.railway.station.subway.tianjin" = "حمل و نقل";
+
+"type.railway.station.subway.tokyo" = "حمل و نقل";
+
+"type.railway.station.subway.valencia" = "حمل و نقل";
+
+"type.railway.station.subway.vienna" = "حمل و نقل";
+
+"type.railway.station.subway.warszawa" = "حمل و نقل";
+
+"type.railway.station.subway.washington" = "حمل و نقل";
+
+"type.railway.station.subway.wuhan" = "حمل و نقل";
+
+"type.railway.station.subway.yerevan" = "حمل و نقل";
+
+"type.railway.station.subway.yokohama" = "حمل و نقل";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "ورودی مترو";
 
-"type.railway.subway_entrance.barcelona" = "حمل و نقل";
+"type.railway.subway_entrance.adana" = "ورودی مترو";
 
-"type.railway.subway_entrance.berlin" = "حمل و نقل";
+"type.railway.subway_entrance.algiers" = "ورودی مترو";
 
-"type.railway.subway_entrance.kiev" = "حمل و نقل";
+"type.railway.subway_entrance.almaty" = "ورودی مترو";
 
-"type.railway.subway_entrance.london" = "حمل و نقل";
+"type.railway.subway_entrance.amsterdam" = "ورودی مترو";
 
-"type.railway.subway_entrance.madrid" = "حمل و نقل";
+"type.railway.subway_entrance.ankara" = "ورودی مترو";
 
-"type.railway.subway_entrance.minsk" = "حمل و نقل";
+"type.railway.subway_entrance.athens" = "ورودی مترو";
 
-"type.railway.subway_entrance.moscow" = "حمل و نقل";
+"type.railway.subway_entrance.baku" = "ورودی مترو";
 
-"type.railway.subway_entrance.newyork" = "حمل و نقل";
+"type.railway.subway_entrance.bangkok" = "ورودی مترو";
 
-"type.railway.subway_entrance.paris" = "حمل و نقل";
+"type.railway.subway_entrance.barcelona" = "ورودی مترو";
 
-"type.railway.subway_entrance.roma" = "حمل و نقل";
+"type.railway.subway_entrance.beijing" = "ورودی مترو";
 
-"type.railway.subway_entrance.spb" = "حمل و نقل";
+"type.railway.subway_entrance.bengalore" = "ورودی مترو";
+
+"type.railway.subway_entrance.berlin" = "ورودی مترو";
+
+"type.railway.subway_entrance.brasilia" = "ورودی مترو";
+
+"type.railway.subway_entrance.brescia" = "ورودی مترو";
+
+"type.railway.subway_entrance.brussels" = "ورودی مترو";
+
+"type.railway.subway_entrance.bucharest" = "ورودی مترو";
+
+"type.railway.subway_entrance.budapest" = "ورودی مترو";
+
+"type.railway.subway_entrance.buenos_aires" = "ورودی مترو";
+
+"type.railway.subway_entrance.bursa" = "ورودی مترو";
+
+"type.railway.subway_entrance.cairo" = "ورودی مترو";
+
+"type.railway.subway_entrance.caracas" = "ورودی مترو";
+
+"type.railway.subway_entrance.catania" = "ورودی مترو";
+
+"type.railway.subway_entrance.changchun" = "ورودی مترو";
+
+"type.railway.subway_entrance.chengdu" = "ورودی مترو";
+
+"type.railway.subway_entrance.chicago" = "ورودی مترو";
+
+"type.railway.subway_entrance.chongqing" = "ورودی مترو";
+
+"type.railway.subway_entrance.dalian" = "ورودی مترو";
+
+"type.railway.subway_entrance.delhi" = "ورودی مترو";
+
+"type.railway.subway_entrance.dnepro" = "ورودی مترو";
+
+"type.railway.subway_entrance.dubai" = "ورودی مترو";
+
+"type.railway.subway_entrance.ekb" = "ورودی مترو";
+
+"type.railway.subway_entrance.fukuoka" = "ورودی مترو";
+
+"type.railway.subway_entrance.glasgow" = "ورودی مترو";
+
+"type.railway.subway_entrance.guangzhou" = "ورودی مترو";
+
+"type.railway.subway_entrance.hamburg" = "ورودی مترو";
+
+"type.railway.subway_entrance.helsinki" = "ورودی مترو";
+
+"type.railway.subway_entrance.hiroshima" = "ورودی مترو";
+
+"type.railway.subway_entrance.isfahan" = "ورودی مترو";
+
+"type.railway.subway_entrance.istanbul" = "ورودی مترو";
+
+"type.railway.subway_entrance.izmir" = "ورودی مترو";
+
+"type.railway.subway_entrance.kazan" = "ورودی مترو";
+
+"type.railway.subway_entrance.kharkiv" = "ورودی مترو";
+
+"type.railway.subway_entrance.kiev" = "ورودی مترو";
+
+"type.railway.subway_entrance.kobe" = "ورودی مترو";
+
+"type.railway.subway_entrance.kolkata" = "ورودی مترو";
+
+"type.railway.subway_entrance.kunming" = "ورودی مترو";
+
+"type.railway.subway_entrance.kyoto" = "ورودی مترو";
+
+"type.railway.subway_entrance.la" = "ورودی مترو";
+
+"type.railway.subway_entrance.lausanne" = "ورودی مترو";
+
+"type.railway.subway_entrance.lille" = "ورودی مترو";
+
+"type.railway.subway_entrance.lima" = "ورودی مترو";
+
+"type.railway.subway_entrance.lisboa" = "ورودی مترو";
+
+"type.railway.subway_entrance.lisbon" = "ورودی مترو";
+
+"type.railway.subway_entrance.london" = "ورودی مترو";
+
+"type.railway.subway_entrance.lyon" = "ورودی مترو";
+
+"type.railway.subway_entrance.madrid" = "ورودی مترو";
+
+"type.railway.subway_entrance.malaga" = "ورودی مترو";
+
+"type.railway.subway_entrance.manila" = "ورودی مترو";
+
+"type.railway.subway_entrance.maracaibo" = "ورودی مترو";
+
+"type.railway.subway_entrance.mashhad" = "ورودی مترو";
+
+"type.railway.subway_entrance.mecca" = "ورودی مترو";
+
+"type.railway.subway_entrance.medellin" = "ورودی مترو";
+
+"type.railway.subway_entrance.mexico" = "ورودی مترو";
+
+"type.railway.subway_entrance.milan" = "ورودی مترو";
+
+"type.railway.subway_entrance.minsk" = "ورودی مترو";
+
+"type.railway.subway_entrance.montreal" = "ورودی مترو";
+
+"type.railway.subway_entrance.moscow" = "ورودی مترو";
+
+"type.railway.subway_entrance.munchen" = "ورودی مترو";
+
+"type.railway.subway_entrance.nagoya" = "ورودی مترو";
+
+"type.railway.subway_entrance.newyork" = "ورودی مترو";
+
+"type.railway.subway_entrance.nnov" = "ورودی مترو";
+
+"type.railway.subway_entrance.novosibirsk" = "ورودی مترو";
+
+"type.railway.subway_entrance.osaka" = "ورودی مترو";
+
+"type.railway.subway_entrance.oslo" = "ورودی مترو";
+
+"type.railway.subway_entrance.palma" = "ورودی مترو";
+
+"type.railway.subway_entrance.panama" = "ورودی مترو";
+
+"type.railway.subway_entrance.paris" = "ورودی مترو";
+
+"type.railway.subway_entrance.philadelphia" = "ورودی مترو";
+
+"type.railway.subway_entrance.pyongyang" = "ورودی مترو";
+
+"type.railway.subway_entrance.rennes" = "ورودی مترو";
+
+"type.railway.subway_entrance.rio" = "ورودی مترو";
+
+"type.railway.subway_entrance.roma" = "ورودی مترو";
+
+"type.railway.subway_entrance.rotterdam" = "ورودی مترو";
+
+"type.railway.subway_entrance.samara" = "ورودی مترو";
+
+"type.railway.subway_entrance.santiago" = "ورودی مترو";
+
+"type.railway.subway_entrance.santo_domingo" = "ورودی مترو";
+
+"type.railway.subway_entrance.saopaulo" = "ورودی مترو";
+
+"type.railway.subway_entrance.sapporo" = "ورودی مترو";
+
+"type.railway.subway_entrance.sendai" = "ورودی مترو";
+
+"type.railway.subway_entrance.sf" = "ورودی مترو";
+
+"type.railway.subway_entrance.shanghai" = "ورودی مترو";
+
+"type.railway.subway_entrance.shiraz" = "ورودی مترو";
+
+"type.railway.subway_entrance.sofia" = "ورودی مترو";
+
+"type.railway.subway_entrance.spb" = "ورودی مترو";
+
+"type.railway.subway_entrance.stockholm" = "ورودی مترو";
+
+"type.railway.subway_entrance.tabriz" = "ورودی مترو";
+
+"type.railway.subway_entrance.taipei" = "ورودی مترو";
+
+"type.railway.subway_entrance.taoyuan" = "ورودی مترو";
+
+"type.railway.subway_entrance.tashkent" = "ورودی مترو";
+
+"type.railway.subway_entrance.tbilisi" = "ورودی مترو";
+
+"type.railway.subway_entrance.tianjin" = "ورودی مترو";
+
+"type.railway.subway_entrance.tokyo" = "ورودی مترو";
+
+"type.railway.subway_entrance.valencia" = "ورودی مترو";
+
+"type.railway.subway_entrance.vienna" = "ورودی مترو";
+
+"type.railway.subway_entrance.warszawa" = "ورودی مترو";
+
+"type.railway.subway_entrance.washington" = "ورودی مترو";
+
+"type.railway.subway_entrance.wuhan" = "ورودی مترو";
+
+"type.railway.subway_entrance.yerevan" = "ورودی مترو";
+
+"type.railway.subway_entrance.yokohama" = "ورودی مترو";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index d51bf34bfc..b18715b2fe 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Metron sisäänkäynti";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.berlin" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.brasilia" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.brescia" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.brussels" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.bucharest" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.budapest" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.buenos_aires" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.bursa" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.cairo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.caracas" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.catania" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.changchun" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.chengdu" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.chicago" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.chongqing" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.dalian" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.delhi" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.dnepro" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.dubai" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.ekb" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.fukuoka" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.glasgow" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.guangzhou" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.hamburg" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.helsinki" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.hiroshima" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.isfahan" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.istanbul" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.izmir" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kazan" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kharkiv" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kiev" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kobe" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kolkata" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kunming" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.kyoto" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.la" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.lausanne" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.lille" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.lima" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.lisboa" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.lisbon" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.london" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.lyon" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.madrid" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.malaga" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.manila" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.maracaibo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.mashhad" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.mecca" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.medellin" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.mexico" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.milan" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.minsk" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.montreal" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.moscow" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.munchen" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.nagoya" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.newyork" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.nnov" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.novosibirsk" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.osaka" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.oslo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.palma" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.panama" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.paris" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.philadelphia" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.pyongyang" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.rennes" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.rio" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.roma" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.rotterdam" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.samara" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.santiago" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.santo_domingo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.saopaulo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.sapporo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.sendai" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.sf" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.shanghai" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.shiraz" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.sofia" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.spb" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.stockholm" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.tabriz" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.taipei" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.taoyuan" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.tashkent" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.tbilisi" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.tianjin" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.tokyo" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.valencia" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.vienna" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.warszawa" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.washington" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.wuhan" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.yerevan" = "Metron sisäänkäynti";
+
+"type.railway.subway_entrance.yokohama" = "Metron sisäänkäynti";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 1ae1ccce61..eb308ece4d 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -2689,27 +2689,223 @@
 
 "type.railway.station.subway" = "Station de métro";
 
-"type.railway.station.subway.barcelona" = "Métro";
+"type.railway.station.subway.adana" = "Station de métro";
 
-"type.railway.station.subway.berlin" = "Métro";
+"type.railway.station.subway.algiers" = "Station de métro";
 
-"type.railway.station.subway.kiev" = "Métro";
+"type.railway.station.subway.almaty" = "Station de métro";
 
-"type.railway.station.subway.london" = "Métro";
+"type.railway.station.subway.amsterdam" = "Station de métro";
 
-"type.railway.station.subway.madrid" = "Métro";
+"type.railway.station.subway.ankara" = "Station de métro";
 
-"type.railway.station.subway.minsk" = "Métro";
+"type.railway.station.subway.athens" = "Station de métro";
 
-"type.railway.station.subway.moscow" = "Métro";
+"type.railway.station.subway.baku" = "Station de métro";
 
-"type.railway.station.subway.newyork" = "Métro";
+"type.railway.station.subway.bangkok" = "Station de métro";
+
+"type.railway.station.subway.barcelona" = "Station de métro";
+
+"type.railway.station.subway.beijing" = "Station de métro";
+
+"type.railway.station.subway.bengalore" = "Station de métro";
+
+"type.railway.station.subway.berlin" = "Station de métro";
+
+"type.railway.station.subway.brasilia" = "Station de métro";
+
+"type.railway.station.subway.brescia" = "Station de métro";
+
+"type.railway.station.subway.brussels" = "Station de métro";
+
+"type.railway.station.subway.bucharest" = "Station de métro";
+
+"type.railway.station.subway.budapest" = "Station de métro";
+
+"type.railway.station.subway.buenos_aires" = "Station de métro";
+
+"type.railway.station.subway.bursa" = "Station de métro";
+
+"type.railway.station.subway.cairo" = "Station de métro";
+
+"type.railway.station.subway.caracas" = "Station de métro";
+
+"type.railway.station.subway.catania" = "Station de métro";
+
+"type.railway.station.subway.changchun" = "Station de métro";
+
+"type.railway.station.subway.chengdu" = "Station de métro";
+
+"type.railway.station.subway.chicago" = "Station de métro";
+
+"type.railway.station.subway.chongqing" = "Station de métro";
+
+"type.railway.station.subway.dalian" = "Station de métro";
+
+"type.railway.station.subway.delhi" = "Station de métro";
+
+"type.railway.station.subway.dnepro" = "Station de métro";
+
+"type.railway.station.subway.dubai" = "Station de métro";
+
+"type.railway.station.subway.ekb" = "Station de métro";
+
+"type.railway.station.subway.fukuoka" = "Station de métro";
+
+"type.railway.station.subway.glasgow" = "Station de métro";
+
+"type.railway.station.subway.guangzhou" = "Station de métro";
+
+"type.railway.station.subway.hamburg" = "Station de métro";
+
+"type.railway.station.subway.helsinki" = "Station de métro";
+
+"type.railway.station.subway.hiroshima" = "Station de métro";
+
+"type.railway.station.subway.isfahan" = "Station de métro";
+
+"type.railway.station.subway.istanbul" = "Station de métro";
+
+"type.railway.station.subway.izmir" = "Station de métro";
+
+"type.railway.station.subway.kazan" = "Station de métro";
+
+"type.railway.station.subway.kharkiv" = "Station de métro";
+
+"type.railway.station.subway.kiev" = "Station de métro";
+
+"type.railway.station.subway.kobe" = "Station de métro";
+
+"type.railway.station.subway.kolkata" = "Station de métro";
+
+"type.railway.station.subway.kunming" = "Station de métro";
+
+"type.railway.station.subway.kyoto" = "Station de métro";
+
+"type.railway.station.subway.la" = "Station de métro";
+
+"type.railway.station.subway.lausanne" = "Station de métro";
+
+"type.railway.station.subway.lille" = "Station de métro";
+
+"type.railway.station.subway.lima" = "Station de métro";
+
+"type.railway.station.subway.lisboa" = "Station de métro";
+
+"type.railway.station.subway.lisbon" = "Station de métro";
+
+"type.railway.station.subway.london" = "Station de métro";
+
+"type.railway.station.subway.lyon" = "Station de métro";
+
+"type.railway.station.subway.madrid" = "Station de métro";
+
+"type.railway.station.subway.malaga" = "Station de métro";
+
+"type.railway.station.subway.manila" = "Station de métro";
+
+"type.railway.station.subway.maracaibo" = "Station de métro";
+
+"type.railway.station.subway.mashhad" = "Station de métro";
+
+"type.railway.station.subway.mecca" = "Station de métro";
+
+"type.railway.station.subway.medellin" = "Station de métro";
+
+"type.railway.station.subway.mexico" = "Station de métro";
+
+"type.railway.station.subway.milan" = "Station de métro";
+
+"type.railway.station.subway.minsk" = "Station de métro";
+
+"type.railway.station.subway.montreal" = "Station de métro";
+
+"type.railway.station.subway.moscow" = "Station de métro";
+
+"type.railway.station.subway.munchen" = "Station de métro";
+
+"type.railway.station.subway.nagoya" = "Station de métro";
+
+"type.railway.station.subway.newyork" = "Station de métro";
+
+"type.railway.station.subway.nnov" = "Station de métro";
+
+"type.railway.station.subway.novosibirsk" = "Station de métro";
+
+"type.railway.station.subway.osaka" = "Station de métro";
+
+"type.railway.station.subway.oslo" = "Station de métro";
+
+"type.railway.station.subway.palma" = "Station de métro";
+
+"type.railway.station.subway.panama" = "Station de métro";
 
 "type.railway.station.subway.paris" = "Station de métro";
 
-"type.railway.station.subway.roma" = "Métro";
+"type.railway.station.subway.philadelphia" = "Station de métro";
 
-"type.railway.station.subway.spb" = "Métro";
+"type.railway.station.subway.pyongyang" = "Station de métro";
+
+"type.railway.station.subway.rennes" = "Station de métro";
+
+"type.railway.station.subway.rio" = "Station de métro";
+
+"type.railway.station.subway.roma" = "Station de métro";
+
+"type.railway.station.subway.rotterdam" = "Station de métro";
+
+"type.railway.station.subway.samara" = "Station de métro";
+
+"type.railway.station.subway.santiago" = "Station de métro";
+
+"type.railway.station.subway.santo_domingo" = "Station de métro";
+
+"type.railway.station.subway.saopaulo" = "Station de métro";
+
+"type.railway.station.subway.sapporo" = "Station de métro";
+
+"type.railway.station.subway.sendai" = "Station de métro";
+
+"type.railway.station.subway.sf" = "Station de métro";
+
+"type.railway.station.subway.shanghai" = "Station de métro";
+
+"type.railway.station.subway.shiraz" = "Station de métro";
+
+"type.railway.station.subway.sofia" = "Station de métro";
+
+"type.railway.station.subway.spb" = "Station de métro";
+
+"type.railway.station.subway.stockholm" = "Station de métro";
+
+"type.railway.station.subway.tabriz" = "Station de métro";
+
+"type.railway.station.subway.taipei" = "Station de métro";
+
+"type.railway.station.subway.taoyuan" = "Station de métro";
+
+"type.railway.station.subway.tashkent" = "Station de métro";
+
+"type.railway.station.subway.tbilisi" = "Station de métro";
+
+"type.railway.station.subway.tianjin" = "Station de métro";
+
+"type.railway.station.subway.tokyo" = "Station de métro";
+
+"type.railway.station.subway.valencia" = "Station de métro";
+
+"type.railway.station.subway.vienna" = "Station de métro";
+
+"type.railway.station.subway.warszawa" = "Station de métro";
+
+"type.railway.station.subway.washington" = "Station de métro";
+
+"type.railway.station.subway.wuhan" = "Station de métro";
+
+"type.railway.station.subway.yerevan" = "Station de métro";
+
+"type.railway.station.subway.yokohama" = "Station de métro";
 
 "type.railway.subway" = "Ligne de métro";
 
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Entrée du métro";
 
-"type.railway.subway_entrance.barcelona" = "Métro";
+"type.railway.subway_entrance.adana" = "Entrée du métro";
 
-"type.railway.subway_entrance.berlin" = "Métro";
+"type.railway.subway_entrance.algiers" = "Entrée du métro";
 
-"type.railway.subway_entrance.kiev" = "Métro";
+"type.railway.subway_entrance.almaty" = "Entrée du métro";
 
-"type.railway.subway_entrance.london" = "Métro";
+"type.railway.subway_entrance.amsterdam" = "Entrée du métro";
 
-"type.railway.subway_entrance.madrid" = "Métro";
+"type.railway.subway_entrance.ankara" = "Entrée du métro";
 
-"type.railway.subway_entrance.minsk" = "Métro";
+"type.railway.subway_entrance.athens" = "Entrée du métro";
 
-"type.railway.subway_entrance.moscow" = "Métro";
+"type.railway.subway_entrance.baku" = "Entrée du métro";
 
-"type.railway.subway_entrance.newyork" = "Métro";
+"type.railway.subway_entrance.bangkok" = "Entrée du métro";
 
-"type.railway.subway_entrance.paris" = "Métro";
+"type.railway.subway_entrance.barcelona" = "Entrée du métro";
 
-"type.railway.subway_entrance.roma" = "Métro";
+"type.railway.subway_entrance.beijing" = "Entrée du métro";
 
-"type.railway.subway_entrance.spb" = "Métro";
+"type.railway.subway_entrance.bengalore" = "Entrée du métro";
+
+"type.railway.subway_entrance.berlin" = "Entrée du métro";
+
+"type.railway.subway_entrance.brasilia" = "Entrée du métro";
+
+"type.railway.subway_entrance.brescia" = "Entrée du métro";
+
+"type.railway.subway_entrance.brussels" = "Entrée du métro";
+
+"type.railway.subway_entrance.bucharest" = "Entrée du métro";
+
+"type.railway.subway_entrance.budapest" = "Entrée du métro";
+
+"type.railway.subway_entrance.buenos_aires" = "Entrée du métro";
+
+"type.railway.subway_entrance.bursa" = "Entrée du métro";
+
+"type.railway.subway_entrance.cairo" = "Entrée du métro";
+
+"type.railway.subway_entrance.caracas" = "Entrée du métro";
+
+"type.railway.subway_entrance.catania" = "Entrée du métro";
+
+"type.railway.subway_entrance.changchun" = "Entrée du métro";
+
+"type.railway.subway_entrance.chengdu" = "Entrée du métro";
+
+"type.railway.subway_entrance.chicago" = "Entrée du métro";
+
+"type.railway.subway_entrance.chongqing" = "Entrée du métro";
+
+"type.railway.subway_entrance.dalian" = "Entrée du métro";
+
+"type.railway.subway_entrance.delhi" = "Entrée du métro";
+
+"type.railway.subway_entrance.dnepro" = "Entrée du métro";
+
+"type.railway.subway_entrance.dubai" = "Entrée du métro";
+
+"type.railway.subway_entrance.ekb" = "Entrée du métro";
+
+"type.railway.subway_entrance.fukuoka" = "Entrée du métro";
+
+"type.railway.subway_entrance.glasgow" = "Entrée du métro";
+
+"type.railway.subway_entrance.guangzhou" = "Entrée du métro";
+
+"type.railway.subway_entrance.hamburg" = "Entrée du métro";
+
+"type.railway.subway_entrance.helsinki" = "Entrée du métro";
+
+"type.railway.subway_entrance.hiroshima" = "Entrée du métro";
+
+"type.railway.subway_entrance.isfahan" = "Entrée du métro";
+
+"type.railway.subway_entrance.istanbul" = "Entrée du métro";
+
+"type.railway.subway_entrance.izmir" = "Entrée du métro";
+
+"type.railway.subway_entrance.kazan" = "Entrée du métro";
+
+"type.railway.subway_entrance.kharkiv" = "Entrée du métro";
+
+"type.railway.subway_entrance.kiev" = "Entrée du métro";
+
+"type.railway.subway_entrance.kobe" = "Entrée du métro";
+
+"type.railway.subway_entrance.kolkata" = "Entrée du métro";
+
+"type.railway.subway_entrance.kunming" = "Entrée du métro";
+
+"type.railway.subway_entrance.kyoto" = "Entrée du métro";
+
+"type.railway.subway_entrance.la" = "Entrée du métro";
+
+"type.railway.subway_entrance.lausanne" = "Entrée du métro";
+
+"type.railway.subway_entrance.lille" = "Entrée du métro";
+
+"type.railway.subway_entrance.lima" = "Entrée du métro";
+
+"type.railway.subway_entrance.lisboa" = "Entrée du métro";
+
+"type.railway.subway_entrance.lisbon" = "Entrée du métro";
+
+"type.railway.subway_entrance.london" = "Entrée du métro";
+
+"type.railway.subway_entrance.lyon" = "Entrée du métro";
+
+"type.railway.subway_entrance.madrid" = "Entrée du métro";
+
+"type.railway.subway_entrance.malaga" = "Entrée du métro";
+
+"type.railway.subway_entrance.manila" = "Entrée du métro";
+
+"type.railway.subway_entrance.maracaibo" = "Entrée du métro";
+
+"type.railway.subway_entrance.mashhad" = "Entrée du métro";
+
+"type.railway.subway_entrance.mecca" = "Entrée du métro";
+
+"type.railway.subway_entrance.medellin" = "Entrée du métro";
+
+"type.railway.subway_entrance.mexico" = "Entrée du métro";
+
+"type.railway.subway_entrance.milan" = "Entrée du métro";
+
+"type.railway.subway_entrance.minsk" = "Entrée du métro";
+
+"type.railway.subway_entrance.montreal" = "Entrée du métro";
+
+"type.railway.subway_entrance.moscow" = "Entrée du métro";
+
+"type.railway.subway_entrance.munchen" = "Entrée du métro";
+
+"type.railway.subway_entrance.nagoya" = "Entrée du métro";
+
+"type.railway.subway_entrance.newyork" = "Entrée du métro";
+
+"type.railway.subway_entrance.nnov" = "Entrée du métro";
+
+"type.railway.subway_entrance.novosibirsk" = "Entrée du métro";
+
+"type.railway.subway_entrance.osaka" = "Entrée du métro";
+
+"type.railway.subway_entrance.oslo" = "Entrée du métro";
+
+"type.railway.subway_entrance.palma" = "Entrée du métro";
+
+"type.railway.subway_entrance.panama" = "Entrée du métro";
+
+"type.railway.subway_entrance.paris" = "Entrée du métro";
+
+"type.railway.subway_entrance.philadelphia" = "Entrée du métro";
+
+"type.railway.subway_entrance.pyongyang" = "Entrée du métro";
+
+"type.railway.subway_entrance.rennes" = "Entrée du métro";
+
+"type.railway.subway_entrance.rio" = "Entrée du métro";
+
+"type.railway.subway_entrance.roma" = "Entrée du métro";
+
+"type.railway.subway_entrance.rotterdam" = "Entrée du métro";
+
+"type.railway.subway_entrance.samara" = "Entrée du métro";
+
+"type.railway.subway_entrance.santiago" = "Entrée du métro";
+
+"type.railway.subway_entrance.santo_domingo" = "Entrée du métro";
+
+"type.railway.subway_entrance.saopaulo" = "Entrée du métro";
+
+"type.railway.subway_entrance.sapporo" = "Entrée du métro";
+
+"type.railway.subway_entrance.sendai" = "Entrée du métro";
+
+"type.railway.subway_entrance.sf" = "Entrée du métro";
+
+"type.railway.subway_entrance.shanghai" = "Entrée du métro";
+
+"type.railway.subway_entrance.shiraz" = "Entrée du métro";
+
+"type.railway.subway_entrance.sofia" = "Entrée du métro";
+
+"type.railway.subway_entrance.spb" = "Entrée du métro";
+
+"type.railway.subway_entrance.stockholm" = "Entrée du métro";
+
+"type.railway.subway_entrance.tabriz" = "Entrée du métro";
+
+"type.railway.subway_entrance.taipei" = "Entrée du métro";
+
+"type.railway.subway_entrance.taoyuan" = "Entrée du métro";
+
+"type.railway.subway_entrance.tashkent" = "Entrée du métro";
+
+"type.railway.subway_entrance.tbilisi" = "Entrée du métro";
+
+"type.railway.subway_entrance.tianjin" = "Entrée du métro";
+
+"type.railway.subway_entrance.tokyo" = "Entrée du métro";
+
+"type.railway.subway_entrance.valencia" = "Entrée du métro";
+
+"type.railway.subway_entrance.vienna" = "Entrée du métro";
+
+"type.railway.subway_entrance.warszawa" = "Entrée du métro";
+
+"type.railway.subway_entrance.washington" = "Entrée du métro";
+
+"type.railway.subway_entrance.wuhan" = "Entrée du métro";
+
+"type.railway.subway_entrance.yerevan" = "Entrée du métro";
+
+"type.railway.subway_entrance.yokohama" = "Entrée du métro";
 
 "type.railway.tram" = "Voie de tramway";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 12ef7fb55a..40c3f851f1 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Subway Entrance";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Subway Entrance";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Subway Entrance";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Subway Entrance";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Subway Entrance";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Subway Entrance";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Subway Entrance";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Subway Entrance";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Subway Entrance";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Subway Entrance";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Subway Entrance";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Subway Entrance";
+
+"type.railway.subway_entrance.berlin" = "Subway Entrance";
+
+"type.railway.subway_entrance.brasilia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brescia" = "Subway Entrance";
+
+"type.railway.subway_entrance.brussels" = "Subway Entrance";
+
+"type.railway.subway_entrance.bucharest" = "Subway Entrance";
+
+"type.railway.subway_entrance.budapest" = "Subway Entrance";
+
+"type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
+
+"type.railway.subway_entrance.bursa" = "Subway Entrance";
+
+"type.railway.subway_entrance.cairo" = "Subway Entrance";
+
+"type.railway.subway_entrance.caracas" = "Subway Entrance";
+
+"type.railway.subway_entrance.catania" = "Subway Entrance";
+
+"type.railway.subway_entrance.changchun" = "Subway Entrance";
+
+"type.railway.subway_entrance.chengdu" = "Subway Entrance";
+
+"type.railway.subway_entrance.chicago" = "Subway Entrance";
+
+"type.railway.subway_entrance.chongqing" = "Subway Entrance";
+
+"type.railway.subway_entrance.dalian" = "Subway Entrance";
+
+"type.railway.subway_entrance.delhi" = "Subway Entrance";
+
+"type.railway.subway_entrance.dnepro" = "Subway Entrance";
+
+"type.railway.subway_entrance.dubai" = "Subway Entrance";
+
+"type.railway.subway_entrance.ekb" = "Subway Entrance";
+
+"type.railway.subway_entrance.fukuoka" = "Subway Entrance";
+
+"type.railway.subway_entrance.glasgow" = "Subway Entrance";
+
+"type.railway.subway_entrance.guangzhou" = "Subway Entrance";
+
+"type.railway.subway_entrance.hamburg" = "Subway Entrance";
+
+"type.railway.subway_entrance.helsinki" = "Subway Entrance";
+
+"type.railway.subway_entrance.hiroshima" = "Subway Entrance";
+
+"type.railway.subway_entrance.isfahan" = "Subway Entrance";
+
+"type.railway.subway_entrance.istanbul" = "Subway Entrance";
+
+"type.railway.subway_entrance.izmir" = "Subway Entrance";
+
+"type.railway.subway_entrance.kazan" = "Subway Entrance";
+
+"type.railway.subway_entrance.kharkiv" = "Subway Entrance";
+
+"type.railway.subway_entrance.kiev" = "Subway Entrance";
+
+"type.railway.subway_entrance.kobe" = "Subway Entrance";
+
+"type.railway.subway_entrance.kolkata" = "Subway Entrance";
+
+"type.railway.subway_entrance.kunming" = "Subway Entrance";
+
+"type.railway.subway_entrance.kyoto" = "Subway Entrance";
+
+"type.railway.subway_entrance.la" = "Subway Entrance";
+
+"type.railway.subway_entrance.lausanne" = "Subway Entrance";
+
+"type.railway.subway_entrance.lille" = "Subway Entrance";
+
+"type.railway.subway_entrance.lima" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisboa" = "Subway Entrance";
+
+"type.railway.subway_entrance.lisbon" = "Subway Entrance";
+
+"type.railway.subway_entrance.london" = "Subway Entrance";
+
+"type.railway.subway_entrance.lyon" = "Subway Entrance";
+
+"type.railway.subway_entrance.madrid" = "Subway Entrance";
+
+"type.railway.subway_entrance.malaga" = "Subway Entrance";
+
+"type.railway.subway_entrance.manila" = "Subway Entrance";
+
+"type.railway.subway_entrance.maracaibo" = "Subway Entrance";
+
+"type.railway.subway_entrance.mashhad" = "Subway Entrance";
+
+"type.railway.subway_entrance.mecca" = "Subway Entrance";
+
+"type.railway.subway_entrance.medellin" = "Subway Entrance";
+
+"type.railway.subway_entrance.mexico" = "Subway Entrance";
+
+"type.railway.subway_entrance.milan" = "Subway Entrance";
+
+"type.railway.subway_entrance.minsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.montreal" = "Subway Entrance";
+
+"type.railway.subway_entrance.moscow" = "Subway Entrance";
+
+"type.railway.subway_entrance.munchen" = "Subway Entrance";
+
+"type.railway.subway_entrance.nagoya" = "Subway Entrance";
+
+"type.railway.subway_entrance.newyork" = "Subway Entrance";
+
+"type.railway.subway_entrance.nnov" = "Subway Entrance";
+
+"type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
+
+"type.railway.subway_entrance.osaka" = "Subway Entrance";
+
+"type.railway.subway_entrance.oslo" = "Subway Entrance";
+
+"type.railway.subway_entrance.palma" = "Subway Entrance";
+
+"type.railway.subway_entrance.panama" = "Subway Entrance";
+
+"type.railway.subway_entrance.paris" = "Subway Entrance";
+
+"type.railway.subway_entrance.philadelphia" = "Subway Entrance";
+
+"type.railway.subway_entrance.pyongyang" = "Subway Entrance";
+
+"type.railway.subway_entrance.rennes" = "Subway Entrance";
+
+"type.railway.subway_entrance.rio" = "Subway Entrance";
+
+"type.railway.subway_entrance.roma" = "Subway Entrance";
+
+"type.railway.subway_entrance.rotterdam" = "Subway Entrance";
+
+"type.railway.subway_entrance.samara" = "Subway Entrance";
+
+"type.railway.subway_entrance.santiago" = "Subway Entrance";
+
+"type.railway.subway_entrance.santo_domingo" = "Subway Entrance";
+
+"type.railway.subway_entrance.saopaulo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sapporo" = "Subway Entrance";
+
+"type.railway.subway_entrance.sendai" = "Subway Entrance";
+
+"type.railway.subway_entrance.sf" = "Subway Entrance";
+
+"type.railway.subway_entrance.shanghai" = "Subway Entrance";
+
+"type.railway.subway_entrance.shiraz" = "Subway Entrance";
+
+"type.railway.subway_entrance.sofia" = "Subway Entrance";
+
+"type.railway.subway_entrance.spb" = "Subway Entrance";
+
+"type.railway.subway_entrance.stockholm" = "Subway Entrance";
+
+"type.railway.subway_entrance.tabriz" = "Subway Entrance";
+
+"type.railway.subway_entrance.taipei" = "Subway Entrance";
+
+"type.railway.subway_entrance.taoyuan" = "Subway Entrance";
+
+"type.railway.subway_entrance.tashkent" = "Subway Entrance";
+
+"type.railway.subway_entrance.tbilisi" = "Subway Entrance";
+
+"type.railway.subway_entrance.tianjin" = "Subway Entrance";
+
+"type.railway.subway_entrance.tokyo" = "Subway Entrance";
+
+"type.railway.subway_entrance.valencia" = "Subway Entrance";
+
+"type.railway.subway_entrance.vienna" = "Subway Entrance";
+
+"type.railway.subway_entrance.warszawa" = "Subway Entrance";
+
+"type.railway.subway_entrance.washington" = "Subway Entrance";
+
+"type.railway.subway_entrance.wuhan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yerevan" = "Subway Entrance";
+
+"type.railway.subway_entrance.yokohama" = "Subway Entrance";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 54e59185ae..cc8c106e7a 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Földalatti";
 
+"type.railway.station.subway.adana" = "Földalatti";
+
+"type.railway.station.subway.algiers" = "Földalatti";
+
+"type.railway.station.subway.almaty" = "Földalatti";
+
+"type.railway.station.subway.amsterdam" = "Földalatti";
+
+"type.railway.station.subway.ankara" = "Földalatti";
+
+"type.railway.station.subway.athens" = "Földalatti";
+
+"type.railway.station.subway.baku" = "Földalatti";
+
+"type.railway.station.subway.bangkok" = "Földalatti";
+
 "type.railway.station.subway.barcelona" = "Földalatti";
 
+"type.railway.station.subway.beijing" = "Földalatti";
+
+"type.railway.station.subway.bengalore" = "Földalatti";
+
 "type.railway.station.subway.berlin" = "Földalatti";
 
+"type.railway.station.subway.brasilia" = "Földalatti";
+
+"type.railway.station.subway.brescia" = "Földalatti";
+
+"type.railway.station.subway.brussels" = "Földalatti";
+
+"type.railway.station.subway.bucharest" = "Földalatti";
+
+"type.railway.station.subway.budapest" = "Földalatti";
+
+"type.railway.station.subway.buenos_aires" = "Földalatti";
+
+"type.railway.station.subway.bursa" = "Földalatti";
+
+"type.railway.station.subway.cairo" = "Földalatti";
+
+"type.railway.station.subway.caracas" = "Földalatti";
+
+"type.railway.station.subway.catania" = "Földalatti";
+
+"type.railway.station.subway.changchun" = "Földalatti";
+
+"type.railway.station.subway.chengdu" = "Földalatti";
+
+"type.railway.station.subway.chicago" = "Földalatti";
+
+"type.railway.station.subway.chongqing" = "Földalatti";
+
+"type.railway.station.subway.dalian" = "Földalatti";
+
+"type.railway.station.subway.delhi" = "Földalatti";
+
+"type.railway.station.subway.dnepro" = "Földalatti";
+
+"type.railway.station.subway.dubai" = "Földalatti";
+
+"type.railway.station.subway.ekb" = "Földalatti";
+
+"type.railway.station.subway.fukuoka" = "Földalatti";
+
+"type.railway.station.subway.glasgow" = "Földalatti";
+
+"type.railway.station.subway.guangzhou" = "Földalatti";
+
+"type.railway.station.subway.hamburg" = "Földalatti";
+
+"type.railway.station.subway.helsinki" = "Földalatti";
+
+"type.railway.station.subway.hiroshima" = "Földalatti";
+
+"type.railway.station.subway.isfahan" = "Földalatti";
+
+"type.railway.station.subway.istanbul" = "Földalatti";
+
+"type.railway.station.subway.izmir" = "Földalatti";
+
+"type.railway.station.subway.kazan" = "Földalatti";
+
+"type.railway.station.subway.kharkiv" = "Földalatti";
+
 "type.railway.station.subway.kiev" = "Földalatti";
 
+"type.railway.station.subway.kobe" = "Földalatti";
+
+"type.railway.station.subway.kolkata" = "Földalatti";
+
+"type.railway.station.subway.kunming" = "Földalatti";
+
+"type.railway.station.subway.kyoto" = "Földalatti";
+
+"type.railway.station.subway.la" = "Földalatti";
+
+"type.railway.station.subway.lausanne" = "Földalatti";
+
+"type.railway.station.subway.lille" = "Földalatti";
+
+"type.railway.station.subway.lima" = "Földalatti";
+
+"type.railway.station.subway.lisboa" = "Földalatti";
+
+"type.railway.station.subway.lisbon" = "Földalatti";
+
 "type.railway.station.subway.london" = "Földalatti";
 
+"type.railway.station.subway.lyon" = "Földalatti";
+
 "type.railway.station.subway.madrid" = "Földalatti";
 
+"type.railway.station.subway.malaga" = "Földalatti";
+
+"type.railway.station.subway.manila" = "Földalatti";
+
+"type.railway.station.subway.maracaibo" = "Földalatti";
+
+"type.railway.station.subway.mashhad" = "Földalatti";
+
+"type.railway.station.subway.mecca" = "Földalatti";
+
+"type.railway.station.subway.medellin" = "Földalatti";
+
+"type.railway.station.subway.mexico" = "Földalatti";
+
+"type.railway.station.subway.milan" = "Földalatti";
+
 "type.railway.station.subway.minsk" = "Földalatti";
 
+"type.railway.station.subway.montreal" = "Földalatti";
+
 "type.railway.station.subway.moscow" = "Földalatti";
 
+"type.railway.station.subway.munchen" = "Földalatti";
+
+"type.railway.station.subway.nagoya" = "Földalatti";
+
 "type.railway.station.subway.newyork" = "Földalatti";
 
+"type.railway.station.subway.nnov" = "Földalatti";
+
+"type.railway.station.subway.novosibirsk" = "Földalatti";
+
+"type.railway.station.subway.osaka" = "Földalatti";
+
+"type.railway.station.subway.oslo" = "Földalatti";
+
+"type.railway.station.subway.palma" = "Földalatti";
+
+"type.railway.station.subway.panama" = "Földalatti";
+
 "type.railway.station.subway.paris" = "Földalatti";
 
+"type.railway.station.subway.philadelphia" = "Földalatti";
+
+"type.railway.station.subway.pyongyang" = "Földalatti";
+
+"type.railway.station.subway.rennes" = "Földalatti";
+
+"type.railway.station.subway.rio" = "Földalatti";
+
 "type.railway.station.subway.roma" = "Földalatti";
 
+"type.railway.station.subway.rotterdam" = "Földalatti";
+
+"type.railway.station.subway.samara" = "Földalatti";
+
+"type.railway.station.subway.santiago" = "Földalatti";
+
+"type.railway.station.subway.santo_domingo" = "Földalatti";
+
+"type.railway.station.subway.saopaulo" = "Földalatti";
+
+"type.railway.station.subway.sapporo" = "Földalatti";
+
+"type.railway.station.subway.sendai" = "Földalatti";
+
+"type.railway.station.subway.sf" = "Földalatti";
+
+"type.railway.station.subway.shanghai" = "Földalatti";
+
+"type.railway.station.subway.shiraz" = "Földalatti";
+
+"type.railway.station.subway.sofia" = "Földalatti";
+
 "type.railway.station.subway.spb" = "Földalatti";
 
+"type.railway.station.subway.stockholm" = "Földalatti";
+
+"type.railway.station.subway.tabriz" = "Földalatti";
+
+"type.railway.station.subway.taipei" = "Földalatti";
+
+"type.railway.station.subway.taoyuan" = "Földalatti";
+
+"type.railway.station.subway.tashkent" = "Földalatti";
+
+"type.railway.station.subway.tbilisi" = "Földalatti";
+
+"type.railway.station.subway.tianjin" = "Földalatti";
+
+"type.railway.station.subway.tokyo" = "Földalatti";
+
+"type.railway.station.subway.valencia" = "Földalatti";
+
+"type.railway.station.subway.vienna" = "Földalatti";
+
+"type.railway.station.subway.warszawa" = "Földalatti";
+
+"type.railway.station.subway.washington" = "Földalatti";
+
+"type.railway.station.subway.wuhan" = "Földalatti";
+
+"type.railway.station.subway.yerevan" = "Földalatti";
+
+"type.railway.station.subway.yokohama" = "Földalatti";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.barcelona" = "Földalatti";
+"type.railway.subway_entrance.adana" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.berlin" = "Földalatti";
+"type.railway.subway_entrance.algiers" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.kiev" = "Földalatti";
+"type.railway.subway_entrance.almaty" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.london" = "Földalatti";
+"type.railway.subway_entrance.amsterdam" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.madrid" = "Földalatti";
+"type.railway.subway_entrance.ankara" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.minsk" = "Földalatti";
+"type.railway.subway_entrance.athens" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.moscow" = "Földalatti";
+"type.railway.subway_entrance.baku" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.newyork" = "Földalatti";
+"type.railway.subway_entrance.bangkok" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.paris" = "Földalatti";
+"type.railway.subway_entrance.barcelona" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.roma" = "Földalatti";
+"type.railway.subway_entrance.beijing" = "Földalatti bejárat";
 
-"type.railway.subway_entrance.spb" = "Földalatti";
+"type.railway.subway_entrance.bengalore" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.berlin" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.brasilia" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.brescia" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.brussels" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.bucharest" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.budapest" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.buenos_aires" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.bursa" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.cairo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.caracas" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.catania" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.changchun" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.chengdu" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.chicago" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.chongqing" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.dalian" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.delhi" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.dnepro" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.dubai" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.ekb" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.fukuoka" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.glasgow" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.guangzhou" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.hamburg" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.helsinki" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.hiroshima" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.isfahan" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.istanbul" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.izmir" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kazan" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kharkiv" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kiev" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kobe" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kolkata" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kunming" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.kyoto" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.la" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.lausanne" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.lille" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.lima" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.lisboa" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.lisbon" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.london" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.lyon" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.madrid" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.malaga" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.manila" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.maracaibo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.mashhad" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.mecca" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.medellin" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.mexico" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.milan" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.minsk" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.montreal" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.moscow" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.munchen" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.nagoya" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.newyork" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.nnov" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.novosibirsk" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.osaka" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.oslo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.palma" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.panama" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.paris" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.philadelphia" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.pyongyang" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.rennes" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.rio" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.roma" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.rotterdam" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.samara" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.santiago" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.santo_domingo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.saopaulo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.sapporo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.sendai" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.sf" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.shanghai" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.shiraz" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.sofia" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.spb" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.stockholm" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.tabriz" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.taipei" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.taoyuan" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.tashkent" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.tbilisi" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.tianjin" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.tokyo" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.valencia" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.vienna" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.warszawa" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.washington" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.wuhan" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.yerevan" = "Földalatti bejárat";
+
+"type.railway.subway_entrance.yokohama" = "Földalatti bejárat";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 50308c6420..d3b141e4c8 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.adana" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.algiers" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.almaty" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.amsterdam" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.ankara" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.athens" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.baku" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.bangkok" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.barcelona" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.beijing" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.bengalore" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.berlin" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.brasilia" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.brescia" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.brussels" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.bucharest" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.budapest" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.buenos_aires" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.bursa" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.cairo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.caracas" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.catania" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.changchun" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.chengdu" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.chicago" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.chongqing" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.dalian" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.delhi" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.dnepro" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.dubai" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.ekb" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.fukuoka" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.glasgow" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.guangzhou" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.hamburg" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.helsinki" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.hiroshima" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.isfahan" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.istanbul" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.izmir" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.kazan" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.kharkiv" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.kiev" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.kobe" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.kolkata" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.kunming" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.kyoto" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.la" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.lausanne" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.lille" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.lima" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.lisboa" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.lisbon" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.london" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.lyon" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.madrid" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.malaga" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.manila" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.maracaibo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.mashhad" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.mecca" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.medellin" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.mexico" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.milan" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.minsk" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.montreal" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.moscow" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.munchen" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.nagoya" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.newyork" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.nnov" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.novosibirsk" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.osaka" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.oslo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.palma" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.panama" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.paris" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.philadelphia" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.pyongyang" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.rennes" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.rio" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.roma" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.rotterdam" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.samara" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.santiago" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.santo_domingo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.saopaulo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.sapporo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.sendai" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.sf" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.shanghai" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.shiraz" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.sofia" = "Stasiun bawah tanah";
+
 "type.railway.station.subway.spb" = "Stasiun bawah tanah";
 
+"type.railway.station.subway.stockholm" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.tabriz" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.taipei" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.taoyuan" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.tashkent" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.tbilisi" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.tianjin" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.tokyo" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.valencia" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.vienna" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.warszawa" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.washington" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.wuhan" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.yerevan" = "Stasiun bawah tanah";
+
+"type.railway.station.subway.yokohama" = "Stasiun bawah tanah";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.barcelona" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.adana" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.berlin" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.algiers" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.kiev" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.almaty" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.london" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.amsterdam" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.madrid" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.ankara" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.minsk" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.athens" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.moscow" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.baku" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.newyork" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.bangkok" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.paris" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.barcelona" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.roma" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.beijing" = "Pintu masuk kereta bawah tanah";
 
-"type.railway.subway_entrance.spb" = "Stasiun bawah tanah";
+"type.railway.subway_entrance.bengalore" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.berlin" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.brasilia" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.brescia" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.brussels" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.bucharest" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.budapest" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.buenos_aires" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.bursa" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.cairo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.caracas" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.catania" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.changchun" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.chengdu" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.chicago" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.chongqing" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.dalian" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.delhi" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.dnepro" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.dubai" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.ekb" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.fukuoka" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.glasgow" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.guangzhou" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.hamburg" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.helsinki" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.hiroshima" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.isfahan" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.istanbul" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.izmir" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kazan" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kharkiv" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kiev" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kobe" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kolkata" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kunming" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.kyoto" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.la" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.lausanne" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.lille" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.lima" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.lisboa" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.lisbon" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.london" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.lyon" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.madrid" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.malaga" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.manila" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.maracaibo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.mashhad" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.mecca" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.medellin" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.mexico" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.milan" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.minsk" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.montreal" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.moscow" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.munchen" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.nagoya" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.newyork" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.nnov" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.novosibirsk" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.osaka" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.oslo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.palma" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.panama" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.paris" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.philadelphia" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.pyongyang" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.rennes" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.rio" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.roma" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.rotterdam" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.samara" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.santiago" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.santo_domingo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.saopaulo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.sapporo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.sendai" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.sf" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.shanghai" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.shiraz" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.sofia" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.spb" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.stockholm" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.tabriz" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.taipei" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.taoyuan" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.tashkent" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.tbilisi" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.tianjin" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.tokyo" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.valencia" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.vienna" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.warszawa" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.washington" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.wuhan" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.yerevan" = "Pintu masuk kereta bawah tanah";
+
+"type.railway.subway_entrance.yokohama" = "Pintu masuk kereta bawah tanah";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 080bbd0178..f92da08140 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metrò";
 
+"type.railway.station.subway.adana" = "Metrò";
+
+"type.railway.station.subway.algiers" = "Metrò";
+
+"type.railway.station.subway.almaty" = "Metrò";
+
+"type.railway.station.subway.amsterdam" = "Metrò";
+
+"type.railway.station.subway.ankara" = "Metrò";
+
+"type.railway.station.subway.athens" = "Metrò";
+
+"type.railway.station.subway.baku" = "Metrò";
+
+"type.railway.station.subway.bangkok" = "Metrò";
+
 "type.railway.station.subway.barcelona" = "Metrò";
 
+"type.railway.station.subway.beijing" = "Metrò";
+
+"type.railway.station.subway.bengalore" = "Metrò";
+
 "type.railway.station.subway.berlin" = "Metrò";
 
+"type.railway.station.subway.brasilia" = "Metrò";
+
+"type.railway.station.subway.brescia" = "Metrò";
+
+"type.railway.station.subway.brussels" = "Metrò";
+
+"type.railway.station.subway.bucharest" = "Metrò";
+
+"type.railway.station.subway.budapest" = "Metrò";
+
+"type.railway.station.subway.buenos_aires" = "Metrò";
+
+"type.railway.station.subway.bursa" = "Metrò";
+
+"type.railway.station.subway.cairo" = "Metrò";
+
+"type.railway.station.subway.caracas" = "Metrò";
+
+"type.railway.station.subway.catania" = "Metrò";
+
+"type.railway.station.subway.changchun" = "Metrò";
+
+"type.railway.station.subway.chengdu" = "Metrò";
+
+"type.railway.station.subway.chicago" = "Metrò";
+
+"type.railway.station.subway.chongqing" = "Metrò";
+
+"type.railway.station.subway.dalian" = "Metrò";
+
+"type.railway.station.subway.delhi" = "Metrò";
+
+"type.railway.station.subway.dnepro" = "Metrò";
+
+"type.railway.station.subway.dubai" = "Metrò";
+
+"type.railway.station.subway.ekb" = "Metrò";
+
+"type.railway.station.subway.fukuoka" = "Metrò";
+
+"type.railway.station.subway.glasgow" = "Metrò";
+
+"type.railway.station.subway.guangzhou" = "Metrò";
+
+"type.railway.station.subway.hamburg" = "Metrò";
+
+"type.railway.station.subway.helsinki" = "Metrò";
+
+"type.railway.station.subway.hiroshima" = "Metrò";
+
+"type.railway.station.subway.isfahan" = "Metrò";
+
+"type.railway.station.subway.istanbul" = "Metrò";
+
+"type.railway.station.subway.izmir" = "Metrò";
+
+"type.railway.station.subway.kazan" = "Metrò";
+
+"type.railway.station.subway.kharkiv" = "Metrò";
+
 "type.railway.station.subway.kiev" = "Metrò";
 
+"type.railway.station.subway.kobe" = "Metrò";
+
+"type.railway.station.subway.kolkata" = "Metrò";
+
+"type.railway.station.subway.kunming" = "Metrò";
+
+"type.railway.station.subway.kyoto" = "Metrò";
+
+"type.railway.station.subway.la" = "Metrò";
+
+"type.railway.station.subway.lausanne" = "Metrò";
+
+"type.railway.station.subway.lille" = "Metrò";
+
+"type.railway.station.subway.lima" = "Metrò";
+
+"type.railway.station.subway.lisboa" = "Metrò";
+
+"type.railway.station.subway.lisbon" = "Metrò";
+
 "type.railway.station.subway.london" = "Metrò";
 
+"type.railway.station.subway.lyon" = "Metrò";
+
 "type.railway.station.subway.madrid" = "Metrò";
 
+"type.railway.station.subway.malaga" = "Metrò";
+
+"type.railway.station.subway.manila" = "Metrò";
+
+"type.railway.station.subway.maracaibo" = "Metrò";
+
+"type.railway.station.subway.mashhad" = "Metrò";
+
+"type.railway.station.subway.mecca" = "Metrò";
+
+"type.railway.station.subway.medellin" = "Metrò";
+
+"type.railway.station.subway.mexico" = "Metrò";
+
+"type.railway.station.subway.milan" = "Metrò";
+
 "type.railway.station.subway.minsk" = "Metrò";
 
+"type.railway.station.subway.montreal" = "Metrò";
+
 "type.railway.station.subway.moscow" = "Metrò";
 
+"type.railway.station.subway.munchen" = "Metrò";
+
+"type.railway.station.subway.nagoya" = "Metrò";
+
 "type.railway.station.subway.newyork" = "Metrò";
 
+"type.railway.station.subway.nnov" = "Metrò";
+
+"type.railway.station.subway.novosibirsk" = "Metrò";
+
+"type.railway.station.subway.osaka" = "Metrò";
+
+"type.railway.station.subway.oslo" = "Metrò";
+
+"type.railway.station.subway.palma" = "Metrò";
+
+"type.railway.station.subway.panama" = "Metrò";
+
 "type.railway.station.subway.paris" = "Metrò";
 
+"type.railway.station.subway.philadelphia" = "Metrò";
+
+"type.railway.station.subway.pyongyang" = "Metrò";
+
+"type.railway.station.subway.rennes" = "Metrò";
+
+"type.railway.station.subway.rio" = "Metrò";
+
 "type.railway.station.subway.roma" = "Metrò";
 
+"type.railway.station.subway.rotterdam" = "Metrò";
+
+"type.railway.station.subway.samara" = "Metrò";
+
+"type.railway.station.subway.santiago" = "Metrò";
+
+"type.railway.station.subway.santo_domingo" = "Metrò";
+
+"type.railway.station.subway.saopaulo" = "Metrò";
+
+"type.railway.station.subway.sapporo" = "Metrò";
+
+"type.railway.station.subway.sendai" = "Metrò";
+
+"type.railway.station.subway.sf" = "Metrò";
+
+"type.railway.station.subway.shanghai" = "Metrò";
+
+"type.railway.station.subway.shiraz" = "Metrò";
+
+"type.railway.station.subway.sofia" = "Metrò";
+
 "type.railway.station.subway.spb" = "Metrò";
 
+"type.railway.station.subway.stockholm" = "Metrò";
+
+"type.railway.station.subway.tabriz" = "Metrò";
+
+"type.railway.station.subway.taipei" = "Metrò";
+
+"type.railway.station.subway.taoyuan" = "Metrò";
+
+"type.railway.station.subway.tashkent" = "Metrò";
+
+"type.railway.station.subway.tbilisi" = "Metrò";
+
+"type.railway.station.subway.tianjin" = "Metrò";
+
+"type.railway.station.subway.tokyo" = "Metrò";
+
+"type.railway.station.subway.valencia" = "Metrò";
+
+"type.railway.station.subway.vienna" = "Metrò";
+
+"type.railway.station.subway.warszawa" = "Metrò";
+
+"type.railway.station.subway.washington" = "Metrò";
+
+"type.railway.station.subway.wuhan" = "Metrò";
+
+"type.railway.station.subway.yerevan" = "Metrò";
+
+"type.railway.station.subway.yokohama" = "Metrò";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.barcelona" = "Metrò";
+"type.railway.subway_entrance.adana" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.berlin" = "Metrò";
+"type.railway.subway_entrance.algiers" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.kiev" = "Metrò";
+"type.railway.subway_entrance.almaty" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.london" = "Metrò";
+"type.railway.subway_entrance.amsterdam" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.madrid" = "Metrò";
+"type.railway.subway_entrance.ankara" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.minsk" = "Metrò";
+"type.railway.subway_entrance.athens" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.moscow" = "Metrò";
+"type.railway.subway_entrance.baku" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.newyork" = "Metrò";
+"type.railway.subway_entrance.bangkok" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.paris" = "Metrò";
+"type.railway.subway_entrance.barcelona" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.roma" = "Metrò";
+"type.railway.subway_entrance.beijing" = "Stazione metropolitana";
 
-"type.railway.subway_entrance.spb" = "Metrò";
+"type.railway.subway_entrance.bengalore" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.berlin" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.brasilia" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.brescia" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.brussels" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.bucharest" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.budapest" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.buenos_aires" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.bursa" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.cairo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.caracas" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.catania" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.changchun" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.chengdu" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.chicago" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.chongqing" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.dalian" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.delhi" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.dnepro" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.dubai" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.ekb" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.fukuoka" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.glasgow" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.guangzhou" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.hamburg" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.helsinki" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.hiroshima" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.isfahan" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.istanbul" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.izmir" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kazan" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kharkiv" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kiev" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kobe" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kolkata" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kunming" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.kyoto" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.la" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.lausanne" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.lille" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.lima" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.lisboa" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.lisbon" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.london" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.lyon" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.madrid" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.malaga" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.manila" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.maracaibo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.mashhad" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.mecca" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.medellin" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.mexico" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.milan" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.minsk" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.montreal" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.moscow" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.munchen" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.nagoya" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.newyork" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.nnov" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.novosibirsk" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.osaka" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.oslo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.palma" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.panama" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.paris" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.philadelphia" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.pyongyang" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.rennes" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.rio" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.roma" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.rotterdam" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.samara" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.santiago" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.santo_domingo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.saopaulo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.sapporo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.sendai" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.sf" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.shanghai" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.shiraz" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.sofia" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.spb" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.stockholm" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.tabriz" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.taipei" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.taoyuan" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.tashkent" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.tbilisi" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.tianjin" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.tokyo" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.valencia" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.vienna" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.warszawa" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.washington" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.wuhan" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.yerevan" = "Stazione metropolitana";
+
+"type.railway.subway_entrance.yokohama" = "Stazione metropolitana";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index efddf32cd1..c51a6a720c 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "地下鉄";
 
+"type.railway.station.subway.adana" = "地下鉄";
+
+"type.railway.station.subway.algiers" = "地下鉄";
+
+"type.railway.station.subway.almaty" = "地下鉄";
+
+"type.railway.station.subway.amsterdam" = "地下鉄";
+
+"type.railway.station.subway.ankara" = "地下鉄";
+
+"type.railway.station.subway.athens" = "地下鉄";
+
+"type.railway.station.subway.baku" = "地下鉄";
+
+"type.railway.station.subway.bangkok" = "地下鉄";
+
 "type.railway.station.subway.barcelona" = "地下鉄";
 
+"type.railway.station.subway.beijing" = "地下鉄";
+
+"type.railway.station.subway.bengalore" = "地下鉄";
+
 "type.railway.station.subway.berlin" = "地下鉄";
 
+"type.railway.station.subway.brasilia" = "地下鉄";
+
+"type.railway.station.subway.brescia" = "地下鉄";
+
+"type.railway.station.subway.brussels" = "地下鉄";
+
+"type.railway.station.subway.bucharest" = "地下鉄";
+
+"type.railway.station.subway.budapest" = "地下鉄";
+
+"type.railway.station.subway.buenos_aires" = "地下鉄";
+
+"type.railway.station.subway.bursa" = "地下鉄";
+
+"type.railway.station.subway.cairo" = "地下鉄";
+
+"type.railway.station.subway.caracas" = "地下鉄";
+
+"type.railway.station.subway.catania" = "地下鉄";
+
+"type.railway.station.subway.changchun" = "地下鉄";
+
+"type.railway.station.subway.chengdu" = "地下鉄";
+
+"type.railway.station.subway.chicago" = "地下鉄";
+
+"type.railway.station.subway.chongqing" = "地下鉄";
+
+"type.railway.station.subway.dalian" = "地下鉄";
+
+"type.railway.station.subway.delhi" = "地下鉄";
+
+"type.railway.station.subway.dnepro" = "地下鉄";
+
+"type.railway.station.subway.dubai" = "地下鉄";
+
+"type.railway.station.subway.ekb" = "地下鉄";
+
+"type.railway.station.subway.fukuoka" = "地下鉄";
+
+"type.railway.station.subway.glasgow" = "地下鉄";
+
+"type.railway.station.subway.guangzhou" = "地下鉄";
+
+"type.railway.station.subway.hamburg" = "地下鉄";
+
+"type.railway.station.subway.helsinki" = "地下鉄";
+
+"type.railway.station.subway.hiroshima" = "地下鉄";
+
+"type.railway.station.subway.isfahan" = "地下鉄";
+
+"type.railway.station.subway.istanbul" = "地下鉄";
+
+"type.railway.station.subway.izmir" = "地下鉄";
+
+"type.railway.station.subway.kazan" = "地下鉄";
+
+"type.railway.station.subway.kharkiv" = "地下鉄";
+
 "type.railway.station.subway.kiev" = "地下鉄";
 
+"type.railway.station.subway.kobe" = "地下鉄";
+
+"type.railway.station.subway.kolkata" = "地下鉄";
+
+"type.railway.station.subway.kunming" = "地下鉄";
+
+"type.railway.station.subway.kyoto" = "地下鉄";
+
+"type.railway.station.subway.la" = "地下鉄";
+
+"type.railway.station.subway.lausanne" = "地下鉄";
+
+"type.railway.station.subway.lille" = "地下鉄";
+
+"type.railway.station.subway.lima" = "地下鉄";
+
+"type.railway.station.subway.lisboa" = "地下鉄";
+
+"type.railway.station.subway.lisbon" = "地下鉄";
+
 "type.railway.station.subway.london" = "地下鉄";
 
+"type.railway.station.subway.lyon" = "地下鉄";
+
 "type.railway.station.subway.madrid" = "地下鉄";
 
+"type.railway.station.subway.malaga" = "地下鉄";
+
+"type.railway.station.subway.manila" = "地下鉄";
+
+"type.railway.station.subway.maracaibo" = "地下鉄";
+
+"type.railway.station.subway.mashhad" = "地下鉄";
+
+"type.railway.station.subway.mecca" = "地下鉄";
+
+"type.railway.station.subway.medellin" = "地下鉄";
+
+"type.railway.station.subway.mexico" = "地下鉄";
+
+"type.railway.station.subway.milan" = "地下鉄";
+
 "type.railway.station.subway.minsk" = "地下鉄";
 
+"type.railway.station.subway.montreal" = "地下鉄";
+
 "type.railway.station.subway.moscow" = "地下鉄";
 
+"type.railway.station.subway.munchen" = "地下鉄";
+
+"type.railway.station.subway.nagoya" = "地下鉄";
+
 "type.railway.station.subway.newyork" = "地下鉄";
 
+"type.railway.station.subway.nnov" = "地下鉄";
+
+"type.railway.station.subway.novosibirsk" = "地下鉄";
+
+"type.railway.station.subway.osaka" = "地下鉄";
+
+"type.railway.station.subway.oslo" = "地下鉄";
+
+"type.railway.station.subway.palma" = "地下鉄";
+
+"type.railway.station.subway.panama" = "地下鉄";
+
 "type.railway.station.subway.paris" = "地下鉄";
 
+"type.railway.station.subway.philadelphia" = "地下鉄";
+
+"type.railway.station.subway.pyongyang" = "地下鉄";
+
+"type.railway.station.subway.rennes" = "地下鉄";
+
+"type.railway.station.subway.rio" = "地下鉄";
+
 "type.railway.station.subway.roma" = "地下鉄";
 
+"type.railway.station.subway.rotterdam" = "地下鉄";
+
+"type.railway.station.subway.samara" = "地下鉄";
+
+"type.railway.station.subway.santiago" = "地下鉄";
+
+"type.railway.station.subway.santo_domingo" = "地下鉄";
+
+"type.railway.station.subway.saopaulo" = "地下鉄";
+
+"type.railway.station.subway.sapporo" = "地下鉄";
+
+"type.railway.station.subway.sendai" = "地下鉄";
+
+"type.railway.station.subway.sf" = "地下鉄";
+
+"type.railway.station.subway.shanghai" = "地下鉄";
+
+"type.railway.station.subway.shiraz" = "地下鉄";
+
+"type.railway.station.subway.sofia" = "地下鉄";
+
 "type.railway.station.subway.spb" = "地下鉄";
 
+"type.railway.station.subway.stockholm" = "地下鉄";
+
+"type.railway.station.subway.tabriz" = "地下鉄";
+
+"type.railway.station.subway.taipei" = "地下鉄";
+
+"type.railway.station.subway.taoyuan" = "地下鉄";
+
+"type.railway.station.subway.tashkent" = "地下鉄";
+
+"type.railway.station.subway.tbilisi" = "地下鉄";
+
+"type.railway.station.subway.tianjin" = "地下鉄";
+
+"type.railway.station.subway.tokyo" = "地下鉄";
+
+"type.railway.station.subway.valencia" = "地下鉄";
+
+"type.railway.station.subway.vienna" = "地下鉄";
+
+"type.railway.station.subway.warszawa" = "地下鉄";
+
+"type.railway.station.subway.washington" = "地下鉄";
+
+"type.railway.station.subway.wuhan" = "地下鉄";
+
+"type.railway.station.subway.yerevan" = "地下鉄";
+
+"type.railway.station.subway.yokohama" = "地下鉄";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "地下鉄入り口";
 
-"type.railway.subway_entrance.barcelona" = "地下鉄";
+"type.railway.subway_entrance.adana" = "地下鉄入り口";
 
-"type.railway.subway_entrance.berlin" = "地下鉄";
+"type.railway.subway_entrance.algiers" = "地下鉄入り口";
 
-"type.railway.subway_entrance.kiev" = "地下鉄";
+"type.railway.subway_entrance.almaty" = "地下鉄入り口";
 
-"type.railway.subway_entrance.london" = "地下鉄";
+"type.railway.subway_entrance.amsterdam" = "地下鉄入り口";
 
-"type.railway.subway_entrance.madrid" = "地下鉄";
+"type.railway.subway_entrance.ankara" = "地下鉄入り口";
 
-"type.railway.subway_entrance.minsk" = "地下鉄";
+"type.railway.subway_entrance.athens" = "地下鉄入り口";
 
-"type.railway.subway_entrance.moscow" = "地下鉄";
+"type.railway.subway_entrance.baku" = "地下鉄入り口";
 
-"type.railway.subway_entrance.newyork" = "地下鉄";
+"type.railway.subway_entrance.bangkok" = "地下鉄入り口";
 
-"type.railway.subway_entrance.paris" = "地下鉄";
+"type.railway.subway_entrance.barcelona" = "地下鉄入り口";
 
-"type.railway.subway_entrance.roma" = "地下鉄";
+"type.railway.subway_entrance.beijing" = "地下鉄入り口";
 
-"type.railway.subway_entrance.spb" = "地下鉄";
+"type.railway.subway_entrance.bengalore" = "地下鉄入り口";
+
+"type.railway.subway_entrance.berlin" = "地下鉄入り口";
+
+"type.railway.subway_entrance.brasilia" = "地下鉄入り口";
+
+"type.railway.subway_entrance.brescia" = "地下鉄入り口";
+
+"type.railway.subway_entrance.brussels" = "地下鉄入り口";
+
+"type.railway.subway_entrance.bucharest" = "地下鉄入り口";
+
+"type.railway.subway_entrance.budapest" = "地下鉄入り口";
+
+"type.railway.subway_entrance.buenos_aires" = "地下鉄入り口";
+
+"type.railway.subway_entrance.bursa" = "地下鉄入り口";
+
+"type.railway.subway_entrance.cairo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.caracas" = "地下鉄入り口";
+
+"type.railway.subway_entrance.catania" = "地下鉄入り口";
+
+"type.railway.subway_entrance.changchun" = "地下鉄入り口";
+
+"type.railway.subway_entrance.chengdu" = "地下鉄入り口";
+
+"type.railway.subway_entrance.chicago" = "地下鉄入り口";
+
+"type.railway.subway_entrance.chongqing" = "地下鉄入り口";
+
+"type.railway.subway_entrance.dalian" = "地下鉄入り口";
+
+"type.railway.subway_entrance.delhi" = "地下鉄入り口";
+
+"type.railway.subway_entrance.dnepro" = "地下鉄入り口";
+
+"type.railway.subway_entrance.dubai" = "地下鉄入り口";
+
+"type.railway.subway_entrance.ekb" = "地下鉄入り口";
+
+"type.railway.subway_entrance.fukuoka" = "地下鉄入り口";
+
+"type.railway.subway_entrance.glasgow" = "地下鉄入り口";
+
+"type.railway.subway_entrance.guangzhou" = "地下鉄入り口";
+
+"type.railway.subway_entrance.hamburg" = "地下鉄入り口";
+
+"type.railway.subway_entrance.helsinki" = "地下鉄入り口";
+
+"type.railway.subway_entrance.hiroshima" = "地下鉄入り口";
+
+"type.railway.subway_entrance.isfahan" = "地下鉄入り口";
+
+"type.railway.subway_entrance.istanbul" = "地下鉄入り口";
+
+"type.railway.subway_entrance.izmir" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kazan" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kharkiv" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kiev" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kobe" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kolkata" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kunming" = "地下鉄入り口";
+
+"type.railway.subway_entrance.kyoto" = "地下鉄入り口";
+
+"type.railway.subway_entrance.la" = "地下鉄入り口";
+
+"type.railway.subway_entrance.lausanne" = "地下鉄入り口";
+
+"type.railway.subway_entrance.lille" = "地下鉄入り口";
+
+"type.railway.subway_entrance.lima" = "地下鉄入り口";
+
+"type.railway.subway_entrance.lisboa" = "地下鉄入り口";
+
+"type.railway.subway_entrance.lisbon" = "地下鉄入り口";
+
+"type.railway.subway_entrance.london" = "地下鉄入り口";
+
+"type.railway.subway_entrance.lyon" = "地下鉄入り口";
+
+"type.railway.subway_entrance.madrid" = "地下鉄入り口";
+
+"type.railway.subway_entrance.malaga" = "地下鉄入り口";
+
+"type.railway.subway_entrance.manila" = "地下鉄入り口";
+
+"type.railway.subway_entrance.maracaibo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.mashhad" = "地下鉄入り口";
+
+"type.railway.subway_entrance.mecca" = "地下鉄入り口";
+
+"type.railway.subway_entrance.medellin" = "地下鉄入り口";
+
+"type.railway.subway_entrance.mexico" = "地下鉄入り口";
+
+"type.railway.subway_entrance.milan" = "地下鉄入り口";
+
+"type.railway.subway_entrance.minsk" = "地下鉄入り口";
+
+"type.railway.subway_entrance.montreal" = "地下鉄入り口";
+
+"type.railway.subway_entrance.moscow" = "地下鉄入り口";
+
+"type.railway.subway_entrance.munchen" = "地下鉄入り口";
+
+"type.railway.subway_entrance.nagoya" = "地下鉄入り口";
+
+"type.railway.subway_entrance.newyork" = "地下鉄入り口";
+
+"type.railway.subway_entrance.nnov" = "地下鉄入り口";
+
+"type.railway.subway_entrance.novosibirsk" = "地下鉄入り口";
+
+"type.railway.subway_entrance.osaka" = "地下鉄入り口";
+
+"type.railway.subway_entrance.oslo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.palma" = "地下鉄入り口";
+
+"type.railway.subway_entrance.panama" = "地下鉄入り口";
+
+"type.railway.subway_entrance.paris" = "地下鉄入り口";
+
+"type.railway.subway_entrance.philadelphia" = "地下鉄入り口";
+
+"type.railway.subway_entrance.pyongyang" = "地下鉄入り口";
+
+"type.railway.subway_entrance.rennes" = "地下鉄入り口";
+
+"type.railway.subway_entrance.rio" = "地下鉄入り口";
+
+"type.railway.subway_entrance.roma" = "地下鉄入り口";
+
+"type.railway.subway_entrance.rotterdam" = "地下鉄入り口";
+
+"type.railway.subway_entrance.samara" = "地下鉄入り口";
+
+"type.railway.subway_entrance.santiago" = "地下鉄入り口";
+
+"type.railway.subway_entrance.santo_domingo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.saopaulo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.sapporo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.sendai" = "地下鉄入り口";
+
+"type.railway.subway_entrance.sf" = "地下鉄入り口";
+
+"type.railway.subway_entrance.shanghai" = "地下鉄入り口";
+
+"type.railway.subway_entrance.shiraz" = "地下鉄入り口";
+
+"type.railway.subway_entrance.sofia" = "地下鉄入り口";
+
+"type.railway.subway_entrance.spb" = "地下鉄入り口";
+
+"type.railway.subway_entrance.stockholm" = "地下鉄入り口";
+
+"type.railway.subway_entrance.tabriz" = "地下鉄入り口";
+
+"type.railway.subway_entrance.taipei" = "地下鉄入り口";
+
+"type.railway.subway_entrance.taoyuan" = "地下鉄入り口";
+
+"type.railway.subway_entrance.tashkent" = "地下鉄入り口";
+
+"type.railway.subway_entrance.tbilisi" = "地下鉄入り口";
+
+"type.railway.subway_entrance.tianjin" = "地下鉄入り口";
+
+"type.railway.subway_entrance.tokyo" = "地下鉄入り口";
+
+"type.railway.subway_entrance.valencia" = "地下鉄入り口";
+
+"type.railway.subway_entrance.vienna" = "地下鉄入り口";
+
+"type.railway.subway_entrance.warszawa" = "地下鉄入り口";
+
+"type.railway.subway_entrance.washington" = "地下鉄入り口";
+
+"type.railway.subway_entrance.wuhan" = "地下鉄入り口";
+
+"type.railway.subway_entrance.yerevan" = "地下鉄入り口";
+
+"type.railway.subway_entrance.yokohama" = "地下鉄入り口";
 
 "type.railway.tram" = "トラム";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index c175610c81..65d695632f 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "지하철";
 
+"type.railway.station.subway.adana" = "지하철";
+
+"type.railway.station.subway.algiers" = "지하철";
+
+"type.railway.station.subway.almaty" = "지하철";
+
+"type.railway.station.subway.amsterdam" = "지하철";
+
+"type.railway.station.subway.ankara" = "지하철";
+
+"type.railway.station.subway.athens" = "지하철";
+
+"type.railway.station.subway.baku" = "지하철";
+
+"type.railway.station.subway.bangkok" = "지하철";
+
 "type.railway.station.subway.barcelona" = "지하철";
 
+"type.railway.station.subway.beijing" = "지하철";
+
+"type.railway.station.subway.bengalore" = "지하철";
+
 "type.railway.station.subway.berlin" = "지하철";
 
+"type.railway.station.subway.brasilia" = "지하철";
+
+"type.railway.station.subway.brescia" = "지하철";
+
+"type.railway.station.subway.brussels" = "지하철";
+
+"type.railway.station.subway.bucharest" = "지하철";
+
+"type.railway.station.subway.budapest" = "지하철";
+
+"type.railway.station.subway.buenos_aires" = "지하철";
+
+"type.railway.station.subway.bursa" = "지하철";
+
+"type.railway.station.subway.cairo" = "지하철";
+
+"type.railway.station.subway.caracas" = "지하철";
+
+"type.railway.station.subway.catania" = "지하철";
+
+"type.railway.station.subway.changchun" = "지하철";
+
+"type.railway.station.subway.chengdu" = "지하철";
+
+"type.railway.station.subway.chicago" = "지하철";
+
+"type.railway.station.subway.chongqing" = "지하철";
+
+"type.railway.station.subway.dalian" = "지하철";
+
+"type.railway.station.subway.delhi" = "지하철";
+
+"type.railway.station.subway.dnepro" = "지하철";
+
+"type.railway.station.subway.dubai" = "지하철";
+
+"type.railway.station.subway.ekb" = "지하철";
+
+"type.railway.station.subway.fukuoka" = "지하철";
+
+"type.railway.station.subway.glasgow" = "지하철";
+
+"type.railway.station.subway.guangzhou" = "지하철";
+
+"type.railway.station.subway.hamburg" = "지하철";
+
+"type.railway.station.subway.helsinki" = "지하철";
+
+"type.railway.station.subway.hiroshima" = "지하철";
+
+"type.railway.station.subway.isfahan" = "지하철";
+
+"type.railway.station.subway.istanbul" = "지하철";
+
+"type.railway.station.subway.izmir" = "지하철";
+
+"type.railway.station.subway.kazan" = "지하철";
+
+"type.railway.station.subway.kharkiv" = "지하철";
+
 "type.railway.station.subway.kiev" = "지하철";
 
+"type.railway.station.subway.kobe" = "지하철";
+
+"type.railway.station.subway.kolkata" = "지하철";
+
+"type.railway.station.subway.kunming" = "지하철";
+
+"type.railway.station.subway.kyoto" = "지하철";
+
+"type.railway.station.subway.la" = "지하철";
+
+"type.railway.station.subway.lausanne" = "지하철";
+
+"type.railway.station.subway.lille" = "지하철";
+
+"type.railway.station.subway.lima" = "지하철";
+
+"type.railway.station.subway.lisboa" = "지하철";
+
+"type.railway.station.subway.lisbon" = "지하철";
+
 "type.railway.station.subway.london" = "지하철";
 
+"type.railway.station.subway.lyon" = "지하철";
+
 "type.railway.station.subway.madrid" = "지하철";
 
+"type.railway.station.subway.malaga" = "지하철";
+
+"type.railway.station.subway.manila" = "지하철";
+
+"type.railway.station.subway.maracaibo" = "지하철";
+
+"type.railway.station.subway.mashhad" = "지하철";
+
+"type.railway.station.subway.mecca" = "지하철";
+
+"type.railway.station.subway.medellin" = "지하철";
+
+"type.railway.station.subway.mexico" = "지하철";
+
+"type.railway.station.subway.milan" = "지하철";
+
 "type.railway.station.subway.minsk" = "지하철";
 
+"type.railway.station.subway.montreal" = "지하철";
+
 "type.railway.station.subway.moscow" = "지하철";
 
+"type.railway.station.subway.munchen" = "지하철";
+
+"type.railway.station.subway.nagoya" = "지하철";
+
 "type.railway.station.subway.newyork" = "지하철";
 
+"type.railway.station.subway.nnov" = "지하철";
+
+"type.railway.station.subway.novosibirsk" = "지하철";
+
+"type.railway.station.subway.osaka" = "지하철";
+
+"type.railway.station.subway.oslo" = "지하철";
+
+"type.railway.station.subway.palma" = "지하철";
+
+"type.railway.station.subway.panama" = "지하철";
+
 "type.railway.station.subway.paris" = "지하철";
 
+"type.railway.station.subway.philadelphia" = "지하철";
+
+"type.railway.station.subway.pyongyang" = "지하철";
+
+"type.railway.station.subway.rennes" = "지하철";
+
+"type.railway.station.subway.rio" = "지하철";
+
 "type.railway.station.subway.roma" = "지하철";
 
+"type.railway.station.subway.rotterdam" = "지하철";
+
+"type.railway.station.subway.samara" = "지하철";
+
+"type.railway.station.subway.santiago" = "지하철";
+
+"type.railway.station.subway.santo_domingo" = "지하철";
+
+"type.railway.station.subway.saopaulo" = "지하철";
+
+"type.railway.station.subway.sapporo" = "지하철";
+
+"type.railway.station.subway.sendai" = "지하철";
+
+"type.railway.station.subway.sf" = "지하철";
+
+"type.railway.station.subway.shanghai" = "지하철";
+
+"type.railway.station.subway.shiraz" = "지하철";
+
+"type.railway.station.subway.sofia" = "지하철";
+
 "type.railway.station.subway.spb" = "지하철";
 
+"type.railway.station.subway.stockholm" = "지하철";
+
+"type.railway.station.subway.tabriz" = "지하철";
+
+"type.railway.station.subway.taipei" = "지하철";
+
+"type.railway.station.subway.taoyuan" = "지하철";
+
+"type.railway.station.subway.tashkent" = "지하철";
+
+"type.railway.station.subway.tbilisi" = "지하철";
+
+"type.railway.station.subway.tianjin" = "지하철";
+
+"type.railway.station.subway.tokyo" = "지하철";
+
+"type.railway.station.subway.valencia" = "지하철";
+
+"type.railway.station.subway.vienna" = "지하철";
+
+"type.railway.station.subway.warszawa" = "지하철";
+
+"type.railway.station.subway.washington" = "지하철";
+
+"type.railway.station.subway.wuhan" = "지하철";
+
+"type.railway.station.subway.yerevan" = "지하철";
+
+"type.railway.station.subway.yokohama" = "지하철";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "지하철 입구";
 
-"type.railway.subway_entrance.barcelona" = "지하철";
+"type.railway.subway_entrance.adana" = "지하철 입구";
 
-"type.railway.subway_entrance.berlin" = "지하철";
+"type.railway.subway_entrance.algiers" = "지하철 입구";
 
-"type.railway.subway_entrance.kiev" = "지하철";
+"type.railway.subway_entrance.almaty" = "지하철 입구";
 
-"type.railway.subway_entrance.london" = "지하철";
+"type.railway.subway_entrance.amsterdam" = "지하철 입구";
 
-"type.railway.subway_entrance.madrid" = "지하철";
+"type.railway.subway_entrance.ankara" = "지하철 입구";
 
-"type.railway.subway_entrance.minsk" = "지하철";
+"type.railway.subway_entrance.athens" = "지하철 입구";
 
-"type.railway.subway_entrance.moscow" = "지하철";
+"type.railway.subway_entrance.baku" = "지하철 입구";
 
-"type.railway.subway_entrance.newyork" = "지하철";
+"type.railway.subway_entrance.bangkok" = "지하철 입구";
 
-"type.railway.subway_entrance.paris" = "지하철";
+"type.railway.subway_entrance.barcelona" = "지하철 입구";
 
-"type.railway.subway_entrance.roma" = "지하철";
+"type.railway.subway_entrance.beijing" = "지하철 입구";
 
-"type.railway.subway_entrance.spb" = "지하철";
+"type.railway.subway_entrance.bengalore" = "지하철 입구";
+
+"type.railway.subway_entrance.berlin" = "지하철 입구";
+
+"type.railway.subway_entrance.brasilia" = "지하철 입구";
+
+"type.railway.subway_entrance.brescia" = "지하철 입구";
+
+"type.railway.subway_entrance.brussels" = "지하철 입구";
+
+"type.railway.subway_entrance.bucharest" = "지하철 입구";
+
+"type.railway.subway_entrance.budapest" = "지하철 입구";
+
+"type.railway.subway_entrance.buenos_aires" = "지하철 입구";
+
+"type.railway.subway_entrance.bursa" = "지하철 입구";
+
+"type.railway.subway_entrance.cairo" = "지하철 입구";
+
+"type.railway.subway_entrance.caracas" = "지하철 입구";
+
+"type.railway.subway_entrance.catania" = "지하철 입구";
+
+"type.railway.subway_entrance.changchun" = "지하철 입구";
+
+"type.railway.subway_entrance.chengdu" = "지하철 입구";
+
+"type.railway.subway_entrance.chicago" = "지하철 입구";
+
+"type.railway.subway_entrance.chongqing" = "지하철 입구";
+
+"type.railway.subway_entrance.dalian" = "지하철 입구";
+
+"type.railway.subway_entrance.delhi" = "지하철 입구";
+
+"type.railway.subway_entrance.dnepro" = "지하철 입구";
+
+"type.railway.subway_entrance.dubai" = "지하철 입구";
+
+"type.railway.subway_entrance.ekb" = "지하철 입구";
+
+"type.railway.subway_entrance.fukuoka" = "지하철 입구";
+
+"type.railway.subway_entrance.glasgow" = "지하철 입구";
+
+"type.railway.subway_entrance.guangzhou" = "지하철 입구";
+
+"type.railway.subway_entrance.hamburg" = "지하철 입구";
+
+"type.railway.subway_entrance.helsinki" = "지하철 입구";
+
+"type.railway.subway_entrance.hiroshima" = "지하철 입구";
+
+"type.railway.subway_entrance.isfahan" = "지하철 입구";
+
+"type.railway.subway_entrance.istanbul" = "지하철 입구";
+
+"type.railway.subway_entrance.izmir" = "지하철 입구";
+
+"type.railway.subway_entrance.kazan" = "지하철 입구";
+
+"type.railway.subway_entrance.kharkiv" = "지하철 입구";
+
+"type.railway.subway_entrance.kiev" = "지하철 입구";
+
+"type.railway.subway_entrance.kobe" = "지하철 입구";
+
+"type.railway.subway_entrance.kolkata" = "지하철 입구";
+
+"type.railway.subway_entrance.kunming" = "지하철 입구";
+
+"type.railway.subway_entrance.kyoto" = "지하철 입구";
+
+"type.railway.subway_entrance.la" = "지하철 입구";
+
+"type.railway.subway_entrance.lausanne" = "지하철 입구";
+
+"type.railway.subway_entrance.lille" = "지하철 입구";
+
+"type.railway.subway_entrance.lima" = "지하철 입구";
+
+"type.railway.subway_entrance.lisboa" = "지하철 입구";
+
+"type.railway.subway_entrance.lisbon" = "지하철 입구";
+
+"type.railway.subway_entrance.london" = "지하철 입구";
+
+"type.railway.subway_entrance.lyon" = "지하철 입구";
+
+"type.railway.subway_entrance.madrid" = "지하철 입구";
+
+"type.railway.subway_entrance.malaga" = "지하철 입구";
+
+"type.railway.subway_entrance.manila" = "지하철 입구";
+
+"type.railway.subway_entrance.maracaibo" = "지하철 입구";
+
+"type.railway.subway_entrance.mashhad" = "지하철 입구";
+
+"type.railway.subway_entrance.mecca" = "지하철 입구";
+
+"type.railway.subway_entrance.medellin" = "지하철 입구";
+
+"type.railway.subway_entrance.mexico" = "지하철 입구";
+
+"type.railway.subway_entrance.milan" = "지하철 입구";
+
+"type.railway.subway_entrance.minsk" = "지하철 입구";
+
+"type.railway.subway_entrance.montreal" = "지하철 입구";
+
+"type.railway.subway_entrance.moscow" = "지하철 입구";
+
+"type.railway.subway_entrance.munchen" = "지하철 입구";
+
+"type.railway.subway_entrance.nagoya" = "지하철 입구";
+
+"type.railway.subway_entrance.newyork" = "지하철 입구";
+
+"type.railway.subway_entrance.nnov" = "지하철 입구";
+
+"type.railway.subway_entrance.novosibirsk" = "지하철 입구";
+
+"type.railway.subway_entrance.osaka" = "지하철 입구";
+
+"type.railway.subway_entrance.oslo" = "지하철 입구";
+
+"type.railway.subway_entrance.palma" = "지하철 입구";
+
+"type.railway.subway_entrance.panama" = "지하철 입구";
+
+"type.railway.subway_entrance.paris" = "지하철 입구";
+
+"type.railway.subway_entrance.philadelphia" = "지하철 입구";
+
+"type.railway.subway_entrance.pyongyang" = "지하철 입구";
+
+"type.railway.subway_entrance.rennes" = "지하철 입구";
+
+"type.railway.subway_entrance.rio" = "지하철 입구";
+
+"type.railway.subway_entrance.roma" = "지하철 입구";
+
+"type.railway.subway_entrance.rotterdam" = "지하철 입구";
+
+"type.railway.subway_entrance.samara" = "지하철 입구";
+
+"type.railway.subway_entrance.santiago" = "지하철 입구";
+
+"type.railway.subway_entrance.santo_domingo" = "지하철 입구";
+
+"type.railway.subway_entrance.saopaulo" = "지하철 입구";
+
+"type.railway.subway_entrance.sapporo" = "지하철 입구";
+
+"type.railway.subway_entrance.sendai" = "지하철 입구";
+
+"type.railway.subway_entrance.sf" = "지하철 입구";
+
+"type.railway.subway_entrance.shanghai" = "지하철 입구";
+
+"type.railway.subway_entrance.shiraz" = "지하철 입구";
+
+"type.railway.subway_entrance.sofia" = "지하철 입구";
+
+"type.railway.subway_entrance.spb" = "지하철 입구";
+
+"type.railway.subway_entrance.stockholm" = "지하철 입구";
+
+"type.railway.subway_entrance.tabriz" = "지하철 입구";
+
+"type.railway.subway_entrance.taipei" = "지하철 입구";
+
+"type.railway.subway_entrance.taoyuan" = "지하철 입구";
+
+"type.railway.subway_entrance.tashkent" = "지하철 입구";
+
+"type.railway.subway_entrance.tbilisi" = "지하철 입구";
+
+"type.railway.subway_entrance.tianjin" = "지하철 입구";
+
+"type.railway.subway_entrance.tokyo" = "지하철 입구";
+
+"type.railway.subway_entrance.valencia" = "지하철 입구";
+
+"type.railway.subway_entrance.vienna" = "지하철 입구";
+
+"type.railway.subway_entrance.warszawa" = "지하철 입구";
+
+"type.railway.subway_entrance.washington" = "지하철 입구";
+
+"type.railway.subway_entrance.wuhan" = "지하철 입구";
+
+"type.railway.subway_entrance.yerevan" = "지하철 입구";
+
+"type.railway.subway_entrance.yokohama" = "지하철 입구";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index a433c39f59..25d7ad5467 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "भुयारी मार्ग";
 
+"type.railway.station.subway.adana" = "भुयारी मार्ग";
+
+"type.railway.station.subway.algiers" = "भुयारी मार्ग";
+
+"type.railway.station.subway.almaty" = "भुयारी मार्ग";
+
+"type.railway.station.subway.amsterdam" = "भुयारी मार्ग";
+
+"type.railway.station.subway.ankara" = "भुयारी मार्ग";
+
+"type.railway.station.subway.athens" = "भुयारी मार्ग";
+
+"type.railway.station.subway.baku" = "भुयारी मार्ग";
+
+"type.railway.station.subway.bangkok" = "भुयारी मार्ग";
+
 "type.railway.station.subway.barcelona" = "भुयारी मार्ग";
 
+"type.railway.station.subway.beijing" = "भुयारी मार्ग";
+
+"type.railway.station.subway.bengalore" = "भुयारी मार्ग";
+
 "type.railway.station.subway.berlin" = "भुयारी मार्ग";
 
+"type.railway.station.subway.brasilia" = "भुयारी मार्ग";
+
+"type.railway.station.subway.brescia" = "भुयारी मार्ग";
+
+"type.railway.station.subway.brussels" = "भुयारी मार्ग";
+
+"type.railway.station.subway.bucharest" = "भुयारी मार्ग";
+
+"type.railway.station.subway.budapest" = "भुयारी मार्ग";
+
+"type.railway.station.subway.buenos_aires" = "भुयारी मार्ग";
+
+"type.railway.station.subway.bursa" = "भुयारी मार्ग";
+
+"type.railway.station.subway.cairo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.caracas" = "भुयारी मार्ग";
+
+"type.railway.station.subway.catania" = "भुयारी मार्ग";
+
+"type.railway.station.subway.changchun" = "भुयारी मार्ग";
+
+"type.railway.station.subway.chengdu" = "भुयारी मार्ग";
+
+"type.railway.station.subway.chicago" = "भुयारी मार्ग";
+
+"type.railway.station.subway.chongqing" = "भुयारी मार्ग";
+
+"type.railway.station.subway.dalian" = "भुयारी मार्ग";
+
+"type.railway.station.subway.delhi" = "भुयारी मार्ग";
+
+"type.railway.station.subway.dnepro" = "भुयारी मार्ग";
+
+"type.railway.station.subway.dubai" = "भुयारी मार्ग";
+
+"type.railway.station.subway.ekb" = "भुयारी मार्ग";
+
+"type.railway.station.subway.fukuoka" = "भुयारी मार्ग";
+
+"type.railway.station.subway.glasgow" = "भुयारी मार्ग";
+
+"type.railway.station.subway.guangzhou" = "भुयारी मार्ग";
+
+"type.railway.station.subway.hamburg" = "भुयारी मार्ग";
+
+"type.railway.station.subway.helsinki" = "भुयारी मार्ग";
+
+"type.railway.station.subway.hiroshima" = "भुयारी मार्ग";
+
+"type.railway.station.subway.isfahan" = "भुयारी मार्ग";
+
+"type.railway.station.subway.istanbul" = "भुयारी मार्ग";
+
+"type.railway.station.subway.izmir" = "भुयारी मार्ग";
+
+"type.railway.station.subway.kazan" = "भुयारी मार्ग";
+
+"type.railway.station.subway.kharkiv" = "भुयारी मार्ग";
+
 "type.railway.station.subway.kiev" = "भुयारी मार्ग";
 
+"type.railway.station.subway.kobe" = "भुयारी मार्ग";
+
+"type.railway.station.subway.kolkata" = "भुयारी मार्ग";
+
+"type.railway.station.subway.kunming" = "भुयारी मार्ग";
+
+"type.railway.station.subway.kyoto" = "भुयारी मार्ग";
+
+"type.railway.station.subway.la" = "भुयारी मार्ग";
+
+"type.railway.station.subway.lausanne" = "भुयारी मार्ग";
+
+"type.railway.station.subway.lille" = "भुयारी मार्ग";
+
+"type.railway.station.subway.lima" = "भुयारी मार्ग";
+
+"type.railway.station.subway.lisboa" = "भुयारी मार्ग";
+
+"type.railway.station.subway.lisbon" = "भुयारी मार्ग";
+
 "type.railway.station.subway.london" = "भुयारी मार्ग";
 
+"type.railway.station.subway.lyon" = "भुयारी मार्ग";
+
 "type.railway.station.subway.madrid" = "भुयारी मार्ग";
 
+"type.railway.station.subway.malaga" = "भुयारी मार्ग";
+
+"type.railway.station.subway.manila" = "भुयारी मार्ग";
+
+"type.railway.station.subway.maracaibo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.mashhad" = "भुयारी मार्ग";
+
+"type.railway.station.subway.mecca" = "भुयारी मार्ग";
+
+"type.railway.station.subway.medellin" = "भुयारी मार्ग";
+
+"type.railway.station.subway.mexico" = "भुयारी मार्ग";
+
+"type.railway.station.subway.milan" = "भुयारी मार्ग";
+
 "type.railway.station.subway.minsk" = "भुयारी मार्ग";
 
+"type.railway.station.subway.montreal" = "भुयारी मार्ग";
+
 "type.railway.station.subway.moscow" = "भुयारी मार्ग";
 
+"type.railway.station.subway.munchen" = "भुयारी मार्ग";
+
+"type.railway.station.subway.nagoya" = "भुयारी मार्ग";
+
 "type.railway.station.subway.newyork" = "भुयारी मार्ग";
 
+"type.railway.station.subway.nnov" = "भुयारी मार्ग";
+
+"type.railway.station.subway.novosibirsk" = "भुयारी मार्ग";
+
+"type.railway.station.subway.osaka" = "भुयारी मार्ग";
+
+"type.railway.station.subway.oslo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.palma" = "भुयारी मार्ग";
+
+"type.railway.station.subway.panama" = "भुयारी मार्ग";
+
 "type.railway.station.subway.paris" = "भुयारी मार्ग";
 
+"type.railway.station.subway.philadelphia" = "भुयारी मार्ग";
+
+"type.railway.station.subway.pyongyang" = "भुयारी मार्ग";
+
+"type.railway.station.subway.rennes" = "भुयारी मार्ग";
+
+"type.railway.station.subway.rio" = "भुयारी मार्ग";
+
 "type.railway.station.subway.roma" = "भुयारी मार्ग";
 
+"type.railway.station.subway.rotterdam" = "भुयारी मार्ग";
+
+"type.railway.station.subway.samara" = "भुयारी मार्ग";
+
+"type.railway.station.subway.santiago" = "भुयारी मार्ग";
+
+"type.railway.station.subway.santo_domingo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.saopaulo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.sapporo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.sendai" = "भुयारी मार्ग";
+
+"type.railway.station.subway.sf" = "भुयारी मार्ग";
+
+"type.railway.station.subway.shanghai" = "भुयारी मार्ग";
+
+"type.railway.station.subway.shiraz" = "भुयारी मार्ग";
+
+"type.railway.station.subway.sofia" = "भुयारी मार्ग";
+
 "type.railway.station.subway.spb" = "भुयारी मार्ग";
 
+"type.railway.station.subway.stockholm" = "भुयारी मार्ग";
+
+"type.railway.station.subway.tabriz" = "भुयारी मार्ग";
+
+"type.railway.station.subway.taipei" = "भुयारी मार्ग";
+
+"type.railway.station.subway.taoyuan" = "भुयारी मार्ग";
+
+"type.railway.station.subway.tashkent" = "भुयारी मार्ग";
+
+"type.railway.station.subway.tbilisi" = "भुयारी मार्ग";
+
+"type.railway.station.subway.tianjin" = "भुयारी मार्ग";
+
+"type.railway.station.subway.tokyo" = "भुयारी मार्ग";
+
+"type.railway.station.subway.valencia" = "भुयारी मार्ग";
+
+"type.railway.station.subway.vienna" = "भुयारी मार्ग";
+
+"type.railway.station.subway.warszawa" = "भुयारी मार्ग";
+
+"type.railway.station.subway.washington" = "भुयारी मार्ग";
+
+"type.railway.station.subway.wuhan" = "भुयारी मार्ग";
+
+"type.railway.station.subway.yerevan" = "भुयारी मार्ग";
+
+"type.railway.station.subway.yokohama" = "भुयारी मार्ग";
+
 "type.railway.subway" = "भुयारी मार्गिका";
 
 "type.railway.subway.bridge" = "भुयारी मार्गिका";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.barcelona" = "भुयारी मार्ग";
+"type.railway.subway_entrance.adana" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.berlin" = "भुयारी मार्ग";
+"type.railway.subway_entrance.algiers" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.kiev" = "भुयारी मार्ग";
+"type.railway.subway_entrance.almaty" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.london" = "भुयारी मार्ग";
+"type.railway.subway_entrance.amsterdam" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.madrid" = "भुयारी मार्ग";
+"type.railway.subway_entrance.ankara" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.minsk" = "भुयारी मार्ग";
+"type.railway.subway_entrance.athens" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.moscow" = "भुयारी मार्ग";
+"type.railway.subway_entrance.baku" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.newyork" = "भुयारी मार्ग";
+"type.railway.subway_entrance.bangkok" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.paris" = "भुयारी मार्ग";
+"type.railway.subway_entrance.barcelona" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.roma" = "भुयारी मार्ग";
+"type.railway.subway_entrance.beijing" = "भुयारी प्रवेशद्वार";
 
-"type.railway.subway_entrance.spb" = "भुयारी मार्ग";
+"type.railway.subway_entrance.bengalore" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.berlin" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.brasilia" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.brescia" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.brussels" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.bucharest" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.budapest" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.buenos_aires" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.bursa" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.cairo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.caracas" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.catania" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.changchun" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.chengdu" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.chicago" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.chongqing" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.dalian" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.delhi" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.dnepro" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.dubai" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.ekb" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.fukuoka" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.glasgow" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.guangzhou" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.hamburg" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.helsinki" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.hiroshima" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.isfahan" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.istanbul" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.izmir" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kazan" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kharkiv" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kiev" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kobe" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kolkata" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kunming" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.kyoto" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.la" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.lausanne" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.lille" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.lima" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.lisboa" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.lisbon" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.london" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.lyon" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.madrid" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.malaga" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.manila" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.maracaibo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.mashhad" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.mecca" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.medellin" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.mexico" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.milan" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.minsk" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.montreal" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.moscow" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.munchen" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.nagoya" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.newyork" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.nnov" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.novosibirsk" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.osaka" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.oslo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.palma" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.panama" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.paris" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.philadelphia" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.pyongyang" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.rennes" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.rio" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.roma" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.rotterdam" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.samara" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.santiago" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.santo_domingo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.saopaulo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.sapporo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.sendai" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.sf" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.shanghai" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.shiraz" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.sofia" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.spb" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.stockholm" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.tabriz" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.taipei" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.taoyuan" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.tashkent" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.tbilisi" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.tianjin" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.tokyo" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.valencia" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.vienna" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.warszawa" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.washington" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.wuhan" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.yerevan" = "भुयारी प्रवेशद्वार";
+
+"type.railway.subway_entrance.yokohama" = "भुयारी प्रवेशद्वार";
 
 "type.railway.tram" = "ट्राम मार्गिका";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 9e61259480..1cde7e9fb9 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "T-bane";
 
+"type.railway.station.subway.adana" = "T-bane";
+
+"type.railway.station.subway.algiers" = "T-bane";
+
+"type.railway.station.subway.almaty" = "T-bane";
+
+"type.railway.station.subway.amsterdam" = "T-bane";
+
+"type.railway.station.subway.ankara" = "T-bane";
+
+"type.railway.station.subway.athens" = "T-bane";
+
+"type.railway.station.subway.baku" = "T-bane";
+
+"type.railway.station.subway.bangkok" = "T-bane";
+
 "type.railway.station.subway.barcelona" = "T-bane";
 
+"type.railway.station.subway.beijing" = "T-bane";
+
+"type.railway.station.subway.bengalore" = "T-bane";
+
 "type.railway.station.subway.berlin" = "T-bane";
 
+"type.railway.station.subway.brasilia" = "T-bane";
+
+"type.railway.station.subway.brescia" = "T-bane";
+
+"type.railway.station.subway.brussels" = "T-bane";
+
+"type.railway.station.subway.bucharest" = "T-bane";
+
+"type.railway.station.subway.budapest" = "T-bane";
+
+"type.railway.station.subway.buenos_aires" = "T-bane";
+
+"type.railway.station.subway.bursa" = "T-bane";
+
+"type.railway.station.subway.cairo" = "T-bane";
+
+"type.railway.station.subway.caracas" = "T-bane";
+
+"type.railway.station.subway.catania" = "T-bane";
+
+"type.railway.station.subway.changchun" = "T-bane";
+
+"type.railway.station.subway.chengdu" = "T-bane";
+
+"type.railway.station.subway.chicago" = "T-bane";
+
+"type.railway.station.subway.chongqing" = "T-bane";
+
+"type.railway.station.subway.dalian" = "T-bane";
+
+"type.railway.station.subway.delhi" = "T-bane";
+
+"type.railway.station.subway.dnepro" = "T-bane";
+
+"type.railway.station.subway.dubai" = "T-bane";
+
+"type.railway.station.subway.ekb" = "T-bane";
+
+"type.railway.station.subway.fukuoka" = "T-bane";
+
+"type.railway.station.subway.glasgow" = "T-bane";
+
+"type.railway.station.subway.guangzhou" = "T-bane";
+
+"type.railway.station.subway.hamburg" = "T-bane";
+
+"type.railway.station.subway.helsinki" = "T-bane";
+
+"type.railway.station.subway.hiroshima" = "T-bane";
+
+"type.railway.station.subway.isfahan" = "T-bane";
+
+"type.railway.station.subway.istanbul" = "T-bane";
+
+"type.railway.station.subway.izmir" = "T-bane";
+
+"type.railway.station.subway.kazan" = "T-bane";
+
+"type.railway.station.subway.kharkiv" = "T-bane";
+
 "type.railway.station.subway.kiev" = "T-bane";
 
+"type.railway.station.subway.kobe" = "T-bane";
+
+"type.railway.station.subway.kolkata" = "T-bane";
+
+"type.railway.station.subway.kunming" = "T-bane";
+
+"type.railway.station.subway.kyoto" = "T-bane";
+
+"type.railway.station.subway.la" = "T-bane";
+
+"type.railway.station.subway.lausanne" = "T-bane";
+
+"type.railway.station.subway.lille" = "T-bane";
+
+"type.railway.station.subway.lima" = "T-bane";
+
+"type.railway.station.subway.lisboa" = "T-bane";
+
+"type.railway.station.subway.lisbon" = "T-bane";
+
 "type.railway.station.subway.london" = "T-bane";
 
+"type.railway.station.subway.lyon" = "T-bane";
+
 "type.railway.station.subway.madrid" = "T-bane";
 
+"type.railway.station.subway.malaga" = "T-bane";
+
+"type.railway.station.subway.manila" = "T-bane";
+
+"type.railway.station.subway.maracaibo" = "T-bane";
+
+"type.railway.station.subway.mashhad" = "T-bane";
+
+"type.railway.station.subway.mecca" = "T-bane";
+
+"type.railway.station.subway.medellin" = "T-bane";
+
+"type.railway.station.subway.mexico" = "T-bane";
+
+"type.railway.station.subway.milan" = "T-bane";
+
 "type.railway.station.subway.minsk" = "T-bane";
 
+"type.railway.station.subway.montreal" = "T-bane";
+
 "type.railway.station.subway.moscow" = "T-bane";
 
+"type.railway.station.subway.munchen" = "T-bane";
+
+"type.railway.station.subway.nagoya" = "T-bane";
+
 "type.railway.station.subway.newyork" = "T-bane";
 
+"type.railway.station.subway.nnov" = "T-bane";
+
+"type.railway.station.subway.novosibirsk" = "T-bane";
+
+"type.railway.station.subway.osaka" = "T-bane";
+
+"type.railway.station.subway.oslo" = "T-bane";
+
+"type.railway.station.subway.palma" = "T-bane";
+
+"type.railway.station.subway.panama" = "T-bane";
+
 "type.railway.station.subway.paris" = "T-bane";
 
+"type.railway.station.subway.philadelphia" = "T-bane";
+
+"type.railway.station.subway.pyongyang" = "T-bane";
+
+"type.railway.station.subway.rennes" = "T-bane";
+
+"type.railway.station.subway.rio" = "T-bane";
+
 "type.railway.station.subway.roma" = "T-bane";
 
+"type.railway.station.subway.rotterdam" = "T-bane";
+
+"type.railway.station.subway.samara" = "T-bane";
+
+"type.railway.station.subway.santiago" = "T-bane";
+
+"type.railway.station.subway.santo_domingo" = "T-bane";
+
+"type.railway.station.subway.saopaulo" = "T-bane";
+
+"type.railway.station.subway.sapporo" = "T-bane";
+
+"type.railway.station.subway.sendai" = "T-bane";
+
+"type.railway.station.subway.sf" = "T-bane";
+
+"type.railway.station.subway.shanghai" = "T-bane";
+
+"type.railway.station.subway.shiraz" = "T-bane";
+
+"type.railway.station.subway.sofia" = "T-bane";
+
 "type.railway.station.subway.spb" = "T-bane";
 
+"type.railway.station.subway.stockholm" = "T-bane";
+
+"type.railway.station.subway.tabriz" = "T-bane";
+
+"type.railway.station.subway.taipei" = "T-bane";
+
+"type.railway.station.subway.taoyuan" = "T-bane";
+
+"type.railway.station.subway.tashkent" = "T-bane";
+
+"type.railway.station.subway.tbilisi" = "T-bane";
+
+"type.railway.station.subway.tianjin" = "T-bane";
+
+"type.railway.station.subway.tokyo" = "T-bane";
+
+"type.railway.station.subway.valencia" = "T-bane";
+
+"type.railway.station.subway.vienna" = "T-bane";
+
+"type.railway.station.subway.warszawa" = "T-bane";
+
+"type.railway.station.subway.washington" = "T-bane";
+
+"type.railway.station.subway.wuhan" = "T-bane";
+
+"type.railway.station.subway.yerevan" = "T-bane";
+
+"type.railway.station.subway.yokohama" = "T-bane";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "T-bane inngang";
 
-"type.railway.subway_entrance.barcelona" = "T-bane";
+"type.railway.subway_entrance.adana" = "T-bane inngang";
 
-"type.railway.subway_entrance.berlin" = "T-bane";
+"type.railway.subway_entrance.algiers" = "T-bane inngang";
 
-"type.railway.subway_entrance.kiev" = "T-bane";
+"type.railway.subway_entrance.almaty" = "T-bane inngang";
 
-"type.railway.subway_entrance.london" = "T-bane";
+"type.railway.subway_entrance.amsterdam" = "T-bane inngang";
 
-"type.railway.subway_entrance.madrid" = "T-bane";
+"type.railway.subway_entrance.ankara" = "T-bane inngang";
 
-"type.railway.subway_entrance.minsk" = "T-bane";
+"type.railway.subway_entrance.athens" = "T-bane inngang";
 
-"type.railway.subway_entrance.moscow" = "T-bane";
+"type.railway.subway_entrance.baku" = "T-bane inngang";
 
-"type.railway.subway_entrance.newyork" = "T-bane";
+"type.railway.subway_entrance.bangkok" = "T-bane inngang";
 
-"type.railway.subway_entrance.paris" = "T-bane";
+"type.railway.subway_entrance.barcelona" = "T-bane inngang";
 
-"type.railway.subway_entrance.roma" = "T-bane";
+"type.railway.subway_entrance.beijing" = "T-bane inngang";
 
-"type.railway.subway_entrance.spb" = "T-bane";
+"type.railway.subway_entrance.bengalore" = "T-bane inngang";
+
+"type.railway.subway_entrance.berlin" = "T-bane inngang";
+
+"type.railway.subway_entrance.brasilia" = "T-bane inngang";
+
+"type.railway.subway_entrance.brescia" = "T-bane inngang";
+
+"type.railway.subway_entrance.brussels" = "T-bane inngang";
+
+"type.railway.subway_entrance.bucharest" = "T-bane inngang";
+
+"type.railway.subway_entrance.budapest" = "T-bane inngang";
+
+"type.railway.subway_entrance.buenos_aires" = "T-bane inngang";
+
+"type.railway.subway_entrance.bursa" = "T-bane inngang";
+
+"type.railway.subway_entrance.cairo" = "T-bane inngang";
+
+"type.railway.subway_entrance.caracas" = "T-bane inngang";
+
+"type.railway.subway_entrance.catania" = "T-bane inngang";
+
+"type.railway.subway_entrance.changchun" = "T-bane inngang";
+
+"type.railway.subway_entrance.chengdu" = "T-bane inngang";
+
+"type.railway.subway_entrance.chicago" = "T-bane inngang";
+
+"type.railway.subway_entrance.chongqing" = "T-bane inngang";
+
+"type.railway.subway_entrance.dalian" = "T-bane inngang";
+
+"type.railway.subway_entrance.delhi" = "T-bane inngang";
+
+"type.railway.subway_entrance.dnepro" = "T-bane inngang";
+
+"type.railway.subway_entrance.dubai" = "T-bane inngang";
+
+"type.railway.subway_entrance.ekb" = "T-bane inngang";
+
+"type.railway.subway_entrance.fukuoka" = "T-bane inngang";
+
+"type.railway.subway_entrance.glasgow" = "T-bane inngang";
+
+"type.railway.subway_entrance.guangzhou" = "T-bane inngang";
+
+"type.railway.subway_entrance.hamburg" = "T-bane inngang";
+
+"type.railway.subway_entrance.helsinki" = "T-bane inngang";
+
+"type.railway.subway_entrance.hiroshima" = "T-bane inngang";
+
+"type.railway.subway_entrance.isfahan" = "T-bane inngang";
+
+"type.railway.subway_entrance.istanbul" = "T-bane inngang";
+
+"type.railway.subway_entrance.izmir" = "T-bane inngang";
+
+"type.railway.subway_entrance.kazan" = "T-bane inngang";
+
+"type.railway.subway_entrance.kharkiv" = "T-bane inngang";
+
+"type.railway.subway_entrance.kiev" = "T-bane inngang";
+
+"type.railway.subway_entrance.kobe" = "T-bane inngang";
+
+"type.railway.subway_entrance.kolkata" = "T-bane inngang";
+
+"type.railway.subway_entrance.kunming" = "T-bane inngang";
+
+"type.railway.subway_entrance.kyoto" = "T-bane inngang";
+
+"type.railway.subway_entrance.la" = "T-bane inngang";
+
+"type.railway.subway_entrance.lausanne" = "T-bane inngang";
+
+"type.railway.subway_entrance.lille" = "T-bane inngang";
+
+"type.railway.subway_entrance.lima" = "T-bane inngang";
+
+"type.railway.subway_entrance.lisboa" = "T-bane inngang";
+
+"type.railway.subway_entrance.lisbon" = "T-bane inngang";
+
+"type.railway.subway_entrance.london" = "T-bane inngang";
+
+"type.railway.subway_entrance.lyon" = "T-bane inngang";
+
+"type.railway.subway_entrance.madrid" = "T-bane inngang";
+
+"type.railway.subway_entrance.malaga" = "T-bane inngang";
+
+"type.railway.subway_entrance.manila" = "T-bane inngang";
+
+"type.railway.subway_entrance.maracaibo" = "T-bane inngang";
+
+"type.railway.subway_entrance.mashhad" = "T-bane inngang";
+
+"type.railway.subway_entrance.mecca" = "T-bane inngang";
+
+"type.railway.subway_entrance.medellin" = "T-bane inngang";
+
+"type.railway.subway_entrance.mexico" = "T-bane inngang";
+
+"type.railway.subway_entrance.milan" = "T-bane inngang";
+
+"type.railway.subway_entrance.minsk" = "T-bane inngang";
+
+"type.railway.subway_entrance.montreal" = "T-bane inngang";
+
+"type.railway.subway_entrance.moscow" = "T-bane inngang";
+
+"type.railway.subway_entrance.munchen" = "T-bane inngang";
+
+"type.railway.subway_entrance.nagoya" = "T-bane inngang";
+
+"type.railway.subway_entrance.newyork" = "T-bane inngang";
+
+"type.railway.subway_entrance.nnov" = "T-bane inngang";
+
+"type.railway.subway_entrance.novosibirsk" = "T-bane inngang";
+
+"type.railway.subway_entrance.osaka" = "T-bane inngang";
+
+"type.railway.subway_entrance.oslo" = "T-bane inngang";
+
+"type.railway.subway_entrance.palma" = "T-bane inngang";
+
+"type.railway.subway_entrance.panama" = "T-bane inngang";
+
+"type.railway.subway_entrance.paris" = "T-bane inngang";
+
+"type.railway.subway_entrance.philadelphia" = "T-bane inngang";
+
+"type.railway.subway_entrance.pyongyang" = "T-bane inngang";
+
+"type.railway.subway_entrance.rennes" = "T-bane inngang";
+
+"type.railway.subway_entrance.rio" = "T-bane inngang";
+
+"type.railway.subway_entrance.roma" = "T-bane inngang";
+
+"type.railway.subway_entrance.rotterdam" = "T-bane inngang";
+
+"type.railway.subway_entrance.samara" = "T-bane inngang";
+
+"type.railway.subway_entrance.santiago" = "T-bane inngang";
+
+"type.railway.subway_entrance.santo_domingo" = "T-bane inngang";
+
+"type.railway.subway_entrance.saopaulo" = "T-bane inngang";
+
+"type.railway.subway_entrance.sapporo" = "T-bane inngang";
+
+"type.railway.subway_entrance.sendai" = "T-bane inngang";
+
+"type.railway.subway_entrance.sf" = "T-bane inngang";
+
+"type.railway.subway_entrance.shanghai" = "T-bane inngang";
+
+"type.railway.subway_entrance.shiraz" = "T-bane inngang";
+
+"type.railway.subway_entrance.sofia" = "T-bane inngang";
+
+"type.railway.subway_entrance.spb" = "T-bane inngang";
+
+"type.railway.subway_entrance.stockholm" = "T-bane inngang";
+
+"type.railway.subway_entrance.tabriz" = "T-bane inngang";
+
+"type.railway.subway_entrance.taipei" = "T-bane inngang";
+
+"type.railway.subway_entrance.taoyuan" = "T-bane inngang";
+
+"type.railway.subway_entrance.tashkent" = "T-bane inngang";
+
+"type.railway.subway_entrance.tbilisi" = "T-bane inngang";
+
+"type.railway.subway_entrance.tianjin" = "T-bane inngang";
+
+"type.railway.subway_entrance.tokyo" = "T-bane inngang";
+
+"type.railway.subway_entrance.valencia" = "T-bane inngang";
+
+"type.railway.subway_entrance.vienna" = "T-bane inngang";
+
+"type.railway.subway_entrance.warszawa" = "T-bane inngang";
+
+"type.railway.subway_entrance.washington" = "T-bane inngang";
+
+"type.railway.subway_entrance.wuhan" = "T-bane inngang";
+
+"type.railway.subway_entrance.yerevan" = "T-bane inngang";
+
+"type.railway.subway_entrance.yokohama" = "T-bane inngang";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 1886eb821d..b8be462e37 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -2689,27 +2689,223 @@
 
 "type.railway.station.subway" = "Metrostation";
 
-"type.railway.station.subway.barcelona" = "Metro";
+"type.railway.station.subway.adana" = "Metrostation";
 
-"type.railway.station.subway.berlin" = "Metro";
+"type.railway.station.subway.algiers" = "Metrostation";
 
-"type.railway.station.subway.kiev" = "Metro";
+"type.railway.station.subway.almaty" = "Metrostation";
 
-"type.railway.station.subway.london" = "Metro";
+"type.railway.station.subway.amsterdam" = "Metrostation";
 
-"type.railway.station.subway.madrid" = "Metro";
+"type.railway.station.subway.ankara" = "Metrostation";
 
-"type.railway.station.subway.minsk" = "Metro";
+"type.railway.station.subway.athens" = "Metrostation";
 
-"type.railway.station.subway.moscow" = "Metro";
+"type.railway.station.subway.baku" = "Metrostation";
 
-"type.railway.station.subway.newyork" = "Metro";
+"type.railway.station.subway.bangkok" = "Metrostation";
 
-"type.railway.station.subway.paris" = "Metro";
+"type.railway.station.subway.barcelona" = "Metrostation";
 
-"type.railway.station.subway.roma" = "Metro";
+"type.railway.station.subway.beijing" = "Metrostation";
 
-"type.railway.station.subway.spb" = "Metro";
+"type.railway.station.subway.bengalore" = "Metrostation";
+
+"type.railway.station.subway.berlin" = "Metrostation";
+
+"type.railway.station.subway.brasilia" = "Metrostation";
+
+"type.railway.station.subway.brescia" = "Metrostation";
+
+"type.railway.station.subway.brussels" = "Metrostation";
+
+"type.railway.station.subway.bucharest" = "Metrostation";
+
+"type.railway.station.subway.budapest" = "Metrostation";
+
+"type.railway.station.subway.buenos_aires" = "Metrostation";
+
+"type.railway.station.subway.bursa" = "Metrostation";
+
+"type.railway.station.subway.cairo" = "Metrostation";
+
+"type.railway.station.subway.caracas" = "Metrostation";
+
+"type.railway.station.subway.catania" = "Metrostation";
+
+"type.railway.station.subway.changchun" = "Metrostation";
+
+"type.railway.station.subway.chengdu" = "Metrostation";
+
+"type.railway.station.subway.chicago" = "Metrostation";
+
+"type.railway.station.subway.chongqing" = "Metrostation";
+
+"type.railway.station.subway.dalian" = "Metrostation";
+
+"type.railway.station.subway.delhi" = "Metrostation";
+
+"type.railway.station.subway.dnepro" = "Metrostation";
+
+"type.railway.station.subway.dubai" = "Metrostation";
+
+"type.railway.station.subway.ekb" = "Metrostation";
+
+"type.railway.station.subway.fukuoka" = "Metrostation";
+
+"type.railway.station.subway.glasgow" = "Metrostation";
+
+"type.railway.station.subway.guangzhou" = "Metrostation";
+
+"type.railway.station.subway.hamburg" = "Metrostation";
+
+"type.railway.station.subway.helsinki" = "Metrostation";
+
+"type.railway.station.subway.hiroshima" = "Metrostation";
+
+"type.railway.station.subway.isfahan" = "Metrostation";
+
+"type.railway.station.subway.istanbul" = "Metrostation";
+
+"type.railway.station.subway.izmir" = "Metrostation";
+
+"type.railway.station.subway.kazan" = "Metrostation";
+
+"type.railway.station.subway.kharkiv" = "Metrostation";
+
+"type.railway.station.subway.kiev" = "Metrostation";
+
+"type.railway.station.subway.kobe" = "Metrostation";
+
+"type.railway.station.subway.kolkata" = "Metrostation";
+
+"type.railway.station.subway.kunming" = "Metrostation";
+
+"type.railway.station.subway.kyoto" = "Metrostation";
+
+"type.railway.station.subway.la" = "Metrostation";
+
+"type.railway.station.subway.lausanne" = "Metrostation";
+
+"type.railway.station.subway.lille" = "Metrostation";
+
+"type.railway.station.subway.lima" = "Metrostation";
+
+"type.railway.station.subway.lisboa" = "Metrostation";
+
+"type.railway.station.subway.lisbon" = "Metrostation";
+
+"type.railway.station.subway.london" = "Metrostation";
+
+"type.railway.station.subway.lyon" = "Metrostation";
+
+"type.railway.station.subway.madrid" = "Metrostation";
+
+"type.railway.station.subway.malaga" = "Metrostation";
+
+"type.railway.station.subway.manila" = "Metrostation";
+
+"type.railway.station.subway.maracaibo" = "Metrostation";
+
+"type.railway.station.subway.mashhad" = "Metrostation";
+
+"type.railway.station.subway.mecca" = "Metrostation";
+
+"type.railway.station.subway.medellin" = "Metrostation";
+
+"type.railway.station.subway.mexico" = "Metrostation";
+
+"type.railway.station.subway.milan" = "Metrostation";
+
+"type.railway.station.subway.minsk" = "Metrostation";
+
+"type.railway.station.subway.montreal" = "Metrostation";
+
+"type.railway.station.subway.moscow" = "Metrostation";
+
+"type.railway.station.subway.munchen" = "Metrostation";
+
+"type.railway.station.subway.nagoya" = "Metrostation";
+
+"type.railway.station.subway.newyork" = "Metrostation";
+
+"type.railway.station.subway.nnov" = "Metrostation";
+
+"type.railway.station.subway.novosibirsk" = "Metrostation";
+
+"type.railway.station.subway.osaka" = "Metrostation";
+
+"type.railway.station.subway.oslo" = "Metrostation";
+
+"type.railway.station.subway.palma" = "Metrostation";
+
+"type.railway.station.subway.panama" = "Metrostation";
+
+"type.railway.station.subway.paris" = "Metrostation";
+
+"type.railway.station.subway.philadelphia" = "Metrostation";
+
+"type.railway.station.subway.pyongyang" = "Metrostation";
+
+"type.railway.station.subway.rennes" = "Metrostation";
+
+"type.railway.station.subway.rio" = "Metrostation";
+
+"type.railway.station.subway.roma" = "Metrostation";
+
+"type.railway.station.subway.rotterdam" = "Metrostation";
+
+"type.railway.station.subway.samara" = "Metrostation";
+
+"type.railway.station.subway.santiago" = "Metrostation";
+
+"type.railway.station.subway.santo_domingo" = "Metrostation";
+
+"type.railway.station.subway.saopaulo" = "Metrostation";
+
+"type.railway.station.subway.sapporo" = "Metrostation";
+
+"type.railway.station.subway.sendai" = "Metrostation";
+
+"type.railway.station.subway.sf" = "Metrostation";
+
+"type.railway.station.subway.shanghai" = "Metrostation";
+
+"type.railway.station.subway.shiraz" = "Metrostation";
+
+"type.railway.station.subway.sofia" = "Metrostation";
+
+"type.railway.station.subway.spb" = "Metrostation";
+
+"type.railway.station.subway.stockholm" = "Metrostation";
+
+"type.railway.station.subway.tabriz" = "Metrostation";
+
+"type.railway.station.subway.taipei" = "Metrostation";
+
+"type.railway.station.subway.taoyuan" = "Metrostation";
+
+"type.railway.station.subway.tashkent" = "Metrostation";
+
+"type.railway.station.subway.tbilisi" = "Metrostation";
+
+"type.railway.station.subway.tianjin" = "Metrostation";
+
+"type.railway.station.subway.tokyo" = "Metrostation";
+
+"type.railway.station.subway.valencia" = "Metrostation";
+
+"type.railway.station.subway.vienna" = "Metrostation";
+
+"type.railway.station.subway.warszawa" = "Metrostation";
+
+"type.railway.station.subway.washington" = "Metrostation";
+
+"type.railway.station.subway.wuhan" = "Metrostation";
+
+"type.railway.station.subway.yerevan" = "Metrostation";
+
+"type.railway.station.subway.yokohama" = "Metrostation";
 
 "type.railway.subway" = "Metro";
 
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Metro ingang";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Metro ingang";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Metro ingang";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Metro ingang";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Metro ingang";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Metro ingang";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Metro ingang";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Metro ingang";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Metro ingang";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Metro ingang";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Metro ingang";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Metro ingang";
+
+"type.railway.subway_entrance.berlin" = "Metro ingang";
+
+"type.railway.subway_entrance.brasilia" = "Metro ingang";
+
+"type.railway.subway_entrance.brescia" = "Metro ingang";
+
+"type.railway.subway_entrance.brussels" = "Metro ingang";
+
+"type.railway.subway_entrance.bucharest" = "Metro ingang";
+
+"type.railway.subway_entrance.budapest" = "Metro ingang";
+
+"type.railway.subway_entrance.buenos_aires" = "Metro ingang";
+
+"type.railway.subway_entrance.bursa" = "Metro ingang";
+
+"type.railway.subway_entrance.cairo" = "Metro ingang";
+
+"type.railway.subway_entrance.caracas" = "Metro ingang";
+
+"type.railway.subway_entrance.catania" = "Metro ingang";
+
+"type.railway.subway_entrance.changchun" = "Metro ingang";
+
+"type.railway.subway_entrance.chengdu" = "Metro ingang";
+
+"type.railway.subway_entrance.chicago" = "Metro ingang";
+
+"type.railway.subway_entrance.chongqing" = "Metro ingang";
+
+"type.railway.subway_entrance.dalian" = "Metro ingang";
+
+"type.railway.subway_entrance.delhi" = "Metro ingang";
+
+"type.railway.subway_entrance.dnepro" = "Metro ingang";
+
+"type.railway.subway_entrance.dubai" = "Metro ingang";
+
+"type.railway.subway_entrance.ekb" = "Metro ingang";
+
+"type.railway.subway_entrance.fukuoka" = "Metro ingang";
+
+"type.railway.subway_entrance.glasgow" = "Metro ingang";
+
+"type.railway.subway_entrance.guangzhou" = "Metro ingang";
+
+"type.railway.subway_entrance.hamburg" = "Metro ingang";
+
+"type.railway.subway_entrance.helsinki" = "Metro ingang";
+
+"type.railway.subway_entrance.hiroshima" = "Metro ingang";
+
+"type.railway.subway_entrance.isfahan" = "Metro ingang";
+
+"type.railway.subway_entrance.istanbul" = "Metro ingang";
+
+"type.railway.subway_entrance.izmir" = "Metro ingang";
+
+"type.railway.subway_entrance.kazan" = "Metro ingang";
+
+"type.railway.subway_entrance.kharkiv" = "Metro ingang";
+
+"type.railway.subway_entrance.kiev" = "Metro ingang";
+
+"type.railway.subway_entrance.kobe" = "Metro ingang";
+
+"type.railway.subway_entrance.kolkata" = "Metro ingang";
+
+"type.railway.subway_entrance.kunming" = "Metro ingang";
+
+"type.railway.subway_entrance.kyoto" = "Metro ingang";
+
+"type.railway.subway_entrance.la" = "Metro ingang";
+
+"type.railway.subway_entrance.lausanne" = "Metro ingang";
+
+"type.railway.subway_entrance.lille" = "Metro ingang";
+
+"type.railway.subway_entrance.lima" = "Metro ingang";
+
+"type.railway.subway_entrance.lisboa" = "Metro ingang";
+
+"type.railway.subway_entrance.lisbon" = "Metro ingang";
+
+"type.railway.subway_entrance.london" = "Metro ingang";
+
+"type.railway.subway_entrance.lyon" = "Metro ingang";
+
+"type.railway.subway_entrance.madrid" = "Metro ingang";
+
+"type.railway.subway_entrance.malaga" = "Metro ingang";
+
+"type.railway.subway_entrance.manila" = "Metro ingang";
+
+"type.railway.subway_entrance.maracaibo" = "Metro ingang";
+
+"type.railway.subway_entrance.mashhad" = "Metro ingang";
+
+"type.railway.subway_entrance.mecca" = "Metro ingang";
+
+"type.railway.subway_entrance.medellin" = "Metro ingang";
+
+"type.railway.subway_entrance.mexico" = "Metro ingang";
+
+"type.railway.subway_entrance.milan" = "Metro ingang";
+
+"type.railway.subway_entrance.minsk" = "Metro ingang";
+
+"type.railway.subway_entrance.montreal" = "Metro ingang";
+
+"type.railway.subway_entrance.moscow" = "Metro ingang";
+
+"type.railway.subway_entrance.munchen" = "Metro ingang";
+
+"type.railway.subway_entrance.nagoya" = "Metro ingang";
+
+"type.railway.subway_entrance.newyork" = "Metro ingang";
+
+"type.railway.subway_entrance.nnov" = "Metro ingang";
+
+"type.railway.subway_entrance.novosibirsk" = "Metro ingang";
+
+"type.railway.subway_entrance.osaka" = "Metro ingang";
+
+"type.railway.subway_entrance.oslo" = "Metro ingang";
+
+"type.railway.subway_entrance.palma" = "Metro ingang";
+
+"type.railway.subway_entrance.panama" = "Metro ingang";
+
+"type.railway.subway_entrance.paris" = "Metro ingang";
+
+"type.railway.subway_entrance.philadelphia" = "Metro ingang";
+
+"type.railway.subway_entrance.pyongyang" = "Metro ingang";
+
+"type.railway.subway_entrance.rennes" = "Metro ingang";
+
+"type.railway.subway_entrance.rio" = "Metro ingang";
+
+"type.railway.subway_entrance.roma" = "Metro ingang";
+
+"type.railway.subway_entrance.rotterdam" = "Metro ingang";
+
+"type.railway.subway_entrance.samara" = "Metro ingang";
+
+"type.railway.subway_entrance.santiago" = "Metro ingang";
+
+"type.railway.subway_entrance.santo_domingo" = "Metro ingang";
+
+"type.railway.subway_entrance.saopaulo" = "Metro ingang";
+
+"type.railway.subway_entrance.sapporo" = "Metro ingang";
+
+"type.railway.subway_entrance.sendai" = "Metro ingang";
+
+"type.railway.subway_entrance.sf" = "Metro ingang";
+
+"type.railway.subway_entrance.shanghai" = "Metro ingang";
+
+"type.railway.subway_entrance.shiraz" = "Metro ingang";
+
+"type.railway.subway_entrance.sofia" = "Metro ingang";
+
+"type.railway.subway_entrance.spb" = "Metro ingang";
+
+"type.railway.subway_entrance.stockholm" = "Metro ingang";
+
+"type.railway.subway_entrance.tabriz" = "Metro ingang";
+
+"type.railway.subway_entrance.taipei" = "Metro ingang";
+
+"type.railway.subway_entrance.taoyuan" = "Metro ingang";
+
+"type.railway.subway_entrance.tashkent" = "Metro ingang";
+
+"type.railway.subway_entrance.tbilisi" = "Metro ingang";
+
+"type.railway.subway_entrance.tianjin" = "Metro ingang";
+
+"type.railway.subway_entrance.tokyo" = "Metro ingang";
+
+"type.railway.subway_entrance.valencia" = "Metro ingang";
+
+"type.railway.subway_entrance.vienna" = "Metro ingang";
+
+"type.railway.subway_entrance.warszawa" = "Metro ingang";
+
+"type.railway.subway_entrance.washington" = "Metro ingang";
+
+"type.railway.subway_entrance.wuhan" = "Metro ingang";
+
+"type.railway.subway_entrance.yerevan" = "Metro ingang";
+
+"type.railway.subway_entrance.yokohama" = "Metro ingang";
 
 "type.railway.tram" = "Tram";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 399a4fd744..dff759eeae 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Wejście do metra";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Wejście do metra";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Wejście do metra";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Wejście do metra";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Wejście do metra";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Wejście do metra";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Wejście do metra";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Wejście do metra";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Wejście do metra";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Wejście do metra";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Wejście do metra";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Wejście do metra";
+
+"type.railway.subway_entrance.berlin" = "Wejście do metra";
+
+"type.railway.subway_entrance.brasilia" = "Wejście do metra";
+
+"type.railway.subway_entrance.brescia" = "Wejście do metra";
+
+"type.railway.subway_entrance.brussels" = "Wejście do metra";
+
+"type.railway.subway_entrance.bucharest" = "Wejście do metra";
+
+"type.railway.subway_entrance.budapest" = "Wejście do metra";
+
+"type.railway.subway_entrance.buenos_aires" = "Wejście do metra";
+
+"type.railway.subway_entrance.bursa" = "Wejście do metra";
+
+"type.railway.subway_entrance.cairo" = "Wejście do metra";
+
+"type.railway.subway_entrance.caracas" = "Wejście do metra";
+
+"type.railway.subway_entrance.catania" = "Wejście do metra";
+
+"type.railway.subway_entrance.changchun" = "Wejście do metra";
+
+"type.railway.subway_entrance.chengdu" = "Wejście do metra";
+
+"type.railway.subway_entrance.chicago" = "Wejście do metra";
+
+"type.railway.subway_entrance.chongqing" = "Wejście do metra";
+
+"type.railway.subway_entrance.dalian" = "Wejście do metra";
+
+"type.railway.subway_entrance.delhi" = "Wejście do metra";
+
+"type.railway.subway_entrance.dnepro" = "Wejście do metra";
+
+"type.railway.subway_entrance.dubai" = "Wejście do metra";
+
+"type.railway.subway_entrance.ekb" = "Wejście do metra";
+
+"type.railway.subway_entrance.fukuoka" = "Wejście do metra";
+
+"type.railway.subway_entrance.glasgow" = "Wejście do metra";
+
+"type.railway.subway_entrance.guangzhou" = "Wejście do metra";
+
+"type.railway.subway_entrance.hamburg" = "Wejście do metra";
+
+"type.railway.subway_entrance.helsinki" = "Wejście do metra";
+
+"type.railway.subway_entrance.hiroshima" = "Wejście do metra";
+
+"type.railway.subway_entrance.isfahan" = "Wejście do metra";
+
+"type.railway.subway_entrance.istanbul" = "Wejście do metra";
+
+"type.railway.subway_entrance.izmir" = "Wejście do metra";
+
+"type.railway.subway_entrance.kazan" = "Wejście do metra";
+
+"type.railway.subway_entrance.kharkiv" = "Wejście do metra";
+
+"type.railway.subway_entrance.kiev" = "Wejście do metra";
+
+"type.railway.subway_entrance.kobe" = "Wejście do metra";
+
+"type.railway.subway_entrance.kolkata" = "Wejście do metra";
+
+"type.railway.subway_entrance.kunming" = "Wejście do metra";
+
+"type.railway.subway_entrance.kyoto" = "Wejście do metra";
+
+"type.railway.subway_entrance.la" = "Wejście do metra";
+
+"type.railway.subway_entrance.lausanne" = "Wejście do metra";
+
+"type.railway.subway_entrance.lille" = "Wejście do metra";
+
+"type.railway.subway_entrance.lima" = "Wejście do metra";
+
+"type.railway.subway_entrance.lisboa" = "Wejście do metra";
+
+"type.railway.subway_entrance.lisbon" = "Wejście do metra";
+
+"type.railway.subway_entrance.london" = "Wejście do metra";
+
+"type.railway.subway_entrance.lyon" = "Wejście do metra";
+
+"type.railway.subway_entrance.madrid" = "Wejście do metra";
+
+"type.railway.subway_entrance.malaga" = "Wejście do metra";
+
+"type.railway.subway_entrance.manila" = "Wejście do metra";
+
+"type.railway.subway_entrance.maracaibo" = "Wejście do metra";
+
+"type.railway.subway_entrance.mashhad" = "Wejście do metra";
+
+"type.railway.subway_entrance.mecca" = "Wejście do metra";
+
+"type.railway.subway_entrance.medellin" = "Wejście do metra";
+
+"type.railway.subway_entrance.mexico" = "Wejście do metra";
+
+"type.railway.subway_entrance.milan" = "Wejście do metra";
+
+"type.railway.subway_entrance.minsk" = "Wejście do metra";
+
+"type.railway.subway_entrance.montreal" = "Wejście do metra";
+
+"type.railway.subway_entrance.moscow" = "Wejście do metra";
+
+"type.railway.subway_entrance.munchen" = "Wejście do metra";
+
+"type.railway.subway_entrance.nagoya" = "Wejście do metra";
+
+"type.railway.subway_entrance.newyork" = "Wejście do metra";
+
+"type.railway.subway_entrance.nnov" = "Wejście do metra";
+
+"type.railway.subway_entrance.novosibirsk" = "Wejście do metra";
+
+"type.railway.subway_entrance.osaka" = "Wejście do metra";
+
+"type.railway.subway_entrance.oslo" = "Wejście do metra";
+
+"type.railway.subway_entrance.palma" = "Wejście do metra";
+
+"type.railway.subway_entrance.panama" = "Wejście do metra";
+
+"type.railway.subway_entrance.paris" = "Wejście do metra";
+
+"type.railway.subway_entrance.philadelphia" = "Wejście do metra";
+
+"type.railway.subway_entrance.pyongyang" = "Wejście do metra";
+
+"type.railway.subway_entrance.rennes" = "Wejście do metra";
+
+"type.railway.subway_entrance.rio" = "Wejście do metra";
+
+"type.railway.subway_entrance.roma" = "Wejście do metra";
+
+"type.railway.subway_entrance.rotterdam" = "Wejście do metra";
+
+"type.railway.subway_entrance.samara" = "Wejście do metra";
+
+"type.railway.subway_entrance.santiago" = "Wejście do metra";
+
+"type.railway.subway_entrance.santo_domingo" = "Wejście do metra";
+
+"type.railway.subway_entrance.saopaulo" = "Wejście do metra";
+
+"type.railway.subway_entrance.sapporo" = "Wejście do metra";
+
+"type.railway.subway_entrance.sendai" = "Wejście do metra";
+
+"type.railway.subway_entrance.sf" = "Wejście do metra";
+
+"type.railway.subway_entrance.shanghai" = "Wejście do metra";
+
+"type.railway.subway_entrance.shiraz" = "Wejście do metra";
+
+"type.railway.subway_entrance.sofia" = "Wejście do metra";
+
+"type.railway.subway_entrance.spb" = "Wejście do metra";
+
+"type.railway.subway_entrance.stockholm" = "Wejście do metra";
+
+"type.railway.subway_entrance.tabriz" = "Wejście do metra";
+
+"type.railway.subway_entrance.taipei" = "Wejście do metra";
+
+"type.railway.subway_entrance.taoyuan" = "Wejście do metra";
+
+"type.railway.subway_entrance.tashkent" = "Wejście do metra";
+
+"type.railway.subway_entrance.tbilisi" = "Wejście do metra";
+
+"type.railway.subway_entrance.tianjin" = "Wejście do metra";
+
+"type.railway.subway_entrance.tokyo" = "Wejście do metra";
+
+"type.railway.subway_entrance.valencia" = "Wejście do metra";
+
+"type.railway.subway_entrance.vienna" = "Wejście do metra";
+
+"type.railway.subway_entrance.warszawa" = "Wejście do metra";
+
+"type.railway.subway_entrance.washington" = "Wejście do metra";
+
+"type.railway.subway_entrance.wuhan" = "Wejście do metra";
+
+"type.railway.subway_entrance.yerevan" = "Wejście do metra";
+
+"type.railway.subway_entrance.yokohama" = "Wejście do metra";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 9aec2466a7..7cce4edea7 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -2687,29 +2687,225 @@
 
 "type.railway.station.monorail" = "Estação de trem";
 
-"type.railway.station.subway" = "Estação do metrô";
+"type.railway.station.subway" = "Estação de metrô";
 
-"type.railway.station.subway.barcelona" = "Estação do metrô";
+"type.railway.station.subway.adana" = "Estação de metrô";
 
-"type.railway.station.subway.berlin" = "Estação do metrô";
+"type.railway.station.subway.algiers" = "Estação de metrô";
 
-"type.railway.station.subway.kiev" = "Estação do metrô";
+"type.railway.station.subway.almaty" = "Estação de metrô";
 
-"type.railway.station.subway.london" = "Estação do metrô";
+"type.railway.station.subway.amsterdam" = "Estação de metrô";
 
-"type.railway.station.subway.madrid" = "Estação do metrô";
+"type.railway.station.subway.ankara" = "Estação de metrô";
 
-"type.railway.station.subway.minsk" = "Estação do metrô";
+"type.railway.station.subway.athens" = "Estação de metrô";
 
-"type.railway.station.subway.moscow" = "Estação do metrô";
+"type.railway.station.subway.baku" = "Estação de metrô";
 
-"type.railway.station.subway.newyork" = "Estação do metrô";
+"type.railway.station.subway.bangkok" = "Estação de metrô";
 
-"type.railway.station.subway.paris" = "Estação do metrô";
+"type.railway.station.subway.barcelona" = "Estação de metrô";
 
-"type.railway.station.subway.roma" = "Estação do metrô";
+"type.railway.station.subway.beijing" = "Estação de metrô";
 
-"type.railway.station.subway.spb" = "Estação do metrô";
+"type.railway.station.subway.bengalore" = "Estação de metrô";
+
+"type.railway.station.subway.berlin" = "Estação de metrô";
+
+"type.railway.station.subway.brasilia" = "Estação de metrô";
+
+"type.railway.station.subway.brescia" = "Estação de metrô";
+
+"type.railway.station.subway.brussels" = "Estação de metrô";
+
+"type.railway.station.subway.bucharest" = "Estação de metrô";
+
+"type.railway.station.subway.budapest" = "Estação de metrô";
+
+"type.railway.station.subway.buenos_aires" = "Estação de metrô";
+
+"type.railway.station.subway.bursa" = "Estação de metrô";
+
+"type.railway.station.subway.cairo" = "Estação de metrô";
+
+"type.railway.station.subway.caracas" = "Estação de metrô";
+
+"type.railway.station.subway.catania" = "Estação de metrô";
+
+"type.railway.station.subway.changchun" = "Estação de metrô";
+
+"type.railway.station.subway.chengdu" = "Estação de metrô";
+
+"type.railway.station.subway.chicago" = "Estação de metrô";
+
+"type.railway.station.subway.chongqing" = "Estação de metrô";
+
+"type.railway.station.subway.dalian" = "Estação de metrô";
+
+"type.railway.station.subway.delhi" = "Estação de metrô";
+
+"type.railway.station.subway.dnepro" = "Estação de metrô";
+
+"type.railway.station.subway.dubai" = "Estação de metrô";
+
+"type.railway.station.subway.ekb" = "Estação de metrô";
+
+"type.railway.station.subway.fukuoka" = "Estação de metrô";
+
+"type.railway.station.subway.glasgow" = "Estação de metrô";
+
+"type.railway.station.subway.guangzhou" = "Estação de metrô";
+
+"type.railway.station.subway.hamburg" = "Estação de metrô";
+
+"type.railway.station.subway.helsinki" = "Estação de metrô";
+
+"type.railway.station.subway.hiroshima" = "Estação de metrô";
+
+"type.railway.station.subway.isfahan" = "Estação de metrô";
+
+"type.railway.station.subway.istanbul" = "Estação de metrô";
+
+"type.railway.station.subway.izmir" = "Estação de metrô";
+
+"type.railway.station.subway.kazan" = "Estação de metrô";
+
+"type.railway.station.subway.kharkiv" = "Estação de metrô";
+
+"type.railway.station.subway.kiev" = "Estação de metrô";
+
+"type.railway.station.subway.kobe" = "Estação de metrô";
+
+"type.railway.station.subway.kolkata" = "Estação de metrô";
+
+"type.railway.station.subway.kunming" = "Estação de metrô";
+
+"type.railway.station.subway.kyoto" = "Estação de metrô";
+
+"type.railway.station.subway.la" = "Estação de metrô";
+
+"type.railway.station.subway.lausanne" = "Estação de metrô";
+
+"type.railway.station.subway.lille" = "Estação de metrô";
+
+"type.railway.station.subway.lima" = "Estação de metrô";
+
+"type.railway.station.subway.lisboa" = "Estação de metrô";
+
+"type.railway.station.subway.lisbon" = "Estação de metrô";
+
+"type.railway.station.subway.london" = "Estação de metrô";
+
+"type.railway.station.subway.lyon" = "Estação de metrô";
+
+"type.railway.station.subway.madrid" = "Estação de metrô";
+
+"type.railway.station.subway.malaga" = "Estação de metrô";
+
+"type.railway.station.subway.manila" = "Estação de metrô";
+
+"type.railway.station.subway.maracaibo" = "Estação de metrô";
+
+"type.railway.station.subway.mashhad" = "Estação de metrô";
+
+"type.railway.station.subway.mecca" = "Estação de metrô";
+
+"type.railway.station.subway.medellin" = "Estação de metrô";
+
+"type.railway.station.subway.mexico" = "Estação de metrô";
+
+"type.railway.station.subway.milan" = "Estação de metrô";
+
+"type.railway.station.subway.minsk" = "Estação de metrô";
+
+"type.railway.station.subway.montreal" = "Estação de metrô";
+
+"type.railway.station.subway.moscow" = "Estação de metrô";
+
+"type.railway.station.subway.munchen" = "Estação de metrô";
+
+"type.railway.station.subway.nagoya" = "Estação de metrô";
+
+"type.railway.station.subway.newyork" = "Estação de metrô";
+
+"type.railway.station.subway.nnov" = "Estação de metrô";
+
+"type.railway.station.subway.novosibirsk" = "Estação de metrô";
+
+"type.railway.station.subway.osaka" = "Estação de metrô";
+
+"type.railway.station.subway.oslo" = "Estação de metrô";
+
+"type.railway.station.subway.palma" = "Estação de metrô";
+
+"type.railway.station.subway.panama" = "Estação de metrô";
+
+"type.railway.station.subway.paris" = "Estação de metrô";
+
+"type.railway.station.subway.philadelphia" = "Estação de metrô";
+
+"type.railway.station.subway.pyongyang" = "Estação de metrô";
+
+"type.railway.station.subway.rennes" = "Estação de metrô";
+
+"type.railway.station.subway.rio" = "Estação de metrô";
+
+"type.railway.station.subway.roma" = "Estação de metrô";
+
+"type.railway.station.subway.rotterdam" = "Estação de metrô";
+
+"type.railway.station.subway.samara" = "Estação de metrô";
+
+"type.railway.station.subway.santiago" = "Estação de metrô";
+
+"type.railway.station.subway.santo_domingo" = "Estação de metrô";
+
+"type.railway.station.subway.saopaulo" = "Estação de metrô";
+
+"type.railway.station.subway.sapporo" = "Estação de metrô";
+
+"type.railway.station.subway.sendai" = "Estação de metrô";
+
+"type.railway.station.subway.sf" = "Estação de metrô";
+
+"type.railway.station.subway.shanghai" = "Estação de metrô";
+
+"type.railway.station.subway.shiraz" = "Estação de metrô";
+
+"type.railway.station.subway.sofia" = "Estação de metrô";
+
+"type.railway.station.subway.spb" = "Estação de metrô";
+
+"type.railway.station.subway.stockholm" = "Estação de metrô";
+
+"type.railway.station.subway.tabriz" = "Estação de metrô";
+
+"type.railway.station.subway.taipei" = "Estação de metrô";
+
+"type.railway.station.subway.taoyuan" = "Estação de metrô";
+
+"type.railway.station.subway.tashkent" = "Estação de metrô";
+
+"type.railway.station.subway.tbilisi" = "Estação de metrô";
+
+"type.railway.station.subway.tianjin" = "Estação de metrô";
+
+"type.railway.station.subway.tokyo" = "Estação de metrô";
+
+"type.railway.station.subway.valencia" = "Estação de metrô";
+
+"type.railway.station.subway.vienna" = "Estação de metrô";
+
+"type.railway.station.subway.warszawa" = "Estação de metrô";
+
+"type.railway.station.subway.washington" = "Estação de metrô";
+
+"type.railway.station.subway.wuhan" = "Estação de metrô";
+
+"type.railway.station.subway.yerevan" = "Estação de metrô";
+
+"type.railway.station.subway.yokohama" = "Estação de metrô";
 
 "type.railway.subway" = "Metrô";
 
@@ -2717,29 +2913,225 @@
 
 "type.railway.subway.tunnel" = "Metrô";
 
-"type.railway.subway_entrance" = "Entrada de metrô";
+"type.railway.subway_entrance" = "Entrada do metrô";
 
-"type.railway.subway_entrance.barcelona" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.adana" = "Entrada do metrô";
 
-"type.railway.subway_entrance.berlin" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.algiers" = "Entrada do metrô";
 
-"type.railway.subway_entrance.kiev" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.almaty" = "Entrada do metrô";
 
-"type.railway.subway_entrance.london" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.amsterdam" = "Entrada do metrô";
 
-"type.railway.subway_entrance.madrid" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.ankara" = "Entrada do metrô";
 
-"type.railway.subway_entrance.minsk" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.athens" = "Entrada do metrô";
 
-"type.railway.subway_entrance.moscow" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.baku" = "Entrada do metrô";
 
-"type.railway.subway_entrance.newyork" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.bangkok" = "Entrada do metrô";
 
-"type.railway.subway_entrance.paris" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.barcelona" = "Entrada do metrô";
 
-"type.railway.subway_entrance.roma" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.beijing" = "Entrada do metrô";
 
-"type.railway.subway_entrance.spb" = "Entrada de estação do metrô";
+"type.railway.subway_entrance.bengalore" = "Entrada do metrô";
+
+"type.railway.subway_entrance.berlin" = "Entrada do metrô";
+
+"type.railway.subway_entrance.brasilia" = "Entrada do metrô";
+
+"type.railway.subway_entrance.brescia" = "Entrada do metrô";
+
+"type.railway.subway_entrance.brussels" = "Entrada do metrô";
+
+"type.railway.subway_entrance.bucharest" = "Entrada do metrô";
+
+"type.railway.subway_entrance.budapest" = "Entrada do metrô";
+
+"type.railway.subway_entrance.buenos_aires" = "Entrada do metrô";
+
+"type.railway.subway_entrance.bursa" = "Entrada do metrô";
+
+"type.railway.subway_entrance.cairo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.caracas" = "Entrada do metrô";
+
+"type.railway.subway_entrance.catania" = "Entrada do metrô";
+
+"type.railway.subway_entrance.changchun" = "Entrada do metrô";
+
+"type.railway.subway_entrance.chengdu" = "Entrada do metrô";
+
+"type.railway.subway_entrance.chicago" = "Entrada do metrô";
+
+"type.railway.subway_entrance.chongqing" = "Entrada do metrô";
+
+"type.railway.subway_entrance.dalian" = "Entrada do metrô";
+
+"type.railway.subway_entrance.delhi" = "Entrada do metrô";
+
+"type.railway.subway_entrance.dnepro" = "Entrada do metrô";
+
+"type.railway.subway_entrance.dubai" = "Entrada do metrô";
+
+"type.railway.subway_entrance.ekb" = "Entrada do metrô";
+
+"type.railway.subway_entrance.fukuoka" = "Entrada do metrô";
+
+"type.railway.subway_entrance.glasgow" = "Entrada do metrô";
+
+"type.railway.subway_entrance.guangzhou" = "Entrada do metrô";
+
+"type.railway.subway_entrance.hamburg" = "Entrada do metrô";
+
+"type.railway.subway_entrance.helsinki" = "Entrada do metrô";
+
+"type.railway.subway_entrance.hiroshima" = "Entrada do metrô";
+
+"type.railway.subway_entrance.isfahan" = "Entrada do metrô";
+
+"type.railway.subway_entrance.istanbul" = "Entrada do metrô";
+
+"type.railway.subway_entrance.izmir" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kazan" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kharkiv" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kiev" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kobe" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kolkata" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kunming" = "Entrada do metrô";
+
+"type.railway.subway_entrance.kyoto" = "Entrada do metrô";
+
+"type.railway.subway_entrance.la" = "Entrada do metrô";
+
+"type.railway.subway_entrance.lausanne" = "Entrada do metrô";
+
+"type.railway.subway_entrance.lille" = "Entrada do metrô";
+
+"type.railway.subway_entrance.lima" = "Entrada do metrô";
+
+"type.railway.subway_entrance.lisboa" = "Entrada do metrô";
+
+"type.railway.subway_entrance.lisbon" = "Entrada do metrô";
+
+"type.railway.subway_entrance.london" = "Entrada do metrô";
+
+"type.railway.subway_entrance.lyon" = "Entrada do metrô";
+
+"type.railway.subway_entrance.madrid" = "Entrada do metrô";
+
+"type.railway.subway_entrance.malaga" = "Entrada do metrô";
+
+"type.railway.subway_entrance.manila" = "Entrada do metrô";
+
+"type.railway.subway_entrance.maracaibo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.mashhad" = "Entrada do metrô";
+
+"type.railway.subway_entrance.mecca" = "Entrada do metrô";
+
+"type.railway.subway_entrance.medellin" = "Entrada do metrô";
+
+"type.railway.subway_entrance.mexico" = "Entrada do metrô";
+
+"type.railway.subway_entrance.milan" = "Entrada do metrô";
+
+"type.railway.subway_entrance.minsk" = "Entrada do metrô";
+
+"type.railway.subway_entrance.montreal" = "Entrada do metrô";
+
+"type.railway.subway_entrance.moscow" = "Entrada do metrô";
+
+"type.railway.subway_entrance.munchen" = "Entrada do metrô";
+
+"type.railway.subway_entrance.nagoya" = "Entrada do metrô";
+
+"type.railway.subway_entrance.newyork" = "Entrada do metrô";
+
+"type.railway.subway_entrance.nnov" = "Entrada do metrô";
+
+"type.railway.subway_entrance.novosibirsk" = "Entrada do metrô";
+
+"type.railway.subway_entrance.osaka" = "Entrada do metrô";
+
+"type.railway.subway_entrance.oslo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.palma" = "Entrada do metrô";
+
+"type.railway.subway_entrance.panama" = "Entrada do metrô";
+
+"type.railway.subway_entrance.paris" = "Entrada do metrô";
+
+"type.railway.subway_entrance.philadelphia" = "Entrada do metrô";
+
+"type.railway.subway_entrance.pyongyang" = "Entrada do metrô";
+
+"type.railway.subway_entrance.rennes" = "Entrada do metrô";
+
+"type.railway.subway_entrance.rio" = "Entrada do metrô";
+
+"type.railway.subway_entrance.roma" = "Entrada do metrô";
+
+"type.railway.subway_entrance.rotterdam" = "Entrada do metrô";
+
+"type.railway.subway_entrance.samara" = "Entrada do metrô";
+
+"type.railway.subway_entrance.santiago" = "Entrada do metrô";
+
+"type.railway.subway_entrance.santo_domingo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.saopaulo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.sapporo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.sendai" = "Entrada do metrô";
+
+"type.railway.subway_entrance.sf" = "Entrada do metrô";
+
+"type.railway.subway_entrance.shanghai" = "Entrada do metrô";
+
+"type.railway.subway_entrance.shiraz" = "Entrada do metrô";
+
+"type.railway.subway_entrance.sofia" = "Entrada do metrô";
+
+"type.railway.subway_entrance.spb" = "Entrada do metrô";
+
+"type.railway.subway_entrance.stockholm" = "Entrada do metrô";
+
+"type.railway.subway_entrance.tabriz" = "Entrada do metrô";
+
+"type.railway.subway_entrance.taipei" = "Entrada do metrô";
+
+"type.railway.subway_entrance.taoyuan" = "Entrada do metrô";
+
+"type.railway.subway_entrance.tashkent" = "Entrada do metrô";
+
+"type.railway.subway_entrance.tbilisi" = "Entrada do metrô";
+
+"type.railway.subway_entrance.tianjin" = "Entrada do metrô";
+
+"type.railway.subway_entrance.tokyo" = "Entrada do metrô";
+
+"type.railway.subway_entrance.valencia" = "Entrada do metrô";
+
+"type.railway.subway_entrance.vienna" = "Entrada do metrô";
+
+"type.railway.subway_entrance.warszawa" = "Entrada do metrô";
+
+"type.railway.subway_entrance.washington" = "Entrada do metrô";
+
+"type.railway.subway_entrance.wuhan" = "Entrada do metrô";
+
+"type.railway.subway_entrance.yerevan" = "Entrada do metrô";
+
+"type.railway.subway_entrance.yokohama" = "Entrada do metrô";
 
 "type.railway.tram" = "Linha de bonde";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 21275670ff..1f7a2fa2c7 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -2687,29 +2687,225 @@
 
 "type.railway.station.monorail" = "Estação de comboios";
 
-"type.railway.station.subway" = "Estação de metropolitano";
+"type.railway.station.subway" = "Estação de metro";
 
-"type.railway.station.subway.barcelona" = "Estação de metropolitano";
+"type.railway.station.subway.adana" = "Estação de metro";
 
-"type.railway.station.subway.berlin" = "Estação de metropolitano";
+"type.railway.station.subway.algiers" = "Estação de metro";
 
-"type.railway.station.subway.kiev" = "Estação de metropolitano";
+"type.railway.station.subway.almaty" = "Estação de metro";
 
-"type.railway.station.subway.london" = "Estação de metropolitano";
+"type.railway.station.subway.amsterdam" = "Estação de metro";
 
-"type.railway.station.subway.madrid" = "Estação de metropolitano";
+"type.railway.station.subway.ankara" = "Estação de metro";
 
-"type.railway.station.subway.minsk" = "Estação de metropolitano";
+"type.railway.station.subway.athens" = "Estação de metro";
 
-"type.railway.station.subway.moscow" = "Estação de metropolitano";
+"type.railway.station.subway.baku" = "Estação de metro";
 
-"type.railway.station.subway.newyork" = "Estação de metropolitano";
+"type.railway.station.subway.bangkok" = "Estação de metro";
 
-"type.railway.station.subway.paris" = "Estação de metropolitano";
+"type.railway.station.subway.barcelona" = "Estação de metro";
 
-"type.railway.station.subway.roma" = "Estação de metropolitano";
+"type.railway.station.subway.beijing" = "Estação de metro";
 
-"type.railway.station.subway.spb" = "Estação de metropolitano";
+"type.railway.station.subway.bengalore" = "Estação de metro";
+
+"type.railway.station.subway.berlin" = "Estação de metro";
+
+"type.railway.station.subway.brasilia" = "Estação de metro";
+
+"type.railway.station.subway.brescia" = "Estação de metro";
+
+"type.railway.station.subway.brussels" = "Estação de metro";
+
+"type.railway.station.subway.bucharest" = "Estação de metro";
+
+"type.railway.station.subway.budapest" = "Estação de metro";
+
+"type.railway.station.subway.buenos_aires" = "Estação de metro";
+
+"type.railway.station.subway.bursa" = "Estação de metro";
+
+"type.railway.station.subway.cairo" = "Estação de metro";
+
+"type.railway.station.subway.caracas" = "Estação de metro";
+
+"type.railway.station.subway.catania" = "Estação de metro";
+
+"type.railway.station.subway.changchun" = "Estação de metro";
+
+"type.railway.station.subway.chengdu" = "Estação de metro";
+
+"type.railway.station.subway.chicago" = "Estação de metro";
+
+"type.railway.station.subway.chongqing" = "Estação de metro";
+
+"type.railway.station.subway.dalian" = "Estação de metro";
+
+"type.railway.station.subway.delhi" = "Estação de metro";
+
+"type.railway.station.subway.dnepro" = "Estação de metro";
+
+"type.railway.station.subway.dubai" = "Estação de metro";
+
+"type.railway.station.subway.ekb" = "Estação de metro";
+
+"type.railway.station.subway.fukuoka" = "Estação de metro";
+
+"type.railway.station.subway.glasgow" = "Estação de metro";
+
+"type.railway.station.subway.guangzhou" = "Estação de metro";
+
+"type.railway.station.subway.hamburg" = "Estação de metro";
+
+"type.railway.station.subway.helsinki" = "Estação de metro";
+
+"type.railway.station.subway.hiroshima" = "Estação de metro";
+
+"type.railway.station.subway.isfahan" = "Estação de metro";
+
+"type.railway.station.subway.istanbul" = "Estação de metro";
+
+"type.railway.station.subway.izmir" = "Estação de metro";
+
+"type.railway.station.subway.kazan" = "Estação de metro";
+
+"type.railway.station.subway.kharkiv" = "Estação de metro";
+
+"type.railway.station.subway.kiev" = "Estação de metro";
+
+"type.railway.station.subway.kobe" = "Estação de metro";
+
+"type.railway.station.subway.kolkata" = "Estação de metro";
+
+"type.railway.station.subway.kunming" = "Estação de metro";
+
+"type.railway.station.subway.kyoto" = "Estação de metro";
+
+"type.railway.station.subway.la" = "Estação de metro";
+
+"type.railway.station.subway.lausanne" = "Estação de metro";
+
+"type.railway.station.subway.lille" = "Estação de metro";
+
+"type.railway.station.subway.lima" = "Estação de metro";
+
+"type.railway.station.subway.lisboa" = "Estação de metro";
+
+"type.railway.station.subway.lisbon" = "Estação de metro";
+
+"type.railway.station.subway.london" = "Estação de metro";
+
+"type.railway.station.subway.lyon" = "Estação de metro";
+
+"type.railway.station.subway.madrid" = "Estação de metro";
+
+"type.railway.station.subway.malaga" = "Estação de metro";
+
+"type.railway.station.subway.manila" = "Estação de metro";
+
+"type.railway.station.subway.maracaibo" = "Estação de metro";
+
+"type.railway.station.subway.mashhad" = "Estação de metro";
+
+"type.railway.station.subway.mecca" = "Estação de metro";
+
+"type.railway.station.subway.medellin" = "Estação de metro";
+
+"type.railway.station.subway.mexico" = "Estação de metro";
+
+"type.railway.station.subway.milan" = "Estação de metro";
+
+"type.railway.station.subway.minsk" = "Estação de metro";
+
+"type.railway.station.subway.montreal" = "Estação de metro";
+
+"type.railway.station.subway.moscow" = "Estação de metro";
+
+"type.railway.station.subway.munchen" = "Estação de metro";
+
+"type.railway.station.subway.nagoya" = "Estação de metro";
+
+"type.railway.station.subway.newyork" = "Estação de metro";
+
+"type.railway.station.subway.nnov" = "Estação de metro";
+
+"type.railway.station.subway.novosibirsk" = "Estação de metro";
+
+"type.railway.station.subway.osaka" = "Estação de metro";
+
+"type.railway.station.subway.oslo" = "Estação de metro";
+
+"type.railway.station.subway.palma" = "Estação de metro";
+
+"type.railway.station.subway.panama" = "Estação de metro";
+
+"type.railway.station.subway.paris" = "Estação de metro";
+
+"type.railway.station.subway.philadelphia" = "Estação de metro";
+
+"type.railway.station.subway.pyongyang" = "Estação de metro";
+
+"type.railway.station.subway.rennes" = "Estação de metro";
+
+"type.railway.station.subway.rio" = "Estação de metro";
+
+"type.railway.station.subway.roma" = "Estação de metro";
+
+"type.railway.station.subway.rotterdam" = "Estação de metro";
+
+"type.railway.station.subway.samara" = "Estação de metro";
+
+"type.railway.station.subway.santiago" = "Estação de metro";
+
+"type.railway.station.subway.santo_domingo" = "Estação de metro";
+
+"type.railway.station.subway.saopaulo" = "Estação de metro";
+
+"type.railway.station.subway.sapporo" = "Estação de metro";
+
+"type.railway.station.subway.sendai" = "Estação de metro";
+
+"type.railway.station.subway.sf" = "Estação de metro";
+
+"type.railway.station.subway.shanghai" = "Estação de metro";
+
+"type.railway.station.subway.shiraz" = "Estação de metro";
+
+"type.railway.station.subway.sofia" = "Estação de metro";
+
+"type.railway.station.subway.spb" = "Estação de metro";
+
+"type.railway.station.subway.stockholm" = "Estação de metro";
+
+"type.railway.station.subway.tabriz" = "Estação de metro";
+
+"type.railway.station.subway.taipei" = "Estação de metro";
+
+"type.railway.station.subway.taoyuan" = "Estação de metro";
+
+"type.railway.station.subway.tashkent" = "Estação de metro";
+
+"type.railway.station.subway.tbilisi" = "Estação de metro";
+
+"type.railway.station.subway.tianjin" = "Estação de metro";
+
+"type.railway.station.subway.tokyo" = "Estação de metro";
+
+"type.railway.station.subway.valencia" = "Estação de metro";
+
+"type.railway.station.subway.vienna" = "Estação de metro";
+
+"type.railway.station.subway.warszawa" = "Estação de metro";
+
+"type.railway.station.subway.washington" = "Estação de metro";
+
+"type.railway.station.subway.wuhan" = "Estação de metro";
+
+"type.railway.station.subway.yerevan" = "Estação de metro";
+
+"type.railway.station.subway.yokohama" = "Estação de metro";
 
 "type.railway.subway" = "Metropolitano";
 
@@ -2717,29 +2913,225 @@
 
 "type.railway.subway.tunnel" = "Metropolitano";
 
-"type.railway.subway_entrance" = "Entrada de metropolitano";
+"type.railway.subway_entrance" = "Entrada do metro";
 
-"type.railway.subway_entrance.barcelona" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.adana" = "Entrada do metro";
 
-"type.railway.subway_entrance.berlin" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.algiers" = "Entrada do metro";
 
-"type.railway.subway_entrance.kiev" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.almaty" = "Entrada do metro";
 
-"type.railway.subway_entrance.london" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.amsterdam" = "Entrada do metro";
 
-"type.railway.subway_entrance.madrid" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.ankara" = "Entrada do metro";
 
-"type.railway.subway_entrance.minsk" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.athens" = "Entrada do metro";
 
-"type.railway.subway_entrance.moscow" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.baku" = "Entrada do metro";
 
-"type.railway.subway_entrance.newyork" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.bangkok" = "Entrada do metro";
 
-"type.railway.subway_entrance.paris" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.barcelona" = "Entrada do metro";
 
-"type.railway.subway_entrance.roma" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.beijing" = "Entrada do metro";
 
-"type.railway.subway_entrance.spb" = "Entrada de estação de metrolitano";
+"type.railway.subway_entrance.bengalore" = "Entrada do metro";
+
+"type.railway.subway_entrance.berlin" = "Entrada do metro";
+
+"type.railway.subway_entrance.brasilia" = "Entrada do metro";
+
+"type.railway.subway_entrance.brescia" = "Entrada do metro";
+
+"type.railway.subway_entrance.brussels" = "Entrada do metro";
+
+"type.railway.subway_entrance.bucharest" = "Entrada do metro";
+
+"type.railway.subway_entrance.budapest" = "Entrada do metro";
+
+"type.railway.subway_entrance.buenos_aires" = "Entrada do metro";
+
+"type.railway.subway_entrance.bursa" = "Entrada do metro";
+
+"type.railway.subway_entrance.cairo" = "Entrada do metro";
+
+"type.railway.subway_entrance.caracas" = "Entrada do metro";
+
+"type.railway.subway_entrance.catania" = "Entrada do metro";
+
+"type.railway.subway_entrance.changchun" = "Entrada do metro";
+
+"type.railway.subway_entrance.chengdu" = "Entrada do metro";
+
+"type.railway.subway_entrance.chicago" = "Entrada do metro";
+
+"type.railway.subway_entrance.chongqing" = "Entrada do metro";
+
+"type.railway.subway_entrance.dalian" = "Entrada do metro";
+
+"type.railway.subway_entrance.delhi" = "Entrada do metro";
+
+"type.railway.subway_entrance.dnepro" = "Entrada do metro";
+
+"type.railway.subway_entrance.dubai" = "Entrada do metro";
+
+"type.railway.subway_entrance.ekb" = "Entrada do metro";
+
+"type.railway.subway_entrance.fukuoka" = "Entrada do metro";
+
+"type.railway.subway_entrance.glasgow" = "Entrada do metro";
+
+"type.railway.subway_entrance.guangzhou" = "Entrada do metro";
+
+"type.railway.subway_entrance.hamburg" = "Entrada do metro";
+
+"type.railway.subway_entrance.helsinki" = "Entrada do metro";
+
+"type.railway.subway_entrance.hiroshima" = "Entrada do metro";
+
+"type.railway.subway_entrance.isfahan" = "Entrada do metro";
+
+"type.railway.subway_entrance.istanbul" = "Entrada do metro";
+
+"type.railway.subway_entrance.izmir" = "Entrada do metro";
+
+"type.railway.subway_entrance.kazan" = "Entrada do metro";
+
+"type.railway.subway_entrance.kharkiv" = "Entrada do metro";
+
+"type.railway.subway_entrance.kiev" = "Entrada do metro";
+
+"type.railway.subway_entrance.kobe" = "Entrada do metro";
+
+"type.railway.subway_entrance.kolkata" = "Entrada do metro";
+
+"type.railway.subway_entrance.kunming" = "Entrada do metro";
+
+"type.railway.subway_entrance.kyoto" = "Entrada do metro";
+
+"type.railway.subway_entrance.la" = "Entrada do metro";
+
+"type.railway.subway_entrance.lausanne" = "Entrada do metro";
+
+"type.railway.subway_entrance.lille" = "Entrada do metro";
+
+"type.railway.subway_entrance.lima" = "Entrada do metro";
+
+"type.railway.subway_entrance.lisboa" = "Entrada do metro";
+
+"type.railway.subway_entrance.lisbon" = "Entrada do metro";
+
+"type.railway.subway_entrance.london" = "Entrada do metro";
+
+"type.railway.subway_entrance.lyon" = "Entrada do metro";
+
+"type.railway.subway_entrance.madrid" = "Entrada do metro";
+
+"type.railway.subway_entrance.malaga" = "Entrada do metro";
+
+"type.railway.subway_entrance.manila" = "Entrada do metro";
+
+"type.railway.subway_entrance.maracaibo" = "Entrada do metro";
+
+"type.railway.subway_entrance.mashhad" = "Entrada do metro";
+
+"type.railway.subway_entrance.mecca" = "Entrada do metro";
+
+"type.railway.subway_entrance.medellin" = "Entrada do metro";
+
+"type.railway.subway_entrance.mexico" = "Entrada do metro";
+
+"type.railway.subway_entrance.milan" = "Entrada do metro";
+
+"type.railway.subway_entrance.minsk" = "Entrada do metro";
+
+"type.railway.subway_entrance.montreal" = "Entrada do metro";
+
+"type.railway.subway_entrance.moscow" = "Entrada do metro";
+
+"type.railway.subway_entrance.munchen" = "Entrada do metro";
+
+"type.railway.subway_entrance.nagoya" = "Entrada do metro";
+
+"type.railway.subway_entrance.newyork" = "Entrada do metro";
+
+"type.railway.subway_entrance.nnov" = "Entrada do metro";
+
+"type.railway.subway_entrance.novosibirsk" = "Entrada do metro";
+
+"type.railway.subway_entrance.osaka" = "Entrada do metro";
+
+"type.railway.subway_entrance.oslo" = "Entrada do metro";
+
+"type.railway.subway_entrance.palma" = "Entrada do metro";
+
+"type.railway.subway_entrance.panama" = "Entrada do metro";
+
+"type.railway.subway_entrance.paris" = "Entrada do metro";
+
+"type.railway.subway_entrance.philadelphia" = "Entrada do metro";
+
+"type.railway.subway_entrance.pyongyang" = "Entrada do metro";
+
+"type.railway.subway_entrance.rennes" = "Entrada do metro";
+
+"type.railway.subway_entrance.rio" = "Entrada do metro";
+
+"type.railway.subway_entrance.roma" = "Entrada do metro";
+
+"type.railway.subway_entrance.rotterdam" = "Entrada do metro";
+
+"type.railway.subway_entrance.samara" = "Entrada do metro";
+
+"type.railway.subway_entrance.santiago" = "Entrada do metro";
+
+"type.railway.subway_entrance.santo_domingo" = "Entrada do metro";
+
+"type.railway.subway_entrance.saopaulo" = "Entrada do metro";
+
+"type.railway.subway_entrance.sapporo" = "Entrada do metro";
+
+"type.railway.subway_entrance.sendai" = "Entrada do metro";
+
+"type.railway.subway_entrance.sf" = "Entrada do metro";
+
+"type.railway.subway_entrance.shanghai" = "Entrada do metro";
+
+"type.railway.subway_entrance.shiraz" = "Entrada do metro";
+
+"type.railway.subway_entrance.sofia" = "Entrada do metro";
+
+"type.railway.subway_entrance.spb" = "Entrada do metro";
+
+"type.railway.subway_entrance.stockholm" = "Entrada do metro";
+
+"type.railway.subway_entrance.tabriz" = "Entrada do metro";
+
+"type.railway.subway_entrance.taipei" = "Entrada do metro";
+
+"type.railway.subway_entrance.taoyuan" = "Entrada do metro";
+
+"type.railway.subway_entrance.tashkent" = "Entrada do metro";
+
+"type.railway.subway_entrance.tbilisi" = "Entrada do metro";
+
+"type.railway.subway_entrance.tianjin" = "Entrada do metro";
+
+"type.railway.subway_entrance.tokyo" = "Entrada do metro";
+
+"type.railway.subway_entrance.valencia" = "Entrada do metro";
+
+"type.railway.subway_entrance.vienna" = "Entrada do metro";
+
+"type.railway.subway_entrance.warszawa" = "Entrada do metro";
+
+"type.railway.subway_entrance.washington" = "Entrada do metro";
+
+"type.railway.subway_entrance.wuhan" = "Entrada do metro";
+
+"type.railway.subway_entrance.yerevan" = "Entrada do metro";
+
+"type.railway.subway_entrance.yokohama" = "Entrada do metro";
 
 "type.railway.tram" = "Linha de elétrico";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index cb1c33f2e3..984cd158a2 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metrou";
 
+"type.railway.station.subway.adana" = "Metrou";
+
+"type.railway.station.subway.algiers" = "Metrou";
+
+"type.railway.station.subway.almaty" = "Metrou";
+
+"type.railway.station.subway.amsterdam" = "Metrou";
+
+"type.railway.station.subway.ankara" = "Metrou";
+
+"type.railway.station.subway.athens" = "Metrou";
+
+"type.railway.station.subway.baku" = "Metrou";
+
+"type.railway.station.subway.bangkok" = "Metrou";
+
 "type.railway.station.subway.barcelona" = "Metrou";
 
+"type.railway.station.subway.beijing" = "Metrou";
+
+"type.railway.station.subway.bengalore" = "Metrou";
+
 "type.railway.station.subway.berlin" = "Metrou";
 
+"type.railway.station.subway.brasilia" = "Metrou";
+
+"type.railway.station.subway.brescia" = "Metrou";
+
+"type.railway.station.subway.brussels" = "Metrou";
+
+"type.railway.station.subway.bucharest" = "Metrou";
+
+"type.railway.station.subway.budapest" = "Metrou";
+
+"type.railway.station.subway.buenos_aires" = "Metrou";
+
+"type.railway.station.subway.bursa" = "Metrou";
+
+"type.railway.station.subway.cairo" = "Metrou";
+
+"type.railway.station.subway.caracas" = "Metrou";
+
+"type.railway.station.subway.catania" = "Metrou";
+
+"type.railway.station.subway.changchun" = "Metrou";
+
+"type.railway.station.subway.chengdu" = "Metrou";
+
+"type.railway.station.subway.chicago" = "Metrou";
+
+"type.railway.station.subway.chongqing" = "Metrou";
+
+"type.railway.station.subway.dalian" = "Metrou";
+
+"type.railway.station.subway.delhi" = "Metrou";
+
+"type.railway.station.subway.dnepro" = "Metrou";
+
+"type.railway.station.subway.dubai" = "Metrou";
+
+"type.railway.station.subway.ekb" = "Metrou";
+
+"type.railway.station.subway.fukuoka" = "Metrou";
+
+"type.railway.station.subway.glasgow" = "Metrou";
+
+"type.railway.station.subway.guangzhou" = "Metrou";
+
+"type.railway.station.subway.hamburg" = "Metrou";
+
+"type.railway.station.subway.helsinki" = "Metrou";
+
+"type.railway.station.subway.hiroshima" = "Metrou";
+
+"type.railway.station.subway.isfahan" = "Metrou";
+
+"type.railway.station.subway.istanbul" = "Metrou";
+
+"type.railway.station.subway.izmir" = "Metrou";
+
+"type.railway.station.subway.kazan" = "Metrou";
+
+"type.railway.station.subway.kharkiv" = "Metrou";
+
 "type.railway.station.subway.kiev" = "Metrou";
 
+"type.railway.station.subway.kobe" = "Metrou";
+
+"type.railway.station.subway.kolkata" = "Metrou";
+
+"type.railway.station.subway.kunming" = "Metrou";
+
+"type.railway.station.subway.kyoto" = "Metrou";
+
+"type.railway.station.subway.la" = "Metrou";
+
+"type.railway.station.subway.lausanne" = "Metrou";
+
+"type.railway.station.subway.lille" = "Metrou";
+
+"type.railway.station.subway.lima" = "Metrou";
+
+"type.railway.station.subway.lisboa" = "Metrou";
+
+"type.railway.station.subway.lisbon" = "Metrou";
+
 "type.railway.station.subway.london" = "Metrou";
 
+"type.railway.station.subway.lyon" = "Metrou";
+
 "type.railway.station.subway.madrid" = "Metrou";
 
+"type.railway.station.subway.malaga" = "Metrou";
+
+"type.railway.station.subway.manila" = "Metrou";
+
+"type.railway.station.subway.maracaibo" = "Metrou";
+
+"type.railway.station.subway.mashhad" = "Metrou";
+
+"type.railway.station.subway.mecca" = "Metrou";
+
+"type.railway.station.subway.medellin" = "Metrou";
+
+"type.railway.station.subway.mexico" = "Metrou";
+
+"type.railway.station.subway.milan" = "Metrou";
+
 "type.railway.station.subway.minsk" = "Metrou";
 
+"type.railway.station.subway.montreal" = "Metrou";
+
 "type.railway.station.subway.moscow" = "Metrou";
 
+"type.railway.station.subway.munchen" = "Metrou";
+
+"type.railway.station.subway.nagoya" = "Metrou";
+
 "type.railway.station.subway.newyork" = "Metrou";
 
+"type.railway.station.subway.nnov" = "Metrou";
+
+"type.railway.station.subway.novosibirsk" = "Metrou";
+
+"type.railway.station.subway.osaka" = "Metrou";
+
+"type.railway.station.subway.oslo" = "Metrou";
+
+"type.railway.station.subway.palma" = "Metrou";
+
+"type.railway.station.subway.panama" = "Metrou";
+
 "type.railway.station.subway.paris" = "Metrou";
 
+"type.railway.station.subway.philadelphia" = "Metrou";
+
+"type.railway.station.subway.pyongyang" = "Metrou";
+
+"type.railway.station.subway.rennes" = "Metrou";
+
+"type.railway.station.subway.rio" = "Metrou";
+
 "type.railway.station.subway.roma" = "Metrou";
 
+"type.railway.station.subway.rotterdam" = "Metrou";
+
+"type.railway.station.subway.samara" = "Metrou";
+
+"type.railway.station.subway.santiago" = "Metrou";
+
+"type.railway.station.subway.santo_domingo" = "Metrou";
+
+"type.railway.station.subway.saopaulo" = "Metrou";
+
+"type.railway.station.subway.sapporo" = "Metrou";
+
+"type.railway.station.subway.sendai" = "Metrou";
+
+"type.railway.station.subway.sf" = "Metrou";
+
+"type.railway.station.subway.shanghai" = "Metrou";
+
+"type.railway.station.subway.shiraz" = "Metrou";
+
+"type.railway.station.subway.sofia" = "Metrou";
+
 "type.railway.station.subway.spb" = "Metrou";
 
+"type.railway.station.subway.stockholm" = "Metrou";
+
+"type.railway.station.subway.tabriz" = "Metrou";
+
+"type.railway.station.subway.taipei" = "Metrou";
+
+"type.railway.station.subway.taoyuan" = "Metrou";
+
+"type.railway.station.subway.tashkent" = "Metrou";
+
+"type.railway.station.subway.tbilisi" = "Metrou";
+
+"type.railway.station.subway.tianjin" = "Metrou";
+
+"type.railway.station.subway.tokyo" = "Metrou";
+
+"type.railway.station.subway.valencia" = "Metrou";
+
+"type.railway.station.subway.vienna" = "Metrou";
+
+"type.railway.station.subway.warszawa" = "Metrou";
+
+"type.railway.station.subway.washington" = "Metrou";
+
+"type.railway.station.subway.wuhan" = "Metrou";
+
+"type.railway.station.subway.yerevan" = "Metrou";
+
+"type.railway.station.subway.yokohama" = "Metrou";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Intrare în metro";
 
-"type.railway.subway_entrance.barcelona" = "Metrou";
+"type.railway.subway_entrance.adana" = "Intrare în metro";
 
-"type.railway.subway_entrance.berlin" = "Metrou";
+"type.railway.subway_entrance.algiers" = "Intrare în metro";
 
-"type.railway.subway_entrance.kiev" = "Metrou";
+"type.railway.subway_entrance.almaty" = "Intrare în metro";
 
-"type.railway.subway_entrance.london" = "Metrou";
+"type.railway.subway_entrance.amsterdam" = "Intrare în metro";
 
-"type.railway.subway_entrance.madrid" = "Metrou";
+"type.railway.subway_entrance.ankara" = "Intrare în metro";
 
-"type.railway.subway_entrance.minsk" = "Metrou";
+"type.railway.subway_entrance.athens" = "Intrare în metro";
 
-"type.railway.subway_entrance.moscow" = "Metrou";
+"type.railway.subway_entrance.baku" = "Intrare în metro";
 
-"type.railway.subway_entrance.newyork" = "Metrou";
+"type.railway.subway_entrance.bangkok" = "Intrare în metro";
 
-"type.railway.subway_entrance.paris" = "Metrou";
+"type.railway.subway_entrance.barcelona" = "Intrare în metro";
 
-"type.railway.subway_entrance.roma" = "Metrou";
+"type.railway.subway_entrance.beijing" = "Intrare în metro";
 
-"type.railway.subway_entrance.spb" = "Metrou";
+"type.railway.subway_entrance.bengalore" = "Intrare în metro";
+
+"type.railway.subway_entrance.berlin" = "Intrare în metro";
+
+"type.railway.subway_entrance.brasilia" = "Intrare în metro";
+
+"type.railway.subway_entrance.brescia" = "Intrare în metro";
+
+"type.railway.subway_entrance.brussels" = "Intrare în metro";
+
+"type.railway.subway_entrance.bucharest" = "Intrare în metro";
+
+"type.railway.subway_entrance.budapest" = "Intrare în metro";
+
+"type.railway.subway_entrance.buenos_aires" = "Intrare în metro";
+
+"type.railway.subway_entrance.bursa" = "Intrare în metro";
+
+"type.railway.subway_entrance.cairo" = "Intrare în metro";
+
+"type.railway.subway_entrance.caracas" = "Intrare în metro";
+
+"type.railway.subway_entrance.catania" = "Intrare în metro";
+
+"type.railway.subway_entrance.changchun" = "Intrare în metro";
+
+"type.railway.subway_entrance.chengdu" = "Intrare în metro";
+
+"type.railway.subway_entrance.chicago" = "Intrare în metro";
+
+"type.railway.subway_entrance.chongqing" = "Intrare în metro";
+
+"type.railway.subway_entrance.dalian" = "Intrare în metro";
+
+"type.railway.subway_entrance.delhi" = "Intrare în metro";
+
+"type.railway.subway_entrance.dnepro" = "Intrare în metro";
+
+"type.railway.subway_entrance.dubai" = "Intrare în metro";
+
+"type.railway.subway_entrance.ekb" = "Intrare în metro";
+
+"type.railway.subway_entrance.fukuoka" = "Intrare în metro";
+
+"type.railway.subway_entrance.glasgow" = "Intrare în metro";
+
+"type.railway.subway_entrance.guangzhou" = "Intrare în metro";
+
+"type.railway.subway_entrance.hamburg" = "Intrare în metro";
+
+"type.railway.subway_entrance.helsinki" = "Intrare în metro";
+
+"type.railway.subway_entrance.hiroshima" = "Intrare în metro";
+
+"type.railway.subway_entrance.isfahan" = "Intrare în metro";
+
+"type.railway.subway_entrance.istanbul" = "Intrare în metro";
+
+"type.railway.subway_entrance.izmir" = "Intrare în metro";
+
+"type.railway.subway_entrance.kazan" = "Intrare în metro";
+
+"type.railway.subway_entrance.kharkiv" = "Intrare în metro";
+
+"type.railway.subway_entrance.kiev" = "Intrare în metro";
+
+"type.railway.subway_entrance.kobe" = "Intrare în metro";
+
+"type.railway.subway_entrance.kolkata" = "Intrare în metro";
+
+"type.railway.subway_entrance.kunming" = "Intrare în metro";
+
+"type.railway.subway_entrance.kyoto" = "Intrare în metro";
+
+"type.railway.subway_entrance.la" = "Intrare în metro";
+
+"type.railway.subway_entrance.lausanne" = "Intrare în metro";
+
+"type.railway.subway_entrance.lille" = "Intrare în metro";
+
+"type.railway.subway_entrance.lima" = "Intrare în metro";
+
+"type.railway.subway_entrance.lisboa" = "Intrare în metro";
+
+"type.railway.subway_entrance.lisbon" = "Intrare în metro";
+
+"type.railway.subway_entrance.london" = "Intrare în metro";
+
+"type.railway.subway_entrance.lyon" = "Intrare în metro";
+
+"type.railway.subway_entrance.madrid" = "Intrare în metro";
+
+"type.railway.subway_entrance.malaga" = "Intrare în metro";
+
+"type.railway.subway_entrance.manila" = "Intrare în metro";
+
+"type.railway.subway_entrance.maracaibo" = "Intrare în metro";
+
+"type.railway.subway_entrance.mashhad" = "Intrare în metro";
+
+"type.railway.subway_entrance.mecca" = "Intrare în metro";
+
+"type.railway.subway_entrance.medellin" = "Intrare în metro";
+
+"type.railway.subway_entrance.mexico" = "Intrare în metro";
+
+"type.railway.subway_entrance.milan" = "Intrare în metro";
+
+"type.railway.subway_entrance.minsk" = "Intrare în metro";
+
+"type.railway.subway_entrance.montreal" = "Intrare în metro";
+
+"type.railway.subway_entrance.moscow" = "Intrare în metro";
+
+"type.railway.subway_entrance.munchen" = "Intrare în metro";
+
+"type.railway.subway_entrance.nagoya" = "Intrare în metro";
+
+"type.railway.subway_entrance.newyork" = "Intrare în metro";
+
+"type.railway.subway_entrance.nnov" = "Intrare în metro";
+
+"type.railway.subway_entrance.novosibirsk" = "Intrare în metro";
+
+"type.railway.subway_entrance.osaka" = "Intrare în metro";
+
+"type.railway.subway_entrance.oslo" = "Intrare în metro";
+
+"type.railway.subway_entrance.palma" = "Intrare în metro";
+
+"type.railway.subway_entrance.panama" = "Intrare în metro";
+
+"type.railway.subway_entrance.paris" = "Intrare în metro";
+
+"type.railway.subway_entrance.philadelphia" = "Intrare în metro";
+
+"type.railway.subway_entrance.pyongyang" = "Intrare în metro";
+
+"type.railway.subway_entrance.rennes" = "Intrare în metro";
+
+"type.railway.subway_entrance.rio" = "Intrare în metro";
+
+"type.railway.subway_entrance.roma" = "Intrare în metro";
+
+"type.railway.subway_entrance.rotterdam" = "Intrare în metro";
+
+"type.railway.subway_entrance.samara" = "Intrare în metro";
+
+"type.railway.subway_entrance.santiago" = "Intrare în metro";
+
+"type.railway.subway_entrance.santo_domingo" = "Intrare în metro";
+
+"type.railway.subway_entrance.saopaulo" = "Intrare în metro";
+
+"type.railway.subway_entrance.sapporo" = "Intrare în metro";
+
+"type.railway.subway_entrance.sendai" = "Intrare în metro";
+
+"type.railway.subway_entrance.sf" = "Intrare în metro";
+
+"type.railway.subway_entrance.shanghai" = "Intrare în metro";
+
+"type.railway.subway_entrance.shiraz" = "Intrare în metro";
+
+"type.railway.subway_entrance.sofia" = "Intrare în metro";
+
+"type.railway.subway_entrance.spb" = "Intrare în metro";
+
+"type.railway.subway_entrance.stockholm" = "Intrare în metro";
+
+"type.railway.subway_entrance.tabriz" = "Intrare în metro";
+
+"type.railway.subway_entrance.taipei" = "Intrare în metro";
+
+"type.railway.subway_entrance.taoyuan" = "Intrare în metro";
+
+"type.railway.subway_entrance.tashkent" = "Intrare în metro";
+
+"type.railway.subway_entrance.tbilisi" = "Intrare în metro";
+
+"type.railway.subway_entrance.tianjin" = "Intrare în metro";
+
+"type.railway.subway_entrance.tokyo" = "Intrare în metro";
+
+"type.railway.subway_entrance.valencia" = "Intrare în metro";
+
+"type.railway.subway_entrance.vienna" = "Intrare în metro";
+
+"type.railway.subway_entrance.warszawa" = "Intrare în metro";
+
+"type.railway.subway_entrance.washington" = "Intrare în metro";
+
+"type.railway.subway_entrance.wuhan" = "Intrare în metro";
+
+"type.railway.subway_entrance.yerevan" = "Intrare în metro";
+
+"type.railway.subway_entrance.yokohama" = "Intrare în metro";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index d83b06d504..33df9e3ba4 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Метро";
 
+"type.railway.station.subway.adana" = "Метро";
+
+"type.railway.station.subway.algiers" = "Метро";
+
+"type.railway.station.subway.almaty" = "Метро";
+
+"type.railway.station.subway.amsterdam" = "Метро";
+
+"type.railway.station.subway.ankara" = "Метро";
+
+"type.railway.station.subway.athens" = "Метро";
+
+"type.railway.station.subway.baku" = "Метро";
+
+"type.railway.station.subway.bangkok" = "Метро";
+
 "type.railway.station.subway.barcelona" = "Метро";
 
+"type.railway.station.subway.beijing" = "Метро";
+
+"type.railway.station.subway.bengalore" = "Метро";
+
 "type.railway.station.subway.berlin" = "Метро";
 
+"type.railway.station.subway.brasilia" = "Метро";
+
+"type.railway.station.subway.brescia" = "Метро";
+
+"type.railway.station.subway.brussels" = "Метро";
+
+"type.railway.station.subway.bucharest" = "Метро";
+
+"type.railway.station.subway.budapest" = "Метро";
+
+"type.railway.station.subway.buenos_aires" = "Метро";
+
+"type.railway.station.subway.bursa" = "Метро";
+
+"type.railway.station.subway.cairo" = "Метро";
+
+"type.railway.station.subway.caracas" = "Метро";
+
+"type.railway.station.subway.catania" = "Метро";
+
+"type.railway.station.subway.changchun" = "Метро";
+
+"type.railway.station.subway.chengdu" = "Метро";
+
+"type.railway.station.subway.chicago" = "Метро";
+
+"type.railway.station.subway.chongqing" = "Метро";
+
+"type.railway.station.subway.dalian" = "Метро";
+
+"type.railway.station.subway.delhi" = "Метро";
+
+"type.railway.station.subway.dnepro" = "Метро";
+
+"type.railway.station.subway.dubai" = "Метро";
+
+"type.railway.station.subway.ekb" = "Метро";
+
+"type.railway.station.subway.fukuoka" = "Метро";
+
+"type.railway.station.subway.glasgow" = "Метро";
+
+"type.railway.station.subway.guangzhou" = "Метро";
+
+"type.railway.station.subway.hamburg" = "Метро";
+
+"type.railway.station.subway.helsinki" = "Метро";
+
+"type.railway.station.subway.hiroshima" = "Метро";
+
+"type.railway.station.subway.isfahan" = "Метро";
+
+"type.railway.station.subway.istanbul" = "Метро";
+
+"type.railway.station.subway.izmir" = "Метро";
+
+"type.railway.station.subway.kazan" = "Метро";
+
+"type.railway.station.subway.kharkiv" = "Метро";
+
 "type.railway.station.subway.kiev" = "Метро";
 
+"type.railway.station.subway.kobe" = "Метро";
+
+"type.railway.station.subway.kolkata" = "Метро";
+
+"type.railway.station.subway.kunming" = "Метро";
+
+"type.railway.station.subway.kyoto" = "Метро";
+
+"type.railway.station.subway.la" = "Метро";
+
+"type.railway.station.subway.lausanne" = "Метро";
+
+"type.railway.station.subway.lille" = "Метро";
+
+"type.railway.station.subway.lima" = "Метро";
+
+"type.railway.station.subway.lisboa" = "Метро";
+
+"type.railway.station.subway.lisbon" = "Метро";
+
 "type.railway.station.subway.london" = "Метро";
 
+"type.railway.station.subway.lyon" = "Метро";
+
 "type.railway.station.subway.madrid" = "Метро";
 
+"type.railway.station.subway.malaga" = "Метро";
+
+"type.railway.station.subway.manila" = "Метро";
+
+"type.railway.station.subway.maracaibo" = "Метро";
+
+"type.railway.station.subway.mashhad" = "Метро";
+
+"type.railway.station.subway.mecca" = "Метро";
+
+"type.railway.station.subway.medellin" = "Метро";
+
+"type.railway.station.subway.mexico" = "Метро";
+
+"type.railway.station.subway.milan" = "Метро";
+
 "type.railway.station.subway.minsk" = "Метро";
 
+"type.railway.station.subway.montreal" = "Метро";
+
 "type.railway.station.subway.moscow" = "Метро";
 
+"type.railway.station.subway.munchen" = "Метро";
+
+"type.railway.station.subway.nagoya" = "Метро";
+
 "type.railway.station.subway.newyork" = "Метро";
 
+"type.railway.station.subway.nnov" = "Метро";
+
+"type.railway.station.subway.novosibirsk" = "Метро";
+
+"type.railway.station.subway.osaka" = "Метро";
+
+"type.railway.station.subway.oslo" = "Метро";
+
+"type.railway.station.subway.palma" = "Метро";
+
+"type.railway.station.subway.panama" = "Метро";
+
 "type.railway.station.subway.paris" = "Метро";
 
+"type.railway.station.subway.philadelphia" = "Метро";
+
+"type.railway.station.subway.pyongyang" = "Метро";
+
+"type.railway.station.subway.rennes" = "Метро";
+
+"type.railway.station.subway.rio" = "Метро";
+
 "type.railway.station.subway.roma" = "Метро";
 
+"type.railway.station.subway.rotterdam" = "Метро";
+
+"type.railway.station.subway.samara" = "Метро";
+
+"type.railway.station.subway.santiago" = "Метро";
+
+"type.railway.station.subway.santo_domingo" = "Метро";
+
+"type.railway.station.subway.saopaulo" = "Метро";
+
+"type.railway.station.subway.sapporo" = "Метро";
+
+"type.railway.station.subway.sendai" = "Метро";
+
+"type.railway.station.subway.sf" = "Метро";
+
+"type.railway.station.subway.shanghai" = "Метро";
+
+"type.railway.station.subway.shiraz" = "Метро";
+
+"type.railway.station.subway.sofia" = "Метро";
+
 "type.railway.station.subway.spb" = "Метро";
 
+"type.railway.station.subway.stockholm" = "Метро";
+
+"type.railway.station.subway.tabriz" = "Метро";
+
+"type.railway.station.subway.taipei" = "Метро";
+
+"type.railway.station.subway.taoyuan" = "Метро";
+
+"type.railway.station.subway.tashkent" = "Метро";
+
+"type.railway.station.subway.tbilisi" = "Метро";
+
+"type.railway.station.subway.tianjin" = "Метро";
+
+"type.railway.station.subway.tokyo" = "Метро";
+
+"type.railway.station.subway.valencia" = "Метро";
+
+"type.railway.station.subway.vienna" = "Метро";
+
+"type.railway.station.subway.warszawa" = "Метро";
+
+"type.railway.station.subway.washington" = "Метро";
+
+"type.railway.station.subway.wuhan" = "Метро";
+
+"type.railway.station.subway.yerevan" = "Метро";
+
+"type.railway.station.subway.yokohama" = "Метро";
+
 "type.railway.subway" = "Ветка метро";
 
 "type.railway.subway.bridge" = "Ветка метро";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Вход в метро";
 
-"type.railway.subway_entrance.barcelona" = "Метро";
+"type.railway.subway_entrance.adana" = "Вход в метро";
 
-"type.railway.subway_entrance.berlin" = "Метро";
+"type.railway.subway_entrance.algiers" = "Вход в метро";
 
-"type.railway.subway_entrance.kiev" = "Метро";
+"type.railway.subway_entrance.almaty" = "Вход в метро";
 
-"type.railway.subway_entrance.london" = "Метро";
+"type.railway.subway_entrance.amsterdam" = "Вход в метро";
 
-"type.railway.subway_entrance.madrid" = "Метро";
+"type.railway.subway_entrance.ankara" = "Вход в метро";
 
-"type.railway.subway_entrance.minsk" = "Метро";
+"type.railway.subway_entrance.athens" = "Вход в метро";
 
-"type.railway.subway_entrance.moscow" = "Метро";
+"type.railway.subway_entrance.baku" = "Вход в метро";
 
-"type.railway.subway_entrance.newyork" = "Метро";
+"type.railway.subway_entrance.bangkok" = "Вход в метро";
 
-"type.railway.subway_entrance.paris" = "Метро";
+"type.railway.subway_entrance.barcelona" = "Вход в метро";
 
-"type.railway.subway_entrance.roma" = "Метро";
+"type.railway.subway_entrance.beijing" = "Вход в метро";
 
-"type.railway.subway_entrance.spb" = "Метро";
+"type.railway.subway_entrance.bengalore" = "Вход в метро";
+
+"type.railway.subway_entrance.berlin" = "Вход в метро";
+
+"type.railway.subway_entrance.brasilia" = "Вход в метро";
+
+"type.railway.subway_entrance.brescia" = "Вход в метро";
+
+"type.railway.subway_entrance.brussels" = "Вход в метро";
+
+"type.railway.subway_entrance.bucharest" = "Вход в метро";
+
+"type.railway.subway_entrance.budapest" = "Вход в метро";
+
+"type.railway.subway_entrance.buenos_aires" = "Вход в метро";
+
+"type.railway.subway_entrance.bursa" = "Вход в метро";
+
+"type.railway.subway_entrance.cairo" = "Вход в метро";
+
+"type.railway.subway_entrance.caracas" = "Вход в метро";
+
+"type.railway.subway_entrance.catania" = "Вход в метро";
+
+"type.railway.subway_entrance.changchun" = "Вход в метро";
+
+"type.railway.subway_entrance.chengdu" = "Вход в метро";
+
+"type.railway.subway_entrance.chicago" = "Вход в метро";
+
+"type.railway.subway_entrance.chongqing" = "Вход в метро";
+
+"type.railway.subway_entrance.dalian" = "Вход в метро";
+
+"type.railway.subway_entrance.delhi" = "Вход в метро";
+
+"type.railway.subway_entrance.dnepro" = "Вход в метро";
+
+"type.railway.subway_entrance.dubai" = "Вход в метро";
+
+"type.railway.subway_entrance.ekb" = "Вход в метро";
+
+"type.railway.subway_entrance.fukuoka" = "Вход в метро";
+
+"type.railway.subway_entrance.glasgow" = "Вход в метро";
+
+"type.railway.subway_entrance.guangzhou" = "Вход в метро";
+
+"type.railway.subway_entrance.hamburg" = "Вход в метро";
+
+"type.railway.subway_entrance.helsinki" = "Вход в метро";
+
+"type.railway.subway_entrance.hiroshima" = "Вход в метро";
+
+"type.railway.subway_entrance.isfahan" = "Вход в метро";
+
+"type.railway.subway_entrance.istanbul" = "Вход в метро";
+
+"type.railway.subway_entrance.izmir" = "Вход в метро";
+
+"type.railway.subway_entrance.kazan" = "Вход в метро";
+
+"type.railway.subway_entrance.kharkiv" = "Вход в метро";
+
+"type.railway.subway_entrance.kiev" = "Вход в метро";
+
+"type.railway.subway_entrance.kobe" = "Вход в метро";
+
+"type.railway.subway_entrance.kolkata" = "Вход в метро";
+
+"type.railway.subway_entrance.kunming" = "Вход в метро";
+
+"type.railway.subway_entrance.kyoto" = "Вход в метро";
+
+"type.railway.subway_entrance.la" = "Вход в метро";
+
+"type.railway.subway_entrance.lausanne" = "Вход в метро";
+
+"type.railway.subway_entrance.lille" = "Вход в метро";
+
+"type.railway.subway_entrance.lima" = "Вход в метро";
+
+"type.railway.subway_entrance.lisboa" = "Вход в метро";
+
+"type.railway.subway_entrance.lisbon" = "Вход в метро";
+
+"type.railway.subway_entrance.london" = "Вход в метро";
+
+"type.railway.subway_entrance.lyon" = "Вход в метро";
+
+"type.railway.subway_entrance.madrid" = "Вход в метро";
+
+"type.railway.subway_entrance.malaga" = "Вход в метро";
+
+"type.railway.subway_entrance.manila" = "Вход в метро";
+
+"type.railway.subway_entrance.maracaibo" = "Вход в метро";
+
+"type.railway.subway_entrance.mashhad" = "Вход в метро";
+
+"type.railway.subway_entrance.mecca" = "Вход в метро";
+
+"type.railway.subway_entrance.medellin" = "Вход в метро";
+
+"type.railway.subway_entrance.mexico" = "Вход в метро";
+
+"type.railway.subway_entrance.milan" = "Вход в метро";
+
+"type.railway.subway_entrance.minsk" = "Вход в метро";
+
+"type.railway.subway_entrance.montreal" = "Вход в метро";
+
+"type.railway.subway_entrance.moscow" = "Вход в метро";
+
+"type.railway.subway_entrance.munchen" = "Вход в метро";
+
+"type.railway.subway_entrance.nagoya" = "Вход в метро";
+
+"type.railway.subway_entrance.newyork" = "Вход в метро";
+
+"type.railway.subway_entrance.nnov" = "Вход в метро";
+
+"type.railway.subway_entrance.novosibirsk" = "Вход в метро";
+
+"type.railway.subway_entrance.osaka" = "Вход в метро";
+
+"type.railway.subway_entrance.oslo" = "Вход в метро";
+
+"type.railway.subway_entrance.palma" = "Вход в метро";
+
+"type.railway.subway_entrance.panama" = "Вход в метро";
+
+"type.railway.subway_entrance.paris" = "Вход в метро";
+
+"type.railway.subway_entrance.philadelphia" = "Вход в метро";
+
+"type.railway.subway_entrance.pyongyang" = "Вход в метро";
+
+"type.railway.subway_entrance.rennes" = "Вход в метро";
+
+"type.railway.subway_entrance.rio" = "Вход в метро";
+
+"type.railway.subway_entrance.roma" = "Вход в метро";
+
+"type.railway.subway_entrance.rotterdam" = "Вход в метро";
+
+"type.railway.subway_entrance.samara" = "Вход в метро";
+
+"type.railway.subway_entrance.santiago" = "Вход в метро";
+
+"type.railway.subway_entrance.santo_domingo" = "Вход в метро";
+
+"type.railway.subway_entrance.saopaulo" = "Вход в метро";
+
+"type.railway.subway_entrance.sapporo" = "Вход в метро";
+
+"type.railway.subway_entrance.sendai" = "Вход в метро";
+
+"type.railway.subway_entrance.sf" = "Вход в метро";
+
+"type.railway.subway_entrance.shanghai" = "Вход в метро";
+
+"type.railway.subway_entrance.shiraz" = "Вход в метро";
+
+"type.railway.subway_entrance.sofia" = "Вход в метро";
+
+"type.railway.subway_entrance.spb" = "Вход в метро";
+
+"type.railway.subway_entrance.stockholm" = "Вход в метро";
+
+"type.railway.subway_entrance.tabriz" = "Вход в метро";
+
+"type.railway.subway_entrance.taipei" = "Вход в метро";
+
+"type.railway.subway_entrance.taoyuan" = "Вход в метро";
+
+"type.railway.subway_entrance.tashkent" = "Вход в метро";
+
+"type.railway.subway_entrance.tbilisi" = "Вход в метро";
+
+"type.railway.subway_entrance.tianjin" = "Вход в метро";
+
+"type.railway.subway_entrance.tokyo" = "Вход в метро";
+
+"type.railway.subway_entrance.valencia" = "Вход в метро";
+
+"type.railway.subway_entrance.vienna" = "Вход в метро";
+
+"type.railway.subway_entrance.warszawa" = "Вход в метро";
+
+"type.railway.subway_entrance.washington" = "Вход в метро";
+
+"type.railway.subway_entrance.wuhan" = "Вход в метро";
+
+"type.railway.subway_entrance.yerevan" = "Вход в метро";
+
+"type.railway.subway_entrance.yokohama" = "Вход в метро";
 
 "type.railway.tram" = "Трамвай";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index cf492af250..95392ff8cb 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Vstup do metra";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Vstup do metra";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Vstup do metra";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Vstup do metra";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Vstup do metra";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Vstup do metra";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Vstup do metra";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Vstup do metra";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Vstup do metra";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Vstup do metra";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Vstup do metra";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Vstup do metra";
+
+"type.railway.subway_entrance.berlin" = "Vstup do metra";
+
+"type.railway.subway_entrance.brasilia" = "Vstup do metra";
+
+"type.railway.subway_entrance.brescia" = "Vstup do metra";
+
+"type.railway.subway_entrance.brussels" = "Vstup do metra";
+
+"type.railway.subway_entrance.bucharest" = "Vstup do metra";
+
+"type.railway.subway_entrance.budapest" = "Vstup do metra";
+
+"type.railway.subway_entrance.buenos_aires" = "Vstup do metra";
+
+"type.railway.subway_entrance.bursa" = "Vstup do metra";
+
+"type.railway.subway_entrance.cairo" = "Vstup do metra";
+
+"type.railway.subway_entrance.caracas" = "Vstup do metra";
+
+"type.railway.subway_entrance.catania" = "Vstup do metra";
+
+"type.railway.subway_entrance.changchun" = "Vstup do metra";
+
+"type.railway.subway_entrance.chengdu" = "Vstup do metra";
+
+"type.railway.subway_entrance.chicago" = "Vstup do metra";
+
+"type.railway.subway_entrance.chongqing" = "Vstup do metra";
+
+"type.railway.subway_entrance.dalian" = "Vstup do metra";
+
+"type.railway.subway_entrance.delhi" = "Vstup do metra";
+
+"type.railway.subway_entrance.dnepro" = "Vstup do metra";
+
+"type.railway.subway_entrance.dubai" = "Vstup do metra";
+
+"type.railway.subway_entrance.ekb" = "Vstup do metra";
+
+"type.railway.subway_entrance.fukuoka" = "Vstup do metra";
+
+"type.railway.subway_entrance.glasgow" = "Vstup do metra";
+
+"type.railway.subway_entrance.guangzhou" = "Vstup do metra";
+
+"type.railway.subway_entrance.hamburg" = "Vstup do metra";
+
+"type.railway.subway_entrance.helsinki" = "Vstup do metra";
+
+"type.railway.subway_entrance.hiroshima" = "Vstup do metra";
+
+"type.railway.subway_entrance.isfahan" = "Vstup do metra";
+
+"type.railway.subway_entrance.istanbul" = "Vstup do metra";
+
+"type.railway.subway_entrance.izmir" = "Vstup do metra";
+
+"type.railway.subway_entrance.kazan" = "Vstup do metra";
+
+"type.railway.subway_entrance.kharkiv" = "Vstup do metra";
+
+"type.railway.subway_entrance.kiev" = "Vstup do metra";
+
+"type.railway.subway_entrance.kobe" = "Vstup do metra";
+
+"type.railway.subway_entrance.kolkata" = "Vstup do metra";
+
+"type.railway.subway_entrance.kunming" = "Vstup do metra";
+
+"type.railway.subway_entrance.kyoto" = "Vstup do metra";
+
+"type.railway.subway_entrance.la" = "Vstup do metra";
+
+"type.railway.subway_entrance.lausanne" = "Vstup do metra";
+
+"type.railway.subway_entrance.lille" = "Vstup do metra";
+
+"type.railway.subway_entrance.lima" = "Vstup do metra";
+
+"type.railway.subway_entrance.lisboa" = "Vstup do metra";
+
+"type.railway.subway_entrance.lisbon" = "Vstup do metra";
+
+"type.railway.subway_entrance.london" = "Vstup do metra";
+
+"type.railway.subway_entrance.lyon" = "Vstup do metra";
+
+"type.railway.subway_entrance.madrid" = "Vstup do metra";
+
+"type.railway.subway_entrance.malaga" = "Vstup do metra";
+
+"type.railway.subway_entrance.manila" = "Vstup do metra";
+
+"type.railway.subway_entrance.maracaibo" = "Vstup do metra";
+
+"type.railway.subway_entrance.mashhad" = "Vstup do metra";
+
+"type.railway.subway_entrance.mecca" = "Vstup do metra";
+
+"type.railway.subway_entrance.medellin" = "Vstup do metra";
+
+"type.railway.subway_entrance.mexico" = "Vstup do metra";
+
+"type.railway.subway_entrance.milan" = "Vstup do metra";
+
+"type.railway.subway_entrance.minsk" = "Vstup do metra";
+
+"type.railway.subway_entrance.montreal" = "Vstup do metra";
+
+"type.railway.subway_entrance.moscow" = "Vstup do metra";
+
+"type.railway.subway_entrance.munchen" = "Vstup do metra";
+
+"type.railway.subway_entrance.nagoya" = "Vstup do metra";
+
+"type.railway.subway_entrance.newyork" = "Vstup do metra";
+
+"type.railway.subway_entrance.nnov" = "Vstup do metra";
+
+"type.railway.subway_entrance.novosibirsk" = "Vstup do metra";
+
+"type.railway.subway_entrance.osaka" = "Vstup do metra";
+
+"type.railway.subway_entrance.oslo" = "Vstup do metra";
+
+"type.railway.subway_entrance.palma" = "Vstup do metra";
+
+"type.railway.subway_entrance.panama" = "Vstup do metra";
+
+"type.railway.subway_entrance.paris" = "Vstup do metra";
+
+"type.railway.subway_entrance.philadelphia" = "Vstup do metra";
+
+"type.railway.subway_entrance.pyongyang" = "Vstup do metra";
+
+"type.railway.subway_entrance.rennes" = "Vstup do metra";
+
+"type.railway.subway_entrance.rio" = "Vstup do metra";
+
+"type.railway.subway_entrance.roma" = "Vstup do metra";
+
+"type.railway.subway_entrance.rotterdam" = "Vstup do metra";
+
+"type.railway.subway_entrance.samara" = "Vstup do metra";
+
+"type.railway.subway_entrance.santiago" = "Vstup do metra";
+
+"type.railway.subway_entrance.santo_domingo" = "Vstup do metra";
+
+"type.railway.subway_entrance.saopaulo" = "Vstup do metra";
+
+"type.railway.subway_entrance.sapporo" = "Vstup do metra";
+
+"type.railway.subway_entrance.sendai" = "Vstup do metra";
+
+"type.railway.subway_entrance.sf" = "Vstup do metra";
+
+"type.railway.subway_entrance.shanghai" = "Vstup do metra";
+
+"type.railway.subway_entrance.shiraz" = "Vstup do metra";
+
+"type.railway.subway_entrance.sofia" = "Vstup do metra";
+
+"type.railway.subway_entrance.spb" = "Vstup do metra";
+
+"type.railway.subway_entrance.stockholm" = "Vstup do metra";
+
+"type.railway.subway_entrance.tabriz" = "Vstup do metra";
+
+"type.railway.subway_entrance.taipei" = "Vstup do metra";
+
+"type.railway.subway_entrance.taoyuan" = "Vstup do metra";
+
+"type.railway.subway_entrance.tashkent" = "Vstup do metra";
+
+"type.railway.subway_entrance.tbilisi" = "Vstup do metra";
+
+"type.railway.subway_entrance.tianjin" = "Vstup do metra";
+
+"type.railway.subway_entrance.tokyo" = "Vstup do metra";
+
+"type.railway.subway_entrance.valencia" = "Vstup do metra";
+
+"type.railway.subway_entrance.vienna" = "Vstup do metra";
+
+"type.railway.subway_entrance.warszawa" = "Vstup do metra";
+
+"type.railway.subway_entrance.washington" = "Vstup do metra";
+
+"type.railway.subway_entrance.wuhan" = "Vstup do metra";
+
+"type.railway.subway_entrance.yerevan" = "Vstup do metra";
+
+"type.railway.subway_entrance.yokohama" = "Vstup do metra";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 844bb93df5..eaaf4039ac 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Tunnelbana";
 
+"type.railway.station.subway.adana" = "Tunnelbana";
+
+"type.railway.station.subway.algiers" = "Tunnelbana";
+
+"type.railway.station.subway.almaty" = "Tunnelbana";
+
+"type.railway.station.subway.amsterdam" = "Tunnelbana";
+
+"type.railway.station.subway.ankara" = "Tunnelbana";
+
+"type.railway.station.subway.athens" = "Tunnelbana";
+
+"type.railway.station.subway.baku" = "Tunnelbana";
+
+"type.railway.station.subway.bangkok" = "Tunnelbana";
+
 "type.railway.station.subway.barcelona" = "Tunnelbana";
 
+"type.railway.station.subway.beijing" = "Tunnelbana";
+
+"type.railway.station.subway.bengalore" = "Tunnelbana";
+
 "type.railway.station.subway.berlin" = "Tunnelbana";
 
+"type.railway.station.subway.brasilia" = "Tunnelbana";
+
+"type.railway.station.subway.brescia" = "Tunnelbana";
+
+"type.railway.station.subway.brussels" = "Tunnelbana";
+
+"type.railway.station.subway.bucharest" = "Tunnelbana";
+
+"type.railway.station.subway.budapest" = "Tunnelbana";
+
+"type.railway.station.subway.buenos_aires" = "Tunnelbana";
+
+"type.railway.station.subway.bursa" = "Tunnelbana";
+
+"type.railway.station.subway.cairo" = "Tunnelbana";
+
+"type.railway.station.subway.caracas" = "Tunnelbana";
+
+"type.railway.station.subway.catania" = "Tunnelbana";
+
+"type.railway.station.subway.changchun" = "Tunnelbana";
+
+"type.railway.station.subway.chengdu" = "Tunnelbana";
+
+"type.railway.station.subway.chicago" = "Tunnelbana";
+
+"type.railway.station.subway.chongqing" = "Tunnelbana";
+
+"type.railway.station.subway.dalian" = "Tunnelbana";
+
+"type.railway.station.subway.delhi" = "Tunnelbana";
+
+"type.railway.station.subway.dnepro" = "Tunnelbana";
+
+"type.railway.station.subway.dubai" = "Tunnelbana";
+
+"type.railway.station.subway.ekb" = "Tunnelbana";
+
+"type.railway.station.subway.fukuoka" = "Tunnelbana";
+
+"type.railway.station.subway.glasgow" = "Tunnelbana";
+
+"type.railway.station.subway.guangzhou" = "Tunnelbana";
+
+"type.railway.station.subway.hamburg" = "Tunnelbana";
+
+"type.railway.station.subway.helsinki" = "Tunnelbana";
+
+"type.railway.station.subway.hiroshima" = "Tunnelbana";
+
+"type.railway.station.subway.isfahan" = "Tunnelbana";
+
+"type.railway.station.subway.istanbul" = "Tunnelbana";
+
+"type.railway.station.subway.izmir" = "Tunnelbana";
+
+"type.railway.station.subway.kazan" = "Tunnelbana";
+
+"type.railway.station.subway.kharkiv" = "Tunnelbana";
+
 "type.railway.station.subway.kiev" = "Tunnelbana";
 
+"type.railway.station.subway.kobe" = "Tunnelbana";
+
+"type.railway.station.subway.kolkata" = "Tunnelbana";
+
+"type.railway.station.subway.kunming" = "Tunnelbana";
+
+"type.railway.station.subway.kyoto" = "Tunnelbana";
+
+"type.railway.station.subway.la" = "Tunnelbana";
+
+"type.railway.station.subway.lausanne" = "Tunnelbana";
+
+"type.railway.station.subway.lille" = "Tunnelbana";
+
+"type.railway.station.subway.lima" = "Tunnelbana";
+
+"type.railway.station.subway.lisboa" = "Tunnelbana";
+
+"type.railway.station.subway.lisbon" = "Tunnelbana";
+
 "type.railway.station.subway.london" = "Tunnelbana";
 
+"type.railway.station.subway.lyon" = "Tunnelbana";
+
 "type.railway.station.subway.madrid" = "Tunnelbana";
 
+"type.railway.station.subway.malaga" = "Tunnelbana";
+
+"type.railway.station.subway.manila" = "Tunnelbana";
+
+"type.railway.station.subway.maracaibo" = "Tunnelbana";
+
+"type.railway.station.subway.mashhad" = "Tunnelbana";
+
+"type.railway.station.subway.mecca" = "Tunnelbana";
+
+"type.railway.station.subway.medellin" = "Tunnelbana";
+
+"type.railway.station.subway.mexico" = "Tunnelbana";
+
+"type.railway.station.subway.milan" = "Tunnelbana";
+
 "type.railway.station.subway.minsk" = "Tunnelbana";
 
+"type.railway.station.subway.montreal" = "Tunnelbana";
+
 "type.railway.station.subway.moscow" = "Tunnelbana";
 
+"type.railway.station.subway.munchen" = "Tunnelbana";
+
+"type.railway.station.subway.nagoya" = "Tunnelbana";
+
 "type.railway.station.subway.newyork" = "Tunnelbana";
 
+"type.railway.station.subway.nnov" = "Tunnelbana";
+
+"type.railway.station.subway.novosibirsk" = "Tunnelbana";
+
+"type.railway.station.subway.osaka" = "Tunnelbana";
+
+"type.railway.station.subway.oslo" = "Tunnelbana";
+
+"type.railway.station.subway.palma" = "Tunnelbana";
+
+"type.railway.station.subway.panama" = "Tunnelbana";
+
 "type.railway.station.subway.paris" = "Tunnelbana";
 
+"type.railway.station.subway.philadelphia" = "Tunnelbana";
+
+"type.railway.station.subway.pyongyang" = "Tunnelbana";
+
+"type.railway.station.subway.rennes" = "Tunnelbana";
+
+"type.railway.station.subway.rio" = "Tunnelbana";
+
 "type.railway.station.subway.roma" = "Tunnelbana";
 
+"type.railway.station.subway.rotterdam" = "Tunnelbana";
+
+"type.railway.station.subway.samara" = "Tunnelbana";
+
+"type.railway.station.subway.santiago" = "Tunnelbana";
+
+"type.railway.station.subway.santo_domingo" = "Tunnelbana";
+
+"type.railway.station.subway.saopaulo" = "Tunnelbana";
+
+"type.railway.station.subway.sapporo" = "Tunnelbana";
+
+"type.railway.station.subway.sendai" = "Tunnelbana";
+
+"type.railway.station.subway.sf" = "Tunnelbana";
+
+"type.railway.station.subway.shanghai" = "Tunnelbana";
+
+"type.railway.station.subway.shiraz" = "Tunnelbana";
+
+"type.railway.station.subway.sofia" = "Tunnelbana";
+
 "type.railway.station.subway.spb" = "Tunnelbana";
 
+"type.railway.station.subway.stockholm" = "Tunnelbana";
+
+"type.railway.station.subway.tabriz" = "Tunnelbana";
+
+"type.railway.station.subway.taipei" = "Tunnelbana";
+
+"type.railway.station.subway.taoyuan" = "Tunnelbana";
+
+"type.railway.station.subway.tashkent" = "Tunnelbana";
+
+"type.railway.station.subway.tbilisi" = "Tunnelbana";
+
+"type.railway.station.subway.tianjin" = "Tunnelbana";
+
+"type.railway.station.subway.tokyo" = "Tunnelbana";
+
+"type.railway.station.subway.valencia" = "Tunnelbana";
+
+"type.railway.station.subway.vienna" = "Tunnelbana";
+
+"type.railway.station.subway.warszawa" = "Tunnelbana";
+
+"type.railway.station.subway.washington" = "Tunnelbana";
+
+"type.railway.station.subway.wuhan" = "Tunnelbana";
+
+"type.railway.station.subway.yerevan" = "Tunnelbana";
+
+"type.railway.station.subway.yokohama" = "Tunnelbana";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.barcelona" = "Tunnelbana";
+"type.railway.subway_entrance.adana" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.berlin" = "Tunnelbana";
+"type.railway.subway_entrance.algiers" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.kiev" = "Tunnelbana";
+"type.railway.subway_entrance.almaty" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.london" = "Tunnelbana";
+"type.railway.subway_entrance.amsterdam" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.madrid" = "Tunnelbana";
+"type.railway.subway_entrance.ankara" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.minsk" = "Tunnelbana";
+"type.railway.subway_entrance.athens" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.moscow" = "Tunnelbana";
+"type.railway.subway_entrance.baku" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.newyork" = "Tunnelbana";
+"type.railway.subway_entrance.bangkok" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.paris" = "Tunnelbana";
+"type.railway.subway_entrance.barcelona" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.roma" = "Tunnelbana";
+"type.railway.subway_entrance.beijing" = "Tunnelbana entré";
 
-"type.railway.subway_entrance.spb" = "Tunnelbana";
+"type.railway.subway_entrance.bengalore" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.berlin" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.brasilia" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.brescia" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.brussels" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.bucharest" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.budapest" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.buenos_aires" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.bursa" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.cairo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.caracas" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.catania" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.changchun" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.chengdu" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.chicago" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.chongqing" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.dalian" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.delhi" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.dnepro" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.dubai" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.ekb" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.fukuoka" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.glasgow" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.guangzhou" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.hamburg" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.helsinki" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.hiroshima" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.isfahan" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.istanbul" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.izmir" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kazan" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kharkiv" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kiev" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kobe" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kolkata" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kunming" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.kyoto" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.la" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.lausanne" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.lille" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.lima" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.lisboa" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.lisbon" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.london" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.lyon" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.madrid" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.malaga" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.manila" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.maracaibo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.mashhad" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.mecca" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.medellin" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.mexico" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.milan" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.minsk" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.montreal" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.moscow" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.munchen" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.nagoya" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.newyork" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.nnov" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.novosibirsk" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.osaka" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.oslo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.palma" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.panama" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.paris" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.philadelphia" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.pyongyang" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.rennes" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.rio" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.roma" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.rotterdam" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.samara" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.santiago" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.santo_domingo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.saopaulo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.sapporo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.sendai" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.sf" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.shanghai" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.shiraz" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.sofia" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.spb" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.stockholm" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.tabriz" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.taipei" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.taoyuan" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.tashkent" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.tbilisi" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.tianjin" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.tokyo" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.valencia" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.vienna" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.warszawa" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.washington" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.wuhan" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.yerevan" = "Tunnelbana entré";
+
+"type.railway.subway_entrance.yokohama" = "Tunnelbana entré";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 3fc177ebd1..677b20e2f3 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Subway";
 
+"type.railway.station.subway.adana" = "Subway";
+
+"type.railway.station.subway.algiers" = "Subway";
+
+"type.railway.station.subway.almaty" = "Subway";
+
+"type.railway.station.subway.amsterdam" = "Subway";
+
+"type.railway.station.subway.ankara" = "Subway";
+
+"type.railway.station.subway.athens" = "Subway";
+
+"type.railway.station.subway.baku" = "Subway";
+
+"type.railway.station.subway.bangkok" = "Subway";
+
 "type.railway.station.subway.barcelona" = "Subway";
 
+"type.railway.station.subway.beijing" = "Subway";
+
+"type.railway.station.subway.bengalore" = "Subway";
+
 "type.railway.station.subway.berlin" = "Subway";
 
+"type.railway.station.subway.brasilia" = "Subway";
+
+"type.railway.station.subway.brescia" = "Subway";
+
+"type.railway.station.subway.brussels" = "Subway";
+
+"type.railway.station.subway.bucharest" = "Subway";
+
+"type.railway.station.subway.budapest" = "Subway";
+
+"type.railway.station.subway.buenos_aires" = "Subway";
+
+"type.railway.station.subway.bursa" = "Subway";
+
+"type.railway.station.subway.cairo" = "Subway";
+
+"type.railway.station.subway.caracas" = "Subway";
+
+"type.railway.station.subway.catania" = "Subway";
+
+"type.railway.station.subway.changchun" = "Subway";
+
+"type.railway.station.subway.chengdu" = "Subway";
+
+"type.railway.station.subway.chicago" = "Subway";
+
+"type.railway.station.subway.chongqing" = "Subway";
+
+"type.railway.station.subway.dalian" = "Subway";
+
+"type.railway.station.subway.delhi" = "Subway";
+
+"type.railway.station.subway.dnepro" = "Subway";
+
+"type.railway.station.subway.dubai" = "Subway";
+
+"type.railway.station.subway.ekb" = "Subway";
+
+"type.railway.station.subway.fukuoka" = "Subway";
+
+"type.railway.station.subway.glasgow" = "Subway";
+
+"type.railway.station.subway.guangzhou" = "Subway";
+
+"type.railway.station.subway.hamburg" = "Subway";
+
+"type.railway.station.subway.helsinki" = "Subway";
+
+"type.railway.station.subway.hiroshima" = "Subway";
+
+"type.railway.station.subway.isfahan" = "Subway";
+
+"type.railway.station.subway.istanbul" = "Subway";
+
+"type.railway.station.subway.izmir" = "Subway";
+
+"type.railway.station.subway.kazan" = "Subway";
+
+"type.railway.station.subway.kharkiv" = "Subway";
+
 "type.railway.station.subway.kiev" = "Subway";
 
+"type.railway.station.subway.kobe" = "Subway";
+
+"type.railway.station.subway.kolkata" = "Subway";
+
+"type.railway.station.subway.kunming" = "Subway";
+
+"type.railway.station.subway.kyoto" = "Subway";
+
+"type.railway.station.subway.la" = "Subway";
+
+"type.railway.station.subway.lausanne" = "Subway";
+
+"type.railway.station.subway.lille" = "Subway";
+
+"type.railway.station.subway.lima" = "Subway";
+
+"type.railway.station.subway.lisboa" = "Subway";
+
+"type.railway.station.subway.lisbon" = "Subway";
+
 "type.railway.station.subway.london" = "Subway";
 
+"type.railway.station.subway.lyon" = "Subway";
+
 "type.railway.station.subway.madrid" = "Subway";
 
+"type.railway.station.subway.malaga" = "Subway";
+
+"type.railway.station.subway.manila" = "Subway";
+
+"type.railway.station.subway.maracaibo" = "Subway";
+
+"type.railway.station.subway.mashhad" = "Subway";
+
+"type.railway.station.subway.mecca" = "Subway";
+
+"type.railway.station.subway.medellin" = "Subway";
+
+"type.railway.station.subway.mexico" = "Subway";
+
+"type.railway.station.subway.milan" = "Subway";
+
 "type.railway.station.subway.minsk" = "Subway";
 
+"type.railway.station.subway.montreal" = "Subway";
+
 "type.railway.station.subway.moscow" = "Subway";
 
+"type.railway.station.subway.munchen" = "Subway";
+
+"type.railway.station.subway.nagoya" = "Subway";
+
 "type.railway.station.subway.newyork" = "Subway";
 
+"type.railway.station.subway.nnov" = "Subway";
+
+"type.railway.station.subway.novosibirsk" = "Subway";
+
+"type.railway.station.subway.osaka" = "Subway";
+
+"type.railway.station.subway.oslo" = "Subway";
+
+"type.railway.station.subway.palma" = "Subway";
+
+"type.railway.station.subway.panama" = "Subway";
+
 "type.railway.station.subway.paris" = "Subway";
 
+"type.railway.station.subway.philadelphia" = "Subway";
+
+"type.railway.station.subway.pyongyang" = "Subway";
+
+"type.railway.station.subway.rennes" = "Subway";
+
+"type.railway.station.subway.rio" = "Subway";
+
 "type.railway.station.subway.roma" = "Subway";
 
+"type.railway.station.subway.rotterdam" = "Subway";
+
+"type.railway.station.subway.samara" = "Subway";
+
+"type.railway.station.subway.santiago" = "Subway";
+
+"type.railway.station.subway.santo_domingo" = "Subway";
+
+"type.railway.station.subway.saopaulo" = "Subway";
+
+"type.railway.station.subway.sapporo" = "Subway";
+
+"type.railway.station.subway.sendai" = "Subway";
+
+"type.railway.station.subway.sf" = "Subway";
+
+"type.railway.station.subway.shanghai" = "Subway";
+
+"type.railway.station.subway.shiraz" = "Subway";
+
+"type.railway.station.subway.sofia" = "Subway";
+
 "type.railway.station.subway.spb" = "Subway";
 
+"type.railway.station.subway.stockholm" = "Subway";
+
+"type.railway.station.subway.tabriz" = "Subway";
+
+"type.railway.station.subway.taipei" = "Subway";
+
+"type.railway.station.subway.taoyuan" = "Subway";
+
+"type.railway.station.subway.tashkent" = "Subway";
+
+"type.railway.station.subway.tbilisi" = "Subway";
+
+"type.railway.station.subway.tianjin" = "Subway";
+
+"type.railway.station.subway.tokyo" = "Subway";
+
+"type.railway.station.subway.valencia" = "Subway";
+
+"type.railway.station.subway.vienna" = "Subway";
+
+"type.railway.station.subway.warszawa" = "Subway";
+
+"type.railway.station.subway.washington" = "Subway";
+
+"type.railway.station.subway.wuhan" = "Subway";
+
+"type.railway.station.subway.yerevan" = "Subway";
+
+"type.railway.station.subway.yokohama" = "Subway";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.barcelona" = "Subway";
+"type.railway.subway_entrance.adana" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.berlin" = "Subway";
+"type.railway.subway_entrance.algiers" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.kiev" = "Subway";
+"type.railway.subway_entrance.almaty" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.london" = "Subway";
+"type.railway.subway_entrance.amsterdam" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.madrid" = "Subway";
+"type.railway.subway_entrance.ankara" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.minsk" = "Subway";
+"type.railway.subway_entrance.athens" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.moscow" = "Subway";
+"type.railway.subway_entrance.baku" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.newyork" = "Subway";
+"type.railway.subway_entrance.bangkok" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.paris" = "Subway";
+"type.railway.subway_entrance.barcelona" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.roma" = "Subway";
+"type.railway.subway_entrance.beijing" = "Lango la kuingilia stesheni ya reli";
 
-"type.railway.subway_entrance.spb" = "Subway";
+"type.railway.subway_entrance.bengalore" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.berlin" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.brasilia" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.brescia" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.brussels" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.bucharest" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.budapest" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.buenos_aires" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.bursa" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.cairo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.caracas" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.catania" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.changchun" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.chengdu" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.chicago" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.chongqing" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.dalian" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.delhi" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.dnepro" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.dubai" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.ekb" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.fukuoka" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.glasgow" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.guangzhou" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.hamburg" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.helsinki" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.hiroshima" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.isfahan" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.istanbul" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.izmir" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kazan" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kharkiv" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kiev" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kobe" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kolkata" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kunming" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.kyoto" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.la" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.lausanne" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.lille" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.lima" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.lisboa" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.lisbon" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.london" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.lyon" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.madrid" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.malaga" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.manila" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.maracaibo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.mashhad" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.mecca" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.medellin" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.mexico" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.milan" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.minsk" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.montreal" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.moscow" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.munchen" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.nagoya" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.newyork" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.nnov" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.novosibirsk" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.osaka" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.oslo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.palma" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.panama" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.paris" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.philadelphia" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.pyongyang" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.rennes" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.rio" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.roma" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.rotterdam" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.samara" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.santiago" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.santo_domingo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.saopaulo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.sapporo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.sendai" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.sf" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.shanghai" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.shiraz" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.sofia" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.spb" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.stockholm" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.tabriz" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.taipei" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.taoyuan" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.tashkent" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.tbilisi" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.tianjin" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.tokyo" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.valencia" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.vienna" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.warszawa" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.washington" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.wuhan" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.yerevan" = "Lango la kuingilia stesheni ya reli";
+
+"type.railway.subway_entrance.yokohama" = "Lango la kuingilia stesheni ya reli";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index e78d74d163..c010024f4c 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "รถไฟ";
 
+"type.railway.station.subway.adana" = "รถไฟ";
+
+"type.railway.station.subway.algiers" = "รถไฟ";
+
+"type.railway.station.subway.almaty" = "รถไฟ";
+
+"type.railway.station.subway.amsterdam" = "รถไฟ";
+
+"type.railway.station.subway.ankara" = "รถไฟ";
+
+"type.railway.station.subway.athens" = "รถไฟ";
+
+"type.railway.station.subway.baku" = "รถไฟ";
+
+"type.railway.station.subway.bangkok" = "รถไฟ";
+
 "type.railway.station.subway.barcelona" = "รถไฟ";
 
+"type.railway.station.subway.beijing" = "รถไฟ";
+
+"type.railway.station.subway.bengalore" = "รถไฟ";
+
 "type.railway.station.subway.berlin" = "รถไฟ";
 
+"type.railway.station.subway.brasilia" = "รถไฟ";
+
+"type.railway.station.subway.brescia" = "รถไฟ";
+
+"type.railway.station.subway.brussels" = "รถไฟ";
+
+"type.railway.station.subway.bucharest" = "รถไฟ";
+
+"type.railway.station.subway.budapest" = "รถไฟ";
+
+"type.railway.station.subway.buenos_aires" = "รถไฟ";
+
+"type.railway.station.subway.bursa" = "รถไฟ";
+
+"type.railway.station.subway.cairo" = "รถไฟ";
+
+"type.railway.station.subway.caracas" = "รถไฟ";
+
+"type.railway.station.subway.catania" = "รถไฟ";
+
+"type.railway.station.subway.changchun" = "รถไฟ";
+
+"type.railway.station.subway.chengdu" = "รถไฟ";
+
+"type.railway.station.subway.chicago" = "รถไฟ";
+
+"type.railway.station.subway.chongqing" = "รถไฟ";
+
+"type.railway.station.subway.dalian" = "รถไฟ";
+
+"type.railway.station.subway.delhi" = "รถไฟ";
+
+"type.railway.station.subway.dnepro" = "รถไฟ";
+
+"type.railway.station.subway.dubai" = "รถไฟ";
+
+"type.railway.station.subway.ekb" = "รถไฟ";
+
+"type.railway.station.subway.fukuoka" = "รถไฟ";
+
+"type.railway.station.subway.glasgow" = "รถไฟ";
+
+"type.railway.station.subway.guangzhou" = "รถไฟ";
+
+"type.railway.station.subway.hamburg" = "รถไฟ";
+
+"type.railway.station.subway.helsinki" = "รถไฟ";
+
+"type.railway.station.subway.hiroshima" = "รถไฟ";
+
+"type.railway.station.subway.isfahan" = "รถไฟ";
+
+"type.railway.station.subway.istanbul" = "รถไฟ";
+
+"type.railway.station.subway.izmir" = "รถไฟ";
+
+"type.railway.station.subway.kazan" = "รถไฟ";
+
+"type.railway.station.subway.kharkiv" = "รถไฟ";
+
 "type.railway.station.subway.kiev" = "รถไฟ";
 
+"type.railway.station.subway.kobe" = "รถไฟ";
+
+"type.railway.station.subway.kolkata" = "รถไฟ";
+
+"type.railway.station.subway.kunming" = "รถไฟ";
+
+"type.railway.station.subway.kyoto" = "รถไฟ";
+
+"type.railway.station.subway.la" = "รถไฟ";
+
+"type.railway.station.subway.lausanne" = "รถไฟ";
+
+"type.railway.station.subway.lille" = "รถไฟ";
+
+"type.railway.station.subway.lima" = "รถไฟ";
+
+"type.railway.station.subway.lisboa" = "รถไฟ";
+
+"type.railway.station.subway.lisbon" = "รถไฟ";
+
 "type.railway.station.subway.london" = "รถไฟ";
 
+"type.railway.station.subway.lyon" = "รถไฟ";
+
 "type.railway.station.subway.madrid" = "รถไฟ";
 
+"type.railway.station.subway.malaga" = "รถไฟ";
+
+"type.railway.station.subway.manila" = "รถไฟ";
+
+"type.railway.station.subway.maracaibo" = "รถไฟ";
+
+"type.railway.station.subway.mashhad" = "รถไฟ";
+
+"type.railway.station.subway.mecca" = "รถไฟ";
+
+"type.railway.station.subway.medellin" = "รถไฟ";
+
+"type.railway.station.subway.mexico" = "รถไฟ";
+
+"type.railway.station.subway.milan" = "รถไฟ";
+
 "type.railway.station.subway.minsk" = "รถไฟ";
 
+"type.railway.station.subway.montreal" = "รถไฟ";
+
 "type.railway.station.subway.moscow" = "รถไฟ";
 
+"type.railway.station.subway.munchen" = "รถไฟ";
+
+"type.railway.station.subway.nagoya" = "รถไฟ";
+
 "type.railway.station.subway.newyork" = "รถไฟ";
 
+"type.railway.station.subway.nnov" = "รถไฟ";
+
+"type.railway.station.subway.novosibirsk" = "รถไฟ";
+
+"type.railway.station.subway.osaka" = "รถไฟ";
+
+"type.railway.station.subway.oslo" = "รถไฟ";
+
+"type.railway.station.subway.palma" = "รถไฟ";
+
+"type.railway.station.subway.panama" = "รถไฟ";
+
 "type.railway.station.subway.paris" = "รถไฟ";
 
+"type.railway.station.subway.philadelphia" = "รถไฟ";
+
+"type.railway.station.subway.pyongyang" = "รถไฟ";
+
+"type.railway.station.subway.rennes" = "รถไฟ";
+
+"type.railway.station.subway.rio" = "รถไฟ";
+
 "type.railway.station.subway.roma" = "รถไฟ";
 
+"type.railway.station.subway.rotterdam" = "รถไฟ";
+
+"type.railway.station.subway.samara" = "รถไฟ";
+
+"type.railway.station.subway.santiago" = "รถไฟ";
+
+"type.railway.station.subway.santo_domingo" = "รถไฟ";
+
+"type.railway.station.subway.saopaulo" = "รถไฟ";
+
+"type.railway.station.subway.sapporo" = "รถไฟ";
+
+"type.railway.station.subway.sendai" = "รถไฟ";
+
+"type.railway.station.subway.sf" = "รถไฟ";
+
+"type.railway.station.subway.shanghai" = "รถไฟ";
+
+"type.railway.station.subway.shiraz" = "รถไฟ";
+
+"type.railway.station.subway.sofia" = "รถไฟ";
+
 "type.railway.station.subway.spb" = "รถไฟ";
 
+"type.railway.station.subway.stockholm" = "รถไฟ";
+
+"type.railway.station.subway.tabriz" = "รถไฟ";
+
+"type.railway.station.subway.taipei" = "รถไฟ";
+
+"type.railway.station.subway.taoyuan" = "รถไฟ";
+
+"type.railway.station.subway.tashkent" = "รถไฟ";
+
+"type.railway.station.subway.tbilisi" = "รถไฟ";
+
+"type.railway.station.subway.tianjin" = "รถไฟ";
+
+"type.railway.station.subway.tokyo" = "รถไฟ";
+
+"type.railway.station.subway.valencia" = "รถไฟ";
+
+"type.railway.station.subway.vienna" = "รถไฟ";
+
+"type.railway.station.subway.warszawa" = "รถไฟ";
+
+"type.railway.station.subway.washington" = "รถไฟ";
+
+"type.railway.station.subway.wuhan" = "รถไฟ";
+
+"type.railway.station.subway.yerevan" = "รถไฟ";
+
+"type.railway.station.subway.yokohama" = "รถไฟ";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.barcelona" = "รถไฟ";
+"type.railway.subway_entrance.adana" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.berlin" = "รถไฟ";
+"type.railway.subway_entrance.algiers" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.kiev" = "รถไฟ";
+"type.railway.subway_entrance.almaty" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.london" = "รถไฟ";
+"type.railway.subway_entrance.amsterdam" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.madrid" = "รถไฟ";
+"type.railway.subway_entrance.ankara" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.minsk" = "รถไฟ";
+"type.railway.subway_entrance.athens" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.moscow" = "รถไฟ";
+"type.railway.subway_entrance.baku" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.newyork" = "รถไฟ";
+"type.railway.subway_entrance.bangkok" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.paris" = "รถไฟ";
+"type.railway.subway_entrance.barcelona" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.roma" = "รถไฟ";
+"type.railway.subway_entrance.beijing" = "ทางเข้ารถไฟใต้ดิน";
 
-"type.railway.subway_entrance.spb" = "รถไฟ";
+"type.railway.subway_entrance.bengalore" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.berlin" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.brasilia" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.brescia" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.brussels" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.bucharest" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.budapest" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.buenos_aires" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.bursa" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.cairo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.caracas" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.catania" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.changchun" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.chengdu" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.chicago" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.chongqing" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.dalian" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.delhi" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.dnepro" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.dubai" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.ekb" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.fukuoka" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.glasgow" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.guangzhou" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.hamburg" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.helsinki" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.hiroshima" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.isfahan" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.istanbul" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.izmir" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kazan" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kharkiv" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kiev" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kobe" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kolkata" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kunming" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.kyoto" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.la" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.lausanne" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.lille" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.lima" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.lisboa" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.lisbon" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.london" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.lyon" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.madrid" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.malaga" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.manila" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.maracaibo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.mashhad" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.mecca" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.medellin" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.mexico" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.milan" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.minsk" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.montreal" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.moscow" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.munchen" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.nagoya" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.newyork" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.nnov" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.novosibirsk" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.osaka" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.oslo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.palma" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.panama" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.paris" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.philadelphia" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.pyongyang" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.rennes" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.rio" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.roma" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.rotterdam" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.samara" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.santiago" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.santo_domingo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.saopaulo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.sapporo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.sendai" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.sf" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.shanghai" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.shiraz" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.sofia" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.spb" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.stockholm" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.tabriz" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.taipei" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.taoyuan" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.tashkent" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.tbilisi" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.tianjin" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.tokyo" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.valencia" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.vienna" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.warszawa" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.washington" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.wuhan" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.yerevan" = "ทางเข้ารถไฟใต้ดิน";
+
+"type.railway.subway_entrance.yokohama" = "ทางเข้ารถไฟใต้ดิน";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 46a3bc9a36..190eb5b20e 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Metro";
 
+"type.railway.station.subway.adana" = "Metro";
+
+"type.railway.station.subway.algiers" = "Metro";
+
+"type.railway.station.subway.almaty" = "Metro";
+
+"type.railway.station.subway.amsterdam" = "Metro";
+
+"type.railway.station.subway.ankara" = "Metro";
+
+"type.railway.station.subway.athens" = "Metro";
+
+"type.railway.station.subway.baku" = "Metro";
+
+"type.railway.station.subway.bangkok" = "Metro";
+
 "type.railway.station.subway.barcelona" = "Metro";
 
+"type.railway.station.subway.beijing" = "Metro";
+
+"type.railway.station.subway.bengalore" = "Metro";
+
 "type.railway.station.subway.berlin" = "Metro";
 
+"type.railway.station.subway.brasilia" = "Metro";
+
+"type.railway.station.subway.brescia" = "Metro";
+
+"type.railway.station.subway.brussels" = "Metro";
+
+"type.railway.station.subway.bucharest" = "Metro";
+
+"type.railway.station.subway.budapest" = "Metro";
+
+"type.railway.station.subway.buenos_aires" = "Metro";
+
+"type.railway.station.subway.bursa" = "Metro";
+
+"type.railway.station.subway.cairo" = "Metro";
+
+"type.railway.station.subway.caracas" = "Metro";
+
+"type.railway.station.subway.catania" = "Metro";
+
+"type.railway.station.subway.changchun" = "Metro";
+
+"type.railway.station.subway.chengdu" = "Metro";
+
+"type.railway.station.subway.chicago" = "Metro";
+
+"type.railway.station.subway.chongqing" = "Metro";
+
+"type.railway.station.subway.dalian" = "Metro";
+
+"type.railway.station.subway.delhi" = "Metro";
+
+"type.railway.station.subway.dnepro" = "Metro";
+
+"type.railway.station.subway.dubai" = "Metro";
+
+"type.railway.station.subway.ekb" = "Metro";
+
+"type.railway.station.subway.fukuoka" = "Metro";
+
+"type.railway.station.subway.glasgow" = "Metro";
+
+"type.railway.station.subway.guangzhou" = "Metro";
+
+"type.railway.station.subway.hamburg" = "Metro";
+
+"type.railway.station.subway.helsinki" = "Metro";
+
+"type.railway.station.subway.hiroshima" = "Metro";
+
+"type.railway.station.subway.isfahan" = "Metro";
+
+"type.railway.station.subway.istanbul" = "Metro";
+
+"type.railway.station.subway.izmir" = "Metro";
+
+"type.railway.station.subway.kazan" = "Metro";
+
+"type.railway.station.subway.kharkiv" = "Metro";
+
 "type.railway.station.subway.kiev" = "Metro";
 
+"type.railway.station.subway.kobe" = "Metro";
+
+"type.railway.station.subway.kolkata" = "Metro";
+
+"type.railway.station.subway.kunming" = "Metro";
+
+"type.railway.station.subway.kyoto" = "Metro";
+
+"type.railway.station.subway.la" = "Metro";
+
+"type.railway.station.subway.lausanne" = "Metro";
+
+"type.railway.station.subway.lille" = "Metro";
+
+"type.railway.station.subway.lima" = "Metro";
+
+"type.railway.station.subway.lisboa" = "Metro";
+
+"type.railway.station.subway.lisbon" = "Metro";
+
 "type.railway.station.subway.london" = "Metro";
 
+"type.railway.station.subway.lyon" = "Metro";
+
 "type.railway.station.subway.madrid" = "Metro";
 
+"type.railway.station.subway.malaga" = "Metro";
+
+"type.railway.station.subway.manila" = "Metro";
+
+"type.railway.station.subway.maracaibo" = "Metro";
+
+"type.railway.station.subway.mashhad" = "Metro";
+
+"type.railway.station.subway.mecca" = "Metro";
+
+"type.railway.station.subway.medellin" = "Metro";
+
+"type.railway.station.subway.mexico" = "Metro";
+
+"type.railway.station.subway.milan" = "Metro";
+
 "type.railway.station.subway.minsk" = "Metro";
 
+"type.railway.station.subway.montreal" = "Metro";
+
 "type.railway.station.subway.moscow" = "Metro";
 
+"type.railway.station.subway.munchen" = "Metro";
+
+"type.railway.station.subway.nagoya" = "Metro";
+
 "type.railway.station.subway.newyork" = "Metro";
 
+"type.railway.station.subway.nnov" = "Metro";
+
+"type.railway.station.subway.novosibirsk" = "Metro";
+
+"type.railway.station.subway.osaka" = "Metro";
+
+"type.railway.station.subway.oslo" = "Metro";
+
+"type.railway.station.subway.palma" = "Metro";
+
+"type.railway.station.subway.panama" = "Metro";
+
 "type.railway.station.subway.paris" = "Metro";
 
+"type.railway.station.subway.philadelphia" = "Metro";
+
+"type.railway.station.subway.pyongyang" = "Metro";
+
+"type.railway.station.subway.rennes" = "Metro";
+
+"type.railway.station.subway.rio" = "Metro";
+
 "type.railway.station.subway.roma" = "Metro";
 
+"type.railway.station.subway.rotterdam" = "Metro";
+
+"type.railway.station.subway.samara" = "Metro";
+
+"type.railway.station.subway.santiago" = "Metro";
+
+"type.railway.station.subway.santo_domingo" = "Metro";
+
+"type.railway.station.subway.saopaulo" = "Metro";
+
+"type.railway.station.subway.sapporo" = "Metro";
+
+"type.railway.station.subway.sendai" = "Metro";
+
+"type.railway.station.subway.sf" = "Metro";
+
+"type.railway.station.subway.shanghai" = "Metro";
+
+"type.railway.station.subway.shiraz" = "Metro";
+
+"type.railway.station.subway.sofia" = "Metro";
+
 "type.railway.station.subway.spb" = "Metro";
 
+"type.railway.station.subway.stockholm" = "Metro";
+
+"type.railway.station.subway.tabriz" = "Metro";
+
+"type.railway.station.subway.taipei" = "Metro";
+
+"type.railway.station.subway.taoyuan" = "Metro";
+
+"type.railway.station.subway.tashkent" = "Metro";
+
+"type.railway.station.subway.tbilisi" = "Metro";
+
+"type.railway.station.subway.tianjin" = "Metro";
+
+"type.railway.station.subway.tokyo" = "Metro";
+
+"type.railway.station.subway.valencia" = "Metro";
+
+"type.railway.station.subway.vienna" = "Metro";
+
+"type.railway.station.subway.warszawa" = "Metro";
+
+"type.railway.station.subway.washington" = "Metro";
+
+"type.railway.station.subway.wuhan" = "Metro";
+
+"type.railway.station.subway.yerevan" = "Metro";
+
+"type.railway.station.subway.yokohama" = "Metro";
+
 "type.railway.subway" = "Metro Hattı";
 
 "type.railway.subway.bridge" = "Metro Hattı";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Metro Girişi";
 
-"type.railway.subway_entrance.barcelona" = "Metro";
+"type.railway.subway_entrance.adana" = "Metro Girişi";
 
-"type.railway.subway_entrance.berlin" = "Metro";
+"type.railway.subway_entrance.algiers" = "Metro Girişi";
 
-"type.railway.subway_entrance.kiev" = "Metro";
+"type.railway.subway_entrance.almaty" = "Metro Girişi";
 
-"type.railway.subway_entrance.london" = "Metro";
+"type.railway.subway_entrance.amsterdam" = "Metro Girişi";
 
-"type.railway.subway_entrance.madrid" = "Metro";
+"type.railway.subway_entrance.ankara" = "Metro Girişi";
 
-"type.railway.subway_entrance.minsk" = "Metro";
+"type.railway.subway_entrance.athens" = "Metro Girişi";
 
-"type.railway.subway_entrance.moscow" = "Metro";
+"type.railway.subway_entrance.baku" = "Metro Girişi";
 
-"type.railway.subway_entrance.newyork" = "Metro";
+"type.railway.subway_entrance.bangkok" = "Metro Girişi";
 
-"type.railway.subway_entrance.paris" = "Metro";
+"type.railway.subway_entrance.barcelona" = "Metro Girişi";
 
-"type.railway.subway_entrance.roma" = "Metro";
+"type.railway.subway_entrance.beijing" = "Metro Girişi";
 
-"type.railway.subway_entrance.spb" = "Metro";
+"type.railway.subway_entrance.bengalore" = "Metro Girişi";
+
+"type.railway.subway_entrance.berlin" = "Metro Girişi";
+
+"type.railway.subway_entrance.brasilia" = "Metro Girişi";
+
+"type.railway.subway_entrance.brescia" = "Metro Girişi";
+
+"type.railway.subway_entrance.brussels" = "Metro Girişi";
+
+"type.railway.subway_entrance.bucharest" = "Metro Girişi";
+
+"type.railway.subway_entrance.budapest" = "Metro Girişi";
+
+"type.railway.subway_entrance.buenos_aires" = "Metro Girişi";
+
+"type.railway.subway_entrance.bursa" = "Metro Girişi";
+
+"type.railway.subway_entrance.cairo" = "Metro Girişi";
+
+"type.railway.subway_entrance.caracas" = "Metro Girişi";
+
+"type.railway.subway_entrance.catania" = "Metro Girişi";
+
+"type.railway.subway_entrance.changchun" = "Metro Girişi";
+
+"type.railway.subway_entrance.chengdu" = "Metro Girişi";
+
+"type.railway.subway_entrance.chicago" = "Metro Girişi";
+
+"type.railway.subway_entrance.chongqing" = "Metro Girişi";
+
+"type.railway.subway_entrance.dalian" = "Metro Girişi";
+
+"type.railway.subway_entrance.delhi" = "Metro Girişi";
+
+"type.railway.subway_entrance.dnepro" = "Metro Girişi";
+
+"type.railway.subway_entrance.dubai" = "Metro Girişi";
+
+"type.railway.subway_entrance.ekb" = "Metro Girişi";
+
+"type.railway.subway_entrance.fukuoka" = "Metro Girişi";
+
+"type.railway.subway_entrance.glasgow" = "Metro Girişi";
+
+"type.railway.subway_entrance.guangzhou" = "Metro Girişi";
+
+"type.railway.subway_entrance.hamburg" = "Metro Girişi";
+
+"type.railway.subway_entrance.helsinki" = "Metro Girişi";
+
+"type.railway.subway_entrance.hiroshima" = "Metro Girişi";
+
+"type.railway.subway_entrance.isfahan" = "Metro Girişi";
+
+"type.railway.subway_entrance.istanbul" = "Metro Girişi";
+
+"type.railway.subway_entrance.izmir" = "Metro Girişi";
+
+"type.railway.subway_entrance.kazan" = "Metro Girişi";
+
+"type.railway.subway_entrance.kharkiv" = "Metro Girişi";
+
+"type.railway.subway_entrance.kiev" = "Metro Girişi";
+
+"type.railway.subway_entrance.kobe" = "Metro Girişi";
+
+"type.railway.subway_entrance.kolkata" = "Metro Girişi";
+
+"type.railway.subway_entrance.kunming" = "Metro Girişi";
+
+"type.railway.subway_entrance.kyoto" = "Metro Girişi";
+
+"type.railway.subway_entrance.la" = "Metro Girişi";
+
+"type.railway.subway_entrance.lausanne" = "Metro Girişi";
+
+"type.railway.subway_entrance.lille" = "Metro Girişi";
+
+"type.railway.subway_entrance.lima" = "Metro Girişi";
+
+"type.railway.subway_entrance.lisboa" = "Metro Girişi";
+
+"type.railway.subway_entrance.lisbon" = "Metro Girişi";
+
+"type.railway.subway_entrance.london" = "Metro Girişi";
+
+"type.railway.subway_entrance.lyon" = "Metro Girişi";
+
+"type.railway.subway_entrance.madrid" = "Metro Girişi";
+
+"type.railway.subway_entrance.malaga" = "Metro Girişi";
+
+"type.railway.subway_entrance.manila" = "Metro Girişi";
+
+"type.railway.subway_entrance.maracaibo" = "Metro Girişi";
+
+"type.railway.subway_entrance.mashhad" = "Metro Girişi";
+
+"type.railway.subway_entrance.mecca" = "Metro Girişi";
+
+"type.railway.subway_entrance.medellin" = "Metro Girişi";
+
+"type.railway.subway_entrance.mexico" = "Metro Girişi";
+
+"type.railway.subway_entrance.milan" = "Metro Girişi";
+
+"type.railway.subway_entrance.minsk" = "Metro Girişi";
+
+"type.railway.subway_entrance.montreal" = "Metro Girişi";
+
+"type.railway.subway_entrance.moscow" = "Metro Girişi";
+
+"type.railway.subway_entrance.munchen" = "Metro Girişi";
+
+"type.railway.subway_entrance.nagoya" = "Metro Girişi";
+
+"type.railway.subway_entrance.newyork" = "Metro Girişi";
+
+"type.railway.subway_entrance.nnov" = "Metro Girişi";
+
+"type.railway.subway_entrance.novosibirsk" = "Metro Girişi";
+
+"type.railway.subway_entrance.osaka" = "Metro Girişi";
+
+"type.railway.subway_entrance.oslo" = "Metro Girişi";
+
+"type.railway.subway_entrance.palma" = "Metro Girişi";
+
+"type.railway.subway_entrance.panama" = "Metro Girişi";
+
+"type.railway.subway_entrance.paris" = "Metro Girişi";
+
+"type.railway.subway_entrance.philadelphia" = "Metro Girişi";
+
+"type.railway.subway_entrance.pyongyang" = "Metro Girişi";
+
+"type.railway.subway_entrance.rennes" = "Metro Girişi";
+
+"type.railway.subway_entrance.rio" = "Metro Girişi";
+
+"type.railway.subway_entrance.roma" = "Metro Girişi";
+
+"type.railway.subway_entrance.rotterdam" = "Metro Girişi";
+
+"type.railway.subway_entrance.samara" = "Metro Girişi";
+
+"type.railway.subway_entrance.santiago" = "Metro Girişi";
+
+"type.railway.subway_entrance.santo_domingo" = "Metro Girişi";
+
+"type.railway.subway_entrance.saopaulo" = "Metro Girişi";
+
+"type.railway.subway_entrance.sapporo" = "Metro Girişi";
+
+"type.railway.subway_entrance.sendai" = "Metro Girişi";
+
+"type.railway.subway_entrance.sf" = "Metro Girişi";
+
+"type.railway.subway_entrance.shanghai" = "Metro Girişi";
+
+"type.railway.subway_entrance.shiraz" = "Metro Girişi";
+
+"type.railway.subway_entrance.sofia" = "Metro Girişi";
+
+"type.railway.subway_entrance.spb" = "Metro Girişi";
+
+"type.railway.subway_entrance.stockholm" = "Metro Girişi";
+
+"type.railway.subway_entrance.tabriz" = "Metro Girişi";
+
+"type.railway.subway_entrance.taipei" = "Metro Girişi";
+
+"type.railway.subway_entrance.taoyuan" = "Metro Girişi";
+
+"type.railway.subway_entrance.tashkent" = "Metro Girişi";
+
+"type.railway.subway_entrance.tbilisi" = "Metro Girişi";
+
+"type.railway.subway_entrance.tianjin" = "Metro Girişi";
+
+"type.railway.subway_entrance.tokyo" = "Metro Girişi";
+
+"type.railway.subway_entrance.valencia" = "Metro Girişi";
+
+"type.railway.subway_entrance.vienna" = "Metro Girişi";
+
+"type.railway.subway_entrance.warszawa" = "Metro Girişi";
+
+"type.railway.subway_entrance.washington" = "Metro Girişi";
+
+"type.railway.subway_entrance.wuhan" = "Metro Girişi";
+
+"type.railway.subway_entrance.yerevan" = "Metro Girişi";
+
+"type.railway.subway_entrance.yokohama" = "Metro Girişi";
 
 "type.railway.tram" = "Tramvay Hattı";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index feea34727e..343d03e712 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Метро";
 
+"type.railway.station.subway.adana" = "Метро";
+
+"type.railway.station.subway.algiers" = "Метро";
+
+"type.railway.station.subway.almaty" = "Метро";
+
+"type.railway.station.subway.amsterdam" = "Метро";
+
+"type.railway.station.subway.ankara" = "Метро";
+
+"type.railway.station.subway.athens" = "Метро";
+
+"type.railway.station.subway.baku" = "Метро";
+
+"type.railway.station.subway.bangkok" = "Метро";
+
 "type.railway.station.subway.barcelona" = "Метро";
 
+"type.railway.station.subway.beijing" = "Метро";
+
+"type.railway.station.subway.bengalore" = "Метро";
+
 "type.railway.station.subway.berlin" = "Метро";
 
+"type.railway.station.subway.brasilia" = "Метро";
+
+"type.railway.station.subway.brescia" = "Метро";
+
+"type.railway.station.subway.brussels" = "Метро";
+
+"type.railway.station.subway.bucharest" = "Метро";
+
+"type.railway.station.subway.budapest" = "Метро";
+
+"type.railway.station.subway.buenos_aires" = "Метро";
+
+"type.railway.station.subway.bursa" = "Метро";
+
+"type.railway.station.subway.cairo" = "Метро";
+
+"type.railway.station.subway.caracas" = "Метро";
+
+"type.railway.station.subway.catania" = "Метро";
+
+"type.railway.station.subway.changchun" = "Метро";
+
+"type.railway.station.subway.chengdu" = "Метро";
+
+"type.railway.station.subway.chicago" = "Метро";
+
+"type.railway.station.subway.chongqing" = "Метро";
+
+"type.railway.station.subway.dalian" = "Метро";
+
+"type.railway.station.subway.delhi" = "Метро";
+
+"type.railway.station.subway.dnepro" = "Метро";
+
+"type.railway.station.subway.dubai" = "Метро";
+
+"type.railway.station.subway.ekb" = "Метро";
+
+"type.railway.station.subway.fukuoka" = "Метро";
+
+"type.railway.station.subway.glasgow" = "Метро";
+
+"type.railway.station.subway.guangzhou" = "Метро";
+
+"type.railway.station.subway.hamburg" = "Метро";
+
+"type.railway.station.subway.helsinki" = "Метро";
+
+"type.railway.station.subway.hiroshima" = "Метро";
+
+"type.railway.station.subway.isfahan" = "Метро";
+
+"type.railway.station.subway.istanbul" = "Метро";
+
+"type.railway.station.subway.izmir" = "Метро";
+
+"type.railway.station.subway.kazan" = "Метро";
+
+"type.railway.station.subway.kharkiv" = "Метро";
+
 "type.railway.station.subway.kiev" = "Метро";
 
+"type.railway.station.subway.kobe" = "Метро";
+
+"type.railway.station.subway.kolkata" = "Метро";
+
+"type.railway.station.subway.kunming" = "Метро";
+
+"type.railway.station.subway.kyoto" = "Метро";
+
+"type.railway.station.subway.la" = "Метро";
+
+"type.railway.station.subway.lausanne" = "Метро";
+
+"type.railway.station.subway.lille" = "Метро";
+
+"type.railway.station.subway.lima" = "Метро";
+
+"type.railway.station.subway.lisboa" = "Метро";
+
+"type.railway.station.subway.lisbon" = "Метро";
+
 "type.railway.station.subway.london" = "Метро";
 
+"type.railway.station.subway.lyon" = "Метро";
+
 "type.railway.station.subway.madrid" = "Метро";
 
+"type.railway.station.subway.malaga" = "Метро";
+
+"type.railway.station.subway.manila" = "Метро";
+
+"type.railway.station.subway.maracaibo" = "Метро";
+
+"type.railway.station.subway.mashhad" = "Метро";
+
+"type.railway.station.subway.mecca" = "Метро";
+
+"type.railway.station.subway.medellin" = "Метро";
+
+"type.railway.station.subway.mexico" = "Метро";
+
+"type.railway.station.subway.milan" = "Метро";
+
 "type.railway.station.subway.minsk" = "Метро";
 
+"type.railway.station.subway.montreal" = "Метро";
+
 "type.railway.station.subway.moscow" = "Метро";
 
+"type.railway.station.subway.munchen" = "Метро";
+
+"type.railway.station.subway.nagoya" = "Метро";
+
 "type.railway.station.subway.newyork" = "Метро";
 
+"type.railway.station.subway.nnov" = "Метро";
+
+"type.railway.station.subway.novosibirsk" = "Метро";
+
+"type.railway.station.subway.osaka" = "Метро";
+
+"type.railway.station.subway.oslo" = "Метро";
+
+"type.railway.station.subway.palma" = "Метро";
+
+"type.railway.station.subway.panama" = "Метро";
+
 "type.railway.station.subway.paris" = "Метро";
 
+"type.railway.station.subway.philadelphia" = "Метро";
+
+"type.railway.station.subway.pyongyang" = "Метро";
+
+"type.railway.station.subway.rennes" = "Метро";
+
+"type.railway.station.subway.rio" = "Метро";
+
 "type.railway.station.subway.roma" = "Метро";
 
+"type.railway.station.subway.rotterdam" = "Метро";
+
+"type.railway.station.subway.samara" = "Метро";
+
+"type.railway.station.subway.santiago" = "Метро";
+
+"type.railway.station.subway.santo_domingo" = "Метро";
+
+"type.railway.station.subway.saopaulo" = "Метро";
+
+"type.railway.station.subway.sapporo" = "Метро";
+
+"type.railway.station.subway.sendai" = "Метро";
+
+"type.railway.station.subway.sf" = "Метро";
+
+"type.railway.station.subway.shanghai" = "Метро";
+
+"type.railway.station.subway.shiraz" = "Метро";
+
+"type.railway.station.subway.sofia" = "Метро";
+
 "type.railway.station.subway.spb" = "Метро";
 
+"type.railway.station.subway.stockholm" = "Метро";
+
+"type.railway.station.subway.tabriz" = "Метро";
+
+"type.railway.station.subway.taipei" = "Метро";
+
+"type.railway.station.subway.taoyuan" = "Метро";
+
+"type.railway.station.subway.tashkent" = "Метро";
+
+"type.railway.station.subway.tbilisi" = "Метро";
+
+"type.railway.station.subway.tianjin" = "Метро";
+
+"type.railway.station.subway.tokyo" = "Метро";
+
+"type.railway.station.subway.valencia" = "Метро";
+
+"type.railway.station.subway.vienna" = "Метро";
+
+"type.railway.station.subway.warszawa" = "Метро";
+
+"type.railway.station.subway.washington" = "Метро";
+
+"type.railway.station.subway.wuhan" = "Метро";
+
+"type.railway.station.subway.yerevan" = "Метро";
+
+"type.railway.station.subway.yokohama" = "Метро";
+
 "type.railway.subway" = "Лінія метро";
 
 "type.railway.subway.bridge" = "Лінія метро";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Вхід до метро";
 
-"type.railway.subway_entrance.barcelona" = "Метро";
+"type.railway.subway_entrance.adana" = "Вхід до метро";
 
-"type.railway.subway_entrance.berlin" = "Метро";
+"type.railway.subway_entrance.algiers" = "Вхід до метро";
 
-"type.railway.subway_entrance.kiev" = "Метро";
+"type.railway.subway_entrance.almaty" = "Вхід до метро";
 
-"type.railway.subway_entrance.london" = "Метро";
+"type.railway.subway_entrance.amsterdam" = "Вхід до метро";
 
-"type.railway.subway_entrance.madrid" = "Метро";
+"type.railway.subway_entrance.ankara" = "Вхід до метро";
 
-"type.railway.subway_entrance.minsk" = "Метро";
+"type.railway.subway_entrance.athens" = "Вхід до метро";
 
-"type.railway.subway_entrance.moscow" = "Метро";
+"type.railway.subway_entrance.baku" = "Вхід до метро";
 
-"type.railway.subway_entrance.newyork" = "Метро";
+"type.railway.subway_entrance.bangkok" = "Вхід до метро";
 
-"type.railway.subway_entrance.paris" = "Метро";
+"type.railway.subway_entrance.barcelona" = "Вхід до метро";
 
-"type.railway.subway_entrance.roma" = "Метро";
+"type.railway.subway_entrance.beijing" = "Вхід до метро";
 
-"type.railway.subway_entrance.spb" = "Метро";
+"type.railway.subway_entrance.bengalore" = "Вхід до метро";
+
+"type.railway.subway_entrance.berlin" = "Вхід до метро";
+
+"type.railway.subway_entrance.brasilia" = "Вхід до метро";
+
+"type.railway.subway_entrance.brescia" = "Вхід до метро";
+
+"type.railway.subway_entrance.brussels" = "Вхід до метро";
+
+"type.railway.subway_entrance.bucharest" = "Вхід до метро";
+
+"type.railway.subway_entrance.budapest" = "Вхід до метро";
+
+"type.railway.subway_entrance.buenos_aires" = "Вхід до метро";
+
+"type.railway.subway_entrance.bursa" = "Вхід до метро";
+
+"type.railway.subway_entrance.cairo" = "Вхід до метро";
+
+"type.railway.subway_entrance.caracas" = "Вхід до метро";
+
+"type.railway.subway_entrance.catania" = "Вхід до метро";
+
+"type.railway.subway_entrance.changchun" = "Вхід до метро";
+
+"type.railway.subway_entrance.chengdu" = "Вхід до метро";
+
+"type.railway.subway_entrance.chicago" = "Вхід до метро";
+
+"type.railway.subway_entrance.chongqing" = "Вхід до метро";
+
+"type.railway.subway_entrance.dalian" = "Вхід до метро";
+
+"type.railway.subway_entrance.delhi" = "Вхід до метро";
+
+"type.railway.subway_entrance.dnepro" = "Вхід до метро";
+
+"type.railway.subway_entrance.dubai" = "Вхід до метро";
+
+"type.railway.subway_entrance.ekb" = "Вхід до метро";
+
+"type.railway.subway_entrance.fukuoka" = "Вхід до метро";
+
+"type.railway.subway_entrance.glasgow" = "Вхід до метро";
+
+"type.railway.subway_entrance.guangzhou" = "Вхід до метро";
+
+"type.railway.subway_entrance.hamburg" = "Вхід до метро";
+
+"type.railway.subway_entrance.helsinki" = "Вхід до метро";
+
+"type.railway.subway_entrance.hiroshima" = "Вхід до метро";
+
+"type.railway.subway_entrance.isfahan" = "Вхід до метро";
+
+"type.railway.subway_entrance.istanbul" = "Вхід до метро";
+
+"type.railway.subway_entrance.izmir" = "Вхід до метро";
+
+"type.railway.subway_entrance.kazan" = "Вхід до метро";
+
+"type.railway.subway_entrance.kharkiv" = "Вхід до метро";
+
+"type.railway.subway_entrance.kiev" = "Вхід до метро";
+
+"type.railway.subway_entrance.kobe" = "Вхід до метро";
+
+"type.railway.subway_entrance.kolkata" = "Вхід до метро";
+
+"type.railway.subway_entrance.kunming" = "Вхід до метро";
+
+"type.railway.subway_entrance.kyoto" = "Вхід до метро";
+
+"type.railway.subway_entrance.la" = "Вхід до метро";
+
+"type.railway.subway_entrance.lausanne" = "Вхід до метро";
+
+"type.railway.subway_entrance.lille" = "Вхід до метро";
+
+"type.railway.subway_entrance.lima" = "Вхід до метро";
+
+"type.railway.subway_entrance.lisboa" = "Вхід до метро";
+
+"type.railway.subway_entrance.lisbon" = "Вхід до метро";
+
+"type.railway.subway_entrance.london" = "Вхід до метро";
+
+"type.railway.subway_entrance.lyon" = "Вхід до метро";
+
+"type.railway.subway_entrance.madrid" = "Вхід до метро";
+
+"type.railway.subway_entrance.malaga" = "Вхід до метро";
+
+"type.railway.subway_entrance.manila" = "Вхід до метро";
+
+"type.railway.subway_entrance.maracaibo" = "Вхід до метро";
+
+"type.railway.subway_entrance.mashhad" = "Вхід до метро";
+
+"type.railway.subway_entrance.mecca" = "Вхід до метро";
+
+"type.railway.subway_entrance.medellin" = "Вхід до метро";
+
+"type.railway.subway_entrance.mexico" = "Вхід до метро";
+
+"type.railway.subway_entrance.milan" = "Вхід до метро";
+
+"type.railway.subway_entrance.minsk" = "Вхід до метро";
+
+"type.railway.subway_entrance.montreal" = "Вхід до метро";
+
+"type.railway.subway_entrance.moscow" = "Вхід до метро";
+
+"type.railway.subway_entrance.munchen" = "Вхід до метро";
+
+"type.railway.subway_entrance.nagoya" = "Вхід до метро";
+
+"type.railway.subway_entrance.newyork" = "Вхід до метро";
+
+"type.railway.subway_entrance.nnov" = "Вхід до метро";
+
+"type.railway.subway_entrance.novosibirsk" = "Вхід до метро";
+
+"type.railway.subway_entrance.osaka" = "Вхід до метро";
+
+"type.railway.subway_entrance.oslo" = "Вхід до метро";
+
+"type.railway.subway_entrance.palma" = "Вхід до метро";
+
+"type.railway.subway_entrance.panama" = "Вхід до метро";
+
+"type.railway.subway_entrance.paris" = "Вхід до метро";
+
+"type.railway.subway_entrance.philadelphia" = "Вхід до метро";
+
+"type.railway.subway_entrance.pyongyang" = "Вхід до метро";
+
+"type.railway.subway_entrance.rennes" = "Вхід до метро";
+
+"type.railway.subway_entrance.rio" = "Вхід до метро";
+
+"type.railway.subway_entrance.roma" = "Вхід до метро";
+
+"type.railway.subway_entrance.rotterdam" = "Вхід до метро";
+
+"type.railway.subway_entrance.samara" = "Вхід до метро";
+
+"type.railway.subway_entrance.santiago" = "Вхід до метро";
+
+"type.railway.subway_entrance.santo_domingo" = "Вхід до метро";
+
+"type.railway.subway_entrance.saopaulo" = "Вхід до метро";
+
+"type.railway.subway_entrance.sapporo" = "Вхід до метро";
+
+"type.railway.subway_entrance.sendai" = "Вхід до метро";
+
+"type.railway.subway_entrance.sf" = "Вхід до метро";
+
+"type.railway.subway_entrance.shanghai" = "Вхід до метро";
+
+"type.railway.subway_entrance.shiraz" = "Вхід до метро";
+
+"type.railway.subway_entrance.sofia" = "Вхід до метро";
+
+"type.railway.subway_entrance.spb" = "Вхід до метро";
+
+"type.railway.subway_entrance.stockholm" = "Вхід до метро";
+
+"type.railway.subway_entrance.tabriz" = "Вхід до метро";
+
+"type.railway.subway_entrance.taipei" = "Вхід до метро";
+
+"type.railway.subway_entrance.taoyuan" = "Вхід до метро";
+
+"type.railway.subway_entrance.tashkent" = "Вхід до метро";
+
+"type.railway.subway_entrance.tbilisi" = "Вхід до метро";
+
+"type.railway.subway_entrance.tianjin" = "Вхід до метро";
+
+"type.railway.subway_entrance.tokyo" = "Вхід до метро";
+
+"type.railway.subway_entrance.valencia" = "Вхід до метро";
+
+"type.railway.subway_entrance.vienna" = "Вхід до метро";
+
+"type.railway.subway_entrance.warszawa" = "Вхід до метро";
+
+"type.railway.subway_entrance.washington" = "Вхід до метро";
+
+"type.railway.subway_entrance.wuhan" = "Вхід до метро";
+
+"type.railway.subway_entrance.yerevan" = "Вхід до метро";
+
+"type.railway.subway_entrance.yokohama" = "Вхід до метро";
 
 "type.railway.tram" = "Трамвай";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 944ee17da2..948fbb9494 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -2689,28 +2689,224 @@
 
 "type.railway.station.subway" = "Ngầm";
 
+"type.railway.station.subway.adana" = "Ngầm";
+
+"type.railway.station.subway.algiers" = "Ngầm";
+
+"type.railway.station.subway.almaty" = "Ngầm";
+
+"type.railway.station.subway.amsterdam" = "Ngầm";
+
+"type.railway.station.subway.ankara" = "Ngầm";
+
+"type.railway.station.subway.athens" = "Ngầm";
+
+"type.railway.station.subway.baku" = "Ngầm";
+
+"type.railway.station.subway.bangkok" = "Ngầm";
+
 "type.railway.station.subway.barcelona" = "Ngầm";
 
+"type.railway.station.subway.beijing" = "Ngầm";
+
+"type.railway.station.subway.bengalore" = "Ngầm";
+
 "type.railway.station.subway.berlin" = "Ngầm";
 
+"type.railway.station.subway.brasilia" = "Ngầm";
+
+"type.railway.station.subway.brescia" = "Ngầm";
+
+"type.railway.station.subway.brussels" = "Ngầm";
+
+"type.railway.station.subway.bucharest" = "Ngầm";
+
+"type.railway.station.subway.budapest" = "Ngầm";
+
+"type.railway.station.subway.buenos_aires" = "Ngầm";
+
+"type.railway.station.subway.bursa" = "Ngầm";
+
+"type.railway.station.subway.cairo" = "Ngầm";
+
+"type.railway.station.subway.caracas" = "Ngầm";
+
+"type.railway.station.subway.catania" = "Ngầm";
+
+"type.railway.station.subway.changchun" = "Ngầm";
+
+"type.railway.station.subway.chengdu" = "Ngầm";
+
+"type.railway.station.subway.chicago" = "Ngầm";
+
+"type.railway.station.subway.chongqing" = "Ngầm";
+
+"type.railway.station.subway.dalian" = "Ngầm";
+
+"type.railway.station.subway.delhi" = "Ngầm";
+
+"type.railway.station.subway.dnepro" = "Ngầm";
+
+"type.railway.station.subway.dubai" = "Ngầm";
+
+"type.railway.station.subway.ekb" = "Ngầm";
+
+"type.railway.station.subway.fukuoka" = "Ngầm";
+
+"type.railway.station.subway.glasgow" = "Ngầm";
+
+"type.railway.station.subway.guangzhou" = "Ngầm";
+
+"type.railway.station.subway.hamburg" = "Ngầm";
+
+"type.railway.station.subway.helsinki" = "Ngầm";
+
+"type.railway.station.subway.hiroshima" = "Ngầm";
+
+"type.railway.station.subway.isfahan" = "Ngầm";
+
+"type.railway.station.subway.istanbul" = "Ngầm";
+
+"type.railway.station.subway.izmir" = "Ngầm";
+
+"type.railway.station.subway.kazan" = "Ngầm";
+
+"type.railway.station.subway.kharkiv" = "Ngầm";
+
 "type.railway.station.subway.kiev" = "Ngầm";
 
+"type.railway.station.subway.kobe" = "Ngầm";
+
+"type.railway.station.subway.kolkata" = "Ngầm";
+
+"type.railway.station.subway.kunming" = "Ngầm";
+
+"type.railway.station.subway.kyoto" = "Ngầm";
+
+"type.railway.station.subway.la" = "Ngầm";
+
+"type.railway.station.subway.lausanne" = "Ngầm";
+
+"type.railway.station.subway.lille" = "Ngầm";
+
+"type.railway.station.subway.lima" = "Ngầm";
+
+"type.railway.station.subway.lisboa" = "Ngầm";
+
+"type.railway.station.subway.lisbon" = "Ngầm";
+
 "type.railway.station.subway.london" = "Ngầm";
 
+"type.railway.station.subway.lyon" = "Ngầm";
+
 "type.railway.station.subway.madrid" = "Ngầm";
 
+"type.railway.station.subway.malaga" = "Ngầm";
+
+"type.railway.station.subway.manila" = "Ngầm";
+
+"type.railway.station.subway.maracaibo" = "Ngầm";
+
+"type.railway.station.subway.mashhad" = "Ngầm";
+
+"type.railway.station.subway.mecca" = "Ngầm";
+
+"type.railway.station.subway.medellin" = "Ngầm";
+
+"type.railway.station.subway.mexico" = "Ngầm";
+
+"type.railway.station.subway.milan" = "Ngầm";
+
 "type.railway.station.subway.minsk" = "Ngầm";
 
+"type.railway.station.subway.montreal" = "Ngầm";
+
 "type.railway.station.subway.moscow" = "Ngầm";
 
+"type.railway.station.subway.munchen" = "Ngầm";
+
+"type.railway.station.subway.nagoya" = "Ngầm";
+
 "type.railway.station.subway.newyork" = "Ngầm";
 
+"type.railway.station.subway.nnov" = "Ngầm";
+
+"type.railway.station.subway.novosibirsk" = "Ngầm";
+
+"type.railway.station.subway.osaka" = "Ngầm";
+
+"type.railway.station.subway.oslo" = "Ngầm";
+
+"type.railway.station.subway.palma" = "Ngầm";
+
+"type.railway.station.subway.panama" = "Ngầm";
+
 "type.railway.station.subway.paris" = "Ngầm";
 
+"type.railway.station.subway.philadelphia" = "Ngầm";
+
+"type.railway.station.subway.pyongyang" = "Ngầm";
+
+"type.railway.station.subway.rennes" = "Ngầm";
+
+"type.railway.station.subway.rio" = "Ngầm";
+
 "type.railway.station.subway.roma" = "Ngầm";
 
+"type.railway.station.subway.rotterdam" = "Ngầm";
+
+"type.railway.station.subway.samara" = "Ngầm";
+
+"type.railway.station.subway.santiago" = "Ngầm";
+
+"type.railway.station.subway.santo_domingo" = "Ngầm";
+
+"type.railway.station.subway.saopaulo" = "Ngầm";
+
+"type.railway.station.subway.sapporo" = "Ngầm";
+
+"type.railway.station.subway.sendai" = "Ngầm";
+
+"type.railway.station.subway.sf" = "Ngầm";
+
+"type.railway.station.subway.shanghai" = "Ngầm";
+
+"type.railway.station.subway.shiraz" = "Ngầm";
+
+"type.railway.station.subway.sofia" = "Ngầm";
+
 "type.railway.station.subway.spb" = "Ngầm";
 
+"type.railway.station.subway.stockholm" = "Ngầm";
+
+"type.railway.station.subway.tabriz" = "Ngầm";
+
+"type.railway.station.subway.taipei" = "Ngầm";
+
+"type.railway.station.subway.taoyuan" = "Ngầm";
+
+"type.railway.station.subway.tashkent" = "Ngầm";
+
+"type.railway.station.subway.tbilisi" = "Ngầm";
+
+"type.railway.station.subway.tianjin" = "Ngầm";
+
+"type.railway.station.subway.tokyo" = "Ngầm";
+
+"type.railway.station.subway.valencia" = "Ngầm";
+
+"type.railway.station.subway.vienna" = "Ngầm";
+
+"type.railway.station.subway.warszawa" = "Ngầm";
+
+"type.railway.station.subway.washington" = "Ngầm";
+
+"type.railway.station.subway.wuhan" = "Ngầm";
+
+"type.railway.station.subway.yerevan" = "Ngầm";
+
+"type.railway.station.subway.yokohama" = "Ngầm";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
@@ -2719,27 +2915,223 @@
 
 "type.railway.subway_entrance" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.barcelona" = "Ngầm";
+"type.railway.subway_entrance.adana" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.berlin" = "Ngầm";
+"type.railway.subway_entrance.algiers" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.kiev" = "Ngầm";
+"type.railway.subway_entrance.almaty" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.london" = "Ngầm";
+"type.railway.subway_entrance.amsterdam" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.madrid" = "Ngầm";
+"type.railway.subway_entrance.ankara" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.minsk" = "Ngầm";
+"type.railway.subway_entrance.athens" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.moscow" = "Ngầm";
+"type.railway.subway_entrance.baku" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.newyork" = "Ngầm";
+"type.railway.subway_entrance.bangkok" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.paris" = "Ngầm";
+"type.railway.subway_entrance.barcelona" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.roma" = "Ngầm";
+"type.railway.subway_entrance.beijing" = "Lỗi vào Metro";
 
-"type.railway.subway_entrance.spb" = "Ngầm";
+"type.railway.subway_entrance.bengalore" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.berlin" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.brasilia" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.brescia" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.brussels" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.bucharest" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.budapest" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.buenos_aires" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.bursa" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.cairo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.caracas" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.catania" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.changchun" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.chengdu" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.chicago" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.chongqing" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.dalian" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.delhi" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.dnepro" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.dubai" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.ekb" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.fukuoka" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.glasgow" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.guangzhou" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.hamburg" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.helsinki" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.hiroshima" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.isfahan" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.istanbul" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.izmir" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kazan" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kharkiv" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kiev" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kobe" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kolkata" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kunming" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.kyoto" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.la" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.lausanne" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.lille" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.lima" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.lisboa" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.lisbon" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.london" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.lyon" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.madrid" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.malaga" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.manila" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.maracaibo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.mashhad" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.mecca" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.medellin" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.mexico" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.milan" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.minsk" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.montreal" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.moscow" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.munchen" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.nagoya" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.newyork" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.nnov" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.novosibirsk" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.osaka" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.oslo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.palma" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.panama" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.paris" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.philadelphia" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.pyongyang" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.rennes" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.rio" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.roma" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.rotterdam" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.samara" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.santiago" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.santo_domingo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.saopaulo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.sapporo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.sendai" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.sf" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.shanghai" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.shiraz" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.sofia" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.spb" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.stockholm" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.tabriz" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.taipei" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.taoyuan" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.tashkent" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.tbilisi" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.tianjin" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.tokyo" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.valencia" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.vienna" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.warszawa" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.washington" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.wuhan" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.yerevan" = "Lỗi vào Metro";
+
+"type.railway.subway_entrance.yokohama" = "Lỗi vào Metro";
 
 "type.railway.tram" = "Tram Line";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 647b5c3b50..9286e9feb7 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -2689,57 +2689,449 @@
 
 "type.railway.station.subway" = "地铁车站";
 
+"type.railway.station.subway.adana" = "地铁车站";
+
+"type.railway.station.subway.algiers" = "地铁车站";
+
+"type.railway.station.subway.almaty" = "地铁车站";
+
+"type.railway.station.subway.amsterdam" = "地铁车站";
+
+"type.railway.station.subway.ankara" = "地铁车站";
+
+"type.railway.station.subway.athens" = "地铁车站";
+
+"type.railway.station.subway.baku" = "地铁车站";
+
+"type.railway.station.subway.bangkok" = "地铁车站";
+
 "type.railway.station.subway.barcelona" = "地铁车站";
 
+"type.railway.station.subway.beijing" = "地铁车站";
+
+"type.railway.station.subway.bengalore" = "地铁车站";
+
 "type.railway.station.subway.berlin" = "地铁车站";
 
+"type.railway.station.subway.brasilia" = "地铁车站";
+
+"type.railway.station.subway.brescia" = "地铁车站";
+
+"type.railway.station.subway.brussels" = "地铁车站";
+
+"type.railway.station.subway.bucharest" = "地铁车站";
+
+"type.railway.station.subway.budapest" = "地铁车站";
+
+"type.railway.station.subway.buenos_aires" = "地铁车站";
+
+"type.railway.station.subway.bursa" = "地铁车站";
+
+"type.railway.station.subway.cairo" = "地铁车站";
+
+"type.railway.station.subway.caracas" = "地铁车站";
+
+"type.railway.station.subway.catania" = "地铁车站";
+
+"type.railway.station.subway.changchun" = "地铁车站";
+
+"type.railway.station.subway.chengdu" = "地铁车站";
+
+"type.railway.station.subway.chicago" = "地铁车站";
+
+"type.railway.station.subway.chongqing" = "地铁车站";
+
+"type.railway.station.subway.dalian" = "地铁车站";
+
+"type.railway.station.subway.delhi" = "地铁车站";
+
+"type.railway.station.subway.dnepro" = "地铁车站";
+
+"type.railway.station.subway.dubai" = "地铁车站";
+
+"type.railway.station.subway.ekb" = "地铁车站";
+
+"type.railway.station.subway.fukuoka" = "地铁车站";
+
+"type.railway.station.subway.glasgow" = "地铁车站";
+
+"type.railway.station.subway.guangzhou" = "地铁车站";
+
+"type.railway.station.subway.hamburg" = "地铁车站";
+
+"type.railway.station.subway.helsinki" = "地铁车站";
+
+"type.railway.station.subway.hiroshima" = "地铁车站";
+
+"type.railway.station.subway.isfahan" = "地铁车站";
+
+"type.railway.station.subway.istanbul" = "地铁车站";
+
+"type.railway.station.subway.izmir" = "地铁车站";
+
+"type.railway.station.subway.kazan" = "地铁车站";
+
+"type.railway.station.subway.kharkiv" = "地铁车站";
+
 "type.railway.station.subway.kiev" = "地铁车站";
 
+"type.railway.station.subway.kobe" = "地铁车站";
+
+"type.railway.station.subway.kolkata" = "地铁车站";
+
+"type.railway.station.subway.kunming" = "地铁车站";
+
+"type.railway.station.subway.kyoto" = "地铁车站";
+
+"type.railway.station.subway.la" = "地铁车站";
+
+"type.railway.station.subway.lausanne" = "地铁车站";
+
+"type.railway.station.subway.lille" = "地铁车站";
+
+"type.railway.station.subway.lima" = "地铁车站";
+
+"type.railway.station.subway.lisboa" = "地铁车站";
+
+"type.railway.station.subway.lisbon" = "地铁车站";
+
 "type.railway.station.subway.london" = "地铁车站";
 
+"type.railway.station.subway.lyon" = "地铁车站";
+
 "type.railway.station.subway.madrid" = "地铁车站";
 
+"type.railway.station.subway.malaga" = "地铁车站";
+
+"type.railway.station.subway.manila" = "地铁车站";
+
+"type.railway.station.subway.maracaibo" = "地铁车站";
+
+"type.railway.station.subway.mashhad" = "地铁车站";
+
+"type.railway.station.subway.mecca" = "地铁车站";
+
+"type.railway.station.subway.medellin" = "地铁车站";
+
+"type.railway.station.subway.mexico" = "地铁车站";
+
+"type.railway.station.subway.milan" = "地铁车站";
+
 "type.railway.station.subway.minsk" = "地铁车站";
 
+"type.railway.station.subway.montreal" = "地铁车站";
+
 "type.railway.station.subway.moscow" = "地铁车站";
 
+"type.railway.station.subway.munchen" = "地铁车站";
+
+"type.railway.station.subway.nagoya" = "地铁车站";
+
 "type.railway.station.subway.newyork" = "地铁车站";
 
+"type.railway.station.subway.nnov" = "地铁车站";
+
+"type.railway.station.subway.novosibirsk" = "地铁车站";
+
+"type.railway.station.subway.osaka" = "地铁车站";
+
+"type.railway.station.subway.oslo" = "地铁车站";
+
+"type.railway.station.subway.palma" = "地铁车站";
+
+"type.railway.station.subway.panama" = "地铁车站";
+
 "type.railway.station.subway.paris" = "地铁车站";
 
+"type.railway.station.subway.philadelphia" = "地铁车站";
+
+"type.railway.station.subway.pyongyang" = "地铁车站";
+
+"type.railway.station.subway.rennes" = "地铁车站";
+
+"type.railway.station.subway.rio" = "地铁车站";
+
 "type.railway.station.subway.roma" = "地铁车站";
 
+"type.railway.station.subway.rotterdam" = "地铁车站";
+
+"type.railway.station.subway.samara" = "地铁车站";
+
+"type.railway.station.subway.santiago" = "地铁车站";
+
+"type.railway.station.subway.santo_domingo" = "地铁车站";
+
+"type.railway.station.subway.saopaulo" = "地铁车站";
+
+"type.railway.station.subway.sapporo" = "地铁车站";
+
+"type.railway.station.subway.sendai" = "地铁车站";
+
+"type.railway.station.subway.sf" = "地铁车站";
+
+"type.railway.station.subway.shanghai" = "地铁车站";
+
+"type.railway.station.subway.shiraz" = "地铁车站";
+
+"type.railway.station.subway.sofia" = "地铁车站";
+
 "type.railway.station.subway.spb" = "地铁车站";
 
+"type.railway.station.subway.stockholm" = "地铁车站";
+
+"type.railway.station.subway.tabriz" = "地铁车站";
+
+"type.railway.station.subway.taipei" = "地铁车站";
+
+"type.railway.station.subway.taoyuan" = "地铁车站";
+
+"type.railway.station.subway.tashkent" = "地铁车站";
+
+"type.railway.station.subway.tbilisi" = "地铁车站";
+
+"type.railway.station.subway.tianjin" = "地铁车站";
+
+"type.railway.station.subway.tokyo" = "地铁车站";
+
+"type.railway.station.subway.valencia" = "地铁车站";
+
+"type.railway.station.subway.vienna" = "地铁车站";
+
+"type.railway.station.subway.warszawa" = "地铁车站";
+
+"type.railway.station.subway.washington" = "地铁车站";
+
+"type.railway.station.subway.wuhan" = "地铁车站";
+
+"type.railway.station.subway.yerevan" = "地铁车站";
+
+"type.railway.station.subway.yokohama" = "地铁车站";
+
 "type.railway.subway" = "Subway Line";
 
 "type.railway.subway.bridge" = "Subway Line";
 
 "type.railway.subway.tunnel" = "Subway Line";
 
-"type.railway.subway_entrance" = "地铁入口";
+"type.railway.subway_entrance" = "地铁出入口";
 
-"type.railway.subway_entrance.barcelona" = "地铁入口";
+"type.railway.subway_entrance.adana" = "地铁出入口";
 
-"type.railway.subway_entrance.berlin" = "地铁入口";
+"type.railway.subway_entrance.algiers" = "地铁出入口";
 
-"type.railway.subway_entrance.kiev" = "地铁入口";
+"type.railway.subway_entrance.almaty" = "地铁出入口";
 
-"type.railway.subway_entrance.london" = "地铁入口";
+"type.railway.subway_entrance.amsterdam" = "地铁出入口";
 
-"type.railway.subway_entrance.madrid" = "地铁入口";
+"type.railway.subway_entrance.ankara" = "地铁出入口";
 
-"type.railway.subway_entrance.minsk" = "地铁入口";
+"type.railway.subway_entrance.athens" = "地铁出入口";
 
-"type.railway.subway_entrance.moscow" = "地铁入口";
+"type.railway.subway_entrance.baku" = "地铁出入口";
 
-"type.railway.subway_entrance.newyork" = "地铁入口";
+"type.railway.subway_entrance.bangkok" = "地铁出入口";
 
-"type.railway.subway_entrance.paris" = "地铁入口";
+"type.railway.subway_entrance.barcelona" = "地铁出入口";
 
-"type.railway.subway_entrance.roma" = "地铁入口";
+"type.railway.subway_entrance.beijing" = "地铁出入口";
 
-"type.railway.subway_entrance.spb" = "地铁入口";
+"type.railway.subway_entrance.bengalore" = "地铁出入口";
+
+"type.railway.subway_entrance.berlin" = "地铁出入口";
+
+"type.railway.subway_entrance.brasilia" = "地铁出入口";
+
+"type.railway.subway_entrance.brescia" = "地铁出入口";
+
+"type.railway.subway_entrance.brussels" = "地铁出入口";
+
+"type.railway.subway_entrance.bucharest" = "地铁出入口";
+
+"type.railway.subway_entrance.budapest" = "地铁出入口";
+
+"type.railway.subway_entrance.buenos_aires" = "地铁出入口";
+
+"type.railway.subway_entrance.bursa" = "地铁出入口";
+
+"type.railway.subway_entrance.cairo" = "地铁出入口";
+
+"type.railway.subway_entrance.caracas" = "地铁出入口";
+
+"type.railway.subway_entrance.catania" = "地铁出入口";
+
+"type.railway.subway_entrance.changchun" = "地铁出入口";
+
+"type.railway.subway_entrance.chengdu" = "地铁出入口";
+
+"type.railway.subway_entrance.chicago" = "地铁出入口";
+
+"type.railway.subway_entrance.chongqing" = "地铁出入口";
+
+"type.railway.subway_entrance.dalian" = "地铁出入口";
+
+"type.railway.subway_entrance.delhi" = "地铁出入口";
+
+"type.railway.subway_entrance.dnepro" = "地铁出入口";
+
+"type.railway.subway_entrance.dubai" = "地铁出入口";
+
+"type.railway.subway_entrance.ekb" = "地铁出入口";
+
+"type.railway.subway_entrance.fukuoka" = "地铁出入口";
+
+"type.railway.subway_entrance.glasgow" = "地铁出入口";
+
+"type.railway.subway_entrance.guangzhou" = "地铁出入口";
+
+"type.railway.subway_entrance.hamburg" = "地铁出入口";
+
+"type.railway.subway_entrance.helsinki" = "地铁出入口";
+
+"type.railway.subway_entrance.hiroshima" = "地铁出入口";
+
+"type.railway.subway_entrance.isfahan" = "地铁出入口";
+
+"type.railway.subway_entrance.istanbul" = "地铁出入口";
+
+"type.railway.subway_entrance.izmir" = "地铁出入口";
+
+"type.railway.subway_entrance.kazan" = "地铁出入口";
+
+"type.railway.subway_entrance.kharkiv" = "地铁出入口";
+
+"type.railway.subway_entrance.kiev" = "地铁出入口";
+
+"type.railway.subway_entrance.kobe" = "地铁出入口";
+
+"type.railway.subway_entrance.kolkata" = "地铁出入口";
+
+"type.railway.subway_entrance.kunming" = "地铁出入口";
+
+"type.railway.subway_entrance.kyoto" = "地铁出入口";
+
+"type.railway.subway_entrance.la" = "地铁出入口";
+
+"type.railway.subway_entrance.lausanne" = "地铁出入口";
+
+"type.railway.subway_entrance.lille" = "地铁出入口";
+
+"type.railway.subway_entrance.lima" = "地铁出入口";
+
+"type.railway.subway_entrance.lisboa" = "地铁出入口";
+
+"type.railway.subway_entrance.lisbon" = "地铁出入口";
+
+"type.railway.subway_entrance.london" = "地铁出入口";
+
+"type.railway.subway_entrance.lyon" = "地铁出入口";
+
+"type.railway.subway_entrance.madrid" = "地铁出入口";
+
+"type.railway.subway_entrance.malaga" = "地铁出入口";
+
+"type.railway.subway_entrance.manila" = "地铁出入口";
+
+"type.railway.subway_entrance.maracaibo" = "地铁出入口";
+
+"type.railway.subway_entrance.mashhad" = "地铁出入口";
+
+"type.railway.subway_entrance.mecca" = "地铁出入口";
+
+"type.railway.subway_entrance.medellin" = "地铁出入口";
+
+"type.railway.subway_entrance.mexico" = "地铁出入口";
+
+"type.railway.subway_entrance.milan" = "地铁出入口";
+
+"type.railway.subway_entrance.minsk" = "地铁出入口";
+
+"type.railway.subway_entrance.montreal" = "地铁出入口";
+
+"type.railway.subway_entrance.moscow" = "地铁出入口";
+
+"type.railway.subway_entrance.munchen" = "地铁出入口";
+
+"type.railway.subway_entrance.nagoya" = "地铁出入口";
+
+"type.railway.subway_entrance.newyork" = "地铁出入口";
+
+"type.railway.subway_entrance.nnov" = "地铁出入口";
+
+"type.railway.subway_entrance.novosibirsk" = "地铁出入口";
+
+"type.railway.subway_entrance.osaka" = "地铁出入口";
+
+"type.railway.subway_entrance.oslo" = "地铁出入口";
+
+"type.railway.subway_entrance.palma" = "地铁出入口";
+
+"type.railway.subway_entrance.panama" = "地铁出入口";
+
+"type.railway.subway_entrance.paris" = "地铁出入口";
+
+"type.railway.subway_entrance.philadelphia" = "地铁出入口";
+
+"type.railway.subway_entrance.pyongyang" = "地铁出入口";
+
+"type.railway.subway_entrance.rennes" = "地铁出入口";
+
+"type.railway.subway_entrance.rio" = "地铁出入口";
+
+"type.railway.subway_entrance.roma" = "地铁出入口";
+
+"type.railway.subway_entrance.rotterdam" = "地铁出入口";
+
+"type.railway.subway_entrance.samara" = "地铁出入口";
+
+"type.railway.subway_entrance.santiago" = "地铁出入口";
+
+"type.railway.subway_entrance.santo_domingo" = "地铁出入口";
+
+"type.railway.subway_entrance.saopaulo" = "地铁出入口";
+
+"type.railway.subway_entrance.sapporo" = "地铁出入口";
+
+"type.railway.subway_entrance.sendai" = "地铁出入口";
+
+"type.railway.subway_entrance.sf" = "地铁出入口";
+
+"type.railway.subway_entrance.shanghai" = "地铁出入口";
+
+"type.railway.subway_entrance.shiraz" = "地铁出入口";
+
+"type.railway.subway_entrance.sofia" = "地铁出入口";
+
+"type.railway.subway_entrance.spb" = "地铁出入口";
+
+"type.railway.subway_entrance.stockholm" = "地铁出入口";
+
+"type.railway.subway_entrance.tabriz" = "地铁出入口";
+
+"type.railway.subway_entrance.taipei" = "地铁出入口";
+
+"type.railway.subway_entrance.taoyuan" = "地铁出入口";
+
+"type.railway.subway_entrance.tashkent" = "地铁出入口";
+
+"type.railway.subway_entrance.tbilisi" = "地铁出入口";
+
+"type.railway.subway_entrance.tianjin" = "地铁出入口";
+
+"type.railway.subway_entrance.tokyo" = "地铁出入口";
+
+"type.railway.subway_entrance.valencia" = "地铁出入口";
+
+"type.railway.subway_entrance.vienna" = "地铁出入口";
+
+"type.railway.subway_entrance.warszawa" = "地铁出入口";
+
+"type.railway.subway_entrance.washington" = "地铁出入口";
+
+"type.railway.subway_entrance.wuhan" = "地铁出入口";
+
+"type.railway.subway_entrance.yerevan" = "地铁出入口";
+
+"type.railway.subway_entrance.yokohama" = "地铁出入口";
 
 "type.railway.tram" = "电车轨道";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 183d14221c..69fe6d6fd4 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -2687,29 +2687,225 @@
 
 "type.railway.station.monorail" = "單軌車站";
 
-"type.railway.station.subway" = "地鐵車站";
+"type.railway.station.subway" = "捷運站";
 
-"type.railway.station.subway.barcelona" = "地鐵車站";
+"type.railway.station.subway.adana" = "捷運站";
 
-"type.railway.station.subway.berlin" = "地鐵車站";
+"type.railway.station.subway.algiers" = "捷運站";
 
-"type.railway.station.subway.kiev" = "地鐵車站";
+"type.railway.station.subway.almaty" = "捷運站";
 
-"type.railway.station.subway.london" = "地鐵車站";
+"type.railway.station.subway.amsterdam" = "捷運站";
 
-"type.railway.station.subway.madrid" = "地鐵車站";
+"type.railway.station.subway.ankara" = "捷運站";
 
-"type.railway.station.subway.minsk" = "地鐵車站";
+"type.railway.station.subway.athens" = "捷運站";
 
-"type.railway.station.subway.moscow" = "地鐵車站";
+"type.railway.station.subway.baku" = "捷運站";
 
-"type.railway.station.subway.newyork" = "地鐵車站";
+"type.railway.station.subway.bangkok" = "捷運站";
 
-"type.railway.station.subway.paris" = "地鐵車站";
+"type.railway.station.subway.barcelona" = "捷運站";
 
-"type.railway.station.subway.roma" = "地鐵車站";
+"type.railway.station.subway.beijing" = "捷運站";
 
-"type.railway.station.subway.spb" = "地鐵車站";
+"type.railway.station.subway.bengalore" = "捷運站";
+
+"type.railway.station.subway.berlin" = "捷運站";
+
+"type.railway.station.subway.brasilia" = "捷運站";
+
+"type.railway.station.subway.brescia" = "捷運站";
+
+"type.railway.station.subway.brussels" = "捷運站";
+
+"type.railway.station.subway.bucharest" = "捷運站";
+
+"type.railway.station.subway.budapest" = "捷運站";
+
+"type.railway.station.subway.buenos_aires" = "捷運站";
+
+"type.railway.station.subway.bursa" = "捷運站";
+
+"type.railway.station.subway.cairo" = "捷運站";
+
+"type.railway.station.subway.caracas" = "捷運站";
+
+"type.railway.station.subway.catania" = "捷運站";
+
+"type.railway.station.subway.changchun" = "捷運站";
+
+"type.railway.station.subway.chengdu" = "捷運站";
+
+"type.railway.station.subway.chicago" = "捷運站";
+
+"type.railway.station.subway.chongqing" = "捷運站";
+
+"type.railway.station.subway.dalian" = "捷運站";
+
+"type.railway.station.subway.delhi" = "捷運站";
+
+"type.railway.station.subway.dnepro" = "捷運站";
+
+"type.railway.station.subway.dubai" = "捷運站";
+
+"type.railway.station.subway.ekb" = "捷運站";
+
+"type.railway.station.subway.fukuoka" = "捷運站";
+
+"type.railway.station.subway.glasgow" = "捷運站";
+
+"type.railway.station.subway.guangzhou" = "捷運站";
+
+"type.railway.station.subway.hamburg" = "捷運站";
+
+"type.railway.station.subway.helsinki" = "捷運站";
+
+"type.railway.station.subway.hiroshima" = "捷運站";
+
+"type.railway.station.subway.isfahan" = "捷運站";
+
+"type.railway.station.subway.istanbul" = "捷運站";
+
+"type.railway.station.subway.izmir" = "捷運站";
+
+"type.railway.station.subway.kazan" = "捷運站";
+
+"type.railway.station.subway.kharkiv" = "捷運站";
+
+"type.railway.station.subway.kiev" = "捷運站";
+
+"type.railway.station.subway.kobe" = "捷運站";
+
+"type.railway.station.subway.kolkata" = "捷運站";
+
+"type.railway.station.subway.kunming" = "捷運站";
+
+"type.railway.station.subway.kyoto" = "捷運站";
+
+"type.railway.station.subway.la" = "捷運站";
+
+"type.railway.station.subway.lausanne" = "捷運站";
+
+"type.railway.station.subway.lille" = "捷運站";
+
+"type.railway.station.subway.lima" = "捷運站";
+
+"type.railway.station.subway.lisboa" = "捷運站";
+
+"type.railway.station.subway.lisbon" = "捷運站";
+
+"type.railway.station.subway.london" = "捷運站";
+
+"type.railway.station.subway.lyon" = "捷運站";
+
+"type.railway.station.subway.madrid" = "捷運站";
+
+"type.railway.station.subway.malaga" = "捷運站";
+
+"type.railway.station.subway.manila" = "捷運站";
+
+"type.railway.station.subway.maracaibo" = "捷運站";
+
+"type.railway.station.subway.mashhad" = "捷運站";
+
+"type.railway.station.subway.mecca" = "捷運站";
+
+"type.railway.station.subway.medellin" = "捷運站";
+
+"type.railway.station.subway.mexico" = "捷運站";
+
+"type.railway.station.subway.milan" = "捷運站";
+
+"type.railway.station.subway.minsk" = "捷運站";
+
+"type.railway.station.subway.montreal" = "捷運站";
+
+"type.railway.station.subway.moscow" = "捷運站";
+
+"type.railway.station.subway.munchen" = "捷運站";
+
+"type.railway.station.subway.nagoya" = "捷運站";
+
+"type.railway.station.subway.newyork" = "捷運站";
+
+"type.railway.station.subway.nnov" = "捷運站";
+
+"type.railway.station.subway.novosibirsk" = "捷運站";
+
+"type.railway.station.subway.osaka" = "捷運站";
+
+"type.railway.station.subway.oslo" = "捷運站";
+
+"type.railway.station.subway.palma" = "捷運站";
+
+"type.railway.station.subway.panama" = "捷運站";
+
+"type.railway.station.subway.paris" = "捷運站";
+
+"type.railway.station.subway.philadelphia" = "捷運站";
+
+"type.railway.station.subway.pyongyang" = "捷運站";
+
+"type.railway.station.subway.rennes" = "捷運站";
+
+"type.railway.station.subway.rio" = "捷運站";
+
+"type.railway.station.subway.roma" = "捷運站";
+
+"type.railway.station.subway.rotterdam" = "捷運站";
+
+"type.railway.station.subway.samara" = "捷運站";
+
+"type.railway.station.subway.santiago" = "捷運站";
+
+"type.railway.station.subway.santo_domingo" = "捷運站";
+
+"type.railway.station.subway.saopaulo" = "捷運站";
+
+"type.railway.station.subway.sapporo" = "捷運站";
+
+"type.railway.station.subway.sendai" = "捷運站";
+
+"type.railway.station.subway.sf" = "捷運站";
+
+"type.railway.station.subway.shanghai" = "捷運站";
+
+"type.railway.station.subway.shiraz" = "捷運站";
+
+"type.railway.station.subway.sofia" = "捷運站";
+
+"type.railway.station.subway.spb" = "捷運站";
+
+"type.railway.station.subway.stockholm" = "捷運站";
+
+"type.railway.station.subway.tabriz" = "捷運站";
+
+"type.railway.station.subway.taipei" = "捷運站";
+
+"type.railway.station.subway.taoyuan" = "捷運站";
+
+"type.railway.station.subway.tashkent" = "捷運站";
+
+"type.railway.station.subway.tbilisi" = "捷運站";
+
+"type.railway.station.subway.tianjin" = "捷運站";
+
+"type.railway.station.subway.tokyo" = "捷運站";
+
+"type.railway.station.subway.valencia" = "捷運站";
+
+"type.railway.station.subway.vienna" = "捷運站";
+
+"type.railway.station.subway.warszawa" = "捷運站";
+
+"type.railway.station.subway.washington" = "捷運站";
+
+"type.railway.station.subway.wuhan" = "捷運站";
+
+"type.railway.station.subway.yerevan" = "捷運站";
+
+"type.railway.station.subway.yokohama" = "捷運站";
 
 "type.railway.subway" = "Subway Line";
 
@@ -2719,28 +2915,224 @@
 
 "type.railway.subway_entrance" = "地鐵入口";
 
+"type.railway.subway_entrance.adana" = "地鐵入口";
+
+"type.railway.subway_entrance.algiers" = "地鐵入口";
+
+"type.railway.subway_entrance.almaty" = "地鐵入口";
+
+"type.railway.subway_entrance.amsterdam" = "地鐵入口";
+
+"type.railway.subway_entrance.ankara" = "地鐵入口";
+
+"type.railway.subway_entrance.athens" = "地鐵入口";
+
+"type.railway.subway_entrance.baku" = "地鐵入口";
+
+"type.railway.subway_entrance.bangkok" = "地鐵入口";
+
 "type.railway.subway_entrance.barcelona" = "地鐵入口";
 
+"type.railway.subway_entrance.beijing" = "地鐵入口";
+
+"type.railway.subway_entrance.bengalore" = "地鐵入口";
+
 "type.railway.subway_entrance.berlin" = "地鐵入口";
 
+"type.railway.subway_entrance.brasilia" = "地鐵入口";
+
+"type.railway.subway_entrance.brescia" = "地鐵入口";
+
+"type.railway.subway_entrance.brussels" = "地鐵入口";
+
+"type.railway.subway_entrance.bucharest" = "地鐵入口";
+
+"type.railway.subway_entrance.budapest" = "地鐵入口";
+
+"type.railway.subway_entrance.buenos_aires" = "地鐵入口";
+
+"type.railway.subway_entrance.bursa" = "地鐵入口";
+
+"type.railway.subway_entrance.cairo" = "地鐵入口";
+
+"type.railway.subway_entrance.caracas" = "地鐵入口";
+
+"type.railway.subway_entrance.catania" = "地鐵入口";
+
+"type.railway.subway_entrance.changchun" = "地鐵入口";
+
+"type.railway.subway_entrance.chengdu" = "地鐵入口";
+
+"type.railway.subway_entrance.chicago" = "地鐵入口";
+
+"type.railway.subway_entrance.chongqing" = "地鐵入口";
+
+"type.railway.subway_entrance.dalian" = "地鐵入口";
+
+"type.railway.subway_entrance.delhi" = "地鐵入口";
+
+"type.railway.subway_entrance.dnepro" = "地鐵入口";
+
+"type.railway.subway_entrance.dubai" = "地鐵入口";
+
+"type.railway.subway_entrance.ekb" = "地鐵入口";
+
+"type.railway.subway_entrance.fukuoka" = "地鐵入口";
+
+"type.railway.subway_entrance.glasgow" = "地鐵入口";
+
+"type.railway.subway_entrance.guangzhou" = "地鐵入口";
+
+"type.railway.subway_entrance.hamburg" = "地鐵入口";
+
+"type.railway.subway_entrance.helsinki" = "地鐵入口";
+
+"type.railway.subway_entrance.hiroshima" = "地鐵入口";
+
+"type.railway.subway_entrance.isfahan" = "地鐵入口";
+
+"type.railway.subway_entrance.istanbul" = "地鐵入口";
+
+"type.railway.subway_entrance.izmir" = "地鐵入口";
+
+"type.railway.subway_entrance.kazan" = "地鐵入口";
+
+"type.railway.subway_entrance.kharkiv" = "地鐵入口";
+
 "type.railway.subway_entrance.kiev" = "地鐵入口";
 
+"type.railway.subway_entrance.kobe" = "地鐵入口";
+
+"type.railway.subway_entrance.kolkata" = "地鐵入口";
+
+"type.railway.subway_entrance.kunming" = "地鐵入口";
+
+"type.railway.subway_entrance.kyoto" = "地鐵入口";
+
+"type.railway.subway_entrance.la" = "地鐵入口";
+
+"type.railway.subway_entrance.lausanne" = "地鐵入口";
+
+"type.railway.subway_entrance.lille" = "地鐵入口";
+
+"type.railway.subway_entrance.lima" = "地鐵入口";
+
+"type.railway.subway_entrance.lisboa" = "地鐵入口";
+
+"type.railway.subway_entrance.lisbon" = "地鐵入口";
+
 "type.railway.subway_entrance.london" = "地鐵入口";
 
+"type.railway.subway_entrance.lyon" = "地鐵入口";
+
 "type.railway.subway_entrance.madrid" = "地鐵入口";
 
+"type.railway.subway_entrance.malaga" = "地鐵入口";
+
+"type.railway.subway_entrance.manila" = "地鐵入口";
+
+"type.railway.subway_entrance.maracaibo" = "地鐵入口";
+
+"type.railway.subway_entrance.mashhad" = "地鐵入口";
+
+"type.railway.subway_entrance.mecca" = "地鐵入口";
+
+"type.railway.subway_entrance.medellin" = "地鐵入口";
+
+"type.railway.subway_entrance.mexico" = "地鐵入口";
+
+"type.railway.subway_entrance.milan" = "地鐵入口";
+
 "type.railway.subway_entrance.minsk" = "地鐵入口";
 
+"type.railway.subway_entrance.montreal" = "地鐵入口";
+
 "type.railway.subway_entrance.moscow" = "地鐵入口";
 
+"type.railway.subway_entrance.munchen" = "地鐵入口";
+
+"type.railway.subway_entrance.nagoya" = "地鐵入口";
+
 "type.railway.subway_entrance.newyork" = "地鐵入口";
 
+"type.railway.subway_entrance.nnov" = "地鐵入口";
+
+"type.railway.subway_entrance.novosibirsk" = "地鐵入口";
+
+"type.railway.subway_entrance.osaka" = "地鐵入口";
+
+"type.railway.subway_entrance.oslo" = "地鐵入口";
+
+"type.railway.subway_entrance.palma" = "地鐵入口";
+
+"type.railway.subway_entrance.panama" = "地鐵入口";
+
 "type.railway.subway_entrance.paris" = "地鐵入口";
 
+"type.railway.subway_entrance.philadelphia" = "地鐵入口";
+
+"type.railway.subway_entrance.pyongyang" = "地鐵入口";
+
+"type.railway.subway_entrance.rennes" = "地鐵入口";
+
+"type.railway.subway_entrance.rio" = "地鐵入口";
+
 "type.railway.subway_entrance.roma" = "地鐵入口";
 
+"type.railway.subway_entrance.rotterdam" = "地鐵入口";
+
+"type.railway.subway_entrance.samara" = "地鐵入口";
+
+"type.railway.subway_entrance.santiago" = "地鐵入口";
+
+"type.railway.subway_entrance.santo_domingo" = "地鐵入口";
+
+"type.railway.subway_entrance.saopaulo" = "地鐵入口";
+
+"type.railway.subway_entrance.sapporo" = "地鐵入口";
+
+"type.railway.subway_entrance.sendai" = "地鐵入口";
+
+"type.railway.subway_entrance.sf" = "地鐵入口";
+
+"type.railway.subway_entrance.shanghai" = "地鐵入口";
+
+"type.railway.subway_entrance.shiraz" = "地鐵入口";
+
+"type.railway.subway_entrance.sofia" = "地鐵入口";
+
 "type.railway.subway_entrance.spb" = "地鐵入口";
 
+"type.railway.subway_entrance.stockholm" = "地鐵入口";
+
+"type.railway.subway_entrance.tabriz" = "地鐵入口";
+
+"type.railway.subway_entrance.taipei" = "地鐵入口";
+
+"type.railway.subway_entrance.taoyuan" = "地鐵入口";
+
+"type.railway.subway_entrance.tashkent" = "地鐵入口";
+
+"type.railway.subway_entrance.tbilisi" = "地鐵入口";
+
+"type.railway.subway_entrance.tianjin" = "地鐵入口";
+
+"type.railway.subway_entrance.tokyo" = "地鐵入口";
+
+"type.railway.subway_entrance.valencia" = "地鐵入口";
+
+"type.railway.subway_entrance.vienna" = "地鐵入口";
+
+"type.railway.subway_entrance.warszawa" = "地鐵入口";
+
+"type.railway.subway_entrance.washington" = "地鐵入口";
+
+"type.railway.subway_entrance.wuhan" = "地鐵入口";
+
+"type.railway.subway_entrance.yerevan" = "地鐵入口";
+
+"type.railway.subway_entrance.yokohama" = "地鐵入口";
+
 "type.railway.tram" = "電車軌道";
 
 "type.railway.tram.bridge" = "電車軌道";