diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 8231ff2906..ff4af56212 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -791,6 +791,7 @@
 	<string name="type.building.garage">جراج</string>
 	<string name="type.building.has_parts">مبنى</string>
 	<string name="type.building.train_station">محطة سكك حديدية</string>
+	<string name="type.cemetery.grave">ﺮﻴﻄﺧ</string>
 	<string name="type.craft.brewery">مصنع جعة</string>
 	<string name="type.craft.carpenter">نجار</string>
 	<string name="type.craft.electrician">كهربائي</string>
@@ -1126,6 +1127,7 @@
 	<string name="type.natural.glacier">كتلة جليدية</string>
 	<string name="type.natural.grassland">ملعب</string>
 	<string name="type.natural.water.lake">بحيرة</string>
+	<string name="type.natural.water.lock">ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ</string>
 	<string name="type.natural.water.pond">بركة</string>
 	<string name="type.natural.water.reservoir">خزان</string>
 	<string name="type.natural.water.basin">حوض المياه</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 5f756cc8f5..4a07a66d82 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -747,6 +747,7 @@
 	<string name="type.barrier.chain">Ланцуг</string>
 	<string name="type.barrier.lift_gate">Шлагбаўм</string>
 	<string name="type.barrier.swing_gate">Шлагбаўм</string>
+	<string name="type.cemetery.grave">Магіла</string>
 	<string name="type.craft.metal_construction">Металаканструкцыі</string>
 	<string name="type.cuisine.bubble_tea">Чай з бурбалкамі</string>
 	<string name="type.emergency.defibrillator">Дэфібрылятар</string>
@@ -861,6 +862,7 @@
 	<string name="type.mountain_pass">Перавал</string>
 	<string name="type.natural.beach.sand">Пяшчаны пляж</string>
 	<string name="type.natural.beach.gravel">Галечны пляж</string>
+	<string name="type.natural.water.lock">Шлюзавая камера</string>
 	<string name="type.natural.water.pond">Сажалка</string>
 	<string name="type.natural.water.reservoir">Вадасховішча</string>
 	<string name="type.natural.water.basin">Рэзервуар</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index dbf5a1b15c..edf806eab5 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -639,6 +639,7 @@
 
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.recycling.batteries">Батерии</string>
+	<string name="type.cemetery.grave">Гроб</string>
 	<string name="type.craft.metal_construction">Метални конструкции</string>
 	<string name="type.healthcare.laboratory">Медицинска лаборатория</string>
 
@@ -736,6 +737,7 @@
 	<string name="type.historic.archaeological_site">Археологически сайт</string>
 	<string name="type.landuse.basin">Резервоар</string>
 	<string name="type.leisure.picnic_table">Маса за пикник</string>
+	<string name="type.natural.water.lock">Заключваща камера</string>
 	<string name="type.natural.water.reservoir">Резервоар</string>
 	<string name="type.natural.water.basin">Резервоар</string>
 	<string name="type.natural.water">Воден басейн</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index cd7e018752..eacaa5686a 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -787,6 +787,7 @@
 	<string name="type.building.garage">Garáž</string>
 	<string name="type.building.has_parts">Stavba</string>
 	<string name="type.building.train_station">Železniční stanice</string>
+	<string name="type.cemetery.grave">Hrob</string>
 	<string name="type.craft.brewery">Pivovar</string>
 	<string name="type.craft.carpenter">Truhlář</string>
 	<string name="type.craft.electrician">Elektrikář</string>
@@ -1120,6 +1121,7 @@
 	<string name="type.natural.glacier">Ledovec</string>
 	<string name="type.natural.grassland">Pole</string>
 	<string name="type.natural.water.lake">Jezero</string>
+	<string name="type.natural.water.lock">Zámková komora</string>
 	<string name="type.natural.water.pond">Rybník</string>
 	<string name="type.natural.water.reservoir">Nádrž</string>
 	<string name="type.natural.water.basin">Vodní nádrž</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 91bbfb87fa..0e4dba1aef 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -781,6 +781,7 @@
 	<string name="type.building.address">Bygning</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building.train_station">Togstation</string>
+	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Tømrer</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1111,6 +1112,7 @@
 	<string name="type.natural.glacier">Gletsjer</string>
 	<string name="type.natural.grassland">Mark</string>
 	<string name="type.natural.water.lake">Sø</string>
+	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Vandbassin</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 93e7c9a990..46cd02a581 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -852,6 +852,7 @@
 	<string name="type.building.address">Gebäude</string>
 	<string name="type.building.has_parts">Gebäude</string>
 	<string name="type.building.train_station">Bahnhof</string>
+	<string name="type.cemetery.grave">Grab</string>
 	<string name="type.craft.brewery">Brauerei</string>
 	<string name="type.craft.carpenter">Zimmermann</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1249,6 +1250,7 @@
 	<string name="type.natural.heath">Heide</string>
 	<string name="type.natural.hot_spring">Thermalquelle</string>
 	<string name="type.natural.water.lake">See</string>
+	<string name="type.natural.water.lock">Schleusenkammer</string>
 	<string name="type.natural.water.pond">Teich</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Wasserbecken</string>
@@ -1528,7 +1530,6 @@
 	<string name="type.waterway.dock">Dock</string>
 	<string name="type.waterway.drain">Abfluss</string>
 	<string name="type.waterway.drain.tunnel">Abfluss</string>
-	<string name="type.waterway.lock">Schleuse</string>
 	<string name="type.waterway.lock_gate">Schleusentor</string>
 	<string name="type.waterway.river">Fluss</string>
 	<string name="type.waterway.river.tunnel">Fluss</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 6c10e446a8..bd7ecf306c 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -787,6 +787,7 @@
 	<string name="type.building.garage">Γκαράζ</string>
 	<string name="type.building.has_parts">Κτίριο</string>
 	<string name="type.building.train_station">Σιδηροδρομικός σταθμός</string>
+	<string name="type.cemetery.grave">Τάφος</string>
 	<string name="type.craft.brewery">Ζυθοποιείο</string>
 	<string name="type.craft.carpenter">Ξυλουργός</string>
 	<string name="type.craft.electrician">Ηλεκτρολόγος</string>
@@ -1123,6 +1124,7 @@
 	<string name="type.natural.glacier">Παγετώνας</string>
 	<string name="type.natural.grassland">Λιβάδι</string>
 	<string name="type.natural.water.lake">Λίμνη</string>
+	<string name="type.natural.water.lock">Θάλαμος κλειδαριάς</string>
 	<string name="type.natural.water.pond">Δεξαμενή</string>
 	<string name="type.natural.water.reservoir">Δεξαμενή</string>
 	<string name="type.natural.water.basin">Μια λεκάνη νερού</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 3c39865654..2138c17d82 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -865,6 +865,7 @@
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Estación de tren</string>
 	<string name="type.building.warehouse">Almacén</string>
+	<string name="type.cemetery.grave">Tumba</string>
 	<string name="type.craft.brewery">Fábrica de cerveza</string>
 	<string name="type.craft.carpenter">Carpintero</string>
 	<string name="type.craft.electrician">Electricista</string>
@@ -1201,6 +1202,7 @@
 	<string name="type.natural.glacier">Glaciar</string>
 	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Cámara de bloqueo</string>
 	<string name="type.natural.water.pond">Estanque</string>
 	<string name="type.natural.water.reservoir">Embalse</string>
 	<string name="type.natural.water.basin">Cuenca</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index bfb6ca1cd2..a9e16d11bd 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -848,6 +848,7 @@
 	<string name="type.building.has_parts">Eraikin</string>
 	<string name="type.building.train_station">Tren geltokian</string>
 	<string name="type.building.warehouse">Denda</string>
+	<string name="type.cemetery.grave">Hilobia</string>
 	<string name="type.craft.brewery">Garagardo fabrika</string>
 	<string name="type.craft.carpenter">Arotza</string>
 	<string name="type.craft.electrician">Elektrizista teknikaria</string>
@@ -1183,6 +1184,7 @@
 	<string name="type.natural.glacier">Glaziarra</string>
 	<string name="type.natural.grassland">Landa</string>
 	<string name="type.natural.water.lake">Lakua</string>
+	<string name="type.natural.water.lock">Sarraila Ganbera</string>
 	<string name="type.natural.water.pond">Urmaela</string>
 	<string name="type.natural.water.reservoir">Urtegia</string>
 	<string name="type.natural.water.basin">Arroa</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 1a6c2afaac..96a74f9691 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -785,6 +785,7 @@
 	<string name="type.building.garage">گاراژ</string>
 	<string name="type.building.has_parts">ساختمان</string>
 	<string name="type.building.train_station">ایستگاه قطار</string>
+	<string name="type.cemetery.grave">ﺮﺒﻗ</string>
 	<string name="type.craft.brewery">کارخانه ابجوسازی</string>
 	<string name="type.craft.carpenter">نجار</string>
 	<string name="type.craft.electrician">برق کار</string>
@@ -1031,6 +1032,7 @@
 	<string name="type.natural.glacier">یخچال طبیعی</string>
 	<string name="type.natural.grassland">کشتزار</string>
 	<string name="type.natural.water.lake">دریاچه</string>
+	<string name="type.natural.water.lock">ﻞﻔﻗ ﻕﺎﺗﺍ</string>
 	<string name="type.natural.water.pond">تالاب</string>
 	<string name="type.natural.water.reservoir">مخزن</string>
 	<string name="type.natural.water.basin">حوضه آب</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 17a0ac7037..f36ca6676d 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -799,6 +799,7 @@
 	<string name="type.building.garage">Autotalli</string>
 	<string name="type.building.has_parts">Rakennus</string>
 	<string name="type.building.train_station">Rautatieasema</string>
+	<string name="type.cemetery.grave">Hauta</string>
 	<string name="type.craft.brewery">Panimo</string>
 	<string name="type.craft.carpenter">Puuseppä</string>
 	<string name="type.craft.electrician">Sähkömies</string>
@@ -1133,6 +1134,7 @@
 	<string name="type.natural.glacier">Jäätikkö</string>
 	<string name="type.natural.grassland">Pelto</string>
 	<string name="type.natural.water.lake">Järvi</string>
+	<string name="type.natural.water.lock">Lukko kammio</string>
 	<string name="type.natural.water.pond">Lampi</string>
 	<string name="type.natural.water.reservoir">Säiliö</string>
 	<string name="type.natural.water.basin">Vesisäiliö</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index b2d99f6c3e..0dcfbae83e 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -824,6 +824,7 @@
 	<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.craft">Artisanat</string>
 	<string name="type.craft.brewery">Brasserie artisanale</string>
 	<string name="type.craft.carpenter">Charpentier</string>
@@ -1202,6 +1203,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.pond">Étang</string>
 	<string name="type.natural.water.reservoir">Réservoir</string>
 	<string name="type.natural.water.basin">Réservoir</string>
@@ -1411,7 +1413,6 @@
 	<string name="type.waterway.ditch">Fossé</string>
 	<string name="type.waterway.ditch.tunnel">Fossé</string>
 	<string name="type.waterway.dock">Cale</string>
-	<string name="type.waterway.lock">Écluse</string>
 	<string name="type.waterway.lock_gate">Porte d\'écluse</string>
 	<string name="type.waterway.river">Rivière</string>
 	<string name="type.waterway.river.tunnel">Rivière</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 6488b31e5e..c5e423a10d 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -786,6 +786,7 @@
 	<string name="type.building.garage">Garázs</string>
 	<string name="type.building.has_parts">Épület</string>
 	<string name="type.building.train_station">Vonatmegálló</string>
+	<string name="type.cemetery.grave">Sír</string>
 	<string name="type.craft.brewery">Sörfőzde</string>
 	<string name="type.craft.carpenter">Ács</string>
 	<string name="type.craft.electrician">Villanyszerelő</string>
@@ -1118,6 +1119,7 @@
 	<string name="type.natural.glacier">Gleccser</string>
 	<string name="type.natural.grassland">Mező</string>
 	<string name="type.natural.water.lake">Tó</string>
+	<string name="type.natural.water.lock">Zsilipkamra</string>
 	<string name="type.natural.water.pond">Tavacska</string>
 	<string name="type.natural.water.reservoir">Rezervoár</string>
 	<string name="type.natural.water.basin">Vízgyűjtő</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 21aa0320a8..e84f7c5aa4 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -782,6 +782,7 @@
 	<string name="type.building.garage">Garasi</string>
 	<string name="type.building.has_parts">Gedung</string>
 	<string name="type.building.train_station">Rel kereta api</string>
+	<string name="type.cemetery.grave">Kuburan</string>
 	<string name="type.craft.brewery">Toko minuman</string>
 	<string name="type.craft.carpenter">Tukang kayu</string>
 	<string name="type.craft.electrician">Tukang listrik</string>
@@ -1113,6 +1114,7 @@
 	<string name="type.natural.glacier">Gletser</string>
 	<string name="type.natural.grassland">Ladang</string>
 	<string name="type.natural.water.lake">Danau</string>
+	<string name="type.natural.water.lock">Ruang Kunci</string>
 	<string name="type.natural.water.pond">Kolam</string>
 	<string name="type.natural.water.reservoir">Waduk</string>
 	<string name="type.natural.water.basin">Sebuah baskom air</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 98d3a58f31..da8543c9e7 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -812,6 +812,7 @@
 	<string name="type.building.address">Edificio</string>
 	<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.brewery">Birrificio</string>
 	<string name="type.craft.carpenter">Falegname</string>
 	<string name="type.craft.electrician">Elettricista</string>
@@ -1145,6 +1146,7 @@
 	<string name="type.natural.glacier">Ghiacciaio</string>
 	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Camera di blocco</string>
 	<string name="type.natural.water.pond">Stagno</string>
 	<string name="type.natural.water.reservoir">Serbatoio</string>
 	<string name="type.natural.water.basin">Bacino d\'acqua</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index c51517338a..da1501f160 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -226,6 +226,7 @@
 
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.recycling.batteries">תוללוס</string>
+	<string name="type.cemetery.grave">רבק</string>
 	<string name="type.cuisine.african">מטבח אפריקאי</string>
 	<string name="type.cuisine.american">מטבח אמריקאי</string>
 	<string name="type.cuisine.arab">מטבח ערבי</string>
@@ -406,6 +407,7 @@
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">אגן מים</string>
 	<string name="type.leisure.picnic_table">קינקיפ ןחלוש</string>
+	<string name="type.natural.water.lock">לוענמ את</string>
 	<string name="type.natural.water.reservoir">מאגר</string>
 	<string name="type.natural.water.basin">אגן מים</string>
 	<string name="type.natural.water">גוף מים</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index ae7f28f33d..f367764d5f 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -817,6 +817,7 @@
 	<string name="type.building.garage">車庫</string>
 	<string name="type.building.has_parts">建物</string>
 	<string name="type.building.train_station">鉄道駅</string>
+	<string name="type.cemetery.grave">墓</string>
 	<string name="type.craft">工房</string>
 	<string name="type.craft.brewery">醸造所</string>
 	<string name="type.craft.carpenter">大工</string>
@@ -1214,6 +1215,7 @@
 	<string name="type.natural.heath">ヒース</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
+	<string name="type.natural.water.lock">ロックチャンバー</string>
 	<string name="type.natural.water.pond">池</string>
 	<string name="type.natural.water.reservoir">貯水池</string>
 	<string name="type.natural.water.basin">水地</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 6de0befdc4..defb884cb2 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -786,6 +786,7 @@
 	<string name="type.building.garage">차고</string>
 	<string name="type.building.has_parts">건물</string>
 	<string name="type.building.train_station">기차역</string>
+	<string name="type.cemetery.grave">무덤</string>
 	<string name="type.craft.brewery">양조장</string>
 	<string name="type.craft.carpenter">목수</string>
 	<string name="type.craft.electrician">전기기술자</string>
@@ -1120,6 +1121,7 @@
 	<string name="type.natural.glacier">빙하</string>
 	<string name="type.natural.grassland">밭</string>
 	<string name="type.natural.water.lake">호수</string>
+	<string name="type.natural.water.lock">잠금 챔버</string>
 	<string name="type.natural.water.pond">연못이</string>
 	<string name="type.natural.water.reservoir">저수지</string>
 	<string name="type.natural.water.basin">저수지</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 8998dcd21d..aaf6185c2e 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -783,6 +783,7 @@
 	<string name="type.building.garage">Verksted</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building.train_station">Togstasjon</string>
+	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Snekker</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1114,6 +1115,7 @@
 	<string name="type.natural.glacier">Isbre</string>
 	<string name="type.natural.grassland">Slette</string>
 	<string name="type.natural.water.lake">Innsjø</string>
+	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
 	<string name="type.natural.water.basin">Vannvask</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index b5a6eac054..fef5ca5fd4 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -787,6 +787,7 @@
 	<string name="type.building.address">Gebouw</string>
 	<string name="type.building.has_parts">Gebouw</string>
 	<string name="type.building.train_station">Station</string>
+	<string name="type.cemetery.grave">Graf</string>
 	<string name="type.craft.brewery">Brouwerij</string>
 	<string name="type.craft.carpenter">Timmerman</string>
 	<string name="type.craft.electrician">Elektricien</string>
@@ -1124,6 +1125,7 @@
 	<string name="type.natural.heath">Heide</string>
 	<string name="type.natural.hot_spring">Heetwaterbron</string>
 	<string name="type.natural.water.lake">Meer</string>
+	<string name="type.natural.water.lock">Slotkamer</string>
 	<string name="type.natural.water.pond">Plas</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Waterbassin</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 54f327a6ae..4b3ce96364 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -846,6 +846,7 @@
 	<string name="type.building.garage">Garaż</string>
 	<string name="type.building.has_parts">Część budynku</string>
 	<string name="type.building.train_station">Dworzec kolejowy</string>
+	<string name="type.cemetery.grave">Mogiła</string>
 	<string name="type.craft">Rzemiosło</string>
 	<string name="type.craft.brewery">Browar</string>
 	<string name="type.craft.carpenter">Stolarz</string>
@@ -1237,6 +1238,7 @@
 	<string name="type.natural.heath">Wrzosowisko</string>
 	<string name="type.natural.hot_spring">Gorące źródło</string>
 	<string name="type.natural.water.lake">Jezioro</string>
+	<string name="type.natural.water.lock">Komora zamka</string>
 	<string name="type.natural.water.pond">Staw</string>
 	<string name="type.natural.water.reservoir">Zbiornik</string>
 	<string name="type.natural.water.basin">Zbiornik</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 558ab34174..8861b7f19d 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -864,6 +864,7 @@
 	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building.train_station">Estação de trem</string>
 	<string name="type.building.warehouse">Armazém</string>
+	<string name="type.cemetery.grave">Túmulo</string>
 	<string name="type.craft">Ofícios</string>
 	<string name="type.craft.brewery">Cervejaria artesanal</string>
 	<string name="type.craft.carpenter">Carpinteiro</string>
@@ -1263,6 +1264,7 @@
 	<string name="type.natural.heath">Charneca</string>
 	<string name="type.natural.hot_spring">Nascente de água quente</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Câmara de Bloqueio</string>
 	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.water.basin">Reservatório</string>
 	<string name="type.natural.water.river">Rio</string>
@@ -1544,7 +1546,6 @@
 	<string name="type.waterway.dock">Doca</string>
 	<string name="type.waterway.drain">Valeta de drenagem</string>
 	<string name="type.waterway.drain.tunnel">Valeta de drenagem</string>
-	<string name="type.waterway.lock">Eclusa</string>
 	<string name="type.waterway.lock_gate">Comporta de eclusa</string>
 	<string name="type.waterway.river">Rio</string>
 	<string name="type.waterway.river.tunnel">Rio</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index aca9e5f623..681f5281f0 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -846,6 +846,7 @@
 	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building.train_station">Estação de comboios</string>
 	<string name="type.building.warehouse">Armazém</string>
+	<string name="type.cemetery.grave">Túmulo</string>
 	<string name="type.craft">Ofícios</string>
 	<string name="type.craft.brewery">Cervejaria artesanal</string>
 	<string name="type.craft.carpenter">Carpinteiro</string>
@@ -1245,6 +1246,7 @@
 	<string name="type.natural.heath">Charneca</string>
 	<string name="type.natural.hot_spring">Nascente de água quente</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Câmara de Bloqueio</string>
 	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.water.reservoir">Reservatório</string>
 	<string name="type.natural.water.basin">Reservatório</string>
@@ -1527,7 +1529,6 @@
 	<string name="type.waterway.dock">Doca</string>
 	<string name="type.waterway.drain">Valeta de drenagem</string>
 	<string name="type.waterway.drain.tunnel">Valeta de drenagem</string>
-	<string name="type.waterway.lock">Eclusa</string>
 	<string name="type.waterway.lock_gate">Comporta de eclusa</string>
 	<string name="type.waterway.river">Rio</string>
 	<string name="type.waterway.river.tunnel">Rio</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 695f9d4979..03cf3b2879 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -809,6 +809,7 @@
 	<string name="type.building.garage">Garaj</string>
 	<string name="type.building.has_parts">Clădire</string>
 	<string name="type.building.train_station">Feroviar</string>
+	<string name="type.cemetery.grave">Mormânt</string>
 	<string name="type.craft.brewery">Berărie</string>
 	<string name="type.craft.carpenter">Tâmplar</string>
 	<string name="type.craft.gardener">Peisagist</string>
@@ -1139,6 +1140,7 @@
 	<string name="type.natural.glacier">Ghețar</string>
 	<string name="type.natural.grassland">Câmp</string>
 	<string name="type.natural.water.lake">Lac</string>
+	<string name="type.natural.water.lock">Camera de blocare</string>
 	<string name="type.natural.water.pond">Heleșteu</string>
 	<string name="type.natural.water.reservoir">Rezervor</string>
 	<string name="type.natural.water.basin">Bazin de apă</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 0cf22eb4d0..796e82c1ef 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -903,17 +903,25 @@
 	<string name="type.building.has_parts">Здание</string>
 	<string name="type.building.train_station">Ж/д вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
+	<string name="type.cemetery.grave">Могила</string>
 	<string name="type.craft">Мастерская</string>
+	<string name="type.craft.beekeeper">Пчеловод</string>
+	<string name="type.craft.blacksmith">Кузнец</string>
 	<string name="type.craft.brewery">Крафтовое пиво</string>
 	<string name="type.craft.carpenter">Столяр</string>
+	<string name="type.craft.confectionery">Кондитер</string>
 	<string name="type.craft.electrician">Электрик</string>
+	<string name="type.craft.electronics_repair">Ремонт электроники</string>
 	<string name="type.craft.gardener">Садовник</string>
+	<string name="type.craft.handicraft">Декоративный мастер</string>
 	<string name="type.craft.hvac">Кондиционеры</string>
 	<string name="type.craft.metal_construction">Металлоконструкции</string>
 	<string name="type.craft.painter">Маляр</string>
 	<string name="type.craft.photographer">Фотограф</string>
 	<string name="type.craft.plumber">Сантехник</string>
+	<string name="type.craft.sawmill">Лесопилка</string>
 	<string name="type.craft.shoemaker">Ремонт обуви</string>
+	<string name="type.craft.winery">Винодельня</string>
 	<string name="type.craft.tailor">Ателье</string>
 	<string name="type.cuisine.african">Африканская кухня</string>
 	<string name="type.cuisine.american">Американская кухня</string>
@@ -1314,6 +1322,7 @@
 	<string name="type.natural.heath">Пустошь</string>
 	<string name="type.natural.hot_spring">Горячий источник</string>
 	<string name="type.natural.water.lake">Озеро</string>
+	<string name="type.natural.water.lock">Шлюзовая камера</string>
 	<string name="type.natural.water.pond">Пруд</string>
 	<string name="type.natural.water.reservoir">Водохранилище</string>
 	<string name="type.natural.water.basin">Резервуар</string>
@@ -1603,7 +1612,6 @@
 	<string name="type.waterway.dock">Причал</string>
 	<string name="type.waterway.drain">Водоотвод</string>
 	<string name="type.waterway.drain.tunnel">Водоотвод</string>
-	<string name="type.waterway.lock">Шлюз</string>
 	<string name="type.waterway.lock_gate">Шлюз</string>
 	<string name="type.waterway.river">Река</string>
 	<string name="type.waterway.river.tunnel">Река</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 2d48855b0a..dfedbfa85a 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -785,6 +785,7 @@
 	<string name="type.building.garage">Garáž</string>
 	<string name="type.building.has_parts">Budova</string>
 	<string name="type.building.train_station">Železničná stanica</string>
+	<string name="type.cemetery.grave">Hrob</string>
 	<string name="type.craft.brewery">Pivovar</string>
 	<string name="type.craft.carpenter">Tesár</string>
 	<string name="type.craft.electrician">Elektrikár</string>
@@ -1116,6 +1117,7 @@
 	<string name="type.natural.glacier">Ľadovec</string>
 	<string name="type.natural.grassland">Lúka</string>
 	<string name="type.natural.water.lake">Jazero</string>
+	<string name="type.natural.water.lock">Uzamykacia komora</string>
 	<string name="type.natural.water.pond">Rybník</string>
 	<string name="type.natural.water.reservoir">Nádrž</string>
 	<string name="type.natural.water.basin">Vodná nádrž</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 29cc4bb1e2..48ed6ca7a7 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -782,6 +782,7 @@
 	<string name="type.building.address">Byggnad</string>
 	<string name="type.building.has_parts">Byggnad</string>
 	<string name="type.building.train_station">Tågstation</string>
+	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Snickare</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1112,6 +1113,7 @@
 	<string name="type.natural.glacier">Glaciär</string>
 	<string name="type.natural.grassland">Fältet</string>
 	<string name="type.natural.water.lake">Sjö</string>
+	<string name="type.natural.water.lock">Låskammare</string>
 	<string name="type.natural.water.pond">Damm</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
 	<string name="type.natural.water.basin">Vattenbassäng</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 7aa5958a4a..7874885221 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -233,6 +233,7 @@
 	<string name="type.recycling.batteries">Betri</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Mashine ya kuuzia tiketi za usafiri wa umma</string>
 	<string name="type.boundary.national_park">Hifadhi ya taifa</string>
+	<string name="type.cemetery.grave">Kaburi</string>
 	<string name="type.cuisine.coffee_shop">Kahawa</string>
 	<string name="type.healthcare.laboratory">Maabara ya Matibabu</string>
 
@@ -346,6 +347,7 @@
 	<string name="type.natural.geyser">Chemchem ya maji moto</string>
 	<string name="type.natural.glacier">Mto barafu</string>
 	<string name="type.natural.grassland">Shamba</string>
+	<string name="type.natural.water.lock">Chumba cha kufuli</string>
 	<string name="type.natural.water.reservoir">Hifadhi</string>
 	<string name="type.natural.water.basin">Bonde la Maji</string>
 	<string name="type.natural.scrub">Eneo la Vichaka</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 89e81bddfe..ceb2034b5c 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -789,6 +789,7 @@
 	<string name="type.building.garage">อาคารจอดรถ</string>
 	<string name="type.building.has_parts">อาคาร</string>
 	<string name="type.building.train_station">สถานีรถไฟ</string>
+	<string name="type.cemetery.grave">หลุมฝังศพ</string>
 	<string name="type.craft.brewery">โรงเบียร์</string>
 	<string name="type.craft.carpenter">ช่างไม้</string>
 	<string name="type.craft.electrician">ช่างไฟฟ้า</string>
@@ -1124,6 +1125,7 @@
 	<string name="type.natural.glacier">ธารน้ำแข็ง</string>
 	<string name="type.natural.grassland">ทุ่งหญ้า</string>
 	<string name="type.natural.water.lake">ทะเลสาบ</string>
+	<string name="type.natural.water.lock">ห้องล็อค</string>
 	<string name="type.natural.water.pond">บ่อ</string>
 	<string name="type.natural.water.reservoir">อ่างเก็บน้ำ</string>
 	<string name="type.natural.water.basin">อ่างน้ำ</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index de5f1da82a..8aab56ba71 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -877,6 +877,7 @@
 	<string name="type.building.has_parts">Bina</string>
 	<string name="type.building.train_station">Tren İstasyonu</string>
 	<string name="type.building.warehouse">Depo</string>
+	<string name="type.cemetery.grave">Mezar</string>
 	<string name="type.craft">Zanaat</string>
 	<string name="type.craft.brewery">Bira Fabrikası</string>
 	<string name="type.craft.carpenter">Marangoz</string>
@@ -1285,6 +1286,7 @@
 	<string name="type.natural.heath">Çalı</string>
 	<string name="type.natural.hot_spring">Kaplıca</string>
 	<string name="type.natural.water.lake">Göl</string>
+	<string name="type.natural.water.lock">Kilit Odası</string>
 	<string name="type.natural.water.pond">Gölet</string>
 	<string name="type.natural.water.reservoir">Rezervuar</string>
 	<string name="type.natural.water.basin">Havza</string>
@@ -1567,7 +1569,6 @@
 	<string name="type.waterway.dock">Rıhtım</string>
 	<string name="type.waterway.drain">Lağım</string>
 	<string name="type.waterway.drain.tunnel">Lağım</string>
-	<string name="type.waterway.lock">Kanal Havuzu</string>
 	<string name="type.waterway.lock_gate">Kilit Kapısı</string>
 	<string name="type.waterway.river">Nehir</string>
 	<string name="type.waterway.river.tunnel">Nehir</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index b79c7f4182..458dac6edb 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -874,6 +874,7 @@
 	<string name="type.building.has_parts">Будівля</string>
 	<string name="type.building.train_station">Залізничний вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
+	<string name="type.cemetery.grave">Могила</string>
 	<string name="type.craft">Майстерня</string>
 	<string name="type.craft.brewery">Пивоварня</string>
 	<string name="type.craft.carpenter">Столяр</string>
@@ -1282,6 +1283,7 @@
 	<string name="type.natural.heath">Пустище</string>
 	<string name="type.natural.hot_spring">Горяче джерело</string>
 	<string name="type.natural.water.lake">Озеро</string>
+	<string name="type.natural.water.lock">Замкова камера</string>
 	<string name="type.natural.water.pond">Ставок</string>
 	<string name="type.natural.water.reservoir">Водосховище</string>
 	<string name="type.natural.water.basin">Резервуар</string>
@@ -1564,7 +1566,6 @@
 	<string name="type.waterway.dock">Причал</string>
 	<string name="type.waterway.drain">Водовiдвiд</string>
 	<string name="type.waterway.drain.tunnel">Водовiдвiд</string>
-	<string name="type.waterway.lock">Шлюз</string>
 	<string name="type.waterway.lock_gate">Шлюз</string>
 	<string name="type.waterway.river">Річка</string>
 	<string name="type.waterway.river.tunnel">Річка</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 6534bd1123..4bfb8f6c9c 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -786,6 +786,7 @@
 	<string name="type.building.garage">Gara</string>
 	<string name="type.building.has_parts">Tòa nhà</string>
 	<string name="type.building.train_station">Đường tàu hỏa</string>
+	<string name="type.cemetery.grave">Phần mộ</string>
 	<string name="type.craft.brewery">Nhà máy bia</string>
 	<string name="type.craft.carpenter">Thợ mộc</string>
 	<string name="type.craft.electrician">Thợ điện</string>
@@ -1119,6 +1120,7 @@
 	<string name="type.natural.glacier">Sông băng</string>
 	<string name="type.natural.grassland">Cánh đồng</string>
 	<string name="type.natural.water.lake">Hồ</string>
+	<string name="type.natural.water.lock">Khoang khóa</string>
 	<string name="type.natural.water.pond">Ao</string>
 	<string name="type.natural.water.reservoir">Hồ chứa</string>
 	<string name="type.natural.water.basin">Một chậu nước</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index f24f549be4..4c7a8f7f03 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -821,6 +821,7 @@
 	<string name="type.building.garage">車庫</string>
 	<string name="type.building.has_parts">建築物</string>
 	<string name="type.building.train_station">鐵道</string>
+	<string name="type.cemetery.grave">墓穴</string>
 	<string name="type.craft.brewery">釀酒廠</string>
 	<string name="type.craft.carpenter">木工</string>
 	<string name="type.craft.electrician">電工</string>
@@ -1164,6 +1165,7 @@
 	<string name="type.natural.glacier">冰川</string>
 	<string name="type.natural.grassland">田野</string>
 	<string name="type.natural.water.lake">湖泊</string>
+	<string name="type.natural.water.lock">鎖室</string>
 	<string name="type.natural.water.pond">潭</string>
 	<string name="type.natural.water.reservoir">水庫</string>
 	<string name="type.natural.water.basin">水庫</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index a6596eb361..55a058f2a7 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -839,6 +839,7 @@
 	<string name="type.building.has_parts">建筑物</string>
 	<string name="type.building.train_station">火车站建筑</string>
 	<string name="type.building.warehouse">仓库</string>
+	<string name="type.cemetery.grave">墓穴</string>
 	<string name="type.craft">工艺作坊</string>
 	<string name="type.craft.brewery">酿酒厂</string>
 	<string name="type.craft.carpenter">木匠</string>
@@ -1232,6 +1233,7 @@
 	<string name="type.natural.heath">荒野</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
+	<string name="type.natural.water.lock">锁室</string>
 	<string name="type.natural.water.pond">池塘</string>
 	<string name="type.natural.water.reservoir">水库</string>
 	<string name="type.natural.water.basin">水盆地</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 096cccf69e..49245b6448 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -917,17 +917,25 @@
 	<string name="type.building.has_parts">Building</string>
 	<string name="type.building.train_station">Train Station</string>
 	<string name="type.building.warehouse">Warehouse</string>
+	<string name="type.cemetery.grave">Grave</string>
 	<string name="type.craft">Craft</string>
+	<string name="type.craft.beekeeper">beekeeper</string>
+	<string name="type.craft.blacksmith">Blacksmith</string>
 	<string name="type.craft.brewery">Craft Brewery</string>
 	<string name="type.craft.carpenter">Carpenter</string>
+	<string name="type.craft.confectionery">Confectionery</string>
 	<string name="type.craft.electrician">Electrician</string>
+	<string name="type.craft.electronics_repair">Electronics repair</string>
 	<string name="type.craft.gardener">Gardener</string>
+	<string name="type.craft.handicraft">Handicraft</string>
 	<string name="type.craft.hvac">Hvac</string>
 	<string name="type.craft.metal_construction">Metal Worker</string>
 	<string name="type.craft.painter">Painter</string>
 	<string name="type.craft.photographer">Photographer</string>
 	<string name="type.craft.plumber">Plumber</string>
+	<string name="type.craft.sawmill">Sawmill</string>
 	<string name="type.craft.shoemaker">Shoe Repair</string>
+	<string name="type.craft.winery">Winery</string>
 	<string name="type.craft.tailor">Tailor</string>
 	<string name="type.cuisine.african">African</string>
 	<string name="type.cuisine.american">American</string>
@@ -1345,6 +1353,7 @@
 	<string name="type.natural.heath">Heath</string>
 	<string name="type.natural.hot_spring">Hot Spring</string>
 	<string name="type.natural.water.lake">Lake</string>
+	<string name="type.natural.water.lock">Lock Chamber</string>
 	<string name="type.natural.water.pond">Pond</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Basin</string>
@@ -1634,7 +1643,6 @@
 	<string name="type.waterway.dock">Waterway Dock</string>
 	<string name="type.waterway.drain">Drain</string>
 	<string name="type.waterway.drain.tunnel">Drain</string>
-	<string name="type.waterway.lock">Waterway Lock</string>
 	<string name="type.waterway.lock_gate">Lock Gate</string>
 	<string name="type.waterway.river">River</string>
 	<string name="type.waterway.river.tunnel">River</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 72d34a90af..3d80b56235 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "ﺮﻴﻄﺧ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "مصنع جعة";
 
 "type.craft.carpenter" = "نجار";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "كهربائي";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "مهندس مناظر";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "تكييف";
 
 "type.craft.metal_construction" = "عامل معادن";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "سمكري";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "تصليح الاحذية";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "خياط";
 
 "type.cuisine.african" = "مطبخ أفريقي";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "بحيرة";
 
+"type.natural.water.lock" = "ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ";
+
 "type.natural.water.pond" = "بركة";
 
 "type.natural.water.reservoir" = "خزان";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "بوابة هويس";
 
 "type.waterway.river" = "نهر";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 3407e24a60..d1fddf6025 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Магіла";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Металаканструкцыі";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Шлюзавая камера";
+
 "type.natural.water.pond" = "Сажалка";
 
 "type.natural.water.reservoir" = "Вадасховішча";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "Рака";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index c3dd6b2531..b8b93fa8e9 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Гроб";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Метални конструкции";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Заключваща камера";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Резервоар";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 6d3319ac04..0e1d0a5606 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Hrob";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Pivovar";
 
 "type.craft.carpenter" = "Truhlář";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrikář";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Zahradník";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "HVAC";
 
 "type.craft.metal_construction" = "Kovodílna";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Instalatér";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Opravna obuvi";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Krejčí";
 
 "type.cuisine.african" = "Africká kuchyně";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Jezero";
 
+"type.natural.water.lock" = "Zámková komora";
+
 "type.natural.water.pond" = "Rybník";
 
 "type.natural.water.reservoir" = "Nádrž";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Stavidlo";
 
 "type.waterway.river" = "Řeka";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index a661d9fdf2..61bdd609ae 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grav";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bryggeri";
 
 "type.craft.carpenter" = "Tømrer";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gartner";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Blikkenslager";
 
 "type.craft.metal_construction" = "Metalarbejder";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "VVS-mand";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Skomager";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Skrædder";
 
 "type.cuisine.african" = "Afrikansk";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Sø";
 
+"type.natural.water.lock" = "Låsekammer";
+
 "type.natural.water.pond" = "Dam";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Låseport";
 
 "type.waterway.river" = "Flod";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 40b4505124..a347ef7d7f 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grab";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Brauerei";
 
 "type.craft.carpenter" = "Zimmermann";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Landschaftsgärtner";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Heizung";
 
 "type.craft.metal_construction" = "Schlosser";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Installateur";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Schuhmacher";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Schneider";
 
 "type.cuisine.african" = "Afrikanische Küche";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "See";
 
+"type.natural.water.lock" = "Schleusenkammer";
+
 "type.natural.water.pond" = "Teich";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Abfluss";
 
-"type.waterway.lock" = "Schleuse";
-
 "type.waterway.lock_gate" = "Schleusentor";
 
 "type.waterway.river" = "Fluss";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 3342b32d47..96e575ff53 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Τάφος";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Ζυθοποιείο";
 
 "type.craft.carpenter" = "Ξυλουργός";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Ηλεκτρολόγος";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Κηπουρός";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Ψυκτικός";
 
 "type.craft.metal_construction" = "Μεταλλουργός";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Υδραυλικός";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Υποδηματοποιός";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Ράφτης";
 
 "type.cuisine.african" = "Αφρικανική";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Λίμνη";
 
+"type.natural.water.lock" = "Θάλαμος κλειδαριάς";
+
 "type.natural.water.pond" = "Δεξαμενή";
 
 "type.natural.water.reservoir" = "Δεξαμενή";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Φράγμα";
 
 "type.waterway.river" = "Ποταμός";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 2a133f1ce7..0d289aaf32 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grave";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Lock Chamber";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 15105ce892..b873665ad7 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grave";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Lock Chamber";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index b0878c1ccc..9378934609 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Almacén";
 
+"type.cemetery.grave" = "Tumba";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Fábrica de cerveza";
 
 "type.craft.carpenter" = "Carpintero";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paisajista";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Aire acondicionado";
 
 "type.craft.metal_construction" = "Trabajador del metal";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Fontanero";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Zapatero";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Sastre";
 
 "type.cuisine.african" = "Cocina africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Cámara de bloqueo";
+
 "type.natural.water.pond" = "Estanque";
 
 "type.natural.water.reservoir" = "Embalse";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Compuerta";
 
 "type.waterway.river" = "Río";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 05187e4f6b..c2903350f4 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Almacén";
 
+"type.cemetery.grave" = "Tumba";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Fábrica de cerveza";
 
 "type.craft.carpenter" = "Carpintero";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paisajista";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Aire acondicionado";
 
 "type.craft.metal_construction" = "Trabajador del metal";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Fontanero";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Zapatero";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Sastre";
 
 "type.cuisine.african" = "Cocina africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Cámara de bloqueo";
+
 "type.natural.water.pond" = "Estanque";
 
 "type.natural.water.reservoir" = "Embalse";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Compuerta";
 
 "type.waterway.river" = "Río";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 0d98d2469f..d1404c3813 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Denda";
 
+"type.cemetery.grave" = "Hilobia";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Garagardo fabrika";
 
 "type.craft.carpenter" = "Arotza";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrizista teknikaria";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paisaia";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Aire girotua";
 
 "type.craft.metal_construction" = "Metalgintzako langilea";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Iturgina";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Zapataria";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Jostun";
 
 "type.cuisine.african" = "Afrikako sukaldaritza";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lakua";
 
+"type.natural.water.lock" = "Sarraila Ganbera";
+
 "type.natural.water.pond" = "Urmaela";
 
 "type.natural.water.reservoir" = "Urtegia";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Atea";
 
 "type.waterway.river" = "Ibai";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 9540887636..27ad60914b 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "ﺮﺒﻗ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "کارخانه ابجوسازی";
 
 "type.craft.carpenter" = "نجار";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "برق کار";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "باغبان";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "اهن کار";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "لوله کش";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "کفاش";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "خیاطی";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "دریاچه";
 
+"type.natural.water.lock" = "ﻞﻔﻗ ﻕﺎﺗﺍ";
+
 "type.natural.water.pond" = "تالاب";
 
 "type.natural.water.reservoir" = "مخزن";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "رودخانه";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 88800c48ba..3d2f8d1e85 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Hauta";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Panimo";
 
 "type.craft.carpenter" = "Puuseppä";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Sähkömies";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Puutarhuri";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Ilmastointilaite";
 
 "type.craft.metal_construction" = "Metallimies";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Putkimies";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Suutari";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Räätäli";
 
 "type.cuisine.african" = "Afrikkalainen keittiö";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Järvi";
 
+"type.natural.water.lock" = "Lukko kammio";
+
 "type.natural.water.pond" = "Lampi";
 
 "type.natural.water.reservoir" = "Säiliö";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Kanavasulku";
 
 "type.waterway.river" = "Joki";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 6837c9d66e..ccc0a445b9 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Entrepôt";
 
+"type.cemetery.grave" = "La tombe";
+
 "type.craft" = "Artisanat";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Brasserie artisanale";
 
 "type.craft.carpenter" = "Charpentier";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Électricien";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paysagiste";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Climatiseur";
 
 "type.craft.metal_construction" = "Métallo";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plombier";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Cordonnier";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailleur";
 
 "type.cuisine.african" = "Cuisine africaine";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lac";
 
+"type.natural.water.lock" = "Chambre de verrouillage";
+
 "type.natural.water.pond" = "Étang";
 
 "type.natural.water.reservoir" = "Réservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Écluse";
-
 "type.waterway.lock_gate" = "Porte d'écluse";
 
 "type.waterway.river" = "Rivière";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 529a4c77e4..95d699bb76 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "רבק";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "מטבח אפריקאי";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "לוענמ את";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "מאגר";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index c892401379..5b6bcca806 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Sír";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Sörfőzde";
 
 "type.craft.carpenter" = "Ács";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Villanyszerelő";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Kertész";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hűtés-fűtés szerelő";
 
 "type.craft.metal_construction" = "Lakatos";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Vízvezeték-szerelő";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Cipész";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Szabó";
 
 "type.cuisine.african" = "Afrikai konyha";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Tó";
 
+"type.natural.water.lock" = "Zsilipkamra";
+
 "type.natural.water.pond" = "Tavacska";
 
 "type.natural.water.reservoir" = "Rezervoár";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Zsilip";
 
 "type.waterway.river" = "Folyó";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index f19449f82f..264ddd7e5b 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Kuburan";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Toko minuman";
 
 "type.craft.carpenter" = "Tukang kayu";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Tukang listrik";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Tukang kebun";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Tukang besi";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Tukang pipa";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Tukang sepatu";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tukang jahit";
 
 "type.cuisine.african" = "Masakan afrika";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Danau";
 
+"type.natural.water.lock" = "Ruang Kunci";
+
 "type.natural.water.pond" = "Kolam";
 
 "type.natural.water.reservoir" = "Waduk";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Gerbang pengunci";
 
 "type.waterway.river" = "Sungai";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 1c896fd872..059de12e05 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "La tomba";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Birrificio";
 
 "type.craft.carpenter" = "Falegname";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elettricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Giardiniere";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Impianti HVAC";
 
 "type.craft.metal_construction" = "Fabbro";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Idraulico";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Calzolaio";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Sarto";
 
 "type.cuisine.african" = "Cucina africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Camera di blocco";
+
 "type.natural.water.pond" = "Stagno";
 
 "type.natural.water.reservoir" = "Serbatoio";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Sbarramento";
 
 "type.waterway.river" = "Fiume";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index e73f6714d5..a87f6961b6 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "墓";
+
 "type.craft" = "工房";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "醸造所";
 
 "type.craft.carpenter" = "大工";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "電気技師";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "造園家";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "冷暖房空調";
 
 "type.craft.metal_construction" = "金属工";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "配管工";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "靴修理";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "仕立て屋";
 
 "type.cuisine.african" = "アフリカ料理";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "湖";
 
+"type.natural.water.lock" = "ロックチャンバー";
+
 "type.natural.water.pond" = "池";
 
 "type.natural.water.reservoir" = "貯水池";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "用水路";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "水門";
 
 "type.waterway.river" = "河川";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 7ef5c0bc51..c444dea004 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "무덤";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "양조장";
 
 "type.craft.carpenter" = "목수";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "전기기술자";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "조경사";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "냉난방기";
 
 "type.craft.metal_construction" = "금속공";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "배관공";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "구두수선";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "양복점";
 
 "type.cuisine.african" = "아프리카식 음식";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "호수";
 
+"type.natural.water.lock" = "잠금 챔버";
+
 "type.natural.water.pond" = "연못이";
 
 "type.natural.water.reservoir" = "저수지";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "수문";
 
 "type.waterway.river" = "강";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 83c7b990d7..aa9bd2581c 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grav";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bryggeri";
 
 "type.craft.carpenter" = "Snekker";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Anleggsgartner";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Klimaanlegg";
 
 "type.craft.metal_construction" = "Metallarbeider";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Rørlegger";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Skoreparasjon";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Skredder";
 
 "type.cuisine.african" = "Afrikansk mat";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Innsjø";
 
+"type.natural.water.lock" = "Låsekammer";
+
 "type.natural.water.pond" = "Dam";
 
 "type.natural.water.reservoir" = "Reservoar";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Sluseport";
 
 "type.waterway.river" = "Elv";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index ff1599f33f..c96ad37875 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Graf";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Brouwerij";
 
 "type.craft.carpenter" = "Timmerman";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektricien";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Tuinarchitect";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Airconditioning";
 
 "type.craft.metal_construction" = "Metaalarbeider";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Loodgieter";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Schoenmaker";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Kleermaker";
 
 "type.cuisine.african" = "Afrikaans";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Meer";
 
+"type.natural.water.lock" = "Slotkamer";
+
 "type.natural.water.pond" = "Plas";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Gesloten poort";
 
 "type.waterway.river" = "Rivier";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index de2d5ea62d..5d8603ae0e 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Mogiła";
+
 "type.craft" = "Rzemiosło";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Browar";
 
 "type.craft.carpenter" = "Stolarz";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektryk";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Ogrodnik";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Klimatyzacja";
 
 "type.craft.metal_construction" = "Ślusarz, obrabiacz metalu";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Hydraulik";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Szewc";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Krawiec";
 
 "type.cuisine.african" = "Kuchnia afrykańska";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Jezioro";
 
+"type.natural.water.lock" = "Komora zamka";
+
 "type.natural.water.pond" = "Staw";
 
 "type.natural.water.reservoir" = "Zbiornik";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Wrota śluzy";
 
 "type.waterway.river" = "Rzeka";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index b09de541ac..ce80ad7e2c 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Armazém";
 
+"type.cemetery.grave" = "Túmulo";
+
 "type.craft" = "Ofícios";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Cervejaria artesanal";
 
 "type.craft.carpenter" = "Carpinteiro";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Eletricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Jardineiro";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Ar-condicionado";
 
 "type.craft.metal_construction" = "Serralheiro metálico";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Encanador";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Sapateiro";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Alfaiate";
 
 "type.cuisine.african" = "Cozinha africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Câmara de Bloqueio";
+
 "type.natural.water.pond" = "Lagoa";
 
 "type.natural.water.reservoir" = "Reservatório";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Valeta de drenagem";
 
-"type.waterway.lock" = "Eclusa";
-
 "type.waterway.lock_gate" = "Comporta de eclusa";
 
 "type.waterway.river" = "Rio";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index da9ffeee47..08899cd1ee 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Armazém";
 
+"type.cemetery.grave" = "Túmulo";
+
 "type.craft" = "Ofícios";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Cervejaria artesanal";
 
 "type.craft.carpenter" = "Carpinteiro";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Eletricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Jardineiro";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Instalador de ar-condicionado";
 
 "type.craft.metal_construction" = "Serralheiro metálico";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Picheleiro";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Sapateiro";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Alfaiate";
 
 "type.cuisine.african" = "Cozinha africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Câmara de Bloqueio";
+
 "type.natural.water.pond" = "Lagoa";
 
 "type.natural.water.reservoir" = "Reservatório";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Valeta de drenagem";
 
-"type.waterway.lock" = "Eclusa";
-
 "type.waterway.lock_gate" = "Comporta de eclusa";
 
 "type.waterway.river" = "Rio";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 7b09b01077..7484eeb853 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Mormânt";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Berărie";
 
 "type.craft.carpenter" = "Tâmplar";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Peisagist";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metalurgist";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Instalator";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Reparații încălțăminte";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Croitor";
 
 "type.cuisine.african" = "Bucătărie african";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lac";
 
+"type.natural.water.lock" = "Camera de blocare";
+
 "type.natural.water.pond" = "Heleșteu";
 
 "type.natural.water.reservoir" = "Rezervor";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Ecluză";
 
 "type.waterway.river" = "Râu";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 940b138ee1..f138042eed 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Склад";
 
+"type.cemetery.grave" = "Могила";
+
 "type.craft" = "Мастерская";
 
+"type.craft.beekeeper" = "Пчеловод";
+
+"type.craft.blacksmith" = "Кузнец";
+
 "type.craft.brewery" = "Крафтовое пиво";
 
 "type.craft.carpenter" = "Столяр";
 
+"type.craft.confectionery" = "Кондитер";
+
 "type.craft.electrician" = "Электрик";
 
+"type.craft.electronics_repair" = "Ремонт электроники";
+
 "type.craft.gardener" = "Садовник";
 
+"type.craft.handicraft" = "Декоративный мастер";
+
 "type.craft.hvac" = "Кондиционеры";
 
 "type.craft.metal_construction" = "Металлоконструкции";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Сантехник";
 
+"type.craft.sawmill" = "Лесопилка";
+
 "type.craft.shoemaker" = "Ремонт обуви";
 
+"type.craft.winery" = "Винодельня";
+
 "type.craft.tailor" = "Ателье";
 
 "type.cuisine.african" = "Африканская кухня";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Озеро";
 
+"type.natural.water.lock" = "Шлюзовая камера";
+
 "type.natural.water.pond" = "Пруд";
 
 "type.natural.water.reservoir" = "Водохранилище";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Водоотвод";
 
-"type.waterway.lock" = "Шлюз";
-
 "type.waterway.lock_gate" = "Шлюз";
 
 "type.waterway.river" = "Река";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 4e192edbde..aa790474c9 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Hrob";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Pivovar";
 
 "type.craft.carpenter" = "Tesár";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrikár";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Záhradníctvo";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Vzduchotechnika";
 
 "type.craft.metal_construction" = "Kovorobotník";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Klampiarstvo";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Oprava obuvy";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Krajčírstvo";
 
 "type.cuisine.african" = "Africká kuchyňa";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Jazero";
 
+"type.natural.water.lock" = "Uzamykacia komora";
+
 "type.natural.water.pond" = "Rybník";
 
 "type.natural.water.reservoir" = "Nádrž";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Stavidlo";
 
 "type.waterway.river" = "Rieka";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 3a3fe14067..97a6a91a13 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grav";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bryggeri";
 
 "type.craft.carpenter" = "Snickare";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Trädgårdsmästare";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Vvs";
 
 "type.craft.metal_construction" = "Metallarbetare";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Vvs-montör";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Skomakare";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Skräddare";
 
 "type.cuisine.african" = "Afrikansk mat";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Sjö";
 
+"type.natural.water.lock" = "Låskammare";
+
 "type.natural.water.pond" = "Damm";
 
 "type.natural.water.reservoir" = "Reservoar";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Slussport";
 
 "type.waterway.river" = "Flod";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 6c66e7c5c9..339245793d 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Kaburi";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Chumba cha kufuli";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Hifadhi";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index af2c584f14..47022e80b0 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "หลุมฝังศพ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "โรงเบียร์";
 
 "type.craft.carpenter" = "ช่างไม้";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "ช่างไฟฟ้า";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "คนจัดสวน";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "ระบบปรับอากาศ";
 
 "type.craft.metal_construction" = "ช่างเหล็ก";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "ช่างประปา";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "ช่างซ่อมรองเท้า";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "ช่างตัดเสื้อ";
 
 "type.cuisine.african" = "อาหารแอฟริกัน";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "ทะเลสาบ";
 
+"type.natural.water.lock" = "ห้องล็อค";
+
 "type.natural.water.pond" = "บ่อ";
 
 "type.natural.water.reservoir" = "อ่างเก็บน้ำ";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "ประตูระบายน้ำ";
 
 "type.waterway.river" = "แม่น้ำ";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 39092677bb..6d9c857825 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Depo";
 
+"type.cemetery.grave" = "Mezar";
+
 "type.craft" = "Zanaat";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bira Fabrikası";
 
 "type.craft.carpenter" = "Marangoz";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrikçi";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Bahçe Düzenleyici";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Klimacı";
 
 "type.craft.metal_construction" = "Dökümcü";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Tesisatçı";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Ayakkabı Tamircisi";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Terzi";
 
 "type.cuisine.african" = "Afrika mutfağı";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Göl";
 
+"type.natural.water.lock" = "Kilit Odası";
+
 "type.natural.water.pond" = "Gölet";
 
 "type.natural.water.reservoir" = "Rezervuar";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Lağım";
 
-"type.waterway.lock" = "Kanal Havuzu";
-
 "type.waterway.lock_gate" = "Kilit Kapısı";
 
 "type.waterway.river" = "Nehir";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 438848570e..f08f5f2c76 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Склад";
 
+"type.cemetery.grave" = "Могила";
+
 "type.craft" = "Майстерня";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Пивоварня";
 
 "type.craft.carpenter" = "Столяр";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Електрик";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Садівник";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Кондиціонери";
 
 "type.craft.metal_construction" = "Металоконструкції";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Сантехнік";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Ремонт взуття";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Ательє";
 
 "type.cuisine.african" = "Африканська кухня";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Озеро";
 
+"type.natural.water.lock" = "Замкова камера";
+
 "type.natural.water.pond" = "Ставок";
 
 "type.natural.water.reservoir" = "Водосховище";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Водовiдвiд";
 
-"type.waterway.lock" = "Шлюз";
-
 "type.waterway.lock_gate" = "Шлюз";
 
 "type.waterway.river" = "Річка";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 9717dc0255..28e1404c77 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Phần mộ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Nhà máy bia";
 
 "type.craft.carpenter" = "Thợ mộc";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Thợ điện";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Người thiết kế và xây dựng cảnh quan";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Điều hòa nhiệt độ";
 
 "type.craft.metal_construction" = "Nhà kim khí";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Thợ đường ống";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Sửa giày";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Thợ may";
 
 "type.cuisine.african" = "Ẩm thực châu phi";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Hồ";
 
+"type.natural.water.lock" = "Khoang khóa";
+
 "type.natural.water.pond" = "Ao";
 
 "type.natural.water.reservoir" = "Hồ chứa";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Cổng Khóa";
 
 "type.waterway.river" = "Sông";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index ab5afb876b..4e12a1d461 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "仓库";
 
+"type.cemetery.grave" = "墓穴";
+
 "type.craft" = "工艺作坊";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "酿酒厂";
 
 "type.craft.carpenter" = "木匠";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "电工";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "园艺工";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "暖通工程师";
 
 "type.craft.metal_construction" = "金属制造工";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "管道工";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "鞋匠";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "裁缝";
 
 "type.cuisine.african" = "非洲菜";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "湖";
 
+"type.natural.water.lock" = "锁室";
+
 "type.natural.water.pond" = "池塘";
 
 "type.natural.water.reservoir" = "水库";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "渠";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "闸门";
 
 "type.waterway.river" = "河流";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index dc332c614e..2463152f1e 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "墓穴";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "釀酒廠";
 
 "type.craft.carpenter" = "木工";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "電工";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "園藝師";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "空調設備";
 
 "type.craft.metal_construction" = "鐵工";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "水管工人";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "修鞋工";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "裁縫師";
 
 "type.cuisine.african" = "非洲料理";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "湖泊";
 
+"type.natural.water.lock" = "鎖室";
+
 "type.natural.water.pond" = "潭";
 
 "type.natural.water.reservoir" = "水庫";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "閘門";
 
 "type.waterway.river" = "河流";