diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 2497aef2c3..43437f49b9 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">م.ب.</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">ميل</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">موقعي</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">لاحقا</string>
@@ -880,34 +880,51 @@
 	<string name="type.healthcare.laboratory">ﺔﻴﺒﻄﻟﺍ ﺕﺍﺮﺒﺘﺨﻤﻟﺍ</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">نفق</string>
 	<string name="type.highway.bus_stop">موقف حافلة</string>
 	<string name="type.highway.construction">طريق تحت الإنشاء</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">نفق</string>
 	<string name="type.highway.footway">مسار</string>
 	<string name="type.highway.footway.alpine_hiking">مسار</string>
 	<string name="type.highway.footway.area">مسار</string>
-	<string name="type.highway.footway.bridge">مسار</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">كوبري</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">مسار</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">مسار</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">مسار</string>
 	<string name="type.highway.footway.hiking">مسار</string>
 	<string name="type.highway.footway.mountain_hiking">مسار</string>
 	<string name="type.highway.footway.permissive">مسار</string>
-	<string name="type.highway.footway.tunnel">مسار</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">نفق</string>
 	<string name="type.highway.ford">مخاضة</string>
 	<string name="type.highway.living_street">شارع</string>
-	<string name="type.highway.living_street.bridge">شارع</string>
-	<string name="type.highway.living_street.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">نفق</string>
 	<string name="type.highway.motorway">شارع</string>
-	<string name="type.highway.motorway.bridge">شارع</string>
-	<string name="type.highway.motorway.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">نفق</string>
 	<string name="type.highway.motorway_junction">مخرج</string>
 	<string name="type.highway.motorway_link">شارع</string>
-	<string name="type.highway.motorway_link.bridge">شارع</string>
-	<string name="type.highway.motorway_link.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">نفق</string>
 	<string name="type.highway.path">مسار</string>
 	<string name="type.highway.path.alpine_hiking">مسار</string>
 	<string name="type.highway.path.bicycle">مسار</string>
-	<string name="type.highway.path.bridge">مسار</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">كوبري</string>
 	<string name="type.highway.path.demanding_alpine_hiking">مسار</string>
 	<string name="type.highway.path.demanding_mountain_hiking">مسار</string>
 	<string name="type.highway.path.difficult_alpine_hiking">مسار</string>
@@ -915,51 +932,75 @@
 	<string name="type.highway.path.horse">مسار</string>
 	<string name="type.highway.path.mountain_hiking">مسار</string>
 	<string name="type.highway.path.permissive">مسار</string>
-	<string name="type.highway.path.tunnel">مسار</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">نفق</string>
 	<string name="type.highway.pedestrian">شارع</string>
 	<string name="type.highway.pedestrian.area">شارع</string>
-	<string name="type.highway.pedestrian.bridge">شارع</string>
-	<string name="type.highway.pedestrian.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">نفق</string>
 	<string name="type.highway.primary">شارع</string>
-	<string name="type.highway.primary.bridge">شارع</string>
-	<string name="type.highway.primary.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">نفق</string>
 	<string name="type.highway.primary_link">شارع</string>
-	<string name="type.highway.primary_link.bridge">شارع</string>
-	<string name="type.highway.primary_link.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">نفق</string>
 	<string name="type.highway.raceway">مسار سباق</string>
 	<string name="type.highway.residential">شارع</string>
 	<string name="type.highway.residential.area">شارع</string>
-	<string name="type.highway.residential.bridge">شارع</string>
-	<string name="type.highway.residential.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">نفق</string>
 	<string name="type.highway.rest_area">استراحة</string>
 	<string name="type.highway.road">شارع</string>
-	<string name="type.highway.road.bridge">شارع</string>
-	<string name="type.highway.road.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">نفق</string>
 	<string name="type.highway.secondary">شارع</string>
-	<string name="type.highway.secondary.bridge">شارع</string>
-	<string name="type.highway.secondary.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">نفق</string>
 	<string name="type.highway.secondary_link">شارع</string>
-	<string name="type.highway.secondary_link.bridge">شارع</string>
-	<string name="type.highway.secondary_link.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">نفق</string>
 	<string name="type.highway.service">شارع</string>
 	<string name="type.highway.service.area">شارع</string>
-	<string name="type.highway.service.bridge">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">كوبري</string>
 	<string name="type.highway.service.driveway">شارع</string>
 	<string name="type.highway.service.parking_aisle">شارع</string>
-	<string name="type.highway.service.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">نفق</string>
 	<string name="type.highway.speed_camera">كاميرا لرصد السرعة</string>
 	<string name="type.highway.steps">مسار</string>
-	<string name="type.highway.steps.bridge">مسار</string>
-	<string name="type.highway.steps.tunnel">مسار</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">نفق</string>
 	<string name="type.highway.tertiary">شارع</string>
-	<string name="type.highway.tertiary.bridge">شارع</string>
-	<string name="type.highway.tertiary.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">نفق</string>
 	<string name="type.highway.tertiary_link">شارع</string>
-	<string name="type.highway.tertiary_link.bridge">شارع</string>
-	<string name="type.highway.tertiary_link.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">نفق</string>
 	<string name="type.highway.track">شارع</string>
 	<string name="type.highway.track.area">شارع</string>
-	<string name="type.highway.track.bridge">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">كوبري</string>
 	<string name="type.highway.track.grade1">شارع</string>
 	<string name="type.highway.track.grade2">شارع</string>
 	<string name="type.highway.track.grade3">شارع</string>
@@ -967,18 +1008,25 @@
 	<string name="type.highway.track.grade5">شارع</string>
 	<string name="type.highway.track.no.access">شارع</string>
 	<string name="type.highway.track.permissive">شارع</string>
-	<string name="type.highway.track.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">نفق</string>
 	<string name="type.highway.traffic_signals">إشارات مرور</string>
 	<string name="type.highway.trunk">شارع</string>
-	<string name="type.highway.trunk.bridge">شارع</string>
-	<string name="type.highway.trunk.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">نفق</string>
 	<string name="type.highway.trunk_link">شارع</string>
-	<string name="type.highway.trunk_link.bridge">شارع</string>
-	<string name="type.highway.trunk_link.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">نفق</string>
 	<string name="type.highway.unclassified">شارع</string>
 	<string name="type.highway.unclassified.area">شارع</string>
-	<string name="type.highway.unclassified.bridge">شارع</string>
-	<string name="type.highway.unclassified.tunnel">شارع</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">كوبري</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">نفق</string>
 	<string name="type.area_highway.footway">مسار</string>
 	<string name="type.area_highway.living_street">شارع</string>
 	<string name="type.area_highway.motorway">شارع</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 123cf62832..f70ef52fb8 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -24,7 +24,7 @@
 	<string name="gb">ГБ</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Мілі</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Маё месцазнаходжанне</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Потым</string>
@@ -719,6 +719,96 @@
 	<string name="type.emergency.fire_hydrant">Пажарны гідрант</string>
 	<string name="type.healthcare.laboratory">Медыцынская лабараторыя</string>
 
+	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Тунэль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Тунэль</string>
+
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">Рэзервуар</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 00b857257e..0802169454 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -24,7 +24,7 @@
 	<string name="gb">ГБ</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Мили</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Мое местоположение</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">По-късно</string>
@@ -625,6 +625,96 @@
 	<string name="type.recycling.batteries">Батерии</string>
 	<string name="type.healthcare.laboratory">Медицинска лаборатория</string>
 
+	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Тунел</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Тунел</string>
+
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">Резервоар</string>
 	<string name="type.leisure.picnic_table">Маса за пикник</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index d868b553ca..06329b719f 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mapy</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Míle</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Moje poloha</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Později</string>
@@ -876,34 +876,51 @@
 	<string name="type.healthcare.laboratory">Lékařská laboratoř</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunel</string>
 	<string name="type.highway.bus_stop">Autobusová zastávka</string>
 	<string name="type.highway.construction">Silnice v rekonstrukci</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunel</string>
 	<string name="type.highway.footway">Cesta</string>
 	<string name="type.highway.footway.alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.area">Cesta</string>
-	<string name="type.highway.footway.bridge">Cesta</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Most</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Cesta</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.hiking">Cesta</string>
 	<string name="type.highway.footway.mountain_hiking">Cesta</string>
 	<string name="type.highway.footway.permissive">Cesta</string>
-	<string name="type.highway.footway.tunnel">Cesta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Brod</string>
 	<string name="type.highway.living_street">Ulice</string>
-	<string name="type.highway.living_street.bridge">Ulice</string>
-	<string name="type.highway.living_street.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunel</string>
 	<string name="type.highway.motorway">Ulice</string>
-	<string name="type.highway.motorway.bridge">Ulice</string>
-	<string name="type.highway.motorway.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunel</string>
 	<string name="type.highway.motorway_junction">Dopravní uzel</string>
 	<string name="type.highway.motorway_link">Ulice</string>
-	<string name="type.highway.motorway_link.bridge">Ulice</string>
-	<string name="type.highway.motorway_link.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Cesta</string>
 	<string name="type.highway.path.alpine_hiking">Cesta</string>
 	<string name="type.highway.path.bicycle">Cesta</string>
-	<string name="type.highway.path.bridge">Cesta</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Most</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Cesta</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Cesta</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Cesta</string>
@@ -911,51 +928,75 @@
 	<string name="type.highway.path.horse">Cesta</string>
 	<string name="type.highway.path.mountain_hiking">Cesta</string>
 	<string name="type.highway.path.permissive">Cesta</string>
-	<string name="type.highway.path.tunnel">Cesta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Ulice</string>
 	<string name="type.highway.pedestrian.area">Ulice</string>
-	<string name="type.highway.pedestrian.bridge">Ulice</string>
-	<string name="type.highway.pedestrian.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunel</string>
 	<string name="type.highway.primary">Ulice</string>
-	<string name="type.highway.primary.bridge">Ulice</string>
-	<string name="type.highway.primary.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunel</string>
 	<string name="type.highway.primary_link">Ulice</string>
-	<string name="type.highway.primary_link.bridge">Ulice</string>
-	<string name="type.highway.primary_link.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunel</string>
 	<string name="type.highway.raceway">Závodiště</string>
 	<string name="type.highway.residential">Ulice</string>
 	<string name="type.highway.residential.area">Ulice</string>
-	<string name="type.highway.residential.bridge">Ulice</string>
-	<string name="type.highway.residential.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunel</string>
 	<string name="type.highway.rest_area">Odpočívadlo</string>
 	<string name="type.highway.road">Ulice</string>
-	<string name="type.highway.road.bridge">Ulice</string>
-	<string name="type.highway.road.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunel</string>
 	<string name="type.highway.secondary">Ulice</string>
-	<string name="type.highway.secondary.bridge">Ulice</string>
-	<string name="type.highway.secondary.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunel</string>
 	<string name="type.highway.secondary_link">Ulice</string>
-	<string name="type.highway.secondary_link.bridge">Ulice</string>
-	<string name="type.highway.secondary_link.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunel</string>
 	<string name="type.highway.service">Ulice</string>
 	<string name="type.highway.service.area">Ulice</string>
-	<string name="type.highway.service.bridge">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Most</string>
 	<string name="type.highway.service.driveway">Ulice</string>
 	<string name="type.highway.service.parking_aisle">Ulice</string>
-	<string name="type.highway.service.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunel</string>
 	<string name="type.highway.speed_camera">Rychlostní kamera</string>
 	<string name="type.highway.steps">Cesta</string>
-	<string name="type.highway.steps.bridge">Cesta</string>
-	<string name="type.highway.steps.tunnel">Cesta</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunel</string>
 	<string name="type.highway.tertiary">Ulice</string>
-	<string name="type.highway.tertiary.bridge">Ulice</string>
-	<string name="type.highway.tertiary.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunel</string>
 	<string name="type.highway.tertiary_link">Ulice</string>
-	<string name="type.highway.tertiary_link.bridge">Ulice</string>
-	<string name="type.highway.tertiary_link.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunel</string>
 	<string name="type.highway.track">Ulice</string>
 	<string name="type.highway.track.area">Ulice</string>
-	<string name="type.highway.track.bridge">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Most</string>
 	<string name="type.highway.track.grade1">Ulice</string>
 	<string name="type.highway.track.grade2">Ulice</string>
 	<string name="type.highway.track.grade3">Ulice</string>
@@ -963,18 +1004,25 @@
 	<string name="type.highway.track.grade5">Ulice</string>
 	<string name="type.highway.track.no.access">Ulice</string>
 	<string name="type.highway.track.permissive">Ulice</string>
-	<string name="type.highway.track.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semafor</string>
 	<string name="type.highway.trunk">Ulice</string>
-	<string name="type.highway.trunk.bridge">Ulice</string>
-	<string name="type.highway.trunk.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunel</string>
 	<string name="type.highway.trunk_link">Ulice</string>
-	<string name="type.highway.trunk_link.bridge">Ulice</string>
-	<string name="type.highway.trunk_link.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunel</string>
 	<string name="type.highway.unclassified">Ulice</string>
 	<string name="type.highway.unclassified.area">Ulice</string>
-	<string name="type.highway.unclassified.bridge">Ulice</string>
-	<string name="type.highway.unclassified.tunnel">Ulice</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunel</string>
 	<string name="type.area_highway.footway">Cesta</string>
 	<string name="type.area_highway.living_street">Ulice</string>
 	<string name="type.area_highway.motorway">Ulice</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index d7c5c8ad49..8180cf7de0 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Kort</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mil</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Min position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senere</string>
@@ -870,34 +870,51 @@
 	<string name="type.healthcare.laboratory">Medicinsk laboratorium</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Busstoppested</string>
 	<string name="type.highway.construction">Vej under opbygning</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.footway">Sti</string>
 	<string name="type.highway.footway.alpine_hiking">Sti</string>
 	<string name="type.highway.footway.area">Sti</string>
-	<string name="type.highway.footway.bridge">Sti</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Bro</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Sti</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Sti</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Sti</string>
 	<string name="type.highway.footway.hiking">Sti</string>
 	<string name="type.highway.footway.mountain_hiking">Sti</string>
 	<string name="type.highway.footway.permissive">Sti</string>
-	<string name="type.highway.footway.tunnel">Sti</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadested</string>
 	<string name="type.highway.living_street">Gade</string>
-	<string name="type.highway.living_street.bridge">Gade</string>
-	<string name="type.highway.living_street.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Gade</string>
-	<string name="type.highway.motorway.bridge">Gade</string>
-	<string name="type.highway.motorway.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunnel</string>
 	<string name="type.highway.motorway_junction">Motorvejsafkørsel</string>
 	<string name="type.highway.motorway_link">Gade</string>
-	<string name="type.highway.motorway_link.bridge">Gade</string>
-	<string name="type.highway.motorway_link.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sti</string>
 	<string name="type.highway.path.alpine_hiking">Sti</string>
 	<string name="type.highway.path.bicycle">Sti</string>
-	<string name="type.highway.path.bridge">Sti</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Bro</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Sti</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Sti</string>
@@ -905,51 +922,75 @@
 	<string name="type.highway.path.horse">Sti</string>
 	<string name="type.highway.path.mountain_hiking">Sti</string>
 	<string name="type.highway.path.permissive">Sti</string>
-	<string name="type.highway.path.tunnel">Sti</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Gade</string>
 	<string name="type.highway.pedestrian.area">Gade</string>
-	<string name="type.highway.pedestrian.bridge">Gade</string>
-	<string name="type.highway.pedestrian.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
 	<string name="type.highway.primary">Gade</string>
-	<string name="type.highway.primary.bridge">Gade</string>
-	<string name="type.highway.primary.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Gade</string>
-	<string name="type.highway.primary_link.bridge">Gade</string>
-	<string name="type.highway.primary_link.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Væddeløbsbane</string>
 	<string name="type.highway.residential">Gade</string>
 	<string name="type.highway.residential.area">Gade</string>
-	<string name="type.highway.residential.bridge">Gade</string>
-	<string name="type.highway.residential.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Rasteplads</string>
 	<string name="type.highway.road">Gade</string>
-	<string name="type.highway.road.bridge">Gade</string>
-	<string name="type.highway.road.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Gade</string>
-	<string name="type.highway.secondary.bridge">Gade</string>
-	<string name="type.highway.secondary.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Gade</string>
-	<string name="type.highway.secondary_link.bridge">Gade</string>
-	<string name="type.highway.secondary_link.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Gade</string>
 	<string name="type.highway.service.area">Gade</string>
-	<string name="type.highway.service.bridge">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Bro</string>
 	<string name="type.highway.service.driveway">Gade</string>
 	<string name="type.highway.service.parking_aisle">Gade</string>
-	<string name="type.highway.service.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Automatisk Trafikkontrol</string>
 	<string name="type.highway.steps">Sti</string>
-	<string name="type.highway.steps.bridge">Sti</string>
-	<string name="type.highway.steps.tunnel">Sti</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Gade</string>
-	<string name="type.highway.tertiary.bridge">Gade</string>
-	<string name="type.highway.tertiary.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Gade</string>
-	<string name="type.highway.tertiary_link.bridge">Gade</string>
-	<string name="type.highway.tertiary_link.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Gade</string>
 	<string name="type.highway.track.area">Gade</string>
-	<string name="type.highway.track.bridge">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Bro</string>
 	<string name="type.highway.track.grade1">Gade</string>
 	<string name="type.highway.track.grade2">Gade</string>
 	<string name="type.highway.track.grade3">Gade</string>
@@ -957,18 +998,25 @@
 	<string name="type.highway.track.grade5">Gade</string>
 	<string name="type.highway.track.no.access">Gade</string>
 	<string name="type.highway.track.permissive">Gade</string>
-	<string name="type.highway.track.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafiklys</string>
 	<string name="type.highway.trunk">Gade</string>
-	<string name="type.highway.trunk.bridge">Gade</string>
-	<string name="type.highway.trunk.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">Gade</string>
-	<string name="type.highway.trunk_link.bridge">Gade</string>
-	<string name="type.highway.trunk_link.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Gade</string>
 	<string name="type.highway.unclassified.area">Gade</string>
-	<string name="type.highway.unclassified.bridge">Gade</string>
-	<string name="type.highway.unclassified.tunnel">Gade</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.footway">Sti</string>
 	<string name="type.area_highway.living_street">Gade</string>
 	<string name="type.area_highway.motorway">Gade</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 3dfa8481d4..21b1bbaa33 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">MB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Meilen</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Mein Standort</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Später</string>
@@ -930,42 +930,55 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Straße</string>
 	<string name="type.highway.bridleway">Reitweg</string>
-	<string name="type.highway.bridleway.bridge">Reitweg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Brücke</string>
 	<string name="type.highway.bridleway.permissive">Reitweg</string>
-	<string name="type.highway.bridleway.tunnel">Reitweg</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Bushaltestelle</string>
 	<string name="type.highway.construction">Straße im Bau</string>
 	<string name="type.highway.cycleway">Radweg</string>
-	<string name="type.highway.cycleway.bridge">Radweg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Brücke</string>
 	<string name="type.highway.cycleway.permissive">Radweg</string>
-	<string name="type.highway.cycleway.tunnel">Radweg</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.elevator">Aufzug</string>
 	<string name="type.highway.footway">Fußweg</string>
 	<string name="type.highway.footway.alpine_hiking">Alpinwanderweg</string>
 	<string name="type.highway.footway.area">Fußweg</string>
-	<string name="type.highway.footway.bridge">Fußweg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Brücke</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Anspruchsvoller Alpinwanderweg</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Anspruchsvoller Bergwanderweg</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Schwieriger Alpinwanderweg</string>
 	<string name="type.highway.footway.hiking">Wanderweg</string>
 	<string name="type.highway.footway.mountain_hiking">Bergwanderweg</string>
 	<string name="type.highway.footway.permissive">Fußweg</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Fußgängertunnel</string>
 	<string name="type.highway.ford">Furt</string>
 	<string name="type.highway.living_street">Spielstraße</string>
-	<string name="type.highway.living_street.bridge">Spielstraße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Spielstraßentunnel</string>
 	<string name="type.highway.motorway">Autobahn</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway.bridge">Autobahnbrücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway.tunnel">Autobahntunnel</string>
 	<string name="type.highway.motorway_junction">Autobahnausfahrt</string>
 	<string name="type.highway.motorway_link">Autobahnauffahrt</string>
-	<string name="type.highway.motorway_link.bridge">Autobahnauffahrt</string>
-	<string name="type.highway.motorway_link.tunnel">Autobahnauffahrt</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Weg</string>
 	<string name="type.highway.path.alpine_hiking">Alpinwanderweg</string>
 	<string name="type.highway.path.bicycle">Radweg</string>
-	<string name="type.highway.path.bridge">Weg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Brücke</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Anspruchsvoller Alpinwanderweg</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Anspruchsvoller Bergwanderweg</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Schwieriger Alpinwanderweg</string>
@@ -973,52 +986,76 @@
 	<string name="type.highway.path.horse">Reitweg</string>
 	<string name="type.highway.path.mountain_hiking">Bergwanderweg</string>
 	<string name="type.highway.path.permissive">Weg</string>
-	<string name="type.highway.path.tunnel">Weg</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Fußgängerzone</string>
 	<string name="type.highway.pedestrian.area">Fußgängerzone</string>
-	<string name="type.highway.pedestrian.bridge">Fußgängerzone</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.pedestrian.tunnel">Fußgängertunnel</string>
 	<string name="type.highway.primary">Hauptstraße</string>
-	<string name="type.highway.primary.bridge">Hauptstraße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary.tunnel">Hauptstraßentunnel</string>
 	<string name="type.highway.primary_link">Hauptstraße</string>
-	<string name="type.highway.primary_link.bridge">Hauptstraße</string>
-	<string name="type.highway.primary_link.tunnel">Hauptstraße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Rennbahn</string>
 	<string name="type.highway.residential">Wohnstraße</string>
 	<string name="type.highway.residential.area">Wohnstraße</string>
-	<string name="type.highway.residential.bridge">Wohnstraße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.residential.tunnel">Wohnstraßentunnel</string>
 	<string name="type.highway.rest_area">Rastplatz</string>
 	<string name="type.highway.road">Straße</string>
-	<string name="type.highway.road.bridge">Straße</string>
-	<string name="type.highway.road.tunnel">Straßentunnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Straße</string>
-	<string name="type.highway.secondary.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary.tunnel">Straßentunnel</string>
 	<string name="type.highway.secondary_link">Straße</string>
-	<string name="type.highway.secondary_link.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary_link.tunnel">Straßentunnel</string>
 	<string name="type.highway.service">Straße</string>
 	<string name="type.highway.service.area">Straße</string>
-	<string name="type.highway.service.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Brücke</string>
 	<string name="type.highway.service.driveway">Zufahrt</string>
 	<string name="type.highway.service.parking_aisle">Straße</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.service.tunnel">Straßentunnel</string>
 	<string name="type.highway.services">Raststätte</string>
 	<string name="type.highway.speed_camera">Blitzer</string>
 	<string name="type.highway.steps">Stufen</string>
-	<string name="type.highway.steps.bridge">Stufen</string>
-	<string name="type.highway.steps.tunnel">Stufen</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Straße</string>
-	<string name="type.highway.tertiary.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary.tunnel">Straßentunnel</string>
 	<string name="type.highway.tertiary_link">Straße</string>
-	<string name="type.highway.tertiary_link.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary_link.tunnel">Straßentunnel</string>
 	<string name="type.highway.track">Straße</string>
 	<string name="type.highway.track.area">Straße</string>
-	<string name="type.highway.track.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Brücke</string>
 	<string name="type.highway.track.grade1">Straße</string>
 	<string name="type.highway.track.grade2">Straße</string>
 	<string name="type.highway.track.grade3">Straße</string>
@@ -1026,17 +1063,24 @@
 	<string name="type.highway.track.grade5">Straße</string>
 	<string name="type.highway.track.no.access">Straße</string>
 	<string name="type.highway.track.permissive">Straße</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Straßentunnel</string>
 	<string name="type.highway.traffic_signals">Verkehrsampel</string>
 	<string name="type.highway.trunk">Schnellstraße</string>
-	<string name="type.highway.trunk.bridge">Schnellstraße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk.tunnel">Schnellstraßentunnel</string>
 	<string name="type.highway.trunk_link">Schnellstraße</string>
-	<string name="type.highway.trunk_link.bridge">Schnellstraße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk_link.tunnel">Straßentunnel</string>
 	<string name="type.highway.unclassified">Straße</string>
 	<string name="type.highway.unclassified.area">Straße</string>
-	<string name="type.highway.unclassified.bridge">Straße</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Brücke</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.unclassified.tunnel">Straßentunnel</string>
 	<string name="type.area_highway.cycleway">Radweg</string>
 	<string name="type.area_highway.footway">Weg</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 1c16b02f38..6042ffdc23 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -22,7 +22,7 @@
 	<string name="gb">GB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Μίλια</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Η θέση μου</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Αργότερα</string>
@@ -877,34 +877,51 @@
 	<string name="type.healthcare.laboratory">Ιατρικό Εργαστήριο</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Σήραγγα</string>
 	<string name="type.highway.bus_stop">Στάση λεωφορείου</string>
 	<string name="type.highway.construction">Οδός υπό κατασκευή</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Σήραγγα</string>
 	<string name="type.highway.footway">Διαδρομή</string>
 	<string name="type.highway.footway.alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.footway.area">Διαδρομή</string>
-	<string name="type.highway.footway.bridge">Διαδρομή</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Γέφυρα</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Διαδρομή</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.footway.hiking">Διαδρομή</string>
 	<string name="type.highway.footway.mountain_hiking">Διαδρομή</string>
 	<string name="type.highway.footway.permissive">Διαδρομή</string>
-	<string name="type.highway.footway.tunnel">Διαδρομή</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Σήραγγα</string>
 	<string name="type.highway.ford">Πέρασμα</string>
 	<string name="type.highway.living_street">Οδός</string>
-	<string name="type.highway.living_street.bridge">Οδός</string>
-	<string name="type.highway.living_street.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Σήραγγα</string>
 	<string name="type.highway.motorway">Οδός</string>
-	<string name="type.highway.motorway.bridge">Οδός</string>
-	<string name="type.highway.motorway.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Σήραγγα</string>
 	<string name="type.highway.motorway_junction">Έξοδος</string>
 	<string name="type.highway.motorway_link">Οδός</string>
-	<string name="type.highway.motorway_link.bridge">Οδός</string>
-	<string name="type.highway.motorway_link.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Σήραγγα</string>
 	<string name="type.highway.path">Διαδρομή</string>
 	<string name="type.highway.path.alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.path.bicycle">Διαδρομή</string>
-	<string name="type.highway.path.bridge">Διαδρομή</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Γέφυρα</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Διαδρομή</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Διαδρομή</string>
@@ -912,51 +929,75 @@
 	<string name="type.highway.path.horse">Διαδρομή</string>
 	<string name="type.highway.path.mountain_hiking">Διαδρομή</string>
 	<string name="type.highway.path.permissive">Διαδρομή</string>
-	<string name="type.highway.path.tunnel">Διαδρομή</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Σήραγγα</string>
 	<string name="type.highway.pedestrian">Οδός</string>
 	<string name="type.highway.pedestrian.area">Οδός</string>
-	<string name="type.highway.pedestrian.bridge">Οδός</string>
-	<string name="type.highway.pedestrian.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Σήραγγα</string>
 	<string name="type.highway.primary">Οδός</string>
-	<string name="type.highway.primary.bridge">Οδός</string>
-	<string name="type.highway.primary.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Σήραγγα</string>
 	<string name="type.highway.primary_link">Οδός</string>
-	<string name="type.highway.primary_link.bridge">Οδός</string>
-	<string name="type.highway.primary_link.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Σήραγγα</string>
 	<string name="type.highway.raceway">Πίστα αγώνων</string>
 	<string name="type.highway.residential">Οδός</string>
 	<string name="type.highway.residential.area">Οδός</string>
-	<string name="type.highway.residential.bridge">Οδός</string>
-	<string name="type.highway.residential.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Σήραγγα</string>
 	<string name="type.highway.rest_area">Χώρος ανάπαυσης αυτοκινητιστών</string>
 	<string name="type.highway.road">Οδός</string>
-	<string name="type.highway.road.bridge">Οδός</string>
-	<string name="type.highway.road.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Σήραγγα</string>
 	<string name="type.highway.secondary">Οδός</string>
-	<string name="type.highway.secondary.bridge">Οδός</string>
-	<string name="type.highway.secondary.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Σήραγγα</string>
 	<string name="type.highway.secondary_link">Οδός</string>
-	<string name="type.highway.secondary_link.bridge">Οδός</string>
-	<string name="type.highway.secondary_link.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Σήραγγα</string>
 	<string name="type.highway.service">Οδός</string>
 	<string name="type.highway.service.area">Οδός</string>
-	<string name="type.highway.service.bridge">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Γέφυρα</string>
 	<string name="type.highway.service.driveway">Οδός</string>
 	<string name="type.highway.service.parking_aisle">Οδός</string>
-	<string name="type.highway.service.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Σήραγγα</string>
 	<string name="type.highway.speed_camera">Κάμερα ταχύτητας</string>
 	<string name="type.highway.steps">Διαδρομή</string>
-	<string name="type.highway.steps.bridge">Διαδρομή</string>
-	<string name="type.highway.steps.tunnel">Διαδρομή</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Σήραγγα</string>
 	<string name="type.highway.tertiary">Οδός</string>
-	<string name="type.highway.tertiary.bridge">Οδός</string>
-	<string name="type.highway.tertiary.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Σήραγγα</string>
 	<string name="type.highway.tertiary_link">Οδός</string>
-	<string name="type.highway.tertiary_link.bridge">Οδός</string>
-	<string name="type.highway.tertiary_link.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Σήραγγα</string>
 	<string name="type.highway.track">Οδός</string>
 	<string name="type.highway.track.area">Οδός</string>
-	<string name="type.highway.track.bridge">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Γέφυρα</string>
 	<string name="type.highway.track.grade1">Οδός</string>
 	<string name="type.highway.track.grade2">Οδός</string>
 	<string name="type.highway.track.grade3">Οδός</string>
@@ -964,18 +1005,25 @@
 	<string name="type.highway.track.grade5">Οδός</string>
 	<string name="type.highway.track.no.access">Οδός</string>
 	<string name="type.highway.track.permissive">Οδός</string>
-	<string name="type.highway.track.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Σήραγγα</string>
 	<string name="type.highway.traffic_signals">Φανάρια κυκλοφορίας</string>
 	<string name="type.highway.trunk">Οδός</string>
-	<string name="type.highway.trunk.bridge">Οδός</string>
-	<string name="type.highway.trunk.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Σήραγγα</string>
 	<string name="type.highway.trunk_link">Οδός</string>
-	<string name="type.highway.trunk_link.bridge">Οδός</string>
-	<string name="type.highway.trunk_link.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Σήραγγα</string>
 	<string name="type.highway.unclassified">Οδός</string>
 	<string name="type.highway.unclassified.area">Οδός</string>
-	<string name="type.highway.unclassified.bridge">Οδός</string>
-	<string name="type.highway.unclassified.tunnel">Οδός</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Γέφυρα</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Σήραγγα</string>
 	<string name="type.area_highway.footway">Διαδρομή</string>
 	<string name="type.area_highway.living_street">Οδός</string>
 	<string name="type.area_highway.motorway">Οδός</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index f68f6b2bfe..b041156c57 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -204,8 +204,96 @@
 	<string name="type.boundary.national_park">Parque nacional</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Túnel</string>
 	<string name="type.highway.construction">Carretera en construcción</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Túnel</string>
 	<string name="type.highway.ford">Vado (de lugar)</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Túnel</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Túnel</string>
 
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.churchyard">Camposanto</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index dc4cfd31ff..392cff5617 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mapas</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Milla</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Mi posición</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Luego</string>
@@ -890,34 +890,51 @@
 	<string name="type.healthcare.laboratory">Laboratorio médico</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Túnel</string>
 	<string name="type.highway.bus_stop">Parada de autobús</string>
 	<string name="type.highway.construction">Carretera en construcción</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Túnel</string>
 	<string name="type.highway.footway">Camino</string>
 	<string name="type.highway.footway.alpine_hiking">Camino</string>
 	<string name="type.highway.footway.area">Camino</string>
-	<string name="type.highway.footway.bridge">Camino</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Puente</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Camino</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Camino</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Camino</string>
 	<string name="type.highway.footway.hiking">Camino</string>
 	<string name="type.highway.footway.mountain_hiking">Camino</string>
 	<string name="type.highway.footway.permissive">Camino</string>
-	<string name="type.highway.footway.tunnel">Camino</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Túnel</string>
 	<string name="type.highway.ford">Vado (de lugar)</string>
 	<string name="type.highway.living_street">Calle</string>
-	<string name="type.highway.living_street.bridge">Calle</string>
-	<string name="type.highway.living_street.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Túnel</string>
 	<string name="type.highway.motorway">Calle</string>
-	<string name="type.highway.motorway.bridge">Calle</string>
-	<string name="type.highway.motorway.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Túnel</string>
 	<string name="type.highway.motorway_junction">Salida</string>
 	<string name="type.highway.motorway_link">Calle</string>
-	<string name="type.highway.motorway_link.bridge">Calle</string>
-	<string name="type.highway.motorway_link.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Camino</string>
 	<string name="type.highway.path.alpine_hiking">Camino</string>
 	<string name="type.highway.path.bicycle">Camino</string>
-	<string name="type.highway.path.bridge">Camino</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Puente</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Camino</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Camino</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Camino</string>
@@ -925,51 +942,75 @@
 	<string name="type.highway.path.horse">Camino</string>
 	<string name="type.highway.path.mountain_hiking">Camino</string>
 	<string name="type.highway.path.permissive">Camino</string>
-	<string name="type.highway.path.tunnel">Camino</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Calle</string>
 	<string name="type.highway.pedestrian.area">Calle</string>
-	<string name="type.highway.pedestrian.bridge">Calle</string>
-	<string name="type.highway.pedestrian.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Túnel</string>
 	<string name="type.highway.primary">Calle</string>
-	<string name="type.highway.primary.bridge">Calle</string>
-	<string name="type.highway.primary.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Túnel</string>
 	<string name="type.highway.primary_link">Calle</string>
-	<string name="type.highway.primary_link.bridge">Calle</string>
-	<string name="type.highway.primary_link.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Túnel</string>
 	<string name="type.highway.raceway">Circuito</string>
 	<string name="type.highway.residential">Calle</string>
 	<string name="type.highway.residential.area">Calle</string>
-	<string name="type.highway.residential.bridge">Calle</string>
-	<string name="type.highway.residential.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Túnel</string>
 	<string name="type.highway.rest_area">Área de descanso</string>
 	<string name="type.highway.road">Calle</string>
-	<string name="type.highway.road.bridge">Calle</string>
-	<string name="type.highway.road.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Túnel</string>
 	<string name="type.highway.secondary">Calle</string>
-	<string name="type.highway.secondary.bridge">Calle</string>
-	<string name="type.highway.secondary.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Túnel</string>
 	<string name="type.highway.secondary_link">Calle</string>
-	<string name="type.highway.secondary_link.bridge">Calle</string>
-	<string name="type.highway.secondary_link.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Túnel</string>
 	<string name="type.highway.service">Calle</string>
 	<string name="type.highway.service.area">Calle</string>
-	<string name="type.highway.service.bridge">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Puente</string>
 	<string name="type.highway.service.driveway">Calle</string>
 	<string name="type.highway.service.parking_aisle">Calle</string>
-	<string name="type.highway.service.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Túnel</string>
 	<string name="type.highway.speed_camera">Radar de velocidad</string>
 	<string name="type.highway.steps">Camino</string>
-	<string name="type.highway.steps.bridge">Camino</string>
-	<string name="type.highway.steps.tunnel">Camino</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Túnel</string>
 	<string name="type.highway.tertiary">Calle</string>
-	<string name="type.highway.tertiary.bridge">Calle</string>
-	<string name="type.highway.tertiary.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Túnel</string>
 	<string name="type.highway.tertiary_link">Calle</string>
-	<string name="type.highway.tertiary_link.bridge">Calle</string>
-	<string name="type.highway.tertiary_link.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Túnel</string>
 	<string name="type.highway.track">Calle</string>
 	<string name="type.highway.track.area">Calle</string>
-	<string name="type.highway.track.bridge">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Puente</string>
 	<string name="type.highway.track.grade1">Calle</string>
 	<string name="type.highway.track.grade2">Calle</string>
 	<string name="type.highway.track.grade3">Calle</string>
@@ -977,18 +1018,25 @@
 	<string name="type.highway.track.grade5">Calle</string>
 	<string name="type.highway.track.no.access">Calle</string>
 	<string name="type.highway.track.permissive">Calle</string>
-	<string name="type.highway.track.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Túnel</string>
 	<string name="type.highway.traffic_signals">Semáforos</string>
 	<string name="type.highway.trunk">Calle</string>
-	<string name="type.highway.trunk.bridge">Calle</string>
-	<string name="type.highway.trunk.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Túnel</string>
 	<string name="type.highway.trunk_link">Calle</string>
-	<string name="type.highway.trunk_link.bridge">Calle</string>
-	<string name="type.highway.trunk_link.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Túnel</string>
 	<string name="type.highway.unclassified">Calle</string>
 	<string name="type.highway.unclassified.area">Calle</string>
-	<string name="type.highway.unclassified.bridge">Calle</string>
-	<string name="type.highway.unclassified.tunnel">Calle</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Puente</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Túnel</string>
 	<string name="type.area_highway.footway">Camino</string>
 	<string name="type.area_highway.living_street">Calle</string>
 	<string name="type.area_highway.motorway">Calle</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 44775d5e8a..ac5e776879 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -24,7 +24,7 @@
 	<string name="gb">گیگابایت</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">مایل</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">مکان من</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">بعداً</string>
@@ -789,34 +789,51 @@
 	<string name="type.healthcare.laboratory">ﯽﮑﺷﺰﭘ ﻩﺎﮕﺸﯾﺎﻣﺯﺁ</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">تونل</string>
 	<string name="type.highway.bus_stop">حمل و نقل</string>
 	<string name="type.highway.construction">جاده در دست ساخت است</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">تونل</string>
 	<string name="type.highway.footway">مسیر</string>
 	<string name="type.highway.footway.alpine_hiking">مسیر</string>
 	<string name="type.highway.footway.area">مسیر</string>
-	<string name="type.highway.footway.bridge">مسیر</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">پل</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">مسیر</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">مسیر</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">مسیر</string>
 	<string name="type.highway.footway.hiking">مسیر</string>
 	<string name="type.highway.footway.mountain_hiking">مسیر</string>
 	<string name="type.highway.footway.permissive">مسیر</string>
-	<string name="type.highway.footway.tunnel">مسیر</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">تونل</string>
 	<string name="type.highway.ford">گدار</string>
 	<string name="type.highway.living_street">جاده</string>
-	<string name="type.highway.living_street.bridge">جاده</string>
-	<string name="type.highway.living_street.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">تونل</string>
 	<string name="type.highway.motorway">جاده</string>
-	<string name="type.highway.motorway.bridge">جاده</string>
-	<string name="type.highway.motorway.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">تونل</string>
 	<string name="type.highway.motorway_junction">تقاطع</string>
 	<string name="type.highway.motorway_link">جاده</string>
-	<string name="type.highway.motorway_link.bridge">جاده</string>
-	<string name="type.highway.motorway_link.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">تونل</string>
 	<string name="type.highway.path">مسیر</string>
 	<string name="type.highway.path.alpine_hiking">مسیر</string>
 	<string name="type.highway.path.bicycle">مسیر</string>
-	<string name="type.highway.path.bridge">مسیر</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">پل</string>
 	<string name="type.highway.path.demanding_alpine_hiking">مسیر</string>
 	<string name="type.highway.path.demanding_mountain_hiking">مسیر</string>
 	<string name="type.highway.path.difficult_alpine_hiking">مسیر</string>
@@ -824,50 +841,74 @@
 	<string name="type.highway.path.horse">مسیر</string>
 	<string name="type.highway.path.mountain_hiking">مسیر</string>
 	<string name="type.highway.path.permissive">مسیر</string>
-	<string name="type.highway.path.tunnel">مسیر</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">تونل</string>
 	<string name="type.highway.pedestrian">جاده</string>
 	<string name="type.highway.pedestrian.area">جاده</string>
-	<string name="type.highway.pedestrian.bridge">جاده</string>
-	<string name="type.highway.pedestrian.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">تونل</string>
 	<string name="type.highway.primary">جاده</string>
-	<string name="type.highway.primary.bridge">جاده</string>
-	<string name="type.highway.primary.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">تونل</string>
 	<string name="type.highway.primary_link">جاده</string>
-	<string name="type.highway.primary_link.bridge">جاده</string>
-	<string name="type.highway.primary_link.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">تونل</string>
 	<string name="type.highway.raceway">کانال</string>
 	<string name="type.highway.residential">جاده</string>
 	<string name="type.highway.residential.area">جاده</string>
-	<string name="type.highway.residential.bridge">جاده</string>
-	<string name="type.highway.residential.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">تونل</string>
 	<string name="type.highway.road">جاده</string>
-	<string name="type.highway.road.bridge">جاده</string>
-	<string name="type.highway.road.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">تونل</string>
 	<string name="type.highway.secondary">جاده</string>
-	<string name="type.highway.secondary.bridge">جاده</string>
-	<string name="type.highway.secondary.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">تونل</string>
 	<string name="type.highway.secondary_link">جاده</string>
-	<string name="type.highway.secondary_link.bridge">جاده</string>
-	<string name="type.highway.secondary_link.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">تونل</string>
 	<string name="type.highway.service">جاده</string>
 	<string name="type.highway.service.area">جاده</string>
-	<string name="type.highway.service.bridge">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">پل</string>
 	<string name="type.highway.service.driveway">جاده</string>
 	<string name="type.highway.service.parking_aisle">جاده</string>
-	<string name="type.highway.service.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">تونل</string>
 	<string name="type.highway.speed_camera">دوربین سرعت سنج</string>
 	<string name="type.highway.steps">مسیر</string>
-	<string name="type.highway.steps.bridge">مسیر</string>
-	<string name="type.highway.steps.tunnel">مسیر</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">تونل</string>
 	<string name="type.highway.tertiary">جاده</string>
-	<string name="type.highway.tertiary.bridge">جاده</string>
-	<string name="type.highway.tertiary.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">تونل</string>
 	<string name="type.highway.tertiary_link">جاده</string>
-	<string name="type.highway.tertiary_link.bridge">جاده</string>
-	<string name="type.highway.tertiary_link.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">تونل</string>
 	<string name="type.highway.track">جاده</string>
 	<string name="type.highway.track.area">جاده</string>
-	<string name="type.highway.track.bridge">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">پل</string>
 	<string name="type.highway.track.grade1">جاده</string>
 	<string name="type.highway.track.grade2">جاده</string>
 	<string name="type.highway.track.grade3">جاده</string>
@@ -875,18 +916,25 @@
 	<string name="type.highway.track.grade5">جاده</string>
 	<string name="type.highway.track.no.access">جاده</string>
 	<string name="type.highway.track.permissive">جاده</string>
-	<string name="type.highway.track.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">تونل</string>
 	<string name="type.highway.traffic_signals">چراغ راهنما</string>
 	<string name="type.highway.trunk">جاده</string>
-	<string name="type.highway.trunk.bridge">جاده</string>
-	<string name="type.highway.trunk.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">تونل</string>
 	<string name="type.highway.trunk_link">جاده</string>
-	<string name="type.highway.trunk_link.bridge">جاده</string>
-	<string name="type.highway.trunk_link.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">تونل</string>
 	<string name="type.highway.unclassified">جاده</string>
 	<string name="type.highway.unclassified.area">جاده</string>
-	<string name="type.highway.unclassified.bridge">جاده</string>
-	<string name="type.highway.unclassified.tunnel">جاده</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">پل</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">تونل</string>
 	<string name="type.area_highway.footway">مسیر</string>
 	<string name="type.area_highway.living_street">جاده</string>
 	<string name="type.area_highway.motorway">جاده</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 247cd5749c..b8837fe635 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">Mt</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mailit</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Sijaintini</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Myöhemmin</string>
@@ -886,34 +886,51 @@
 	<string name="type.healthcare.laboratory">Lääketieteellinen laboratorio</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunneli</string>
 	<string name="type.highway.bus_stop">Bussipysäkki</string>
 	<string name="type.highway.construction">Rakenteilla oleva tie</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunneli</string>
 	<string name="type.highway.footway">Polku</string>
 	<string name="type.highway.footway.alpine_hiking">Polku</string>
 	<string name="type.highway.footway.area">Polku</string>
-	<string name="type.highway.footway.bridge">Polku</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Silta</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Polku</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Polku</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Polku</string>
 	<string name="type.highway.footway.hiking">Polku</string>
 	<string name="type.highway.footway.mountain_hiking">Polku</string>
 	<string name="type.highway.footway.permissive">Polku</string>
-	<string name="type.highway.footway.tunnel">Polku</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunneli</string>
 	<string name="type.highway.ford">Kahluupaikka</string>
 	<string name="type.highway.living_street">Katu</string>
-	<string name="type.highway.living_street.bridge">Katu</string>
-	<string name="type.highway.living_street.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunneli</string>
 	<string name="type.highway.motorway">Katu</string>
-	<string name="type.highway.motorway.bridge">Katu</string>
-	<string name="type.highway.motorway.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunneli</string>
 	<string name="type.highway.motorway_junction">Poistumistie</string>
 	<string name="type.highway.motorway_link">Katu</string>
-	<string name="type.highway.motorway_link.bridge">Katu</string>
-	<string name="type.highway.motorway_link.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunneli</string>
 	<string name="type.highway.path">Polku</string>
 	<string name="type.highway.path.alpine_hiking">Polku</string>
 	<string name="type.highway.path.bicycle">Polku</string>
-	<string name="type.highway.path.bridge">Polku</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Silta</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Polku</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Polku</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Polku</string>
@@ -921,51 +938,75 @@
 	<string name="type.highway.path.horse">Polku</string>
 	<string name="type.highway.path.mountain_hiking">Polku</string>
 	<string name="type.highway.path.permissive">Polku</string>
-	<string name="type.highway.path.tunnel">Polku</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunneli</string>
 	<string name="type.highway.pedestrian">Katu</string>
 	<string name="type.highway.pedestrian.area">Katu</string>
-	<string name="type.highway.pedestrian.bridge">Katu</string>
-	<string name="type.highway.pedestrian.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunneli</string>
 	<string name="type.highway.primary">Katu</string>
-	<string name="type.highway.primary.bridge">Katu</string>
-	<string name="type.highway.primary.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunneli</string>
 	<string name="type.highway.primary_link">Katu</string>
-	<string name="type.highway.primary_link.bridge">Katu</string>
-	<string name="type.highway.primary_link.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunneli</string>
 	<string name="type.highway.raceway">Kilparata</string>
 	<string name="type.highway.residential">Katu</string>
 	<string name="type.highway.residential.area">Katu</string>
-	<string name="type.highway.residential.bridge">Katu</string>
-	<string name="type.highway.residential.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunneli</string>
 	<string name="type.highway.rest_area">Levähdyspaikka</string>
 	<string name="type.highway.road">Katu</string>
-	<string name="type.highway.road.bridge">Katu</string>
-	<string name="type.highway.road.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunneli</string>
 	<string name="type.highway.secondary">Katu</string>
-	<string name="type.highway.secondary.bridge">Katu</string>
-	<string name="type.highway.secondary.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunneli</string>
 	<string name="type.highway.secondary_link">Katu</string>
-	<string name="type.highway.secondary_link.bridge">Katu</string>
-	<string name="type.highway.secondary_link.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunneli</string>
 	<string name="type.highway.service">Katu</string>
 	<string name="type.highway.service.area">Katu</string>
-	<string name="type.highway.service.bridge">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Silta</string>
 	<string name="type.highway.service.driveway">Katu</string>
 	<string name="type.highway.service.parking_aisle">Katu</string>
-	<string name="type.highway.service.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunneli</string>
 	<string name="type.highway.speed_camera">Nopeusvalvontakamera</string>
 	<string name="type.highway.steps">Polku</string>
-	<string name="type.highway.steps.bridge">Polku</string>
-	<string name="type.highway.steps.tunnel">Polku</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunneli</string>
 	<string name="type.highway.tertiary">Katu</string>
-	<string name="type.highway.tertiary.bridge">Katu</string>
-	<string name="type.highway.tertiary.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunneli</string>
 	<string name="type.highway.tertiary_link">Katu</string>
-	<string name="type.highway.tertiary_link.bridge">Katu</string>
-	<string name="type.highway.tertiary_link.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunneli</string>
 	<string name="type.highway.track">Katu</string>
 	<string name="type.highway.track.area">Katu</string>
-	<string name="type.highway.track.bridge">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Silta</string>
 	<string name="type.highway.track.grade1">Katu</string>
 	<string name="type.highway.track.grade2">Katu</string>
 	<string name="type.highway.track.grade3">Katu</string>
@@ -973,18 +1014,25 @@
 	<string name="type.highway.track.grade5">Katu</string>
 	<string name="type.highway.track.no.access">Katu</string>
 	<string name="type.highway.track.permissive">Katu</string>
-	<string name="type.highway.track.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunneli</string>
 	<string name="type.highway.traffic_signals">Liikennevalot</string>
 	<string name="type.highway.trunk">Katu</string>
-	<string name="type.highway.trunk.bridge">Katu</string>
-	<string name="type.highway.trunk.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunneli</string>
 	<string name="type.highway.trunk_link">Katu</string>
-	<string name="type.highway.trunk_link.bridge">Katu</string>
-	<string name="type.highway.trunk_link.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunneli</string>
 	<string name="type.highway.unclassified">Katu</string>
 	<string name="type.highway.unclassified.area">Katu</string>
-	<string name="type.highway.unclassified.bridge">Katu</string>
-	<string name="type.highway.unclassified.tunnel">Katu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Silta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunneli</string>
 	<string name="type.area_highway.cycleway">Pyörätie</string>
 	<string name="type.area_highway.footway">Kävelytie</string>
 	<string name="type.area_highway.living_street">Katu</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 320faa8abb..3debde2cc5 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">Mo</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Miles</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Ma position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Plus tard</string>
@@ -911,42 +911,55 @@
 
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway.bridleway">Chemin pour cavalier</string>
-	<string name="type.highway.bridleway.bridge">Chemin pour cavalier</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Pont</string>
 	<string name="type.highway.bridleway.permissive">Chemin pour cavalier</string>
-	<string name="type.highway.bridleway.tunnel">Chemin pour cavalier</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Arrêt de bus</string>
 	<string name="type.highway.construction">Route en construction</string>
 	<string name="type.highway.cycleway">Piste cyclable</string>
-	<string name="type.highway.cycleway.bridge">Piste cyclable</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Pont</string>
 	<string name="type.highway.cycleway.permissive">Piste cyclable</string>
-	<string name="type.highway.cycleway.tunnel">Piste cyclable</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.elevator">Ascenseur</string>
 	<string name="type.highway.footway">Chemin</string>
 	<string name="type.highway.footway.alpine_hiking">Chemin</string>
 	<string name="type.highway.footway.area">Chemin</string>
-	<string name="type.highway.footway.bridge">Chemin</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Pont</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Chemin</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Chemin</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Chemin</string>
 	<string name="type.highway.footway.hiking">Chemin</string>
 	<string name="type.highway.footway.mountain_hiking">Chemin</string>
 	<string name="type.highway.footway.permissive">Chemin</string>
-	<string name="type.highway.footway.tunnel">Chemin</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Gué</string>
 	<string name="type.highway.living_street">Zone de rencontre</string>
-	<string name="type.highway.living_street.bridge">Zone de rencontre</string>
-	<string name="type.highway.living_street.tunnel">Zone de rencontre</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Autoroute</string>
-	<string name="type.highway.motorway.bridge">Autoroute</string>
-	<string name="type.highway.motorway.tunnel">Autoroute</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunnel</string>
 	<string name="type.highway.motorway_junction">Sortie</string>
 	<string name="type.highway.motorway_link">Autoroute</string>
-	<string name="type.highway.motorway_link.bridge">Autoroute</string>
-	<string name="type.highway.motorway_link.tunnel">Autoroute</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Chemin</string>
 	<string name="type.highway.path.alpine_hiking">Chemin</string>
 	<string name="type.highway.path.bicycle">Chemin</string>
-	<string name="type.highway.path.bridge">Chemin</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Pont</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Chemin</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Chemin</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Chemin</string>
@@ -954,52 +967,76 @@
 	<string name="type.highway.path.horse">Chemin</string>
 	<string name="type.highway.path.mountain_hiking">Chemin</string>
 	<string name="type.highway.path.permissive">Chemin</string>
-	<string name="type.highway.path.tunnel">Chemin</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Rue piétonne</string>
 	<string name="type.highway.pedestrian.area">Rue piétonne</string>
-	<string name="type.highway.pedestrian.bridge">Rue piétonne</string>
-	<string name="type.highway.pedestrian.tunnel">Rue piétonne</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
 	<string name="type.highway.primary">Rue</string>
-	<string name="type.highway.primary.bridge">Rue</string>
-	<string name="type.highway.primary.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Rue</string>
-	<string name="type.highway.primary_link.bridge">Rue</string>
-	<string name="type.highway.primary_link.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Circuit</string>
 	<string name="type.highway.residential">Rue</string>
 	<string name="type.highway.residential.area">Rue</string>
-	<string name="type.highway.residential.bridge">Rue</string>
-	<string name="type.highway.residential.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Aire de repos</string>
 	<string name="type.highway.road">Rue</string>
-	<string name="type.highway.road.bridge">Rue</string>
-	<string name="type.highway.road.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Rue</string>
-	<string name="type.highway.secondary.bridge">Rue</string>
-	<string name="type.highway.secondary.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Rue</string>
-	<string name="type.highway.secondary_link.bridge">Rue</string>
-	<string name="type.highway.secondary_link.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Rue</string>
 	<string name="type.highway.service.area">Rue</string>
-	<string name="type.highway.service.bridge">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Pont</string>
 	<string name="type.highway.service.driveway">Rue</string>
 	<string name="type.highway.service.parking_aisle">Allée</string>
-	<string name="type.highway.service.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.services">Aire de service</string>
 	<string name="type.highway.speed_camera">Radar de vitesse</string>
 	<string name="type.highway.steps">Escaliers</string>
-	<string name="type.highway.steps.bridge">Escaliers</string>
-	<string name="type.highway.steps.tunnel">Escaliers</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Rue</string>
-	<string name="type.highway.tertiary.bridge">Rue</string>
-	<string name="type.highway.tertiary.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Rue</string>
-	<string name="type.highway.tertiary_link.bridge">Rue</string>
-	<string name="type.highway.tertiary_link.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Piste</string>
 	<string name="type.highway.track.area">Piste</string>
-	<string name="type.highway.track.bridge">Piste</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Pont</string>
 	<string name="type.highway.track.grade1">Piste</string>
 	<string name="type.highway.track.grade2">Piste</string>
 	<string name="type.highway.track.grade3">Piste</string>
@@ -1007,18 +1044,25 @@
 	<string name="type.highway.track.grade5">Piste</string>
 	<string name="type.highway.track.no.access">Piste</string>
 	<string name="type.highway.track.permissive">Piste</string>
-	<string name="type.highway.track.tunnel">Piste</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Feux de circulation</string>
 	<string name="type.highway.trunk">Voie rapide</string>
-	<string name="type.highway.trunk.bridge">Voie rapide</string>
-	<string name="type.highway.trunk.tunnel">Voie rapide</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">Voie rapide</string>
-	<string name="type.highway.trunk_link.bridge">Voie rapide</string>
-	<string name="type.highway.trunk_link.tunnel">Voie rapide</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Rue</string>
 	<string name="type.highway.unclassified.area">Rue</string>
-	<string name="type.highway.unclassified.bridge">Rue</string>
-	<string name="type.highway.unclassified.tunnel">Rue</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Pont</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.cycleway">Piste cyclable</string>
 	<string name="type.area_highway.footway">Chemin</string>
 	<string name="type.area_highway.living_street">Zone de rencontre</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 55aed61291..202facb47a 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Térképek</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mérföld</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Saját helyzet</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Később</string>
@@ -875,34 +875,51 @@
 	<string name="type.healthcare.laboratory">Orvosi laboratórium</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Alagút</string>
 	<string name="type.highway.bus_stop">Buszmegálló</string>
 	<string name="type.highway.construction">Útépítés</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Alagút</string>
 	<string name="type.highway.footway">Ösvény</string>
 	<string name="type.highway.footway.alpine_hiking">Ösvény</string>
 	<string name="type.highway.footway.area">Ösvény</string>
-	<string name="type.highway.footway.bridge">Ösvény</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Híd</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Ösvény</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Ösvény</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Ösvény</string>
 	<string name="type.highway.footway.hiking">Ösvény</string>
 	<string name="type.highway.footway.mountain_hiking">Ösvény</string>
 	<string name="type.highway.footway.permissive">Ösvény</string>
-	<string name="type.highway.footway.tunnel">Ösvény</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Alagút</string>
 	<string name="type.highway.ford">Gázló</string>
 	<string name="type.highway.living_street">Utca</string>
-	<string name="type.highway.living_street.bridge">Utca</string>
-	<string name="type.highway.living_street.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Alagút</string>
 	<string name="type.highway.motorway">Utca</string>
-	<string name="type.highway.motorway.bridge">Utca</string>
-	<string name="type.highway.motorway.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Alagút</string>
 	<string name="type.highway.motorway_junction">Kijárat</string>
 	<string name="type.highway.motorway_link">Utca</string>
-	<string name="type.highway.motorway_link.bridge">Utca</string>
-	<string name="type.highway.motorway_link.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Alagút</string>
 	<string name="type.highway.path">Ösvény</string>
 	<string name="type.highway.path.alpine_hiking">Ösvény</string>
 	<string name="type.highway.path.bicycle">Ösvény</string>
-	<string name="type.highway.path.bridge">Ösvény</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Híd</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Ösvény</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Ösvény</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Ösvény</string>
@@ -910,51 +927,75 @@
 	<string name="type.highway.path.horse">Ösvény</string>
 	<string name="type.highway.path.mountain_hiking">Ösvény</string>
 	<string name="type.highway.path.permissive">Ösvény</string>
-	<string name="type.highway.path.tunnel">Ösvény</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Alagút</string>
 	<string name="type.highway.pedestrian">Utca</string>
 	<string name="type.highway.pedestrian.area">Utca</string>
-	<string name="type.highway.pedestrian.bridge">Utca</string>
-	<string name="type.highway.pedestrian.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Alagút</string>
 	<string name="type.highway.primary">Utca</string>
-	<string name="type.highway.primary.bridge">Utca</string>
-	<string name="type.highway.primary.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Alagút</string>
 	<string name="type.highway.primary_link">Utca</string>
-	<string name="type.highway.primary_link.bridge">Utca</string>
-	<string name="type.highway.primary_link.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Alagút</string>
 	<string name="type.highway.raceway">Versenypálya</string>
 	<string name="type.highway.residential">Utca</string>
 	<string name="type.highway.residential.area">Utca</string>
-	<string name="type.highway.residential.bridge">Utca</string>
-	<string name="type.highway.residential.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Alagút</string>
 	<string name="type.highway.rest_area">Pihenőzóna</string>
 	<string name="type.highway.road">Utca</string>
-	<string name="type.highway.road.bridge">Utca</string>
-	<string name="type.highway.road.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Alagút</string>
 	<string name="type.highway.secondary">Utca</string>
-	<string name="type.highway.secondary.bridge">Utca</string>
-	<string name="type.highway.secondary.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Alagút</string>
 	<string name="type.highway.secondary_link">Utca</string>
-	<string name="type.highway.secondary_link.bridge">Utca</string>
-	<string name="type.highway.secondary_link.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Alagút</string>
 	<string name="type.highway.service">Utca</string>
 	<string name="type.highway.service.area">Utca</string>
-	<string name="type.highway.service.bridge">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Híd</string>
 	<string name="type.highway.service.driveway">Utca</string>
 	<string name="type.highway.service.parking_aisle">Utca</string>
-	<string name="type.highway.service.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Alagút</string>
 	<string name="type.highway.speed_camera">Traffipax</string>
 	<string name="type.highway.steps">Ösvény</string>
-	<string name="type.highway.steps.bridge">Ösvény</string>
-	<string name="type.highway.steps.tunnel">Ösvény</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Alagút</string>
 	<string name="type.highway.tertiary">Utca</string>
-	<string name="type.highway.tertiary.bridge">Utca</string>
-	<string name="type.highway.tertiary.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Alagút</string>
 	<string name="type.highway.tertiary_link">Utca</string>
-	<string name="type.highway.tertiary_link.bridge">Utca</string>
-	<string name="type.highway.tertiary_link.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Alagút</string>
 	<string name="type.highway.track">Utca</string>
 	<string name="type.highway.track.area">Utca</string>
-	<string name="type.highway.track.bridge">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Híd</string>
 	<string name="type.highway.track.grade1">Utca</string>
 	<string name="type.highway.track.grade2">Utca</string>
 	<string name="type.highway.track.grade3">Utca</string>
@@ -962,18 +1003,25 @@
 	<string name="type.highway.track.grade5">Utca</string>
 	<string name="type.highway.track.no.access">Utca</string>
 	<string name="type.highway.track.permissive">Utca</string>
-	<string name="type.highway.track.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Alagút</string>
 	<string name="type.highway.traffic_signals">Közlekedési lámpák</string>
 	<string name="type.highway.trunk">Utca</string>
-	<string name="type.highway.trunk.bridge">Utca</string>
-	<string name="type.highway.trunk.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Alagút</string>
 	<string name="type.highway.trunk_link">Utca</string>
-	<string name="type.highway.trunk_link.bridge">Utca</string>
-	<string name="type.highway.trunk_link.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Alagút</string>
 	<string name="type.highway.unclassified">Utca</string>
 	<string name="type.highway.unclassified.area">Utca</string>
-	<string name="type.highway.unclassified.bridge">Utca</string>
-	<string name="type.highway.unclassified.tunnel">Utca</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Híd</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Alagút</string>
 	<string name="type.area_highway.footway">Ösvény</string>
 	<string name="type.area_highway.living_street">Utca</string>
 	<string name="type.area_highway.motorway">Utca</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 307b876f14..9f33114b75 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">MB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mil</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Posisi Saya</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Nanti</string>
@@ -872,34 +872,51 @@
 	<string name="type.healthcare.laboratory">Laboratorium medis</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Terowongan</string>
 	<string name="type.highway.bus_stop">Halte bus</string>
 	<string name="type.highway.construction">Jalan sedang dibangun</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Terowongan</string>
 	<string name="type.highway.footway">Jalur</string>
 	<string name="type.highway.footway.alpine_hiking">Jalur</string>
 	<string name="type.highway.footway.area">Jalur</string>
-	<string name="type.highway.footway.bridge">Jalur</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Menjembatani</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Jalur</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Jalur</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Jalur</string>
 	<string name="type.highway.footway.hiking">Jalur</string>
 	<string name="type.highway.footway.mountain_hiking">Jalur</string>
 	<string name="type.highway.footway.permissive">Jalur</string>
-	<string name="type.highway.footway.tunnel">Jalur</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Terowongan</string>
 	<string name="type.highway.ford">Menyeberang</string>
 	<string name="type.highway.living_street">Jalan</string>
-	<string name="type.highway.living_street.bridge">Jalan</string>
-	<string name="type.highway.living_street.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Terowongan</string>
 	<string name="type.highway.motorway">Jalan</string>
-	<string name="type.highway.motorway.bridge">Jalan</string>
-	<string name="type.highway.motorway.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Terowongan</string>
 	<string name="type.highway.motorway_junction">Keluar</string>
 	<string name="type.highway.motorway_link">Jalan</string>
-	<string name="type.highway.motorway_link.bridge">Jalan</string>
-	<string name="type.highway.motorway_link.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Terowongan</string>
 	<string name="type.highway.path">Jalur</string>
 	<string name="type.highway.path.alpine_hiking">Jalur</string>
 	<string name="type.highway.path.bicycle">Jalur</string>
-	<string name="type.highway.path.bridge">Jalur</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Menjembatani</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Jalur</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Jalur</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Jalur</string>
@@ -907,51 +924,75 @@
 	<string name="type.highway.path.horse">Jalur</string>
 	<string name="type.highway.path.mountain_hiking">Jalur</string>
 	<string name="type.highway.path.permissive">Jalur</string>
-	<string name="type.highway.path.tunnel">Jalur</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Terowongan</string>
 	<string name="type.highway.pedestrian">Jalan</string>
 	<string name="type.highway.pedestrian.area">Jalan</string>
-	<string name="type.highway.pedestrian.bridge">Jalan</string>
-	<string name="type.highway.pedestrian.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Terowongan</string>
 	<string name="type.highway.primary">Jalan</string>
-	<string name="type.highway.primary.bridge">Jalan</string>
-	<string name="type.highway.primary.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Terowongan</string>
 	<string name="type.highway.primary_link">Jalan</string>
-	<string name="type.highway.primary_link.bridge">Jalan</string>
-	<string name="type.highway.primary_link.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Terowongan</string>
 	<string name="type.highway.raceway">Lintasan balap</string>
 	<string name="type.highway.residential">Jalan</string>
 	<string name="type.highway.residential.area">Jalan</string>
-	<string name="type.highway.residential.bridge">Jalan</string>
-	<string name="type.highway.residential.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Terowongan</string>
 	<string name="type.highway.rest_area">Tempat istirahat</string>
 	<string name="type.highway.road">Jalan</string>
-	<string name="type.highway.road.bridge">Jalan</string>
-	<string name="type.highway.road.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Terowongan</string>
 	<string name="type.highway.secondary">Jalan</string>
-	<string name="type.highway.secondary.bridge">Jalan</string>
-	<string name="type.highway.secondary.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Terowongan</string>
 	<string name="type.highway.secondary_link">Jalan</string>
-	<string name="type.highway.secondary_link.bridge">Jalan</string>
-	<string name="type.highway.secondary_link.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Terowongan</string>
 	<string name="type.highway.service">Jalan</string>
 	<string name="type.highway.service.area">Jalan</string>
-	<string name="type.highway.service.bridge">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Menjembatani</string>
 	<string name="type.highway.service.driveway">Jalan</string>
 	<string name="type.highway.service.parking_aisle">Jalan</string>
-	<string name="type.highway.service.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Terowongan</string>
 	<string name="type.highway.speed_camera">Kamera Kecepatan</string>
 	<string name="type.highway.steps">Jalur</string>
-	<string name="type.highway.steps.bridge">Jalur</string>
-	<string name="type.highway.steps.tunnel">Jalur</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Terowongan</string>
 	<string name="type.highway.tertiary">Jalan</string>
-	<string name="type.highway.tertiary.bridge">Jalan</string>
-	<string name="type.highway.tertiary.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Terowongan</string>
 	<string name="type.highway.tertiary_link">Jalan</string>
-	<string name="type.highway.tertiary_link.bridge">Jalan</string>
-	<string name="type.highway.tertiary_link.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Terowongan</string>
 	<string name="type.highway.track">Jalan</string>
 	<string name="type.highway.track.area">Jalan</string>
-	<string name="type.highway.track.bridge">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Menjembatani</string>
 	<string name="type.highway.track.grade1">Jalan</string>
 	<string name="type.highway.track.grade2">Jalan</string>
 	<string name="type.highway.track.grade3">Jalan</string>
@@ -959,18 +1000,25 @@
 	<string name="type.highway.track.grade5">Jalan</string>
 	<string name="type.highway.track.no.access">Jalan</string>
 	<string name="type.highway.track.permissive">Jalan</string>
-	<string name="type.highway.track.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Terowongan</string>
 	<string name="type.highway.traffic_signals">Lampu lalu lintas</string>
 	<string name="type.highway.trunk">Jalan</string>
-	<string name="type.highway.trunk.bridge">Jalan</string>
-	<string name="type.highway.trunk.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Terowongan</string>
 	<string name="type.highway.trunk_link">Jalan</string>
-	<string name="type.highway.trunk_link.bridge">Jalan</string>
-	<string name="type.highway.trunk_link.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Terowongan</string>
 	<string name="type.highway.unclassified">Jalan</string>
 	<string name="type.highway.unclassified.area">Jalan</string>
-	<string name="type.highway.unclassified.bridge">Jalan</string>
-	<string name="type.highway.unclassified.tunnel">Jalan</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Menjembatani</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Terowongan</string>
 	<string name="type.area_highway.footway">Jalur</string>
 	<string name="type.area_highway.living_street">Jalan</string>
 	<string name="type.area_highway.motorway">Jalan</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index cf0258d279..06b6a79ac0 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mappe</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Miglia</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">La mia posizione</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Più tardi</string>
@@ -899,33 +899,50 @@
 	<string name="type.healthcare.laboratory">Laboratorio Medico</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Fermata</string>
 	<string name="type.highway.construction">Strada in costruzione</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.footway">Sentiero</string>
 	<string name="type.highway.footway.alpine_hiking">Sentiero</string>
 	<string name="type.highway.footway.area">Sentiero</string>
-	<string name="type.highway.footway.bridge">Sentiero</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Ponte</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Sentiero</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Sentiero</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Sentiero</string>
 	<string name="type.highway.footway.hiking">Sentiero</string>
 	<string name="type.highway.footway.mountain_hiking">Sentiero</string>
 	<string name="type.highway.footway.permissive">Sentiero</string>
-	<string name="type.highway.footway.tunnel">Sentiero</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Guado</string>
 	<string name="type.highway.living_street">Via</string>
-	<string name="type.highway.living_street.bridge">Via</string>
-	<string name="type.highway.living_street.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Via</string>
-	<string name="type.highway.motorway.bridge">Via</string>
-	<string name="type.highway.motorway.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunnel</string>
 	<string name="type.highway.motorway_link">Via</string>
-	<string name="type.highway.motorway_link.bridge">Via</string>
-	<string name="type.highway.motorway_link.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sentiero</string>
 	<string name="type.highway.path.alpine_hiking">Sentiero</string>
 	<string name="type.highway.path.bicycle">Sentiero</string>
-	<string name="type.highway.path.bridge">Sentiero</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Ponte</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Sentiero</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Sentiero</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Sentiero</string>
@@ -933,51 +950,75 @@
 	<string name="type.highway.path.horse">Sentiero</string>
 	<string name="type.highway.path.mountain_hiking">Sentiero</string>
 	<string name="type.highway.path.permissive">Sentiero</string>
-	<string name="type.highway.path.tunnel">Sentiero</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Via</string>
 	<string name="type.highway.pedestrian.area">Via</string>
-	<string name="type.highway.pedestrian.bridge">Via</string>
-	<string name="type.highway.pedestrian.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
 	<string name="type.highway.primary">Via</string>
-	<string name="type.highway.primary.bridge">Via</string>
-	<string name="type.highway.primary.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Via</string>
-	<string name="type.highway.primary_link.bridge">Via</string>
-	<string name="type.highway.primary_link.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Pista</string>
 	<string name="type.highway.residential">Via</string>
 	<string name="type.highway.residential.area">Via</string>
-	<string name="type.highway.residential.bridge">Via</string>
-	<string name="type.highway.residential.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Area di sosta</string>
 	<string name="type.highway.road">Via</string>
-	<string name="type.highway.road.bridge">Via</string>
-	<string name="type.highway.road.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Via</string>
-	<string name="type.highway.secondary.bridge">Via</string>
-	<string name="type.highway.secondary.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Via</string>
-	<string name="type.highway.secondary_link.bridge">Via</string>
-	<string name="type.highway.secondary_link.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Via</string>
 	<string name="type.highway.service.area">Via</string>
-	<string name="type.highway.service.bridge">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Ponte</string>
 	<string name="type.highway.service.driveway">Via</string>
 	<string name="type.highway.service.parking_aisle">Via</string>
-	<string name="type.highway.service.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Autovelox</string>
 	<string name="type.highway.steps">Sentiero</string>
-	<string name="type.highway.steps.bridge">Sentiero</string>
-	<string name="type.highway.steps.tunnel">Sentiero</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Via</string>
-	<string name="type.highway.tertiary.bridge">Via</string>
-	<string name="type.highway.tertiary.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Via</string>
-	<string name="type.highway.tertiary_link.bridge">Via</string>
-	<string name="type.highway.tertiary_link.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Via</string>
 	<string name="type.highway.track.area">Via</string>
-	<string name="type.highway.track.bridge">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Ponte</string>
 	<string name="type.highway.track.grade1">Via</string>
 	<string name="type.highway.track.grade2">Via</string>
 	<string name="type.highway.track.grade3">Via</string>
@@ -985,18 +1026,25 @@
 	<string name="type.highway.track.grade5">Via</string>
 	<string name="type.highway.track.no.access">Via</string>
 	<string name="type.highway.track.permissive">Via</string>
-	<string name="type.highway.track.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Semaforo</string>
 	<string name="type.highway.trunk">Via</string>
-	<string name="type.highway.trunk.bridge">Via</string>
-	<string name="type.highway.trunk.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">Via</string>
-	<string name="type.highway.trunk_link.bridge">Via</string>
-	<string name="type.highway.trunk_link.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Via</string>
 	<string name="type.highway.unclassified.area">Via</string>
-	<string name="type.highway.unclassified.bridge">Via</string>
-	<string name="type.highway.unclassified.tunnel">Via</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.footway">Sentiero</string>
 	<string name="type.area_highway.living_street">Via</string>
 	<string name="type.area_highway.motorway">Via</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 6220593c7f..1406b3c3db 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">מפות</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">מ\"ב</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">מיקומי</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">מאוחר יותר</string>
@@ -310,6 +310,96 @@
 	<string name="type.cuisine.vietnamese">מטבח וייטנאמי</string>
 	<string name="type.healthcare.laboratory">תיאופר הדבעמ</string>
 
+	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">מִנהָרָה</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">לְגַשֵׁר</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">מִנהָרָה</string>
+
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">אגן מים</string>
 	<string name="type.leisure.picnic_table">קינקיפ ןחלוש</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index a69bb6a2aa..ad30cc32fc 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">マップ</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">マイル</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">現在地</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">次の機会に</string>
@@ -909,41 +909,54 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">道路</string>
 	<string name="type.highway.bridleway">馬道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.bridleway.bridge">馬道(橋)</string>
 	<string name="type.highway.bridleway.permissive">馬道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">馬道(トンネル)</string>
 	<string name="type.highway.bus_stop">バス停</string>
 	<string name="type.highway.construction">工事中の道路</string>
 	<string name="type.highway.cycleway">自転車道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.cycleway.bridge">自転車道(橋)</string>
 	<string name="type.highway.cycleway.permissive">自転車道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.cycleway.tunnel">自転車道(トンネル)</string>
 	<string name="type.highway.footway">歩道</string>
 	<string name="type.highway.footway.alpine_hiking">歩道</string>
 	<string name="type.highway.footway.area">歩道</string>
-	<string name="type.highway.footway.bridge">歩道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">橋</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">歩道</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">歩道</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">歩道</string>
 	<string name="type.highway.footway.hiking">歩道</string>
 	<string name="type.highway.footway.mountain_hiking">歩道</string>
 	<string name="type.highway.footway.permissive">歩道</string>
-	<string name="type.highway.footway.tunnel">歩道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">トンネル</string>
 	<string name="type.highway.ford">浅瀬</string>
 	<string name="type.highway.living_street">ストリート</string>
-	<string name="type.highway.living_street.bridge">ストリート</string>
-	<string name="type.highway.living_street.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">トンネル</string>
 	<string name="type.highway.motorway">ストリート</string>
-	<string name="type.highway.motorway.bridge">ストリート</string>
-	<string name="type.highway.motorway.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">トンネル</string>
 	<string name="type.highway.motorway_junction">ジャンクション</string>
 	<string name="type.highway.motorway_link">ストリート</string>
-	<string name="type.highway.motorway_link.bridge">ストリート</string>
-	<string name="type.highway.motorway_link.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">トンネル</string>
 	<string name="type.highway.path">歩道</string>
 	<string name="type.highway.path.alpine_hiking">歩道</string>
 	<string name="type.highway.path.bicycle">歩道</string>
-	<string name="type.highway.path.bridge">歩道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">橋</string>
 	<string name="type.highway.path.demanding_alpine_hiking">歩道</string>
 	<string name="type.highway.path.demanding_mountain_hiking">歩道</string>
 	<string name="type.highway.path.difficult_alpine_hiking">歩道</string>
@@ -951,52 +964,76 @@
 	<string name="type.highway.path.horse">歩道</string>
 	<string name="type.highway.path.mountain_hiking">歩道</string>
 	<string name="type.highway.path.permissive">歩道</string>
-	<string name="type.highway.path.tunnel">歩道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">トンネル</string>
 	<string name="type.highway.pedestrian">ストリート</string>
 	<string name="type.highway.pedestrian.area">ストリート</string>
-	<string name="type.highway.pedestrian.bridge">ストリート</string>
-	<string name="type.highway.pedestrian.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">トンネル</string>
 	<string name="type.highway.primary">ストリート</string>
-	<string name="type.highway.primary.bridge">ストリート</string>
-	<string name="type.highway.primary.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">トンネル</string>
 	<string name="type.highway.primary_link">ストリート</string>
-	<string name="type.highway.primary_link.bridge">ストリート</string>
-	<string name="type.highway.primary_link.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">トンネル</string>
 	<string name="type.highway.raceway">レース場</string>
 	<string name="type.highway.residential">ストリート</string>
 	<string name="type.highway.residential.area">ストリート</string>
-	<string name="type.highway.residential.bridge">ストリート</string>
-	<string name="type.highway.residential.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">トンネル</string>
 	<string name="type.highway.rest_area">休憩所</string>
 	<string name="type.highway.road">ストリート</string>
-	<string name="type.highway.road.bridge">ストリート</string>
-	<string name="type.highway.road.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">トンネル</string>
 	<string name="type.highway.secondary">ストリート</string>
-	<string name="type.highway.secondary.bridge">ストリート</string>
-	<string name="type.highway.secondary.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">トンネル</string>
 	<string name="type.highway.secondary_link">ストリート</string>
-	<string name="type.highway.secondary_link.bridge">ストリート</string>
-	<string name="type.highway.secondary_link.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">トンネル</string>
 	<string name="type.highway.service">ストリート</string>
 	<string name="type.highway.service.area">ストリート</string>
-	<string name="type.highway.service.bridge">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">橋</string>
 	<string name="type.highway.service.driveway">ストリート</string>
 	<string name="type.highway.service.parking_aisle">ストリート</string>
-	<string name="type.highway.service.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">トンネル</string>
 	<string name="type.highway.services">サービスエリア</string>
 	<string name="type.highway.speed_camera">自動速度違反取締装置</string>
 	<string name="type.highway.steps">歩道</string>
-	<string name="type.highway.steps.bridge">歩道</string>
-	<string name="type.highway.steps.tunnel">歩道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">トンネル</string>
 	<string name="type.highway.tertiary">ストリート</string>
-	<string name="type.highway.tertiary.bridge">ストリート</string>
-	<string name="type.highway.tertiary.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">トンネル</string>
 	<string name="type.highway.tertiary_link">ストリート</string>
-	<string name="type.highway.tertiary_link.bridge">ストリート</string>
-	<string name="type.highway.tertiary_link.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">トンネル</string>
 	<string name="type.highway.track">ストリート</string>
 	<string name="type.highway.track.area">ストリート</string>
-	<string name="type.highway.track.bridge">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">橋</string>
 	<string name="type.highway.track.grade1">ストリート</string>
 	<string name="type.highway.track.grade2">ストリート</string>
 	<string name="type.highway.track.grade3">ストリート</string>
@@ -1004,18 +1041,25 @@
 	<string name="type.highway.track.grade5">ストリート</string>
 	<string name="type.highway.track.no.access">ストリート</string>
 	<string name="type.highway.track.permissive">ストリート</string>
-	<string name="type.highway.track.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">トンネル</string>
 	<string name="type.highway.traffic_signals">交通信号</string>
 	<string name="type.highway.trunk">ストリート</string>
-	<string name="type.highway.trunk.bridge">ストリート</string>
-	<string name="type.highway.trunk.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">トンネル</string>
 	<string name="type.highway.trunk_link">ストリート</string>
-	<string name="type.highway.trunk_link.bridge">ストリート</string>
-	<string name="type.highway.trunk_link.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">トンネル</string>
 	<string name="type.highway.unclassified">ストリート</string>
 	<string name="type.highway.unclassified.area">ストリート</string>
-	<string name="type.highway.unclassified.bridge">ストリート</string>
-	<string name="type.highway.unclassified.tunnel">ストリート</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">トンネル</string>
 	<string name="type.area_highway.cycleway">自転車道</string>
 	<string name="type.area_highway.footway">歩道</string>
 	<string name="type.area_highway.living_street">ストリート</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index df303ba4eb..ba44425b92 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">지도</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">마일</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">나의 위치</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">후</string>
@@ -875,33 +875,50 @@
 	<string name="type.healthcare.laboratory">의료 연구실</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">터널</string>
 	<string name="type.highway.bus_stop">버스 정류장</string>
 	<string name="type.highway.construction">공사 중 도로</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">터널</string>
 	<string name="type.highway.footway">길</string>
 	<string name="type.highway.footway.alpine_hiking">길</string>
 	<string name="type.highway.footway.area">길</string>
-	<string name="type.highway.footway.bridge">길</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">다리</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">길</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">길</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">길</string>
 	<string name="type.highway.footway.hiking">길</string>
 	<string name="type.highway.footway.mountain_hiking">길</string>
 	<string name="type.highway.footway.permissive">길</string>
-	<string name="type.highway.footway.tunnel">길</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">터널</string>
 	<string name="type.highway.ford">여울</string>
 	<string name="type.highway.living_street">거리</string>
-	<string name="type.highway.living_street.bridge">거리</string>
-	<string name="type.highway.living_street.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">터널</string>
 	<string name="type.highway.motorway">거리</string>
-	<string name="type.highway.motorway.bridge">거리</string>
-	<string name="type.highway.motorway.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">터널</string>
 	<string name="type.highway.motorway_link">거리</string>
-	<string name="type.highway.motorway_link.bridge">거리</string>
-	<string name="type.highway.motorway_link.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">터널</string>
 	<string name="type.highway.path">길</string>
 	<string name="type.highway.path.alpine_hiking">길</string>
 	<string name="type.highway.path.bicycle">길</string>
-	<string name="type.highway.path.bridge">길</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">다리</string>
 	<string name="type.highway.path.demanding_alpine_hiking">길</string>
 	<string name="type.highway.path.demanding_mountain_hiking">길</string>
 	<string name="type.highway.path.difficult_alpine_hiking">길</string>
@@ -909,51 +926,75 @@
 	<string name="type.highway.path.horse">길</string>
 	<string name="type.highway.path.mountain_hiking">길</string>
 	<string name="type.highway.path.permissive">길</string>
-	<string name="type.highway.path.tunnel">길</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">터널</string>
 	<string name="type.highway.pedestrian">거리</string>
 	<string name="type.highway.pedestrian.area">거리</string>
-	<string name="type.highway.pedestrian.bridge">거리</string>
-	<string name="type.highway.pedestrian.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">터널</string>
 	<string name="type.highway.primary">거리</string>
-	<string name="type.highway.primary.bridge">거리</string>
-	<string name="type.highway.primary.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">터널</string>
 	<string name="type.highway.primary_link">거리</string>
-	<string name="type.highway.primary_link.bridge">거리</string>
-	<string name="type.highway.primary_link.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">터널</string>
 	<string name="type.highway.raceway">경마장</string>
 	<string name="type.highway.residential">거리</string>
 	<string name="type.highway.residential.area">거리</string>
-	<string name="type.highway.residential.bridge">거리</string>
-	<string name="type.highway.residential.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">터널</string>
 	<string name="type.highway.rest_area">휴게소</string>
 	<string name="type.highway.road">거리</string>
-	<string name="type.highway.road.bridge">거리</string>
-	<string name="type.highway.road.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">터널</string>
 	<string name="type.highway.secondary">거리</string>
-	<string name="type.highway.secondary.bridge">거리</string>
-	<string name="type.highway.secondary.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">터널</string>
 	<string name="type.highway.secondary_link">거리</string>
-	<string name="type.highway.secondary_link.bridge">거리</string>
-	<string name="type.highway.secondary_link.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">터널</string>
 	<string name="type.highway.service">거리</string>
 	<string name="type.highway.service.area">거리</string>
-	<string name="type.highway.service.bridge">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">다리</string>
 	<string name="type.highway.service.driveway">거리</string>
 	<string name="type.highway.service.parking_aisle">거리</string>
-	<string name="type.highway.service.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">터널</string>
 	<string name="type.highway.speed_camera">스피드 카메라</string>
 	<string name="type.highway.steps">길</string>
-	<string name="type.highway.steps.bridge">길</string>
-	<string name="type.highway.steps.tunnel">길</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">터널</string>
 	<string name="type.highway.tertiary">거리</string>
-	<string name="type.highway.tertiary.bridge">거리</string>
-	<string name="type.highway.tertiary.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">터널</string>
 	<string name="type.highway.tertiary_link">거리</string>
-	<string name="type.highway.tertiary_link.bridge">거리</string>
-	<string name="type.highway.tertiary_link.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">터널</string>
 	<string name="type.highway.track">거리</string>
 	<string name="type.highway.track.area">거리</string>
-	<string name="type.highway.track.bridge">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">다리</string>
 	<string name="type.highway.track.grade1">거리</string>
 	<string name="type.highway.track.grade2">거리</string>
 	<string name="type.highway.track.grade3">거리</string>
@@ -961,18 +1002,25 @@
 	<string name="type.highway.track.grade5">거리</string>
 	<string name="type.highway.track.no.access">거리</string>
 	<string name="type.highway.track.permissive">거리</string>
-	<string name="type.highway.track.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">터널</string>
 	<string name="type.highway.traffic_signals">신호등</string>
 	<string name="type.highway.trunk">거리</string>
-	<string name="type.highway.trunk.bridge">거리</string>
-	<string name="type.highway.trunk.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">터널</string>
 	<string name="type.highway.trunk_link">거리</string>
-	<string name="type.highway.trunk_link.bridge">거리</string>
-	<string name="type.highway.trunk_link.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">터널</string>
 	<string name="type.highway.unclassified">거리</string>
 	<string name="type.highway.unclassified.area">거리</string>
-	<string name="type.highway.unclassified.bridge">거리</string>
-	<string name="type.highway.unclassified.tunnel">거리</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">다리</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">터널</string>
 	<string name="type.area_highway.footway">길</string>
 	<string name="type.area_highway.living_street">거리</string>
 	<string name="type.area_highway.motorway">거리</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index b83a58385e..00bf24601d 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">MB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Miles</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Min posisjon</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senere</string>
@@ -872,34 +872,51 @@
 	<string name="type.healthcare.laboratory">Medisinsk laboratorium</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Busstopp</string>
 	<string name="type.highway.construction">Veikonstruksjon</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.footway">Sti</string>
 	<string name="type.highway.footway.alpine_hiking">Sti</string>
 	<string name="type.highway.footway.area">Sti</string>
-	<string name="type.highway.footway.bridge">Sti</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Bridge</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Sti</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Sti</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Sti</string>
 	<string name="type.highway.footway.hiking">Sti</string>
 	<string name="type.highway.footway.mountain_hiking">Sti</string>
 	<string name="type.highway.footway.permissive">Sti</string>
-	<string name="type.highway.footway.tunnel">Sti</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadested</string>
 	<string name="type.highway.living_street">Gate</string>
-	<string name="type.highway.living_street.bridge">Gate</string>
-	<string name="type.highway.living_street.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Gate</string>
-	<string name="type.highway.motorway.bridge">Gate</string>
-	<string name="type.highway.motorway.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunnel</string>
 	<string name="type.highway.motorway_junction">Utgang</string>
 	<string name="type.highway.motorway_link">Gate</string>
-	<string name="type.highway.motorway_link.bridge">Gate</string>
-	<string name="type.highway.motorway_link.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sti</string>
 	<string name="type.highway.path.alpine_hiking">Sti</string>
 	<string name="type.highway.path.bicycle">Sti</string>
-	<string name="type.highway.path.bridge">Sti</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Bridge</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Sti</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Sti</string>
@@ -907,51 +924,75 @@
 	<string name="type.highway.path.horse">Sti</string>
 	<string name="type.highway.path.mountain_hiking">Sti</string>
 	<string name="type.highway.path.permissive">Sti</string>
-	<string name="type.highway.path.tunnel">Sti</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Gate</string>
 	<string name="type.highway.pedestrian.area">Gate</string>
-	<string name="type.highway.pedestrian.bridge">Gate</string>
-	<string name="type.highway.pedestrian.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
 	<string name="type.highway.primary">Gate</string>
-	<string name="type.highway.primary.bridge">Gate</string>
-	<string name="type.highway.primary.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Gate</string>
-	<string name="type.highway.primary_link.bridge">Gate</string>
-	<string name="type.highway.primary_link.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Løpebane</string>
 	<string name="type.highway.residential">Gate</string>
 	<string name="type.highway.residential.area">Gate</string>
-	<string name="type.highway.residential.bridge">Gate</string>
-	<string name="type.highway.residential.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Rasteplass</string>
 	<string name="type.highway.road">Gate</string>
-	<string name="type.highway.road.bridge">Gate</string>
-	<string name="type.highway.road.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Gate</string>
-	<string name="type.highway.secondary.bridge">Gate</string>
-	<string name="type.highway.secondary.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Gate</string>
-	<string name="type.highway.secondary_link.bridge">Gate</string>
-	<string name="type.highway.secondary_link.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Gate</string>
 	<string name="type.highway.service.area">Gate</string>
-	<string name="type.highway.service.bridge">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Bridge</string>
 	<string name="type.highway.service.driveway">Gate</string>
 	<string name="type.highway.service.parking_aisle">Gate</string>
-	<string name="type.highway.service.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Fotoboks</string>
 	<string name="type.highway.steps">Sti</string>
-	<string name="type.highway.steps.bridge">Sti</string>
-	<string name="type.highway.steps.tunnel">Sti</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Gate</string>
-	<string name="type.highway.tertiary.bridge">Gate</string>
-	<string name="type.highway.tertiary.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Gate</string>
-	<string name="type.highway.tertiary_link.bridge">Gate</string>
-	<string name="type.highway.tertiary_link.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Gate</string>
 	<string name="type.highway.track.area">Gate</string>
-	<string name="type.highway.track.bridge">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Bridge</string>
 	<string name="type.highway.track.grade1">Gate</string>
 	<string name="type.highway.track.grade2">Gate</string>
 	<string name="type.highway.track.grade3">Gate</string>
@@ -959,18 +1000,25 @@
 	<string name="type.highway.track.grade5">Gate</string>
 	<string name="type.highway.track.no.access">Gate</string>
 	<string name="type.highway.track.permissive">Gate</string>
-	<string name="type.highway.track.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafikklys</string>
 	<string name="type.highway.trunk">Gate</string>
-	<string name="type.highway.trunk.bridge">Gate</string>
-	<string name="type.highway.trunk.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">Gate</string>
-	<string name="type.highway.trunk_link.bridge">Gate</string>
-	<string name="type.highway.trunk_link.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Gate</string>
 	<string name="type.highway.unclassified.area">Gate</string>
-	<string name="type.highway.unclassified.bridge">Gate</string>
-	<string name="type.highway.unclassified.tunnel">Gate</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.footway">Sti</string>
 	<string name="type.area_highway.living_street">Gate</string>
 	<string name="type.area_highway.motorway">Gate</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index b03d1b7871..0861ac92ce 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Kaarten</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mijlen</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Mijn locatie</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Zoeken</string>
@@ -869,34 +869,51 @@
 	<string name="type.healthcare.laboratory">Medisch laboratorium</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Bushalte</string>
 	<string name="type.highway.construction">Baan in aanbouw</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.footway">Pad</string>
 	<string name="type.highway.footway.alpine_hiking">Pad</string>
 	<string name="type.highway.footway.area">Pad</string>
-	<string name="type.highway.footway.bridge">Pad</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Brug</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Pad</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Pad</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Pad</string>
 	<string name="type.highway.footway.hiking">Pad</string>
 	<string name="type.highway.footway.mountain_hiking">Pad</string>
 	<string name="type.highway.footway.permissive">Pad</string>
-	<string name="type.highway.footway.tunnel">Pad</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Voorde</string>
 	<string name="type.highway.living_street">Straat</string>
-	<string name="type.highway.living_street.bridge">Straat</string>
-	<string name="type.highway.living_street.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Straat</string>
-	<string name="type.highway.motorway.bridge">Straat</string>
-	<string name="type.highway.motorway.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunnel</string>
 	<string name="type.highway.motorway_junction">Afrit</string>
 	<string name="type.highway.motorway_link">Straat</string>
-	<string name="type.highway.motorway_link.bridge">Straat</string>
-	<string name="type.highway.motorway_link.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Pad</string>
 	<string name="type.highway.path.alpine_hiking">Pad</string>
 	<string name="type.highway.path.bicycle">Pad</string>
-	<string name="type.highway.path.bridge">Pad</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Brug</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Pad</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Pad</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Pad</string>
@@ -904,51 +921,75 @@
 	<string name="type.highway.path.horse">Pad</string>
 	<string name="type.highway.path.mountain_hiking">Pad</string>
 	<string name="type.highway.path.permissive">Pad</string>
-	<string name="type.highway.path.tunnel">Pad</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Straat</string>
 	<string name="type.highway.pedestrian.area">Straat</string>
-	<string name="type.highway.pedestrian.bridge">Straat</string>
-	<string name="type.highway.pedestrian.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
 	<string name="type.highway.primary">Straat</string>
-	<string name="type.highway.primary.bridge">Straat</string>
-	<string name="type.highway.primary.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Straat</string>
-	<string name="type.highway.primary_link.bridge">Straat</string>
-	<string name="type.highway.primary_link.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Racebaan</string>
 	<string name="type.highway.residential">Straat</string>
 	<string name="type.highway.residential.area">Straat</string>
-	<string name="type.highway.residential.bridge">Straat</string>
-	<string name="type.highway.residential.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Parkeerplaats</string>
 	<string name="type.highway.road">Straat</string>
-	<string name="type.highway.road.bridge">Straat</string>
-	<string name="type.highway.road.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Straat</string>
-	<string name="type.highway.secondary.bridge">Straat</string>
-	<string name="type.highway.secondary.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Straat</string>
-	<string name="type.highway.secondary_link.bridge">Straat</string>
-	<string name="type.highway.secondary_link.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Straat</string>
 	<string name="type.highway.service.area">Straat</string>
-	<string name="type.highway.service.bridge">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Brug</string>
 	<string name="type.highway.service.driveway">Straat</string>
 	<string name="type.highway.service.parking_aisle">Straat</string>
-	<string name="type.highway.service.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Flitspaal</string>
 	<string name="type.highway.steps">Pad</string>
-	<string name="type.highway.steps.bridge">Pad</string>
-	<string name="type.highway.steps.tunnel">Pad</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Straat</string>
-	<string name="type.highway.tertiary.bridge">Straat</string>
-	<string name="type.highway.tertiary.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Straat</string>
-	<string name="type.highway.tertiary_link.bridge">Straat</string>
-	<string name="type.highway.tertiary_link.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Straat</string>
 	<string name="type.highway.track.area">Straat</string>
-	<string name="type.highway.track.bridge">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Brug</string>
 	<string name="type.highway.track.grade1">Straat</string>
 	<string name="type.highway.track.grade2">Straat</string>
 	<string name="type.highway.track.grade3">Straat</string>
@@ -956,18 +997,25 @@
 	<string name="type.highway.track.grade5">Straat</string>
 	<string name="type.highway.track.no.access">Straat</string>
 	<string name="type.highway.track.permissive">Straat</string>
-	<string name="type.highway.track.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Verkeerslichten</string>
 	<string name="type.highway.trunk">Straat</string>
-	<string name="type.highway.trunk.bridge">Straat</string>
-	<string name="type.highway.trunk.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">Straat</string>
-	<string name="type.highway.trunk_link.bridge">Straat</string>
-	<string name="type.highway.trunk_link.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Straat</string>
 	<string name="type.highway.unclassified.area">Straat</string>
-	<string name="type.highway.unclassified.bridge">Straat</string>
-	<string name="type.highway.unclassified.tunnel">Straat</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Brug</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.footway">Pad</string>
 	<string name="type.area_highway.living_street">Straat</string>
 	<string name="type.area_highway.motorway">Straat</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 09f2b03c7e..7e587225e0 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mapy</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mile</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Moje położenie</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Później</string>
@@ -937,18 +937,23 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Droga</string>
 	<string name="type.highway.bridleway">Droga dla koni</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.bridleway.bridge">Most drogowy dla koni</string>
 	<string name="type.highway.bridleway.permissive">Droga dla koni ograniczona</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">Tunel drogowy dla koni</string>
 	<string name="type.highway.bus_stop">Przystanek autobusowy</string>
 	<string name="type.highway.construction">Droga w trakcie budowy</string>
 	<string name="type.highway.cycleway">Droga rowerowa</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.cycleway.bridge">Most drogowy dla rowerów</string>
 	<string name="type.highway.cycleway.permissive">Droga rowerowa ograniczona</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.cycleway.tunnel">Tunel drogowy dla rowerów</string>
 	<string name="type.highway.footway">Chodnik</string>
 	<string name="type.highway.footway.alpine_hiking">Ścieżka wspinaczkowa</string>
 	<string name="type.highway.footway.area">Obszar chodnika</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Most dla pieszych</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Ścieżka</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Ścieżka</string>
@@ -956,22 +961,30 @@
 	<string name="type.highway.footway.hiking">Ścieżka</string>
 	<string name="type.highway.footway.mountain_hiking">Ścieżka</string>
 	<string name="type.highway.footway.permissive">Chodnik</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel dla pieszych</string>
 	<string name="type.highway.ford">Bród</string>
 	<string name="type.highway.living_street">Ulica w strefie zamieszkania</string>
-	<string name="type.highway.living_street.bridge">Ulica w strefie zamieszkania</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Tunel ulicy</string>
 	<string name="type.highway.motorway">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway.bridge">Most drogowy</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway.tunnel">Tunel drogowy</string>
 	<string name="type.highway.motorway_junction">Wyjazd</string>
 	<string name="type.highway.motorway_link">Ulica</string>
-	<string name="type.highway.motorway_link.bridge">Ulica</string>
-	<string name="type.highway.motorway_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Ścieżka</string>
 	<string name="type.highway.path.alpine_hiking">Ścieżka wspinaczkowa</string>
 	<string name="type.highway.path.bicycle">Ścieżka dla rowerów</string>
-	<string name="type.highway.path.bridge">Ścieżka</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Most</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Ścieżka</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Ścieżka</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Ścieżka</string>
@@ -979,52 +992,76 @@
 	<string name="type.highway.path.horse">Ścieżka</string>
 	<string name="type.highway.path.mountain_hiking">Ścieżka</string>
 	<string name="type.highway.path.permissive">Ścieżka</string>
-	<string name="type.highway.path.tunnel">Ścieżka</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Pasaż pieszy</string>
 	<string name="type.highway.pedestrian.area">Pasaż pieszy</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.pedestrian.bridge">Most pasażu pieszego</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.pedestrian.tunnel">Tunel pasażu pieszego</string>
 	<string name="type.highway.primary">Ulica</string>
-	<string name="type.highway.primary.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary.tunnel">Tunel drogowy</string>
 	<string name="type.highway.primary_link">Ulica</string>
-	<string name="type.highway.primary_link.bridge">Ulica</string>
-	<string name="type.highway.primary_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunel</string>
 	<string name="type.highway.raceway">Tor wyścigowy</string>
 	<string name="type.highway.residential">Ulica</string>
 	<string name="type.highway.residential.area">Ulica</string>
-	<string name="type.highway.residential.bridge">Ulica</string>
-	<string name="type.highway.residential.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunel</string>
 	<string name="type.highway.rest_area">Miejsce wypoczynku</string>
 	<string name="type.highway.road">Ulica</string>
-	<string name="type.highway.road.bridge">Ulica</string>
-	<string name="type.highway.road.tunnel">Tunel drogowy</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunel</string>
 	<string name="type.highway.secondary">Ulica</string>
-	<string name="type.highway.secondary.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary.tunnel">Tunel drogowy</string>
 	<string name="type.highway.secondary_link">Ulica</string>
-	<string name="type.highway.secondary_link.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary_link.tunnel">Tunel drogowy</string>
 	<string name="type.highway.service">Ulica</string>
 	<string name="type.highway.service.area">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.service.bridge">Most drogowy</string>
 	<string name="type.highway.service.driveway">Ulica</string>
 	<string name="type.highway.service.parking_aisle">Miejsca parkingowe</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.service.tunnel">Tunel drogowy</string>
 	<string name="type.highway.services">Miejsce obsługi podróżnych</string>
 	<string name="type.highway.speed_camera">Fotoradar</string>
 	<string name="type.highway.steps">Schody</string>
-	<string name="type.highway.steps.bridge">Schody</string>
-	<string name="type.highway.steps.tunnel">Schody</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunel</string>
 	<string name="type.highway.tertiary">Ulica</string>
-	<string name="type.highway.tertiary.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary.tunnel">Tunel drogowy</string>
 	<string name="type.highway.tertiary_link">Ulica</string>
-	<string name="type.highway.tertiary_link.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary_link.tunnel">Tunel drogowy</string>
 	<string name="type.highway.track">Ulica</string>
 	<string name="type.highway.track.area">Ulica</string>
-	<string name="type.highway.track.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Most</string>
 	<string name="type.highway.track.grade1">Ulica</string>
 	<string name="type.highway.track.grade2">Ulica</string>
 	<string name="type.highway.track.grade3">Ulica</string>
@@ -1032,17 +1069,24 @@
 	<string name="type.highway.track.grade5">Ulica</string>
 	<string name="type.highway.track.no.access">Ulica</string>
 	<string name="type.highway.track.permissive">Ulica</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel drogowy</string>
 	<string name="type.highway.traffic_signals">Sygnalizacja świetlna</string>
 	<string name="type.highway.trunk">Ulica</string>
-	<string name="type.highway.trunk.bridge">Ulica</string>
-	<string name="type.highway.trunk.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunel</string>
 	<string name="type.highway.trunk_link">Ulica</string>
-	<string name="type.highway.trunk_link.bridge">Ulica</string>
-	<string name="type.highway.trunk_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunel</string>
 	<string name="type.highway.unclassified">Ulica</string>
 	<string name="type.highway.unclassified.area">Ulica</string>
-	<string name="type.highway.unclassified.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.unclassified.tunnel">Tunel drogowy</string>
 	<string name="type.area_highway.cycleway">Droga rowerowa</string>
 	<string name="type.area_highway.footway">Chodnik</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 2f335ce282..675e7cecff 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mapas</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Milhas</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Minha posição</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mais tarde</string>
@@ -934,41 +934,54 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Rodovia</string>
 	<string name="type.highway.bridleway">Caminho para cavaleiros</string>
-	<string name="type.highway.bridleway.bridge">Caminho para cavaleiros</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Ponte</string>
 	<string name="type.highway.bridleway.permissive">Caminho para cavaleiros</string>
-	<string name="type.highway.bridleway.tunnel">Caminho para cavaleiros</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Túnel</string>
 	<string name="type.highway.bus_stop">Ponto de ônibus</string>
 	<string name="type.highway.construction">Pista em construção</string>
 	<string name="type.highway.cycleway">Ciclovia</string>
-	<string name="type.highway.cycleway.bridge">Ciclovia</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Ponte</string>
 	<string name="type.highway.cycleway.permissive">Ciclovia</string>
-	<string name="type.highway.cycleway.tunnel">Ciclovia</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Túnel</string>
 	<string name="type.highway.footway">Caminho pedonal</string>
 	<string name="type.highway.footway.alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.area">Caminho pedonal</string>
-	<string name="type.highway.footway.bridge">Caminho pedonal</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Ponte</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.mountain_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.permissive">Caminho pedonal</string>
-	<string name="type.highway.footway.tunnel">Caminho pedonal</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Túnel</string>
 	<string name="type.highway.ford">Rio raso</string>
 	<string name="type.highway.living_street">Zona de coexistência</string>
-	<string name="type.highway.living_street.bridge">Zona de coexistência</string>
-	<string name="type.highway.living_street.tunnel">Zona de coexistência</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Túnel</string>
 	<string name="type.highway.motorway">Rodovia</string>
-	<string name="type.highway.motorway.bridge">Rodovia</string>
-	<string name="type.highway.motorway.tunnel">Rodovia</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Túnel</string>
 	<string name="type.highway.motorway_junction">Saída de rodovia</string>
 	<string name="type.highway.motorway_link">Rodovia</string>
-	<string name="type.highway.motorway_link.bridge">Rodovia</string>
-	<string name="type.highway.motorway_link.tunnel">Rodovia</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Caminho</string>
 	<string name="type.highway.path.alpine_hiking">Caminho</string>
 	<string name="type.highway.path.bicycle">Caminho</string>
-	<string name="type.highway.path.bridge">Caminho</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Ponte</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Caminho</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Caminho</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Caminho</string>
@@ -976,52 +989,76 @@
 	<string name="type.highway.path.horse">Caminho</string>
 	<string name="type.highway.path.mountain_hiking">Caminho</string>
 	<string name="type.highway.path.permissive">Caminho</string>
-	<string name="type.highway.path.tunnel">Caminho</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Rua pedonal</string>
 	<string name="type.highway.pedestrian.area">Rua pedonal</string>
-	<string name="type.highway.pedestrian.bridge">Rua pedonal</string>
-	<string name="type.highway.pedestrian.tunnel">Rua pedonal</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Túnel</string>
 	<string name="type.highway.primary">Estrada</string>
-	<string name="type.highway.primary.bridge">Estrada</string>
-	<string name="type.highway.primary.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Túnel</string>
 	<string name="type.highway.primary_link">Estrada</string>
-	<string name="type.highway.primary_link.bridge">Estrada</string>
-	<string name="type.highway.primary_link.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Túnel</string>
 	<string name="type.highway.raceway">Pista de corrida</string>
 	<string name="type.highway.residential">Rua residencial</string>
 	<string name="type.highway.residential.area">Rua residencial</string>
-	<string name="type.highway.residential.bridge">Rua residencial</string>
-	<string name="type.highway.residential.tunnel">Rua residencial</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Túnel</string>
 	<string name="type.highway.rest_area">Área de descanso</string>
 	<string name="type.highway.road">Estrada</string>
-	<string name="type.highway.road.bridge">Estrada</string>
-	<string name="type.highway.road.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Túnel</string>
 	<string name="type.highway.secondary">Estrada</string>
-	<string name="type.highway.secondary.bridge">Estrada</string>
-	<string name="type.highway.secondary.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Túnel</string>
 	<string name="type.highway.secondary_link">Estrada</string>
-	<string name="type.highway.secondary_link.bridge">Estrada</string>
-	<string name="type.highway.secondary_link.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Túnel</string>
 	<string name="type.highway.service">Estrada de acesso ou serviço</string>
 	<string name="type.highway.service.area">Estrada de acesso ou serviço</string>
-	<string name="type.highway.service.bridge">Estrada de acesso ou serviço</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Ponte</string>
 	<string name="type.highway.service.driveway">Estrada de acesso ou serviço</string>
 	<string name="type.highway.service.parking_aisle">Estrada de estacionamento</string>
-	<string name="type.highway.service.tunnel">Estrada de acesso ou serviço</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Túnel</string>
 	<string name="type.highway.services">Área de serviços de estrada</string>
 	<string name="type.highway.speed_camera">Radar de velocidade</string>
 	<string name="type.highway.steps">Escadas</string>
-	<string name="type.highway.steps.bridge">Escadas</string>
-	<string name="type.highway.steps.tunnel">Escadas</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Túnel</string>
 	<string name="type.highway.tertiary">Estrada</string>
-	<string name="type.highway.tertiary.bridge">Estrada</string>
-	<string name="type.highway.tertiary.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Túnel</string>
 	<string name="type.highway.tertiary_link">Estrada</string>
-	<string name="type.highway.tertiary_link.bridge">Estrada</string>
-	<string name="type.highway.tertiary_link.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Túnel</string>
 	<string name="type.highway.track">Estrada rústica</string>
 	<string name="type.highway.track.area">Estrada rústica</string>
-	<string name="type.highway.track.bridge">Estrada rústica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Ponte</string>
 	<string name="type.highway.track.grade1">Estrada rústica</string>
 	<string name="type.highway.track.grade2">Estrada rústica</string>
 	<string name="type.highway.track.grade3">Estrada rústica</string>
@@ -1029,18 +1066,25 @@
 	<string name="type.highway.track.grade5">Estrada rústica</string>
 	<string name="type.highway.track.no.access">Estrada rústica</string>
 	<string name="type.highway.track.permissive">Estrada rústica</string>
-	<string name="type.highway.track.tunnel">Estrada rústica</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Túnel</string>
 	<string name="type.highway.traffic_signals">Semáforo</string>
 	<string name="type.highway.trunk">Via expressa</string>
-	<string name="type.highway.trunk.bridge">Via expressa</string>
-	<string name="type.highway.trunk.tunnel">Via expressa</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Túnel</string>
 	<string name="type.highway.trunk_link">Via expressa</string>
-	<string name="type.highway.trunk_link.bridge">Via expressa</string>
-	<string name="type.highway.trunk_link.tunnel">Via expressa</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Túnel</string>
 	<string name="type.highway.unclassified">Estrada sem classificação</string>
 	<string name="type.highway.unclassified.area">Estrada sem classificação</string>
-	<string name="type.highway.unclassified.bridge">Estrada sem classificação</string>
-	<string name="type.highway.unclassified.tunnel">Estrada sem classificação</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Túnel</string>
 	<string name="type.area_highway.cycleway">Ciclovia</string>
 	<string name="type.area_highway.footway">Caminho pedonal</string>
 	<string name="type.area_highway.living_street">Zona de coexistência</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 309ccc5604..6b56def801 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mapas</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Milhas</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">A minha posição</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mais tarde</string>
@@ -938,41 +938,54 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Rodovia</string>
 	<string name="type.highway.bridleway">Caminho para cavaleiros</string>
-	<string name="type.highway.bridleway.bridge">Caminho para cavaleiros</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Ponte</string>
 	<string name="type.highway.bridleway.permissive">Caminho para cavaleiros</string>
-	<string name="type.highway.bridleway.tunnel">Caminho para cavaleiros</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Túnel</string>
 	<string name="type.highway.bus_stop">Paragem de autocarros</string>
 	<string name="type.highway.construction">Estrada em construção</string>
 	<string name="type.highway.cycleway">Ciclovia</string>
-	<string name="type.highway.cycleway.bridge">Ciclovia</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Ponte</string>
 	<string name="type.highway.cycleway.permissive">Ciclovia</string>
-	<string name="type.highway.cycleway.tunnel">Ciclovia</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Túnel</string>
 	<string name="type.highway.footway">Caminho pedonal</string>
 	<string name="type.highway.footway.alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.area">Caminho pedonal</string>
-	<string name="type.highway.footway.bridge">Caminho pedonal</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Ponte</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.mountain_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.permissive">Caminho pedonal</string>
-	<string name="type.highway.footway.tunnel">Caminho pedonal</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Túnel</string>
 	<string name="type.highway.ford">Vau</string>
 	<string name="type.highway.living_street">Zona de coexistência</string>
-	<string name="type.highway.living_street.bridge">Zona de coexistência</string>
-	<string name="type.highway.living_street.tunnel">Zona de coexistência</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Túnel</string>
 	<string name="type.highway.motorway">Autoestrada</string>
-	<string name="type.highway.motorway.bridge">Autoestrada</string>
-	<string name="type.highway.motorway.tunnel">Autoestrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Túnel</string>
 	<string name="type.highway.motorway_junction">Saída de autoestrada</string>
 	<string name="type.highway.motorway_link">Ligação a autoestrada</string>
-	<string name="type.highway.motorway_link.bridge">Ligação a autoestrada</string>
-	<string name="type.highway.motorway_link.tunnel">Ligação a autoestrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Caminho</string>
 	<string name="type.highway.path.alpine_hiking">Caminho</string>
 	<string name="type.highway.path.bicycle">Caminho</string>
-	<string name="type.highway.path.bridge">Caminho</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Ponte</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Caminho</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Caminho</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Caminho</string>
@@ -980,52 +993,76 @@
 	<string name="type.highway.path.horse">Caminho</string>
 	<string name="type.highway.path.mountain_hiking">Caminho</string>
 	<string name="type.highway.path.permissive">Caminho</string>
-	<string name="type.highway.path.tunnel">Caminho</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Rua pedonal</string>
 	<string name="type.highway.pedestrian.area">Rua pedonal</string>
-	<string name="type.highway.pedestrian.bridge">Rua pedonal</string>
-	<string name="type.highway.pedestrian.tunnel">Rua pedonal</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Túnel</string>
 	<string name="type.highway.primary">Estrada primária</string>
-	<string name="type.highway.primary.bridge">Estrada primária</string>
-	<string name="type.highway.primary.tunnel">Estrada primária</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Túnel</string>
 	<string name="type.highway.primary_link">Estrada primária</string>
-	<string name="type.highway.primary_link.bridge">Estrada primária</string>
-	<string name="type.highway.primary_link.tunnel">Estrada primária</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Túnel</string>
 	<string name="type.highway.raceway">Pista de corridas</string>
 	<string name="type.highway.residential">Rua residencial</string>
 	<string name="type.highway.residential.area">Rua residencial</string>
-	<string name="type.highway.residential.bridge">Rua residencial</string>
-	<string name="type.highway.residential.tunnel">Rua residencial</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Túnel</string>
 	<string name="type.highway.rest_area">Área de descanso</string>
 	<string name="type.highway.road">Estrada</string>
-	<string name="type.highway.road.bridge">Estrada</string>
-	<string name="type.highway.road.tunnel">Estrada</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Túnel</string>
 	<string name="type.highway.secondary">Estrada secundária</string>
-	<string name="type.highway.secondary.bridge">Estrada secundária</string>
-	<string name="type.highway.secondary.tunnel">Estrada secundária</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Túnel</string>
 	<string name="type.highway.secondary_link">Estrada secundária</string>
-	<string name="type.highway.secondary_link.bridge">Estrada secundária</string>
-	<string name="type.highway.secondary_link.tunnel">Estrada secundária</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Túnel</string>
 	<string name="type.highway.service">Estrada de acesso ou serviço</string>
 	<string name="type.highway.service.area">Estrada de acesso ou serviço</string>
-	<string name="type.highway.service.bridge">Estrada de acesso ou serviço</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Ponte</string>
 	<string name="type.highway.service.driveway">Estrada de acesso ou serviço</string>
 	<string name="type.highway.service.parking_aisle">Estrada de estacionamento</string>
-	<string name="type.highway.service.tunnel">Estrada de acesso ou serviço</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Túnel</string>
 	<string name="type.highway.services">Área de serviço</string>
 	<string name="type.highway.speed_camera">Radar de velocidade</string>
 	<string name="type.highway.steps">Escadas</string>
-	<string name="type.highway.steps.bridge">Escadas</string>
-	<string name="type.highway.steps.tunnel">Escadas</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Túnel</string>
 	<string name="type.highway.tertiary">Estrada terciária</string>
-	<string name="type.highway.tertiary.bridge">Estrada terciária</string>
-	<string name="type.highway.tertiary.tunnel">Estrada terciária</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Túnel</string>
 	<string name="type.highway.tertiary_link">Estrada terciária</string>
-	<string name="type.highway.tertiary_link.bridge">Estrada terciária</string>
-	<string name="type.highway.tertiary_link.tunnel">Estrada terciária</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Túnel</string>
 	<string name="type.highway.track">Carreiro florestal ou agrícola</string>
 	<string name="type.highway.track.area">Carreiro florestal ou agrícola</string>
-	<string name="type.highway.track.bridge">Carreiro florestal ou agrícola</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Ponte</string>
 	<string name="type.highway.track.grade1">Carreiro florestal ou agrícola</string>
 	<string name="type.highway.track.grade2">Carreiro florestal ou agrícola</string>
 	<string name="type.highway.track.grade3">Carreiro florestal ou agrícola</string>
@@ -1033,18 +1070,25 @@
 	<string name="type.highway.track.grade5">Carreiro florestal ou agrícola</string>
 	<string name="type.highway.track.no.access">Carreiro florestal ou agrícola</string>
 	<string name="type.highway.track.permissive">Carreiro florestal ou agrícola</string>
-	<string name="type.highway.track.tunnel">Carreiro florestal ou agrícola</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Túnel</string>
 	<string name="type.highway.traffic_signals">Semáforo</string>
 	<string name="type.highway.trunk">Via rápida</string>
-	<string name="type.highway.trunk.bridge">Via rápida</string>
-	<string name="type.highway.trunk.tunnel">Via rápida</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Túnel</string>
 	<string name="type.highway.trunk_link">Via rápida</string>
-	<string name="type.highway.trunk_link.bridge">Via rápida</string>
-	<string name="type.highway.trunk_link.tunnel">Via rápida</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Túnel</string>
 	<string name="type.highway.unclassified">Estrada sem classificação</string>
 	<string name="type.highway.unclassified.area">Estrada sem classificação</string>
-	<string name="type.highway.unclassified.bridge">Estrada sem classificação</string>
-	<string name="type.highway.unclassified.tunnel">Estrada sem classificação</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Ponte</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Túnel</string>
 	<string name="type.area_highway.cycleway">Ciclovia</string>
 	<string name="type.area_highway.footway">Caminho pedonal</string>
 	<string name="type.area_highway.living_street">Zona de coexistência</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index ae1bda5dee..b8febb8298 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Hărţi</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mile</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Poziția mea</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mai tîrziu</string>
@@ -895,34 +895,51 @@
 	<string name="type.healthcare.laboratory">Laborator medical</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunel</string>
 	<string name="type.highway.bus_stop">Stație de autobuz</string>
 	<string name="type.highway.construction">Drum în construcție</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunel</string>
 	<string name="type.highway.footway">Cale</string>
 	<string name="type.highway.footway.alpine_hiking">Cale</string>
 	<string name="type.highway.footway.area">Cale</string>
-	<string name="type.highway.footway.bridge">Cale</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Pod</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Cale</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Cale</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Cale</string>
 	<string name="type.highway.footway.hiking">Cale</string>
 	<string name="type.highway.footway.mountain_hiking">Cale</string>
 	<string name="type.highway.footway.permissive">Cale</string>
-	<string name="type.highway.footway.tunnel">Cale</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Superficial</string>
 	<string name="type.highway.living_street">Stradă</string>
-	<string name="type.highway.living_street.bridge">Stradă</string>
-	<string name="type.highway.living_street.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunel</string>
 	<string name="type.highway.motorway">Stradă</string>
-	<string name="type.highway.motorway.bridge">Stradă</string>
-	<string name="type.highway.motorway.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunel</string>
 	<string name="type.highway.motorway_junction">Ieșire</string>
 	<string name="type.highway.motorway_link">Stradă</string>
-	<string name="type.highway.motorway_link.bridge">Stradă</string>
-	<string name="type.highway.motorway_link.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Cale</string>
 	<string name="type.highway.path.alpine_hiking">Cale</string>
 	<string name="type.highway.path.bicycle">Cale</string>
-	<string name="type.highway.path.bridge">Cale</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Pod</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Cale</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Cale</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Cale</string>
@@ -930,51 +947,75 @@
 	<string name="type.highway.path.horse">Cale</string>
 	<string name="type.highway.path.mountain_hiking">Cale</string>
 	<string name="type.highway.path.permissive">Cale</string>
-	<string name="type.highway.path.tunnel">Cale</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Stradă</string>
 	<string name="type.highway.pedestrian.area">Stradă</string>
-	<string name="type.highway.pedestrian.bridge">Stradă</string>
-	<string name="type.highway.pedestrian.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunel</string>
 	<string name="type.highway.primary">Stradă</string>
-	<string name="type.highway.primary.bridge">Stradă</string>
-	<string name="type.highway.primary.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunel</string>
 	<string name="type.highway.primary_link">Stradă</string>
-	<string name="type.highway.primary_link.bridge">Stradă</string>
-	<string name="type.highway.primary_link.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunel</string>
 	<string name="type.highway.raceway">Pistă de curse</string>
 	<string name="type.highway.residential">Stradă</string>
 	<string name="type.highway.residential.area">Stradă</string>
-	<string name="type.highway.residential.bridge">Stradă</string>
-	<string name="type.highway.residential.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunel</string>
 	<string name="type.highway.rest_area">Zonă de odihnă</string>
 	<string name="type.highway.road">Stradă</string>
-	<string name="type.highway.road.bridge">Stradă</string>
-	<string name="type.highway.road.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunel</string>
 	<string name="type.highway.secondary">Stradă</string>
-	<string name="type.highway.secondary.bridge">Stradă</string>
-	<string name="type.highway.secondary.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunel</string>
 	<string name="type.highway.secondary_link">Stradă</string>
-	<string name="type.highway.secondary_link.bridge">Stradă</string>
-	<string name="type.highway.secondary_link.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunel</string>
 	<string name="type.highway.service">Stradă</string>
 	<string name="type.highway.service.area">Stradă</string>
-	<string name="type.highway.service.bridge">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Pod</string>
 	<string name="type.highway.service.driveway">Stradă</string>
 	<string name="type.highway.service.parking_aisle">Stradă</string>
-	<string name="type.highway.service.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunel</string>
 	<string name="type.highway.speed_camera">Detector de viteză</string>
 	<string name="type.highway.steps">Cale</string>
-	<string name="type.highway.steps.bridge">Cale</string>
-	<string name="type.highway.steps.tunnel">Cale</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunel</string>
 	<string name="type.highway.tertiary">Stradă</string>
-	<string name="type.highway.tertiary.bridge">Stradă</string>
-	<string name="type.highway.tertiary.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunel</string>
 	<string name="type.highway.tertiary_link">Stradă</string>
-	<string name="type.highway.tertiary_link.bridge">Stradă</string>
-	<string name="type.highway.tertiary_link.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunel</string>
 	<string name="type.highway.track">Stradă</string>
 	<string name="type.highway.track.area">Stradă</string>
-	<string name="type.highway.track.bridge">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Pod</string>
 	<string name="type.highway.track.grade1">Stradă</string>
 	<string name="type.highway.track.grade2">Stradă</string>
 	<string name="type.highway.track.grade3">Stradă</string>
@@ -982,18 +1023,25 @@
 	<string name="type.highway.track.grade5">Stradă</string>
 	<string name="type.highway.track.no.access">Stradă</string>
 	<string name="type.highway.track.permissive">Stradă</string>
-	<string name="type.highway.track.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semafoare</string>
 	<string name="type.highway.trunk">Stradă</string>
-	<string name="type.highway.trunk.bridge">Stradă</string>
-	<string name="type.highway.trunk.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunel</string>
 	<string name="type.highway.trunk_link">Stradă</string>
-	<string name="type.highway.trunk_link.bridge">Stradă</string>
-	<string name="type.highway.trunk_link.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunel</string>
 	<string name="type.highway.unclassified">Stradă</string>
 	<string name="type.highway.unclassified.area">Stradă</string>
-	<string name="type.highway.unclassified.bridge">Stradă</string>
-	<string name="type.highway.unclassified.tunnel">Stradă</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Pod</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunel</string>
 	<string name="type.area_highway.footway">Cale</string>
 	<string name="type.area_highway.living_street">Stradă</string>
 	<string name="type.area_highway.motorway">Stradă</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index cd26449246..f5b4c2f100 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -24,7 +24,7 @@
 	<string name="gb">ГБ</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Мили</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Мое местоположение</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не сейчас</string>
@@ -973,42 +973,55 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Дорога</string>
 	<string name="type.highway.bridleway">Конная дорожка</string>
-	<string name="type.highway.bridleway.bridge">Конная дорожка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Мост</string>
 	<string name="type.highway.bridleway.permissive">Конная дорожка</string>
-	<string name="type.highway.bridleway.tunnel">Конная дорожка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Тоннель</string>
 	<string name="type.highway.bus_stop">Остановка</string>
 	<string name="type.highway.construction">Строящаяся дорога</string>
 	<string name="type.highway.cycleway">Велодорожка</string>
-	<string name="type.highway.cycleway.bridge">Велодорожка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Мост</string>
 	<string name="type.highway.cycleway.permissive">Велодорожка</string>
-	<string name="type.highway.cycleway.tunnel">Велодорожка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Тоннель</string>
 	<string name="type.highway.elevator">Лифт</string>
 	<string name="type.highway.footway">Пешеходная дорожка</string>
 	<string name="type.highway.footway.alpine_hiking">Тропа</string>
 	<string name="type.highway.footway.area">Пешеходная зона</string>
-	<string name="type.highway.footway.bridge">Пешеходная дорожка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Пешеходный мост</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Тропа</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Тропа</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Тропа</string>
 	<string name="type.highway.footway.hiking">Тропа</string>
 	<string name="type.highway.footway.mountain_hiking">Тропа</string>
 	<string name="type.highway.footway.permissive">Пешеходная дорожка</string>
-	<string name="type.highway.footway.tunnel">Пешеходная дорожка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Пешеходный тоннель</string>
 	<string name="type.highway.ford">Брод</string>
 	<string name="type.highway.living_street">Жилая зона</string>
-	<string name="type.highway.living_street.bridge">Жилая зона</string>
-	<string name="type.highway.living_street.tunnel">Жилая зона</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Тоннель</string>
 	<string name="type.highway.motorway">Автомагистраль</string>
-	<string name="type.highway.motorway.bridge">Автомагистраль</string>
-	<string name="type.highway.motorway.tunnel">Автомагистраль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Автомобильный мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Автомобильный тоннель</string>
 	<string name="type.highway.motorway_junction">Съезд</string>
 	<string name="type.highway.motorway_link">Съезд с автомагистрали</string>
-	<string name="type.highway.motorway_link.bridge">Съезд с автомагистрали</string>
-	<string name="type.highway.motorway_link.tunnel">Съезд с автомагистрали</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Тоннель</string>
 	<string name="type.highway.path">Тропа</string>
 	<string name="type.highway.path.alpine_hiking">Тропа</string>
 	<string name="type.highway.path.bicycle">Велопешеходная дорожка</string>
-	<string name="type.highway.path.bridge">Тропа</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Мост</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Тропа</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Тропа</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Тропа</string>
@@ -1016,52 +1029,76 @@
 	<string name="type.highway.path.horse">Конная тропа</string>
 	<string name="type.highway.path.mountain_hiking">Тропа</string>
 	<string name="type.highway.path.permissive">Тропа</string>
-	<string name="type.highway.path.tunnel">Тропа</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Тоннель</string>
 	<string name="type.highway.pedestrian">Пешеходная улица</string>
 	<string name="type.highway.pedestrian.area">Пешеходная зона</string>
-	<string name="type.highway.pedestrian.bridge">Пешеходная улица</string>
-	<string name="type.highway.pedestrian.tunnel">Пешеходная улица</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Пешеходный мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Пешеходный тоннель</string>
 	<string name="type.highway.primary">Шоссе</string>
-	<string name="type.highway.primary.bridge">Шоссе</string>
-	<string name="type.highway.primary.tunnel">Шоссе</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Тоннель</string>
 	<string name="type.highway.primary_link">Съезд с шоссе</string>
-	<string name="type.highway.primary_link.bridge">Съезд с шоссе</string>
-	<string name="type.highway.primary_link.tunnel">Съезд с шоссе</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Тоннель</string>
 	<string name="type.highway.raceway">Гоночный трек</string>
 	<string name="type.highway.residential">Улица</string>
 	<string name="type.highway.residential.area">Улица</string>
-	<string name="type.highway.residential.bridge">Улица</string>
-	<string name="type.highway.residential.tunnel">Улица</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Тоннель</string>
 	<string name="type.highway.rest_area">Зона отдыха</string>
 	<string name="type.highway.road">Дорога</string>
-	<string name="type.highway.road.bridge">Дорога</string>
-	<string name="type.highway.road.tunnel">Дорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Тоннель</string>
 	<string name="type.highway.secondary">Автодорога</string>
-	<string name="type.highway.secondary.bridge">Автодорога</string>
-	<string name="type.highway.secondary.tunnel">Автодорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Тоннель</string>
 	<string name="type.highway.secondary_link">Съезд с автодороги</string>
-	<string name="type.highway.secondary_link.bridge">Съезд с автодороги</string>
-	<string name="type.highway.secondary_link.tunnel">Съезд с автодороги</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Тоннель</string>
 	<string name="type.highway.service">Проезд</string>
 	<string name="type.highway.service.area">Проезд</string>
-	<string name="type.highway.service.bridge">Проезд</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Мост</string>
 	<string name="type.highway.service.driveway">Подъезд</string>
 	<string name="type.highway.service.parking_aisle">Парковочный проезд</string>
-	<string name="type.highway.service.tunnel">Проезд</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Тоннель</string>
 	<string name="type.highway.services">Зона обслуживания</string>
 	<string name="type.highway.speed_camera">Камера скорости</string>
 	<string name="type.highway.steps">Лестница</string>
-	<string name="type.highway.steps.bridge">Лестница</string>
-	<string name="type.highway.steps.tunnel">Лестница</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Тоннель</string>
 	<string name="type.highway.tertiary">Дорога</string>
-	<string name="type.highway.tertiary.bridge">Дорога</string>
-	<string name="type.highway.tertiary.tunnel">Дорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Тоннель</string>
 	<string name="type.highway.tertiary_link">Съезд с дороги</string>
-	<string name="type.highway.tertiary_link.bridge">Съезд с дороги</string>
-	<string name="type.highway.tertiary_link.tunnel">Съезд с дороги</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Тоннель</string>
 	<string name="type.highway.track">Грунтовка</string>
 	<string name="type.highway.track.area">Грунтовка</string>
-	<string name="type.highway.track.bridge">Грунтовка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Мост</string>
 	<string name="type.highway.track.grade1">Грунтовка</string>
 	<string name="type.highway.track.grade2">Грунтовка</string>
 	<string name="type.highway.track.grade3">Грунтовка</string>
@@ -1069,18 +1106,25 @@
 	<string name="type.highway.track.grade5">Грунтовка</string>
 	<string name="type.highway.track.no.access">Грунтовка</string>
 	<string name="type.highway.track.permissive">Грунтовка</string>
-	<string name="type.highway.track.tunnel">Грунтовка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Тоннель</string>
 	<string name="type.highway.traffic_signals">Светофор</string>
 	<string name="type.highway.trunk">Трасса</string>
-	<string name="type.highway.trunk.bridge">Трасса</string>
-	<string name="type.highway.trunk.tunnel">Трасса</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Тоннель</string>
 	<string name="type.highway.trunk_link">Съезд с трассы</string>
-	<string name="type.highway.trunk_link.bridge">Съезд с трассы</string>
-	<string name="type.highway.trunk_link.tunnel">Съезд с трассы</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Тоннель</string>
 	<string name="type.highway.unclassified">Небольшая дорога</string>
 	<string name="type.highway.unclassified.area">Небольшая дорога</string>
-	<string name="type.highway.unclassified.bridge">Небольшая дорога</string>
-	<string name="type.highway.unclassified.tunnel">Небольшая дорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Мост</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Тоннель</string>
 	<string name="type.area_highway.cycleway">Велодорожка</string>
 	<string name="type.area_highway.footway">Пешеходная дорожка</string>
 	<string name="type.area_highway.living_street">Жилая зона</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 5ff1700666..99c60c3869 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Mapy</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Míle</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Moja poloha</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Neskôr</string>
@@ -874,34 +874,51 @@
 	<string name="type.healthcare.laboratory">Lekárske laboratórium</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunel</string>
 	<string name="type.highway.bus_stop">Autobusová zastávka</string>
 	<string name="type.highway.construction">Cesta vo výstavbe</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunel</string>
 	<string name="type.highway.footway">Cesta</string>
 	<string name="type.highway.footway.alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.area">Cesta</string>
-	<string name="type.highway.footway.bridge">Cesta</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Most</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Cesta</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.hiking">Cesta</string>
 	<string name="type.highway.footway.mountain_hiking">Cesta</string>
 	<string name="type.highway.footway.permissive">Cesta</string>
-	<string name="type.highway.footway.tunnel">Cesta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Brod</string>
 	<string name="type.highway.living_street">Ulica</string>
-	<string name="type.highway.living_street.bridge">Ulica</string>
-	<string name="type.highway.living_street.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunel</string>
 	<string name="type.highway.motorway">Ulica</string>
-	<string name="type.highway.motorway.bridge">Ulica</string>
-	<string name="type.highway.motorway.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunel</string>
 	<string name="type.highway.motorway_junction">Dopravný uzol</string>
 	<string name="type.highway.motorway_link">Ulica</string>
-	<string name="type.highway.motorway_link.bridge">Ulica</string>
-	<string name="type.highway.motorway_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Cesta</string>
 	<string name="type.highway.path.alpine_hiking">Cesta</string>
 	<string name="type.highway.path.bicycle">Cesta</string>
-	<string name="type.highway.path.bridge">Cesta</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Most</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Cesta</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Cesta</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Cesta</string>
@@ -909,51 +926,75 @@
 	<string name="type.highway.path.horse">Cesta</string>
 	<string name="type.highway.path.mountain_hiking">Cesta</string>
 	<string name="type.highway.path.permissive">Cesta</string>
-	<string name="type.highway.path.tunnel">Cesta</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Ulica</string>
 	<string name="type.highway.pedestrian.area">Ulica</string>
-	<string name="type.highway.pedestrian.bridge">Ulica</string>
-	<string name="type.highway.pedestrian.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunel</string>
 	<string name="type.highway.primary">Ulica</string>
-	<string name="type.highway.primary.bridge">Ulica</string>
-	<string name="type.highway.primary.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunel</string>
 	<string name="type.highway.primary_link">Ulica</string>
-	<string name="type.highway.primary_link.bridge">Ulica</string>
-	<string name="type.highway.primary_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunel</string>
 	<string name="type.highway.raceway">Pretekárska dráha</string>
 	<string name="type.highway.residential">Ulica</string>
 	<string name="type.highway.residential.area">Ulica</string>
-	<string name="type.highway.residential.bridge">Ulica</string>
-	<string name="type.highway.residential.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunel</string>
 	<string name="type.highway.rest_area">Odpočívadlo</string>
 	<string name="type.highway.road">Ulica</string>
-	<string name="type.highway.road.bridge">Ulica</string>
-	<string name="type.highway.road.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunel</string>
 	<string name="type.highway.secondary">Ulica</string>
-	<string name="type.highway.secondary.bridge">Ulica</string>
-	<string name="type.highway.secondary.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunel</string>
 	<string name="type.highway.secondary_link">Ulica</string>
-	<string name="type.highway.secondary_link.bridge">Ulica</string>
-	<string name="type.highway.secondary_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunel</string>
 	<string name="type.highway.service">Ulica</string>
 	<string name="type.highway.service.area">Ulica</string>
-	<string name="type.highway.service.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Most</string>
 	<string name="type.highway.service.driveway">Ulica</string>
 	<string name="type.highway.service.parking_aisle">Ulica</string>
-	<string name="type.highway.service.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunel</string>
 	<string name="type.highway.speed_camera">Rýchlostná kamera</string>
 	<string name="type.highway.steps">Cesta</string>
-	<string name="type.highway.steps.bridge">Cesta</string>
-	<string name="type.highway.steps.tunnel">Cesta</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunel</string>
 	<string name="type.highway.tertiary">Ulica</string>
-	<string name="type.highway.tertiary.bridge">Ulica</string>
-	<string name="type.highway.tertiary.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunel</string>
 	<string name="type.highway.tertiary_link">Ulica</string>
-	<string name="type.highway.tertiary_link.bridge">Ulica</string>
-	<string name="type.highway.tertiary_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunel</string>
 	<string name="type.highway.track">Ulica</string>
 	<string name="type.highway.track.area">Ulica</string>
-	<string name="type.highway.track.bridge">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Most</string>
 	<string name="type.highway.track.grade1">Ulica</string>
 	<string name="type.highway.track.grade2">Ulica</string>
 	<string name="type.highway.track.grade3">Ulica</string>
@@ -961,18 +1002,25 @@
 	<string name="type.highway.track.grade5">Ulica</string>
 	<string name="type.highway.track.no.access">Ulica</string>
 	<string name="type.highway.track.permissive">Ulica</string>
-	<string name="type.highway.track.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semafor</string>
 	<string name="type.highway.trunk">Ulica</string>
-	<string name="type.highway.trunk.bridge">Ulica</string>
-	<string name="type.highway.trunk.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunel</string>
 	<string name="type.highway.trunk_link">Ulica</string>
-	<string name="type.highway.trunk_link.bridge">Ulica</string>
-	<string name="type.highway.trunk_link.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunel</string>
 	<string name="type.highway.unclassified">Ulica</string>
 	<string name="type.highway.unclassified.area">Ulica</string>
-	<string name="type.highway.unclassified.bridge">Ulica</string>
-	<string name="type.highway.unclassified.tunnel">Ulica</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Most</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunel</string>
 	<string name="type.area_highway.footway">Cesta</string>
 	<string name="type.area_highway.living_street">Ulica</string>
 	<string name="type.area_highway.motorway">Ulica</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index aa7fca02d4..0035e32c15 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Kartor</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mil</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Min position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senare</string>
@@ -870,34 +870,51 @@
 	<string name="type.healthcare.laboratory">Medicinskt laboratorium</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Busshållplats</string>
 	<string name="type.highway.construction">Väg under uppförande</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.footway">Gångväg</string>
 	<string name="type.highway.footway.alpine_hiking">Gångväg</string>
 	<string name="type.highway.footway.area">Gångväg</string>
-	<string name="type.highway.footway.bridge">Gångväg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Bro</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Gångväg</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Gångväg</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Gångväg</string>
 	<string name="type.highway.footway.hiking">Gångväg</string>
 	<string name="type.highway.footway.mountain_hiking">Gångväg</string>
 	<string name="type.highway.footway.permissive">Gångväg</string>
-	<string name="type.highway.footway.tunnel">Gångväg</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadställe</string>
 	<string name="type.highway.living_street">Gata</string>
-	<string name="type.highway.living_street.bridge">Gata</string>
-	<string name="type.highway.living_street.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Gata</string>
-	<string name="type.highway.motorway.bridge">Gata</string>
-	<string name="type.highway.motorway.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tunnel</string>
 	<string name="type.highway.motorway_junction">Avfart</string>
 	<string name="type.highway.motorway_link">Gata</string>
-	<string name="type.highway.motorway_link.bridge">Gata</string>
-	<string name="type.highway.motorway_link.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Gångväg</string>
 	<string name="type.highway.path.alpine_hiking">Gångväg</string>
 	<string name="type.highway.path.bicycle">Gångväg</string>
-	<string name="type.highway.path.bridge">Gångväg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Bro</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Gångväg</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Gångväg</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Gångväg</string>
@@ -905,51 +922,75 @@
 	<string name="type.highway.path.horse">Gångväg</string>
 	<string name="type.highway.path.mountain_hiking">Gångväg</string>
 	<string name="type.highway.path.permissive">Gångväg</string>
-	<string name="type.highway.path.tunnel">Gångväg</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Gata</string>
 	<string name="type.highway.pedestrian.area">Gata</string>
-	<string name="type.highway.pedestrian.bridge">Gata</string>
-	<string name="type.highway.pedestrian.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
 	<string name="type.highway.primary">Gata</string>
-	<string name="type.highway.primary.bridge">Gata</string>
-	<string name="type.highway.primary.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Gata</string>
-	<string name="type.highway.primary_link.bridge">Gata</string>
-	<string name="type.highway.primary_link.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Racerbana</string>
 	<string name="type.highway.residential">Gata</string>
 	<string name="type.highway.residential.area">Gata</string>
-	<string name="type.highway.residential.bridge">Gata</string>
-	<string name="type.highway.residential.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Viloplats</string>
 	<string name="type.highway.road">Gata</string>
-	<string name="type.highway.road.bridge">Gata</string>
-	<string name="type.highway.road.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Gata</string>
-	<string name="type.highway.secondary.bridge">Gata</string>
-	<string name="type.highway.secondary.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Gata</string>
-	<string name="type.highway.secondary_link.bridge">Gata</string>
-	<string name="type.highway.secondary_link.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Gata</string>
 	<string name="type.highway.service.area">Gata</string>
-	<string name="type.highway.service.bridge">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Bro</string>
 	<string name="type.highway.service.driveway">Gata</string>
 	<string name="type.highway.service.parking_aisle">Gata</string>
-	<string name="type.highway.service.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Hastighetskamera</string>
 	<string name="type.highway.steps">Gångväg</string>
-	<string name="type.highway.steps.bridge">Gångväg</string>
-	<string name="type.highway.steps.tunnel">Gångväg</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Gata</string>
-	<string name="type.highway.tertiary.bridge">Gata</string>
-	<string name="type.highway.tertiary.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Gata</string>
-	<string name="type.highway.tertiary_link.bridge">Gata</string>
-	<string name="type.highway.tertiary_link.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Gata</string>
 	<string name="type.highway.track.area">Gata</string>
-	<string name="type.highway.track.bridge">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Bro</string>
 	<string name="type.highway.track.grade1">Gata</string>
 	<string name="type.highway.track.grade2">Gata</string>
 	<string name="type.highway.track.grade3">Gata</string>
@@ -957,18 +998,25 @@
 	<string name="type.highway.track.grade5">Gata</string>
 	<string name="type.highway.track.no.access">Gata</string>
 	<string name="type.highway.track.permissive">Gata</string>
-	<string name="type.highway.track.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafikljus</string>
 	<string name="type.highway.trunk">Gata</string>
-	<string name="type.highway.trunk.bridge">Gata</string>
-	<string name="type.highway.trunk.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">Gata</string>
-	<string name="type.highway.trunk_link.bridge">Gata</string>
-	<string name="type.highway.trunk_link.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Gata</string>
 	<string name="type.highway.unclassified.area">Gata</string>
-	<string name="type.highway.unclassified.bridge">Gata</string>
-	<string name="type.highway.unclassified.tunnel">Gata</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Bro</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.footway">Gångväg</string>
 	<string name="type.area_highway.living_street">Gata</string>
 	<string name="type.area_highway.motorway">Gata</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 287ca8343c..14907ddafc 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -224,7 +224,95 @@
 	<string name="type.healthcare.laboratory">Maabara ya Matibabu</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Mtaro</string>
 	<string name="type.highway.construction">Barabara inatengenezwa</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Mtaro</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Daraja</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Mtaro</string>
 
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">Bonde la Maji</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index ee3cce2675..09a76b77da 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">MB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">ไมล์</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">ตำแหน่งของฉัน</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">ภายหลัง</string>
@@ -878,34 +878,51 @@
 	<string name="type.healthcare.laboratory">ห้องปฏิบัติการทางการแพทย์</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">อุโมงค์</string>
 	<string name="type.highway.bus_stop">ป้ายรถเมล์</string>
 	<string name="type.highway.construction">ทางกำลังอยู่ในการก่อสร้าง</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">อุโมงค์</string>
 	<string name="type.highway.footway">เส้นทาง</string>
 	<string name="type.highway.footway.alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.footway.area">เส้นทาง</string>
-	<string name="type.highway.footway.bridge">เส้นทาง</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">สะพาน</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">เส้นทาง</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.footway.hiking">เส้นทาง</string>
 	<string name="type.highway.footway.mountain_hiking">เส้นทาง</string>
 	<string name="type.highway.footway.permissive">เส้นทาง</string>
-	<string name="type.highway.footway.tunnel">เส้นทาง</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">อุโมงค์</string>
 	<string name="type.highway.ford">ที่ตื้นของทางน้ำ</string>
 	<string name="type.highway.living_street">ถนน</string>
-	<string name="type.highway.living_street.bridge">ถนน</string>
-	<string name="type.highway.living_street.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">อุโมงค์</string>
 	<string name="type.highway.motorway">ถนน</string>
-	<string name="type.highway.motorway.bridge">ถนน</string>
-	<string name="type.highway.motorway.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">อุโมงค์</string>
 	<string name="type.highway.motorway_junction">ทางออก</string>
 	<string name="type.highway.motorway_link">ถนน</string>
-	<string name="type.highway.motorway_link.bridge">ถนน</string>
-	<string name="type.highway.motorway_link.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">อุโมงค์</string>
 	<string name="type.highway.path">เส้นทาง</string>
 	<string name="type.highway.path.alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.path.bicycle">เส้นทาง</string>
-	<string name="type.highway.path.bridge">เส้นทาง</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">สะพาน</string>
 	<string name="type.highway.path.demanding_alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.path.demanding_mountain_hiking">เส้นทาง</string>
 	<string name="type.highway.path.difficult_alpine_hiking">เส้นทาง</string>
@@ -913,51 +930,75 @@
 	<string name="type.highway.path.horse">เส้นทาง</string>
 	<string name="type.highway.path.mountain_hiking">เส้นทาง</string>
 	<string name="type.highway.path.permissive">เส้นทาง</string>
-	<string name="type.highway.path.tunnel">เส้นทาง</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">อุโมงค์</string>
 	<string name="type.highway.pedestrian">ถนน</string>
 	<string name="type.highway.pedestrian.area">ถนน</string>
-	<string name="type.highway.pedestrian.bridge">ถนน</string>
-	<string name="type.highway.pedestrian.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">อุโมงค์</string>
 	<string name="type.highway.primary">ถนน</string>
-	<string name="type.highway.primary.bridge">ถนน</string>
-	<string name="type.highway.primary.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">อุโมงค์</string>
 	<string name="type.highway.primary_link">ถนน</string>
-	<string name="type.highway.primary_link.bridge">ถนน</string>
-	<string name="type.highway.primary_link.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">อุโมงค์</string>
 	<string name="type.highway.raceway">สนามแข่ง</string>
 	<string name="type.highway.residential">ถนน</string>
 	<string name="type.highway.residential.area">ถนน</string>
-	<string name="type.highway.residential.bridge">ถนน</string>
-	<string name="type.highway.residential.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">อุโมงค์</string>
 	<string name="type.highway.rest_area">บริเวณพักผ่อน</string>
 	<string name="type.highway.road">ถนน</string>
-	<string name="type.highway.road.bridge">ถนน</string>
-	<string name="type.highway.road.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">อุโมงค์</string>
 	<string name="type.highway.secondary">ถนน</string>
-	<string name="type.highway.secondary.bridge">ถนน</string>
-	<string name="type.highway.secondary.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">อุโมงค์</string>
 	<string name="type.highway.secondary_link">ถนน</string>
-	<string name="type.highway.secondary_link.bridge">ถนน</string>
-	<string name="type.highway.secondary_link.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">อุโมงค์</string>
 	<string name="type.highway.service">ถนน</string>
 	<string name="type.highway.service.area">ถนน</string>
-	<string name="type.highway.service.bridge">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">สะพาน</string>
 	<string name="type.highway.service.driveway">ถนน</string>
 	<string name="type.highway.service.parking_aisle">ถนน</string>
-	<string name="type.highway.service.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">อุโมงค์</string>
 	<string name="type.highway.speed_camera">กล้องตรวจจับความเร็ว</string>
 	<string name="type.highway.steps">เส้นทาง</string>
-	<string name="type.highway.steps.bridge">เส้นทาง</string>
-	<string name="type.highway.steps.tunnel">เส้นทาง</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">อุโมงค์</string>
 	<string name="type.highway.tertiary">ถนน</string>
-	<string name="type.highway.tertiary.bridge">ถนน</string>
-	<string name="type.highway.tertiary.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">อุโมงค์</string>
 	<string name="type.highway.tertiary_link">ถนน</string>
-	<string name="type.highway.tertiary_link.bridge">ถนน</string>
-	<string name="type.highway.tertiary_link.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">อุโมงค์</string>
 	<string name="type.highway.track">ถนน</string>
 	<string name="type.highway.track.area">ถนน</string>
-	<string name="type.highway.track.bridge">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">สะพาน</string>
 	<string name="type.highway.track.grade1">ถนน</string>
 	<string name="type.highway.track.grade2">ถนน</string>
 	<string name="type.highway.track.grade3">ถนน</string>
@@ -965,18 +1006,25 @@
 	<string name="type.highway.track.grade5">ถนน</string>
 	<string name="type.highway.track.no.access">ถนน</string>
 	<string name="type.highway.track.permissive">ถนน</string>
-	<string name="type.highway.track.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">อุโมงค์</string>
 	<string name="type.highway.traffic_signals">สัญญาณไฟจราจร</string>
 	<string name="type.highway.trunk">ถนน</string>
-	<string name="type.highway.trunk.bridge">ถนน</string>
-	<string name="type.highway.trunk.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">อุโมงค์</string>
 	<string name="type.highway.trunk_link">ถนน</string>
-	<string name="type.highway.trunk_link.bridge">ถนน</string>
-	<string name="type.highway.trunk_link.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">อุโมงค์</string>
 	<string name="type.highway.unclassified">ถนน</string>
 	<string name="type.highway.unclassified.area">ถนน</string>
-	<string name="type.highway.unclassified.bridge">ถนน</string>
-	<string name="type.highway.unclassified.tunnel">ถนน</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">สะพาน</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">อุโมงค์</string>
 	<string name="type.area_highway.footway">เส้นทาง</string>
 	<string name="type.area_highway.living_street">ถนน</string>
 	<string name="type.area_highway.motorway">ถนน</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 63096c87ac..b50ccc5854 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -23,7 +23,7 @@
 	<string name="mb">MB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mil</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Konumum</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Daha sonra</string>
@@ -484,7 +484,7 @@
 	<string name="error_enter_correct_twitter_page">Geçerli bir Twitter web adresi veya kullanıcı adı girin</string>
 	<string name="error_enter_correct_vk_page">Geçerli bir VK web adresi veya hesap adı girin</string>
 	<string name="error_enter_correct_line_page">Geçerli bir LINE web adresi veya LINE ID\'si girin</string>
-	<string name="placepage_add_place_button">Haritaya bir yer ekleyin</string>
+	<string name="placepage_add_place_button">Haritaya bir yer ekle</string>
 	<!-- Displayed when saving some edits to the map to warn against publishing personal data -->
 	<string name="editor_share_to_all_dialog_title">Bunu tüm kullanıcılara göndermek ister misiniz?</string>
 	<!-- iOS Dialog before publishing the modifications to the public map. -->
@@ -964,42 +964,55 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Otoyol</string>
 	<string name="type.highway.bridleway">Atlı Yolu</string>
-	<string name="type.highway.bridleway.bridge">Atlı Yolu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Köprü</string>
 	<string name="type.highway.bridleway.permissive">Atlı Yolu</string>
-	<string name="type.highway.bridleway.tunnel">Atlı Yolu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tünel</string>
 	<string name="type.highway.bus_stop">Otobüs Durağı</string>
 	<string name="type.highway.construction">Yapım Aşamasında Yol</string>
 	<string name="type.highway.cycleway">Bisiklet Yolu</string>
-	<string name="type.highway.cycleway.bridge">Bisiklet Yolu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Köprü</string>
 	<string name="type.highway.cycleway.permissive">Bisiklet Yolu</string>
-	<string name="type.highway.cycleway.tunnel">Bisiklet Yolu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tünel</string>
 	<string name="type.highway.elevator">Asansör</string>
 	<string name="type.highway.footway">Yaya Yolu</string>
 	<string name="type.highway.footway.alpine_hiking">Yol</string>
 	<string name="type.highway.footway.area">Yaya Alanı</string>
-	<string name="type.highway.footway.bridge">Yaya Yolu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Köprü</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Yol</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Yol</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Yol</string>
 	<string name="type.highway.footway.hiking">Yol</string>
 	<string name="type.highway.footway.mountain_hiking">Yol</string>
 	<string name="type.highway.footway.permissive">Yaya Yolu</string>
-	<string name="type.highway.footway.tunnel">Yaya Yolu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Tünel</string>
 	<string name="type.highway.ford">Geçit</string>
 	<string name="type.highway.living_street">Cadde</string>
-	<string name="type.highway.living_street.bridge">Cadde</string>
-	<string name="type.highway.living_street.tunnel">Cadde</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tünel</string>
 	<string name="type.highway.motorway">Otoyol</string>
-	<string name="type.highway.motorway.bridge">Otoyol</string>
-	<string name="type.highway.motorway.tunnel">Otoyol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Tünel</string>
 	<string name="type.highway.motorway_junction">Çıkış</string>
 	<string name="type.highway.motorway_link">Otoyol Rampası</string>
-	<string name="type.highway.motorway_link.bridge">Otoyol Rampası</string>
-	<string name="type.highway.motorway_link.tunnel">Otoyol Rampası</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tünel</string>
 	<string name="type.highway.path">Yol</string>
 	<string name="type.highway.path.alpine_hiking">Yol</string>
 	<string name="type.highway.path.bicycle">Bisiklet ve Yürüyüş Yolu</string>
-	<string name="type.highway.path.bridge">Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Köprü</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Yol</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Yol</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Yol</string>
@@ -1007,52 +1020,76 @@
 	<string name="type.highway.path.horse">Atlı Yolu</string>
 	<string name="type.highway.path.mountain_hiking">Yol</string>
 	<string name="type.highway.path.permissive">Yol</string>
-	<string name="type.highway.path.tunnel">Yol</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tünel</string>
 	<string name="type.highway.pedestrian">Yayalar için Cadde</string>
 	<string name="type.highway.pedestrian.area">Yaya Alanı</string>
-	<string name="type.highway.pedestrian.bridge">Yayalar için Cadde</string>
-	<string name="type.highway.pedestrian.tunnel">Yayalar için Cadde</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Tünel</string>
 	<string name="type.highway.primary">Ana Yol</string>
-	<string name="type.highway.primary.bridge">Ana Yol</string>
-	<string name="type.highway.primary.tunnel">Ana Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tünel</string>
 	<string name="type.highway.primary_link">Ana Yol</string>
-	<string name="type.highway.primary_link.bridge">Ana Yol</string>
-	<string name="type.highway.primary_link.tunnel">Ana Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tünel</string>
 	<string name="type.highway.raceway">Yarış Pisti</string>
 	<string name="type.highway.residential">Sokak</string>
 	<string name="type.highway.residential.area">Sokak</string>
-	<string name="type.highway.residential.bridge">Sokak</string>
-	<string name="type.highway.residential.tunnel">Sokak</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tünel</string>
 	<string name="type.highway.rest_area">Dinlenme Alanı</string>
 	<string name="type.highway.road">Yol</string>
-	<string name="type.highway.road.bridge">Yol</string>
-	<string name="type.highway.road.tunnel">Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tünel</string>
 	<string name="type.highway.secondary">Tali Yol</string>
-	<string name="type.highway.secondary.bridge">Tali Yol</string>
-	<string name="type.highway.secondary.tunnel">Tali Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tünel</string>
 	<string name="type.highway.secondary_link">Tali Yol</string>
-	<string name="type.highway.secondary_link.bridge">Tali Yol</string>
-	<string name="type.highway.secondary_link.tunnel">Tali Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tünel</string>
 	<string name="type.highway.service">Servis Yolu</string>
 	<string name="type.highway.service.area">Servis Yolu</string>
-	<string name="type.highway.service.bridge">Servis Yolu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Köprü</string>
 	<string name="type.highway.service.driveway">Servis Yolu</string>
 	<string name="type.highway.service.parking_aisle">Park Koridoru</string>
-	<string name="type.highway.service.tunnel">Servis Yolu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tünel</string>
 	<string name="type.highway.services">Servis Alanı</string>
 	<string name="type.highway.speed_camera">Hız Kamerası</string>
 	<string name="type.highway.steps">Merdiven</string>
-	<string name="type.highway.steps.bridge">Merdiven</string>
-	<string name="type.highway.steps.tunnel">Merdiven</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tünel</string>
 	<string name="type.highway.tertiary">Üçüncül Yol</string>
-	<string name="type.highway.tertiary.bridge">Üçüncül Yol</string>
-	<string name="type.highway.tertiary.tunnel">Üçüncül Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tünel</string>
 	<string name="type.highway.tertiary_link">Üçüncül Yol Rampası</string>
-	<string name="type.highway.tertiary_link.bridge">Üçüncül Yol Rampası</string>
-	<string name="type.highway.tertiary_link.tunnel">Üçüncül Yol Rampası</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tünel</string>
 	<string name="type.highway.track">Pist</string>
 	<string name="type.highway.track.area">Pist</string>
-	<string name="type.highway.track.bridge">Pist</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Köprü</string>
 	<string name="type.highway.track.grade1">Pist</string>
 	<string name="type.highway.track.grade2">Pist</string>
 	<string name="type.highway.track.grade3">Pist</string>
@@ -1060,18 +1097,25 @@
 	<string name="type.highway.track.grade5">Pist</string>
 	<string name="type.highway.track.no.access">Pist</string>
 	<string name="type.highway.track.permissive">Pist</string>
-	<string name="type.highway.track.tunnel">Pist</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tünel</string>
 	<string name="type.highway.traffic_signals">Trafik Işıkları</string>
 	<string name="type.highway.trunk">Devlet Yolu</string>
-	<string name="type.highway.trunk.bridge">Devlet Yolu</string>
-	<string name="type.highway.trunk.tunnel">Devlet Yolu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tünel</string>
 	<string name="type.highway.trunk_link">Devlet Yolu</string>
-	<string name="type.highway.trunk_link.bridge">Devlet Yolu</string>
-	<string name="type.highway.trunk_link.tunnel">Devlet Yolu</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tünel</string>
 	<string name="type.highway.unclassified">Tali Yol</string>
 	<string name="type.highway.unclassified.area">Tali Yol</string>
-	<string name="type.highway.unclassified.bridge">Tali Yol</string>
-	<string name="type.highway.unclassified.tunnel">Tali Yol</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Köprü</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tünel</string>
 	<string name="type.area_highway.cycleway">Bisiklet Yolu</string>
 	<string name="type.area_highway.footway">Yaya Yolu</string>
 	<string name="type.area_highway.living_street">Cadde</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 5710756247..e390a18c8d 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -24,7 +24,7 @@
 	<string name="gb">ГБ</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Милі</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Моє місцезнаходження</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не зараз</string>
@@ -951,42 +951,55 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Дорога</string>
 	<string name="type.highway.bridleway">Кінна доріжка</string>
-	<string name="type.highway.bridleway.bridge">Кінна доріжка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Міст</string>
 	<string name="type.highway.bridleway.permissive">Кінна доріжка</string>
-	<string name="type.highway.bridleway.tunnel">Кінна доріжка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Тунель</string>
 	<string name="type.highway.bus_stop">Зупинка</string>
 	<string name="type.highway.construction">Дорога, що будується</string>
 	<string name="type.highway.cycleway">Велодоріжка</string>
-	<string name="type.highway.cycleway.bridge">Велодоріжка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Міст</string>
 	<string name="type.highway.cycleway.permissive">Велодоріжка</string>
-	<string name="type.highway.cycleway.tunnel">Велодоріжка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Тунель</string>
 	<string name="type.highway.elevator">Ліфт</string>
 	<string name="type.highway.footway">Пішохідна доріжка</string>
 	<string name="type.highway.footway.alpine_hiking">Стежка</string>
 	<string name="type.highway.footway.area">Пішохідна зона</string>
-	<string name="type.highway.footway.bridge">Пішохідна доріжка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Міст</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Стежка</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Стежка</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Стежка</string>
 	<string name="type.highway.footway.hiking">Стежка</string>
 	<string name="type.highway.footway.mountain_hiking">Стежка</string>
 	<string name="type.highway.footway.permissive">Пішохідна доріжка</string>
-	<string name="type.highway.footway.tunnel">Пішохідна доріжка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Тунель</string>
 	<string name="type.highway.ford">Брід</string>
 	<string name="type.highway.living_street">Житлова зона</string>
-	<string name="type.highway.living_street.bridge">Житлова зона</string>
-	<string name="type.highway.living_street.tunnel">Житлова зона</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Тунель</string>
 	<string name="type.highway.motorway">Автомагістраль</string>
-	<string name="type.highway.motorway.bridge">Автомагістраль</string>
-	<string name="type.highway.motorway.tunnel">Автомагістраль</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Тунель</string>
 	<string name="type.highway.motorway_junction">З\'їзд</string>
 	<string name="type.highway.motorway_link">З\'їзд з автомагістралі</string>
-	<string name="type.highway.motorway_link.bridge">З\'їзд з автомагістралі</string>
-	<string name="type.highway.motorway_link.tunnel">З\'їзд з автомагістралі</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Тунель</string>
 	<string name="type.highway.path">Стежка</string>
 	<string name="type.highway.path.alpine_hiking">Стежка</string>
 	<string name="type.highway.path.bicycle">Велопішохідна доріжка</string>
-	<string name="type.highway.path.bridge">Стежка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Міст</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Стежка</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Стежка</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Стежка</string>
@@ -994,52 +1007,76 @@
 	<string name="type.highway.path.horse">Кінна стежка</string>
 	<string name="type.highway.path.mountain_hiking">Стежка</string>
 	<string name="type.highway.path.permissive">Стежка</string>
-	<string name="type.highway.path.tunnel">Стежка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Тунель</string>
 	<string name="type.highway.pedestrian">Пішохідна вулиця</string>
 	<string name="type.highway.pedestrian.area">Пішохідна зона</string>
-	<string name="type.highway.pedestrian.bridge">Пішохідна вулиця</string>
-	<string name="type.highway.pedestrian.tunnel">Пішохідна вулиця</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Тунель</string>
 	<string name="type.highway.primary">Шосе</string>
-	<string name="type.highway.primary.bridge">Шосе</string>
-	<string name="type.highway.primary.tunnel">Шосе</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Тунель</string>
 	<string name="type.highway.primary_link">З\'їзд з шосе</string>
-	<string name="type.highway.primary_link.bridge">З\'їзд з шосе</string>
-	<string name="type.highway.primary_link.tunnel">З\'їзд з шосе</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Тунель</string>
 	<string name="type.highway.raceway">Гоночний трек</string>
 	<string name="type.highway.residential">Вулиця</string>
 	<string name="type.highway.residential.area">Вулиця</string>
-	<string name="type.highway.residential.bridge">Вулиця</string>
-	<string name="type.highway.residential.tunnel">Вулиця</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Тунель</string>
 	<string name="type.highway.rest_area">Зона відпочинку</string>
 	<string name="type.highway.road">Дорога</string>
-	<string name="type.highway.road.bridge">Дорога</string>
-	<string name="type.highway.road.tunnel">Дорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Тунель</string>
 	<string name="type.highway.secondary">Автодорога</string>
-	<string name="type.highway.secondary.bridge">Автодорога</string>
-	<string name="type.highway.secondary.tunnel">Автодорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Тунель</string>
 	<string name="type.highway.secondary_link">З\'їзд з автодороги</string>
-	<string name="type.highway.secondary_link.bridge">З\'їзд з автодороги</string>
-	<string name="type.highway.secondary_link.tunnel">З\'їзд з автодороги</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Тунель</string>
 	<string name="type.highway.service">Проїзд</string>
 	<string name="type.highway.service.area">Проїзд</string>
-	<string name="type.highway.service.bridge">Проїзд</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Міст</string>
 	<string name="type.highway.service.driveway">Під\'їзд</string>
 	<string name="type.highway.service.parking_aisle">Паркувальний проїзд</string>
-	<string name="type.highway.service.tunnel">Проїзд</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Тунель</string>
 	<string name="type.highway.services">Зона обслуговування</string>
 	<string name="type.highway.speed_camera">Камера швидкості</string>
 	<string name="type.highway.steps">Сходи</string>
-	<string name="type.highway.steps.bridge">Сходи</string>
-	<string name="type.highway.steps.tunnel">Сходи</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Тунель</string>
 	<string name="type.highway.tertiary">Дорога</string>
-	<string name="type.highway.tertiary.bridge">Дорога</string>
-	<string name="type.highway.tertiary.tunnel">Дорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Тунель</string>
 	<string name="type.highway.tertiary_link">З\'їзд з дороги</string>
-	<string name="type.highway.tertiary_link.bridge">З\'їзд з дороги</string>
-	<string name="type.highway.tertiary_link.tunnel">З\'їзд з дороги</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Тунель</string>
 	<string name="type.highway.track">Ґрунтівка</string>
 	<string name="type.highway.track.area">Ґрунтівка</string>
-	<string name="type.highway.track.bridge">Ґрунтівка</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Міст</string>
 	<string name="type.highway.track.grade1">Ґрунтівка</string>
 	<string name="type.highway.track.grade2">Ґрунтівка</string>
 	<string name="type.highway.track.grade3">Ґрунтівка</string>
@@ -1047,18 +1084,25 @@
 	<string name="type.highway.track.grade5">Ґрунтівка</string>
 	<string name="type.highway.track.no.access">Ґрунтівка</string>
 	<string name="type.highway.track.permissive">Ґрунтівка</string>
-	<string name="type.highway.track.tunnel">Ґрунтівка</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Тунель</string>
 	<string name="type.highway.traffic_signals">Світлофор</string>
 	<string name="type.highway.trunk">Траса</string>
-	<string name="type.highway.trunk.bridge">Траса</string>
-	<string name="type.highway.trunk.tunnel">Траса</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Тунель</string>
 	<string name="type.highway.trunk_link">З\'їзд з траси</string>
-	<string name="type.highway.trunk_link.bridge">З\'їзд з траси</string>
-	<string name="type.highway.trunk_link.tunnel">З\'їзд з траси</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Тунель</string>
 	<string name="type.highway.unclassified">Невелика дорога</string>
 	<string name="type.highway.unclassified.area">Невелика дорога</string>
-	<string name="type.highway.unclassified.bridge">Невелика дорога</string>
-	<string name="type.highway.unclassified.tunnel">Невелика дорога</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Міст</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Тунель</string>
 	<string name="type.area_highway.cycleway">Велодоріжка</string>
 	<string name="type.area_highway.footway">Пішохідна доріжка</string>
 	<string name="type.area_highway.living_street">Житлова зона</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 776aa38472..aa3e0edc39 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">Bản đồ</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Dặm</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Vị trí của Tôi</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Để sau</string>
@@ -875,34 +875,51 @@
 	<string name="type.healthcare.laboratory">Phòng thí nghiệm y tế</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Đường hầm</string>
 	<string name="type.highway.bus_stop">Bến xe buýt</string>
 	<string name="type.highway.construction">Đường đang thi công</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Đường hầm</string>
 	<string name="type.highway.footway">Đường</string>
 	<string name="type.highway.footway.alpine_hiking">Đường</string>
 	<string name="type.highway.footway.area">Đường</string>
-	<string name="type.highway.footway.bridge">Đường</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Cầu</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Đường</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Đường</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Đường</string>
 	<string name="type.highway.footway.hiking">Đường</string>
 	<string name="type.highway.footway.mountain_hiking">Đường</string>
 	<string name="type.highway.footway.permissive">Đường</string>
-	<string name="type.highway.footway.tunnel">Đường</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Đường hầm</string>
 	<string name="type.highway.ford">Đập tràn</string>
 	<string name="type.highway.living_street">Phố</string>
-	<string name="type.highway.living_street.bridge">Phố</string>
-	<string name="type.highway.living_street.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Đường hầm</string>
 	<string name="type.highway.motorway">Phố</string>
-	<string name="type.highway.motorway.bridge">Phố</string>
-	<string name="type.highway.motorway.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Đường hầm</string>
 	<string name="type.highway.motorway_junction">Lối ra</string>
 	<string name="type.highway.motorway_link">Phố</string>
-	<string name="type.highway.motorway_link.bridge">Phố</string>
-	<string name="type.highway.motorway_link.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Đường hầm</string>
 	<string name="type.highway.path">Đường</string>
 	<string name="type.highway.path.alpine_hiking">Đường</string>
 	<string name="type.highway.path.bicycle">Đường</string>
-	<string name="type.highway.path.bridge">Đường</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Cầu</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Đường</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Đường</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Đường</string>
@@ -910,51 +927,75 @@
 	<string name="type.highway.path.horse">Đường</string>
 	<string name="type.highway.path.mountain_hiking">Đường</string>
 	<string name="type.highway.path.permissive">Đường</string>
-	<string name="type.highway.path.tunnel">Đường</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Đường hầm</string>
 	<string name="type.highway.pedestrian">Phố</string>
 	<string name="type.highway.pedestrian.area">Phố</string>
-	<string name="type.highway.pedestrian.bridge">Phố</string>
-	<string name="type.highway.pedestrian.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Đường hầm</string>
 	<string name="type.highway.primary">Phố</string>
-	<string name="type.highway.primary.bridge">Phố</string>
-	<string name="type.highway.primary.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Đường hầm</string>
 	<string name="type.highway.primary_link">Phố</string>
-	<string name="type.highway.primary_link.bridge">Phố</string>
-	<string name="type.highway.primary_link.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Đường hầm</string>
 	<string name="type.highway.raceway">Đường đua</string>
 	<string name="type.highway.residential">Phố</string>
 	<string name="type.highway.residential.area">Phố</string>
-	<string name="type.highway.residential.bridge">Phố</string>
-	<string name="type.highway.residential.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Đường hầm</string>
 	<string name="type.highway.rest_area">Khu Vực Thụt Vào Để Đỗ Xe</string>
 	<string name="type.highway.road">Phố</string>
-	<string name="type.highway.road.bridge">Phố</string>
-	<string name="type.highway.road.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Đường hầm</string>
 	<string name="type.highway.secondary">Phố</string>
-	<string name="type.highway.secondary.bridge">Phố</string>
-	<string name="type.highway.secondary.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Đường hầm</string>
 	<string name="type.highway.secondary_link">Phố</string>
-	<string name="type.highway.secondary_link.bridge">Phố</string>
-	<string name="type.highway.secondary_link.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Đường hầm</string>
 	<string name="type.highway.service">Phố</string>
 	<string name="type.highway.service.area">Phố</string>
-	<string name="type.highway.service.bridge">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Cầu</string>
 	<string name="type.highway.service.driveway">Phố</string>
 	<string name="type.highway.service.parking_aisle">Phố</string>
-	<string name="type.highway.service.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Đường hầm</string>
 	<string name="type.highway.speed_camera">Camera bắn tốc độ</string>
 	<string name="type.highway.steps">Đường</string>
-	<string name="type.highway.steps.bridge">Đường</string>
-	<string name="type.highway.steps.tunnel">Đường</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Đường hầm</string>
 	<string name="type.highway.tertiary">Phố</string>
-	<string name="type.highway.tertiary.bridge">Phố</string>
-	<string name="type.highway.tertiary.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Đường hầm</string>
 	<string name="type.highway.tertiary_link">Phố</string>
-	<string name="type.highway.tertiary_link.bridge">Phố</string>
-	<string name="type.highway.tertiary_link.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Đường hầm</string>
 	<string name="type.highway.track">Phố</string>
 	<string name="type.highway.track.area">Phố</string>
-	<string name="type.highway.track.bridge">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Cầu</string>
 	<string name="type.highway.track.grade1">Phố</string>
 	<string name="type.highway.track.grade2">Phố</string>
 	<string name="type.highway.track.grade3">Phố</string>
@@ -962,18 +1003,25 @@
 	<string name="type.highway.track.grade5">Phố</string>
 	<string name="type.highway.track.no.access">Phố</string>
 	<string name="type.highway.track.permissive">Phố</string>
-	<string name="type.highway.track.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Đường hầm</string>
 	<string name="type.highway.traffic_signals">Đèn Giao Thông</string>
 	<string name="type.highway.trunk">Phố</string>
-	<string name="type.highway.trunk.bridge">Phố</string>
-	<string name="type.highway.trunk.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Đường hầm</string>
 	<string name="type.highway.trunk_link">Phố</string>
-	<string name="type.highway.trunk_link.bridge">Phố</string>
-	<string name="type.highway.trunk_link.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Đường hầm</string>
 	<string name="type.highway.unclassified">Phố</string>
 	<string name="type.highway.unclassified.area">Phố</string>
-	<string name="type.highway.unclassified.bridge">Phố</string>
-	<string name="type.highway.unclassified.tunnel">Phố</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Cầu</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Đường hầm</string>
 	<string name="type.area_highway.footway">Đường</string>
 	<string name="type.area_highway.living_street">Phố</string>
 	<string name="type.area_highway.motorway">Phố</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index fb00a056f3..96b7f8c4ba 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">地圖</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">英哩</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">我的位置</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">稍後</string>
@@ -909,34 +909,51 @@
 	<string name="type.healthcare.laboratory">醫學實驗室</string>
 
 	<!-- SECTION: Types: Roads -->
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">隧道</string>
 	<string name="type.highway.bus_stop">巴士站</string>
 	<string name="type.highway.construction">在建道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">隧道</string>
 	<string name="type.highway.footway">人行步道</string>
 	<string name="type.highway.footway.alpine_hiking">人行步道</string>
 	<string name="type.highway.footway.area">人行步道</string>
-	<string name="type.highway.footway.bridge">人行步道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">橋</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">人行步道</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">人行步道</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">人行步道</string>
 	<string name="type.highway.footway.hiking">人行步道</string>
 	<string name="type.highway.footway.mountain_hiking">人行步道</string>
 	<string name="type.highway.footway.permissive">人行步道</string>
-	<string name="type.highway.footway.tunnel">人行步道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">隧道</string>
 	<string name="type.highway.ford">淺灘</string>
 	<string name="type.highway.living_street">路</string>
-	<string name="type.highway.living_street.bridge">路</string>
-	<string name="type.highway.living_street.tunnel">路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">隧道</string>
 	<string name="type.highway.motorway">高速公路</string>
-	<string name="type.highway.motorway.bridge">高速公路</string>
-	<string name="type.highway.motorway.tunnel">高速公路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">隧道</string>
 	<string name="type.highway.motorway_junction">交流道</string>
 	<string name="type.highway.motorway_link">高速公路連接路</string>
-	<string name="type.highway.motorway_link.bridge">高速公路連接路</string>
-	<string name="type.highway.motorway_link.tunnel">高速公路連接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">隧道</string>
 	<string name="type.highway.path">人行步道</string>
 	<string name="type.highway.path.alpine_hiking">人行步道</string>
 	<string name="type.highway.path.bicycle">人行步道</string>
-	<string name="type.highway.path.bridge">人行步道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">橋</string>
 	<string name="type.highway.path.demanding_alpine_hiking">人行步道</string>
 	<string name="type.highway.path.demanding_mountain_hiking">人行步道</string>
 	<string name="type.highway.path.difficult_alpine_hiking">人行步道</string>
@@ -944,52 +961,76 @@
 	<string name="type.highway.path.horse">人行步道</string>
 	<string name="type.highway.path.mountain_hiking">人行步道</string>
 	<string name="type.highway.path.permissive">人行步道</string>
-	<string name="type.highway.path.tunnel">人行步道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">隧道</string>
 	<string name="type.highway.pedestrian">路</string>
 	<string name="type.highway.pedestrian.area">路</string>
-	<string name="type.highway.pedestrian.bridge">路</string>
-	<string name="type.highway.pedestrian.tunnel">路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">隧道</string>
 	<string name="type.highway.primary">主要道路</string>
-	<string name="type.highway.primary.bridge">主要道路</string>
-	<string name="type.highway.primary.tunnel">主要道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">隧道</string>
 	<string name="type.highway.primary_link">主要道路連接路</string>
-	<string name="type.highway.primary_link.bridge">主要道路連接路</string>
-	<string name="type.highway.primary_link.tunnel">主要道路連接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">隧道</string>
 	<string name="type.highway.raceway">跑道</string>
 	<string name="type.highway.residential">住宅區道路</string>
 	<string name="type.highway.residential.area">住宅區道路</string>
-	<string name="type.highway.residential.bridge">住宅區道路</string>
-	<string name="type.highway.residential.tunnel">住宅區道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">隧道</string>
 	<string name="type.highway.rest_area">休息區</string>
 	<string name="type.highway.road">道路</string>
-	<string name="type.highway.road.bridge">道路</string>
-	<string name="type.highway.road.tunnel">道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">隧道</string>
 	<string name="type.highway.secondary">次要道路</string>
-	<string name="type.highway.secondary.bridge">次要道路</string>
-	<string name="type.highway.secondary.tunnel">次要道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">隧道</string>
 	<string name="type.highway.secondary_link">次要道路連接路</string>
-	<string name="type.highway.secondary_link.bridge">次要道路連接路</string>
-	<string name="type.highway.secondary_link.tunnel">次要道路連接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">隧道</string>
 	<string name="type.highway.service">輔助道路</string>
 	<string name="type.highway.service.area">輔助道路</string>
-	<string name="type.highway.service.bridge">輔助道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">橋</string>
 	<string name="type.highway.service.driveway">車道</string>
 	<string name="type.highway.service.parking_aisle">停車場通道</string>
-	<string name="type.highway.service.tunnel">輔助道路</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">隧道</string>
 	<string name="type.highway.services">服務區</string>
 	<string name="type.highway.speed_camera">測速照相機</string>
 	<string name="type.highway.steps">人行步道</string>
-	<string name="type.highway.steps.bridge">人行步道</string>
-	<string name="type.highway.steps.tunnel">人行步道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">隧道</string>
 	<string name="type.highway.tertiary">三级道路</string>
-	<string name="type.highway.tertiary.bridge">三级道路</string>
-	<string name="type.highway.tertiary.tunnel">三级道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">隧道</string>
 	<string name="type.highway.tertiary_link">三级道路連接路</string>
-	<string name="type.highway.tertiary_link.bridge">三级道路連接路</string>
-	<string name="type.highway.tertiary_link.tunnel">三级道路連接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">隧道</string>
 	<string name="type.highway.track">土路</string>
 	<string name="type.highway.track.area">土路</string>
-	<string name="type.highway.track.bridge">土路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">橋</string>
 	<string name="type.highway.track.grade1">土路</string>
 	<string name="type.highway.track.grade2">土路</string>
 	<string name="type.highway.track.grade3">土路</string>
@@ -997,18 +1038,25 @@
 	<string name="type.highway.track.grade5">土路</string>
 	<string name="type.highway.track.no.access">土路</string>
 	<string name="type.highway.track.permissive">土路</string>
-	<string name="type.highway.track.tunnel">土路</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">隧道</string>
 	<string name="type.highway.traffic_signals">紅綠燈</string>
 	<string name="type.highway.trunk">主幹道</string>
-	<string name="type.highway.trunk.bridge">主幹道</string>
-	<string name="type.highway.trunk.tunnel">主幹道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">隧道</string>
 	<string name="type.highway.trunk_link">主幹道連接路</string>
-	<string name="type.highway.trunk_link.bridge">主幹道連接路</string>
-	<string name="type.highway.trunk_link.tunnel">主幹道連接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">隧道</string>
 	<string name="type.highway.unclassified">道路</string>
 	<string name="type.highway.unclassified.area">道路</string>
-	<string name="type.highway.unclassified.bridge">道路</string>
-	<string name="type.highway.unclassified.tunnel">道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">橋</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">隧道</string>
 	<string name="type.area_highway.footway">人行步道</string>
 	<string name="type.area_highway.living_street">路</string>
 	<string name="type.area_highway.motorway">高速公路</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 5543f9a992..43e7301054 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -21,7 +21,7 @@
 	<string name="maps">地图</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">英里</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">我的位置</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">稍后</string>
@@ -932,41 +932,54 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">公路要素</string>
 	<string name="type.highway.bridleway">马道</string>
-	<string name="type.highway.bridleway.bridge">马道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">桥</string>
 	<string name="type.highway.bridleway.permissive">马道</string>
-	<string name="type.highway.bridleway.tunnel">马道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">隧道</string>
 	<string name="type.highway.bus_stop">公交站</string>
 	<string name="type.highway.construction">在建道路</string>
 	<string name="type.highway.cycleway">自行车道</string>
-	<string name="type.highway.cycleway.bridge">自行车道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">桥</string>
 	<string name="type.highway.cycleway.permissive">自行车道</string>
-	<string name="type.highway.cycleway.tunnel">自行车道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">隧道</string>
 	<string name="type.highway.footway">步行道路</string>
 	<string name="type.highway.footway.alpine_hiking">步行道路</string>
 	<string name="type.highway.footway.area">步行道路</string>
-	<string name="type.highway.footway.bridge">步行道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">桥</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">步行道路</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">步行道路</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">步行道路</string>
 	<string name="type.highway.footway.hiking">步行道路</string>
 	<string name="type.highway.footway.mountain_hiking">步行道路</string>
 	<string name="type.highway.footway.permissive">步行道路</string>
-	<string name="type.highway.footway.tunnel">步行道路</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">隧道</string>
 	<string name="type.highway.ford">浅滩</string>
 	<string name="type.highway.living_street">生活性街道</string>
-	<string name="type.highway.living_street.bridge">生活性街道</string>
-	<string name="type.highway.living_street.tunnel">生活性街道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">隧道</string>
 	<string name="type.highway.motorway">高速公路</string>
-	<string name="type.highway.motorway.bridge">高速公路</string>
-	<string name="type.highway.motorway.tunnel">高速公路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">隧道</string>
 	<string name="type.highway.motorway_junction">出口</string>
 	<string name="type.highway.motorway_link">高速公路连接路</string>
-	<string name="type.highway.motorway_link.bridge">高速公路连接路</string>
-	<string name="type.highway.motorway_link.tunnel">高速公路连接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">隧道</string>
 	<string name="type.highway.path">小道</string>
 	<string name="type.highway.path.alpine_hiking">小道</string>
 	<string name="type.highway.path.bicycle">小道</string>
-	<string name="type.highway.path.bridge">小道</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">桥</string>
 	<string name="type.highway.path.demanding_alpine_hiking">小道</string>
 	<string name="type.highway.path.demanding_mountain_hiking">小道</string>
 	<string name="type.highway.path.difficult_alpine_hiking">小道</string>
@@ -974,52 +987,76 @@
 	<string name="type.highway.path.horse">小道</string>
 	<string name="type.highway.path.mountain_hiking">小道</string>
 	<string name="type.highway.path.permissive">小道</string>
-	<string name="type.highway.path.tunnel">小道</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">隧道</string>
 	<string name="type.highway.pedestrian">步行街</string>
 	<string name="type.highway.pedestrian.area">步行区域</string>
-	<string name="type.highway.pedestrian.bridge">步行街</string>
-	<string name="type.highway.pedestrian.tunnel">步行街</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">隧道</string>
 	<string name="type.highway.primary">主要道路</string>
-	<string name="type.highway.primary.bridge">主要道路</string>
-	<string name="type.highway.primary.tunnel">主要道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">隧道</string>
 	<string name="type.highway.primary_link">主要道路连接路</string>
-	<string name="type.highway.primary_link.bridge">主要道路连接路</string>
-	<string name="type.highway.primary_link.tunnel">主要道路连接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">隧道</string>
 	<string name="type.highway.raceway">赛车场</string>
 	<string name="type.highway.residential">住宅区道路</string>
 	<string name="type.highway.residential.area">住宅区道路</string>
-	<string name="type.highway.residential.bridge">住宅区道路</string>
-	<string name="type.highway.residential.tunnel">住宅区道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">隧道</string>
 	<string name="type.highway.rest_area">休息区</string>
 	<string name="type.highway.road">道路</string>
-	<string name="type.highway.road.bridge">道路</string>
-	<string name="type.highway.road.tunnel">道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">隧道</string>
 	<string name="type.highway.secondary">次要道路</string>
-	<string name="type.highway.secondary.bridge">次要道路</string>
-	<string name="type.highway.secondary.tunnel">次要道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">隧道</string>
 	<string name="type.highway.secondary_link">次要道路连接路</string>
-	<string name="type.highway.secondary_link.bridge">次要道路连接路</string>
-	<string name="type.highway.secondary_link.tunnel">次要道路连接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">隧道</string>
 	<string name="type.highway.service">辅助道路</string>
 	<string name="type.highway.service.area">辅助道路</string>
-	<string name="type.highway.service.bridge">辅助道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">桥</string>
 	<string name="type.highway.service.driveway">车道</string>
 	<string name="type.highway.service.parking_aisle">停车场通道</string>
-	<string name="type.highway.service.tunnel">辅助道路</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">隧道</string>
 	<string name="type.highway.services">服务区</string>
 	<string name="type.highway.speed_camera">超速摄像头</string>
 	<string name="type.highway.steps">阶梯</string>
-	<string name="type.highway.steps.bridge">阶梯</string>
-	<string name="type.highway.steps.tunnel">阶梯</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">隧道</string>
 	<string name="type.highway.tertiary">三级道路</string>
-	<string name="type.highway.tertiary.bridge">三级道路</string>
-	<string name="type.highway.tertiary.tunnel">三级道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">隧道</string>
 	<string name="type.highway.tertiary_link">三级道路连接路</string>
-	<string name="type.highway.tertiary_link.bridge">三级道路连接路</string>
-	<string name="type.highway.tertiary_link.tunnel">三级道路连接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">隧道</string>
 	<string name="type.highway.track">土路</string>
 	<string name="type.highway.track.area">土路</string>
-	<string name="type.highway.track.bridge">土路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">桥</string>
 	<string name="type.highway.track.grade1">土路</string>
 	<string name="type.highway.track.grade2">土路</string>
 	<string name="type.highway.track.grade3">土路</string>
@@ -1027,18 +1064,25 @@
 	<string name="type.highway.track.grade5">土路</string>
 	<string name="type.highway.track.no.access">土路</string>
 	<string name="type.highway.track.permissive">土路</string>
-	<string name="type.highway.track.tunnel">土路</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">隧道</string>
 	<string name="type.highway.traffic_signals">交通信号灯</string>
 	<string name="type.highway.trunk">干线道路</string>
-	<string name="type.highway.trunk.bridge">干线道路</string>
-	<string name="type.highway.trunk.tunnel">干线道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">隧道</string>
 	<string name="type.highway.trunk_link">干线道路连接路</string>
-	<string name="type.highway.trunk_link.bridge">干线道路连接路</string>
-	<string name="type.highway.trunk_link.tunnel">干线道路连接路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">隧道</string>
 	<string name="type.highway.unclassified">道路</string>
 	<string name="type.highway.unclassified.area">道路</string>
-	<string name="type.highway.unclassified.bridge">道路</string>
-	<string name="type.highway.unclassified.tunnel">道路</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">桥</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">隧道</string>
 	<string name="type.area_highway.cycleway">自行车道</string>
 	<string name="type.area_highway.footway">步行道路</string>
 	<string name="type.area_highway.living_street">生活性街道</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index bbc7d3f4bc..ddb7a4de4b 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -24,7 +24,7 @@
 	<string name="gb">GB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Miles</string>
-	<!-- View and button titles for accessibility -->
+	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">My Position</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Later</string>
@@ -987,42 +987,55 @@
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway">Highway</string>
 	<string name="type.highway.bridleway">Bridle Path</string>
-	<string name="type.highway.bridleway.bridge">Bridle Path</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.bridleway.bridge">Bridge</string>
 	<string name="type.highway.bridleway.permissive">Bridle Path</string>
-	<string name="type.highway.bridleway.tunnel">Bridle Path</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Bus Stop</string>
 	<string name="type.highway.construction">Road Under Construction</string>
 	<string name="type.highway.cycleway">Cycle Path</string>
-	<string name="type.highway.cycleway.bridge">Cycle Path</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.cycleway.bridge">Bridge</string>
 	<string name="type.highway.cycleway.permissive">Cycle Path</string>
-	<string name="type.highway.cycleway.tunnel">Cycle Path</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.cycleway.tunnel">Tunnel</string>
 	<string name="type.highway.elevator">Elevator</string>
 	<string name="type.highway.footway">Foot Path</string>
 	<string name="type.highway.footway.alpine_hiking">Path</string>
 	<string name="type.highway.footway.area">Pedestrian Zone</string>
-	<string name="type.highway.footway.bridge">Foot Path</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.footway.bridge">Pedestrian Bridge</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Path</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Path</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Path</string>
 	<string name="type.highway.footway.hiking">Path</string>
 	<string name="type.highway.footway.mountain_hiking">Path</string>
 	<string name="type.highway.footway.permissive">Foot Path</string>
-	<string name="type.highway.footway.tunnel">Foot Path</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.footway.tunnel">Pedestrian Tunnel</string>
 	<string name="type.highway.ford">Ford</string>
 	<string name="type.highway.living_street">Living Street</string>
-	<string name="type.highway.living_street.bridge">Living Street</string>
-	<string name="type.highway.living_street.tunnel">Living Street</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.living_street.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.living_street.tunnel">Tunnel</string>
 	<string name="type.highway.motorway">Motorway</string>
-	<string name="type.highway.motorway.bridge">Motorway</string>
-	<string name="type.highway.motorway.tunnel">Motorway</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway.bridge">Motorway Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway.tunnel">Motorway Tunnel</string>
 	<string name="type.highway.motorway_junction">Road Exit</string>
 	<string name="type.highway.motorway_link">Motorway Ramp</string>
-	<string name="type.highway.motorway_link.bridge">Motorway Ramp</string>
-	<string name="type.highway.motorway_link.tunnel">Motorway Ramp</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.motorway_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Path</string>
 	<string name="type.highway.path.alpine_hiking">Path</string>
 	<string name="type.highway.path.bicycle">Cycle &amp; Foot Path</string>
-	<string name="type.highway.path.bridge">Path</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.path.bridge">Bridge</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Path</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Path</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Path</string>
@@ -1030,52 +1043,76 @@
 	<string name="type.highway.path.horse">Bridle Path</string>
 	<string name="type.highway.path.mountain_hiking">Path</string>
 	<string name="type.highway.path.permissive">Path</string>
-	<string name="type.highway.path.tunnel">Path</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Pedestrian Street</string>
 	<string name="type.highway.pedestrian.area">Pedestrian Zone</string>
-	<string name="type.highway.pedestrian.bridge">Pedestrian Street</string>
-	<string name="type.highway.pedestrian.tunnel">Pedestrian Street</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.pedestrian.bridge">Pedestrian Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.pedestrian.tunnel">Pedestrian Tunnel</string>
 	<string name="type.highway.primary">Primary Road</string>
-	<string name="type.highway.primary.bridge">Primary Road</string>
-	<string name="type.highway.primary.tunnel">Primary Road</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary.tunnel">Tunnel</string>
 	<string name="type.highway.primary_link">Primary Road Ramp</string>
-	<string name="type.highway.primary_link.bridge">Primary Road Ramp</string>
-	<string name="type.highway.primary_link.tunnel">Primary Road Ramp</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.primary_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Racetrack</string>
 	<string name="type.highway.residential">Street</string>
 	<string name="type.highway.residential.area">Street</string>
-	<string name="type.highway.residential.bridge">Street</string>
-	<string name="type.highway.residential.tunnel">Street</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.residential.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Rest Area</string>
 	<string name="type.highway.road">Road</string>
-	<string name="type.highway.road.bridge">Road</string>
-	<string name="type.highway.road.tunnel">Road</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.road.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.road.tunnel">Tunnel</string>
 	<string name="type.highway.secondary">Secondary Road</string>
-	<string name="type.highway.secondary.bridge">Secondary Road</string>
-	<string name="type.highway.secondary.tunnel">Secondary Road</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary.tunnel">Tunnel</string>
 	<string name="type.highway.secondary_link">Secondary Road Ramp</string>
-	<string name="type.highway.secondary_link.bridge">Secondary Road Ramp</string>
-	<string name="type.highway.secondary_link.tunnel">Secondary Road Ramp</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.secondary_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
 	<string name="type.highway.service">Service Road</string>
 	<string name="type.highway.service.area">Service Road</string>
-	<string name="type.highway.service.bridge">Service Road</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.service.bridge">Bridge</string>
 	<string name="type.highway.service.driveway">Driveway</string>
 	<string name="type.highway.service.parking_aisle">Parking Aisle</string>
-	<string name="type.highway.service.tunnel">Service Road</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.services">Service Area</string>
 	<string name="type.highway.speed_camera">Speed Camera</string>
 	<string name="type.highway.steps">Stairs</string>
-	<string name="type.highway.steps.bridge">Stairs</string>
-	<string name="type.highway.steps.tunnel">Stairs</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.steps.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.steps.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary">Tertiary Road</string>
-	<string name="type.highway.tertiary.bridge">Tertiary Road</string>
-	<string name="type.highway.tertiary.tunnel">Tertiary Road</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary.tunnel">Tunnel</string>
 	<string name="type.highway.tertiary_link">Tertiary Road Ramp</string>
-	<string name="type.highway.tertiary_link.bridge">Tertiary Road Ramp</string>
-	<string name="type.highway.tertiary_link.tunnel">Tertiary Road Ramp</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.tertiary_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
 	<string name="type.highway.track">Track</string>
 	<string name="type.highway.track.area">Track</string>
-	<string name="type.highway.track.bridge">Track</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.track.bridge">Bridge</string>
 	<string name="type.highway.track.grade1">Track</string>
 	<string name="type.highway.track.grade2">Track</string>
 	<string name="type.highway.track.grade3">Track</string>
@@ -1083,18 +1120,25 @@
 	<string name="type.highway.track.grade5">Track</string>
 	<string name="type.highway.track.no.access">Track</string>
 	<string name="type.highway.track.permissive">Track</string>
-	<string name="type.highway.track.tunnel">Track</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Traffic Lights</string>
 	<string name="type.highway.trunk">National Highway</string>
-	<string name="type.highway.trunk.bridge">National Highway</string>
-	<string name="type.highway.trunk.tunnel">National Highway</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk.tunnel">Tunnel</string>
 	<string name="type.highway.trunk_link">National Highway Ramp</string>
-	<string name="type.highway.trunk_link.bridge">National Highway Ramp</string>
-	<string name="type.highway.trunk_link.tunnel">National Highway Ramp</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.trunk_link.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
 	<string name="type.highway.unclassified">Minor Road</string>
 	<string name="type.highway.unclassified.area">Minor Road</string>
-	<string name="type.highway.unclassified.bridge">Minor Road</string>
-	<string name="type.highway.unclassified.tunnel">Minor Road</string>
+	<!-- These translations are used for all type.highway.*.bridge. -->
+	<string name="type.highway.unclassified.bridge">Bridge</string>
+	<!-- These translations are used for all type.highway.*.tunnel. -->
+	<string name="type.highway.unclassified.tunnel">Tunnel</string>
 	<string name="type.area_highway.cycleway">Cycle Path</string>
 	<string name="type.area_highway.footway">Foot Path</string>
 	<string name="type.area_highway.living_street">Living Street</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 4ef6d88c97..bed8fffc40 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "ميل";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "موقعي";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "كوبري";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "نفق";
 
 "type.highway.bus_stop" = "موقف حافلة";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "كوبري";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "نفق";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "مسار";
 
-"type.highway.footway.bridge" = "مسار";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "كوبري";
 
 "type.highway.footway.demanding_alpine_hiking" = "مسار";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "مسار";
 
-"type.highway.footway.tunnel" = "مسار";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "نفق";
 
 "type.highway.ford" = "مخاضة";
 
 "type.highway.living_street" = "شارع";
 
-"type.highway.living_street.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "كوبري";
 
-"type.highway.living_street.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "نفق";
 
 "type.highway.motorway" = "شارع";
 
-"type.highway.motorway.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "كوبري";
 
-"type.highway.motorway.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "نفق";
 
 "type.highway.motorway_junction" = "مخرج";
 
 "type.highway.motorway_link" = "شارع";
 
-"type.highway.motorway_link.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "كوبري";
 
-"type.highway.motorway_link.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "نفق";
 
 "type.highway.path" = "مسار";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "مسار";
 
-"type.highway.path.bridge" = "مسار";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "كوبري";
 
 "type.highway.path.demanding_alpine_hiking" = "مسار";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "مسار";
 
-"type.highway.path.tunnel" = "مسار";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "نفق";
 
 "type.highway.pedestrian" = "شارع";
 
 "type.highway.pedestrian.area" = "شارع";
 
-"type.highway.pedestrian.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "كوبري";
 
-"type.highway.pedestrian.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "نفق";
 
 "type.highway.primary" = "شارع";
 
-"type.highway.primary.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "كوبري";
 
-"type.highway.primary.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "نفق";
 
 "type.highway.primary_link" = "شارع";
 
-"type.highway.primary_link.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "كوبري";
 
-"type.highway.primary_link.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "نفق";
 
 "type.highway.raceway" = "مسار سباق";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "شارع";
 
-"type.highway.residential.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "كوبري";
 
-"type.highway.residential.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "نفق";
 
 "type.highway.rest_area" = "استراحة";
 
 "type.highway.road" = "شارع";
 
-"type.highway.road.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "كوبري";
 
-"type.highway.road.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "نفق";
 
 "type.highway.secondary" = "شارع";
 
-"type.highway.secondary.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "كوبري";
 
-"type.highway.secondary.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "نفق";
 
 "type.highway.secondary_link" = "شارع";
 
-"type.highway.secondary_link.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "كوبري";
 
-"type.highway.secondary_link.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "نفق";
 
 "type.highway.service" = "شارع";
 
 "type.highway.service.area" = "شارع";
 
-"type.highway.service.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "كوبري";
 
 "type.highway.service.driveway" = "شارع";
 
 "type.highway.service.parking_aisle" = "شارع";
 
-"type.highway.service.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "نفق";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "مسار";
 
-"type.highway.steps.bridge" = "مسار";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "كوبري";
 
-"type.highway.steps.tunnel" = "مسار";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "نفق";
 
 "type.highway.tertiary" = "شارع";
 
-"type.highway.tertiary.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "كوبري";
 
-"type.highway.tertiary.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "نفق";
 
 "type.highway.tertiary_link" = "شارع";
 
-"type.highway.tertiary_link.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "كوبري";
 
-"type.highway.tertiary_link.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "نفق";
 
 "type.highway.track" = "شارع";
 
 "type.highway.track.area" = "شارع";
 
-"type.highway.track.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "كوبري";
 
 "type.highway.track.grade1" = "شارع";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "شارع";
 
-"type.highway.track.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "نفق";
 
 "type.highway.traffic_signals" = "إشارات مرور";
 
 "type.highway.trunk" = "شارع";
 
-"type.highway.trunk.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "كوبري";
 
-"type.highway.trunk.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "نفق";
 
 "type.highway.trunk_link" = "شارع";
 
-"type.highway.trunk_link.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "كوبري";
 
-"type.highway.trunk_link.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "نفق";
 
 "type.highway.unclassified" = "شارع";
 
 "type.highway.unclassified.area" = "شارع";
 
-"type.highway.unclassified.bridge" = "شارع";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "كوبري";
 
-"type.highway.unclassified.tunnel" = "شارع";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "نفق";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 97a5a3bac4..da3bf5da70 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Мілі";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Маё месцазнаходжанне";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Мост";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Тунэль";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Мост";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Тунэль";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Foot Path";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Мост";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Тунэль";
 
 "type.highway.ford" = "Ford";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Мост";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Тунэль";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Мост";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Тунэль";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway";
 
-"type.highway.motorway_link.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Мост";
 
-"type.highway.motorway_link.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Тунэль";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Мост";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Тунэль";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Street";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Мост";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Тунэль";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Мост";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Тунэль";
 
 "type.highway.primary_link" = "Primary Road";
 
-"type.highway.primary_link.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Мост";
 
-"type.highway.primary_link.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Тунэль";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Мост";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Тунэль";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Мост";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Тунэль";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Мост";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Тунэль";
 
 "type.highway.secondary_link" = "Secondary Road";
 
-"type.highway.secondary_link.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Мост";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Тунэль";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Мост";
 
 "type.highway.service.driveway" = "Service Road";
 
 "type.highway.service.parking_aisle" = "Service Road";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Тунэль";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Мост";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Тунэль";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Мост";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Тунэль";
 
 "type.highway.tertiary_link" = "Tertiary Road";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Мост";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Тунэль";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Мост";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Тунэль";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Мост";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Тунэль";
 
 "type.highway.trunk_link" = "National Highway";
 
-"type.highway.trunk_link.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Мост";
 
-"type.highway.trunk_link.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Тунэль";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Мост";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Тунэль";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index e409ca8e26..6b9bbd39bc 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Мили";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Мое местоположение";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Мост";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Тунел";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Мост";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Тунел";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Foot Path";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Мост";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Тунел";
 
 "type.highway.ford" = "Ford";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Мост";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Тунел";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Мост";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Тунел";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway";
 
-"type.highway.motorway_link.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Мост";
 
-"type.highway.motorway_link.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Тунел";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Мост";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Тунел";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Street";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Мост";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Тунел";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Мост";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Тунел";
 
 "type.highway.primary_link" = "Primary Road";
 
-"type.highway.primary_link.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Мост";
 
-"type.highway.primary_link.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Тунел";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Мост";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Тунел";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Мост";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Тунел";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Мост";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Тунел";
 
 "type.highway.secondary_link" = "Secondary Road";
 
-"type.highway.secondary_link.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Мост";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Тунел";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Мост";
 
 "type.highway.service.driveway" = "Service Road";
 
 "type.highway.service.parking_aisle" = "Service Road";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Тунел";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Мост";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Тунел";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Мост";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Тунел";
 
 "type.highway.tertiary_link" = "Tertiary Road";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Мост";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Тунел";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Мост";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Тунел";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Мост";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Тунел";
 
 "type.highway.trunk_link" = "National Highway";
 
-"type.highway.trunk_link.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Мост";
 
-"type.highway.trunk_link.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Тунел";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Мост";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Тунел";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 3d3c481216..7fa837cba0 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Míle";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Moje poloha";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Most";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunel";
 
 "type.highway.bus_stop" = "Autobusová zastávka";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Most";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Cesta";
 
-"type.highway.footway.bridge" = "Cesta";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Most";
 
 "type.highway.footway.demanding_alpine_hiking" = "Cesta";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Cesta";
 
-"type.highway.footway.tunnel" = "Cesta";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunel";
 
 "type.highway.ford" = "Brod";
 
 "type.highway.living_street" = "Ulice";
 
-"type.highway.living_street.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Most";
 
-"type.highway.living_street.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunel";
 
 "type.highway.motorway" = "Ulice";
 
-"type.highway.motorway.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Most";
 
-"type.highway.motorway.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunel";
 
 "type.highway.motorway_junction" = "Dopravní uzel";
 
 "type.highway.motorway_link" = "Ulice";
 
-"type.highway.motorway_link.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Most";
 
-"type.highway.motorway_link.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunel";
 
 "type.highway.path" = "Cesta";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Cesta";
 
-"type.highway.path.bridge" = "Cesta";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Most";
 
 "type.highway.path.demanding_alpine_hiking" = "Cesta";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Cesta";
 
-"type.highway.path.tunnel" = "Cesta";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunel";
 
 "type.highway.pedestrian" = "Ulice";
 
 "type.highway.pedestrian.area" = "Ulice";
 
-"type.highway.pedestrian.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Most";
 
-"type.highway.pedestrian.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunel";
 
 "type.highway.primary" = "Ulice";
 
-"type.highway.primary.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Most";
 
-"type.highway.primary.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunel";
 
 "type.highway.primary_link" = "Ulice";
 
-"type.highway.primary_link.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Most";
 
-"type.highway.primary_link.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunel";
 
 "type.highway.raceway" = "Závodiště";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Ulice";
 
-"type.highway.residential.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Most";
 
-"type.highway.residential.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunel";
 
 "type.highway.rest_area" = "Odpočívadlo";
 
 "type.highway.road" = "Ulice";
 
-"type.highway.road.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Most";
 
-"type.highway.road.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunel";
 
 "type.highway.secondary" = "Ulice";
 
-"type.highway.secondary.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Most";
 
-"type.highway.secondary.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunel";
 
 "type.highway.secondary_link" = "Ulice";
 
-"type.highway.secondary_link.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Most";
 
-"type.highway.secondary_link.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunel";
 
 "type.highway.service" = "Ulice";
 
 "type.highway.service.area" = "Ulice";
 
-"type.highway.service.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Most";
 
 "type.highway.service.driveway" = "Ulice";
 
 "type.highway.service.parking_aisle" = "Ulice";
 
-"type.highway.service.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Cesta";
 
-"type.highway.steps.bridge" = "Cesta";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Most";
 
-"type.highway.steps.tunnel" = "Cesta";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunel";
 
 "type.highway.tertiary" = "Ulice";
 
-"type.highway.tertiary.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Most";
 
-"type.highway.tertiary.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunel";
 
 "type.highway.tertiary_link" = "Ulice";
 
-"type.highway.tertiary_link.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Most";
 
-"type.highway.tertiary_link.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunel";
 
 "type.highway.track" = "Ulice";
 
 "type.highway.track.area" = "Ulice";
 
-"type.highway.track.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Most";
 
 "type.highway.track.grade1" = "Ulice";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Ulice";
 
-"type.highway.track.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunel";
 
 "type.highway.traffic_signals" = "Semafor";
 
 "type.highway.trunk" = "Ulice";
 
-"type.highway.trunk.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Most";
 
-"type.highway.trunk.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunel";
 
 "type.highway.trunk_link" = "Ulice";
 
-"type.highway.trunk_link.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Most";
 
-"type.highway.trunk_link.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunel";
 
 "type.highway.unclassified" = "Ulice";
 
 "type.highway.unclassified.area" = "Ulice";
 
-"type.highway.unclassified.bridge" = "Ulice";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Most";
 
-"type.highway.unclassified.tunnel" = "Ulice";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index c49cfdaad9..339961281e 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mil";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Min position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Bro";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Busstoppested";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Bro";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Sti";
 
-"type.highway.footway.bridge" = "Sti";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Bro";
 
 "type.highway.footway.demanding_alpine_hiking" = "Sti";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Sti";
 
-"type.highway.footway.tunnel" = "Sti";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunnel";
 
 "type.highway.ford" = "Vadested";
 
 "type.highway.living_street" = "Gade";
 
-"type.highway.living_street.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Bro";
 
-"type.highway.living_street.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Gade";
 
-"type.highway.motorway.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Bro";
 
-"type.highway.motorway.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunnel";
 
 "type.highway.motorway_junction" = "Motorvejsafkørsel";
 
 "type.highway.motorway_link" = "Gade";
 
-"type.highway.motorway_link.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Bro";
 
-"type.highway.motorway_link.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Sti";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Sti";
 
-"type.highway.path.bridge" = "Sti";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Bro";
 
 "type.highway.path.demanding_alpine_hiking" = "Sti";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Sti";
 
-"type.highway.path.tunnel" = "Sti";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Gade";
 
 "type.highway.pedestrian.area" = "Gade";
 
-"type.highway.pedestrian.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Bro";
 
-"type.highway.pedestrian.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunnel";
 
 "type.highway.primary" = "Gade";
 
-"type.highway.primary.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Bro";
 
-"type.highway.primary.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Gade";
 
-"type.highway.primary_link.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Bro";
 
-"type.highway.primary_link.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Væddeløbsbane";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Gade";
 
-"type.highway.residential.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Bro";
 
-"type.highway.residential.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Rasteplads";
 
 "type.highway.road" = "Gade";
 
-"type.highway.road.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Bro";
 
-"type.highway.road.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Gade";
 
-"type.highway.secondary.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Bro";
 
-"type.highway.secondary.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Gade";
 
-"type.highway.secondary_link.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Bro";
 
-"type.highway.secondary_link.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Gade";
 
 "type.highway.service.area" = "Gade";
 
-"type.highway.service.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Bro";
 
 "type.highway.service.driveway" = "Gade";
 
 "type.highway.service.parking_aisle" = "Gade";
 
-"type.highway.service.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Sti";
 
-"type.highway.steps.bridge" = "Sti";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Bro";
 
-"type.highway.steps.tunnel" = "Sti";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Gade";
 
-"type.highway.tertiary.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Bro";
 
-"type.highway.tertiary.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Gade";
 
-"type.highway.tertiary_link.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Bro";
 
-"type.highway.tertiary_link.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Gade";
 
 "type.highway.track.area" = "Gade";
 
-"type.highway.track.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Bro";
 
 "type.highway.track.grade1" = "Gade";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Gade";
 
-"type.highway.track.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Trafiklys";
 
 "type.highway.trunk" = "Gade";
 
-"type.highway.trunk.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Bro";
 
-"type.highway.trunk.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "Gade";
 
-"type.highway.trunk_link.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Bro";
 
-"type.highway.trunk_link.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Gade";
 
 "type.highway.unclassified.area" = "Gade";
 
-"type.highway.unclassified.bridge" = "Gade";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Bro";
 
-"type.highway.unclassified.tunnel" = "Gade";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 95532382d6..8a76e72b93 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Meilen";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mein Standort";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Reitweg";
 
-"type.highway.bridleway.bridge" = "Reitweg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Brücke";
 
 "type.highway.bridleway.permissive" = "Reitweg";
 
-"type.highway.bridleway.tunnel" = "Reitweg";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Bushaltestelle";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Radweg";
 
-"type.highway.cycleway.bridge" = "Radweg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Brücke";
 
 "type.highway.cycleway.permissive" = "Radweg";
 
-"type.highway.cycleway.tunnel" = "Radweg";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Aufzug";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Fußweg";
 
-"type.highway.footway.bridge" = "Fußweg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Brücke";
 
 "type.highway.footway.demanding_alpine_hiking" = "Anspruchsvoller Alpinwanderweg";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Fußweg";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Fußgängertunnel";
 
 "type.highway.ford" = "Furt";
 
 "type.highway.living_street" = "Spielstraße";
 
-"type.highway.living_street.bridge" = "Spielstraße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Spielstraßentunnel";
 
 "type.highway.motorway" = "Autobahn";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway.bridge" = "Autobahnbrücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.motorway.tunnel" = "Autobahntunnel";
 
 "type.highway.motorway_junction" = "Autobahnausfahrt";
 
 "type.highway.motorway_link" = "Autobahnauffahrt";
 
-"type.highway.motorway_link.bridge" = "Autobahnauffahrt";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Brücke";
 
-"type.highway.motorway_link.tunnel" = "Autobahnauffahrt";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Weg";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Radweg";
 
-"type.highway.path.bridge" = "Weg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Brücke";
 
 "type.highway.path.demanding_alpine_hiking" = "Anspruchsvoller Alpinwanderweg";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Weg";
 
-"type.highway.path.tunnel" = "Weg";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Fußgängerzone";
 
 "type.highway.pedestrian.area" = "Fußgängerzone";
 
-"type.highway.pedestrian.bridge" = "Fußgängerzone";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Fußgängertunnel";
 
 "type.highway.primary" = "Hauptstraße";
 
-"type.highway.primary.bridge" = "Hauptstraße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Hauptstraßentunnel";
 
 "type.highway.primary_link" = "Hauptstraße";
 
-"type.highway.primary_link.bridge" = "Hauptstraße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Brücke";
 
-"type.highway.primary_link.tunnel" = "Hauptstraße";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Rennbahn";
 
@@ -1879,40 +1899,50 @@
 
 "type.highway.residential.area" = "Wohnstraße";
 
-"type.highway.residential.bridge" = "Wohnstraße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.residential.tunnel" = "Wohnstraßentunnel";
 
 "type.highway.rest_area" = "Rastplatz";
 
 "type.highway.road" = "Straße";
 
-"type.highway.road.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Brücke";
 
-"type.highway.road.tunnel" = "Straßentunnel";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Straße";
 
-"type.highway.secondary.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Straßentunnel";
 
 "type.highway.secondary_link" = "Straße";
 
-"type.highway.secondary_link.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Straßentunnel";
 
 "type.highway.service" = "Straße";
 
 "type.highway.service.area" = "Straße";
 
-"type.highway.service.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Brücke";
 
 "type.highway.service.driveway" = "Zufahrt";
 
 "type.highway.service.parking_aisle" = "Straße";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.service.tunnel" = "Straßentunnel";
 
 "type.highway.services" = "Raststätte";
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stufen";
 
-"type.highway.steps.bridge" = "Stufen";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Brücke";
 
-"type.highway.steps.tunnel" = "Stufen";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Straße";
 
-"type.highway.tertiary.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Straßentunnel";
 
 "type.highway.tertiary_link" = "Straße";
 
-"type.highway.tertiary_link.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Straßentunnel";
 
 "type.highway.track" = "Straße";
 
 "type.highway.track.area" = "Straße";
 
-"type.highway.track.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Brücke";
 
 "type.highway.track.grade1" = "Straße";
 
@@ -1957,28 +1994,35 @@
 
 "type.highway.track.permissive" = "Straße";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Straßentunnel";
 
 "type.highway.traffic_signals" = "Verkehrsampel";
 
 "type.highway.trunk" = "Schnellstraße";
 
-"type.highway.trunk.bridge" = "Schnellstraße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk.tunnel" = "Schnellstraßentunnel";
 
 "type.highway.trunk_link" = "Schnellstraße";
 
-"type.highway.trunk_link.bridge" = "Schnellstraße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk_link.tunnel" = "Straßentunnel";
 
 "type.highway.unclassified" = "Straße";
 
 "type.highway.unclassified.area" = "Straße";
 
-"type.highway.unclassified.bridge" = "Straße";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Brücke";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Straßentunnel";
 
 "type.area_highway.cycleway" = "Radweg";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index be012ab31e..7c1a6abf15 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Μίλια";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Η θέση μου";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Γέφυρα";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Σήραγγα";
 
 "type.highway.bus_stop" = "Στάση λεωφορείου";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Γέφυρα";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Σήραγγα";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Διαδρομή";
 
-"type.highway.footway.bridge" = "Διαδρομή";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Γέφυρα";
 
 "type.highway.footway.demanding_alpine_hiking" = "Διαδρομή";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Διαδρομή";
 
-"type.highway.footway.tunnel" = "Διαδρομή";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Σήραγγα";
 
 "type.highway.ford" = "Πέρασμα";
 
 "type.highway.living_street" = "Οδός";
 
-"type.highway.living_street.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Γέφυρα";
 
-"type.highway.living_street.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Σήραγγα";
 
 "type.highway.motorway" = "Οδός";
 
-"type.highway.motorway.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Γέφυρα";
 
-"type.highway.motorway.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Σήραγγα";
 
 "type.highway.motorway_junction" = "Έξοδος";
 
 "type.highway.motorway_link" = "Οδός";
 
-"type.highway.motorway_link.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Γέφυρα";
 
-"type.highway.motorway_link.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Σήραγγα";
 
 "type.highway.path" = "Διαδρομή";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Διαδρομή";
 
-"type.highway.path.bridge" = "Διαδρομή";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Γέφυρα";
 
 "type.highway.path.demanding_alpine_hiking" = "Διαδρομή";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Διαδρομή";
 
-"type.highway.path.tunnel" = "Διαδρομή";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Σήραγγα";
 
 "type.highway.pedestrian" = "Οδός";
 
 "type.highway.pedestrian.area" = "Οδός";
 
-"type.highway.pedestrian.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Γέφυρα";
 
-"type.highway.pedestrian.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Σήραγγα";
 
 "type.highway.primary" = "Οδός";
 
-"type.highway.primary.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Γέφυρα";
 
-"type.highway.primary.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Σήραγγα";
 
 "type.highway.primary_link" = "Οδός";
 
-"type.highway.primary_link.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Γέφυρα";
 
-"type.highway.primary_link.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Σήραγγα";
 
 "type.highway.raceway" = "Πίστα αγώνων";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Οδός";
 
-"type.highway.residential.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Γέφυρα";
 
-"type.highway.residential.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Σήραγγα";
 
 "type.highway.rest_area" = "Χώρος ανάπαυσης αυτοκινητιστών";
 
 "type.highway.road" = "Οδός";
 
-"type.highway.road.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Γέφυρα";
 
-"type.highway.road.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Σήραγγα";
 
 "type.highway.secondary" = "Οδός";
 
-"type.highway.secondary.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Γέφυρα";
 
-"type.highway.secondary.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Σήραγγα";
 
 "type.highway.secondary_link" = "Οδός";
 
-"type.highway.secondary_link.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Γέφυρα";
 
-"type.highway.secondary_link.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Σήραγγα";
 
 "type.highway.service" = "Οδός";
 
 "type.highway.service.area" = "Οδός";
 
-"type.highway.service.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Γέφυρα";
 
 "type.highway.service.driveway" = "Οδός";
 
 "type.highway.service.parking_aisle" = "Οδός";
 
-"type.highway.service.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Σήραγγα";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Διαδρομή";
 
-"type.highway.steps.bridge" = "Διαδρομή";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Γέφυρα";
 
-"type.highway.steps.tunnel" = "Διαδρομή";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Σήραγγα";
 
 "type.highway.tertiary" = "Οδός";
 
-"type.highway.tertiary.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Γέφυρα";
 
-"type.highway.tertiary.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Σήραγγα";
 
 "type.highway.tertiary_link" = "Οδός";
 
-"type.highway.tertiary_link.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Γέφυρα";
 
-"type.highway.tertiary_link.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Σήραγγα";
 
 "type.highway.track" = "Οδός";
 
 "type.highway.track.area" = "Οδός";
 
-"type.highway.track.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Γέφυρα";
 
 "type.highway.track.grade1" = "Οδός";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Οδός";
 
-"type.highway.track.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Σήραγγα";
 
 "type.highway.traffic_signals" = "Φανάρια κυκλοφορίας";
 
 "type.highway.trunk" = "Οδός";
 
-"type.highway.trunk.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Γέφυρα";
 
-"type.highway.trunk.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Σήραγγα";
 
 "type.highway.trunk_link" = "Οδός";
 
-"type.highway.trunk_link.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Γέφυρα";
 
-"type.highway.trunk_link.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Σήραγγα";
 
 "type.highway.unclassified" = "Οδός";
 
 "type.highway.unclassified.area" = "Οδός";
 
-"type.highway.unclassified.bridge" = "Οδός";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Γέφυρα";
 
-"type.highway.unclassified.tunnel" = "Οδός";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Σήραγγα";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 88e1c4e625..e391f1d07d 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miles";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Bridge";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Bridge";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Lift";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Foot Path";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Pedestrian Bridge";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Pedestrian Tunnel";
 
 "type.highway.ford" = "Ford";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Bridge";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Motorway Bridge";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Motorway Tunnel";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway";
 
-"type.highway.motorway_link.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Bridge";
 
-"type.highway.motorway_link.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Bridge";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Street";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Pedestrian Bridge";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Pedestrian Tunnel";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Bridge";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Primary Road";
 
-"type.highway.primary_link.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Bridge";
 
-"type.highway.primary_link.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Bridge";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Bridge";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Bridge";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Secondary Road";
 
-"type.highway.secondary_link.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Bridge";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Bridge";
 
 "type.highway.service.driveway" = "Service Road";
 
 "type.highway.service.parking_aisle" = "Service Road";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Bridge";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Bridge";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Tertiary Road";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Bridge";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Bridge";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Bridge";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "National Highway";
 
-"type.highway.trunk_link.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Bridge";
 
-"type.highway.trunk_link.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Bridge";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 2deb0c8d46..a1aa89ce2b 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miles";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Bridge";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Bridge";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Pedestrian Zone";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Pedestrian Bridge";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Pedestrian Tunnel";
 
 "type.highway.ford" = "Ford";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Bridge";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Motorway Bridge";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Motorway Tunnel";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway Ramp";
 
-"type.highway.motorway_link.bridge" = "Motorway Ramp";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Bridge";
 
-"type.highway.motorway_link.tunnel" = "Motorway Ramp";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Cycle & Foot Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Bridge";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Zone";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Pedestrian Bridge";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Pedestrian Tunnel";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Bridge";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Primary Road Ramp";
 
-"type.highway.primary_link.bridge" = "Primary Road Ramp";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Bridge";
 
-"type.highway.primary_link.tunnel" = "Primary Road Ramp";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Bridge";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Bridge";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Bridge";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Secondary Road Ramp";
 
-"type.highway.secondary_link.bridge" = "Secondary Road Ramp";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Bridge";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road Ramp";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Bridge";
 
 "type.highway.service.driveway" = "Driveway";
 
 "type.highway.service.parking_aisle" = "Parking Aisle";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Bridge";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Bridge";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Tertiary Road Ramp";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road Ramp";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Bridge";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road Ramp";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Bridge";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Bridge";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "National Highway Ramp";
 
-"type.highway.trunk_link.bridge" = "National Highway Ramp";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Bridge";
 
-"type.highway.trunk_link.tunnel" = "National Highway Ramp";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Bridge";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 5a8aba2ee4..dca0a22a05 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miles";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Puente";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Túnel";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Puente";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Túnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Foot Path";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Puente";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Túnel";
 
 "type.highway.ford" = "Vado (de lugar)";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Puente";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Túnel";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Puente";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Túnel";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway";
 
-"type.highway.motorway_link.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Puente";
 
-"type.highway.motorway_link.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Túnel";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Puente";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Túnel";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Street";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Puente";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Túnel";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Puente";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Túnel";
 
 "type.highway.primary_link" = "Primary Road";
 
-"type.highway.primary_link.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Puente";
 
-"type.highway.primary_link.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Túnel";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Puente";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Túnel";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Puente";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Túnel";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Puente";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Túnel";
 
 "type.highway.secondary_link" = "Secondary Road";
 
-"type.highway.secondary_link.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Puente";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Túnel";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Puente";
 
 "type.highway.service.driveway" = "Service Road";
 
 "type.highway.service.parking_aisle" = "Service Road";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Túnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Puente";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Túnel";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Puente";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Túnel";
 
 "type.highway.tertiary_link" = "Tertiary Road";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Puente";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Túnel";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Puente";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Túnel";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Puente";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Túnel";
 
 "type.highway.trunk_link" = "National Highway";
 
-"type.highway.trunk_link.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Puente";
 
-"type.highway.trunk_link.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Túnel";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Puente";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Túnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index d25b7da1e7..7e75f52056 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Milla";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mi posición";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Puente";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Túnel";
 
 "type.highway.bus_stop" = "Parada de autobús";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Puente";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Túnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Camino";
 
-"type.highway.footway.bridge" = "Camino";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Puente";
 
 "type.highway.footway.demanding_alpine_hiking" = "Camino";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Camino";
 
-"type.highway.footway.tunnel" = "Camino";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Túnel";
 
 "type.highway.ford" = "Vado (de lugar)";
 
 "type.highway.living_street" = "Calle";
 
-"type.highway.living_street.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Puente";
 
-"type.highway.living_street.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Túnel";
 
 "type.highway.motorway" = "Calle";
 
-"type.highway.motorway.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Puente";
 
-"type.highway.motorway.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Túnel";
 
 "type.highway.motorway_junction" = "Salida";
 
 "type.highway.motorway_link" = "Calle";
 
-"type.highway.motorway_link.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Puente";
 
-"type.highway.motorway_link.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Túnel";
 
 "type.highway.path" = "Camino";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Camino";
 
-"type.highway.path.bridge" = "Camino";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Puente";
 
 "type.highway.path.demanding_alpine_hiking" = "Camino";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Camino";
 
-"type.highway.path.tunnel" = "Camino";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Túnel";
 
 "type.highway.pedestrian" = "Calle";
 
 "type.highway.pedestrian.area" = "Calle";
 
-"type.highway.pedestrian.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Puente";
 
-"type.highway.pedestrian.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Túnel";
 
 "type.highway.primary" = "Calle";
 
-"type.highway.primary.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Puente";
 
-"type.highway.primary.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Túnel";
 
 "type.highway.primary_link" = "Calle";
 
-"type.highway.primary_link.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Puente";
 
-"type.highway.primary_link.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Túnel";
 
 "type.highway.raceway" = "Circuito";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Calle";
 
-"type.highway.residential.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Puente";
 
-"type.highway.residential.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Túnel";
 
 "type.highway.rest_area" = "Área de descanso";
 
 "type.highway.road" = "Calle";
 
-"type.highway.road.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Puente";
 
-"type.highway.road.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Túnel";
 
 "type.highway.secondary" = "Calle";
 
-"type.highway.secondary.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Puente";
 
-"type.highway.secondary.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Túnel";
 
 "type.highway.secondary_link" = "Calle";
 
-"type.highway.secondary_link.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Puente";
 
-"type.highway.secondary_link.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Túnel";
 
 "type.highway.service" = "Calle";
 
 "type.highway.service.area" = "Calle";
 
-"type.highway.service.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Puente";
 
 "type.highway.service.driveway" = "Calle";
 
 "type.highway.service.parking_aisle" = "Calle";
 
-"type.highway.service.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Túnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Camino";
 
-"type.highway.steps.bridge" = "Camino";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Puente";
 
-"type.highway.steps.tunnel" = "Camino";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Túnel";
 
 "type.highway.tertiary" = "Calle";
 
-"type.highway.tertiary.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Puente";
 
-"type.highway.tertiary.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Túnel";
 
 "type.highway.tertiary_link" = "Calle";
 
-"type.highway.tertiary_link.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Puente";
 
-"type.highway.tertiary_link.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Túnel";
 
 "type.highway.track" = "Calle";
 
 "type.highway.track.area" = "Calle";
 
-"type.highway.track.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Puente";
 
 "type.highway.track.grade1" = "Calle";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Calle";
 
-"type.highway.track.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Túnel";
 
 "type.highway.traffic_signals" = "Semáforos";
 
 "type.highway.trunk" = "Calle";
 
-"type.highway.trunk.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Puente";
 
-"type.highway.trunk.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Túnel";
 
 "type.highway.trunk_link" = "Calle";
 
-"type.highway.trunk_link.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Puente";
 
-"type.highway.trunk_link.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Túnel";
 
 "type.highway.unclassified" = "Calle";
 
 "type.highway.unclassified.area" = "Calle";
 
-"type.highway.unclassified.bridge" = "Calle";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Puente";
 
-"type.highway.unclassified.tunnel" = "Calle";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Túnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 1eb1d208e3..a62a3f7639 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "مایل";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "مکان من";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "پل";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "تونل";
 
 "type.highway.bus_stop" = "حمل و نقل";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "پل";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "تونل";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "مسیر";
 
-"type.highway.footway.bridge" = "مسیر";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "پل";
 
 "type.highway.footway.demanding_alpine_hiking" = "مسیر";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "مسیر";
 
-"type.highway.footway.tunnel" = "مسیر";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "تونل";
 
 "type.highway.ford" = "گدار";
 
 "type.highway.living_street" = "جاده";
 
-"type.highway.living_street.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "پل";
 
-"type.highway.living_street.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "تونل";
 
 "type.highway.motorway" = "جاده";
 
-"type.highway.motorway.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "پل";
 
-"type.highway.motorway.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "تونل";
 
 "type.highway.motorway_junction" = "تقاطع";
 
 "type.highway.motorway_link" = "جاده";
 
-"type.highway.motorway_link.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "پل";
 
-"type.highway.motorway_link.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "تونل";
 
 "type.highway.path" = "مسیر";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "مسیر";
 
-"type.highway.path.bridge" = "مسیر";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "پل";
 
 "type.highway.path.demanding_alpine_hiking" = "مسیر";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "مسیر";
 
-"type.highway.path.tunnel" = "مسیر";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "تونل";
 
 "type.highway.pedestrian" = "جاده";
 
 "type.highway.pedestrian.area" = "جاده";
 
-"type.highway.pedestrian.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "پل";
 
-"type.highway.pedestrian.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "تونل";
 
 "type.highway.primary" = "جاده";
 
-"type.highway.primary.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "پل";
 
-"type.highway.primary.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "تونل";
 
 "type.highway.primary_link" = "جاده";
 
-"type.highway.primary_link.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "پل";
 
-"type.highway.primary_link.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "تونل";
 
 "type.highway.raceway" = "کانال";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "جاده";
 
-"type.highway.residential.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "پل";
 
-"type.highway.residential.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "تونل";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "جاده";
 
-"type.highway.road.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "پل";
 
-"type.highway.road.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "تونل";
 
 "type.highway.secondary" = "جاده";
 
-"type.highway.secondary.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "پل";
 
-"type.highway.secondary.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "تونل";
 
 "type.highway.secondary_link" = "جاده";
 
-"type.highway.secondary_link.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "پل";
 
-"type.highway.secondary_link.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "تونل";
 
 "type.highway.service" = "جاده";
 
 "type.highway.service.area" = "جاده";
 
-"type.highway.service.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "پل";
 
 "type.highway.service.driveway" = "جاده";
 
 "type.highway.service.parking_aisle" = "جاده";
 
-"type.highway.service.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "تونل";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "مسیر";
 
-"type.highway.steps.bridge" = "مسیر";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "پل";
 
-"type.highway.steps.tunnel" = "مسیر";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "تونل";
 
 "type.highway.tertiary" = "جاده";
 
-"type.highway.tertiary.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "پل";
 
-"type.highway.tertiary.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "تونل";
 
 "type.highway.tertiary_link" = "جاده";
 
-"type.highway.tertiary_link.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "پل";
 
-"type.highway.tertiary_link.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "تونل";
 
 "type.highway.track" = "جاده";
 
 "type.highway.track.area" = "جاده";
 
-"type.highway.track.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "پل";
 
 "type.highway.track.grade1" = "جاده";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "جاده";
 
-"type.highway.track.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "تونل";
 
 "type.highway.traffic_signals" = "چراغ راهنما";
 
 "type.highway.trunk" = "جاده";
 
-"type.highway.trunk.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "پل";
 
-"type.highway.trunk.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "تونل";
 
 "type.highway.trunk_link" = "جاده";
 
-"type.highway.trunk_link.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "پل";
 
-"type.highway.trunk_link.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "تونل";
 
 "type.highway.unclassified" = "جاده";
 
 "type.highway.unclassified.area" = "جاده";
 
-"type.highway.unclassified.bridge" = "جاده";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "پل";
 
-"type.highway.unclassified.tunnel" = "جاده";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "تونل";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index b0f12a9832..5dd376a9e7 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mailit";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Sijaintini";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Silta";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunneli";
 
 "type.highway.bus_stop" = "Bussipysäkki";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Silta";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunneli";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Polku";
 
-"type.highway.footway.bridge" = "Polku";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Silta";
 
 "type.highway.footway.demanding_alpine_hiking" = "Polku";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Polku";
 
-"type.highway.footway.tunnel" = "Polku";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunneli";
 
 "type.highway.ford" = "Kahluupaikka";
 
 "type.highway.living_street" = "Katu";
 
-"type.highway.living_street.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Silta";
 
-"type.highway.living_street.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunneli";
 
 "type.highway.motorway" = "Katu";
 
-"type.highway.motorway.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Silta";
 
-"type.highway.motorway.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunneli";
 
 "type.highway.motorway_junction" = "Poistumistie";
 
 "type.highway.motorway_link" = "Katu";
 
-"type.highway.motorway_link.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Silta";
 
-"type.highway.motorway_link.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunneli";
 
 "type.highway.path" = "Polku";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Polku";
 
-"type.highway.path.bridge" = "Polku";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Silta";
 
 "type.highway.path.demanding_alpine_hiking" = "Polku";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Polku";
 
-"type.highway.path.tunnel" = "Polku";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunneli";
 
 "type.highway.pedestrian" = "Katu";
 
 "type.highway.pedestrian.area" = "Katu";
 
-"type.highway.pedestrian.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Silta";
 
-"type.highway.pedestrian.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunneli";
 
 "type.highway.primary" = "Katu";
 
-"type.highway.primary.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Silta";
 
-"type.highway.primary.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunneli";
 
 "type.highway.primary_link" = "Katu";
 
-"type.highway.primary_link.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Silta";
 
-"type.highway.primary_link.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunneli";
 
 "type.highway.raceway" = "Kilparata";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Katu";
 
-"type.highway.residential.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Silta";
 
-"type.highway.residential.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunneli";
 
 "type.highway.rest_area" = "Levähdyspaikka";
 
 "type.highway.road" = "Katu";
 
-"type.highway.road.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Silta";
 
-"type.highway.road.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunneli";
 
 "type.highway.secondary" = "Katu";
 
-"type.highway.secondary.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Silta";
 
-"type.highway.secondary.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunneli";
 
 "type.highway.secondary_link" = "Katu";
 
-"type.highway.secondary_link.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Silta";
 
-"type.highway.secondary_link.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunneli";
 
 "type.highway.service" = "Katu";
 
 "type.highway.service.area" = "Katu";
 
-"type.highway.service.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Silta";
 
 "type.highway.service.driveway" = "Katu";
 
 "type.highway.service.parking_aisle" = "Katu";
 
-"type.highway.service.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunneli";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Polku";
 
-"type.highway.steps.bridge" = "Polku";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Silta";
 
-"type.highway.steps.tunnel" = "Polku";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunneli";
 
 "type.highway.tertiary" = "Katu";
 
-"type.highway.tertiary.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Silta";
 
-"type.highway.tertiary.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunneli";
 
 "type.highway.tertiary_link" = "Katu";
 
-"type.highway.tertiary_link.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Silta";
 
-"type.highway.tertiary_link.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunneli";
 
 "type.highway.track" = "Katu";
 
 "type.highway.track.area" = "Katu";
 
-"type.highway.track.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Silta";
 
 "type.highway.track.grade1" = "Katu";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Katu";
 
-"type.highway.track.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunneli";
 
 "type.highway.traffic_signals" = "Liikennevalot";
 
 "type.highway.trunk" = "Katu";
 
-"type.highway.trunk.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Silta";
 
-"type.highway.trunk.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunneli";
 
 "type.highway.trunk_link" = "Katu";
 
-"type.highway.trunk_link.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Silta";
 
-"type.highway.trunk_link.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunneli";
 
 "type.highway.unclassified" = "Katu";
 
 "type.highway.unclassified.area" = "Katu";
 
-"type.highway.unclassified.bridge" = "Katu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Silta";
 
-"type.highway.unclassified.tunnel" = "Katu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunneli";
 
 "type.area_highway.cycleway" = "Pyörätie";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index b9bbbc2810..cf12ed1e6a 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miles";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Ma position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Chemin pour cavalier";
 
-"type.highway.bridleway.bridge" = "Chemin pour cavalier";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Pont";
 
 "type.highway.bridleway.permissive" = "Chemin pour cavalier";
 
-"type.highway.bridleway.tunnel" = "Chemin pour cavalier";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Arrêt de bus";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Piste cyclable";
 
-"type.highway.cycleway.bridge" = "Piste cyclable";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Pont";
 
 "type.highway.cycleway.permissive" = "Piste cyclable";
 
-"type.highway.cycleway.tunnel" = "Piste cyclable";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Ascenseur";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Chemin";
 
-"type.highway.footway.bridge" = "Chemin";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Pont";
 
 "type.highway.footway.demanding_alpine_hiking" = "Chemin";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Chemin";
 
-"type.highway.footway.tunnel" = "Chemin";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunnel";
 
 "type.highway.ford" = "Gué";
 
 "type.highway.living_street" = "Zone de rencontre";
 
-"type.highway.living_street.bridge" = "Zone de rencontre";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Pont";
 
-"type.highway.living_street.tunnel" = "Zone de rencontre";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Autoroute";
 
-"type.highway.motorway.bridge" = "Autoroute";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Pont";
 
-"type.highway.motorway.tunnel" = "Autoroute";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunnel";
 
 "type.highway.motorway_junction" = "Sortie";
 
 "type.highway.motorway_link" = "Autoroute";
 
-"type.highway.motorway_link.bridge" = "Autoroute";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Pont";
 
-"type.highway.motorway_link.tunnel" = "Autoroute";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Chemin";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Chemin";
 
-"type.highway.path.bridge" = "Chemin";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Pont";
 
 "type.highway.path.demanding_alpine_hiking" = "Chemin";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Chemin";
 
-"type.highway.path.tunnel" = "Chemin";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Rue piétonne";
 
 "type.highway.pedestrian.area" = "Rue piétonne";
 
-"type.highway.pedestrian.bridge" = "Rue piétonne";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Pont";
 
-"type.highway.pedestrian.tunnel" = "Rue piétonne";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunnel";
 
 "type.highway.primary" = "Rue";
 
-"type.highway.primary.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Pont";
 
-"type.highway.primary.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Rue";
 
-"type.highway.primary_link.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Pont";
 
-"type.highway.primary_link.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Circuit";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Rue";
 
-"type.highway.residential.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Pont";
 
-"type.highway.residential.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Aire de repos";
 
 "type.highway.road" = "Rue";
 
-"type.highway.road.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Pont";
 
-"type.highway.road.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Rue";
 
-"type.highway.secondary.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Pont";
 
-"type.highway.secondary.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Rue";
 
-"type.highway.secondary_link.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Pont";
 
-"type.highway.secondary_link.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Rue";
 
 "type.highway.service.area" = "Rue";
 
-"type.highway.service.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Pont";
 
 "type.highway.service.driveway" = "Rue";
 
 "type.highway.service.parking_aisle" = "Allée";
 
-"type.highway.service.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Aire de service";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Escaliers";
 
-"type.highway.steps.bridge" = "Escaliers";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Pont";
 
-"type.highway.steps.tunnel" = "Escaliers";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Rue";
 
-"type.highway.tertiary.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Pont";
 
-"type.highway.tertiary.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Rue";
 
-"type.highway.tertiary_link.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Pont";
 
-"type.highway.tertiary_link.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Piste";
 
 "type.highway.track.area" = "Piste";
 
-"type.highway.track.bridge" = "Piste";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Pont";
 
 "type.highway.track.grade1" = "Piste";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Piste";
 
-"type.highway.track.tunnel" = "Piste";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Feux de circulation";
 
 "type.highway.trunk" = "Voie rapide";
 
-"type.highway.trunk.bridge" = "Voie rapide";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Pont";
 
-"type.highway.trunk.tunnel" = "Voie rapide";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "Voie rapide";
 
-"type.highway.trunk_link.bridge" = "Voie rapide";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Pont";
 
-"type.highway.trunk_link.tunnel" = "Voie rapide";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Rue";
 
 "type.highway.unclassified.area" = "Rue";
 
-"type.highway.unclassified.bridge" = "Rue";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Pont";
 
-"type.highway.unclassified.tunnel" = "Rue";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Piste cyclable";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 54b125c8ce..61b9fa073a 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "מ\"ב";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "מיקומי";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "לְגַשֵׁר";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "מִנהָרָה";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "לְגַשֵׁר";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "מִנהָרָה";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Foot Path";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "לְגַשֵׁר";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "מִנהָרָה";
 
 "type.highway.ford" = "Ford";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "לְגַשֵׁר";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "מִנהָרָה";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "לְגַשֵׁר";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "מִנהָרָה";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway";
 
-"type.highway.motorway_link.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "לְגַשֵׁר";
 
-"type.highway.motorway_link.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "מִנהָרָה";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "לְגַשֵׁר";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "מִנהָרָה";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Street";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "לְגַשֵׁר";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "מִנהָרָה";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "לְגַשֵׁר";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "מִנהָרָה";
 
 "type.highway.primary_link" = "Primary Road";
 
-"type.highway.primary_link.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "לְגַשֵׁר";
 
-"type.highway.primary_link.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "מִנהָרָה";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "לְגַשֵׁר";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "מִנהָרָה";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "לְגַשֵׁר";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "מִנהָרָה";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "לְגַשֵׁר";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "מִנהָרָה";
 
 "type.highway.secondary_link" = "Secondary Road";
 
-"type.highway.secondary_link.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "לְגַשֵׁר";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "מִנהָרָה";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "לְגַשֵׁר";
 
 "type.highway.service.driveway" = "Service Road";
 
 "type.highway.service.parking_aisle" = "Service Road";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "מִנהָרָה";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "לְגַשֵׁר";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "מִנהָרָה";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "לְגַשֵׁר";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "מִנהָרָה";
 
 "type.highway.tertiary_link" = "Tertiary Road";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "לְגַשֵׁר";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "מִנהָרָה";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "לְגַשֵׁר";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "מִנהָרָה";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "לְגַשֵׁר";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "מִנהָרָה";
 
 "type.highway.trunk_link" = "National Highway";
 
-"type.highway.trunk_link.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "לְגַשֵׁר";
 
-"type.highway.trunk_link.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "מִנהָרָה";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "לְגַשֵׁר";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "מִנהָרָה";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 5a5b1e2975..81786f988f 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mérföld";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Saját helyzet";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Híd";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Alagút";
 
 "type.highway.bus_stop" = "Buszmegálló";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Híd";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Alagút";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Ösvény";
 
-"type.highway.footway.bridge" = "Ösvény";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Híd";
 
 "type.highway.footway.demanding_alpine_hiking" = "Ösvény";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Ösvény";
 
-"type.highway.footway.tunnel" = "Ösvény";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Alagút";
 
 "type.highway.ford" = "Gázló";
 
 "type.highway.living_street" = "Utca";
 
-"type.highway.living_street.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Híd";
 
-"type.highway.living_street.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Alagút";
 
 "type.highway.motorway" = "Utca";
 
-"type.highway.motorway.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Híd";
 
-"type.highway.motorway.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Alagút";
 
 "type.highway.motorway_junction" = "Kijárat";
 
 "type.highway.motorway_link" = "Utca";
 
-"type.highway.motorway_link.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Híd";
 
-"type.highway.motorway_link.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Alagút";
 
 "type.highway.path" = "Ösvény";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Ösvény";
 
-"type.highway.path.bridge" = "Ösvény";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Híd";
 
 "type.highway.path.demanding_alpine_hiking" = "Ösvény";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Ösvény";
 
-"type.highway.path.tunnel" = "Ösvény";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Alagút";
 
 "type.highway.pedestrian" = "Utca";
 
 "type.highway.pedestrian.area" = "Utca";
 
-"type.highway.pedestrian.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Híd";
 
-"type.highway.pedestrian.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Alagút";
 
 "type.highway.primary" = "Utca";
 
-"type.highway.primary.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Híd";
 
-"type.highway.primary.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Alagút";
 
 "type.highway.primary_link" = "Utca";
 
-"type.highway.primary_link.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Híd";
 
-"type.highway.primary_link.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Alagút";
 
 "type.highway.raceway" = "Versenypálya";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Utca";
 
-"type.highway.residential.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Híd";
 
-"type.highway.residential.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Alagút";
 
 "type.highway.rest_area" = "Pihenőzóna";
 
 "type.highway.road" = "Utca";
 
-"type.highway.road.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Híd";
 
-"type.highway.road.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Alagút";
 
 "type.highway.secondary" = "Utca";
 
-"type.highway.secondary.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Híd";
 
-"type.highway.secondary.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Alagút";
 
 "type.highway.secondary_link" = "Utca";
 
-"type.highway.secondary_link.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Híd";
 
-"type.highway.secondary_link.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Alagút";
 
 "type.highway.service" = "Utca";
 
 "type.highway.service.area" = "Utca";
 
-"type.highway.service.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Híd";
 
 "type.highway.service.driveway" = "Utca";
 
 "type.highway.service.parking_aisle" = "Utca";
 
-"type.highway.service.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Alagút";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Ösvény";
 
-"type.highway.steps.bridge" = "Ösvény";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Híd";
 
-"type.highway.steps.tunnel" = "Ösvény";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Alagút";
 
 "type.highway.tertiary" = "Utca";
 
-"type.highway.tertiary.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Híd";
 
-"type.highway.tertiary.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Alagút";
 
 "type.highway.tertiary_link" = "Utca";
 
-"type.highway.tertiary_link.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Híd";
 
-"type.highway.tertiary_link.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Alagút";
 
 "type.highway.track" = "Utca";
 
 "type.highway.track.area" = "Utca";
 
-"type.highway.track.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Híd";
 
 "type.highway.track.grade1" = "Utca";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Utca";
 
-"type.highway.track.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Alagút";
 
 "type.highway.traffic_signals" = "Közlekedési lámpák";
 
 "type.highway.trunk" = "Utca";
 
-"type.highway.trunk.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Híd";
 
-"type.highway.trunk.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Alagút";
 
 "type.highway.trunk_link" = "Utca";
 
-"type.highway.trunk_link.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Híd";
 
-"type.highway.trunk_link.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Alagút";
 
 "type.highway.unclassified" = "Utca";
 
 "type.highway.unclassified.area" = "Utca";
 
-"type.highway.unclassified.bridge" = "Utca";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Híd";
 
-"type.highway.unclassified.tunnel" = "Utca";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Alagút";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 0965c8f776..1e29b4232b 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mil";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Posisi Saya";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Menjembatani";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Terowongan";
 
 "type.highway.bus_stop" = "Halte bus";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Menjembatani";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Terowongan";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Jalur";
 
-"type.highway.footway.bridge" = "Jalur";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Menjembatani";
 
 "type.highway.footway.demanding_alpine_hiking" = "Jalur";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Jalur";
 
-"type.highway.footway.tunnel" = "Jalur";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Terowongan";
 
 "type.highway.ford" = "Menyeberang";
 
 "type.highway.living_street" = "Jalan";
 
-"type.highway.living_street.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Menjembatani";
 
-"type.highway.living_street.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Terowongan";
 
 "type.highway.motorway" = "Jalan";
 
-"type.highway.motorway.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Menjembatani";
 
-"type.highway.motorway.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Terowongan";
 
 "type.highway.motorway_junction" = "Keluar";
 
 "type.highway.motorway_link" = "Jalan";
 
-"type.highway.motorway_link.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Menjembatani";
 
-"type.highway.motorway_link.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Terowongan";
 
 "type.highway.path" = "Jalur";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Jalur";
 
-"type.highway.path.bridge" = "Jalur";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Menjembatani";
 
 "type.highway.path.demanding_alpine_hiking" = "Jalur";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Jalur";
 
-"type.highway.path.tunnel" = "Jalur";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Terowongan";
 
 "type.highway.pedestrian" = "Jalan";
 
 "type.highway.pedestrian.area" = "Jalan";
 
-"type.highway.pedestrian.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Menjembatani";
 
-"type.highway.pedestrian.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Terowongan";
 
 "type.highway.primary" = "Jalan";
 
-"type.highway.primary.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Menjembatani";
 
-"type.highway.primary.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Terowongan";
 
 "type.highway.primary_link" = "Jalan";
 
-"type.highway.primary_link.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Menjembatani";
 
-"type.highway.primary_link.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Terowongan";
 
 "type.highway.raceway" = "Lintasan balap";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Jalan";
 
-"type.highway.residential.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Menjembatani";
 
-"type.highway.residential.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Terowongan";
 
 "type.highway.rest_area" = "Tempat istirahat";
 
 "type.highway.road" = "Jalan";
 
-"type.highway.road.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Menjembatani";
 
-"type.highway.road.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Terowongan";
 
 "type.highway.secondary" = "Jalan";
 
-"type.highway.secondary.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Menjembatani";
 
-"type.highway.secondary.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Terowongan";
 
 "type.highway.secondary_link" = "Jalan";
 
-"type.highway.secondary_link.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Menjembatani";
 
-"type.highway.secondary_link.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Terowongan";
 
 "type.highway.service" = "Jalan";
 
 "type.highway.service.area" = "Jalan";
 
-"type.highway.service.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Menjembatani";
 
 "type.highway.service.driveway" = "Jalan";
 
 "type.highway.service.parking_aisle" = "Jalan";
 
-"type.highway.service.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Terowongan";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Jalur";
 
-"type.highway.steps.bridge" = "Jalur";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Menjembatani";
 
-"type.highway.steps.tunnel" = "Jalur";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Terowongan";
 
 "type.highway.tertiary" = "Jalan";
 
-"type.highway.tertiary.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Menjembatani";
 
-"type.highway.tertiary.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Terowongan";
 
 "type.highway.tertiary_link" = "Jalan";
 
-"type.highway.tertiary_link.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Menjembatani";
 
-"type.highway.tertiary_link.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Terowongan";
 
 "type.highway.track" = "Jalan";
 
 "type.highway.track.area" = "Jalan";
 
-"type.highway.track.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Menjembatani";
 
 "type.highway.track.grade1" = "Jalan";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Jalan";
 
-"type.highway.track.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Terowongan";
 
 "type.highway.traffic_signals" = "Lampu lalu lintas";
 
 "type.highway.trunk" = "Jalan";
 
-"type.highway.trunk.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Menjembatani";
 
-"type.highway.trunk.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Terowongan";
 
 "type.highway.trunk_link" = "Jalan";
 
-"type.highway.trunk_link.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Menjembatani";
 
-"type.highway.trunk_link.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Terowongan";
 
 "type.highway.unclassified" = "Jalan";
 
 "type.highway.unclassified.area" = "Jalan";
 
-"type.highway.unclassified.bridge" = "Jalan";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Menjembatani";
 
-"type.highway.unclassified.tunnel" = "Jalan";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Terowongan";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 7c2b0477ac..d48be8b41b 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miglia";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "La mia posizione";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Ponte";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Fermata";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Ponte";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Sentiero";
 
-"type.highway.footway.bridge" = "Sentiero";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Ponte";
 
 "type.highway.footway.demanding_alpine_hiking" = "Sentiero";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Sentiero";
 
-"type.highway.footway.tunnel" = "Sentiero";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunnel";
 
 "type.highway.ford" = "Guado";
 
 "type.highway.living_street" = "Via";
 
-"type.highway.living_street.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Ponte";
 
-"type.highway.living_street.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Via";
 
-"type.highway.motorway.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Ponte";
 
-"type.highway.motorway.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunnel";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Via";
 
-"type.highway.motorway_link.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Ponte";
 
-"type.highway.motorway_link.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Sentiero";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Sentiero";
 
-"type.highway.path.bridge" = "Sentiero";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Ponte";
 
 "type.highway.path.demanding_alpine_hiking" = "Sentiero";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Sentiero";
 
-"type.highway.path.tunnel" = "Sentiero";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Via";
 
 "type.highway.pedestrian.area" = "Via";
 
-"type.highway.pedestrian.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Ponte";
 
-"type.highway.pedestrian.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunnel";
 
 "type.highway.primary" = "Via";
 
-"type.highway.primary.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Ponte";
 
-"type.highway.primary.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Via";
 
-"type.highway.primary_link.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Ponte";
 
-"type.highway.primary_link.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Pista";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Via";
 
-"type.highway.residential.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Ponte";
 
-"type.highway.residential.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Area di sosta";
 
 "type.highway.road" = "Via";
 
-"type.highway.road.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Ponte";
 
-"type.highway.road.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Via";
 
-"type.highway.secondary.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Ponte";
 
-"type.highway.secondary.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Via";
 
-"type.highway.secondary_link.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Ponte";
 
-"type.highway.secondary_link.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Via";
 
 "type.highway.service.area" = "Via";
 
-"type.highway.service.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Ponte";
 
 "type.highway.service.driveway" = "Via";
 
 "type.highway.service.parking_aisle" = "Via";
 
-"type.highway.service.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Sentiero";
 
-"type.highway.steps.bridge" = "Sentiero";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Ponte";
 
-"type.highway.steps.tunnel" = "Sentiero";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Via";
 
-"type.highway.tertiary.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Ponte";
 
-"type.highway.tertiary.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Via";
 
-"type.highway.tertiary_link.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Ponte";
 
-"type.highway.tertiary_link.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Via";
 
 "type.highway.track.area" = "Via";
 
-"type.highway.track.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Ponte";
 
 "type.highway.track.grade1" = "Via";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Via";
 
-"type.highway.track.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Semaforo";
 
 "type.highway.trunk" = "Via";
 
-"type.highway.trunk.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Ponte";
 
-"type.highway.trunk.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "Via";
 
-"type.highway.trunk_link.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Ponte";
 
-"type.highway.trunk_link.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Via";
 
 "type.highway.unclassified.area" = "Via";
 
-"type.highway.unclassified.bridge" = "Via";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Ponte";
 
-"type.highway.unclassified.tunnel" = "Via";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 654db32d67..1435891778 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "マイル";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "現在地";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,10 +1765,12 @@
 
 "type.highway.bridleway" = "馬道";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "馬道(橋)";
 
 "type.highway.bridleway.permissive" = "馬道";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "馬道(トンネル)";
 
 "type.highway.bus_stop" = "バス停";
@@ -1777,10 +1779,12 @@
 
 "type.highway.cycleway" = "自転車道";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.cycleway.bridge" = "自転車道(橋)";
 
 "type.highway.cycleway.permissive" = "自転車道";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "自転車道(トンネル)";
 
 "type.highway.elevator" = "Elevator";
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "歩道";
 
-"type.highway.footway.bridge" = "歩道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "橋";
 
 "type.highway.footway.demanding_alpine_hiking" = "歩道";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "歩道";
 
-"type.highway.footway.tunnel" = "歩道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "トンネル";
 
 "type.highway.ford" = "浅瀬";
 
 "type.highway.living_street" = "ストリート";
 
-"type.highway.living_street.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "橋";
 
-"type.highway.living_street.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "トンネル";
 
 "type.highway.motorway" = "ストリート";
 
-"type.highway.motorway.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "橋";
 
-"type.highway.motorway.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "トンネル";
 
 "type.highway.motorway_junction" = "ジャンクション";
 
 "type.highway.motorway_link" = "ストリート";
 
-"type.highway.motorway_link.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "橋";
 
-"type.highway.motorway_link.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "トンネル";
 
 "type.highway.path" = "歩道";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "歩道";
 
-"type.highway.path.bridge" = "歩道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "橋";
 
 "type.highway.path.demanding_alpine_hiking" = "歩道";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "歩道";
 
-"type.highway.path.tunnel" = "歩道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "トンネル";
 
 "type.highway.pedestrian" = "ストリート";
 
 "type.highway.pedestrian.area" = "ストリート";
 
-"type.highway.pedestrian.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "橋";
 
-"type.highway.pedestrian.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "トンネル";
 
 "type.highway.primary" = "ストリート";
 
-"type.highway.primary.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "橋";
 
-"type.highway.primary.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "トンネル";
 
 "type.highway.primary_link" = "ストリート";
 
-"type.highway.primary_link.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "橋";
 
-"type.highway.primary_link.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "トンネル";
 
 "type.highway.raceway" = "レース場";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "ストリート";
 
-"type.highway.residential.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "橋";
 
-"type.highway.residential.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "トンネル";
 
 "type.highway.rest_area" = "休憩所";
 
 "type.highway.road" = "ストリート";
 
-"type.highway.road.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "橋";
 
-"type.highway.road.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "トンネル";
 
 "type.highway.secondary" = "ストリート";
 
-"type.highway.secondary.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "橋";
 
-"type.highway.secondary.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "トンネル";
 
 "type.highway.secondary_link" = "ストリート";
 
-"type.highway.secondary_link.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "橋";
 
-"type.highway.secondary_link.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "トンネル";
 
 "type.highway.service" = "ストリート";
 
 "type.highway.service.area" = "ストリート";
 
-"type.highway.service.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "橋";
 
 "type.highway.service.driveway" = "ストリート";
 
 "type.highway.service.parking_aisle" = "ストリート";
 
-"type.highway.service.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "トンネル";
 
 "type.highway.services" = "サービスエリア";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "歩道";
 
-"type.highway.steps.bridge" = "歩道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "橋";
 
-"type.highway.steps.tunnel" = "歩道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "トンネル";
 
 "type.highway.tertiary" = "ストリート";
 
-"type.highway.tertiary.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "橋";
 
-"type.highway.tertiary.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "トンネル";
 
 "type.highway.tertiary_link" = "ストリート";
 
-"type.highway.tertiary_link.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "橋";
 
-"type.highway.tertiary_link.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "トンネル";
 
 "type.highway.track" = "ストリート";
 
 "type.highway.track.area" = "ストリート";
 
-"type.highway.track.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "橋";
 
 "type.highway.track.grade1" = "ストリート";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "ストリート";
 
-"type.highway.track.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "トンネル";
 
 "type.highway.traffic_signals" = "交通信号";
 
 "type.highway.trunk" = "ストリート";
 
-"type.highway.trunk.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "橋";
 
-"type.highway.trunk.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "トンネル";
 
 "type.highway.trunk_link" = "ストリート";
 
-"type.highway.trunk_link.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "橋";
 
-"type.highway.trunk_link.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "トンネル";
 
 "type.highway.unclassified" = "ストリート";
 
 "type.highway.unclassified.area" = "ストリート";
 
-"type.highway.unclassified.bridge" = "ストリート";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "橋";
 
-"type.highway.unclassified.tunnel" = "ストリート";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "トンネル";
 
 "type.area_highway.cycleway" = "自転車道";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 86b8a1032b..4927c085f7 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "마일";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "나의 위치";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "다리";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "터널";
 
 "type.highway.bus_stop" = "버스 정류장";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "다리";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "터널";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "길";
 
-"type.highway.footway.bridge" = "길";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "다리";
 
 "type.highway.footway.demanding_alpine_hiking" = "길";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "길";
 
-"type.highway.footway.tunnel" = "길";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "터널";
 
 "type.highway.ford" = "여울";
 
 "type.highway.living_street" = "거리";
 
-"type.highway.living_street.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "다리";
 
-"type.highway.living_street.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "터널";
 
 "type.highway.motorway" = "거리";
 
-"type.highway.motorway.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "다리";
 
-"type.highway.motorway.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "터널";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "거리";
 
-"type.highway.motorway_link.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "다리";
 
-"type.highway.motorway_link.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "터널";
 
 "type.highway.path" = "길";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "길";
 
-"type.highway.path.bridge" = "길";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "다리";
 
 "type.highway.path.demanding_alpine_hiking" = "길";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "길";
 
-"type.highway.path.tunnel" = "길";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "터널";
 
 "type.highway.pedestrian" = "거리";
 
 "type.highway.pedestrian.area" = "거리";
 
-"type.highway.pedestrian.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "다리";
 
-"type.highway.pedestrian.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "터널";
 
 "type.highway.primary" = "거리";
 
-"type.highway.primary.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "다리";
 
-"type.highway.primary.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "터널";
 
 "type.highway.primary_link" = "거리";
 
-"type.highway.primary_link.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "다리";
 
-"type.highway.primary_link.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "터널";
 
 "type.highway.raceway" = "경마장";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "거리";
 
-"type.highway.residential.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "다리";
 
-"type.highway.residential.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "터널";
 
 "type.highway.rest_area" = "휴게소";
 
 "type.highway.road" = "거리";
 
-"type.highway.road.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "다리";
 
-"type.highway.road.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "터널";
 
 "type.highway.secondary" = "거리";
 
-"type.highway.secondary.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "다리";
 
-"type.highway.secondary.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "터널";
 
 "type.highway.secondary_link" = "거리";
 
-"type.highway.secondary_link.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "다리";
 
-"type.highway.secondary_link.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "터널";
 
 "type.highway.service" = "거리";
 
 "type.highway.service.area" = "거리";
 
-"type.highway.service.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "다리";
 
 "type.highway.service.driveway" = "거리";
 
 "type.highway.service.parking_aisle" = "거리";
 
-"type.highway.service.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "터널";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "길";
 
-"type.highway.steps.bridge" = "길";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "다리";
 
-"type.highway.steps.tunnel" = "길";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "터널";
 
 "type.highway.tertiary" = "거리";
 
-"type.highway.tertiary.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "다리";
 
-"type.highway.tertiary.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "터널";
 
 "type.highway.tertiary_link" = "거리";
 
-"type.highway.tertiary_link.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "다리";
 
-"type.highway.tertiary_link.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "터널";
 
 "type.highway.track" = "거리";
 
 "type.highway.track.area" = "거리";
 
-"type.highway.track.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "다리";
 
 "type.highway.track.grade1" = "거리";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "거리";
 
-"type.highway.track.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "터널";
 
 "type.highway.traffic_signals" = "신호등";
 
 "type.highway.trunk" = "거리";
 
-"type.highway.trunk.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "다리";
 
-"type.highway.trunk.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "터널";
 
 "type.highway.trunk_link" = "거리";
 
-"type.highway.trunk_link.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "다리";
 
-"type.highway.trunk_link.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "터널";
 
 "type.highway.unclassified" = "거리";
 
 "type.highway.unclassified.area" = "거리";
 
-"type.highway.unclassified.bridge" = "거리";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "다리";
 
-"type.highway.unclassified.tunnel" = "거리";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "터널";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index c363b810b6..4ea2c00869 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miles";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Min posisjon";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Bridge";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Busstopp";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Bridge";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Sti";
 
-"type.highway.footway.bridge" = "Sti";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Bridge";
 
 "type.highway.footway.demanding_alpine_hiking" = "Sti";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Sti";
 
-"type.highway.footway.tunnel" = "Sti";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunnel";
 
 "type.highway.ford" = "Vadested";
 
 "type.highway.living_street" = "Gate";
 
-"type.highway.living_street.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Bridge";
 
-"type.highway.living_street.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Gate";
 
-"type.highway.motorway.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Bridge";
 
-"type.highway.motorway.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunnel";
 
 "type.highway.motorway_junction" = "Utgang";
 
 "type.highway.motorway_link" = "Gate";
 
-"type.highway.motorway_link.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Bridge";
 
-"type.highway.motorway_link.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Sti";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Sti";
 
-"type.highway.path.bridge" = "Sti";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Bridge";
 
 "type.highway.path.demanding_alpine_hiking" = "Sti";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Sti";
 
-"type.highway.path.tunnel" = "Sti";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Gate";
 
 "type.highway.pedestrian.area" = "Gate";
 
-"type.highway.pedestrian.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Bridge";
 
-"type.highway.pedestrian.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunnel";
 
 "type.highway.primary" = "Gate";
 
-"type.highway.primary.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Bridge";
 
-"type.highway.primary.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Gate";
 
-"type.highway.primary_link.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Bridge";
 
-"type.highway.primary_link.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Løpebane";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Gate";
 
-"type.highway.residential.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Bridge";
 
-"type.highway.residential.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Rasteplass";
 
 "type.highway.road" = "Gate";
 
-"type.highway.road.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Bridge";
 
-"type.highway.road.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Gate";
 
-"type.highway.secondary.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Bridge";
 
-"type.highway.secondary.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Gate";
 
-"type.highway.secondary_link.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Bridge";
 
-"type.highway.secondary_link.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Gate";
 
 "type.highway.service.area" = "Gate";
 
-"type.highway.service.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Bridge";
 
 "type.highway.service.driveway" = "Gate";
 
 "type.highway.service.parking_aisle" = "Gate";
 
-"type.highway.service.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Sti";
 
-"type.highway.steps.bridge" = "Sti";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Bridge";
 
-"type.highway.steps.tunnel" = "Sti";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Gate";
 
-"type.highway.tertiary.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Bridge";
 
-"type.highway.tertiary.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Gate";
 
-"type.highway.tertiary_link.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Bridge";
 
-"type.highway.tertiary_link.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Gate";
 
 "type.highway.track.area" = "Gate";
 
-"type.highway.track.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Bridge";
 
 "type.highway.track.grade1" = "Gate";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Gate";
 
-"type.highway.track.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Trafikklys";
 
 "type.highway.trunk" = "Gate";
 
-"type.highway.trunk.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Bridge";
 
-"type.highway.trunk.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "Gate";
 
-"type.highway.trunk_link.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Bridge";
 
-"type.highway.trunk_link.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Gate";
 
 "type.highway.unclassified.area" = "Gate";
 
-"type.highway.unclassified.bridge" = "Gate";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Bridge";
 
-"type.highway.unclassified.tunnel" = "Gate";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 31489a1fc1..befca1a54c 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mijlen";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mijn locatie";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Brug";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Bushalte";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Brug";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Pad";
 
-"type.highway.footway.bridge" = "Pad";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Brug";
 
 "type.highway.footway.demanding_alpine_hiking" = "Pad";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Pad";
 
-"type.highway.footway.tunnel" = "Pad";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunnel";
 
 "type.highway.ford" = "Voorde";
 
 "type.highway.living_street" = "Straat";
 
-"type.highway.living_street.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Brug";
 
-"type.highway.living_street.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Straat";
 
-"type.highway.motorway.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Brug";
 
-"type.highway.motorway.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunnel";
 
 "type.highway.motorway_junction" = "Afrit";
 
 "type.highway.motorway_link" = "Straat";
 
-"type.highway.motorway_link.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Brug";
 
-"type.highway.motorway_link.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Pad";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Pad";
 
-"type.highway.path.bridge" = "Pad";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Brug";
 
 "type.highway.path.demanding_alpine_hiking" = "Pad";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Pad";
 
-"type.highway.path.tunnel" = "Pad";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Straat";
 
 "type.highway.pedestrian.area" = "Straat";
 
-"type.highway.pedestrian.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Brug";
 
-"type.highway.pedestrian.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunnel";
 
 "type.highway.primary" = "Straat";
 
-"type.highway.primary.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Brug";
 
-"type.highway.primary.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Straat";
 
-"type.highway.primary_link.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Brug";
 
-"type.highway.primary_link.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Racebaan";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Straat";
 
-"type.highway.residential.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Brug";
 
-"type.highway.residential.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Parkeerplaats";
 
 "type.highway.road" = "Straat";
 
-"type.highway.road.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Brug";
 
-"type.highway.road.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Straat";
 
-"type.highway.secondary.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Brug";
 
-"type.highway.secondary.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Straat";
 
-"type.highway.secondary_link.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Brug";
 
-"type.highway.secondary_link.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Straat";
 
 "type.highway.service.area" = "Straat";
 
-"type.highway.service.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Brug";
 
 "type.highway.service.driveway" = "Straat";
 
 "type.highway.service.parking_aisle" = "Straat";
 
-"type.highway.service.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Pad";
 
-"type.highway.steps.bridge" = "Pad";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Brug";
 
-"type.highway.steps.tunnel" = "Pad";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Straat";
 
-"type.highway.tertiary.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Brug";
 
-"type.highway.tertiary.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Straat";
 
-"type.highway.tertiary_link.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Brug";
 
-"type.highway.tertiary_link.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Straat";
 
 "type.highway.track.area" = "Straat";
 
-"type.highway.track.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Brug";
 
 "type.highway.track.grade1" = "Straat";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Straat";
 
-"type.highway.track.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Verkeerslichten";
 
 "type.highway.trunk" = "Straat";
 
-"type.highway.trunk.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Brug";
 
-"type.highway.trunk.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "Straat";
 
-"type.highway.trunk_link.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Brug";
 
-"type.highway.trunk_link.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Straat";
 
 "type.highway.unclassified.area" = "Straat";
 
-"type.highway.unclassified.bridge" = "Straat";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Brug";
 
-"type.highway.unclassified.tunnel" = "Straat";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index f0af5ce562..1b799d1e99 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mile";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Moje położenie";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,10 +1765,12 @@
 
 "type.highway.bridleway" = "Droga dla koni";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Most drogowy dla koni";
 
 "type.highway.bridleway.permissive" = "Droga dla koni ograniczona";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunel drogowy dla koni";
 
 "type.highway.bus_stop" = "Przystanek autobusowy";
@@ -1777,10 +1779,12 @@
 
 "type.highway.cycleway" = "Droga rowerowa";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.cycleway.bridge" = "Most drogowy dla rowerów";
 
 "type.highway.cycleway.permissive" = "Droga rowerowa ograniczona";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "Tunel drogowy dla rowerów";
 
 "type.highway.elevator" = "Elevator";
@@ -1791,6 +1795,7 @@
 
 "type.highway.footway.area" = "Obszar chodnika";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Most dla pieszych";
 
 "type.highway.footway.demanding_alpine_hiking" = "Ścieżka";
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Chodnik";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel dla pieszych";
 
 "type.highway.ford" = "Bród";
 
 "type.highway.living_street" = "Ulica w strefie zamieszkania";
 
-"type.highway.living_street.bridge" = "Ulica w strefie zamieszkania";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Tunel ulicy";
 
 "type.highway.motorway" = "Ulica";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.motorway.bridge" = "Most drogowy";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.motorway.tunnel" = "Tunel drogowy";
 
 "type.highway.motorway_junction" = "Wyjazd";
 
 "type.highway.motorway_link" = "Ulica";
 
-"type.highway.motorway_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Most";
 
-"type.highway.motorway_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunel";
 
 "type.highway.path" = "Ścieżka";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Ścieżka dla rowerów";
 
-"type.highway.path.bridge" = "Ścieżka";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Most";
 
 "type.highway.path.demanding_alpine_hiking" = "Ścieżka";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Ścieżka";
 
-"type.highway.path.tunnel" = "Ścieżka";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunel";
 
 "type.highway.pedestrian" = "Pasaż pieszy";
 
 "type.highway.pedestrian.area" = "Pasaż pieszy";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.pedestrian.bridge" = "Most pasażu pieszego";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Tunel pasażu pieszego";
 
 "type.highway.primary" = "Ulica";
 
-"type.highway.primary.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Tunel drogowy";
 
 "type.highway.primary_link" = "Ulica";
 
-"type.highway.primary_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Most";
 
-"type.highway.primary_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunel";
 
 "type.highway.raceway" = "Tor wyścigowy";
 
@@ -1879,40 +1899,50 @@
 
 "type.highway.residential.area" = "Ulica";
 
-"type.highway.residential.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Most";
 
-"type.highway.residential.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunel";
 
 "type.highway.rest_area" = "Miejsce wypoczynku";
 
 "type.highway.road" = "Ulica";
 
-"type.highway.road.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Most";
 
-"type.highway.road.tunnel" = "Tunel drogowy";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunel";
 
 "type.highway.secondary" = "Ulica";
 
-"type.highway.secondary.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Tunel drogowy";
 
 "type.highway.secondary_link" = "Ulica";
 
-"type.highway.secondary_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Tunel drogowy";
 
 "type.highway.service" = "Ulica";
 
 "type.highway.service.area" = "Ulica";
 
+/* These translations are used for all type.highway.*.bridge. */
 "type.highway.service.bridge" = "Most drogowy";
 
 "type.highway.service.driveway" = "Ulica";
 
 "type.highway.service.parking_aisle" = "Miejsca parkingowe";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.service.tunnel" = "Tunel drogowy";
 
 "type.highway.services" = "Miejsce obsługi podróżnych";
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Schody";
 
-"type.highway.steps.bridge" = "Schody";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Most";
 
-"type.highway.steps.tunnel" = "Schody";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunel";
 
 "type.highway.tertiary" = "Ulica";
 
-"type.highway.tertiary.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Tunel drogowy";
 
 "type.highway.tertiary_link" = "Ulica";
 
-"type.highway.tertiary_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Tunel drogowy";
 
 "type.highway.track" = "Ulica";
 
 "type.highway.track.area" = "Ulica";
 
-"type.highway.track.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Most";
 
 "type.highway.track.grade1" = "Ulica";
 
@@ -1957,28 +1994,35 @@
 
 "type.highway.track.permissive" = "Ulica";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel drogowy";
 
 "type.highway.traffic_signals" = "Sygnalizacja świetlna";
 
 "type.highway.trunk" = "Ulica";
 
-"type.highway.trunk.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Most";
 
-"type.highway.trunk.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunel";
 
 "type.highway.trunk_link" = "Ulica";
 
-"type.highway.trunk_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Most";
 
-"type.highway.trunk_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunel";
 
 "type.highway.unclassified" = "Ulica";
 
 "type.highway.unclassified.area" = "Ulica";
 
-"type.highway.unclassified.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Most";
 
+/* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Tunel drogowy";
 
 "type.area_highway.cycleway" = "Droga rowerowa";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 7da55af806..0048f56dba 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Milhas";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Minha posição";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Caminho para cavaleiros";
 
-"type.highway.bridleway.bridge" = "Caminho para cavaleiros";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Ponte";
 
 "type.highway.bridleway.permissive" = "Caminho para cavaleiros";
 
-"type.highway.bridleway.tunnel" = "Caminho para cavaleiros";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Túnel";
 
 "type.highway.bus_stop" = "Ponto de ônibus";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Ciclovia";
 
-"type.highway.cycleway.bridge" = "Ciclovia";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Ponte";
 
 "type.highway.cycleway.permissive" = "Ciclovia";
 
-"type.highway.cycleway.tunnel" = "Ciclovia";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Túnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Caminho pedonal";
 
-"type.highway.footway.bridge" = "Caminho pedonal";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Ponte";
 
 "type.highway.footway.demanding_alpine_hiking" = "Caminho pedonal";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Caminho pedonal";
 
-"type.highway.footway.tunnel" = "Caminho pedonal";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Túnel";
 
 "type.highway.ford" = "Rio raso";
 
 "type.highway.living_street" = "Zona de coexistência";
 
-"type.highway.living_street.bridge" = "Zona de coexistência";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Ponte";
 
-"type.highway.living_street.tunnel" = "Zona de coexistência";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Túnel";
 
 "type.highway.motorway" = "Rodovia";
 
-"type.highway.motorway.bridge" = "Rodovia";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Ponte";
 
-"type.highway.motorway.tunnel" = "Rodovia";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Túnel";
 
 "type.highway.motorway_junction" = "Saída de rodovia";
 
 "type.highway.motorway_link" = "Rodovia";
 
-"type.highway.motorway_link.bridge" = "Rodovia";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Ponte";
 
-"type.highway.motorway_link.tunnel" = "Rodovia";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Túnel";
 
 "type.highway.path" = "Caminho";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Caminho";
 
-"type.highway.path.bridge" = "Caminho";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Ponte";
 
 "type.highway.path.demanding_alpine_hiking" = "Caminho";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Caminho";
 
-"type.highway.path.tunnel" = "Caminho";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Túnel";
 
 "type.highway.pedestrian" = "Rua pedonal";
 
 "type.highway.pedestrian.area" = "Rua pedonal";
 
-"type.highway.pedestrian.bridge" = "Rua pedonal";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Ponte";
 
-"type.highway.pedestrian.tunnel" = "Rua pedonal";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Túnel";
 
 "type.highway.primary" = "Estrada";
 
-"type.highway.primary.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Ponte";
 
-"type.highway.primary.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Túnel";
 
 "type.highway.primary_link" = "Estrada";
 
-"type.highway.primary_link.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Ponte";
 
-"type.highway.primary_link.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Túnel";
 
 "type.highway.raceway" = "Pista de corrida";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Rua residencial";
 
-"type.highway.residential.bridge" = "Rua residencial";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Ponte";
 
-"type.highway.residential.tunnel" = "Rua residencial";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Túnel";
 
 "type.highway.rest_area" = "Área de descanso";
 
 "type.highway.road" = "Estrada";
 
-"type.highway.road.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Ponte";
 
-"type.highway.road.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Túnel";
 
 "type.highway.secondary" = "Estrada";
 
-"type.highway.secondary.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Ponte";
 
-"type.highway.secondary.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Túnel";
 
 "type.highway.secondary_link" = "Estrada";
 
-"type.highway.secondary_link.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Ponte";
 
-"type.highway.secondary_link.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Túnel";
 
 "type.highway.service" = "Estrada de acesso ou serviço";
 
 "type.highway.service.area" = "Estrada de acesso ou serviço";
 
-"type.highway.service.bridge" = "Estrada de acesso ou serviço";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Ponte";
 
 "type.highway.service.driveway" = "Estrada de acesso ou serviço";
 
 "type.highway.service.parking_aisle" = "Estrada de estacionamento";
 
-"type.highway.service.tunnel" = "Estrada de acesso ou serviço";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Túnel";
 
 "type.highway.services" = "Área de serviços de estrada";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Escadas";
 
-"type.highway.steps.bridge" = "Escadas";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Ponte";
 
-"type.highway.steps.tunnel" = "Escadas";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Túnel";
 
 "type.highway.tertiary" = "Estrada";
 
-"type.highway.tertiary.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Ponte";
 
-"type.highway.tertiary.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Túnel";
 
 "type.highway.tertiary_link" = "Estrada";
 
-"type.highway.tertiary_link.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Ponte";
 
-"type.highway.tertiary_link.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Túnel";
 
 "type.highway.track" = "Estrada rústica";
 
 "type.highway.track.area" = "Estrada rústica";
 
-"type.highway.track.bridge" = "Estrada rústica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Ponte";
 
 "type.highway.track.grade1" = "Estrada rústica";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Estrada rústica";
 
-"type.highway.track.tunnel" = "Estrada rústica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Túnel";
 
 "type.highway.traffic_signals" = "Semáforo";
 
 "type.highway.trunk" = "Via expressa";
 
-"type.highway.trunk.bridge" = "Via expressa";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Ponte";
 
-"type.highway.trunk.tunnel" = "Via expressa";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Túnel";
 
 "type.highway.trunk_link" = "Via expressa";
 
-"type.highway.trunk_link.bridge" = "Via expressa";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Ponte";
 
-"type.highway.trunk_link.tunnel" = "Via expressa";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Túnel";
 
 "type.highway.unclassified" = "Estrada sem classificação";
 
 "type.highway.unclassified.area" = "Estrada sem classificação";
 
-"type.highway.unclassified.bridge" = "Estrada sem classificação";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Ponte";
 
-"type.highway.unclassified.tunnel" = "Estrada sem classificação";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Túnel";
 
 "type.area_highway.cycleway" = "Ciclovia";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 0352d1452d..e7ecf31f0a 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Milhas";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "A minha posição";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Caminho para cavaleiros";
 
-"type.highway.bridleway.bridge" = "Caminho para cavaleiros";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Ponte";
 
 "type.highway.bridleway.permissive" = "Caminho para cavaleiros";
 
-"type.highway.bridleway.tunnel" = "Caminho para cavaleiros";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Túnel";
 
 "type.highway.bus_stop" = "Paragem de autocarros";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Ciclovia";
 
-"type.highway.cycleway.bridge" = "Ciclovia";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Ponte";
 
 "type.highway.cycleway.permissive" = "Ciclovia";
 
-"type.highway.cycleway.tunnel" = "Ciclovia";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Túnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Caminho pedonal";
 
-"type.highway.footway.bridge" = "Caminho pedonal";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Ponte";
 
 "type.highway.footway.demanding_alpine_hiking" = "Caminho pedonal";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Caminho pedonal";
 
-"type.highway.footway.tunnel" = "Caminho pedonal";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Túnel";
 
 "type.highway.ford" = "Vau";
 
 "type.highway.living_street" = "Zona de coexistência";
 
-"type.highway.living_street.bridge" = "Zona de coexistência";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Ponte";
 
-"type.highway.living_street.tunnel" = "Zona de coexistência";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Túnel";
 
 "type.highway.motorway" = "Autoestrada";
 
-"type.highway.motorway.bridge" = "Autoestrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Ponte";
 
-"type.highway.motorway.tunnel" = "Autoestrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Túnel";
 
 "type.highway.motorway_junction" = "Saída de autoestrada";
 
 "type.highway.motorway_link" = "Ligação a autoestrada";
 
-"type.highway.motorway_link.bridge" = "Ligação a autoestrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Ponte";
 
-"type.highway.motorway_link.tunnel" = "Ligação a autoestrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Túnel";
 
 "type.highway.path" = "Caminho";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Caminho";
 
-"type.highway.path.bridge" = "Caminho";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Ponte";
 
 "type.highway.path.demanding_alpine_hiking" = "Caminho";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Caminho";
 
-"type.highway.path.tunnel" = "Caminho";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Túnel";
 
 "type.highway.pedestrian" = "Rua pedonal";
 
 "type.highway.pedestrian.area" = "Rua pedonal";
 
-"type.highway.pedestrian.bridge" = "Rua pedonal";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Ponte";
 
-"type.highway.pedestrian.tunnel" = "Rua pedonal";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Túnel";
 
 "type.highway.primary" = "Estrada primária";
 
-"type.highway.primary.bridge" = "Estrada primária";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Ponte";
 
-"type.highway.primary.tunnel" = "Estrada primária";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Túnel";
 
 "type.highway.primary_link" = "Estrada primária";
 
-"type.highway.primary_link.bridge" = "Estrada primária";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Ponte";
 
-"type.highway.primary_link.tunnel" = "Estrada primária";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Túnel";
 
 "type.highway.raceway" = "Pista de corridas";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Rua residencial";
 
-"type.highway.residential.bridge" = "Rua residencial";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Ponte";
 
-"type.highway.residential.tunnel" = "Rua residencial";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Túnel";
 
 "type.highway.rest_area" = "Área de descanso";
 
 "type.highway.road" = "Estrada";
 
-"type.highway.road.bridge" = "Estrada";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Ponte";
 
-"type.highway.road.tunnel" = "Estrada";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Túnel";
 
 "type.highway.secondary" = "Estrada secundária";
 
-"type.highway.secondary.bridge" = "Estrada secundária";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Ponte";
 
-"type.highway.secondary.tunnel" = "Estrada secundária";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Túnel";
 
 "type.highway.secondary_link" = "Estrada secundária";
 
-"type.highway.secondary_link.bridge" = "Estrada secundária";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Ponte";
 
-"type.highway.secondary_link.tunnel" = "Estrada secundária";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Túnel";
 
 "type.highway.service" = "Estrada de acesso ou serviço";
 
 "type.highway.service.area" = "Estrada de acesso ou serviço";
 
-"type.highway.service.bridge" = "Estrada de acesso ou serviço";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Ponte";
 
 "type.highway.service.driveway" = "Estrada de acesso ou serviço";
 
 "type.highway.service.parking_aisle" = "Estrada de estacionamento";
 
-"type.highway.service.tunnel" = "Estrada de acesso ou serviço";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Túnel";
 
 "type.highway.services" = "Área de serviço";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Escadas";
 
-"type.highway.steps.bridge" = "Escadas";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Ponte";
 
-"type.highway.steps.tunnel" = "Escadas";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Túnel";
 
 "type.highway.tertiary" = "Estrada terciária";
 
-"type.highway.tertiary.bridge" = "Estrada terciária";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Ponte";
 
-"type.highway.tertiary.tunnel" = "Estrada terciária";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Túnel";
 
 "type.highway.tertiary_link" = "Estrada terciária";
 
-"type.highway.tertiary_link.bridge" = "Estrada terciária";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Ponte";
 
-"type.highway.tertiary_link.tunnel" = "Estrada terciária";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Túnel";
 
 "type.highway.track" = "Carreiro florestal ou agrícola";
 
 "type.highway.track.area" = "Carreiro florestal ou agrícola";
 
-"type.highway.track.bridge" = "Carreiro florestal ou agrícola";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Ponte";
 
 "type.highway.track.grade1" = "Carreiro florestal ou agrícola";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Carreiro florestal ou agrícola";
 
-"type.highway.track.tunnel" = "Carreiro florestal ou agrícola";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Túnel";
 
 "type.highway.traffic_signals" = "Semáforo";
 
 "type.highway.trunk" = "Via rápida";
 
-"type.highway.trunk.bridge" = "Via rápida";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Ponte";
 
-"type.highway.trunk.tunnel" = "Via rápida";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Túnel";
 
 "type.highway.trunk_link" = "Via rápida";
 
-"type.highway.trunk_link.bridge" = "Via rápida";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Ponte";
 
-"type.highway.trunk_link.tunnel" = "Via rápida";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Túnel";
 
 "type.highway.unclassified" = "Estrada sem classificação";
 
 "type.highway.unclassified.area" = "Estrada sem classificação";
 
-"type.highway.unclassified.bridge" = "Estrada sem classificação";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Ponte";
 
-"type.highway.unclassified.tunnel" = "Estrada sem classificação";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Túnel";
 
 "type.area_highway.cycleway" = "Ciclovia";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index f2b58116a5..d06b03b395 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mile";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Poziția mea";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Pod";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunel";
 
 "type.highway.bus_stop" = "Stație de autobuz";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Pod";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Cale";
 
-"type.highway.footway.bridge" = "Cale";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Pod";
 
 "type.highway.footway.demanding_alpine_hiking" = "Cale";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Cale";
 
-"type.highway.footway.tunnel" = "Cale";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunel";
 
 "type.highway.ford" = "Superficial";
 
 "type.highway.living_street" = "Stradă";
 
-"type.highway.living_street.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Pod";
 
-"type.highway.living_street.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunel";
 
 "type.highway.motorway" = "Stradă";
 
-"type.highway.motorway.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Pod";
 
-"type.highway.motorway.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunel";
 
 "type.highway.motorway_junction" = "Ieșire";
 
 "type.highway.motorway_link" = "Stradă";
 
-"type.highway.motorway_link.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Pod";
 
-"type.highway.motorway_link.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunel";
 
 "type.highway.path" = "Cale";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Cale";
 
-"type.highway.path.bridge" = "Cale";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Pod";
 
 "type.highway.path.demanding_alpine_hiking" = "Cale";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Cale";
 
-"type.highway.path.tunnel" = "Cale";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunel";
 
 "type.highway.pedestrian" = "Stradă";
 
 "type.highway.pedestrian.area" = "Stradă";
 
-"type.highway.pedestrian.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Pod";
 
-"type.highway.pedestrian.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunel";
 
 "type.highway.primary" = "Stradă";
 
-"type.highway.primary.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Pod";
 
-"type.highway.primary.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunel";
 
 "type.highway.primary_link" = "Stradă";
 
-"type.highway.primary_link.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Pod";
 
-"type.highway.primary_link.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunel";
 
 "type.highway.raceway" = "Pistă de curse";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Stradă";
 
-"type.highway.residential.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Pod";
 
-"type.highway.residential.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunel";
 
 "type.highway.rest_area" = "Zonă de odihnă";
 
 "type.highway.road" = "Stradă";
 
-"type.highway.road.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Pod";
 
-"type.highway.road.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunel";
 
 "type.highway.secondary" = "Stradă";
 
-"type.highway.secondary.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Pod";
 
-"type.highway.secondary.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunel";
 
 "type.highway.secondary_link" = "Stradă";
 
-"type.highway.secondary_link.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Pod";
 
-"type.highway.secondary_link.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunel";
 
 "type.highway.service" = "Stradă";
 
 "type.highway.service.area" = "Stradă";
 
-"type.highway.service.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Pod";
 
 "type.highway.service.driveway" = "Stradă";
 
 "type.highway.service.parking_aisle" = "Stradă";
 
-"type.highway.service.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Cale";
 
-"type.highway.steps.bridge" = "Cale";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Pod";
 
-"type.highway.steps.tunnel" = "Cale";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunel";
 
 "type.highway.tertiary" = "Stradă";
 
-"type.highway.tertiary.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Pod";
 
-"type.highway.tertiary.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunel";
 
 "type.highway.tertiary_link" = "Stradă";
 
-"type.highway.tertiary_link.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Pod";
 
-"type.highway.tertiary_link.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunel";
 
 "type.highway.track" = "Stradă";
 
 "type.highway.track.area" = "Stradă";
 
-"type.highway.track.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Pod";
 
 "type.highway.track.grade1" = "Stradă";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Stradă";
 
-"type.highway.track.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunel";
 
 "type.highway.traffic_signals" = "Semafoare";
 
 "type.highway.trunk" = "Stradă";
 
-"type.highway.trunk.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Pod";
 
-"type.highway.trunk.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunel";
 
 "type.highway.trunk_link" = "Stradă";
 
-"type.highway.trunk_link.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Pod";
 
-"type.highway.trunk_link.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunel";
 
 "type.highway.unclassified" = "Stradă";
 
 "type.highway.unclassified.area" = "Stradă";
 
-"type.highway.unclassified.bridge" = "Stradă";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Pod";
 
-"type.highway.unclassified.tunnel" = "Stradă";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 7e2e29e711..2980f50639 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Мили";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Мое местоположение";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Конная дорожка";
 
-"type.highway.bridleway.bridge" = "Конная дорожка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Мост";
 
 "type.highway.bridleway.permissive" = "Конная дорожка";
 
-"type.highway.bridleway.tunnel" = "Конная дорожка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Тоннель";
 
 "type.highway.bus_stop" = "Остановка";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Велодорожка";
 
-"type.highway.cycleway.bridge" = "Велодорожка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Мост";
 
 "type.highway.cycleway.permissive" = "Велодорожка";
 
-"type.highway.cycleway.tunnel" = "Велодорожка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Тоннель";
 
 "type.highway.elevator" = "Лифт";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Пешеходная зона";
 
-"type.highway.footway.bridge" = "Пешеходная дорожка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Пешеходный мост";
 
 "type.highway.footway.demanding_alpine_hiking" = "Тропа";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Пешеходная дорожка";
 
-"type.highway.footway.tunnel" = "Пешеходная дорожка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Пешеходный тоннель";
 
 "type.highway.ford" = "Брод";
 
 "type.highway.living_street" = "Жилая зона";
 
-"type.highway.living_street.bridge" = "Жилая зона";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Мост";
 
-"type.highway.living_street.tunnel" = "Жилая зона";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Тоннель";
 
 "type.highway.motorway" = "Автомагистраль";
 
-"type.highway.motorway.bridge" = "Автомагистраль";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Автомобильный мост";
 
-"type.highway.motorway.tunnel" = "Автомагистраль";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Автомобильный тоннель";
 
 "type.highway.motorway_junction" = "Съезд";
 
 "type.highway.motorway_link" = "Съезд с автомагистрали";
 
-"type.highway.motorway_link.bridge" = "Съезд с автомагистрали";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Мост";
 
-"type.highway.motorway_link.tunnel" = "Съезд с автомагистрали";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Тоннель";
 
 "type.highway.path" = "Тропа";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Велопешеходная дорожка";
 
-"type.highway.path.bridge" = "Тропа";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Мост";
 
 "type.highway.path.demanding_alpine_hiking" = "Тропа";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Тропа";
 
-"type.highway.path.tunnel" = "Тропа";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Тоннель";
 
 "type.highway.pedestrian" = "Пешеходная улица";
 
 "type.highway.pedestrian.area" = "Пешеходная зона";
 
-"type.highway.pedestrian.bridge" = "Пешеходная улица";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Пешеходный мост";
 
-"type.highway.pedestrian.tunnel" = "Пешеходная улица";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Пешеходный тоннель";
 
 "type.highway.primary" = "Шоссе";
 
-"type.highway.primary.bridge" = "Шоссе";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Мост";
 
-"type.highway.primary.tunnel" = "Шоссе";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Тоннель";
 
 "type.highway.primary_link" = "Съезд с шоссе";
 
-"type.highway.primary_link.bridge" = "Съезд с шоссе";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Мост";
 
-"type.highway.primary_link.tunnel" = "Съезд с шоссе";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Тоннель";
 
 "type.highway.raceway" = "Гоночный трек";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Улица";
 
-"type.highway.residential.bridge" = "Улица";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Мост";
 
-"type.highway.residential.tunnel" = "Улица";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Тоннель";
 
 "type.highway.rest_area" = "Зона отдыха";
 
 "type.highway.road" = "Дорога";
 
-"type.highway.road.bridge" = "Дорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Мост";
 
-"type.highway.road.tunnel" = "Дорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Тоннель";
 
 "type.highway.secondary" = "Автодорога";
 
-"type.highway.secondary.bridge" = "Автодорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Мост";
 
-"type.highway.secondary.tunnel" = "Автодорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Тоннель";
 
 "type.highway.secondary_link" = "Съезд с автодороги";
 
-"type.highway.secondary_link.bridge" = "Съезд с автодороги";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Мост";
 
-"type.highway.secondary_link.tunnel" = "Съезд с автодороги";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Тоннель";
 
 "type.highway.service" = "Проезд";
 
 "type.highway.service.area" = "Проезд";
 
-"type.highway.service.bridge" = "Проезд";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Мост";
 
 "type.highway.service.driveway" = "Подъезд";
 
 "type.highway.service.parking_aisle" = "Парковочный проезд";
 
-"type.highway.service.tunnel" = "Проезд";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Тоннель";
 
 "type.highway.services" = "Зона обслуживания";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Лестница";
 
-"type.highway.steps.bridge" = "Лестница";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Мост";
 
-"type.highway.steps.tunnel" = "Лестница";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Тоннель";
 
 "type.highway.tertiary" = "Дорога";
 
-"type.highway.tertiary.bridge" = "Дорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Мост";
 
-"type.highway.tertiary.tunnel" = "Дорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Тоннель";
 
 "type.highway.tertiary_link" = "Съезд с дороги";
 
-"type.highway.tertiary_link.bridge" = "Съезд с дороги";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Мост";
 
-"type.highway.tertiary_link.tunnel" = "Съезд с дороги";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Тоннель";
 
 "type.highway.track" = "Грунтовка";
 
 "type.highway.track.area" = "Грунтовка";
 
-"type.highway.track.bridge" = "Грунтовка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Мост";
 
 "type.highway.track.grade1" = "Грунтовка";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Грунтовка";
 
-"type.highway.track.tunnel" = "Грунтовка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Тоннель";
 
 "type.highway.traffic_signals" = "Светофор";
 
 "type.highway.trunk" = "Трасса";
 
-"type.highway.trunk.bridge" = "Трасса";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Мост";
 
-"type.highway.trunk.tunnel" = "Трасса";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Тоннель";
 
 "type.highway.trunk_link" = "Съезд с трассы";
 
-"type.highway.trunk_link.bridge" = "Съезд с трассы";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Мост";
 
-"type.highway.trunk_link.tunnel" = "Съезд с трассы";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Тоннель";
 
 "type.highway.unclassified" = "Небольшая дорога";
 
 "type.highway.unclassified.area" = "Небольшая дорога";
 
-"type.highway.unclassified.bridge" = "Небольшая дорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Мост";
 
-"type.highway.unclassified.tunnel" = "Небольшая дорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Тоннель";
 
 "type.area_highway.cycleway" = "Велодорожка";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index a6140b85af..fe46a8e2d2 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Míle";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Moja poloha";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Most";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunel";
 
 "type.highway.bus_stop" = "Autobusová zastávka";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Most";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Cesta";
 
-"type.highway.footway.bridge" = "Cesta";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Most";
 
 "type.highway.footway.demanding_alpine_hiking" = "Cesta";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Cesta";
 
-"type.highway.footway.tunnel" = "Cesta";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunel";
 
 "type.highway.ford" = "Brod";
 
 "type.highway.living_street" = "Ulica";
 
-"type.highway.living_street.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Most";
 
-"type.highway.living_street.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunel";
 
 "type.highway.motorway" = "Ulica";
 
-"type.highway.motorway.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Most";
 
-"type.highway.motorway.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunel";
 
 "type.highway.motorway_junction" = "Dopravný uzol";
 
 "type.highway.motorway_link" = "Ulica";
 
-"type.highway.motorway_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Most";
 
-"type.highway.motorway_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunel";
 
 "type.highway.path" = "Cesta";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Cesta";
 
-"type.highway.path.bridge" = "Cesta";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Most";
 
 "type.highway.path.demanding_alpine_hiking" = "Cesta";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Cesta";
 
-"type.highway.path.tunnel" = "Cesta";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunel";
 
 "type.highway.pedestrian" = "Ulica";
 
 "type.highway.pedestrian.area" = "Ulica";
 
-"type.highway.pedestrian.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Most";
 
-"type.highway.pedestrian.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunel";
 
 "type.highway.primary" = "Ulica";
 
-"type.highway.primary.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Most";
 
-"type.highway.primary.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunel";
 
 "type.highway.primary_link" = "Ulica";
 
-"type.highway.primary_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Most";
 
-"type.highway.primary_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunel";
 
 "type.highway.raceway" = "Pretekárska dráha";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Ulica";
 
-"type.highway.residential.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Most";
 
-"type.highway.residential.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunel";
 
 "type.highway.rest_area" = "Odpočívadlo";
 
 "type.highway.road" = "Ulica";
 
-"type.highway.road.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Most";
 
-"type.highway.road.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunel";
 
 "type.highway.secondary" = "Ulica";
 
-"type.highway.secondary.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Most";
 
-"type.highway.secondary.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunel";
 
 "type.highway.secondary_link" = "Ulica";
 
-"type.highway.secondary_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Most";
 
-"type.highway.secondary_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunel";
 
 "type.highway.service" = "Ulica";
 
 "type.highway.service.area" = "Ulica";
 
-"type.highway.service.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Most";
 
 "type.highway.service.driveway" = "Ulica";
 
 "type.highway.service.parking_aisle" = "Ulica";
 
-"type.highway.service.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Cesta";
 
-"type.highway.steps.bridge" = "Cesta";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Most";
 
-"type.highway.steps.tunnel" = "Cesta";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunel";
 
 "type.highway.tertiary" = "Ulica";
 
-"type.highway.tertiary.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Most";
 
-"type.highway.tertiary.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunel";
 
 "type.highway.tertiary_link" = "Ulica";
 
-"type.highway.tertiary_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Most";
 
-"type.highway.tertiary_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunel";
 
 "type.highway.track" = "Ulica";
 
 "type.highway.track.area" = "Ulica";
 
-"type.highway.track.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Most";
 
 "type.highway.track.grade1" = "Ulica";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Ulica";
 
-"type.highway.track.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunel";
 
 "type.highway.traffic_signals" = "Semafor";
 
 "type.highway.trunk" = "Ulica";
 
-"type.highway.trunk.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Most";
 
-"type.highway.trunk.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunel";
 
 "type.highway.trunk_link" = "Ulica";
 
-"type.highway.trunk_link.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Most";
 
-"type.highway.trunk_link.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunel";
 
 "type.highway.unclassified" = "Ulica";
 
 "type.highway.unclassified.area" = "Ulica";
 
-"type.highway.unclassified.bridge" = "Ulica";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Most";
 
-"type.highway.unclassified.tunnel" = "Ulica";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 3339f2cd4e..36f957f452 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mil";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Min position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Bro";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tunnel";
 
 "type.highway.bus_stop" = "Busshållplats";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Bro";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Gångväg";
 
-"type.highway.footway.bridge" = "Gångväg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Bro";
 
 "type.highway.footway.demanding_alpine_hiking" = "Gångväg";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Gångväg";
 
-"type.highway.footway.tunnel" = "Gångväg";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tunnel";
 
 "type.highway.ford" = "Vadställe";
 
 "type.highway.living_street" = "Gata";
 
-"type.highway.living_street.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Bro";
 
-"type.highway.living_street.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tunnel";
 
 "type.highway.motorway" = "Gata";
 
-"type.highway.motorway.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Bro";
 
-"type.highway.motorway.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tunnel";
 
 "type.highway.motorway_junction" = "Avfart";
 
 "type.highway.motorway_link" = "Gata";
 
-"type.highway.motorway_link.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Bro";
 
-"type.highway.motorway_link.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tunnel";
 
 "type.highway.path" = "Gångväg";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Gångväg";
 
-"type.highway.path.bridge" = "Gångväg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Bro";
 
 "type.highway.path.demanding_alpine_hiking" = "Gångväg";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Gångväg";
 
-"type.highway.path.tunnel" = "Gångväg";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tunnel";
 
 "type.highway.pedestrian" = "Gata";
 
 "type.highway.pedestrian.area" = "Gata";
 
-"type.highway.pedestrian.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Bro";
 
-"type.highway.pedestrian.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tunnel";
 
 "type.highway.primary" = "Gata";
 
-"type.highway.primary.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Bro";
 
-"type.highway.primary.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tunnel";
 
 "type.highway.primary_link" = "Gata";
 
-"type.highway.primary_link.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Bro";
 
-"type.highway.primary_link.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tunnel";
 
 "type.highway.raceway" = "Racerbana";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Gata";
 
-"type.highway.residential.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Bro";
 
-"type.highway.residential.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Viloplats";
 
 "type.highway.road" = "Gata";
 
-"type.highway.road.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Bro";
 
-"type.highway.road.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tunnel";
 
 "type.highway.secondary" = "Gata";
 
-"type.highway.secondary.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Bro";
 
-"type.highway.secondary.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tunnel";
 
 "type.highway.secondary_link" = "Gata";
 
-"type.highway.secondary_link.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Bro";
 
-"type.highway.secondary_link.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tunnel";
 
 "type.highway.service" = "Gata";
 
 "type.highway.service.area" = "Gata";
 
-"type.highway.service.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Bro";
 
 "type.highway.service.driveway" = "Gata";
 
 "type.highway.service.parking_aisle" = "Gata";
 
-"type.highway.service.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tunnel";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Gångväg";
 
-"type.highway.steps.bridge" = "Gångväg";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Bro";
 
-"type.highway.steps.tunnel" = "Gångväg";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tunnel";
 
 "type.highway.tertiary" = "Gata";
 
-"type.highway.tertiary.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Bro";
 
-"type.highway.tertiary.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tunnel";
 
 "type.highway.tertiary_link" = "Gata";
 
-"type.highway.tertiary_link.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Bro";
 
-"type.highway.tertiary_link.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tunnel";
 
 "type.highway.track" = "Gata";
 
 "type.highway.track.area" = "Gata";
 
-"type.highway.track.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Bro";
 
 "type.highway.track.grade1" = "Gata";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Gata";
 
-"type.highway.track.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Trafikljus";
 
 "type.highway.trunk" = "Gata";
 
-"type.highway.trunk.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Bro";
 
-"type.highway.trunk.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tunnel";
 
 "type.highway.trunk_link" = "Gata";
 
-"type.highway.trunk_link.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Bro";
 
-"type.highway.trunk_link.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tunnel";
 
 "type.highway.unclassified" = "Gata";
 
 "type.highway.unclassified.area" = "Gata";
 
-"type.highway.unclassified.bridge" = "Gata";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Bro";
 
-"type.highway.unclassified.tunnel" = "Gata";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tunnel";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 4ccc2fa391..ebc45ee919 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Miles";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Daraja";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Mtaro";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Daraja";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Mtaro";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Foot Path";
 
-"type.highway.footway.bridge" = "Foot Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Daraja";
 
 "type.highway.footway.demanding_alpine_hiking" = "Path";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Foot Path";
 
-"type.highway.footway.tunnel" = "Foot Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Mtaro";
 
 "type.highway.ford" = "Ford";
 
 "type.highway.living_street" = "Living Street";
 
-"type.highway.living_street.bridge" = "Living Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Daraja";
 
-"type.highway.living_street.tunnel" = "Living Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Mtaro";
 
 "type.highway.motorway" = "Motorway";
 
-"type.highway.motorway.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Daraja";
 
-"type.highway.motorway.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Mtaro";
 
 "type.highway.motorway_junction" = "Road Exit";
 
 "type.highway.motorway_link" = "Motorway";
 
-"type.highway.motorway_link.bridge" = "Motorway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Daraja";
 
-"type.highway.motorway_link.tunnel" = "Motorway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Mtaro";
 
 "type.highway.path" = "Path";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.path.bridge" = "Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Daraja";
 
 "type.highway.path.demanding_alpine_hiking" = "Path";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Path";
 
-"type.highway.path.tunnel" = "Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Mtaro";
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
 "type.highway.pedestrian.area" = "Pedestrian Street";
 
-"type.highway.pedestrian.bridge" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Daraja";
 
-"type.highway.pedestrian.tunnel" = "Pedestrian Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Mtaro";
 
 "type.highway.primary" = "Primary Road";
 
-"type.highway.primary.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Daraja";
 
-"type.highway.primary.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Mtaro";
 
 "type.highway.primary_link" = "Primary Road";
 
-"type.highway.primary_link.bridge" = "Primary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Daraja";
 
-"type.highway.primary_link.tunnel" = "Primary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Mtaro";
 
 "type.highway.raceway" = "Racetrack";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Street";
 
-"type.highway.residential.bridge" = "Street";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Daraja";
 
-"type.highway.residential.tunnel" = "Street";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Mtaro";
 
 "type.highway.rest_area" = "Rest Area";
 
 "type.highway.road" = "Road";
 
-"type.highway.road.bridge" = "Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Daraja";
 
-"type.highway.road.tunnel" = "Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Mtaro";
 
 "type.highway.secondary" = "Secondary Road";
 
-"type.highway.secondary.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Daraja";
 
-"type.highway.secondary.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Mtaro";
 
 "type.highway.secondary_link" = "Secondary Road";
 
-"type.highway.secondary_link.bridge" = "Secondary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Daraja";
 
-"type.highway.secondary_link.tunnel" = "Secondary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Mtaro";
 
 "type.highway.service" = "Service Road";
 
 "type.highway.service.area" = "Service Road";
 
-"type.highway.service.bridge" = "Service Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Daraja";
 
 "type.highway.service.driveway" = "Service Road";
 
 "type.highway.service.parking_aisle" = "Service Road";
 
-"type.highway.service.tunnel" = "Service Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Mtaro";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Stairs";
 
-"type.highway.steps.bridge" = "Stairs";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Daraja";
 
-"type.highway.steps.tunnel" = "Stairs";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Mtaro";
 
 "type.highway.tertiary" = "Tertiary Road";
 
-"type.highway.tertiary.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Daraja";
 
-"type.highway.tertiary.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Mtaro";
 
 "type.highway.tertiary_link" = "Tertiary Road";
 
-"type.highway.tertiary_link.bridge" = "Tertiary Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Daraja";
 
-"type.highway.tertiary_link.tunnel" = "Tertiary Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Mtaro";
 
 "type.highway.track" = "Track";
 
 "type.highway.track.area" = "Track";
 
-"type.highway.track.bridge" = "Track";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Daraja";
 
 "type.highway.track.grade1" = "Track";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Track";
 
-"type.highway.track.tunnel" = "Track";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Mtaro";
 
 "type.highway.traffic_signals" = "Traffic Lights";
 
 "type.highway.trunk" = "National Highway";
 
-"type.highway.trunk.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Daraja";
 
-"type.highway.trunk.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Mtaro";
 
 "type.highway.trunk_link" = "National Highway";
 
-"type.highway.trunk_link.bridge" = "National Highway";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Daraja";
 
-"type.highway.trunk_link.tunnel" = "National Highway";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Mtaro";
 
 "type.highway.unclassified" = "Minor Road";
 
 "type.highway.unclassified.area" = "Minor Road";
 
-"type.highway.unclassified.bridge" = "Minor Road";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Daraja";
 
-"type.highway.unclassified.tunnel" = "Minor Road";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Mtaro";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index e69ad036c1..381eb38264 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "ไมล์";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "ตำแหน่งของฉัน";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "สะพาน";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "อุโมงค์";
 
 "type.highway.bus_stop" = "ป้ายรถเมล์";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "สะพาน";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "อุโมงค์";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "เส้นทาง";
 
-"type.highway.footway.bridge" = "เส้นทาง";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "สะพาน";
 
 "type.highway.footway.demanding_alpine_hiking" = "เส้นทาง";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "เส้นทาง";
 
-"type.highway.footway.tunnel" = "เส้นทาง";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "อุโมงค์";
 
 "type.highway.ford" = "ที่ตื้นของทางน้ำ";
 
 "type.highway.living_street" = "ถนน";
 
-"type.highway.living_street.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "สะพาน";
 
-"type.highway.living_street.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "อุโมงค์";
 
 "type.highway.motorway" = "ถนน";
 
-"type.highway.motorway.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "สะพาน";
 
-"type.highway.motorway.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "อุโมงค์";
 
 "type.highway.motorway_junction" = "ทางออก";
 
 "type.highway.motorway_link" = "ถนน";
 
-"type.highway.motorway_link.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "สะพาน";
 
-"type.highway.motorway_link.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "อุโมงค์";
 
 "type.highway.path" = "เส้นทาง";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "เส้นทาง";
 
-"type.highway.path.bridge" = "เส้นทาง";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "สะพาน";
 
 "type.highway.path.demanding_alpine_hiking" = "เส้นทาง";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "เส้นทาง";
 
-"type.highway.path.tunnel" = "เส้นทาง";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "อุโมงค์";
 
 "type.highway.pedestrian" = "ถนน";
 
 "type.highway.pedestrian.area" = "ถนน";
 
-"type.highway.pedestrian.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "สะพาน";
 
-"type.highway.pedestrian.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "อุโมงค์";
 
 "type.highway.primary" = "ถนน";
 
-"type.highway.primary.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "สะพาน";
 
-"type.highway.primary.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "อุโมงค์";
 
 "type.highway.primary_link" = "ถนน";
 
-"type.highway.primary_link.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "สะพาน";
 
-"type.highway.primary_link.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "อุโมงค์";
 
 "type.highway.raceway" = "สนามแข่ง";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "ถนน";
 
-"type.highway.residential.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "สะพาน";
 
-"type.highway.residential.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "อุโมงค์";
 
 "type.highway.rest_area" = "บริเวณพักผ่อน";
 
 "type.highway.road" = "ถนน";
 
-"type.highway.road.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "สะพาน";
 
-"type.highway.road.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "อุโมงค์";
 
 "type.highway.secondary" = "ถนน";
 
-"type.highway.secondary.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "สะพาน";
 
-"type.highway.secondary.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "อุโมงค์";
 
 "type.highway.secondary_link" = "ถนน";
 
-"type.highway.secondary_link.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "สะพาน";
 
-"type.highway.secondary_link.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "อุโมงค์";
 
 "type.highway.service" = "ถนน";
 
 "type.highway.service.area" = "ถนน";
 
-"type.highway.service.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "สะพาน";
 
 "type.highway.service.driveway" = "ถนน";
 
 "type.highway.service.parking_aisle" = "ถนน";
 
-"type.highway.service.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "อุโมงค์";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "เส้นทาง";
 
-"type.highway.steps.bridge" = "เส้นทาง";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "สะพาน";
 
-"type.highway.steps.tunnel" = "เส้นทาง";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "อุโมงค์";
 
 "type.highway.tertiary" = "ถนน";
 
-"type.highway.tertiary.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "สะพาน";
 
-"type.highway.tertiary.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "อุโมงค์";
 
 "type.highway.tertiary_link" = "ถนน";
 
-"type.highway.tertiary_link.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "สะพาน";
 
-"type.highway.tertiary_link.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "อุโมงค์";
 
 "type.highway.track" = "ถนน";
 
 "type.highway.track.area" = "ถนน";
 
-"type.highway.track.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "สะพาน";
 
 "type.highway.track.grade1" = "ถนน";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "ถนน";
 
-"type.highway.track.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "อุโมงค์";
 
 "type.highway.traffic_signals" = "สัญญาณไฟจราจร";
 
 "type.highway.trunk" = "ถนน";
 
-"type.highway.trunk.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "สะพาน";
 
-"type.highway.trunk.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "อุโมงค์";
 
 "type.highway.trunk_link" = "ถนน";
 
-"type.highway.trunk_link.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "สะพาน";
 
-"type.highway.trunk_link.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "อุโมงค์";
 
 "type.highway.unclassified" = "ถนน";
 
 "type.highway.unclassified.area" = "ถนน";
 
-"type.highway.unclassified.bridge" = "ถนน";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "สะพาน";
 
-"type.highway.unclassified.tunnel" = "ถนน";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "อุโมงค์";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index c30e40a4ac..69e1c0c599 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Mil";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Konumum";
 
 /* Update maps later/Buy pro version later button text */
@@ -788,7 +788,7 @@
 
 "refresh" = "Yenile";
 
-"placepage_add_place_button" = "Haritaya bir yer ekleyin";
+"placepage_add_place_button" = "Haritaya bir yer ekle";
 
 /* Displayed when saving some edits to the map to warn against publishing personal data */
 "editor_share_to_all_dialog_title" = "Bunu tüm kullanıcılara göndermek ister misiniz?";
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Atlı Yolu";
 
-"type.highway.bridleway.bridge" = "Atlı Yolu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Köprü";
 
 "type.highway.bridleway.permissive" = "Atlı Yolu";
 
-"type.highway.bridleway.tunnel" = "Atlı Yolu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Tünel";
 
 "type.highway.bus_stop" = "Otobüs Durağı";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Bisiklet Yolu";
 
-"type.highway.cycleway.bridge" = "Bisiklet Yolu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Köprü";
 
 "type.highway.cycleway.permissive" = "Bisiklet Yolu";
 
-"type.highway.cycleway.tunnel" = "Bisiklet Yolu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Tünel";
 
 "type.highway.elevator" = "Asansör";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Yaya Alanı";
 
-"type.highway.footway.bridge" = "Yaya Yolu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Köprü";
 
 "type.highway.footway.demanding_alpine_hiking" = "Yol";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Yaya Yolu";
 
-"type.highway.footway.tunnel" = "Yaya Yolu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Tünel";
 
 "type.highway.ford" = "Geçit";
 
 "type.highway.living_street" = "Cadde";
 
-"type.highway.living_street.bridge" = "Cadde";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Köprü";
 
-"type.highway.living_street.tunnel" = "Cadde";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Tünel";
 
 "type.highway.motorway" = "Otoyol";
 
-"type.highway.motorway.bridge" = "Otoyol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Köprü";
 
-"type.highway.motorway.tunnel" = "Otoyol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Tünel";
 
 "type.highway.motorway_junction" = "Çıkış";
 
 "type.highway.motorway_link" = "Otoyol Rampası";
 
-"type.highway.motorway_link.bridge" = "Otoyol Rampası";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Köprü";
 
-"type.highway.motorway_link.tunnel" = "Otoyol Rampası";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Tünel";
 
 "type.highway.path" = "Yol";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Bisiklet ve Yürüyüş Yolu";
 
-"type.highway.path.bridge" = "Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Köprü";
 
 "type.highway.path.demanding_alpine_hiking" = "Yol";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Yol";
 
-"type.highway.path.tunnel" = "Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Tünel";
 
 "type.highway.pedestrian" = "Yayalar için Cadde";
 
 "type.highway.pedestrian.area" = "Yaya Alanı";
 
-"type.highway.pedestrian.bridge" = "Yayalar için Cadde";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Köprü";
 
-"type.highway.pedestrian.tunnel" = "Yayalar için Cadde";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Tünel";
 
 "type.highway.primary" = "Ana Yol";
 
-"type.highway.primary.bridge" = "Ana Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Köprü";
 
-"type.highway.primary.tunnel" = "Ana Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Tünel";
 
 "type.highway.primary_link" = "Ana Yol";
 
-"type.highway.primary_link.bridge" = "Ana Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Köprü";
 
-"type.highway.primary_link.tunnel" = "Ana Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Tünel";
 
 "type.highway.raceway" = "Yarış Pisti";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Sokak";
 
-"type.highway.residential.bridge" = "Sokak";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Köprü";
 
-"type.highway.residential.tunnel" = "Sokak";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Tünel";
 
 "type.highway.rest_area" = "Dinlenme Alanı";
 
 "type.highway.road" = "Yol";
 
-"type.highway.road.bridge" = "Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Köprü";
 
-"type.highway.road.tunnel" = "Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Tünel";
 
 "type.highway.secondary" = "Tali Yol";
 
-"type.highway.secondary.bridge" = "Tali Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Köprü";
 
-"type.highway.secondary.tunnel" = "Tali Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Tünel";
 
 "type.highway.secondary_link" = "Tali Yol";
 
-"type.highway.secondary_link.bridge" = "Tali Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Köprü";
 
-"type.highway.secondary_link.tunnel" = "Tali Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Tünel";
 
 "type.highway.service" = "Servis Yolu";
 
 "type.highway.service.area" = "Servis Yolu";
 
-"type.highway.service.bridge" = "Servis Yolu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Köprü";
 
 "type.highway.service.driveway" = "Servis Yolu";
 
 "type.highway.service.parking_aisle" = "Park Koridoru";
 
-"type.highway.service.tunnel" = "Servis Yolu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Tünel";
 
 "type.highway.services" = "Servis Alanı";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Merdiven";
 
-"type.highway.steps.bridge" = "Merdiven";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Köprü";
 
-"type.highway.steps.tunnel" = "Merdiven";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Tünel";
 
 "type.highway.tertiary" = "Üçüncül Yol";
 
-"type.highway.tertiary.bridge" = "Üçüncül Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Köprü";
 
-"type.highway.tertiary.tunnel" = "Üçüncül Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Tünel";
 
 "type.highway.tertiary_link" = "Üçüncül Yol Rampası";
 
-"type.highway.tertiary_link.bridge" = "Üçüncül Yol Rampası";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Köprü";
 
-"type.highway.tertiary_link.tunnel" = "Üçüncül Yol Rampası";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Tünel";
 
 "type.highway.track" = "Pist";
 
 "type.highway.track.area" = "Pist";
 
-"type.highway.track.bridge" = "Pist";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Köprü";
 
 "type.highway.track.grade1" = "Pist";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Pist";
 
-"type.highway.track.tunnel" = "Pist";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Tünel";
 
 "type.highway.traffic_signals" = "Trafik Işıkları";
 
 "type.highway.trunk" = "Devlet Yolu";
 
-"type.highway.trunk.bridge" = "Devlet Yolu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Köprü";
 
-"type.highway.trunk.tunnel" = "Devlet Yolu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Tünel";
 
 "type.highway.trunk_link" = "Devlet Yolu";
 
-"type.highway.trunk_link.bridge" = "Devlet Yolu";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Köprü";
 
-"type.highway.trunk_link.tunnel" = "Devlet Yolu";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Tünel";
 
 "type.highway.unclassified" = "Tali Yol";
 
 "type.highway.unclassified.area" = "Tali Yol";
 
-"type.highway.unclassified.bridge" = "Tali Yol";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Köprü";
 
-"type.highway.unclassified.tunnel" = "Tali Yol";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Tünel";
 
 "type.area_highway.cycleway" = "Bisiklet Yolu";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index b06656a921..4e20749ff3 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Милі";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Моє місцезнаходження";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Кінна доріжка";
 
-"type.highway.bridleway.bridge" = "Кінна доріжка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Міст";
 
 "type.highway.bridleway.permissive" = "Кінна доріжка";
 
-"type.highway.bridleway.tunnel" = "Кінна доріжка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Тунель";
 
 "type.highway.bus_stop" = "Зупинка";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Велодоріжка";
 
-"type.highway.cycleway.bridge" = "Велодоріжка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Міст";
 
 "type.highway.cycleway.permissive" = "Велодоріжка";
 
-"type.highway.cycleway.tunnel" = "Велодоріжка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Тунель";
 
 "type.highway.elevator" = "Ліфт";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Пішохідна зона";
 
-"type.highway.footway.bridge" = "Пішохідна доріжка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Міст";
 
 "type.highway.footway.demanding_alpine_hiking" = "Стежка";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Пішохідна доріжка";
 
-"type.highway.footway.tunnel" = "Пішохідна доріжка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Тунель";
 
 "type.highway.ford" = "Брід";
 
 "type.highway.living_street" = "Житлова зона";
 
-"type.highway.living_street.bridge" = "Житлова зона";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Міст";
 
-"type.highway.living_street.tunnel" = "Житлова зона";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Тунель";
 
 "type.highway.motorway" = "Автомагістраль";
 
-"type.highway.motorway.bridge" = "Автомагістраль";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Міст";
 
-"type.highway.motorway.tunnel" = "Автомагістраль";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Тунель";
 
 "type.highway.motorway_junction" = "З'їзд";
 
 "type.highway.motorway_link" = "З'їзд з автомагістралі";
 
-"type.highway.motorway_link.bridge" = "З'їзд з автомагістралі";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Міст";
 
-"type.highway.motorway_link.tunnel" = "З'їзд з автомагістралі";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Тунель";
 
 "type.highway.path" = "Стежка";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Велопішохідна доріжка";
 
-"type.highway.path.bridge" = "Стежка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Міст";
 
 "type.highway.path.demanding_alpine_hiking" = "Стежка";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Стежка";
 
-"type.highway.path.tunnel" = "Стежка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Тунель";
 
 "type.highway.pedestrian" = "Пішохідна вулиця";
 
 "type.highway.pedestrian.area" = "Пішохідна зона";
 
-"type.highway.pedestrian.bridge" = "Пішохідна вулиця";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Міст";
 
-"type.highway.pedestrian.tunnel" = "Пішохідна вулиця";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Тунель";
 
 "type.highway.primary" = "Шосе";
 
-"type.highway.primary.bridge" = "Шосе";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Міст";
 
-"type.highway.primary.tunnel" = "Шосе";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Тунель";
 
 "type.highway.primary_link" = "З'їзд з шосе";
 
-"type.highway.primary_link.bridge" = "З'їзд з шосе";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Міст";
 
-"type.highway.primary_link.tunnel" = "З'їзд з шосе";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Тунель";
 
 "type.highway.raceway" = "Гоночний трек";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Вулиця";
 
-"type.highway.residential.bridge" = "Вулиця";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Міст";
 
-"type.highway.residential.tunnel" = "Вулиця";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Тунель";
 
 "type.highway.rest_area" = "Зона відпочинку";
 
 "type.highway.road" = "Дорога";
 
-"type.highway.road.bridge" = "Дорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Міст";
 
-"type.highway.road.tunnel" = "Дорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Тунель";
 
 "type.highway.secondary" = "Автодорога";
 
-"type.highway.secondary.bridge" = "Автодорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Міст";
 
-"type.highway.secondary.tunnel" = "Автодорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Тунель";
 
 "type.highway.secondary_link" = "З'їзд з автодороги";
 
-"type.highway.secondary_link.bridge" = "З'їзд з автодороги";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Міст";
 
-"type.highway.secondary_link.tunnel" = "З'їзд з автодороги";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Тунель";
 
 "type.highway.service" = "Проїзд";
 
 "type.highway.service.area" = "Проїзд";
 
-"type.highway.service.bridge" = "Проїзд";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Міст";
 
 "type.highway.service.driveway" = "Під'їзд";
 
 "type.highway.service.parking_aisle" = "Паркувальний проїзд";
 
-"type.highway.service.tunnel" = "Проїзд";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Тунель";
 
 "type.highway.services" = "Зона обслуговування";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Сходи";
 
-"type.highway.steps.bridge" = "Сходи";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Міст";
 
-"type.highway.steps.tunnel" = "Сходи";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Тунель";
 
 "type.highway.tertiary" = "Дорога";
 
-"type.highway.tertiary.bridge" = "Дорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Міст";
 
-"type.highway.tertiary.tunnel" = "Дорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Тунель";
 
 "type.highway.tertiary_link" = "З'їзд з дороги";
 
-"type.highway.tertiary_link.bridge" = "З'їзд з дороги";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Міст";
 
-"type.highway.tertiary_link.tunnel" = "З'їзд з дороги";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Тунель";
 
 "type.highway.track" = "Ґрунтівка";
 
 "type.highway.track.area" = "Ґрунтівка";
 
-"type.highway.track.bridge" = "Ґрунтівка";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Міст";
 
 "type.highway.track.grade1" = "Ґрунтівка";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Ґрунтівка";
 
-"type.highway.track.tunnel" = "Ґрунтівка";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Тунель";
 
 "type.highway.traffic_signals" = "Світлофор";
 
 "type.highway.trunk" = "Траса";
 
-"type.highway.trunk.bridge" = "Траса";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Міст";
 
-"type.highway.trunk.tunnel" = "Траса";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Тунель";
 
 "type.highway.trunk_link" = "З'їзд з траси";
 
-"type.highway.trunk_link.bridge" = "З'їзд з траси";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Міст";
 
-"type.highway.trunk_link.tunnel" = "З'їзд з траси";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Тунель";
 
 "type.highway.unclassified" = "Невелика дорога";
 
 "type.highway.unclassified.area" = "Невелика дорога";
 
-"type.highway.unclassified.bridge" = "Невелика дорога";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Міст";
 
-"type.highway.unclassified.tunnel" = "Невелика дорога";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Тунель";
 
 "type.area_highway.cycleway" = "Велодоріжка";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 0d1cc635cb..eea4606237 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "Dặm";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Vị trí của Tôi";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "Cầu";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "Đường hầm";
 
 "type.highway.bus_stop" = "Bến xe buýt";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "Cầu";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "Đường hầm";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "Đường";
 
-"type.highway.footway.bridge" = "Đường";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "Cầu";
 
 "type.highway.footway.demanding_alpine_hiking" = "Đường";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "Đường";
 
-"type.highway.footway.tunnel" = "Đường";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "Đường hầm";
 
 "type.highway.ford" = "Đập tràn";
 
 "type.highway.living_street" = "Phố";
 
-"type.highway.living_street.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "Cầu";
 
-"type.highway.living_street.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "Đường hầm";
 
 "type.highway.motorway" = "Phố";
 
-"type.highway.motorway.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "Cầu";
 
-"type.highway.motorway.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "Đường hầm";
 
 "type.highway.motorway_junction" = "Lối ra";
 
 "type.highway.motorway_link" = "Phố";
 
-"type.highway.motorway_link.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "Cầu";
 
-"type.highway.motorway_link.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "Đường hầm";
 
 "type.highway.path" = "Đường";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "Đường";
 
-"type.highway.path.bridge" = "Đường";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "Cầu";
 
 "type.highway.path.demanding_alpine_hiking" = "Đường";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "Đường";
 
-"type.highway.path.tunnel" = "Đường";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "Đường hầm";
 
 "type.highway.pedestrian" = "Phố";
 
 "type.highway.pedestrian.area" = "Phố";
 
-"type.highway.pedestrian.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "Cầu";
 
-"type.highway.pedestrian.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "Đường hầm";
 
 "type.highway.primary" = "Phố";
 
-"type.highway.primary.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "Cầu";
 
-"type.highway.primary.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "Đường hầm";
 
 "type.highway.primary_link" = "Phố";
 
-"type.highway.primary_link.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "Cầu";
 
-"type.highway.primary_link.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "Đường hầm";
 
 "type.highway.raceway" = "Đường đua";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "Phố";
 
-"type.highway.residential.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "Cầu";
 
-"type.highway.residential.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "Đường hầm";
 
 "type.highway.rest_area" = "Khu Vực Thụt Vào Để Đỗ Xe";
 
 "type.highway.road" = "Phố";
 
-"type.highway.road.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "Cầu";
 
-"type.highway.road.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "Đường hầm";
 
 "type.highway.secondary" = "Phố";
 
-"type.highway.secondary.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "Cầu";
 
-"type.highway.secondary.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "Đường hầm";
 
 "type.highway.secondary_link" = "Phố";
 
-"type.highway.secondary_link.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "Cầu";
 
-"type.highway.secondary_link.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "Đường hầm";
 
 "type.highway.service" = "Phố";
 
 "type.highway.service.area" = "Phố";
 
-"type.highway.service.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "Cầu";
 
 "type.highway.service.driveway" = "Phố";
 
 "type.highway.service.parking_aisle" = "Phố";
 
-"type.highway.service.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "Đường hầm";
 
 "type.highway.services" = "Service Area";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "Đường";
 
-"type.highway.steps.bridge" = "Đường";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "Cầu";
 
-"type.highway.steps.tunnel" = "Đường";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "Đường hầm";
 
 "type.highway.tertiary" = "Phố";
 
-"type.highway.tertiary.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "Cầu";
 
-"type.highway.tertiary.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "Đường hầm";
 
 "type.highway.tertiary_link" = "Phố";
 
-"type.highway.tertiary_link.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "Cầu";
 
-"type.highway.tertiary_link.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "Đường hầm";
 
 "type.highway.track" = "Phố";
 
 "type.highway.track.area" = "Phố";
 
-"type.highway.track.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "Cầu";
 
 "type.highway.track.grade1" = "Phố";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "Phố";
 
-"type.highway.track.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "Đường hầm";
 
 "type.highway.traffic_signals" = "Đèn Giao Thông";
 
 "type.highway.trunk" = "Phố";
 
-"type.highway.trunk.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "Cầu";
 
-"type.highway.trunk.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "Đường hầm";
 
 "type.highway.trunk_link" = "Phố";
 
-"type.highway.trunk_link.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "Cầu";
 
-"type.highway.trunk_link.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "Đường hầm";
 
 "type.highway.unclassified" = "Phố";
 
 "type.highway.unclassified.area" = "Phố";
 
-"type.highway.unclassified.bridge" = "Phố";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "Cầu";
 
-"type.highway.unclassified.tunnel" = "Phố";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "Đường hầm";
 
 "type.area_highway.cycleway" = "Cycle Path";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 5627720763..29cb51fea0 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "英里";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "我的位置";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "马道";
 
-"type.highway.bridleway.bridge" = "马道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "桥";
 
 "type.highway.bridleway.permissive" = "马道";
 
-"type.highway.bridleway.tunnel" = "马道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "隧道";
 
 "type.highway.bus_stop" = "公交站";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "自行车道";
 
-"type.highway.cycleway.bridge" = "自行车道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "桥";
 
 "type.highway.cycleway.permissive" = "自行车道";
 
-"type.highway.cycleway.tunnel" = "自行车道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "隧道";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "步行道路";
 
-"type.highway.footway.bridge" = "步行道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "桥";
 
 "type.highway.footway.demanding_alpine_hiking" = "步行道路";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "步行道路";
 
-"type.highway.footway.tunnel" = "步行道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "隧道";
 
 "type.highway.ford" = "浅滩";
 
 "type.highway.living_street" = "生活性街道";
 
-"type.highway.living_street.bridge" = "生活性街道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "桥";
 
-"type.highway.living_street.tunnel" = "生活性街道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "隧道";
 
 "type.highway.motorway" = "高速公路";
 
-"type.highway.motorway.bridge" = "高速公路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "桥";
 
-"type.highway.motorway.tunnel" = "高速公路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "隧道";
 
 "type.highway.motorway_junction" = "出口";
 
 "type.highway.motorway_link" = "高速公路连接路";
 
-"type.highway.motorway_link.bridge" = "高速公路连接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "桥";
 
-"type.highway.motorway_link.tunnel" = "高速公路连接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "隧道";
 
 "type.highway.path" = "小道";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "小道";
 
-"type.highway.path.bridge" = "小道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "桥";
 
 "type.highway.path.demanding_alpine_hiking" = "小道";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "小道";
 
-"type.highway.path.tunnel" = "小道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "隧道";
 
 "type.highway.pedestrian" = "步行街";
 
 "type.highway.pedestrian.area" = "步行区域";
 
-"type.highway.pedestrian.bridge" = "步行街";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "桥";
 
-"type.highway.pedestrian.tunnel" = "步行街";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "隧道";
 
 "type.highway.primary" = "主要道路";
 
-"type.highway.primary.bridge" = "主要道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "桥";
 
-"type.highway.primary.tunnel" = "主要道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "隧道";
 
 "type.highway.primary_link" = "主要道路连接路";
 
-"type.highway.primary_link.bridge" = "主要道路连接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "桥";
 
-"type.highway.primary_link.tunnel" = "主要道路连接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "隧道";
 
 "type.highway.raceway" = "赛车场";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "住宅区道路";
 
-"type.highway.residential.bridge" = "住宅区道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "桥";
 
-"type.highway.residential.tunnel" = "住宅区道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "隧道";
 
 "type.highway.rest_area" = "休息区";
 
 "type.highway.road" = "道路";
 
-"type.highway.road.bridge" = "道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "桥";
 
-"type.highway.road.tunnel" = "道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "隧道";
 
 "type.highway.secondary" = "次要道路";
 
-"type.highway.secondary.bridge" = "次要道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "桥";
 
-"type.highway.secondary.tunnel" = "次要道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "隧道";
 
 "type.highway.secondary_link" = "次要道路连接路";
 
-"type.highway.secondary_link.bridge" = "次要道路连接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "桥";
 
-"type.highway.secondary_link.tunnel" = "次要道路连接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "隧道";
 
 "type.highway.service" = "辅助道路";
 
 "type.highway.service.area" = "辅助道路";
 
-"type.highway.service.bridge" = "辅助道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "桥";
 
 "type.highway.service.driveway" = "车道";
 
 "type.highway.service.parking_aisle" = "停车场通道";
 
-"type.highway.service.tunnel" = "辅助道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "隧道";
 
 "type.highway.services" = "服务区";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "阶梯";
 
-"type.highway.steps.bridge" = "阶梯";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "桥";
 
-"type.highway.steps.tunnel" = "阶梯";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "隧道";
 
 "type.highway.tertiary" = "三级道路";
 
-"type.highway.tertiary.bridge" = "三级道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "桥";
 
-"type.highway.tertiary.tunnel" = "三级道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "隧道";
 
 "type.highway.tertiary_link" = "三级道路连接路";
 
-"type.highway.tertiary_link.bridge" = "三级道路连接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "桥";
 
-"type.highway.tertiary_link.tunnel" = "三级道路连接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "隧道";
 
 "type.highway.track" = "土路";
 
 "type.highway.track.area" = "土路";
 
-"type.highway.track.bridge" = "土路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "桥";
 
 "type.highway.track.grade1" = "土路";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "土路";
 
-"type.highway.track.tunnel" = "土路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "隧道";
 
 "type.highway.traffic_signals" = "交通信号灯";
 
 "type.highway.trunk" = "干线道路";
 
-"type.highway.trunk.bridge" = "干线道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "桥";
 
-"type.highway.trunk.tunnel" = "干线道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "隧道";
 
 "type.highway.trunk_link" = "干线道路连接路";
 
-"type.highway.trunk_link.bridge" = "干线道路连接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "桥";
 
-"type.highway.trunk_link.tunnel" = "干线道路连接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "隧道";
 
 "type.highway.unclassified" = "道路";
 
 "type.highway.unclassified.area" = "道路";
 
-"type.highway.unclassified.bridge" = "道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "桥";
 
-"type.highway.unclassified.tunnel" = "道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "隧道";
 
 "type.area_highway.cycleway" = "自行车道";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 2021fe071d..33a1d18bb1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* Choose measurement on first launch alert - choose imperial system button */
 "miles" = "英哩";
 
-/* View and button titles for accessibility */
+/* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "我的位置";
 
 /* Update maps later/Buy pro version later button text */
@@ -1765,11 +1765,13 @@
 
 "type.highway.bridleway" = "Bridle Path";
 
-"type.highway.bridleway.bridge" = "Bridle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.bridleway.bridge" = "橋";
 
 "type.highway.bridleway.permissive" = "Bridle Path";
 
-"type.highway.bridleway.tunnel" = "Bridle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.bridleway.tunnel" = "隧道";
 
 "type.highway.bus_stop" = "巴士站";
 
@@ -1777,11 +1779,13 @@
 
 "type.highway.cycleway" = "Cycle Path";
 
-"type.highway.cycleway.bridge" = "Cycle Path";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.cycleway.bridge" = "橋";
 
 "type.highway.cycleway.permissive" = "Cycle Path";
 
-"type.highway.cycleway.tunnel" = "Cycle Path";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.cycleway.tunnel" = "隧道";
 
 "type.highway.elevator" = "Elevator";
 
@@ -1791,7 +1795,8 @@
 
 "type.highway.footway.area" = "人行步道";
 
-"type.highway.footway.bridge" = "人行步道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.footway.bridge" = "橋";
 
 "type.highway.footway.demanding_alpine_hiking" = "人行步道";
 
@@ -1805,29 +1810,36 @@
 
 "type.highway.footway.permissive" = "人行步道";
 
-"type.highway.footway.tunnel" = "人行步道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.footway.tunnel" = "隧道";
 
 "type.highway.ford" = "淺灘";
 
 "type.highway.living_street" = "路";
 
-"type.highway.living_street.bridge" = "路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.living_street.bridge" = "橋";
 
-"type.highway.living_street.tunnel" = "路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.living_street.tunnel" = "隧道";
 
 "type.highway.motorway" = "高速公路";
 
-"type.highway.motorway.bridge" = "高速公路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway.bridge" = "橋";
 
-"type.highway.motorway.tunnel" = "高速公路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway.tunnel" = "隧道";
 
 "type.highway.motorway_junction" = "交流道";
 
 "type.highway.motorway_link" = "高速公路連接路";
 
-"type.highway.motorway_link.bridge" = "高速公路連接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.motorway_link.bridge" = "橋";
 
-"type.highway.motorway_link.tunnel" = "高速公路連接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.motorway_link.tunnel" = "隧道";
 
 "type.highway.path" = "人行步道";
 
@@ -1835,7 +1847,8 @@
 
 "type.highway.path.bicycle" = "人行步道";
 
-"type.highway.path.bridge" = "人行步道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.path.bridge" = "橋";
 
 "type.highway.path.demanding_alpine_hiking" = "人行步道";
 
@@ -1851,27 +1864,34 @@
 
 "type.highway.path.permissive" = "人行步道";
 
-"type.highway.path.tunnel" = "人行步道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.path.tunnel" = "隧道";
 
 "type.highway.pedestrian" = "路";
 
 "type.highway.pedestrian.area" = "路";
 
-"type.highway.pedestrian.bridge" = "路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.pedestrian.bridge" = "橋";
 
-"type.highway.pedestrian.tunnel" = "路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.pedestrian.tunnel" = "隧道";
 
 "type.highway.primary" = "主要道路";
 
-"type.highway.primary.bridge" = "主要道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary.bridge" = "橋";
 
-"type.highway.primary.tunnel" = "主要道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary.tunnel" = "隧道";
 
 "type.highway.primary_link" = "主要道路連接路";
 
-"type.highway.primary_link.bridge" = "主要道路連接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.primary_link.bridge" = "橋";
 
-"type.highway.primary_link.tunnel" = "主要道路連接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.primary_link.tunnel" = "隧道";
 
 "type.highway.raceway" = "跑道";
 
@@ -1879,41 +1899,51 @@
 
 "type.highway.residential.area" = "住宅區道路";
 
-"type.highway.residential.bridge" = "住宅區道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.residential.bridge" = "橋";
 
-"type.highway.residential.tunnel" = "住宅區道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.residential.tunnel" = "隧道";
 
 "type.highway.rest_area" = "休息區";
 
 "type.highway.road" = "道路";
 
-"type.highway.road.bridge" = "道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.road.bridge" = "橋";
 
-"type.highway.road.tunnel" = "道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.road.tunnel" = "隧道";
 
 "type.highway.secondary" = "次要道路";
 
-"type.highway.secondary.bridge" = "次要道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary.bridge" = "橋";
 
-"type.highway.secondary.tunnel" = "次要道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary.tunnel" = "隧道";
 
 "type.highway.secondary_link" = "次要道路連接路";
 
-"type.highway.secondary_link.bridge" = "次要道路連接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.secondary_link.bridge" = "橋";
 
-"type.highway.secondary_link.tunnel" = "次要道路連接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.secondary_link.tunnel" = "隧道";
 
 "type.highway.service" = "輔助道路";
 
 "type.highway.service.area" = "輔助道路";
 
-"type.highway.service.bridge" = "輔助道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.service.bridge" = "橋";
 
 "type.highway.service.driveway" = "車道";
 
 "type.highway.service.parking_aisle" = "停車場通道";
 
-"type.highway.service.tunnel" = "輔助道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.service.tunnel" = "隧道";
 
 "type.highway.services" = "服務區";
 
@@ -1921,27 +1951,34 @@
 
 "type.highway.steps" = "人行步道";
 
-"type.highway.steps.bridge" = "人行步道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.steps.bridge" = "橋";
 
-"type.highway.steps.tunnel" = "人行步道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.steps.tunnel" = "隧道";
 
 "type.highway.tertiary" = "三级道路";
 
-"type.highway.tertiary.bridge" = "三级道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary.bridge" = "橋";
 
-"type.highway.tertiary.tunnel" = "三级道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary.tunnel" = "隧道";
 
 "type.highway.tertiary_link" = "三级道路連接路";
 
-"type.highway.tertiary_link.bridge" = "三级道路連接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.tertiary_link.bridge" = "橋";
 
-"type.highway.tertiary_link.tunnel" = "三级道路連接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.tertiary_link.tunnel" = "隧道";
 
 "type.highway.track" = "土路";
 
 "type.highway.track.area" = "土路";
 
-"type.highway.track.bridge" = "土路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.track.bridge" = "橋";
 
 "type.highway.track.grade1" = "土路";
 
@@ -1957,29 +1994,36 @@
 
 "type.highway.track.permissive" = "土路";
 
-"type.highway.track.tunnel" = "土路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.track.tunnel" = "隧道";
 
 "type.highway.traffic_signals" = "紅綠燈";
 
 "type.highway.trunk" = "主幹道";
 
-"type.highway.trunk.bridge" = "主幹道";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk.bridge" = "橋";
 
-"type.highway.trunk.tunnel" = "主幹道";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk.tunnel" = "隧道";
 
 "type.highway.trunk_link" = "主幹道連接路";
 
-"type.highway.trunk_link.bridge" = "主幹道連接路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.trunk_link.bridge" = "橋";
 
-"type.highway.trunk_link.tunnel" = "主幹道連接路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.trunk_link.tunnel" = "隧道";
 
 "type.highway.unclassified" = "道路";
 
 "type.highway.unclassified.area" = "道路";
 
-"type.highway.unclassified.bridge" = "道路";
+/* These translations are used for all type.highway.*.bridge. */
+"type.highway.unclassified.bridge" = "橋";
 
-"type.highway.unclassified.tunnel" = "道路";
+/* These translations are used for all type.highway.*.tunnel. */
+"type.highway.unclassified.tunnel" = "隧道";
 
 "type.area_highway.cycleway" = "Cycle Path";