diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 6f7d0abeb2..e10243e5b8 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1280,9 +1280,27 @@
 	<string name="type.shop.video">متجر فيديو</string>
 	<string name="type.shop.video_games">متجر ألعاب فيديو</string>
 	<string name="type.shop.wine">متجر مشروبات روحية</string>
+	<string name="type.sport">رياضة</string>
+	<string name="type.sport.american_football">كرة القدم الأمريكية</string>
+	<string name="type.sport.archery">الرماية</string>
 	<string name="type.sport.athletics">العاب رياضية</string>
+	<string name="type.sport.australian_football">كرة القدم الأسترالية</string>
+	<string name="type.sport.baseball">البيسبول</string>
 	<string name="type.sport.basketball">كرة السلة</string>
+	<string name="type.sport.bowls">لعبة البولينج</string>
+	<string name="type.sport.cricket">كريكت</string>
+	<string name="type.sport.curling">كيرلنغ</string>
 	<string name="type.sport.equestrian">رياضة الفروسية</string>
+	<string name="type.sport.golf">الجولف</string>
+	<string name="type.sport.gymnastics">رياضة بدنية</string>
+	<string name="type.sport.handball">كرة اليد</string>
+	<string name="type.sport.multi">رياضات متنوعة</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">الغوص</string>
+	<string name="type.sport.shooting">رماية</string>
+	<string name="type.sport.skiing">التزحلق</string>
+	<string name="type.sport.soccer">كرة القدم</string>
+	<string name="type.sport.swimming">سباحة</string>
 	<string name="type.sport.tennis">ملعب تنس</string>
 	<string name="type.tourism.alpine_hut">مساكن جبلية</string>
 	<string name="type.tourism.apartment">شُقَق</string>
@@ -1303,7 +1321,7 @@
 	<string name="type.tourism.hotel">فندق</string>
 	<string name="type.tourism.information">معلومات سياحية</string>
 	<string name="type.tourism.information.board">لوحة معلومات</string>
-	<string name="type.tourism.information.guidepost">معلومات سياحية</string>
+	<string name="type.tourism.information.guidepost">دليل</string>
 	<string name="type.tourism.information.map">خريطة سياحية</string>
 	<string name="type.tourism.information.office">مكتب سياحة</string>
 	<string name="type.tourism.motel">فندق رخيص</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 62ea3563b8..f9bb598ccd 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -891,7 +891,28 @@
 	<string name="type.shop.caravan">Продаж аўтадамоў</string>
 	<string name="type.shop.cosmetics">Касметыка</string>
 	<string name="type.shop.funeral_directors">Рытуальныя паслугі</string>
+	<string name="type.sport">Спорт</string>
+	<string name="type.sport.american_football">Амерыканскі футбол</string>
+	<string name="type.sport.archery">Стральба з лука</string>
+	<string name="type.sport.australian_football">Аўстралійскі футбол</string>
+	<string name="type.sport.baseball">Бейсбол</string>
+	<string name="type.sport.bowls">Боўлз</string>
+	<string name="type.sport.cricket">Крикет</string>
+	<string name="type.sport.curling">Кёрлінг</string>
+	<string name="type.sport.equestrian">Конны спорт</string>
+	<string name="type.sport.golf">Гольф</string>
+	<string name="type.sport.gymnastics">Гімнастыка</string>
+	<string name="type.sport.handball">Гандбол</string>
+	<string name="type.sport.multi">Розныя віды спорту</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Месца для дайвінга</string>
+	<string name="type.sport.shooting">Стральба</string>
+	<string name="type.sport.skiing">Катанне на лыжах</string>
+	<string name="type.sport.soccer">Футбол</string>
+	<string name="type.sport.swimming">Плаванне</string>
+	<string name="type.sport.tennis">Тэнісны корт</string>
 	<string name="type.tourism.caravan_site">Кемпінг для аўтадамоў</string>
+	<string name="type.tourism.information.guidepost">Даведнік</string>
 	<string name="type.waterway.river">Рака</string>
 	<string name="type.waterway.river.tunnel">Рака</string>
 	<string name="type.waterway.riverbank">Рака</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index cbafa9bfb5..0b6a22e260 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -744,4 +744,13 @@
 	<string name="type.natural.water.basin">Резервоар</string>
 	<string name="type.natural.water">Воден басейн</string>
 	<string name="type.office.telecommunication">Телекомуникационна компания</string>
+	<string name="type.sport">Спорт</string>
+	<string name="type.sport.american_football">Американски футбол</string>
+	<string name="type.sport.archery">Стрелба с лък</string>
+	<string name="type.sport.australian_football">Австралийски футбол</string>
+	<string name="type.sport.equestrian">Конен спорт</string>
+	<string name="type.sport.multi">Различни спортове</string>
+	<string name="type.sport.swimming">Плуване</string>
+	<string name="type.sport.tennis">Тенис корт</string>
+	<string name="type.tourism.information.guidepost">Пътеводител</string>
 </resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 2a87048c89..bc04fbcbde 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1273,9 +1273,26 @@
 	<string name="type.shop.video">Videopůjčovna</string>
 	<string name="type.shop.video_games">Obchod s videohrami</string>
 	<string name="type.shop.wine">Vinařství</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Americký fotbal</string>
+	<string name="type.sport.archery">Lukostřelba</string>
 	<string name="type.sport.athletics">Atletika</string>
+	<string name="type.sport.australian_football">Australský fotbal</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketbal</string>
+	<string name="type.sport.cricket">Kriket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Koňské sporty</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastika</string>
+	<string name="type.sport.handball">Házená</string>
+	<string name="type.sport.multi">Různé sporty</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Potápění</string>
+	<string name="type.sport.shooting">Střílení</string>
+	<string name="type.sport.skiing">Lyžování</string>
+	<string name="type.sport.soccer">Fotbal</string>
+	<string name="type.sport.swimming">Plavání</string>
 	<string name="type.sport.tennis">Tenisový kurt</string>
 	<string name="type.tourism.alpine_hut">Ubytování v horách</string>
 	<string name="type.tourism.apartment">Byty</string>
@@ -1293,7 +1310,7 @@
 	<string name="type.tourism.guest_house">Penzion</string>
 	<string name="type.tourism.information">Infocentrum</string>
 	<string name="type.tourism.information.board">Nástěnka</string>
-	<string name="type.tourism.information.guidepost">Infocentrum</string>
+	<string name="type.tourism.information.guidepost">Rozcestník</string>
 	<string name="type.tourism.information.map">Turistická mapa</string>
 	<string name="type.tourism.information.office">Informační centrum</string>
 	<string name="type.tourism.museum">Muzeum</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index bbbcfa4d6a..6cdad30ac3 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1261,9 +1261,25 @@
 	<string name="type.shop.video">Videobutik</string>
 	<string name="type.shop.video_games">Computerspilbutik</string>
 	<string name="type.shop.wine">Vinhandel</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikansk fodbold</string>
+	<string name="type.sport.archery">Bueskydning</string>
 	<string name="type.sport.athletics">Atletik</string>
+	<string name="type.sport.australian_football">Australsk fodbold</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Ridesport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastik</string>
+	<string name="type.sport.handball">Håndbold</string>
+	<string name="type.sport.multi">Forskellige sportsgrene</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Scuba dykning</string>
+	<string name="type.sport.shooting">Skydning</string>
+	<string name="type.sport.skiing">Stå på ski</string>
+	<string name="type.sport.soccer">Fodbold</string>
+	<string name="type.sport.swimming">Svømning</string>
 	<string name="type.sport.tennis">Tennisbane</string>
 	<string name="type.tourism.alpine_hut">Bjerg logi</string>
 	<string name="type.tourism.apartment">Lejligheder</string>
@@ -1281,7 +1297,7 @@
 	<string name="type.tourism.guest_house">Gæstehus</string>
 	<string name="type.tourism.information">Turistinformation</string>
 	<string name="type.tourism.information.board">Informationstavle</string>
-	<string name="type.tourism.information.guidepost">Turistinformation</string>
+	<string name="type.tourism.information.guidepost">Vejviser</string>
 	<string name="type.tourism.information.map">Turistkort</string>
 	<string name="type.tourism.information.office">Turistkontor</string>
 	<string name="type.tourism.picnic_site">Picnic</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 2f4425e348..2a0d493891 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1471,26 +1471,26 @@
 	<string name="type.sport.american_football">American Football</string>
 	<string name="type.sport.archery">Bogenschießen</string>
 	<string name="type.sport.athletics">Leichtathletik</string>
-	<string name="type.sport.australian_football">Rugby</string>
+	<string name="type.sport.australian_football">Australian Football</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
 	<string name="type.sport.bowls">Bowls</string>
 	<string name="type.sport.cricket">Cricket</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Tauchen</string>
-	<string name="type.sport.equestrian">Reiten</string>
+	<string name="type.sport.equestrian">Reitsport</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gymnastik</string>
 	<string name="type.sport.handball">Handball</string>
-	<string name="type.sport.multi">verschiedene Sportarten</string>
-	<string name="type.sport.scuba_diving">Sporttauchen</string>
-	<string name="type.sport.shooting">Sportschießen</string>
-	<string name="type.sport.skiing">Skisport</string>
+	<string name="type.sport.multi">Verschiedene Sportarten</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Gerätetauchen</string>
+	<string name="type.sport.shooting">Schießen</string>
+	<string name="type.sport.skiing">Skifahren</string>
 	<string name="type.sport.soccer">Fußball</string>
 	<string name="type.sport.swimming">Schwimmen</string>
 	<string name="type.sport.tennis">Tennisspielfeld</string>
 	<string name="type.tourism">Tourismus</string>
-	<string name="type.tourism.alpine_hut">Berghütte</string>
+	<string name="type.tourism.alpine_hut">bewirtschaftete Schutzhütte</string>
 	<string name="type.tourism.apartment">Ferienwohnung</string>
 	<string name="type.tourism.artwork">Kunstwerk</string>
 	<string name="type.tourism.artwork.architecture">Kunstwerk</string>
@@ -1518,7 +1518,7 @@
 	<string name="type.tourism.resort">Resort</string>
 	<string name="type.tourism.theme_park">Freizeitpark</string>
 	<string name="type.tourism.viewpoint">Aussichtspunkt</string>
-	<string name="type.tourism.wilderness_hut">Wildnishütte</string>
+	<string name="type.tourism.wilderness_hut">unbewirtschaftete Schutzhütte</string>
 	<string name="type.tourism.zoo">Zoo</string>
 	<string name="type.traffic_calming">Verkehrsberuhigung</string>
 	<string name="type.traffic_calming.bump">kurze Bodenwelle</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index e0a8f8d3a8..7b4a69823d 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1276,9 +1276,25 @@
 	<string name="type.shop.video">Βίντεο Κλαμπ</string>
 	<string name="type.shop.video_games">Κατάστημα βιντεοπαιχνιδιών</string>
 	<string name="type.shop.wine">Οινοπωλείο</string>
+	<string name="type.sport">Αθλητισμός</string>
+	<string name="type.sport.american_football">αμερικάνικο ποδόσφαιρο</string>
+	<string name="type.sport.archery">Τοξοβολία</string>
 	<string name="type.sport.athletics">Στίβος</string>
+	<string name="type.sport.australian_football">Αυστραλιανό ποδόσφαιρο</string>
+	<string name="type.sport.baseball">Μπέιζμπολ</string>
 	<string name="type.sport.basketball">Μπάσκετ</string>
+	<string name="type.sport.curling">Κέρλινγκ</string>
 	<string name="type.sport.equestrian">Ιππασία</string>
+	<string name="type.sport.golf">Γκολφ</string>
+	<string name="type.sport.gymnastics">Γυμναστική</string>
+	<string name="type.sport.handball">Τόπι</string>
+	<string name="type.sport.multi">Διάφορα αθλήματα</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Κατάδυση</string>
+	<string name="type.sport.shooting">Κυνήγι</string>
+	<string name="type.sport.skiing">Χιονοδρόμια</string>
+	<string name="type.sport.soccer">Ποδόσφαιρο</string>
+	<string name="type.sport.swimming">Κολύμβηση</string>
 	<string name="type.sport.tennis">Γήπεδο τένις</string>
 	<string name="type.tourism.alpine_hut">Ορεινό καταφύγιο</string>
 	<string name="type.tourism.apartment">Διαμερίσματα</string>
@@ -1299,7 +1315,7 @@
 	<string name="type.tourism.hotel">Ξενοδοχείο</string>
 	<string name="type.tourism.information">Τουριστικές πληροφορίες</string>
 	<string name="type.tourism.information.board">Πίνακας πληροφοριών</string>
-	<string name="type.tourism.information.guidepost">Τουριστικές πληροφορίες</string>
+	<string name="type.tourism.information.guidepost">Οδηγός</string>
 	<string name="type.tourism.information.map">Τουριστικός χάρτης</string>
 	<string name="type.tourism.information.office">Ενημέρωση τουριστών</string>
 	<string name="type.tourism.motel">Μοτέλ</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index bc48b7a48c..493dfc3ee0 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -323,9 +323,19 @@
 	<string name="type.railway.subway_entrance">Entrada de metro</string>
 	<string name="type.shop.video">Tienda de vídeo</string>
 	<string name="type.shop.video_games">Tienda de videojuegos</string>
+	<string name="type.sport.archery">Tiro al arco</string>
 	<string name="type.sport.athletics">Atletismo</string>
 	<string name="type.sport.basketball">Baloncesto</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Deporte hípico</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.handball">Balonmano</string>
+	<string name="type.sport.multi">Varios deportes</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Submarinismo</string>
+	<string name="type.sport.shooting">Tiroteo</string>
+	<string name="type.sport.skiing">Esquí</string>
+	<string name="type.sport.soccer">Fútbol</string>
 	<string name="type.sport.tennis">Cancha de tenis</string>
 	<string name="type.wheelchair.limited">Parcialmente equipado para discapacitados</string>
 	<string name="type.wheelchair.no">No equipado para discapacitados</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 944ce6b149..30b8d3f6bb 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1360,21 +1360,22 @@
 	<string name="type.shop.wine">Tienda de vinos</string>
 	<string name="type.sport">Deporte</string>
 	<string name="type.sport.american_football">Fútbol americano</string>
-	<string name="type.sport.archery">Tiro con arco</string>
+	<string name="type.sport.archery">Tiro al arco</string>
 	<string name="type.sport.athletics">Atletismo</string>
 	<string name="type.sport.australian_football">Fútbol australiano</string>
 	<string name="type.sport.baseball">Béisbol</string>
 	<string name="type.sport.basketball">Baloncesto</string>
+	<string name="type.sport.bowls">Bolos sobre hierba</string>
 	<string name="type.sport.cricket">Críquet</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Salto</string>
 	<string name="type.sport.equestrian">Equitación</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gimnasia</string>
 	<string name="type.sport.handball">Balonmano</string>
 	<string name="type.sport.multi">Varios deportes</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Submarinismo</string>
-	<string name="type.sport.shooting">Tiro deportivo</string>
+	<string name="type.sport.shooting">Tiroteo</string>
 	<string name="type.sport.skiing">Esquí</string>
 	<string name="type.sport.soccer">Fútbol</string>
 	<string name="type.sport.swimming">Natación</string>
@@ -1398,7 +1399,7 @@
 	<string name="type.tourism.hostel">Albergue juvenil</string>
 	<string name="type.tourism.information">Información</string>
 	<string name="type.tourism.information.board">Tablón de información</string>
-	<string name="type.tourism.information.guidepost">Información</string>
+	<string name="type.tourism.information.guidepost">Poste indicador</string>
 	<string name="type.tourism.information.map">Mapa turístico</string>
 	<string name="type.tourism.information.office">Oficina de turismo</string>
 	<string name="type.tourism.museum">Museo</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index de3066e746..9f80860c53 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -1346,14 +1346,14 @@
 	<string name="type.sport.basketball">Saskibaloia</string>
 	<string name="type.sport.cricket">Kilkerra</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Salto egin</string>
 	<string name="type.sport.equestrian">Zaldi-lasterketa</string>
 	<string name="type.sport.golf">Golfa</string>
 	<string name="type.sport.gymnastics">Gimnasia</string>
 	<string name="type.sport.handball">Eskubaloia</string>
 	<string name="type.sport.multi">Hainbat kirol</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Urpekaritza</string>
-	<string name="type.sport.shooting">Kirolaren jaurtiketa</string>
+	<string name="type.sport.shooting">Tiroketa</string>
 	<string name="type.sport.skiing">Eskia</string>
 	<string name="type.sport.soccer">Futbola</string>
 	<string name="type.sport.swimming">Igeriketa</string>
@@ -1377,7 +1377,7 @@
 	<string name="type.tourism.hostel">Gazteen aterpetxea</string>
 	<string name="type.tourism.information">Informazioa</string>
 	<string name="type.tourism.information.board">Informazio taula</string>
-	<string name="type.tourism.information.guidepost">Informazioa</string>
+	<string name="type.tourism.information.guidepost">Gida postua</string>
 	<string name="type.tourism.information.map">Mapa turistikoa</string>
 	<string name="type.tourism.information.office">Turismo bulegoa</string>
 	<string name="type.tourism.museum">Museoa</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index d48532a8ce..b7ab3f8c2a 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1183,9 +1183,27 @@
 	<string name="type.shop.video">فروشگاه رسانه‌های تصویری</string>
 	<string name="type.shop.video_games">فروشگاه بازی‌های رایانه‌ای</string>
 	<string name="type.shop.wine">فروشگاه</string>
+	<string name="type.sport">ورزش</string>
+	<string name="type.sport.american_football">فوتبال آمریکایی</string>
+	<string name="type.sport.archery">تیراندازی با کمان</string>
 	<string name="type.sport.athletics">ورزش</string>
+	<string name="type.sport.australian_football">فوتبال استرالیایی</string>
+	<string name="type.sport.baseball">بیسبال</string>
 	<string name="type.sport.basketball">بسکتبال</string>
+	<string name="type.sport.bowls">لعبة البولينج</string>
+	<string name="type.sport.cricket">کریکت</string>
+	<string name="type.sport.curling">کرلینگ</string>
 	<string name="type.sport.equestrian">ورزش های سوارکاری</string>
+	<string name="type.sport.golf">گلف</string>
+	<string name="type.sport.gymnastics">ژیمناستیک</string>
+	<string name="type.sport.handball">هندبال</string>
+	<string name="type.sport.multi">ورزش های مختلف</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">غواصی</string>
+	<string name="type.sport.shooting">ورزش تیراندازی</string>
+	<string name="type.sport.skiing">اسکی</string>
+	<string name="type.sport.soccer">فوتبال</string>
+	<string name="type.sport.swimming">شنا</string>
 	<string name="type.sport.tennis">زمین تنیس</string>
 	<string name="type.tourism.apartment">اپارتمان</string>
 	<string name="type.tourism.artwork">گردشگری</string>
@@ -1204,7 +1222,7 @@
 	<string name="type.tourism.hotel">هتل</string>
 	<string name="type.tourism.information">گردشگری</string>
 	<string name="type.tourism.information.board">گردشگری</string>
-	<string name="type.tourism.information.guidepost">گردشگری</string>
+	<string name="type.tourism.information.guidepost">تابلو راهنما</string>
 	<string name="type.tourism.information.map">گردشگری</string>
 	<string name="type.tourism.information.office">گردشگری</string>
 	<string name="type.tourism.motel">هتل</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 3134dfd88b..a5a9b4e580 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1291,14 +1291,19 @@
 	<string name="type.sport.american_football">Amerikkalainen jalkapallo</string>
 	<string name="type.sport.archery">Jousiammunta</string>
 	<string name="type.sport.athletics">Yleisurheilu</string>
+	<string name="type.sport.australian_football">Australialainen jalkapallo</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Koripallo</string>
-	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.bowls">Nurmikeilailu</string>
 	<string name="type.sport.cricket">Kriketti</string>
 	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Hevosurheilu</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Voimistelu</string>
 	<string name="type.sport.handball">Käsipallo</string>
+	<string name="type.sport.multi">Erilaisia urheilulajeja</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Sukellus</string>
 	<string name="type.sport.shooting">Ammunta</string>
 	<string name="type.sport.skiing">Hiihto</string>
 	<string name="type.sport.soccer">Jalkapallo</string>
@@ -1324,7 +1329,7 @@
 	<string name="type.tourism.hotel">Hotelli</string>
 	<string name="type.tourism.information">Turisti-informaatio</string>
 	<string name="type.tourism.information.board">Informaatio</string>
-	<string name="type.tourism.information.guidepost">Turisti-informaatio</string>
+	<string name="type.tourism.information.guidepost">Tienviitta</string>
 	<string name="type.tourism.information.map">Turistikartta</string>
 	<string name="type.tourism.information.office">Turistitoimisto</string>
 	<string name="type.tourism.motel">Motelli</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 77f02594af..4ff0273f0a 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -79,9 +79,21 @@
 	<!-- Detailed description of Maps Storage settings button -->
 	<string name="maps_storage_summary">Sélectionner l\'emplacement où les cartes devraient être téléchargées</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-	<string name="maps_storage_downloaded">Cartes</string>
+	<string name="maps_storage_downloaded">Cartes téléchargées</string>
+	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+	<string name="maps_storage_internal">Stockage interne privé</string>
+	<!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+	<string name="maps_storage_shared">Stockage interne partagé</string>
+	<!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+	<string name="maps_storage_removable">Carte SD</string>
+	<!-- Generic external storage type in Maps Storage settings -->
+	<string name="maps_storage_external">Stockage externe partagé</string>
+	<!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
+	<string name="maps_storage_free_size">%1$s libres sur %2$s</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Déplacer les cartes ?</string>
+	<!-- Error moving map files from one storage to another -->
+	<string name="move_maps_error">Erreur lors du déplacement des cartes</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Ceci peut prendre plusieurs minutes.\nVeuillez patienter…</string>
 	<!-- Measurement units title in settings activity -->
@@ -97,7 +109,7 @@
 	<!-- Search category for public transport; any changes should be duplicated in categories.txt @transport! -->
 	<string name="transport">Transport</string>
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
-	<string name="fuel">Essence</string>
+	<string name="fuel">Stations-service</string>
 	<!-- Search category for parking lots; any changes should be duplicated in categories.txt @parking! -->
 	<string name="parking">Stationnement</string>
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! -->
@@ -132,6 +144,8 @@
 	<string name="recycling">Recyclage</string>
 	<!-- Search category for water; any changes should be duplicated in categories.txt @water! also used to sort bookmarks by type -->
 	<string name="water">Eau</string>
+	<!-- Search category for RV facilities; any changes should be duplicated in categories.txt @rv! -->
+	<string name="rv">Aménagements pour camping-car</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notes</string>
 	<!-- Email Subject when sharing bookmark list -->
@@ -677,12 +691,18 @@
 	<string name="isolines_toast_zooms_1_10">Zoomez pour voir les courbes de niveaux</string>
 	<string name="download_map_title">Télécharger la carte du monde</string>
 	<!-- Used in DownloadResources startup screen -->
+	<string name="disk_error">Impossible de créer un dossier et de déplacer des fichiers sur la mémoire interne de l\'appareil ou sur la carte SD</string>
+	<!-- Used in DownloadResources startup screen -->
 	<string name="connection_failure">Erreur de connexion</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="disconnect_usb_cable_title">Déconnectez le câble USB</string>
 	<string name="enable_screen_sleep">Autoriser l\'écran à dormir</string>
 	<!-- Description in preferences -->
-	<string name="enable_screen_sleep_description">Lorsqu\'il est activé, l\'écran sera autorisé à dormir après une période d\'inactivité.</string>
+	<string name="enable_screen_sleep_description">Lorsqu\'il est activé, l\'écran sera autorisé à s\'éteindre après une période d\'inactivité.</string>
+	<!-- A preference title; keep short! -->
+	<string name="enable_show_on_lock_screen">Afficher sur l\'écran de verrouillage</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">Lorsqu\'il est activé, vous n\'avez pas besoin de déverrouiller votre appareil à chaque fois quand l\'application fonctionne.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Transport par câble aérien</string>
@@ -775,13 +795,18 @@
 	<string name="type.amenity.recycling">Conteneur de recyclage</string>
 	<string name="type.amenity.recycling.container">Conteneur de recyclage</string>
 	<string name="type.recycling.batteries">Batteries</string>
-	<string name="type.recycling.clothes">Vêtement usagés</string>
+	<string name="type.recycling.clothes">Vêtements usagés</string>
 	<string name="type.recycling.glass_bottles">Verre</string>
 	<string name="type.recycling.paper">Papier usagé</string>
 	<string name="type.recycling.plastic">Déchets plastiques</string>
-	<string name="type.recycling.plastic_bottles">Collecte de bouteilles en plastique</string>
+	<string name="type.recycling.plastic_bottles">Bouteilles en plastique</string>
 	<string name="type.recycling.scrap_metal">Ferraille</string>
 	<string name="type.recycling.small_appliances">Déchets d\'équipements électriques</string>
+	<string name="type.recycling.cardboard">Carton</string>
+	<string name="type.recycling.cans">Emballages métalliques</string>
+	<string name="type.recycling.shoes">Chaussures</string>
+	<string name="type.recycling.green_waste">Déchets organiques</string>
+	<string name="type.recycling.cartons">Briques alimentaires</string>
 	<string name="type.amenity.sanitary_dump_station">Station de vidange</string>
 	<string name="type.amenity.school">École</string>
 	<string name="type.amenity.shelter">Abri</string>
@@ -796,11 +821,13 @@
 	<string name="type.amenity.vending_machine.coffee">Distributeur de café</string>
 	<string name="type.amenity.vending_machine.condoms">Distributeur de préservatifs</string>
 	<string name="type.amenity.vending_machine.drinks">Distributeur de boissons</string>
-	<string name="type.amenity.vending_machine.food">Distributeur de aliments</string>
+	<string name="type.amenity.vending_machine.food">Distributeur d\'aliments</string>
 	<string name="type.amenity.vending_machine.newspapers">Distributeur de journaux</string>
 	<string name="type.amenity.vending_machine.parking_tickets">Horodateur</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Distributeur de billets de transport en commun</string>
 	<string name="type.amenity.vending_machine.sweets">Distributeur de bonbons</string>
+	<string name="type.amenity.vending_machine.excrement_bags">Distributeur de sacs à excréments</string>
+	<string name="type.amenity.parcel_locker">Consigne automatique pour colis</string>
 	<string name="type.amenity.veterinary">Docteur vétérinaire</string>
 	<string name="type.amenity.waste_basket">Poubelle</string>
 	<string name="type.amenity.waste_disposal">Déchets</string>
@@ -821,25 +848,50 @@
 	<string name="type.barrier.swing_gate">Barrière tournante</string>
 	<string name="type.barrier.toll_booth">Poste de péage</string>
 	<string name="type.barrier.wall">Mur</string>
+	<string name="type.boundary">Frontière</string>
+	<string name="type.boundary.administrative">Frontière administrative</string>
+	<string name="type.boundary.administrative.10">Frontière administrative</string>
+	<string name="type.boundary.administrative.11">Frontière administrative</string>
+	<string name="type.boundary.administrative.2">Frontière nationale</string>
+	<string name="type.boundary.administrative.3">Frontière administrative</string>
+	<string name="type.boundary.administrative.4">Frontière administrative</string>
+	<string name="type.boundary.administrative.5">Frontière administrative</string>
+	<string name="type.boundary.administrative.6">Frontière administrative</string>
+	<string name="type.boundary.administrative.7">Frontière administrative</string>
+	<string name="type.boundary.administrative.8">Frontière administrative</string>
+	<string name="type.boundary.administrative.9">Frontière administrative</string>
+	<string name="type.boundary.administrative.city">Frontière de la ville</string>
+	<string name="type.boundary.administrative.country">Frontière nationale</string>
+	<string name="type.boundary.administrative.county">Frontière du comté</string>
+	<string name="type.boundary.administrative.municipality">Frontière de la municipalité</string>
+	<string name="type.boundary.administrative.nation">Frontière nationale</string>
+	<string name="type.boundary.administrative.region">Frontière régionale</string>
+	<string name="type.boundary.administrative.suburb">Frontière de quartier</string>
 	<string name="type.boundary.national_park">Parc national</string>
 	<string name="type.building">Bâtiment</string>
 	<string name="type.building.address">Bâtiment</string>
 	<string name="type.building.has_parts">Bâtiment</string>
 	<string name="type.building.train_station">Gare</string>
 	<string name="type.building.warehouse">Entrepôt</string>
-	<string name="type.cemetery.grave">La tombe</string>
+	<string name="type.cemetery.grave">Tombe</string>
 	<string name="type.craft">Artisanat</string>
+	<string name="type.craft.beekeeper">Apiculteur</string>
+	<string name="type.craft.blacksmith">Forgeron</string>
 	<string name="type.craft.brewery">Brasserie artisanale</string>
 	<string name="type.craft.carpenter">Charpentier</string>
+	<string name="type.craft.confectionery">Confiseur</string>
 	<string name="type.craft.electrician">Électricien</string>
+	<string name="type.craft.electronics_repair">Réparation d\'appareils électroniques</string>
 	<string name="type.craft.gardener">Paysagiste</string>
 	<!-- Heating, Ventilation, and Air Conditioning -->
-	<string name="type.craft.hvac">Climatiseur</string>
+	<string name="type.craft.hvac">Chauffage, ventilation et climatisation</string>
 	<string name="type.craft.metal_construction">Métallo</string>
 	<string name="type.craft.painter">Peintre</string>
 	<string name="type.craft.photographer">Photographe</string>
 	<string name="type.craft.plumber">Plombier</string>
+	<string name="type.craft.sawmill">Scierie</string>
 	<string name="type.craft.shoemaker">Cordonnier</string>
+	<string name="type.craft.winery">Chai</string>
 	<string name="type.craft.tailor">Tailleur</string>
 	<string name="type.cuisine.african">Cuisine africaine</string>
 	<string name="type.cuisine.american">Cuisine américaine</string>
@@ -1106,6 +1158,7 @@
 	<!-- SECTION: Types: Historic -->
 	<string name="type.historic.archaeological_site">Site archéologique</string>
 	<string name="type.historic.battlefield">Champ de bataille</string>
+	<string name="type.historic.boundary_stone">Borne frontière</string>
 	<string name="type.historic.castle">Château</string>
 	<string name="type.historic.castle.defensive">Château</string>
 	<string name="type.historic.castle.stately">Château</string>
@@ -1152,6 +1205,7 @@
 	<string name="type.landuse.railway">Installations ferroviaires</string>
 	<string name="type.landuse.reservoir">Bassin de retenue</string>
 	<string name="type.landuse.residential">Zone résidentielle</string>
+	<string name="type.landuse.retail">Zone commerciale</string>
 	<string name="type.landuse.salt_pond">Marais salant</string>
 	<string name="type.landuse.vineyard">Vignes</string>
 	<string name="type.leisure.dog_park">Parc canin</string>
@@ -1182,8 +1236,11 @@
 	<string name="type.leisure.water_park">Centre aquatique</string>
 	<string name="type.man_made.breakwater">Brise-lames</string>
 	<string name="type.man_made.chimney">Cheminée d\'usine</string>
+	<string name="type.man_made.cutline">Layon</string>
 	<string name="type.man_made.survey_point">Borne géodésique</string>
+	<string name="type.man_made.flagpole">Mât de drapeau</string>
 	<string name="type.man_made.lighthouse">Phare</string>
+	<string name="type.man_made.mast">Mât</string>
 	<string name="type.man_made.pier">Jetée</string>
 	<string name="type.man_made.storage_tank">Réservoir</string>
 	<string name="type.man_made.surveillance">Caméra de surveillance</string>
@@ -1197,9 +1254,11 @@
 	<string name="type.natural.bare_rock">Zone rocheuse</string>
 	<string name="type.natural.bay">Baie</string>
 	<string name="type.natural.beach">Plage</string>
+	<string name="type.natural.beach.sand">Plage de sable</string>
 	<string name="type.natural.cape">Cap</string>
 	<string name="type.natural.cave_entrance">Grotte</string>
 	<string name="type.natural.cliff">Falaise</string>
+	<string name="type.man_made.embankment">Talus</string>
 	<string name="type.natural.coastline">Littoral</string>
 	<string name="type.natural.geyser">Geyser</string>
 	<string name="type.natural.glacier">Glacier</string>
@@ -1207,7 +1266,7 @@
 	<string name="type.natural.heath">Lande</string>
 	<string name="type.natural.hot_spring">Source chaude</string>
 	<string name="type.natural.water.lake">Lac</string>
-	<string name="type.natural.water.lock">Chambre de verrouillage</string>
+	<string name="type.natural.water.lock">Écluse</string>
 	<string name="type.natural.water.pond">Étang</string>
 	<string name="type.natural.water.reservoir">Réservoir</string>
 	<string name="type.natural.water.basin">Réservoir</string>
@@ -1258,6 +1317,7 @@
 	<string name="type.place.ocean">Océan</string>
 	<string name="type.place.region">Région</string>
 	<string name="type.place.sea">Mer</string>
+	<string name="type.place.square">Place</string>
 	<string name="type.place.state">État</string>
 	<string name="type.place.state.USA">État</string>
 	<string name="type.place.suburb">Quartier</string>
@@ -1266,6 +1326,12 @@
 	<string name="type.power.substation">Poste électrique</string>
 	<string name="type.power.tower">Poteau électrique</string>
 	<string name="type.railway">Chemin de fer</string>
+	<string name="type.railway.abandoned">Chemin de fer abandonné</string>
+	<string name="type.railway.abandoned.bridge">Chemin de fer abandonné</string>
+	<string name="type.railway.abandoned.tunnel">Chemin de fer abandonné</string>
+	<string name="type.railway.construction">Chemin de fer en construction</string>
+	<string name="type.railway.crossing">Traversée de voie ferrée</string>
+	<string name="type.railway.disused">Chemin de fer désaffecté</string>
 	<string name="type.railway.funicular">Funiculaire</string>
 	<string name="type.railway.funicular.bridge">Funiculaire</string>
 	<string name="type.railway.funicular.tunnel">Funiculaire</string>
@@ -1274,11 +1340,15 @@
 	<string name="type.railway.monorail">Monorail</string>
 	<string name="type.railway.monorail.bridge">Monorail</string>
 	<string name="type.railway.monorail.tunnel">Monorail</string>
+	<string name="type.railway.platform">Quai de gare</string>
+	<string name="type.railway.preserved">Chemin de fer touristique</string>
 	<string name="type.railway.rail">Chemin de fer</string>
+	<string name="type.railway.rail.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.tunnel">Chemin de fer</string>
 	<string name="type.railway.station">Gare</string>
 	<string name="type.railway.station.light_rail">Gare</string>
 	<string name="type.railway.station.monorail">Gare</string>
-	<string name="type.railway.station.subway">Métro</string>
+	<string name="type.railway.station.subway">Station de métro</string>
 	<string name="type.railway.station.subway.barcelona">Métro</string>
 	<string name="type.railway.station.subway.berlin">Métro</string>
 	<string name="type.railway.station.subway.kiev">Métro</string>
@@ -1287,10 +1357,10 @@
 	<string name="type.railway.station.subway.minsk">Métro</string>
 	<string name="type.railway.station.subway.moscow">Métro</string>
 	<string name="type.railway.station.subway.newyork">Métro</string>
-	<string name="type.railway.station.subway.paris">Métro</string>
+	<string name="type.railway.station.subway.paris">Station de métro</string>
 	<string name="type.railway.station.subway.roma">Métro</string>
 	<string name="type.railway.station.subway.spb">Métro</string>
-	<string name="type.railway.subway">Ligne de métroo</string>
+	<string name="type.railway.subway">Ligne de métro</string>
 	<string name="type.railway.subway.bridge">Voie de métro</string>
 	<string name="type.railway.subway.tunnel">Voie de métro</string>
 	<string name="type.railway.subway_entrance">Entrée du métro</string>
@@ -1322,6 +1392,7 @@
 	<string name="type.shop.car_parts">Pièces de voiture</string>
 	<string name="type.shop.car_repair">Réparation d\'automobiles</string>
 	<string name="type.shop.car_repair.tyres">Réparation de pneus</string>
+	<string name="type.shop.caravan">Concessionnaire de caravanes et camping-cars</string>
 	<string name="type.shop.chemist">Droguerie</string>
 	<string name="type.shop.chocolate">Chocolatier</string>
 	<string name="type.shop.clothes">Boutique de vêtements</string>
@@ -1376,13 +1447,24 @@
 	<string name="type.shop.video">Boutique de vidéos</string>
 	<string name="type.shop.video_games">Boutique de jeux vidéo</string>
 	<string name="type.shop.wine">Caviste</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Football américain</string>
 	<string name="type.sport.archery">Tir à l\'arc</string>
 	<string name="type.sport.athletics">Athlétisme</string>
+	<string name="type.sport.australian_football">Football australien</string>
+	<string name="type.sport.baseball">Base-ball</string>
 	<string name="type.sport.basketball">Basket-ball</string>
+	<string name="type.sport.bowls">Boulingrin</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Sport hippique</string>
+	<string name="type.sport.golf">Le golf</string>
 	<string name="type.sport.gymnastics">Gymnastique</string>
+	<string name="type.sport.handball">Handball</string>
+	<string name="type.sport.multi">Sports multiples</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Plongée sous-marine</string>
-	<string name="type.sport.shooting">Sports de tir</string>
+	<string name="type.sport.shooting">Tir sportif</string>
 	<string name="type.sport.skiing">Ski</string>
 	<string name="type.sport.soccer">Football</string>
 	<string name="type.sport.swimming">Natation</string>
@@ -1413,7 +1495,7 @@
 	<string name="type.tourism.wilderness_hut">Refuge non gardé</string>
 	<string name="type.traffic_calming.bump">Ralentisseur</string>
 	<string name="type.traffic_calming.hump">Ralentisseur</string>
-	<string name="type.waterway.dam">Dam</string>
+	<string name="type.waterway.dam">Barrage</string>
 	<string name="type.waterway.ditch">Fossé</string>
 	<string name="type.waterway.ditch.tunnel">Fossé</string>
 	<string name="type.waterway.dock">Cale</string>
@@ -1426,8 +1508,22 @@
 	<string name="type.waterway.stream.intermittent">Ruisseau</string>
 	<string name="type.waterway.stream.tunnel">Ruisseau</string>
 	<string name="type.waterway.waterfall">Cascade</string>
+	<string name="type.waterway.weir">Seuil</string>
 	<string name="type.wheelchair.limited">Partiellement équipé pour l\'usage des fauteuils roulants</string>
 	<string name="type.wheelchair.no">Non équipé pour l\'usage des fauteuils roulants</string>
 	<string name="type.wheelchair.yes">Équipé pour l\'usage des fauteuils roulants</string>
+	<!-- en.wikipedia.org/wiki/Surface_lift -->
+	<string name="type.piste_lift">Téléski</string>
+	<string name="type.piste_lift.j.bar">Téléski</string>
+	<string name="type.piste_lift.magic_carpet">Tapis roulant</string>
+	<string name="type.piste_type.downhill">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.advanced">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.easy">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.expert">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.freeride">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.intermediate">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.novice">Piste de ski alpin</string>
+	<string name="type.piste_type.nordic">Piste de ski de fond</string>
+	<string name="type.piste_type.sled">Piste de luge</string>
 	<string name="type.building_part">Bâtiment</string>
 </resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index a284b5445e..212cd58ee1 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1274,9 +1274,26 @@
 	<string name="type.shop.video">Videotéka</string>
 	<string name="type.shop.video_games">Videojáték bolt</string>
 	<string name="type.shop.wine">Szeszesital-üzlet</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikai foci</string>
+	<string name="type.sport.archery">Íjászat</string>
 	<string name="type.sport.athletics">Atlétika</string>
+	<string name="type.sport.australian_football">Ausztrál futball</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Kosárlabda</string>
+	<string name="type.sport.cricket">Krikett</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Lovas sportok</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gimnasztika</string>
+	<string name="type.sport.handball">Kézilabda</string>
+	<string name="type.sport.multi">Különféle sportágak</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Búvárkodás</string>
+	<string name="type.sport.shooting">Lövés</string>
+	<string name="type.sport.skiing">Síelés</string>
+	<string name="type.sport.soccer">Futball</string>
+	<string name="type.sport.swimming">Úszás</string>
 	<string name="type.sport.tennis">Teniszpálya</string>
 	<string name="type.tourism.alpine_hut">Hegyi menedék</string>
 	<string name="type.tourism.apartment">Apartmanok</string>
@@ -1296,7 +1313,7 @@
 	<string name="type.tourism.hotel">Szálloda</string>
 	<string name="type.tourism.information">Túrista információ</string>
 	<string name="type.tourism.information.board">Információs tábla</string>
-	<string name="type.tourism.information.guidepost">Túrista információ</string>
+	<string name="type.tourism.information.guidepost">Útmutató</string>
 	<string name="type.tourism.information.map">Turistatérkép</string>
 	<string name="type.tourism.information.office">Idegenforgalmi iroda</string>
 	<string name="type.tourism.museum">Múzeum</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index e84f7c5aa4..849cae700e 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -1263,9 +1263,27 @@
 	<string name="type.shop.video">Toko video</string>
 	<string name="type.shop.video_games">Toko permainan video</string>
 	<string name="type.shop.wine">Toko anggur</string>
+	<string name="type.sport">Olahraga</string>
+	<string name="type.sport.american_football">Sepak Bola Amerika</string>
+	<string name="type.sport.archery">Panahan</string>
 	<string name="type.sport.athletics">Atletik</string>
+	<string name="type.sport.australian_football">Sepak bola Australia</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Bola basket</string>
+	<string name="type.sport.bowls">Boling lapangan</string>
+	<string name="type.sport.cricket">Kriket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Olahraga Berkuda</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Olahraga senam</string>
+	<string name="type.sport.handball">Bola tangan</string>
+	<string name="type.sport.multi">Berbagai Olahraga</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Selam scuba</string>
+	<string name="type.sport.shooting">Penembakan</string>
+	<string name="type.sport.skiing">Bermain ski</string>
+	<string name="type.sport.soccer">Sepak bola</string>
+	<string name="type.sport.swimming">Berenang</string>
 	<string name="type.sport.tennis">Lapangan tenis</string>
 	<string name="type.tourism.alpine_hut">Penginapan di pegunungan</string>
 	<string name="type.tourism.apartment">Apartemen</string>
@@ -1283,7 +1301,7 @@
 	<string name="type.tourism.guest_house">Wisma tamu</string>
 	<string name="type.tourism.information">Informasi turis</string>
 	<string name="type.tourism.information.board">Papan informasi</string>
-	<string name="type.tourism.information.guidepost">Informasi turis</string>
+	<string name="type.tourism.information.guidepost">Tongkat petunjuk jalan</string>
 	<string name="type.tourism.information.map">Peta wisata</string>
 	<string name="type.tourism.information.office">Kantor wisata</string>
 	<string name="type.tourism.picnic_site">Lokasi piknik</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index bc7c498658..985effcb2e 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -814,10 +814,15 @@
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Stazione ferroviaria</string>
 	<string name="type.cemetery.grave">La tomba</string>
+	<string name="type.craft">Artigianato</string>
+	<string name="type.craft.beekeeper">Apicoltore</string>
+	<string name="type.craft.blacksmith">Fabbro</string>
 	<string name="type.craft.brewery">Birrificio</string>
 	<string name="type.craft.carpenter">Falegname</string>
 	<string name="type.craft.electrician">Elettricista</string>
+	<string name="type.craft.electronics_repair">Riparazioni elettroniche</string>
 	<string name="type.craft.gardener">Giardiniere</string>
+	<string name="type.craft.handicraft">Artigiano</string>
 	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Impianti HVAC</string>
 	<string name="type.craft.metal_construction">Fabbro</string>
@@ -1302,9 +1307,27 @@
 	<string name="type.shop.video">Videoteca</string>
 	<string name="type.shop.video_games">Negozio di videogiochi</string>
 	<string name="type.shop.wine">Negozio di alcolici</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Football americano</string>
+	<string name="type.sport.archery">Tiro con l\'arco</string>
 	<string name="type.sport.athletics">Atletica leggera</string>
+	<string name="type.sport.australian_football">Football australiano</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Pallacanestro</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Equitazione</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Ginnastica</string>
+	<string name="type.sport.handball">Palla a mano</string>
+	<string name="type.sport.multi">Sport vari</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Immersioni in subacquea</string>
+	<string name="type.sport.shooting">Tiro</string>
+	<string name="type.sport.skiing">Sciare</string>
+	<string name="type.sport.soccer">Calcio</string>
+	<string name="type.sport.swimming">Nuoto</string>
 	<string name="type.sport.tennis">Campo da tennis</string>
 	<string name="type.tourism.alpine_hut">Hotel di montagna</string>
 	<string name="type.tourism.apartment">Residence</string>
@@ -1324,7 +1347,7 @@
 	<string name="type.tourism.hotel">Hôtel</string>
 	<string name="type.tourism.information">Informazione</string>
 	<string name="type.tourism.information.board">Tabellone informativo</string>
-	<string name="type.tourism.information.guidepost">Informazione</string>
+	<string name="type.tourism.information.guidepost">Guida</string>
 	<string name="type.tourism.information.map">Mappa turistica</string>
 	<string name="type.tourism.information.office">Ufficio turistico</string>
 	<string name="type.tourism.museum">Museo</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index da1501f160..1d04320611 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -411,4 +411,23 @@
 	<string name="type.natural.water.reservoir">מאגר</string>
 	<string name="type.natural.water.basin">אגן מים</string>
 	<string name="type.natural.water">גוף מים</string>
+	<string name="type.sport">ספורט</string>
+	<string name="type.sport.american_football">כדורגל אמריקאי</string>
+	<string name="type.sport.archery">קַשׁתוּת</string>
+	<string name="type.sport.australian_football">פוטבול אוסטרלי</string>
+	<string name="type.sport.baseball">בייסבול</string>
+	<string name="type.sport.bowls">כדורת דשא</string>
+	<string name="type.sport.cricket">קריקט</string>
+	<string name="type.sport.curling">קרלינג</string>
+	<string name="type.sport.equestrian">רכיבה</string>
+	<string name="type.sport.golf">גולף</string>
+	<string name="type.sport.gymnastics">התעמלות</string>
+	<string name="type.sport.handball">כדוריד</string>
+	<string name="type.sport.multi">ענפי ספורט שונים</string>
+	<string name="type.sport.shooting">ירי ספורטיבי</string>
+	<string name="type.sport.skiing">סקי</string>
+	<string name="type.sport.soccer">כדורגל</string>
+	<string name="type.sport.swimming">שחייה</string>
+	<string name="type.sport.tennis">טֶנִיס</string>
+	<string name="type.tourism.information.guidepost">מנחה</string>
 </resources>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 22bfc06a6c..761cc7646b 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1439,13 +1439,13 @@
 	<string name="type.sport.bowls">ローンボウルズ</string>
 	<string name="type.sport.cricket">クリケット</string>
 	<string name="type.sport.curling">カーリング</string>
-	<string name="type.sport.diving">ダイビング</string>
 	<string name="type.sport.equestrian">馬術</string>
 	<string name="type.sport.golf">ゴルフ</string>
-	<string name="type.sport.gymnastics">体操競技</string>
+	<string name="type.sport.gymnastics">体操</string>
 	<string name="type.sport.handball">ハンドボール</string>
 	<string name="type.sport.multi">複数</string>
-	<string name="type.sport.scuba_diving">スクーバダイビング</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">スキューバダイビング</string>
 	<string name="type.sport.shooting">射撃競技</string>
 	<string name="type.sport.skiing">スキー</string>
 	<string name="type.sport.soccer">サッカー</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 1b25ef35ff..2db292f278 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1274,9 +1274,27 @@
 	<string name="type.shop.video">비디오 가게</string>
 	<string name="type.shop.video_games">비디오 게임 가게</string>
 	<string name="type.shop.wine">와인 샵</string>
+	<string name="type.sport">스포츠</string>
+	<string name="type.sport.american_football">미식 축구</string>
+	<string name="type.sport.archery">양궁</string>
 	<string name="type.sport.athletics">육상 경기장</string>
+	<string name="type.sport.australian_football">오스트레일리안 풋볼</string>
+	<string name="type.sport.baseball">야구</string>
 	<string name="type.sport.basketball">야구</string>
+	<string name="type.sport.bowls">론볼</string>
+	<string name="type.sport.cricket">크리켓</string>
+	<string name="type.sport.curling">컬링</string>
 	<string name="type.sport.equestrian">승마 경기장</string>
+	<string name="type.sport.golf">골프</string>
+	<string name="type.sport.gymnastics">체조</string>
+	<string name="type.sport.handball">핸드볼</string>
+	<string name="type.sport.multi">다양한 스포츠</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">스쿠버 다이빙</string>
+	<string name="type.sport.shooting">사격 경기</string>
+	<string name="type.sport.skiing">스키 타기</string>
+	<string name="type.sport.soccer">축구</string>
+	<string name="type.sport.swimming">수영</string>
 	<string name="type.sport.tennis">테니스 코트</string>
 	<string name="type.tourism.alpine_hut">고산 오두막</string>
 	<string name="type.tourism.apartment">아파트</string>
@@ -1297,7 +1315,7 @@
 	<string name="type.tourism.hotel">호텔</string>
 	<string name="type.tourism.information">관광 정보</string>
 	<string name="type.tourism.information.board">정보 게시판</string>
-	<string name="type.tourism.information.guidepost">관광 정보</string>
+	<string name="type.tourism.information.guidepost">도표</string>
 	<string name="type.tourism.information.map">관광안내도</string>
 	<string name="type.tourism.information.office">관광정보센터</string>
 	<string name="type.tourism.motel">모텔</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 06233d0e36..3446ba3503 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1266,9 +1266,27 @@
 	<string name="type.shop.video">Videobutikken</string>
 	<string name="type.shop.video_games">Videospillbutikken</string>
 	<string name="type.shop.wine">Alkoholutsalg</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikansk fotball</string>
+	<string name="type.sport.archery">Bueskyting</string>
 	<string name="type.sport.athletics">Friidrett</string>
+	<string name="type.sport.australian_football">Australsk fotball</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Hestesport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastikk</string>
+	<string name="type.sport.handball">Håndball</string>
+	<string name="type.sport.multi">Ulike idretter</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Dykking</string>
+	<string name="type.sport.shooting">Skyting</string>
+	<string name="type.sport.skiing">Stå på ski</string>
+	<string name="type.sport.soccer">Fotball</string>
+	<string name="type.sport.swimming">Svømming</string>
 	<string name="type.sport.tennis">Tennisbane</string>
 	<string name="type.tourism.alpine_hut">Fjellstue</string>
 	<string name="type.tourism.apartment">Leiligheter</string>
@@ -1288,7 +1306,7 @@
 	<string name="type.tourism.hotel">Hotell</string>
 	<string name="type.tourism.information">Turistinformasjon</string>
 	<string name="type.tourism.information.board">Informasjonstavle</string>
-	<string name="type.tourism.information.guidepost">Turistinformasjon</string>
+	<string name="type.tourism.information.guidepost">Guidepost</string>
 	<string name="type.tourism.information.map">Turistkart</string>
 	<string name="type.tourism.information.office">Turistkontor</string>
 	<string name="type.tourism.motel">Motell</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 254f0b953f..75270a6c81 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1283,9 +1283,27 @@
 	<string name="type.shop.video">Videowinkel</string>
 	<string name="type.shop.video_games">Winkel voor videogames</string>
 	<string name="type.shop.wine">Wijn</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikaans voetbal</string>
+	<string name="type.sport.archery">Boogschieten</string>
 	<string name="type.sport.athletics">Atletiek</string>
+	<string name="type.sport.australian_football">Australian football</string>
+	<string name="type.sport.baseball">Basketbal</string>
 	<string name="type.sport.basketball">Basketbal</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Paardesport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastiek</string>
+	<string name="type.sport.handball">Handbal</string>
+	<string name="type.sport.multi">Diverse sporten</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Duiken</string>
+	<string name="type.sport.shooting">schieten</string>
+	<string name="type.sport.skiing">Skiën</string>
+	<string name="type.sport.soccer">Voetbal</string>
+	<string name="type.sport.swimming">Zwemmen</string>
 	<string name="type.sport.tennis">Tennisveld</string>
 	<string name="type.tourism.alpine_hut">Berghut</string>
 	<string name="type.tourism.apartment">Appartementen</string>
@@ -1302,7 +1320,7 @@
 	<string name="type.tourism.guest_house">Gasthuis</string>
 	<string name="type.tourism.information">Toeristische informatie</string>
 	<string name="type.tourism.information.board">Informatiebord</string>
-	<string name="type.tourism.information.guidepost">Toeristische informatie</string>
+	<string name="type.tourism.information.guidepost">Wegwijzer</string>
 	<string name="type.tourism.information.map">Toeristische kaart</string>
 	<string name="type.tourism.information.office">Toeristische informatie</string>
 	<string name="type.tourism.picnic_site">Picnicplaats</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 71938dd541..58c6dd63bc 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1406,19 +1406,26 @@
 	<string name="type.shop.video">Wypożyczalnia wideo</string>
 	<string name="type.shop.video_games">Sklep z grami wideo</string>
 	<string name="type.shop.wine">Sklep monopolowy</string>
+	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Futbol amerykański</string>
-	<string name="type.sport.archery">Łucznictwo sportowe</string>
+	<string name="type.sport.archery">Łucznictwo</string>
 	<string name="type.sport.athletics">Lekka atletyka</string>
+	<string name="type.sport.australian_football">Futbol australijski</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Koszykówka</string>
 	<string name="type.sport.bowls">Kręgle</string>
 	<string name="type.sport.cricket">Krykiet</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Jeździectwo</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gimnastyka</string>
-	<string name="type.sport.handball">Piłka ręczna</string>
+	<string name="type.sport.handball">Gra w piłkę ręczną</string>
+	<string name="type.sport.multi">Różne sporty</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Nurkowanie</string>
 	<string name="type.sport.shooting">Strzelectwo sportowe</string>
+	<string name="type.sport.skiing">Jazda na nartach</string>
+	<string name="type.sport.soccer">Piłka nożna</string>
 	<string name="type.sport.swimming">Pływanie</string>
 	<string name="type.sport.tennis">Kort tenisowy</string>
 	<string name="type.tourism">Turystyka</string>
@@ -1439,7 +1446,7 @@
 	<string name="type.tourism.guest_house">Pensjonat</string>
 	<string name="type.tourism.information">Informacja turystyczna</string>
 	<string name="type.tourism.information.board">Tablica informacyjna</string>
-	<string name="type.tourism.information.guidepost">Informacja turystyczna</string>
+	<string name="type.tourism.information.guidepost">Drogowskaz</string>
 	<string name="type.tourism.information.map">Mapa turystyczna</string>
 	<string name="type.tourism.information.office">Biuro informacji turystycznej</string>
 	<string name="type.tourism.museum">Muzeum</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 9c89c1aeba..f12457518c 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -1495,19 +1495,11 @@
 	<string name="type.sport.australian_football">Futebol australiano</string>
 	<string name="type.sport.baseball">Beisebol</string>
 	<string name="type.sport.basketball">Basquetebol</string>
-	<string name="type.sport.bowls">Bowls</string>
-	<string name="type.sport.cricket">Críquete</string>
-	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Mergulho</string>
 	<string name="type.sport.equestrian">Esportes equestres</string>
-	<string name="type.sport.golf">Golfe</string>
-	<string name="type.sport.gymnastics">Ginástica</string>
-	<string name="type.sport.handball">Andebol</string>
+	<string name="type.sport.handball">Handebol</string>
 	<string name="type.sport.multi">Vários desportos</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Mergulho autônomo</string>
-	<string name="type.sport.shooting">Tiro esportivo</string>
-	<string name="type.sport.skiing">Esqui</string>
-	<string name="type.sport.soccer">Futebol</string>
 	<string name="type.sport.swimming">Natação esportiva</string>
 	<string name="type.sport.tennis">Quadra de tênis</string>
 	<string name="type.tourism">Turismo</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 868eed092b..10674ba1da 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1467,22 +1467,22 @@
 	<string name="type.shop.video_games">Loja de jogos de vídeo</string>
 	<string name="type.shop.wine">Loja de vinhos</string>
 	<string name="type.sport">Desporto</string>
-	<string name="type.sport.american_football">Futebol americano</string>
+	<string name="type.sport.american_football">Futebol Americano</string>
 	<string name="type.sport.archery">Tiro com arco</string>
 	<string name="type.sport.athletics">Atletismo</string>
-	<string name="type.sport.australian_football">Futebol australiano</string>
-	<string name="type.sport.baseball">Beisebol</string>
+	<string name="type.sport.australian_football">Futebol Australiano</string>
+	<string name="type.sport.baseball">Basebol</string>
 	<string name="type.sport.basketball">Basquetebol</string>
-	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.bowls">Lawn bowls</string>
 	<string name="type.sport.cricket">Críquete</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Mergulho</string>
 	<string name="type.sport.equestrian">Hipismo</string>
 	<string name="type.sport.golf">Golfe</string>
 	<string name="type.sport.gymnastics">Ginástica</string>
 	<string name="type.sport.handball">Andebol</string>
 	<string name="type.sport.multi">Vários desportos</string>
-	<string name="type.sport.scuba_diving">Mergulho autónomo</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Mergulho autônomo</string>
 	<string name="type.sport.shooting">Tiro desportivo</string>
 	<string name="type.sport.skiing">Esqui</string>
 	<string name="type.sport.soccer">Futebol</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 03cf3b2879..260ee9cc33 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1288,9 +1288,25 @@
 	<string name="type.shop.video">Magazin video</string>
 	<string name="type.shop.video_games">Magazin de jocuri video</string>
 	<string name="type.shop.wine">Vinărie</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Fotbal american</string>
+	<string name="type.sport.archery">TIR cu arcul</string>
 	<string name="type.sport.athletics">Atletica ușoară</string>
+	<string name="type.sport.australian_football">Fotbal australian</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Baschetbal</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Sport ecvestru</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gimnastică</string>
+	<string name="type.sport.handball">Handbal</string>
+	<string name="type.sport.multi">Sporturi Diverse</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Scufundări</string>
+	<string name="type.sport.shooting">Filmare</string>
+	<string name="type.sport.skiing">Schi</string>
+	<string name="type.sport.soccer">Fotbal</string>
+	<string name="type.sport.swimming">Natație</string>
 	<string name="type.sport.tennis">Teren de tenis</string>
 	<string name="type.tourism.alpine_hut">Cabană de munte</string>
 	<string name="type.tourism.apartment">Apartamente</string>
@@ -1308,7 +1324,7 @@
 	<string name="type.tourism.guest_house">Pensiune</string>
 	<string name="type.tourism.information">Informații turistice</string>
 	<string name="type.tourism.information.board">Panou de informații</string>
-	<string name="type.tourism.information.guidepost">Informații turistice</string>
+	<string name="type.tourism.information.guidepost">Postul de ghidare</string>
 	<string name="type.tourism.information.map">Hartă turistică</string>
 	<string name="type.tourism.information.office">Birou de informații turistice</string>
 	<string name="type.tourism.museum">Muzeu</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 73d5cfd26d..432ef3a9de 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1557,19 +1557,19 @@
 	<string name="type.sport.american_football">Американский футбол</string>
 	<string name="type.sport.archery">Стрельба из лука</string>
 	<string name="type.sport.athletics">Лёгкая атлетика</string>
-	<string name="type.sport.australian_football">Регби</string>
+	<string name="type.sport.australian_football">Австралийский футбол</string>
 	<string name="type.sport.baseball">Бейсбол</string>
 	<string name="type.sport.basketball">Баскетбол</string>
-	<string name="type.sport.bowls">Кегли</string>
+	<string name="type.sport.bowls">Боулз</string>
 	<string name="type.sport.cricket">Крикет</string>
-	<string name="type.sport.curling">Керлинг</string>
-	<string name="type.sport.diving">Подводное плавание</string>
+	<string name="type.sport.curling">Кёрлинг</string>
 	<string name="type.sport.equestrian">Конный спорт</string>
 	<string name="type.sport.golf">Гольф</string>
 	<string name="type.sport.gymnastics">Гимнастика</string>
 	<string name="type.sport.handball">Гандбол</string>
 	<string name="type.sport.multi">Различные виды спорта</string>
-	<string name="type.sport.scuba_diving">Акваланг</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Место для дайвинга</string>
 	<string name="type.sport.shooting">Стрельба</string>
 	<string name="type.sport.skiing">Лыжи</string>
 	<string name="type.sport.soccer">Футбол</string>
@@ -1595,7 +1595,7 @@
 	<string name="type.tourism.hotel">Гостиница</string>
 	<string name="type.tourism.information">Туринформация</string>
 	<string name="type.tourism.information.board">Информационный щит</string>
-	<string name="type.tourism.information.guidepost">Туринформация</string>
+	<string name="type.tourism.information.guidepost">Указательный столб</string>
 	<string name="type.tourism.information.map">Карта</string>
 	<string name="type.tourism.information.office">Туристический офис</string>
 	<string name="type.tourism.motel">Мотель</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index b02adb6859..7bcb054034 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1269,9 +1269,24 @@
 	<string name="type.shop.video">Predajňa s videami</string>
 	<string name="type.shop.video_games">Predajňa s videohrami</string>
 	<string name="type.shop.wine">Vinotéka</string>
+	<string name="type.sport">Šport</string>
+	<string name="type.sport.american_football">Americký futbal</string>
+	<string name="type.sport.archery">Lukostreľba</string>
 	<string name="type.sport.athletics">Atletika</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketbal</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Jazdecké športy</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastika</string>
+	<string name="type.sport.handball">Hádzaná</string>
+	<string name="type.sport.multi">Rôzne športy</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Potápanie</string>
+	<string name="type.sport.shooting">Streľba</string>
+	<string name="type.sport.skiing">Lyžovanie</string>
+	<string name="type.sport.soccer">Futbal</string>
+	<string name="type.sport.swimming">Plávanie</string>
 	<string name="type.sport.tennis">Tenisový kurt</string>
 	<string name="type.tourism.alpine_hut">Horská chata</string>
 	<string name="type.tourism.apartment">Apartmány</string>
@@ -1289,7 +1304,7 @@
 	<string name="type.tourism.guest_house">Penzión</string>
 	<string name="type.tourism.information">Infocentrum</string>
 	<string name="type.tourism.information.board">Informačné centrum</string>
-	<string name="type.tourism.information.guidepost">Infocentrum</string>
+	<string name="type.tourism.information.guidepost">Smerovník</string>
 	<string name="type.tourism.information.map">Turistická mapa</string>
 	<string name="type.tourism.information.office">Turistické informačné centrum</string>
 	<string name="type.tourism.museum">Múzeum</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 4a1c7e2314..dacd715ccc 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1261,9 +1261,25 @@
 	<string name="type.shop.video">Video butik</string>
 	<string name="type.shop.video_games">Videospel butik</string>
 	<string name="type.shop.wine">Vinhandel</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikansk fotboll</string>
+	<string name="type.sport.archery">Bågskytte</string>
 	<string name="type.sport.athletics">Friidrott</string>
+	<string name="type.sport.baseball">Baseboll</string>
 	<string name="type.sport.basketball">Basket</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Ridsport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastik</string>
+	<string name="type.sport.handball">Handboll</string>
+	<string name="type.sport.multi">Olika sporter</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Dykning</string>
+	<string name="type.sport.shooting">Skytte</string>
+	<string name="type.sport.skiing">Skidåkning</string>
+	<string name="type.sport.soccer">Fotboll</string>
+	<string name="type.sport.swimming">Simning</string>
 	<string name="type.sport.tennis">Tennisbana</string>
 	<string name="type.tourism.alpine_hut">Bergsboende</string>
 	<string name="type.tourism.apartment">Lägenheter</string>
@@ -1283,7 +1299,7 @@
 	<string name="type.tourism.hotel">Hotell</string>
 	<string name="type.tourism.information">Turistinformation</string>
 	<string name="type.tourism.information.board">Informationstavla</string>
-	<string name="type.tourism.information.guidepost">Turistinformation</string>
+	<string name="type.tourism.information.guidepost">Vägledning</string>
 	<string name="type.tourism.information.map">Turistkarta</string>
 	<string name="type.tourism.information.office">Turistcenter</string>
 	<string name="type.tourism.motel">Motell</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index df0e4f26ce..9caa7c38fc 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -360,10 +360,26 @@
 	<string name="type.railway.subway_entrance">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.shop.video">Duka la Video</string>
 	<string name="type.shop.video_games">Duka la Video za Michezo</string>
+	<string name="type.sport">Michezo</string>
+	<string name="type.sport.american_football">Soka ya Marekani</string>
+	<string name="type.sport.archery">Upigaji mishale</string>
 	<string name="type.sport.athletics">Riadha</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Mpira wa kikapu</string>
+	<string name="type.sport.curling">Kukunja</string>
 	<string name="type.sport.equestrian">Michezo ya Farasi</string>
+	<string name="type.sport.golf">Gofu</string>
+	<string name="type.sport.gymnastics">Gymnastics</string>
+	<string name="type.sport.handball">Mpira wa mikono</string>
+	<string name="type.sport.multi">Michezo Mbalimbali</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Upigaji mbizi wa Scuba</string>
+	<string name="type.sport.shooting">Kupiga risasi</string>
+	<string name="type.sport.skiing">Skii</string>
+	<string name="type.sport.soccer">Soka</string>
+	<string name="type.sport.swimming">Kuogelea</string>
 	<string name="type.sport.tennis">Wanja wa tenisi</string>
+	<string name="type.tourism.information.guidepost">Chapisho la mwongozo</string>
 	<string name="type.wheelchair.limited">Viti vya magurudumu vinaruhusiwa vichache</string>
 	<string name="type.wheelchair.no">Viti vya magurudumu haviruhusiwi</string>
 	<string name="type.wheelchair.yes">Viti vya magurudumu vinaruhusiwa kabisa</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 4027095f61..c0ab7a4d72 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1278,9 +1278,24 @@
 	<string name="type.shop.video">ร้านขายดีวีดี</string>
 	<string name="type.shop.video_games">ร้านขายวิดีโอเกม</string>
 	<string name="type.shop.wine">ร้านขายไวน์</string>
+	<string name="type.sport">กีฬา</string>
+	<string name="type.sport.american_football">อเมริกันฟุตบอล</string>
+	<string name="type.sport.archery">ยิงธนู</string>
 	<string name="type.sport.athletics">กรีฑา</string>
+	<string name="type.sport.baseball">เบสบอล</string>
 	<string name="type.sport.basketball">บาสเก็ตบอล</string>
+	<string name="type.sport.curling">เคอร์ลิง</string>
 	<string name="type.sport.equestrian">กีฬาแข่งม้า</string>
+	<string name="type.sport.golf">กอล์ฟ</string>
+	<string name="type.sport.gymnastics">ยิมนาสติก</string>
+	<string name="type.sport.handball">แฮนด์บอล</string>
+	<string name="type.sport.multi">กีฬาต่างๆ</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">ดำน้ำลึก</string>
+	<string name="type.sport.shooting">ยิงปืน</string>
+	<string name="type.sport.skiing">เล่นสกี</string>
+	<string name="type.sport.soccer">ฟุตบอล</string>
+	<string name="type.sport.swimming">การว่ายน้ำ</string>
 	<string name="type.sport.tennis">คอร์ทเทนนิส</string>
 	<string name="type.tourism.alpine_hut">ที่พักบนภูเขาโรงแรม</string>
 	<string name="type.tourism.apartment">อพาร์ตเมนต์</string>
@@ -1301,7 +1316,7 @@
 	<string name="type.tourism.hotel">โรงแรม</string>
 	<string name="type.tourism.information">ข้อมูลการท่องเที่ยว</string>
 	<string name="type.tourism.information.board">บอร์ดประชาสัมพันธ์</string>
-	<string name="type.tourism.information.guidepost">ข้อมูลการท่องเที่ยว</string>
+	<string name="type.tourism.information.guidepost">ไกด์โพส</string>
 	<string name="type.tourism.information.map">แผนที่ท่องเที่ยว</string>
 	<string name="type.tourism.information.office">ศูนย์บริการนักท่องเที่ยว</string>
 	<string name="type.tourism.motel">โมเทล</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 987e3b2b64..ccbd129a11 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1510,21 +1510,21 @@
 	<string name="type.sport.american_football">Amerikan Futbolu</string>
 	<string name="type.sport.archery">Okçuluk</string>
 	<string name="type.sport.athletics">Atletizm</string>
-	<string name="type.sport.australian_football">Ragbi</string>
+	<string name="type.sport.australian_football">Avustralya futbolu</string>
 	<string name="type.sport.baseball">Beyzbol</string>
 	<string name="type.sport.basketball">Basketbol</string>
 	<string name="type.sport.bowls">Kuka Oynu</string>
 	<string name="type.sport.cricket">Kriket</string>
-	<string name="type.sport.curling">Сurling</string>
-	<string name="type.sport.diving">Dalış</string>
+	<string name="type.sport.curling">Körling</string>
 	<string name="type.sport.equestrian">Binicilik Sporları</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Jimnastik</string>
 	<string name="type.sport.handball">Hentbol</string>
 	<string name="type.sport.multi">Çeşitli Sporlar</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Tüplü Dalış</string>
-	<string name="type.sport.shooting">Atış Sporları</string>
-	<string name="type.sport.skiing">Kayak</string>
+	<string name="type.sport.shooting">Çekim</string>
+	<string name="type.sport.skiing">Kayak yapmak</string>
 	<string name="type.sport.soccer">Futbol</string>
 	<string name="type.sport.swimming">Yüzme</string>
 	<string name="type.sport.tennis">Tenis Kortu</string>
@@ -1548,7 +1548,7 @@
 	<string name="type.tourism.hotel">Otel</string>
 	<string name="type.tourism.information">Turist Bilgilendirme</string>
 	<string name="type.tourism.information.board">Bilgi Panosu</string>
-	<string name="type.tourism.information.guidepost">Turist Bilgilendirme</string>
+	<string name="type.tourism.information.guidepost">Kılavuz direği</string>
 	<string name="type.tourism.information.map">Turist Haritası</string>
 	<string name="type.tourism.information.office">Turizm Ofisi</string>
 	<string name="type.tourism.motel">Motel</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index f9fc1fc39a..2470625f09 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1511,22 +1511,22 @@
 	<string name="type.shop.wine">Винна крамниця</string>
 	<string name="type.sport">Спорт</string>
 	<string name="type.sport.american_football">Американський футбол</string>
-	<string name="type.sport.archery">Стрiльба з лука</string>
+	<string name="type.sport.archery">Стрільба з лука</string>
 	<string name="type.sport.athletics">Легка атлетика</string>
-	<string name="type.sport.australian_football">Регбi</string>
+	<string name="type.sport.australian_football">Австралійський футбол</string>
 	<string name="type.sport.baseball">Бейсбол</string>
 	<string name="type.sport.basketball">Баскетбол</string>
-	<string name="type.sport.bowls">Кеглi</string>
+	<string name="type.sport.bowls">Боулз</string>
 	<string name="type.sport.cricket">Крикет</string>
-	<string name="type.sport.curling">Керлiнг</string>
-	<string name="type.sport.diving">Пiдводне плавання</string>
+	<string name="type.sport.curling">Керлінг</string>
 	<string name="type.sport.equestrian">Кінний спорт</string>
 	<string name="type.sport.golf">Гольф</string>
-	<string name="type.sport.gymnastics">Гiмнастика</string>
+	<string name="type.sport.gymnastics">Гімнастика</string>
 	<string name="type.sport.handball">Гандбол</string>
 	<string name="type.sport.multi">Рiзноманiтнi типи спорту</string>
-	<string name="type.sport.scuba_diving">Акваланг</string>
-	<string name="type.sport.shooting">Стрiльба</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Місце для дайвінгу</string>
+	<string name="type.sport.shooting">Стрільба</string>
 	<string name="type.sport.skiing">Лижi</string>
 	<string name="type.sport.soccer">Футбол</string>
 	<string name="type.sport.swimming">Плавання</string>
@@ -1551,7 +1551,7 @@
 	<string name="type.tourism.hotel">Готель</string>
 	<string name="type.tourism.information">Турінформація</string>
 	<string name="type.tourism.information.board">Інформаційний щит</string>
-	<string name="type.tourism.information.guidepost">Турінформація</string>
+	<string name="type.tourism.information.guidepost">Вказівний стовп</string>
 	<string name="type.tourism.information.map">Мапа</string>
 	<string name="type.tourism.information.office">Туристичний офіс</string>
 	<string name="type.tourism.motel">Мотель</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 098dad8be4..473744f90a 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1273,9 +1273,26 @@
 	<string name="type.shop.video">Cửa hàng bán/cho thuê bằng đĩa</string>
 	<string name="type.shop.video_games">Cửa hàng bán trò chơi điện tử</string>
 	<string name="type.shop.wine">Rượu</string>
+	<string name="type.sport">Thể thao</string>
+	<string name="type.sport.american_football">Bóng bầu dục Mỹ</string>
+	<string name="type.sport.archery">Bắn cung</string>
 	<string name="type.sport.athletics">Điền kinh</string>
+	<string name="type.sport.australian_football">Bóng bầu dục Úc</string>
+	<string name="type.sport.baseball">Bóng chày</string>
 	<string name="type.sport.basketball">Bóng rổ</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Bi đá trên băng</string>
 	<string name="type.sport.equestrian">Thể thao cưỡi ngựa</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Thể dục</string>
+	<string name="type.sport.handball">bóng ném</string>
+	<string name="type.sport.multi">Các môn thể thao khác nhau</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Môn lặn</string>
+	<string name="type.sport.shooting">Chụp</string>
+	<string name="type.sport.skiing">Trượt tuyết</string>
+	<string name="type.sport.soccer">Bóng đá</string>
+	<string name="type.sport.swimming">Bơi</string>
 	<string name="type.sport.tennis">Sân tenis</string>
 	<string name="type.tourism.alpine_hut">Nhà ở trên núi</string>
 	<string name="type.tourism.apartment">Căn hộ</string>
@@ -1296,7 +1313,7 @@
 	<string name="type.tourism.hotel">Khách sạn</string>
 	<string name="type.tourism.information">Thông tin du lịch</string>
 	<string name="type.tourism.information.board">Bảng Thông Tin</string>
-	<string name="type.tourism.information.guidepost">Thông tin du lịch</string>
+	<string name="type.tourism.information.guidepost">Hướng dẫn</string>
 	<string name="type.tourism.information.map">Bản Đồ Du Lịch</string>
 	<string name="type.tourism.information.office">Văn Phòng Du Lịch</string>
 	<string name="type.tourism.motel">Nhà nghỉ</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 1e61997c71..f7960cc594 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1326,9 +1326,27 @@
 	<string name="type.shop.video">視頻商城</string>
 	<string name="type.shop.video_games">電子遊戲商城</string>
 	<string name="type.shop.wine">販酒處</string>
-	<string name="type.sport.athletics">田徑</string>
+	<string name="type.sport">體育運動</string>
+	<string name="type.sport.american_football">美式足球</string>
+	<string name="type.sport.archery">射箭</string>
+	<string name="type.sport.athletics">競技</string>
+	<string name="type.sport.australian_football">澳式足球</string>
+	<string name="type.sport.baseball">棒球</string>
 	<string name="type.sport.basketball">籃球</string>
+	<string name="type.sport.bowls">草地滾球</string>
+	<string name="type.sport.cricket">板球</string>
+	<string name="type.sport.curling">冰壺</string>
 	<string name="type.sport.equestrian">馬術運動</string>
+	<string name="type.sport.golf">高爾夫球</string>
+	<string name="type.sport.gymnastics">體操</string>
+	<string name="type.sport.handball">手球</string>
+	<string name="type.sport.multi">各種運動</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">水肺潛水</string>
+	<string name="type.sport.shooting">射擊</string>
+	<string name="type.sport.skiing">滑雪</string>
+	<string name="type.sport.soccer">足球</string>
+	<string name="type.sport.swimming">游泳</string>
 	<string name="type.sport.tennis">網球場</string>
 	<string name="type.tourism.alpine_hut">山上住宿</string>
 	<string name="type.tourism.apartment">公寓</string>
@@ -1349,7 +1367,7 @@
 	<string name="type.tourism.hotel">飯店</string>
 	<string name="type.tourism.information">觀光諮詢</string>
 	<string name="type.tourism.information.board">資訊中心</string>
-	<string name="type.tourism.information.guidepost">觀光諮詢</string>
+	<string name="type.tourism.information.guidepost">指路牌</string>
 	<string name="type.tourism.information.map">旅遊地圖</string>
 	<string name="type.tourism.information.office">旅遊辦事處</string>
 	<string name="type.tourism.motel">汽車旅館</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index ee59144fc6..9762988c49 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -1430,18 +1430,25 @@
 	<string name="type.shop.video">影像店</string>
 	<string name="type.shop.video_games">电子游戏店</string>
 	<string name="type.shop.wine">酒品商店</string>
-	<string name="type.sport.athletics">田径</string>
+	<string name="type.sport">体育运动</string>
+	<string name="type.sport.american_football">美式足球</string>
+	<string name="type.sport.archery">射箭</string>
+	<string name="type.sport.athletics">竞技</string>
+	<string name="type.sport.australian_football">澳式足球</string>
 	<string name="type.sport.baseball">棒球</string>
 	<string name="type.sport.basketball">篮球</string>
-	<string name="type.sport.bowls">保龄球</string>
+	<string name="type.sport.bowls">草地滾球</string>
 	<string name="type.sport.cricket">板球</string>
-	<string name="type.sport.diving">跳水</string>
+	<string name="type.sport.curling">冰壶</string>
 	<string name="type.sport.equestrian">马术运动</string>
 	<string name="type.sport.golf">高尔夫球</string>
 	<string name="type.sport.gymnastics">体操</string>
 	<string name="type.sport.handball">手球</string>
-	<string name="type.sport.multi">多元</string>
+	<string name="type.sport.multi">各种运动</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">水肺潜水</string>
 	<string name="type.sport.shooting">射击</string>
+	<string name="type.sport.skiing">滑雪</string>
 	<string name="type.sport.soccer">足球</string>
 	<string name="type.sport.swimming">游泳</string>
 	<string name="type.sport.tennis">网球场</string>
@@ -1465,7 +1472,7 @@
 	<string name="type.tourism.hotel">旅店</string>
 	<string name="type.tourism.information">旅游问询处</string>
 	<string name="type.tourism.information.board">公告板</string>
-	<string name="type.tourism.information.guidepost">旅游信息</string>
+	<string name="type.tourism.information.guidepost">指路牌</string>
 	<string name="type.tourism.information.map">旅游地图</string>
 	<string name="type.tourism.information.office">旅游咨询中心</string>
 	<string name="type.tourism.motel">汽车旅馆</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 3024cfb37c..749097cbc6 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1584,26 +1584,26 @@
 	<string name="type.shop.video">Video Shop</string>
 	<string name="type.shop.video_games">Video Games Shop</string>
 	<string name="type.shop.wine">Wine Shop</string>
-	<string name="type.sport">sport</string>
+	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">American Football</string>
 	<string name="type.sport.archery">Archery</string>
 	<string name="type.sport.athletics">Athletics</string>
-	<string name="type.sport.australian_football">Rugby</string>
+	<string name="type.sport.australian_football">Australian Football</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
 	<string name="type.sport.bowls">Bowls</string>
 	<string name="type.sport.cricket">Cricket</string>
-	<string name="type.sport.curling">Сurling</string>
-	<string name="type.sport.diving">Diving</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Equestrian Sports</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gymnastics</string>
 	<string name="type.sport.handball">Handball</string>
-	<string name="type.sport.multi">Various Sport</string>
-	<string name="type.sport.scuba_diving">Scuba Diving</string>
+	<string name="type.sport.multi">Various Sports</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Scuba diving site</string>
 	<string name="type.sport.shooting">Shooting</string>
 	<string name="type.sport.skiing">Skiing</string>
-	<string name="type.sport.soccer">Soccer (Football)</string>
+	<string name="type.sport.soccer">Soccer</string>
 	<string name="type.sport.swimming">Swimming</string>
 	<string name="type.sport.tennis">Tennis Court</string>
 	<string name="type.tourism">Tourism</string>
@@ -1626,7 +1626,7 @@
 	<string name="type.tourism.hotel">Hotel</string>
 	<string name="type.tourism.information">Tourist Information</string>
 	<string name="type.tourism.information.board">Information Board</string>
-	<string name="type.tourism.information.guidepost">Tourist Information</string>
+	<string name="type.tourism.information.guidepost">Guidepost</string>
 	<string name="type.tourism.information.map">Tourist Map</string>
 	<string name="type.tourism.information.office">Tourist Office</string>
 	<string name="type.tourism.motel">Motel</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index aae931fe3d..115062a580 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -2854,47 +2854,46 @@
 
 "type.shop.wine" = "متجر مشروبات روحية";
 
-"type.sport" = "sport";
+"type.sport" = "رياضة";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "كرة القدم الأمريكية";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "الرماية";
 
 "type.sport.athletics" = "العاب رياضية";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "كرة القدم الأسترالية";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "البيسبول";
 
 "type.sport.basketball" = "كرة السلة";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "لعبة البولينج";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "كريكت";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "كيرلنغ";
 
 "type.sport.equestrian" = "رياضة الفروسية";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "الجولف";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "رياضة بدنية";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "كرة اليد";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "رياضات متنوعة";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "الغوص";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "رماية";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "التزحلق";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "كرة القدم";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "سباحة";
 
 "type.sport.tennis" = "ملعب تنس";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "لوحة معلومات";
 
-"type.tourism.information.guidepost" = "معلومات سياحية";
+"type.tourism.information.guidepost" = "دليل";
 
 "type.tourism.information.map" = "خريطة سياحية";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index e0edbcbbd0..f295945764 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -2854,49 +2854,48 @@
 
 "type.shop.wine" = "Wine Shop";
 
-"type.sport" = "sport";
+"type.sport" = "Спорт";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Амерыканскі футбол";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Стральба з лука";
 
 "type.sport.athletics" = "Athletics";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Аўстралійскі футбол";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "Бейсбол";
 
 "type.sport.basketball" = "Basketball";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Боўлз";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "Крикет";
 
-"type.sport.curling" = "Сurling";
+"type.sport.curling" = "Кёрлінг";
 
-"type.sport.diving" = "Diving";
+"type.sport.equestrian" = "Конны спорт";
 
-"type.sport.equestrian" = "Equestrian Sports";
+"type.sport.golf" = "Гольф";
 
-"type.sport.golf" = "Golf";
+"type.sport.gymnastics" = "Гімнастыка";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.handball" = "Гандбол";
 
-"type.sport.handball" = "Handball";
+"type.sport.multi" = "Розныя віды спорту";
 
-"type.sport.multi" = "Various Sport";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Месца для дайвінга";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+"type.sport.shooting" = "Стральба";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.skiing" = "Катанне на лыжах";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.soccer" = "Футбол";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.swimming" = "Плаванне";
 
-"type.sport.swimming" = "Swimming";
-
-"type.sport.tennis" = "Tennis Court";
+"type.sport.tennis" = "Тэнісны корт";
 
 "type.tourism" = "Tourism";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Information Board";
 
-"type.tourism.information.guidepost" = "Tourist Information";
+"type.tourism.information.guidepost" = "Даведнік";
 
 "type.tourism.information.map" = "Tourist Map";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index f367531ff8..385ab33f55 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Wine Shop";
 
-"type.sport" = "sport";
+"type.sport" = "Спорт";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Американски футбол";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Стрелба с лък";
 
 "type.sport.athletics" = "Athletics";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Австралийски футбол";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,11 +2872,9 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
+"type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Diving";
-
-"type.sport.equestrian" = "Equestrian Sports";
+"type.sport.equestrian" = "Конен спорт";
 
 "type.sport.golf" = "Golf";
 
@@ -2884,19 +2882,20 @@
 
 "type.sport.handball" = "Handball";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Различни спортове";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
 "type.sport.skiing" = "Skiing";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Soccer";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Плуване";
 
-"type.sport.tennis" = "Tennis Court";
+"type.sport.tennis" = "Тенис корт";
 
 "type.tourism" = "Tourism";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Information Board";
 
-"type.tourism.information.guidepost" = "Tourist Information";
+"type.tourism.information.guidepost" = "Пътеводител";
 
 "type.tourism.information.map" = "Tourist Map";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 49d886a7ea..2a73d57c73 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Vinařství";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Americký fotbal";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Lukostřelba";
 
 "type.sport.athletics" = "Atletika";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australský fotbal";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2870,31 +2870,30 @@
 
 "type.sport.bowls" = "Bowls";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "Kriket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Koňské sporty";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gymnastika";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Házená";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Různé sporty";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Potápění";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Střílení";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Lyžování";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Fotbal";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Plavání";
 
 "type.sport.tennis" = "Tenisový kurt";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Nástěnka";
 
-"type.tourism.information.guidepost" = "Infocentrum";
+"type.tourism.information.guidepost" = "Rozcestník";
 
 "type.tourism.information.map" = "Turistická mapa";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 771134f599..050ba537c8 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Vinhandel";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Amerikansk fodbold";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Bueskydning";
 
 "type.sport.athletics" = "Atletik";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australsk fodbold";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Ridesport";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gymnastik";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Håndbold";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Forskellige sportsgrene";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Scuba dykning";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Skydning";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Stå på ski";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Fodbold";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Svømning";
 
 "type.sport.tennis" = "Tennisbane";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informationstavle";
 
-"type.tourism.information.guidepost" = "Turistinformation";
+"type.tourism.information.guidepost" = "Vejviser";
 
 "type.tourism.information.map" = "Turistkort";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 735366f2a8..e79cd366e6 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -2862,7 +2862,7 @@
 
 "type.sport.athletics" = "Leichtathletik";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2874,9 +2874,7 @@
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Tauchen";
-
-"type.sport.equestrian" = "Reiten";
+"type.sport.equestrian" = "Reitsport";
 
 "type.sport.golf" = "Golf";
 
@@ -2884,13 +2882,14 @@
 
 "type.sport.handball" = "Handball";
 
-"type.sport.multi" = "verschiedene Sportarten";
+"type.sport.multi" = "Verschiedene Sportarten";
 
-"type.sport.scuba_diving" = "Sporttauchen";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Gerätetauchen";
 
-"type.sport.shooting" = "Sportschießen";
+"type.sport.shooting" = "Schießen";
 
-"type.sport.skiing" = "Skisport";
+"type.sport.skiing" = "Skifahren";
 
 "type.sport.soccer" = "Fußball";
 
@@ -2900,7 +2899,7 @@
 
 "type.tourism" = "Tourismus";
 
-"type.tourism.alpine_hut" = "Berghütte";
+"type.tourism.alpine_hut" = "bewirtschaftete Schutzhütte";
 
 "type.tourism.apartment" = "Ferienwohnung";
 
@@ -2956,7 +2955,7 @@
 
 "type.tourism.viewpoint" = "Aussichtspunkt";
 
-"type.tourism.wilderness_hut" = "Wildnishütte";
+"type.tourism.wilderness_hut" = "unbewirtschaftete Schutzhütte";
 
 "type.tourism.zoo" = "Zoo";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 0bd9b6e13b..abf34e9ecf 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -2854,17 +2854,17 @@
 
 "type.shop.wine" = "Οινοπωλείο";
 
-"type.sport" = "sport";
+"type.sport" = "Αθλητισμός";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "αμερικάνικο ποδόσφαιρο";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Τοξοβολία";
 
 "type.sport.athletics" = "Στίβος";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Αυστραλιανό ποδόσφαιρο";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "Μπέιζμπολ";
 
 "type.sport.basketball" = "Μπάσκετ";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Κέρλινγκ";
 
 "type.sport.equestrian" = "Ιππασία";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "Γκολφ";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Γυμναστική";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Τόπι";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Διάφορα αθλήματα";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Κατάδυση";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Κυνήγι";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Χιονοδρόμια";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Ποδόσφαιρο";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Κολύμβηση";
 
 "type.sport.tennis" = "Γήπεδο τένις";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Πίνακας πληροφοριών";
 
-"type.tourism.information.guidepost" = "Τουριστικές πληροφορίες";
+"type.tourism.information.guidepost" = "Οδηγός";
 
 "type.tourism.information.map" = "Τουριστικός χάρτης";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index d435c47026..041806f9d6 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -2854,7 +2854,7 @@
 
 "type.shop.wine" = "Wine Shop";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
 "type.sport.american_football" = "American Football";
 
@@ -2862,7 +2862,7 @@
 
 "type.sport.athletics" = "Athletics";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,9 +2872,7 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Equestrian Sports";
 
@@ -2884,15 +2882,16 @@
 
 "type.sport.handball" = "Handball";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Various Sports";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
 "type.sport.skiing" = "Skiing";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Soccer";
 
 "type.sport.swimming" = "Swimming";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Information Board";
 
-"type.tourism.information.guidepost" = "Tourist Information";
+"type.tourism.information.guidepost" = "Guidepost";
 
 "type.tourism.information.map" = "Tourist Map";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 2e846eb0ec..4754ab67c7 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -2854,7 +2854,7 @@
 
 "type.shop.wine" = "Wine Shop";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
 "type.sport.american_football" = "American Football";
 
@@ -2862,7 +2862,7 @@
 
 "type.sport.athletics" = "Athletics";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,9 +2872,7 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Equestrian Sports";
 
@@ -2884,15 +2882,16 @@
 
 "type.sport.handball" = "Handball";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Various Sports";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
 "type.sport.skiing" = "Skiing";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Soccer";
 
 "type.sport.swimming" = "Swimming";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Information Board";
 
-"type.tourism.information.guidepost" = "Tourist Information";
+"type.tourism.information.guidepost" = "Guidepost";
 
 "type.tourism.information.map" = "Tourist Map";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 4b3a42b23b..52d94da035 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -2858,7 +2858,7 @@
 
 "type.sport.american_football" = "Fútbol americano";
 
-"type.sport.archery" = "Tiro con arco";
+"type.sport.archery" = "Tiro al arco";
 
 "type.sport.athletics" = "Atletismo";
 
@@ -2868,14 +2868,12 @@
 
 "type.sport.basketball" = "Baloncesto";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Bolos sobre hierba";
 
 "type.sport.cricket" = "Críquet";
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Salto";
-
 "type.sport.equestrian" = "Deporte hípico";
 
 "type.sport.golf" = "Golf";
@@ -2886,9 +2884,10 @@
 
 "type.sport.multi" = "Varios deportes";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Submarinismo";
 
-"type.sport.shooting" = "Tiro deportivo";
+"type.sport.shooting" = "Tiroteo";
 
 "type.sport.skiing" = "Esquí";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Tablón de información";
 
-"type.tourism.information.guidepost" = "Información";
+"type.tourism.information.guidepost" = "Poste indicador";
 
 "type.tourism.information.map" = "Mapa turístico";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index bdd32acc3b..71cf0e22ed 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -2858,7 +2858,7 @@
 
 "type.sport.american_football" = "Fútbol americano";
 
-"type.sport.archery" = "Tiro con arco";
+"type.sport.archery" = "Tiro al arco";
 
 "type.sport.athletics" = "Atletismo";
 
@@ -2868,14 +2868,12 @@
 
 "type.sport.basketball" = "Baloncesto";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Bolos sobre hierba";
 
 "type.sport.cricket" = "Críquet";
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Salto";
-
 "type.sport.equestrian" = "Equitación";
 
 "type.sport.golf" = "Golf";
@@ -2886,9 +2884,10 @@
 
 "type.sport.multi" = "Varios deportes";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Submarinismo";
 
-"type.sport.shooting" = "Tiro deportivo";
+"type.sport.shooting" = "Tiroteo";
 
 "type.sport.skiing" = "Esquí";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Tablón de información";
 
-"type.tourism.information.guidepost" = "Información";
+"type.tourism.information.guidepost" = "Poste indicador";
 
 "type.tourism.information.map" = "Mapa turístico";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index b7bd197f3b..972929dbef 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -2874,8 +2874,6 @@
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Salto egin";
-
 "type.sport.equestrian" = "Zaldi-lasterketa";
 
 "type.sport.golf" = "Golfa";
@@ -2886,9 +2884,10 @@
 
 "type.sport.multi" = "Hainbat kirol";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Urpekaritza";
 
-"type.sport.shooting" = "Kirolaren jaurtiketa";
+"type.sport.shooting" = "Tiroketa";
 
 "type.sport.skiing" = "Eskia";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informazio taula";
 
-"type.tourism.information.guidepost" = "Informazioa";
+"type.tourism.information.guidepost" = "Gida postua";
 
 "type.tourism.information.map" = "Mapa turistikoa";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 28837fde55..b4068ed296 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -2854,47 +2854,46 @@
 
 "type.shop.wine" = "فروشگاه";
 
-"type.sport" = "sport";
+"type.sport" = "ورزش";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "فوتبال آمریکایی";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "تیراندازی با کمان";
 
 "type.sport.athletics" = "ورزش";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "فوتبال استرالیایی";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "بیسبال";
 
 "type.sport.basketball" = "بسکتبال";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "لعبة البولينج";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "کریکت";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "کرلینگ";
 
 "type.sport.equestrian" = "ورزش های سوارکاری";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "گلف";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "ژیمناستیک";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "هندبال";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "ورزش های مختلف";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "غواصی";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "ورزش تیراندازی";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "اسکی";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "فوتبال";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "شنا";
 
 "type.sport.tennis" = "زمین تنیس";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "گردشگری";
 
-"type.tourism.information.guidepost" = "گردشگری";
+"type.tourism.information.guidepost" = "تابلو راهنما";
 
 "type.tourism.information.map" = "گردشگری";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 8c380bf965..d78eb6b9f3 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -2862,20 +2862,18 @@
 
 "type.sport.athletics" = "Yleisurheilu";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australialainen jalkapallo";
 
 "type.sport.baseball" = "Baseball";
 
 "type.sport.basketball" = "Koripallo";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Nurmikeilailu";
 
 "type.sport.cricket" = "Kriketti";
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Diving";
-
 "type.sport.equestrian" = "Hevosurheilu";
 
 "type.sport.golf" = "Golf";
@@ -2884,9 +2882,10 @@
 
 "type.sport.handball" = "Käsipallo";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Erilaisia urheilulajeja";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Sukellus";
 
 "type.sport.shooting" = "Ammunta";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informaatio";
 
-"type.tourism.information.guidepost" = "Turisti-informaatio";
+"type.tourism.information.guidepost" = "Tienviitta";
 
 "type.tourism.information.map" = "Turistikartta";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index ee41640bd9..af9db61528 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -99,7 +99,7 @@
 "transport" = "Transport";
 
 /* Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! */
-"fuel" = "Essence";
+"fuel" = "Stations-service";
 
 /* Search category for parking lots; any changes should be duplicated in categories.txt @parking! */
 "parking" = "Stationnement";
@@ -153,7 +153,7 @@
 "water" = "Eau";
 
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
-"rv" = "RV Facilities";
+"rv" = "Aménagements pour camping-car";
 
 "share_bookmarks_email_body" = "Bonjour !\n\nVous trouverez ci-joint mes signets de l'appli Organic Maps. Veuillez les ouvrir si vous avez installé Organic Maps. Si vous ne l'avez pas, téléchargez l'application pour votre appareil iOS ou Android en suivant ce lien : https://omaps.app/get?kmz\n\nBon voyage avec Organic Maps!";
 
@@ -1405,7 +1405,7 @@
 
 "type.recycling.batteries" = "Batteries";
 
-"type.recycling.clothes" = "Vêtement usagés";
+"type.recycling.clothes" = "Vêtements usagés";
 
 "type.recycling.glass_bottles" = "Verre";
 
@@ -1413,21 +1413,21 @@
 
 "type.recycling.plastic" = "Déchets plastiques";
 
-"type.recycling.plastic_bottles" = "Collecte de bouteilles en plastique";
+"type.recycling.plastic_bottles" = "Bouteilles en plastique";
 
 "type.recycling.scrap_metal" = "Ferraille";
 
 "type.recycling.small_appliances" = "Déchets d'équipements électriques";
 
-"type.recycling.cardboard" = "Cardboard";
+"type.recycling.cardboard" = "Carton";
 
-"type.recycling.cans" = "Cans";
+"type.recycling.cans" = "Emballages métalliques";
 
-"type.recycling.shoes" = "Shoes";
+"type.recycling.shoes" = "Chaussures";
 
-"type.recycling.green_waste" = "Green/Organic Waste";
+"type.recycling.green_waste" = "Déchets organiques";
 
-"type.recycling.cartons" = "Bewerage Cartons";
+"type.recycling.cartons" = "Briques alimentaires";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1461,7 +1461,7 @@
 
 "type.amenity.vending_machine.drinks" = "Distributeur de boissons";
 
-"type.amenity.vending_machine.food" = "Distributeur de aliments";
+"type.amenity.vending_machine.food" = "Distributeur d'aliments";
 
 "type.amenity.vending_machine.newspapers" = "Distributeur de journaux";
 
@@ -1471,9 +1471,9 @@
 
 "type.amenity.vending_machine.sweets" = "Distributeur de bonbons";
 
-"type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
+"type.amenity.vending_machine.excrement_bags" = "Distributeur de sacs à excréments";
 
-"type.amenity.parcel_locker" = "Parcel Locker";
+"type.amenity.parcel_locker" = "Consigne automatique pour colis";
 
 "type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
@@ -1521,45 +1521,45 @@
 
 "type.barrier.wall" = "Mur";
 
-"type.boundary" = "Boundary";
+"type.boundary" = "Frontière";
 
-"type.boundary.administrative" = "Administrative Boundary";
+"type.boundary.administrative" = "Frontière administrative";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
+"type.boundary.administrative.10" = "Frontière administrative";
 
-"type.boundary.administrative.11" = "Administrative Boundary";
+"type.boundary.administrative.11" = "Frontière administrative";
 
-"type.boundary.administrative.2" = "National Border";
+"type.boundary.administrative.2" = "Frontière nationale";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+"type.boundary.administrative.3" = "Frontière administrative";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
+"type.boundary.administrative.4" = "Frontière administrative";
 
-"type.boundary.administrative.5" = "Administrative Boundary";
+"type.boundary.administrative.5" = "Frontière administrative";
 
-"type.boundary.administrative.6" = "Administrative Boundary";
+"type.boundary.administrative.6" = "Frontière administrative";
 
-"type.boundary.administrative.7" = "Administrative Boundary";
+"type.boundary.administrative.7" = "Frontière administrative";
 
-"type.boundary.administrative.8" = "Administrative Boundary";
+"type.boundary.administrative.8" = "Frontière administrative";
 
-"type.boundary.administrative.9" = "Administrative Boundary";
+"type.boundary.administrative.9" = "Frontière administrative";
 
-"type.boundary.administrative.city" = "City Boundary";
+"type.boundary.administrative.city" = "Frontière de la ville";
 
-"type.boundary.administrative.country" = "National Border";
+"type.boundary.administrative.country" = "Frontière nationale";
 
-"type.boundary.administrative.county" = "County Boundary";
+"type.boundary.administrative.county" = "Frontière du comté";
 
-"type.boundary.administrative.municipality" = "Municipality Boundary";
+"type.boundary.administrative.municipality" = "Frontière de la municipalité";
 
-"type.boundary.administrative.nation" = "National Border";
+"type.boundary.administrative.nation" = "Frontière nationale";
 
-"type.boundary.administrative.region" = "Regional Boundary";
+"type.boundary.administrative.region" = "Frontière régionale";
 
 "type.boundary.administrative.state" = "State Boundary";
 
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+"type.boundary.administrative.suburb" = "Frontière de quartier";
 
 "type.boundary.national_park" = "Parc national";
 
@@ -1575,30 +1575,30 @@
 
 "type.building.warehouse" = "Entrepôt";
 
-"type.cemetery.grave" = "La tombe";
+"type.cemetery.grave" = "Tombe";
 
 "type.craft" = "Artisanat";
 
-"type.craft.beekeeper" = "Beekeeper";
+"type.craft.beekeeper" = "Apiculteur";
 
-"type.craft.blacksmith" = "Blacksmith";
+"type.craft.blacksmith" = "Forgeron";
 
 "type.craft.brewery" = "Brasserie artisanale";
 
 "type.craft.carpenter" = "Charpentier";
 
-"type.craft.confectionery" = "Confectionery";
+"type.craft.confectionery" = "Confiseur";
 
 "type.craft.electrician" = "Électricien";
 
-"type.craft.electronics_repair" = "Electronics Repair";
+"type.craft.electronics_repair" = "Réparation d'appareils électroniques";
 
 "type.craft.gardener" = "Paysagiste";
 
 "type.craft.handicraft" = "Handicraft";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "Climatiseur";
+"type.craft.hvac" = "Chauffage, ventilation et climatisation";
 
 "type.craft.metal_construction" = "Métallo";
 
@@ -1608,11 +1608,11 @@
 
 "type.craft.plumber" = "Plombier";
 
-"type.craft.sawmill" = "Sawmill";
+"type.craft.sawmill" = "Scierie";
 
 "type.craft.shoemaker" = "Cordonnier";
 
-"type.craft.winery" = "Winery";
+"type.craft.winery" = "Chai";
 
 "type.craft.tailor" = "Tailleur";
 
@@ -2110,7 +2110,7 @@
 
 "type.historic.battlefield" = "Champ de bataille";
 
-"type.historic.boundary_stone" = "Boundary Stone";
+"type.historic.boundary_stone" = "Borne frontière";
 
 "type.historic.castle" = "Château";
 
@@ -2242,7 +2242,7 @@
 
 "type.landuse.residential" = "Zone résidentielle";
 
-"type.landuse.retail" = "Retail Land";
+"type.landuse.retail" = "Zone commerciale";
 
 "type.landuse.salt_pond" = "Marais salant";
 
@@ -2322,15 +2322,15 @@
 
 "type.man_made.chimney" = "Cheminée d'usine";
 
-"type.man_made.cutline" = "Cutline";
+"type.man_made.cutline" = "Layon";
 
 "type.man_made.survey_point" = "Borne géodésique";
 
-"type.man_made.flagpole" = "Flagpole";
+"type.man_made.flagpole" = "Mât de drapeau";
 
 "type.man_made.lighthouse" = "Phare";
 
-"type.man_made.mast" = "Mast";
+"type.man_made.mast" = "Mât";
 
 "type.man_made.pier" = "Jetée";
 
@@ -2376,7 +2376,7 @@
 
 "type.natural.beach" = "Plage";
 
-"type.natural.beach.sand" = "Sandy Beach";
+"type.natural.beach.sand" = "Plage de sable";
 
 "type.natural.beach.gravel" = "Gravel Beach";
 
@@ -2388,7 +2388,7 @@
 
 "type.natural.earth_bank" = "Earth Bank";
 
-"type.man_made.embankment" = "Embankment";
+"type.man_made.embankment" = "Talus";
 
 "type.natural.coastline" = "Littoral";
 
@@ -2404,7 +2404,7 @@
 
 "type.natural.water.lake" = "Lac";
 
-"type.natural.water.lock" = "Chambre de verrouillage";
+"type.natural.water.lock" = "Écluse";
 
 "type.natural.water.pond" = "Étang";
 
@@ -2522,7 +2522,7 @@
 
 "type.place.sea" = "Mer";
 
-"type.place.square" = "Square";
+"type.place.square" = "Place";
 
 "type.place.state" = "État";
 
@@ -2568,17 +2568,17 @@
 
 "type.railway" = "Chemin de fer";
 
-"type.railway.abandoned" = "Abandoned railway";
+"type.railway.abandoned" = "Chemin de fer abandonné";
 
-"type.railway.abandoned.bridge" = "Abandoned railway";
+"type.railway.abandoned.bridge" = "Chemin de fer abandonné";
 
-"type.railway.abandoned.tunnel" = "Abandoned Railway";
+"type.railway.abandoned.tunnel" = "Chemin de fer abandonné";
 
-"type.railway.construction" = "Railway's Construction";
+"type.railway.construction" = "Chemin de fer en construction";
 
-"type.railway.crossing" = "Railway Crossing";
+"type.railway.crossing" = "Traversée de voie ferrée";
 
-"type.railway.disused" = "Disused railway";
+"type.railway.disused" = "Chemin de fer désaffecté";
 
 "type.railway.funicular" = "Funiculaire";
 
@@ -2608,9 +2608,9 @@
 
 "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail";
 
-"type.railway.platform" = "Railway Platform";
+"type.railway.platform" = "Quai de gare";
 
-"type.railway.preserved" = "Preserved Rail";
+"type.railway.preserved" = "Chemin de fer touristique";
 
 "type.railway.preserved.bridge" = "Preserved Rail";
 
@@ -2618,11 +2618,11 @@
 
 "type.railway.rail" = "Chemin de fer";
 
-"type.railway.rail.bridge" = "Railway";
+"type.railway.rail.bridge" = "Chemin de fer";
 
 "type.railway.rail.motor_vehicle" = "Railway";
 
-"type.railway.rail.tunnel" = "Railway";
+"type.railway.rail.tunnel" = "Chemin de fer";
 
 "type.railway.razed" = "Razed Rail";
 
@@ -2644,7 +2644,7 @@
 
 "type.railway.station.monorail" = "Gare";
 
-"type.railway.station.subway" = "Métro";
+"type.railway.station.subway" = "Station de métro";
 
 "type.railway.station.subway.barcelona" = "Métro";
 
@@ -2662,13 +2662,13 @@
 
 "type.railway.station.subway.newyork" = "Métro";
 
-"type.railway.station.subway.paris" = "Métro";
+"type.railway.station.subway.paris" = "Station de métro";
 
 "type.railway.station.subway.roma" = "Métro";
 
 "type.railway.station.subway.spb" = "Métro";
 
-"type.railway.subway" = "Ligne de métroo";
+"type.railway.subway" = "Ligne de métro";
 
 "type.railway.subway.bridge" = "Voie de métro";
 
@@ -2744,7 +2744,7 @@
 
 "type.shop.car_repair.tyres" = "Réparation de pneus";
 
-"type.shop.caravan" = "RV Dealership";
+"type.shop.caravan" = "Concessionnaire de caravanes et camping-cars";
 
 "type.shop.chemist" = "Droguerie";
 
@@ -2854,41 +2854,40 @@
 
 "type.shop.wine" = "Caviste";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Football américain";
 
 "type.sport.archery" = "Tir à l'arc";
 
 "type.sport.athletics" = "Athlétisme";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Football australien";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "Base-ball";
 
 "type.sport.basketball" = "Basket-ball";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Boulingrin";
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Sport hippique";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "Le golf";
 
 "type.sport.gymnastics" = "Gymnastique";
 
 "type.sport.handball" = "Handball";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Sports multiples";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Plongée sous-marine";
 
-"type.sport.shooting" = "Sports de tir";
+"type.sport.shooting" = "Tir sportif";
 
 "type.sport.skiing" = "Ski";
 
@@ -2972,7 +2971,7 @@
 
 "type.waterway.canal.tunnel" = "Canal";
 
-"type.waterway.dam" = "Dam";
+"type.waterway.dam" = "Barrage";
 
 "type.waterway.ditch" = "Fossé";
 
@@ -3002,7 +3001,7 @@
 
 "type.waterway.waterfall" = "Cascade";
 
-"type.waterway.weir" = "Weir";
+"type.waterway.weir" = "Seuil";
 
 "type.wheelchair" = "Wheelchair";
 
@@ -3013,11 +3012,11 @@
 "type.wheelchair.yes" = "Équipé pour l'usage des fauteuils roulants";
 
 /* en.wikipedia.org/wiki/Surface_lift */
-"type.piste_lift" = "Surface Lift";
+"type.piste_lift" = "Téléski";
 
-"type.piste_lift.j.bar" = "J-bar Lift";
+"type.piste_lift.j.bar" = "Téléski";
 
-"type.piste_lift.magic_carpet" = "Magic Carpet";
+"type.piste_lift.magic_carpet" = "Tapis roulant";
 
 "type.piste_lift.platter" = "Platter Lift";
 
@@ -3027,22 +3026,22 @@
 
 "type.piste_type" = "Piste Type";
 
-"type.piste_type.downhill" = "Downhill Ski Run";
+"type.piste_type.downhill" = "Piste de ski alpin";
 
-"type.piste_type.downhill.advanced" = "Downhill Ski Run";
+"type.piste_type.downhill.advanced" = "Piste de ski alpin";
 
-"type.piste_type.downhill.easy" = "Downhill Ski Run";
+"type.piste_type.downhill.easy" = "Piste de ski alpin";
 
-"type.piste_type.downhill.expert" = "Downhill Ski Run";
+"type.piste_type.downhill.expert" = "Piste de ski alpin";
 
-"type.piste_type.downhill.freeride" = "Downhill Ski Run";
+"type.piste_type.downhill.freeride" = "Piste de ski alpin";
 
-"type.piste_type.downhill.intermediate" = "Downhill Ski Run";
+"type.piste_type.downhill.intermediate" = "Piste de ski alpin";
 
-"type.piste_type.downhill.novice" = "Downhill Ski Run";
+"type.piste_type.downhill.novice" = "Piste de ski alpin";
 
-"type.piste_type.nordic" = "Nordic Ski Trail";
+"type.piste_type.nordic" = "Piste de ski de fond";
 
-"type.piste_type.sled" = "Sledding Piste";
+"type.piste_type.sled" = "Piste de luge";
 
 "type.building_part" = "Bâtiment";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index ee56438481..8a9804bdc5 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -2854,49 +2854,48 @@
 
 "type.shop.wine" = "Wine Shop";
 
-"type.sport" = "sport";
+"type.sport" = "ספורט";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "כדורגל אמריקאי";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "קַשׁתוּת";
 
 "type.sport.athletics" = "Athletics";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "פוטבול אוסטרלי";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "בייסבול";
 
 "type.sport.basketball" = "Basketball";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "כדורת דשא";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "קריקט";
 
-"type.sport.curling" = "Сurling";
+"type.sport.curling" = "קרלינג";
 
-"type.sport.diving" = "Diving";
+"type.sport.equestrian" = "רכיבה";
 
-"type.sport.equestrian" = "Equestrian Sports";
+"type.sport.golf" = "גולף";
 
-"type.sport.golf" = "Golf";
+"type.sport.gymnastics" = "התעמלות";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.handball" = "כדוריד";
 
-"type.sport.handball" = "Handball";
+"type.sport.multi" = "ענפי ספורט שונים";
 
-"type.sport.multi" = "Various Sport";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Scuba diving site";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+"type.sport.shooting" = "ירי ספורטיבי";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.skiing" = "סקי";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.soccer" = "כדורגל";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.swimming" = "שחייה";
 
-"type.sport.swimming" = "Swimming";
-
-"type.sport.tennis" = "Tennis Court";
+"type.sport.tennis" = "טֶנִיס";
 
 "type.tourism" = "Tourism";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Information Board";
 
-"type.tourism.information.guidepost" = "Tourist Information";
+"type.tourism.information.guidepost" = "מנחה";
 
 "type.tourism.information.map" = "Tourist Map";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 217d43d7df..e544f5092b 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Szeszesital-üzlet";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Amerikai foci";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Íjászat";
 
 "type.sport.athletics" = "Atlétika";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Ausztrál futball";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2870,31 +2870,30 @@
 
 "type.sport.bowls" = "Bowls";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "Krikett";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Lovas sportok";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gimnasztika";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Kézilabda";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Különféle sportágak";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Búvárkodás";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Lövés";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Síelés";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Futball";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Úszás";
 
 "type.sport.tennis" = "Teniszpálya";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Információs tábla";
 
-"type.tourism.information.guidepost" = "Túrista információ";
+"type.tourism.information.guidepost" = "Útmutató";
 
 "type.tourism.information.map" = "Turistatérkép";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index ad270137fc..8d61f3eca7 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -2854,47 +2854,46 @@
 
 "type.shop.wine" = "Toko anggur";
 
-"type.sport" = "sport";
+"type.sport" = "Olahraga";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Sepak Bola Amerika";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Panahan";
 
 "type.sport.athletics" = "Atletik";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Sepak bola Australia";
 
 "type.sport.baseball" = "Baseball";
 
 "type.sport.basketball" = "Bola basket";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Boling lapangan";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "Kriket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Olahraga Berkuda";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Olahraga senam";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Bola tangan";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Berbagai Olahraga";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Selam scuba";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Penembakan";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Bermain ski";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Sepak bola";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Berenang";
 
 "type.sport.tennis" = "Lapangan tenis";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Papan informasi";
 
-"type.tourism.information.guidepost" = "Informasi turis";
+"type.tourism.information.guidepost" = "Tongkat petunjuk jalan";
 
 "type.tourism.information.map" = "Peta wisata";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index b0a1037a65..95ad43f460 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1577,11 +1577,11 @@
 
 "type.cemetery.grave" = "La tomba";
 
-"type.craft" = "Craft";
+"type.craft" = "Artigianato";
 
-"type.craft.beekeeper" = "Beekeeper";
+"type.craft.beekeeper" = "Apicoltore";
 
-"type.craft.blacksmith" = "Blacksmith";
+"type.craft.blacksmith" = "Fabbro";
 
 "type.craft.brewery" = "Birrificio";
 
@@ -1591,11 +1591,11 @@
 
 "type.craft.electrician" = "Elettricista";
 
-"type.craft.electronics_repair" = "Electronics Repair";
+"type.craft.electronics_repair" = "Riparazioni elettroniche";
 
 "type.craft.gardener" = "Giardiniere";
 
-"type.craft.handicraft" = "Handicraft";
+"type.craft.handicraft" = "Artigiano";
 
 /* Heating, Ventilation, and Air Conditioning */
 "type.craft.hvac" = "Impianti HVAC";
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Negozio di alcolici";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Football americano";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Tiro con l'arco";
 
 "type.sport.athletics" = "Atletica leggera";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Football australiano";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Equitazione";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Ginnastica";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Palla a mano";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Sport vari";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Immersioni in subacquea";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Tiro";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Sciare";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Calcio";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Nuoto";
 
 "type.sport.tennis" = "Campo da tennis";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Tabellone informativo";
 
-"type.tourism.information.guidepost" = "Informazione";
+"type.tourism.information.guidepost" = "Guida";
 
 "type.tourism.information.map" = "Mappa turistica";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 85a9badeb9..468d685b5f 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -2874,19 +2874,18 @@
 
 "type.sport.curling" = "カーリング";
 
-"type.sport.diving" = "ダイビング";
-
 "type.sport.equestrian" = "馬術";
 
 "type.sport.golf" = "ゴルフ";
 
-"type.sport.gymnastics" = "体操競技";
+"type.sport.gymnastics" = "体操";
 
 "type.sport.handball" = "ハンドボール";
 
 "type.sport.multi" = "複数";
 
-"type.sport.scuba_diving" = "スクーバダイビング";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "スキューバダイビング";
 
 "type.sport.shooting" = "射撃競技";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index b2321bce8e..43eaf561d9 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -2854,47 +2854,46 @@
 
 "type.shop.wine" = "와인 샵";
 
-"type.sport" = "sport";
+"type.sport" = "스포츠";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "미식 축구";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "양궁";
 
 "type.sport.athletics" = "육상 경기장";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "오스트레일리안 풋볼";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "야구";
 
 "type.sport.basketball" = "야구";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "론볼";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "크리켓";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "컬링";
 
 "type.sport.equestrian" = "승마 경기장";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "골프";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "체조";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "핸드볼";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "다양한 스포츠";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "스쿠버 다이빙";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "사격 경기";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "스키 타기";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "축구";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "수영";
 
 "type.sport.tennis" = "테니스 코트";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "정보 게시판";
 
-"type.tourism.information.guidepost" = "관광 정보";
+"type.tourism.information.guidepost" = "도표";
 
 "type.tourism.information.map" = "관광안내도";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index c35ece30c9..40e54b329c 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Alkoholutsalg";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Amerikansk fotball";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Bueskyting";
 
 "type.sport.athletics" = "Friidrett";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australsk fotball";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Hestesport";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gymnastikk";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Håndball";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Ulike idretter";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Dykking";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Skyting";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Stå på ski";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Fotball";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Svømming";
 
 "type.sport.tennis" = "Tennisbane";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informasjonstavle";
 
-"type.tourism.information.guidepost" = "Turistinformasjon";
+"type.tourism.information.guidepost" = "Guidepost";
 
 "type.tourism.information.map" = "Turistkart";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index c4db6f424a..eff1838f3c 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -2854,17 +2854,17 @@
 
 "type.shop.wine" = "Wijn";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Amerikaans voetbal";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Boogschieten";
 
 "type.sport.athletics" = "Atletiek";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian football";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "Basketbal";
 
 "type.sport.basketball" = "Basketbal";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Paardesport";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gymnastiek";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Handbal";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Diverse sporten";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Duiken";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "schieten";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Skiën";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Voetbal";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Zwemmen";
 
 "type.sport.tennis" = "Tennisveld";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informatiebord";
 
-"type.tourism.information.guidepost" = "Toeristische informatie";
+"type.tourism.information.guidepost" = "Wegwijzer";
 
 "type.tourism.information.map" = "Toeristische kaart";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 9d9a8f4539..7455b1aaa1 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Sklep monopolowy";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
 "type.sport.american_football" = "Futbol amerykański";
 
-"type.sport.archery" = "Łucznictwo sportowe";
+"type.sport.archery" = "Łucznictwo";
 
 "type.sport.athletics" = "Lekka atletyka";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Futbol australijski";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,9 +2872,7 @@
 
 "type.sport.cricket" = "Krykiet";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Jeździectwo";
 
@@ -2882,17 +2880,18 @@
 
 "type.sport.gymnastics" = "Gimnastyka";
 
-"type.sport.handball" = "Piłka ręczna";
+"type.sport.handball" = "Gra w piłkę ręczną";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Różne sporty";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Nurkowanie";
 
 "type.sport.shooting" = "Strzelectwo sportowe";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Jazda na nartach";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Piłka nożna";
 
 "type.sport.swimming" = "Pływanie";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Tablica informacyjna";
 
-"type.tourism.information.guidepost" = "Informacja turystyczna";
+"type.tourism.information.guidepost" = "Drogowskaz";
 
 "type.tourism.information.map" = "Mapa turystyczna";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 17485249f3..46f04ac845 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -2868,27 +2868,26 @@
 
 "type.sport.basketball" = "Basquetebol";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Lawn bowls";
 
 "type.sport.cricket" = "Críquete";
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Mergulho";
-
 "type.sport.equestrian" = "Esportes equestres";
 
 "type.sport.golf" = "Golfe";
 
 "type.sport.gymnastics" = "Ginástica";
 
-"type.sport.handball" = "Andebol";
+"type.sport.handball" = "Handebol";
 
 "type.sport.multi" = "Vários desportos";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Mergulho autônomo";
 
-"type.sport.shooting" = "Tiro esportivo";
+"type.sport.shooting" = "Tiro desportivo";
 
 "type.sport.skiing" = "Esqui";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 310543d2ff..ede360b500 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -2856,26 +2856,24 @@
 
 "type.sport" = "Desporto";
 
-"type.sport.american_football" = "Futebol americano";
+"type.sport.american_football" = "Futebol Americano";
 
 "type.sport.archery" = "Tiro com arco";
 
 "type.sport.athletics" = "Atletismo";
 
-"type.sport.australian_football" = "Futebol australiano";
+"type.sport.australian_football" = "Futebol Australiano";
 
-"type.sport.baseball" = "Beisebol";
+"type.sport.baseball" = "Basebol";
 
 "type.sport.basketball" = "Basquetebol";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "Lawn bowls";
 
 "type.sport.cricket" = "Críquete";
 
 "type.sport.curling" = "Curling";
 
-"type.sport.diving" = "Mergulho";
-
 "type.sport.equestrian" = "Hipismo";
 
 "type.sport.golf" = "Golfe";
@@ -2886,7 +2884,8 @@
 
 "type.sport.multi" = "Vários desportos";
 
-"type.sport.scuba_diving" = "Mergulho autónomo";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Mergulho autônomo";
 
 "type.sport.shooting" = "Tiro desportivo";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 11e16b37a1..f580101e2e 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Vinărie";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Fotbal american";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "TIR cu arcul";
 
 "type.sport.athletics" = "Atletica ușoară";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Fotbal australian";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Sport ecvestru";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gimnastică";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Handbal";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Sporturi Diverse";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Scufundări";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Filmare";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Schi";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Fotbal";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Natație";
 
 "type.sport.tennis" = "Teren de tenis";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Panou de informații";
 
-"type.tourism.information.guidepost" = "Informații turistice";
+"type.tourism.information.guidepost" = "Postul de ghidare";
 
 "type.tourism.information.map" = "Hartă turistică";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index eb12d90a29..e5971da8bd 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -2862,19 +2862,17 @@
 
 "type.sport.athletics" = "Лёгкая атлетика";
 
-"type.sport.australian_football" = "Регби";
+"type.sport.australian_football" = "Австралийский футбол";
 
 "type.sport.baseball" = "Бейсбол";
 
 "type.sport.basketball" = "Баскетбол";
 
-"type.sport.bowls" = "Кегли";
+"type.sport.bowls" = "Боулз";
 
 "type.sport.cricket" = "Крикет";
 
-"type.sport.curling" = "Керлинг";
-
-"type.sport.diving" = "Подводное плавание";
+"type.sport.curling" = "Кёрлинг";
 
 "type.sport.equestrian" = "Конный спорт";
 
@@ -2886,7 +2884,8 @@
 
 "type.sport.multi" = "Различные виды спорта";
 
-"type.sport.scuba_diving" = "Акваланг";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Место для дайвинга";
 
 "type.sport.shooting" = "Стрельба";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Информационный щит";
 
-"type.tourism.information.guidepost" = "Туринформация";
+"type.tourism.information.guidepost" = "Указательный столб";
 
 "type.tourism.information.map" = "Карта";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 60d54dc38a..d385f765a9 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Vinotéka";
 
-"type.sport" = "sport";
+"type.sport" = "Šport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Americký futbal";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Lukostreľba";
 
 "type.sport.athletics" = "Atletika";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Jazdecké športy";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gymnastika";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Hádzaná";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Rôzne športy";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Potápanie";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Streľba";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Lyžovanie";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Futbal";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Plávanie";
 
 "type.sport.tennis" = "Tenisový kurt";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informačné centrum";
 
-"type.tourism.information.guidepost" = "Infocentrum";
+"type.tourism.information.guidepost" = "Smerovník";
 
 "type.tourism.information.map" = "Turistická mapa";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index e6648a351a..e896b7ca11 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -2854,17 +2854,17 @@
 
 "type.shop.wine" = "Vinhandel";
 
-"type.sport" = "sport";
+"type.sport" = "Sport";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Amerikansk fotboll";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Bågskytte";
 
 "type.sport.athletics" = "Friidrott";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "Baseboll";
 
 "type.sport.basketball" = "Basket";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Curling";
 
 "type.sport.equestrian" = "Ridsport";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Gymnastik";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Handboll";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Olika sporter";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Dykning";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Skytte";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Skidåkning";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Fotboll";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Simning";
 
 "type.sport.tennis" = "Tennisbana";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Informationstavla";
 
-"type.tourism.information.guidepost" = "Turistinformation";
+"type.tourism.information.guidepost" = "Vägledning";
 
 "type.tourism.information.map" = "Turistkarta";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 0ee97d0520..848ff17811 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -2854,15 +2854,15 @@
 
 "type.shop.wine" = "Wine Shop";
 
-"type.sport" = "sport";
+"type.sport" = "Michezo";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Soka ya Marekani";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Upigaji mishale";
 
 "type.sport.athletics" = "Riadha";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
 "type.sport.baseball" = "Baseball";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Kukunja";
 
 "type.sport.equestrian" = "Michezo ya Farasi";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "Gofu";
 
 "type.sport.gymnastics" = "Gymnastics";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "Mpira wa mikono";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Michezo Mbalimbali";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Upigaji mbizi wa Scuba";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Kupiga risasi";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Skii";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Soka";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Kuogelea";
 
 "type.sport.tennis" = "Wanja wa tenisi";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Information Board";
 
-"type.tourism.information.guidepost" = "Tourist Information";
+"type.tourism.information.guidepost" = "Chapisho la mwongozo";
 
 "type.tourism.information.map" = "Tourist Map";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index cd5b82c3bd..61fd45d84f 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -2854,17 +2854,17 @@
 
 "type.shop.wine" = "ร้านขายไวน์";
 
-"type.sport" = "sport";
+"type.sport" = "กีฬา";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "อเมริกันฟุตบอล";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "ยิงธนู";
 
 "type.sport.athletics" = "กรีฑา";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Australian Football";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "เบสบอล";
 
 "type.sport.basketball" = "บาสเก็ตบอล";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "เคอร์ลิง";
 
 "type.sport.equestrian" = "กีฬาแข่งม้า";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "กอล์ฟ";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "ยิมนาสติก";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "แฮนด์บอล";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "กีฬาต่างๆ";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "ดำน้ำลึก";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "ยิงปืน";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "เล่นสกี";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "ฟุตบอล";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "การว่ายน้ำ";
 
 "type.sport.tennis" = "คอร์ทเทนนิส";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "บอร์ดประชาสัมพันธ์";
 
-"type.tourism.information.guidepost" = "ข้อมูลการท่องเที่ยว";
+"type.tourism.information.guidepost" = "ไกด์โพส";
 
 "type.tourism.information.map" = "แผนที่ท่องเที่ยว";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 6f51a14e2b..c86c2ac339 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -2862,7 +2862,7 @@
 
 "type.sport.athletics" = "Atletizm";
 
-"type.sport.australian_football" = "Ragbi";
+"type.sport.australian_football" = "Avustralya futbolu";
 
 "type.sport.baseball" = "Beyzbol";
 
@@ -2872,9 +2872,7 @@
 
 "type.sport.cricket" = "Kriket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Dalış";
+"type.sport.curling" = "Körling";
 
 "type.sport.equestrian" = "Binicilik Sporları";
 
@@ -2886,11 +2884,12 @@
 
 "type.sport.multi" = "Çeşitli Sporlar";
 
+/* Used to tag a scuba diving site. */
 "type.sport.scuba_diving" = "Tüplü Dalış";
 
-"type.sport.shooting" = "Atış Sporları";
+"type.sport.shooting" = "Çekim";
 
-"type.sport.skiing" = "Kayak";
+"type.sport.skiing" = "Kayak yapmak";
 
 "type.sport.soccer" = "Futbol";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Bilgi Panosu";
 
-"type.tourism.information.guidepost" = "Turist Bilgilendirme";
+"type.tourism.information.guidepost" = "Kılavuz direği";
 
 "type.tourism.information.map" = "Turist Haritası";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index a240dea98b..0f5828dfec 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -2858,37 +2858,36 @@
 
 "type.sport.american_football" = "Американський футбол";
 
-"type.sport.archery" = "Стрiльба з лука";
+"type.sport.archery" = "Стрільба з лука";
 
 "type.sport.athletics" = "Легка атлетика";
 
-"type.sport.australian_football" = "Регбi";
+"type.sport.australian_football" = "Австралійський футбол";
 
 "type.sport.baseball" = "Бейсбол";
 
 "type.sport.basketball" = "Баскетбол";
 
-"type.sport.bowls" = "Кеглi";
+"type.sport.bowls" = "Боулз";
 
 "type.sport.cricket" = "Крикет";
 
-"type.sport.curling" = "Керлiнг";
-
-"type.sport.diving" = "Пiдводне плавання";
+"type.sport.curling" = "Керлінг";
 
 "type.sport.equestrian" = "Кінний спорт";
 
 "type.sport.golf" = "Гольф";
 
-"type.sport.gymnastics" = "Гiмнастика";
+"type.sport.gymnastics" = "Гімнастика";
 
 "type.sport.handball" = "Гандбол";
 
 "type.sport.multi" = "Рiзноманiтнi типи спорту";
 
-"type.sport.scuba_diving" = "Акваланг";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Місце для дайвінгу";
 
-"type.sport.shooting" = "Стрiльба";
+"type.sport.shooting" = "Стрільба";
 
 "type.sport.skiing" = "Лижi";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Інформаційний щит";
 
-"type.tourism.information.guidepost" = "Турінформація";
+"type.tourism.information.guidepost" = "Вказівний стовп";
 
 "type.tourism.information.map" = "Мапа";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 11ec9c59db..b67aea1c75 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -2854,17 +2854,17 @@
 
 "type.shop.wine" = "Rượu";
 
-"type.sport" = "sport";
+"type.sport" = "Thể thao";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "Bóng bầu dục Mỹ";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "Bắn cung";
 
 "type.sport.athletics" = "Điền kinh";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "Bóng bầu dục Úc";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "Bóng chày";
 
 "type.sport.basketball" = "Bóng rổ";
 
@@ -2872,29 +2872,28 @@
 
 "type.sport.cricket" = "Cricket";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "Bi đá trên băng";
 
 "type.sport.equestrian" = "Thể thao cưỡi ngựa";
 
 "type.sport.golf" = "Golf";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "Thể dục";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "bóng ném";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "Các môn thể thao khác nhau";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "Môn lặn";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "Chụp";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "Trượt tuyết";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "Bóng đá";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "Bơi";
 
 "type.sport.tennis" = "Sân tenis";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "Bảng Thông Tin";
 
-"type.tourism.information.guidepost" = "Thông tin du lịch";
+"type.tourism.information.guidepost" = "Hướng dẫn";
 
 "type.tourism.information.map" = "Bản Đồ Du Lịch";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 071b6d8e19..ad1259252f 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -2854,27 +2854,25 @@
 
 "type.shop.wine" = "酒品商店";
 
-"type.sport" = "sport";
+"type.sport" = "体育运动";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "美式足球";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "射箭";
 
-"type.sport.athletics" = "田径";
+"type.sport.athletics" = "竞技";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "澳式足球";
 
 "type.sport.baseball" = "棒球";
 
 "type.sport.basketball" = "篮球";
 
-"type.sport.bowls" = "保龄球";
+"type.sport.bowls" = "草地滾球";
 
 "type.sport.cricket" = "板球";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "跳水";
+"type.sport.curling" = "冰壶";
 
 "type.sport.equestrian" = "马术运动";
 
@@ -2884,13 +2882,14 @@
 
 "type.sport.handball" = "手球";
 
-"type.sport.multi" = "多元";
+"type.sport.multi" = "各种运动";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "水肺潜水";
 
 "type.sport.shooting" = "射击";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "滑雪";
 
 "type.sport.soccer" = "足球";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "公告板";
 
-"type.tourism.information.guidepost" = "旅游信息";
+"type.tourism.information.guidepost" = "指路牌";
 
 "type.tourism.information.map" = "旅游地图";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 7ad6b6bf91..410e8a9895 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -2854,47 +2854,46 @@
 
 "type.shop.wine" = "販酒處";
 
-"type.sport" = "sport";
+"type.sport" = "體育運動";
 
-"type.sport.american_football" = "American Football";
+"type.sport.american_football" = "美式足球";
 
-"type.sport.archery" = "Archery";
+"type.sport.archery" = "射箭";
 
-"type.sport.athletics" = "田徑";
+"type.sport.athletics" = "競技";
 
-"type.sport.australian_football" = "Rugby";
+"type.sport.australian_football" = "澳式足球";
 
-"type.sport.baseball" = "Baseball";
+"type.sport.baseball" = "棒球";
 
 "type.sport.basketball" = "籃球";
 
-"type.sport.bowls" = "Bowls";
+"type.sport.bowls" = "草地滾球";
 
-"type.sport.cricket" = "Cricket";
+"type.sport.cricket" = "板球";
 
-"type.sport.curling" = "Сurling";
-
-"type.sport.diving" = "Diving";
+"type.sport.curling" = "冰壺";
 
 "type.sport.equestrian" = "馬術運動";
 
-"type.sport.golf" = "Golf";
+"type.sport.golf" = "高爾夫球";
 
-"type.sport.gymnastics" = "Gymnastics";
+"type.sport.gymnastics" = "體操";
 
-"type.sport.handball" = "Handball";
+"type.sport.handball" = "手球";
 
-"type.sport.multi" = "Various Sport";
+"type.sport.multi" = "各種運動";
 
-"type.sport.scuba_diving" = "Scuba Diving";
+/* Used to tag a scuba diving site. */
+"type.sport.scuba_diving" = "水肺潛水";
 
-"type.sport.shooting" = "Shooting";
+"type.sport.shooting" = "射擊";
 
-"type.sport.skiing" = "Skiing";
+"type.sport.skiing" = "滑雪";
 
-"type.sport.soccer" = "Soccer (Football)";
+"type.sport.soccer" = "足球";
 
-"type.sport.swimming" = "Swimming";
+"type.sport.swimming" = "游泳";
 
 "type.sport.tennis" = "網球場";
 
@@ -2938,7 +2937,7 @@
 
 "type.tourism.information.board" = "資訊中心";
 
-"type.tourism.information.guidepost" = "觀光諮詢";
+"type.tourism.information.guidepost" = "指路牌";
 
 "type.tourism.information.map" = "旅遊地圖";